Skip to content

Commit

Permalink
Translation japanese 2024 09 30 (#531)
Browse files Browse the repository at this point in the history
* fixed search index filter script (#525)

1. fixed path where to find the index
2. Added counter to see how much was removed.
3. Added safeguard for file not found.

* Fixed typo

maintaned -> maintained

* Fixed incorrect URL for 1-Click

See #386

* Changes to GTFS-Flex page (#526)

* Update flex.md

* Update flex.md

* Update flex.md

* Added missing redirection...

...tested and working, already on the webserver

* Fix anchors and translations (ES) on Features Overview (#527)

* Update OneBusAway merge tool link (#528)

* Enabled automatic triggering of workflow

* [Monthly update] September 2024 (#529)

* Update ES Schedule Reference

* Update EN Revision history

* Update ES reference

* Update ES revision history

* Update FR reference

* Fix formatting issue on ES Schedule Reference

* Update FR revision history

* Fix typo in pathways.md (#530)

* Translation & corrections

* Update mkdocs.yml for Japanese

* Update mkdocs.yml

* Fix box formatting in features overview

* Fixed typo

* Translation & fixes

* Fixed typo

* Added assets folder

* Final fixes

* Fix formatting for shapes feature

* Fix formatting issues in Schedule Reference

* Update reference.md

* Fix broken links in flex example page

* Fix format for Schedule recent additions page

---------

Co-authored-by: Elias Gino Cripotos <[email protected]>
Co-authored-by: Sergio Delgado Rodriguez <[email protected]>
Co-authored-by: Sergio Delgado Rodriguez <[email protected]>
  • Loading branch information
4 people authored Oct 3, 2024
1 parent a88a01e commit d440c64
Show file tree
Hide file tree
Showing 94 changed files with 5,707 additions and 4,857 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/prod_push_update_to_server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: Update website on server
# Controls when the action will run. Workflow runs when manually triggered using the UI or API.
on:
workflow_dispatch:
# push:
# branches:
# - main
# paths-ignore:
# - 'README.md'
# - 'LICENSE'
# - '.gitignore'
# - '.github/**'
push:
branches:
- main
paths-ignore:
- 'README.md'
- 'LICENSE'
- '.gitignore'
- '.github/**'

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
1 change: 1 addition & 0 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
RewriteEngine On

# Redirect rules using regex
RedirectMatch 301 ^/reference/static/?$ /documentation/schedule/reference/
RedirectMatch 301 ^/schedule/reference/?$ /documentation/schedule/reference/
RedirectMatch 301 ^/schedule/best-practices/?$ /documentation/schedule/schedule_best_practices/
RedirectMatch 301 ^/schedule/example-feed/?$ /getting_started/example_feed/
Expand Down
3 changes: 2 additions & 1 deletion docs/en/community/extensions/flex.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Visit the Pull Request page to read the full post and contribute to the conversa
- [Vamos Mobility App](https://vamosmobileapp.com/)
- [RTD Denver Flexride](https://www.rtd-denver.com/services/flexride)
- [Nebraska Public Transit DRT OTP Project: Trillium, Olsson, Cambridge Systematics, and TransitPlus](https://trips.nebraskatransit.com/#/)
- [One-Call/One-Click project: Find a Ride's Trip planner](https://www.findaride.org/tripplanner)

Contact us to add your GTFS-Flex implementation to this page

Expand All @@ -64,7 +65,7 @@ Contact us to add your GTFS-Flex implementation to this page
## Adoption tracker
### Current

<iframe class="airtable-embed" src="https://airtable.com/embed/shrUPyCZWOWrvO2mX?backgroundColor=purple&viewControls=on" frameborder="0" onmousewheel="" width="100%" height="533" style="background: transparent; border: 1px solid #ccc;"></iframe>
<iframe class="airtable-embed" src="https://airtable.com/embed/appopXWyO2ne6THIw/shrUPyCZWOWrvO2mX?backgroundColor=purple" frameborder="0" onmousewheel="" width="100%" height="533" style="background: transparent; border: 1px solid #ccc;"></iframe>

[Request a change](https://airtable.com/shrcac1fXUrMxfoDV){ .md-button .md-button--primary }
[Add your organization (consumers)](https://airtable.com/shrgnVR5Su9tkHvUv){ .md-button .md-button--primary }
Expand Down
2 changes: 1 addition & 1 deletion docs/en/documentation/realtime/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ Congestion level that is affecting this vehicle.
| **CONGESTION** |
| **SEVERE_CONGESTION** |

### _enum OccupancyStatus_
### _enum_ OccupancyStatus

The state of passenger occupancy for the vehicle or carriage.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

### Revision History

#### September 2024
* Clarify presence and use of from/to_stop_id & from/to_trip_id fields in transfers.txt. See [discussion](https://github.com/google/transit/pull/455).
* Added validity rules for polygons in GeoJSON files. See [discussion](https://github.com/google/transit/pull/476)

#### August 2024
* Change stops.txt presence because of demand responsive services. See [discussion](https://github.com/google/transit/pull/472).
* Clarify intended use for timepoint in stop_times.txt. See [discussion](https://github.com/google/transit/pull/474).
Expand Down
9 changes: 5 additions & 4 deletions docs/en/documentation/schedule/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -633,12 +633,12 @@ For a given ordered pair of arriving trip and departing trip, the transfer with

| Field Name | Type | Presence | Description |
| ------ | ------ | ------ | ------ |
| `from_stop_id` | Foreign ID referencing `stops.stop_id` | **Conditionally Required** | Identifies a stop or station where a connection between routes begins. If this field refers to a station, the transfer rule applies to all its child stops. Refering to a station is forbiden for `transfer_types` 4 and 5. |
| `to_stop_id` | Foreign ID referencing `stops.stop_id` | **Conditionally Required** | Identifies a stop or station where a connection between routes ends. If this field refers to a station, the transfer rule applies to all child stops. Refering to a station is forbiden for `transfer_types` 4 and 5. |
| `from_stop_id` | Foreign ID referencing `stops.stop_id` | **Conditionally Required** | Identifies a stop (`location_type=0`) or a station (`location_type=1`) where a connection between routes begins. If this field refers to a station, the transfer rule applies to all its child stops. It must refer to a stop (`location_type=0`) if `transfer_type` is `4` or `5`.<br><br>Conditionally Required:<br>- **Required** if `transfer_type` is `1`, `2`, or `3`.<br>- Optional if `transfer_type` is `4` or `5`. |
| `to_stop_id` | Foreign ID referencing `stops.stop_id` | **Conditionally Required** | Identifies a stop (`location_type=0`) or a station (`location_type=1`) where a connection between routes ends. If this field refers to a station, the transfer rule applies to all child stops. It must refer to a stop (`location_type=0`) if `transfer_type` is 4 or 5.<br><br>Conditionally Required:<br>- **Required** if `transfer_type` is `1`, `2`, or `3`.<br>- Optional if `transfer_type` is `4` or `5`. |
| `from_route_id` | Foreign ID referencing `routes.route_id` | Optional | Identifies a route where a connection begins.<br><br>If `from_route_id` is defined, the transfer will apply to the arriving trip on the route for the given `from_stop_id`.<br><br>If both `from_trip_id` and `from_route_id` are defined, the `trip_id` must belong to the `route_id`, and `from_trip_id` will take precedence. |
| `to_route_id` | Foreign ID referencing `routes.route_id` | Optional | Identifies a route where a connection ends.<br><br>If `to_route_id` is defined, the transfer will apply to the departing trip on the route for the given `to_stop_id`.<br><br>If both `to_trip_id` and `to_route_id` are defined, the `trip_id` must belong to the `route_id`, and `to_trip_id` will take precedence. |
| `from_trip_id` | Foreign ID referencing `trips.trip_id` | **Conditionally Required** | Identifies a trip where a connection between routes begins.<br><br>If `from_trip_id` is defined, the transfer will apply to the arriving trip for the given `from_stop_id`.<br><br>If both `from_trip_id` and `from_route_id` are defined, the `trip_id` must belong to the `route_id`, and `from_trip_id` will take precedence. REQUIRED if `transfer_type` is `4` or `5`. |
| `to_trip_id` | Foreign ID referencing `trips.trip_id` | **Conditionally Required** | Identifies a trip where a connection between routes ends.<br><br>If `to_trip_id` is defined, the transfer will apply to the departing trip for the given `to_stop_id`.<br><br>If both `to_trip_id` and `to_route_id` are defined, the `trip_id` must belong to the `route_id`, and `to_trip_id` will take precedence. REQUIRED if `transfer_type` is `4` or `5`. |
| `from_trip_id` | Foreign ID referencing `trips.trip_id` | **Conditionally Required** | Identifies a trip where a connection between routes begins.<br><br>If `from_trip_id` is defined, the transfer will apply to the arriving trip for the given `from_stop_id`.<br><br>If both `from_trip_id` and `from_route_id` are defined, the `trip_id` must belong to the `route_id`, and `from_trip_id` will take precedence.<br><br>Conditionally Required:<br>- **Required** if `transfer_type` is `4` or `5`. <br>- Optional otherwise. |
| `to_trip_id` | Foreign ID referencing `trips.trip_id` | **Conditionally Required** | Identifies a trip where a connection between routes ends.<br><br>If `to_trip_id` is defined, the transfer will apply to the departing trip for the given `to_stop_id`.<br><br>If both `to_trip_id` and `to_route_id` are defined, the `trip_id` must belong to the `route_id`, and `to_trip_id` will take precedence. <br><br>Conditionally Required:<br>- **Required** if `transfer_type` is `4` or `5`. <br>- Optional otherwise. |
| `transfer_type` | Enum | **Required** | Indicates the type of connection for the specified (`from_stop_id`, `to_stop_id`) pair. Valid options are:<br><br> `0` or empty - Recommended transfer point between routes.<br>`1` - Timed transfer point between two routes. The departing vehicle is expected to wait for the arriving one and leave sufficient time for a rider to transfer between routes.<br>`2` - Transfer requires a minimum amount of time between arrival and departure to ensure a connection. The time required to transfer is specified by `min_transfer_time`.<br>`3` - Transfers are not possible between routes at the location.<br>`4` - Passengers can transfer from one trip to another by staying onboard the same vehicle (an "in-seat transfer"). More details about this type of transfer [below](#linked-trips). <br>`5` - In-seat transfers are not allowed between sequential trips. The passenger must alight from the vehicle and re-board. More details about this type of transfer [below](#linked-trips). |
| `min_transfer_time` | Non-negative integer | Optional | Amount of time, in seconds, that must be available to permit a transfer between routes at the specified stops. The `min_transfer_time` should be sufficient to permit a typical rider to move between the two stops, including buffer time to allow for schedule variance on each route. |

Expand Down Expand Up @@ -747,6 +747,7 @@ File: **Optional**
Defines zones where riders can request either pickup or drop off by on-demand services. These zones are represented as GeoJSON polygons.

- This file uses a subset of the GeoJSON format, described in [RFC 7946](https://tools.ietf.org/html/rfc7946).
- Each polygon must be valid by the definition of the [OpenGIS Simple Features Specification, section 6.1.11](http://www.opengis.net/doc/is/sfa/1.2.1).
- The `locations.geojson` file must contain a `FeatureCollection`.
- A `FeatureCollection` defines various stop locations where riders may request pickup or drop off.
- Every GeoJSON `Feature` must have an `id`. The `id` must be unique across all `stops.stop_id`, locations.geojson `id`, and `location_group_id` values.
Expand Down
2 changes: 1 addition & 1 deletion docs/en/getting_started/features/fares.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Route-Based Fares is used to assign different fares for specific groups of route
|----------------------------------|-------------------|
|[routes.txt](../../../documentation/schedule/reference/#routestxt)|`network_id`|
|[fare_leg_rules.txt](../../../documentation/schedule/reference/#fare_leg_rulestxt)|`fare_product_id`, `network_id`|
|[netowrks.txt](../../../documentation/schedule/reference/#networkstxt)|`network_id`, `network_name`|
|[networks.txt](../../../documentation/schedule/reference/#networkstxt)|`network_id`, `network_name`|
|[route_networks.txt](../../../documentation/schedule/reference/#route_networkstxt)|`network_id`, `route_id`|

**Prerequisites**:
Expand Down
2 changes: 1 addition & 1 deletion docs/en/getting_started/features/pathways.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# :material-escalator: Pathways

Pathways features can model large transit stations, guiding riders from station entrances and exists to the location where they board or disambark from a transit vehicle. Some of these features make it possible to communicate a path's physical characteristics and estimated navigation time, and real-world wayfinding systems employed in stations.
Pathways features can model large transit stations, guiding riders from station entrances and exists to the location where they board or disembark from a transit vehicle. Some of these features make it possible to communicate a path's physical characteristics and estimated navigation time, and real-world wayfinding systems employed in stations.

## Pathway Connections

Expand Down
2 changes: 1 addition & 1 deletion docs/en/resources/apps.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Apps people use when taking transit.
- [Transit-Map](https://github.com/vasile/transit-map) - Web app that animates vehicles (markers) on a map using the public transport timetables to interpolate their positions along the routes (polylines).
- [Transitive.js](https://github.com/conveyal/transitive.js) - Creates a customizable web map layer of transit routes using Leaflet or D3.
- [Google I/O Transport Tracker](https://github.com/googlemaps/transport-tracker) - Shows shuttle arrival times for Google I/O conference, based on the open-source [transport-tracker project](https://github.com/googlemaps/transport-tracker). Note: To implement this yourself, you need a [Google Maps APIs Premium Plan license](https://developers.google.com/maps/pricing-and-plans/).
- [~~1-Click~~](http://camsys.software/products/1-click) - A virtual “trip aggregator” that assembles information on a wide variety of available modes: public transit, private, rail, rideshare, carpool, volunteer, paratransit, and walking and biking. Open-source [on GitHub](https://github.com/camsys/oneclick).
- [1-Click](https://camsys.software/platforms/1-click) - A virtual “trip aggregator” that assembles information on a wide variety of available modes: public transit, private, rail, rideshare, carpool, volunteer, paratransit, and walking and biking. Open-source [on GitHub](https://github.com/camsys/oneclick).
- [Bustime](https://busti.me) - Public transport real-time monitoring with WebSocket updates. Open-source [on GitHub](https://github.com/norn/bustime).
- [Transit Tracker](https://transittracker.ca/#/) - Realtime vehicle position for Greater Montreal & Toronto, Canada
- [GTFS Builder](http://nationalrtap.org/Web-Apps/GTFS-Builder) - A free web-based application to help you create GTFS files. Maintained by the National Rural Transit Assistance Program (RTAP).
Expand Down
2 changes: 1 addition & 1 deletion docs/en/resources/gtfs.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Converters from various static schedule formats to and from GTFS.
## GTFS Merge Tools
- [combine_gtfs_feeds](https://github.com/psrc/combine_gtfs_feeds) - A Python tool to combine multiple gtfs feeds into one feed/dataset.
- [GTFS Kit](https://github.com/mrcagney/gtfs_kit) - A Python 3.8+ tool kit for analyzing and merging General Transit Feed Specification (GTFS) data. [Info on how to aggregate and clean feeds provided here](https://mrcagney.github.io/gtfs_kit_docs/index.html#module-gtfs_kit.cleaners).
- [~~onebusaway-gtfs-merge-cli~~](http://developer.onebusaway.org/modules/onebusaway-gtfs-modules/1.3.94/onebusaway-gtfs-merge-cli.html) - A command line tool for merging GTFS feeds. Info provided at the link on how the tool detects and merges duplicate IDs.
- [onebusaway-gtfs-merge-cli](https://github.com/OneBusAway/onebusaway-gtfs-modules/) - A command line tool for merging GTFS feeds. Info provided at the link on how the tool detects and merges duplicate IDs.
- [Transitfeed merge function](https://github.com/google/transitfeed/wiki/Merge) - A Python library with a function to merge two different GTFS feeds.
- [gtfsmerge](https://github.com/now8-org/gtfsmerge) - A Python Script to merge GTFS ZIP archives into one.

Expand Down
2 changes: 1 addition & 1 deletion docs/en/resources/multimodal.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- [General Bikeshare Feed Specification (GBFS)](https://github.com/NABSA/gbfs) - Open data standard for real-time bikeshare information developed by members of the [North American Bikeshare Association (NABSA)](http://nabsa.net/).
- [gbfs-validator](https://github.com/PierrickP/gbfs-validator) - 3rd party tool to validate GBFS feeds.
- [gbfs R package](https://github.com/ds-civic-data/gbfs) - Functions to interface with GBFS feeds in R, allowing users to save and accumulate tidy .rds datasets for specified cities/bikeshare programs.
- [GBFS Documentation Platform](https://gbfs.mobilitydata.org/) - Documentation platform for the General Bikeshare Feed Specification, maintaned by [MobilityData](https://mobilitydata.org/). View the GBFS specification, change proposals, policy guides, and technical tools.
- [GBFS Documentation Platform](https://gbfs.mobilitydata.org/) - Documentation platform for the General Bikeshare Feed Specification, maintained by [MobilityData](https://mobilitydata.org/). View the GBFS specification, change proposals, policy guides, and technical tools.
- [GTFS-flex](https://github.com/MobilityData/gtfs-flex) - A data format that models flexible public transportation services as an extension to GTFS.
- [GTFS-plus](https://github.com/osplanning-data-standards/GTFS-PLUS) - A GTFS-based transit network format for *vehicle and capacity data* suitable for dynamic transit modeling developed by Puget Sound Regional Council, UrbanLabs LLC, LMZ LLC, and San Francisco County Transportation Authority.
- [GTFS-ride](https://github.com/ODOT-PTS/GTFS-ride) - An open, fixed-route transit ridership data standard developed through a partnership between the Oregon Department of Transportation and Oregon State University.
Expand Down
7 changes: 4 additions & 3 deletions docs/es/community/extensions/flex.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ Visite la página Pull Request para leer la publicación completa y contribuir a
- [Alianza de tránsito del noroeste de Oregón (NW Connector)](https://nwconnector.org/other-services/)
- [Aplicación Vamos Mobility](https://vamosmobileapp.com/)
- [RTD Denver Flexride](https://www.rtd-denver.com/services/flexride)
- [Proyecto OTP DRT de transporte público de Nebraska: Trillium, Olsson, Cambridge Systematics y TransitPlus](https://trips.nebraskatransit.com/#/)
- [Proyecto OTP DRT de transporte público de Nebraska: Trillium, Olsson, Cambridge Systematics y TransitPlus](https://trips.nebraskatransit.com/#/)
- [Proyecto One-Call/One-Click: Planificador de viajes Find a Ride](https://www.findaride.org/tripplanner)

Contáctenos para agregar su implementación GTFS-Flex a esta página

Expand All @@ -64,7 +65,7 @@ Contáctenos para agregar su implementación GTFS-Flex a esta página

### Actual

<iframe class="airtable-embed" src="https://airtable.com/embed/shrUPyCZWOWrvO2mX?backgroundColor=purple&viewControls=on" frameborder="0" onmousewheel="" width="100%" height="533" style="background: transparent; border: 1px solid#ccc;"></iframe>
<iframe class="airtable-embed" src="https://airtable.com/embed/appopXWyO2ne6THIw/shrUPyCZWOWrvO2mX?backgroundColor=purple" frameborder="0" onmousewheel="" width="100%" height="533" style="background: transparent; border: 1px solid #ccc;"></iframe>

[Solicitar un cambio](https://airtable.com/shrcac1fXUrMxfoDV){ .md-button .md-button--primary }
[Agregue su organización (consumidores)](https://airtable.com/shrgnVR5Su9tkHvUv){ .md-button .md-button--primary }
Expand All @@ -82,4 +83,4 @@ Contáctenos para agregar su implementación GTFS-Flex a esta página
- **Junio ​​de 2023**: <a href="https://mobilitydata.org/recap-mobilitydata-working-meeting-gtfs-flex-service-discovery/" target="_blank">Reunión de trabajo conceptual celebrada sobre GTFS-Flex</a>
- **Julio de 2023**: <a href="https://github.com/google/transit/pull/388" target="_blank">Pull request publicada n.º 388</a>
- **Agosto y septiembre de 2023**: <a href="https://github.com/google/transit/pull/388" target="_blank">Se celebraron debates sobre "¿GeoJSON en GTFS?"</a>
- **Marzo de 2024**: <a href="https://github.com/google/transit/pull/433" target="_blank">Se adoptó oficialmente GTFS Flex</a>
- **Marzo de 2024**: <a href="https://github.com/google/transit/pull/433" target="_blank">Se adoptó oficialmente GTFS Flex</a>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

### Historial de revisiones

#### Septiembre de 2024
* Aclarar la presencia y el uso de los campos from/to_stop_id y from/to_trip_id en transfers.txt. Ver [discusión](https://github.com/google/transit/pull/455).
* Se agregaron reglas de validez para polígonos en archivos GeoJSON. Ver [discusión](https://github.com/google/transit/pull/476)

#### Agosto de 2024
* Se modificó la presencia de stops.txt debido a los servicios bajo demanda. Ver [discusión](https://github.com/google/transit/pull/472).
* Se aclaró el uso previsto para el timepoint en stop_times.txt. Ver [discusión](https://github.com/google/transit/pull/474).
Expand Down
Loading

0 comments on commit d440c64

Please sign in to comment.