Merge pull request #205 from ibi-group/upstream-merge-2024-03-04

Upstream merge 2024-03-04

.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
 

.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

client-next/package.json

@@ -35,11 +35,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",

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)
 

doc-templates/sandbox/MapboxVectorTilesApi.md

@@ -49,6 +49,15 @@ The feature must be configured in `router-config.json` as follows
         "minZoom": 14,
         "cacheMaxSeconds": 600
       },
+      // flex zones
+      {
+        "name": "areaStops",
+        "type": "AreaStop",
+        "mapper": "OTPRR",
+        "maxZoom": 20,
+        "minZoom": 14,
+        "cacheMaxSeconds": 600
+      },
       {
         "name": "stations",
         "type": "Station",
@@ -136,6 +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`: Flex zones
     - `Station`
     - `VehicleRental`: all rental places: stations and free-floating vehicles
     - `VehicleRentalVehicle`: free-floating rental vehicles
@@ -191,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)
+- 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)