forked from HSLdevcom/OpenTripPlanner
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'otp/dev-2.x' into filter_access_paths_r…
…aptor # Conflicts: # src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
- Loading branch information
Showing
284 changed files
with
2,391 additions
and
1,861 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| name: Debug client | ||
|
|
||
| on: | ||
| push: | ||
| paths: | ||
| - 'client-next/**' | ||
| pull_request: | ||
| paths: | ||
| - 'client-next/**' | ||
|
|
||
| # to avoid conflicts, make sure that only one workflow pushes to Github at the same time | ||
| concurrency: | ||
| group: github-push | ||
|
|
||
| jobs: | ||
| debug-client: | ||
| if: github.repository_owner == 'opentripplanner' | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 20 | ||
| steps: | ||
| # this is necessary so that the correct credentials are put into the git configuration | ||
| # when we push to dev-2.x and push the compiled output to the git repo | ||
| - uses: actions/checkout@v4 | ||
| if: github.event_name == 'push' | ||
| with: | ||
| token: ${{ secrets.CHANGELOG_TOKEN }} | ||
| fetch-depth: 0 | ||
|
|
||
| # for a simple PR where we don't push, we don't need any credentials | ||
| - uses: actions/checkout@v4 | ||
| if: github.event_name == 'pull_request' | ||
|
|
||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 18 | ||
|
|
||
| - name: Set version | ||
| run: echo "VERSION=`date +%Y/%m/%Y-%m-%dT%H:%M`" >> $GITHUB_ENV | ||
|
|
||
| - name: Build debug client | ||
| working-directory: client-next | ||
| run: | | ||
| npm install | ||
| npm run build -- --base https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/${VERSION}/ | ||
| - name: Deploy compiled assets to repo | ||
| if: github.event_name == 'push' && github.ref == 'refs/heads/dev-2.x' | ||
| env: | ||
| REMOTE: debug-client | ||
| LOCAL_BRANCH: local-assets | ||
| REMOTE_BRANCH: main | ||
| TOKEN: ${{ secrets.CHANGELOG_TOKEN }} | ||
| run: | | ||
| # Configure git user | ||
| git config --global user.name 'OTP Bot' | ||
| git config --global user.email '[email protected]' | ||
| # Fetch the assets repo | ||
| git remote add $REMOTE https://[email protected]/opentripplanner/debug-client-assets.git | ||
| git fetch --depth=1 $REMOTE $REMOTE_BRANCH:$LOCAL_BRANCH | ||
| git checkout $LOCAL_BRANCH | ||
| # Copy the compiled output to a versioned folder | ||
| mkdir -p $VERSION | ||
| rsync -r client-next/output/* ./$VERSION/ | ||
| git add $VERSION | ||
| git commit -am "Add version ${VERSION} of debug client" | ||
| # Push to assets repo https://github.com/opentripplanner/debug-client-assets | ||
| git push $REMOTE $LOCAL_BRANCH:$REMOTE_BRANCH | ||
| # Switch back to the OTP code | ||
| 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} | ||
| # just to debug | ||
| cat ${CLIENT_HTML_OUTPUT} | ||
| git add -f ${CLIENT_HTML_OUTPUT} | ||
| git commit -m "Upgrade debug client to version ${VERSION}" | ||
| git push ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git HEAD:dev-2.x |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| VITE_API_URL=/otp/routers/default/transmodel/index/graphql | ||
| VITE_API_URL=/otp/routers/default/transmodel/index/graphql | ||
| VITE_DEBUG_STYLE_URL=/otp/routers/default/inspector/vectortile/style.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| VITE_API_URL=http://localhost:8080/otp/routers/default/transmodel/index/graphql | ||
| VITE_API_URL=http://localhost:8080/otp/routers/default/transmodel/index/graphql | ||
| VITE_DEBUG_STYLE_URL=http://localhost:8080/otp/routers/default/inspector/vectortile/style.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| save-exact=true |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
client-next/src/components/MapView/GeometryPropertyPopup.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import {LngLat, Popup} from 'react-map-gl'; | ||
| import {Table} from 'react-bootstrap'; | ||
|
|
||
| export function GeometryPropertyPopup({ | ||
| coordinates, | ||
| properties, | ||
| onClose, | ||
| }: { | ||
| coordinates: LngLat; | ||
| properties: { [s: string]: string }; | ||
| onClose: () => void; | ||
| }) { | ||
| return ( | ||
| <Popup latitude={coordinates.lat} longitude={coordinates.lng} closeButton={true} onClose={() => onClose()}> | ||
| <Table bordered> | ||
| <tbody> | ||
| {Object.entries(properties).map(([key, value]) => ( | ||
| <tr key={key}> | ||
| <th scope="row">{key}</th> | ||
| <td>{value}</td> | ||
| </tr> | ||
| ))} | ||
| </tbody> | ||
| </Table> | ||
| </Popup> | ||
| ); | ||
| } |
Oops, something went wrong.