Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2…
Browse files Browse the repository at this point in the history
…024-09-23
  • Loading branch information
leonardehrenfried committed Sep 23, 2024
2 parents 782f4bb + c022422 commit eca1586
Show file tree
Hide file tree
Showing 53 changed files with 1,741 additions and 510 deletions.
2 changes: 2 additions & 0 deletions doc/user/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
## 2.7.0-SNAPSHOT (under development)

- Extra leg when transferring at the same stop [#5984](https://github.com/opentripplanner/OpenTripPlanner/pull/5984)
- Filter vector tiles stops by current service week [#6003](https://github.com/opentripplanner/OpenTripPlanner/pull/6003)
- Add a matcher API for filters in the transit service used for datedServiceJourneyQuery [#5713](https://github.com/opentripplanner/OpenTripPlanner/pull/5713)
[](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)

## 2.6.0 (2024-09-18)
Expand Down
56 changes: 56 additions & 0 deletions doc/user/examples/ibi/portland/router-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,62 @@
"url": "https://gbfs.spin.pm/api/gbfs/v2/portland"
}
],
"vectorTiles": {
"basePath": "/rtp/routers/default/vectorTiles",
"attribution": "<a href='https://trimet.org/mod'>Regional Partners</a>",
"layers": [
{
"name": "stops",
"type": "Stop",
"mapper": "Digitransit",
"maxZoom": 20,
"minZoom": 14,
"cacheMaxSeconds": 600,
"filter": "sunday-to-sunday-service-week"
},
{
"name": "areaStops",
"type": "AreaStop",
"mapper": "OTPRR",
"maxZoom": 30,
"minZoom": 8,
"cacheMaxSeconds": 600
},
{
"name": "stations",
"type": "Station",
"mapper": "Digitransit",
"maxZoom": 20,
"minZoom": 2,
"cacheMaxSeconds": 600
},
{
"name": "rentalVehicles",
"type": "VehicleRentalVehicle",
"mapper": "Digitransit",
"maxZoom": 20,
"minZoom": 2,
"cacheMaxSeconds": 60
},
{
"name": "rentalStations",
"type": "VehicleRentalStation",
"mapper": "Digitransit",
"maxZoom": 20,
"minZoom": 2,
"cacheMaxSeconds": 600
},
{
"name": "vehicleParking",
"type": "VehicleParking",
"mapper": "Digitransit",
"maxZoom": 20,
"minZoom": 10,
"cacheMaxSeconds": 60,
"expansionFactor": 0.25
}
]
},
"rideHailingServices": [
{
"type": "uber-car-hailing",
Expand Down
13 changes: 13 additions & 0 deletions doc/user/sandbox/MapboxVectorTilesApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ For each layer, the configuration includes:
|       type = "stop" | `enum` | Type of the layer. | *Required* | | 2.0 |
|       [cacheMaxSeconds](#vectorTiles_layers_0_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 |
|       [expansionFactor](#vectorTiles_layers_0_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 |
|       [filter](#vectorTiles_layers_0_filter) | `enum` | Reduce the result set of a layer further by a specific filter. | *Optional* | `"none"` | 2.6 |
|       [mapper](#vectorTiles_layers_0_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 |
|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 |
|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 |
Expand Down Expand Up @@ -245,6 +246,18 @@ How far outside its boundaries should the tile contain information.

The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number.

<h4 id="vectorTiles_layers_0_filter">filter</h4>

**Since version:** `2.6`**Type:** `enum`**Cardinality:** `Optional`**Default value:** `"none"`
**Path:** /vectorTiles/layers/[0]
**Enum values:** `none` | `sunday-to-sunday-service-week`

Reduce the result set of a layer further by a specific filter.

This is useful for when the schema of a layer, say stops, should remain unchanged but some
elements should not be included in the result.


<h4 id="vectorTiles_layers_0_mapper">mapper</h4>

**Since version:** `2.0`**Type:** `string`**Cardinality:** `Required`
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.5</version>
<version>3.2.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
Loading

0 comments on commit eca1586

Please sign in to comment.