Merge remote-tracking branch 'upstream/dev-2.x' into plan-connection

HSLdevcom · Mar 14, 2024 · cf57eab · cf57eab
2 parents 3c9e438 + 5edc5ae
commit cf57eab
Show file tree

Hide file tree

Showing 258 changed files with 6,256 additions and 5,537 deletions.
diff --git 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
 
@@ -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:
 

diff --git 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

diff --git 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/client-next/package-lock.json b/client-next/package-lock.json
diff --git 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": "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",
-    "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"
   }
 }
diff --git 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/doc-templates/sandbox/MapboxVectorTilesApi.md b/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)
diff --git 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/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  |
@@ -945,15 +945,15 @@ 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`.
 
 <h3 id="od_osmTagMapping">osmTagMapping</h3>
 
 **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.