-
Notifications
You must be signed in to change notification settings - Fork 78
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into dev-flex-2024
# Conflicts: # gtfs.yml # i18n/english.yml # i18n/polish.yml # lib/common/actions/index.js # lib/editor/actions/map/stopStrategies.js # lib/editor/actions/tripPattern.js # lib/editor/components/EditorInput.js # lib/editor/components/HourMinuteInput.js # lib/editor/components/pattern/NormalizeStopTimesModal.js # lib/editor/components/pattern/PatternStopCard.js # lib/editor/components/pattern/PatternStopContainer.js # lib/editor/components/pattern/PatternStopsPanel.js # lib/editor/components/timetable/TimetableEditor.js # lib/editor/components/timetable/TimetableGrid.js # lib/editor/components/timetable/TimetableHeader.js # lib/editor/components/timetable/TripSeriesModal.js # lib/editor/util/map.js # lib/editor/util/validation/validation.js # lib/gtfs/util/index.js # lib/manager/components/transform/FeedTransformation.js # lib/types/index.js
- Loading branch information
Showing
179 changed files
with
6,550 additions
and
1,257 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
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,4 +1,4 @@ | ||
| # See https://help.github.com/articles/about-codeowners/ | ||
|
|
||
| # An IBI Group OTP/Data Tools member is required to approve PR merges | ||
| # An Arcadis OTP/TRANSIT-data-tools member is required to approve PR merges | ||
| * @ibi-group/otp-data-tools |
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 |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # Read the Docs configuration file for MkDocs projects | ||
| # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details | ||
|
|
||
| # Required | ||
| version: 2 | ||
|
|
||
| # Set the version of Python and other tools you might need | ||
| build: | ||
| os: ubuntu-22.04 | ||
| tools: | ||
| python: "3.11" | ||
|
|
||
| mkdocs: | ||
| configuration: mkdocs.yml |
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
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,71 @@ | ||
| version: "3.8" | ||
|
|
||
| x-common-variables: &common-variables | ||
| - BUGSNAG_KEY=${BUGSNAG_KEY} | ||
| - S3_BUCKET=${S3_BUCKET} | ||
| - LOGS_S3_BUCKET=${LOGS_S3_BUCKET} | ||
| - MS_TEAMS_WEBHOOK_URL=${MS_TEAMS_WEBHOOK_URL} | ||
| - MAPBOX_ACCESS_TOKEN=${MAPBOX_ACCESS_TOKEN} | ||
| - GITHUB_SHA=${GITHUB_SHA} | ||
| - GITHUB_REF_SLUG=${GITHUB_REF_SLUG} | ||
| - TRANSITFEEDS_KEY=${TRANSITFEEDS_KEY} | ||
| - GITHUB_REPOSITORY=${GITHUB_REPOSITORY} | ||
| - GITHUB_WORKSPACE=${GITHUB_WORKSPACE} | ||
| - GITHUB_RUN_ID=${GITHUB_RUN_ID} | ||
| - AUTH0_CLIENT_ID=${AUTH0_CLIENT_ID} | ||
| - AUTH0_PUBLIC_KEY=${AUTH0_PUBLIC_KEY} | ||
| - AUTH0_CONNECTION_NAME=${AUTH0_CONNECTION_NAME} | ||
| - AUTH0_DOMAIN=${AUTH0_DOMAIN} | ||
| - AUTH0_API_CLIENT=${AUTH0_API_CLIENT} | ||
| - AUTH0_API_SECRET=${AUTH0_API_SECRET} | ||
| - OSM_VEX=${OSM_VEX} | ||
| - SPARKPOST_KEY=${SPARKPOST_KEY} | ||
| - SPARKPOST_EMAIL=${SPARKPOST_EMAIL} | ||
| - GTFS_DATABASE_URL=jdbc:postgresql://postgres/dmtest | ||
| - GTFS_DATABASE_USER=root | ||
| - GTFS_DATABASE_PASSWORD=e2e | ||
| - MONGO_DB_NAME=data_manager | ||
| - MONGO_HOST=mongo:27017 | ||
| - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} | ||
| - AWS_REGION=${AWS_REGION} | ||
| - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} | ||
| - DISABLE_AUTH=true | ||
|
|
||
| services: | ||
| datatools-server: | ||
| image: ghcr.io/ibi-group/datatools-server:dev | ||
| restart: always | ||
| environment: *common-variables | ||
| volumes: | ||
| - type: bind | ||
| source: ./server/ | ||
| target: /config | ||
| ports: | ||
| - "4000:4000" | ||
| datatools-ui: | ||
| build: | ||
| context: ../ | ||
| dockerfile: ./docker/ui/Dockerfile | ||
| args: *common-variables | ||
| restart: always | ||
| environment: *common-variables | ||
| ports: | ||
| - "9966:9966" | ||
| mongo: | ||
| image: mongo | ||
| restart: always | ||
| volumes: | ||
| - dt-mongo:/data/db | ||
| postgres: | ||
| environment: | ||
| POSTGRES_HOST_AUTH_METHOD: trust | ||
| POSTGRES_USER: root | ||
| POSTGRES_PASS: e2e | ||
| POSTGRES_DB: dmtest | ||
| image: postgres | ||
| restart: always | ||
| volumes: | ||
| - dt-postgres:/var/lib/postgresql/data | ||
| volumes: | ||
| dt-postgres: | ||
| dt-mongo: |
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,5 @@ | ||
| DISABLE_AUTH: TRUE | ||
| GTFS_DATABASE_URL: jdbc:postgresql://postgres/dmtest | ||
| MONGO_DB_NAME: data_manager | ||
| MONGO_HOST: mongo | ||
| AUTH0_CLIENT_ID: disable_auth |
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,67 @@ | ||
| application: | ||
| title: Data Tools | ||
| logo: https://d2tyb7byn1fef9.cloudfront.net/ibi_group-128x128.png | ||
| logo_large: https://d2tyb7byn1fef9.cloudfront.net/ibi_group_black-512x512.png | ||
| client_assets_url: https://example.com | ||
| shortcut_icon_url: https://d2tyb7byn1fef9.cloudfront.net/ibi-logo-original%402x.png | ||
| public_url: http://localhost:9966 | ||
| notifications_enabled: false | ||
| docs_url: http://conveyal-data-tools.readthedocs.org | ||
| support_email: [email protected] | ||
| port: 4000 | ||
| data: | ||
| gtfs: /tmp | ||
| use_s3_storage: false | ||
| s3_region: us-east-1 | ||
| gtfs_s3_bucket: bucket-name | ||
| modules: | ||
| enterprise: | ||
| enabled: false | ||
| editor: | ||
| enabled: true | ||
| deployment: | ||
| enabled: true | ||
| ec2: | ||
| enabled: false | ||
| default_ami: ami-your-ami-id | ||
| tag_key: a-tag-key-to-add-to-all-instances | ||
| tag_value: a-tag-value-to-add-to-all-instances | ||
| # Note: using a cloudfront URL for these download URLs will greatly | ||
| # increase download/deploy speed. | ||
| otp_download_url: https://optional-otp-repo.com | ||
| user_admin: | ||
| enabled: false | ||
| gtfsapi: | ||
| enabled: true | ||
| load_on_fetch: false | ||
| # use_extension: mtc | ||
| # update_frequency: 30 # in seconds | ||
| manager: | ||
| normalizeFieldTransformation: | ||
| # Enter capitalization exceptions (e.g. acronyms), in the desired case, and separated by commas. | ||
| defaultCapitalizationExceptions: | ||
| - ACE | ||
| - BART | ||
| # Enter substitutions (e.g. substitute '@' with 'at'), one dashed entry for each substitution, with: | ||
| # - pattern: the regex string pattern that will be replaced, | ||
| # - replacement: the replacement string for that pattern, | ||
| # - normalizeSpace: if true, the resulting field value will include one space before and after the replacement string. | ||
| # Note: if the replacement must be blank, then normalizeSpace should be set to false | ||
| # and whitespace management should be handled in pattern instead. | ||
| # Substitutions are executed in order they appear in the list. | ||
| defaultSubstitutions: | ||
| - description: "Replace '@' with 'at', and normalize space." | ||
| pattern: "@" | ||
| replacement: at | ||
| normalizeSpace: true | ||
| - description: "Replace '+' (\\+ in regex) and '&' with 'and', and normalize space." | ||
| pattern: "[\\+&]" | ||
| replacement: and | ||
| normalizeSpace: true | ||
| extensions: | ||
| transitland: | ||
| enabled: true | ||
| api: https://transit.land/api/v1/feeds | ||
| transitfeeds: | ||
| enabled: true | ||
| api: http://api.transitfeeds.com/v1/getFeeds |
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,16 @@ | ||
| FROM node:14 | ||
| WORKDIR /datatools-build | ||
|
|
||
| ARG BUGSNAG_KEY | ||
|
|
||
| RUN cd /datatools-build | ||
| COPY package.json yarn.lock patches /datatools-build/ | ||
| RUN yarn | ||
| COPY . /datatools-build/ | ||
| COPY configurations/default /datatools-config/ | ||
|
|
||
|
|
||
| # Copy the tmp file to the env.yml if no env.yml is present | ||
| RUN cp -R -u -p /datatools-config/env.yml.tmp /datatools-config/env.yml | ||
|
|
||
| CMD yarn run mastarm build --env dev --serve --proxy http://datatools-server:4000/api # |
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
Oops, something went wrong.