Skip to content

Commit

Permalink
docs: Change to TRANSIT-data-tools + change select to click
Browse files Browse the repository at this point in the history
  • Loading branch information
AdrianaCeric committed Dec 13, 2023
1 parent d01f2d4 commit eddec9a
Show file tree
Hide file tree
Showing 17 changed files with 79 additions and 80 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
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
10 changes: 5 additions & 5 deletions docs/dev/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ AUTH0_CLIENT_ID: your-auth0-client-id

Update the following properties in `datatools-server` and `env.yml` to reflect the secure Auth0 application settings.

**Note:** For older Auth0 accounts or tenants, utilizing the Auth0 secret token with the HS256 algorithm is possible. However, newer Auth0 tenants will need to specify the absolute path of their `.pem` file in the `AUTH0_PUBLIC_KEY` property. This public key only needs to be downloaded one time for your Auth0 tenant at `https://[your_domain].auth0.com/pem`.
**Note:** For older Auth0 accounts or tenants, it is possible to use the Auth0 secret token with the HS256 algorithm is possible. However, newer Auth0 tenants will need to specify the absolute path of their `.pem` file in the `AUTH0_PUBLIC_KEY` property. This public key only needs to be downloaded one time for your Auth0 tenant at `https://[your_domain].auth0.com/pem`.

```yaml
AUTH0_SECRET: your-auth0-client-secret # used for pre-September 2017 Auth0 accounts
Expand All @@ -166,7 +166,7 @@ To allow for the creation, deletion and editing of users you must generate a tok

If using OIDC-conformant clients/APIs (which appears to be mandatory for new Auth0 tenants), you must set up a custom Auth0 action to add `app_metadata` and `user_metadata` to the user's id token (Note: this is not the default for older, "legacy" Auth0 accounts).

To set up the action, go to Actions > Flows > Login, then under Add action > Custom, click on `Create Action`. Fill in the action name and pick a recommended runtime, and click on `Create`. Modify the function `onExecutePostLogin` as follows, then click Save Draft:
To set up the action, go to Actions > Flows > Login, then under Add action > Custom, click `Create Action`. Fill in the action name and pick a recommended runtime, and click `Create`. Modify the function `onExecutePostLogin` as follows, then click `Save Draft`:

```js
exports.onExecutePostLogin = async (event, api) => {
Expand All @@ -178,10 +178,10 @@ exports.onExecutePostLogin = async (event, api) => {
};
```
If you want the rule to apply only to specific clients, you can retain the conditional block that checks the `context.clientID` value. Otherwise, you can remove this conditional block if it's not needed.
This rule will ensure that app_metadata and user_metadata are included in the user's token, as required for OIDC-conformant clients/APIs in new Auth0 tenants.
This rule will ensure that `app_metadata` and `user_metadata` are included in the user's token, as required for OIDC-conformant clients/APIs in new Auth0 tenants.

You can test the action with mock token data using the Test tab. Once ready, click Deploy, then click Back to Flow.
In the diagram, drag the action between the Start and Complete steps, then click Apply.
You can test the action with mock token data using the Test tab. Once ready, click `Deploy`, then click `Back to Flow`.
In the diagram, drag the action between the Start and Complete steps, then click `Apply`.
You can test that the action is correctly executed by logging-in to datatools with an admin user
and checking that the Admin functionality is available.

Expand Down
2 changes: 1 addition & 1 deletion docs/dev/development.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Development
These instructions should allow you to get Data Tools / Editor / Catalogue up and running within an integrated development environment, allowing you to work on the code and debug it. We all use IntelliJ so instructions will currently be only for that environment.
These instructions should allow you to get TRANSIT-data-tools / Editor / Catalogue up and running within an integrated development environment, allowing you to work on the code and debug it. We all use IntelliJ so instructions will currently be only for that environment.
## Components
The system is made up of two different projects:

Expand Down
6 changes: 3 additions & 3 deletions docs/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# IBI Transit Data Tools (TRANSIT-data-tools)
# Arcadis TRANSIT-data-tools

The IBI Transit Data Tools suite provides web-based tools for creating, managing, evaluating, and publishing transit data, specifically data stored in the General Transit Feed Specification (GTFS) format.
The Arcadis TRANSIT-data-tools suite provides web-based tools for creating, managing, evaluating, and publishing transit data, specifically data stored in the General Transit Feed Specification (GTFS) format.

![feed-profile](https://datatools-builds.s3.amazonaws.com/docs/intro/feed-profile.png)

To get started, click on a topic from the table of contents on the left pane.
To get started, select a topic from the table of contents on the left pane.
14 changes: 7 additions & 7 deletions docs/user/add-deployment-server.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
# Adding an OTP Deployment Server in Data Tools
# Adding an OTP Deployment Server in TRANSIT-data-tools

Assumptions:

* [X] You are an admin for Data Tools.
* [X] You are an admin for TRANSIT-data-tools.
* [X] You have [set up OTP UI and backend servers on AWS](./setting-up-aws-servers.md).
* [X] You have a private key file (usually ends in `.pem`) to connect to that AWS environment and EC2 servers via ssh.

From `Administration > Deployment servers`, click on `+ Add Server`.
From `Administration > Deployment servers`, click `+ Add Server`.

## General Server Properties

| Property | Description |
|----------|-------------|
| Name | A descriptive display name for the server. |
| Public URL | The URL where the public can access the Data Tools UI, e.g. `https://otp-mod-ui.ibi-transit.com`. It is typically the CNAME of the CloudFront mirror of the AWS S3 bucket you created or picked for this deployment. |
| Public URL | The URL where the public can access the TRANSIT-data-tools UI, e.g. `https://otp-mod-ui.ibi-transit.com`. It is typically the CNAME of the CloudFront mirror of the AWS S3 bucket you created or picked for this deployment. |
| Internal URLs (Optional) | The URL(s) based on the UI server IP address(es). |
| S3 bucket name | The name of the AWS S3 bucket you created or picked for this deployment, where Data Tools will share files with the OTP servers. |
| S3 bucket name | The name of the AWS S3 bucket you created or picked for this deployment, where TRANSIT-data-tools will share files with the OTP servers. |
| Admin access only? | Check this option to only allow logins from Data Tool admins. |
| Project specific? (Optional) | Select a project to only allow the GTFS feeds of that project (e.g. within a region) to be deployed to this server. Leave blank to remove the project restriction. |
|AWS Role|The IAM role that the Data Tools application must assume in order to access AWS resources (e.g., writing to S3 buckets or starting EC2 machines). See [Delegate Third Party Access](../setting-up-aws-servers#delegate-third-party-account-access) for more info.|
|AWS Role|The IAM role that the TRANSIT-data-tools application must assume in order to access AWS resources (e.g., writing to S3 buckets or starting EC2 machines). See [Delegate Third Party Access](../setting-up-aws-servers#delegate-third-party-account-access) for more info.|
| Use elastic load balancer (ELB) | **We recommend using an elastic load balancer (ELB)**. Behind the scenes, a new server is initialized and added to the load balancer, and old servers are removed and destroyed without interruption to the user. <br><br>The load balancer also allows instantiating multiple OTP servers on large deployments. (You can start, add, or remove more than one OTP server to the load balancer.)

## Load Balancer Properties

(Applies to Data Tools versions prior to October 2019.)
(Applies to TRANSIT-data-tools versions prior to October 2019.)

| Property | Description |
|----------|-------------|
Expand Down
4 changes: 2 additions & 2 deletions docs/user/deploying-feeds.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Assumptions:

* [X] You have [loaded a GTFS feed into a project](./managing-projects-feeds.md).
* [X] You have a deployment server available [(example: AWS)](./add-deployment-server.md).
* [X] [An osm-lib server has been set up](https://github.com/conveyal/osm-lib) for Data Tools to fetch Open Streets Map (OSM) data.
* [X] [An osm-lib server has been set up](https://github.com/conveyal/osm-lib) for TRANSIT-data-tools to fetch Open Streets Map (OSM) data.

## Executing a deployment

Expand Down Expand Up @@ -32,7 +32,7 @@ The pane also has an option to upload Custom POI CSV files. These files contain

## Watching deployments take place

After you click on `Deploy`, you can watch the deployment progress from the right-hand panel:
After you click `Deploy`, you can watch the deployment progress from the right-hand panel:

1. The data bundle is uploaded to S3.
2. One EC2 server is commissioned.
Expand Down
20 changes: 10 additions & 10 deletions docs/user/editor/patterns.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# Trip Patterns

### Patterns
## Patterns
Patterns refer to the recurring schedules and frequencies of transit trips. They can be thought of as a template for a particular route, indicating the days of the week and times of day that trips will be available, as well as the frequency of service during those periods.

## Editing/Creating Trip Patterns

To begin editing trip patterns, first click the `Routes` tab (outlined in red). Then, select or create a route Click the `Trip patterns` tab, and start editing any relevant fields including:
To begin editing trip patterns, first click the `Routes` tab (outlined in red). Then, click or create a route Click the `Trip patterns` tab, and start editing any relevant fields including:

<!-- TODO: add transitwand to GTFS Editor -->
<!-- - Transitwand id (optional) – the trip pattern can be imported from a Transitwand route trace, if you have one enter the phone id here and click the ‘Load from Transitwand’ box. -->
- **Name:** the name of the pattern within the route, for example: "27 stops from Willowridge Rd at Richgrove Dr to Kipling Station (268 trips)"
- **Type:** specify whether the pattern uses timetables or schedules. For more information on the differences between schedules and timetables, consult [Schedules](schedules.md)
- **Direction:** specify whether the pattern is inbound or outbound. This corresponds to the `direction_id` field in GTFS. All trips associated with this pattern will be assigned the direction provided here.
- **Name:** The name of the pattern within the route is initially set by default to a designation like "27 stops from Willowridge Rd at Richgrove Dr to Kipling Station (13 trips)." However, it can be customized to a more meaningful label if desired.
- **Type:** Specifies whether the pattern uses timetables or schedules. For more information on the differences between schedules and timetables, consult [Schedules](schedules.md).
- **Direction:** Specifies whether the pattern is inbound or outbound. This corresponds to the `direction_id` field in GTFS. All trips associated with this pattern will be assigned the direction provided here.
- **Editing schedules:**
Click `Edit schedules` to begin creating or editing trips/frequencies for a trip pattern. You will be redirected to the Schedule Editor. For more information on creating schedules for a pattern, see [Trips](schedules).

To add a pattern, select the `+ New pattern` button (highlighted in yellow).
To add a pattern, click the `+ New pattern` button (highlighted in yellow).

![edit-pattern](https://datatools-builds.s3.amazonaws.com/docs/patterns/edit-pattern.png)

Expand All @@ -27,17 +27,17 @@ The pattern toolbar contains several helpful buttons to help with the pattern ed
- **Zoom to pattern extents:**
Clicking the search (🔍) button (in the top toolbar) with a pattern selected adjusts the map view to show the entire pattern you are editing.
- **Duplicating pattern:**
Used to create a similar, but different trip pattern. When duplicating of the active pattern, it's name becomes `[Pattern name] copy`.
Used to create a similar, but different trip pattern. When duplicating of the active pattern, its name becomes `[Pattern name] copy`.
- **Reverse pattern:**
To reverse the sequence of stops for a pattern, click the button with opposing arrows. Note: this is a destructive action and should usually only be used after duplicating a pattern.
- **Delete pattern:** Deletes the active pattern. Note: deleted patterns cannot be recovered.


## Stop sequence
### Adding stops
To start creating a pattern, click on the `+ Add stop` button. From here, zoom in on the map and add stops by clicking on them and clicking the green plus symbol: `+`.
To start creating a pattern, click the `+ Add stop` button. From here, zoom in on the map and add stops by clicking on them and clicking the green plus symbol: `+`.

Alternatively, scroll to the end of the stop sequence and select `+ Add stop by name` which will provide a dropdown of options to select from. From there, you'll have the option to add the stop to the end or to the beginning of the pattern.
Alternatively, scroll to the end of the stop sequence and click `+ Add stop by name` which will provide a dropdown of options to click from. From there, you'll have the option to add the stop to the end or to the beginning of the pattern.

<img src="https://datatools-builds.s3.amazonaws.com/docs/patterns/pattern-add-stop.png" style="box-shadow: 3px 3px 3px gray; border-radius: 10px;">

Expand Down Expand Up @@ -135,7 +135,7 @@ There are a few different editing modes that allow for the quick and easy creati
- **Add stop at interval:** At each click on the map, stops are generated along the auto-generated pattern extended to the map click at the user-defined spacing interval from 100 to 2000 meters.
- **Add stop at intersection:** (experimental, not available in all regions) - at each click on the map, stops are generated along the auto-generated pattern extended to the map click according to the user-defined parameters:
- **Offset from intersection:** Distance the stop should be placed from the intersection
- **Before/after:** Whether stop should be placed before or after intersection
- **Before/after:** Whether the stop should be placed before or after intersection
- **Every *n* intersections:** The number of intersections at which each new stop should be placed

**Note**: the last three advanced editing modes should only be used when creating routes in new areas where stops don't already exist.
Expand Down
8 changes: 4 additions & 4 deletions docs/user/editor/schedules.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Timetable-based routes follow a fixed schedule in which the start time, end time
Unlike the fixed nature of timetable-based trips, frequency-based trips run at regular intervals, with a fixed amount of time between consecutive trips. Frequency-based service offers more flexibility and easier adjustment to changing demand. Visit [GTFS specification frequency reference](https://gtfs.org/schedule/reference/#frequenciestxt) for more information.

## Editing/Creating Calendars
To start editing a calendar, click on `+ Create first calendar` if this is the first calendar being added or click on an existing calendar to begin adding/editing its properties which include:
To start editing a calendar, click `+ Create first calendar` if this is the first calendar being added or click an existing calendar to begin adding/editing its properties which include:

- **Service ID:** Unique ID for the calendar
- **Description:** Optional description for calendar (defaults to initial days of week specified)
Expand All @@ -38,7 +38,7 @@ To start editing a calendar, click on `+ Create first calendar` if this is the f
<br>

## Editing/Creating Exceptions
To start editing an exception, select any existing exception (if applicable) on the left pane. You will be able to edit properties such as exception name, customize the exception type, select calendars to add, remove or swap and the time range the exception is applied to. To make a new exception, click on `New exception` on the top left of the pane (highlighted in yellow).
To start editing an exception, click any existing exception (if applicable) on the left pane. You will be able to edit properties such as exception name, customize the exception type, click calendars to add, remove or swap and the time range the exception is applied to. To make a new exception, click `New exception` on the top left of the pane (highlighted in yellow).

<img src="https://datatools-builds.s3.amazonaws.com/docs/schedules/new-exception.png" style="box-shadow: 3px 3px 3px gray; border-radius: 10px; width: 600px;">

Expand Down Expand Up @@ -72,7 +72,7 @@ There are a number of built-in exception types (or available schedules to run) t
## Editing/Creating Timetables
To begin editing a timetable, click the `Edit schedules` button in the top left corner of the screen (highlighed in yellow).

(Alternatively, if you are in the `Routes` tab (see [Routes](/user/editor/routes/)), select an existing route or route click the `New route` button --> select the `Trip patterns` tab --> select a pattern --> select `Use timetables` in the `Type:` dropdown --> select the `Edit schedules` button)
(Alternatively, if you are in the `Routes` tab (see [Routes](/user/editor/routes/)), click an existing route or route click the `New route` button --> click the `Trip patterns` tab --> select a pattern --> click `Use timetables` in the `Type:` dropdown --> click the `Edit schedules` button)

<img src="https://datatools-builds.s3.amazonaws.com/docs/schedules/edit-schedules.png" style="box-shadow: 3px 3px 3px gray; border-radius: 10px; width: 600px;">

Expand Down Expand Up @@ -146,7 +146,7 @@ The following video demonstrates the creation and editing of timetables describe

<br>
## Editing/Creating Frequencies
To edit/create frequencies, navigate to the `Routes` tab (see [Routes](/user/editor/routes/)), select an existing route or route click the `New route` button --> select the `Trip patterns` tab --> select a pattern --> select `Use frequencies` in the 'Type:` dropdown --> select the `Edit schedules` button
To edit/create frequencies, navigate to the `Routes` tab (see [Routes](/user/editor/routes/)), click an existing route or route click the `New route` button --> click the `Trip patterns` tab --> click a pattern --> click `Use frequencies` in the 'Type:` dropdown --> click the `Edit schedules` button

Frequency details include:

Expand Down
Loading

0 comments on commit eddec9a

Please sign in to comment.