Merge remote-tracking branch 'upstream/dev-2.x' into max-car-speed

HSLdevcom · Feb 16, 2024 · 6880485 · 6880485
2 parents a8c4553 + c893a8b
commit 6880485
Show file tree

Hide file tree

Showing 134 changed files with 8,861 additions and 2,622 deletions.
diff --git 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
diff --git 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}\"",
@@ -17,9 +19,9 @@
   "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",
+    "maplibre-gl": "4.0.1",
     "react": "18.2.0",
     "react-bootstrap": "2.8.0",
     "react-dom": "18.2.0",
@@ -30,20 +32,24 @@
     "@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",
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-react-refresh": "0.4.3",
+    "jsdom": "24.0.0",
     "prettier": "3.0.3",
     "typescript": "5.2.2",
-    "vite": "4.4.9"
+    "vite": "4.5.2",
+    "vitest": "1.1.3"
   }
 }
diff --git a/client-next/src/components/ItineraryList/ItineraryList.test.tsx b/client-next/src/components/ItineraryList/ItineraryList.test.tsx
diff --git 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/client-next/src/components/SearchBar/SearchBar.test.tsx 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(<SearchBar loading onRoute={() => {}} setTripQueryVariables={() => {}} tripQueryVariables={variables} />);
+});
diff --git 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',
+  },
 });
diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -87,6 +87,12 @@ 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)
+- 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)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.4.0 (2023-09-13)

diff --git 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.                                                                                                                                                                                                                                                             |                    |    ✓️   |
 
 <!-- OTP-FEATURE-TABLE END -->