diff --git a/.github/workflows/debug-client.yml b/.github/workflows/debug-client.yml index 56304db88f2..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" @@ -76,9 +76,9 @@ 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/ - cp client-next/output/index.html ${CLIENT_HTML_OUTPUT} + CLIENT_HTML_OUTPUT=src/client/index.html + mkdir -p src/client/ + 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 92% rename from client-next/README.md rename to client/README.md index a6c8e76cfad..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 @@ -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: @@ -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 89% rename from client-next/vite.config.ts rename to client/vite.config.ts index 69bfec7f396..af49d327516 100644 --- a/client-next/vite.config.ts +++ b/client/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/docs/Frontends.md b/docs/Frontends.md index e7946102ea1..b2f0b9d0b2e 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`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/client). +- 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. 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. By default, it is available at the root URL (`http://localhost:8080/` in local operation). -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 **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/` . + +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, 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`: ```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`. 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"] }, 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 + + + + +
+ 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/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..6f981b7f67d 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, + 5.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