Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update OTP to 2.5, update to latest planet data. #344

Merged
merged 2 commits into from
Apr 8, 2024
Merged

Update OTP to 2.5, update to latest planet data. #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba062bb
bump planet version
michaelkirk Apr 3, 2024
02cc556
update opentripplanner
michaelkirk Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,9 +507,7 @@ gtfs-build:
##############################

otp-base:
# The version tag is ignored when sha256 is specified, but I'm leaving it
# in to document which "release" our sha pins to.
FROM opentripplanner/opentripplanner:2.3.0@sha256:630779e4b595462502b3813c1d6141da3e180d266d4a26371cc4ab6cb3390db0
FROM opentripplanner/opentripplanner:2.5.0

RUN mkdir /var/opentripplanner

Expand Down
6 changes: 5 additions & 1 deletion bin/_headway_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@
# A bump in the DATA tag pretty much always implies a bump in the CONTAINER
# tag, but not necessarily vice-versa.

export HEADWAY_DATA_TAG=0.8.0
export HEADWAY_DATA_TAG=0.9.0

# # Schema change Log
#
# ## DATA v0.9.0, CONTAINER v0.11.0
#
# BREAKING DATA/CONTAINER: Updated OTP to 2.5.0
#
# ## DATA v0.8.0, CONTAINER v0.10.0
#
# BREAKING DATA: pelias is now on es8
Expand Down
2 changes: 1 addition & 1 deletion builds/planet/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export HEADWAY_PLANET_VERSION=v1.42
export HEADWAY_PLANET_VERSION=v1.43
export HEADWAY_AREA=maps-earth-planet-${HEADWAY_PLANET_VERSION}
export HEADWAY_AREA_TAG="$HEADWAY_AREA"
export HEADWAY_COUNTRIES="ALL"
Expand Down
14 changes: 7 additions & 7 deletions k8s/configs/planet-dev/deployment-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ kind: ConfigMap
metadata:
name: deployment-config
data:
area: maps-earth-planet-v1.42
area: maps-earth-planet-v1.43
public-url: https://maps.earth
bbox: ""
enable-transit-routing: "1"
www-about-url: "https://about.maps.earth"
www-about-link-text: "About maps.earth"
www-contact-url: "mailto:[email protected]?subject=Hello,%20Earth"
www-contact-link-text: "Contact Us"
terrain-source-url: https://data.example.com/0.8.0/terrain.mbtiles
landcover-source-url: https://data.example.com/0.8.0/landcover.mbtiles
areamap-source-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.mbtiles
valhalla-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.valhalla.tar.zst
placeholder-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.placeholder.tar.zst
elasticsearch-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.elasticsearch.tar.zst
terrain-source-url: https://data.example.com/0.9.0/terrain.mbtiles
landcover-source-url: https://data.example.com/0.9.0/landcover.mbtiles
areamap-source-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.mbtiles
valhalla-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.valhalla.tar.zst
placeholder-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.placeholder.tar.zst
elasticsearch-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.elasticsearch.tar.zst
pelias-config-json: |
{
"logger": {
Expand Down
2 changes: 1 addition & 1 deletion k8s/configs/planet-dev/opentripplanner-barcelona-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: ConfigMap
metadata:
name: otp-barcelona-config
data:
graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/Barcelona.graph.obj.zst
graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/Barcelona.graph.obj.zst
router-config-json: ""

2 changes: 1 addition & 1 deletion k8s/configs/planet-dev/opentripplanner-losangeles-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: ConfigMap
metadata:
name: otp-losangeles-config
data:
graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/LosAngeles.graph.obj.zst
graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/LosAngeles.graph.obj.zst
router-config-json: ""

2 changes: 1 addition & 1 deletion k8s/configs/planet-dev/opentripplanner-pugetsound-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ConfigMap
metadata:
name: otp-pugetsound-config
data:
graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/PugetSound.graph.obj.zst
graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/PugetSound.graph.obj.zst
router-config-json: |
{
"configVersion": "2023-05-24",
Expand Down
14 changes: 7 additions & 7 deletions k8s/configs/planet/deployment-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ kind: ConfigMap
metadata:
name: deployment-config
data:
area: maps-earth-planet-v1.42
area: maps-earth-planet-v1.43
public-url: https://maps.earth
bbox: ""
enable-transit-routing: "1"
www-about-url: "https://about.maps.earth"
www-about-link-text: "About maps.earth"
www-contact-url: "mailto:[email protected]?subject=Hello,%20Earth"
www-contact-link-text: "Contact Us"
terrain-source-url: https://data.example.com/0.8.0/terrain.mbtiles
landcover-source-url: https://data.example.com/0.8.0/landcover.mbtiles
areamap-source-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.mbtiles
valhalla-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.valhalla.tar.zst
placeholder-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.placeholder.tar.zst
elasticsearch-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.elasticsearch.tar.zst
terrain-source-url: https://data.example.com/0.9.0/terrain.mbtiles
landcover-source-url: https://data.example.com/0.9.0/landcover.mbtiles
areamap-source-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.mbtiles
valhalla-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.valhalla.tar.zst
placeholder-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.placeholder.tar.zst
elasticsearch-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.elasticsearch.tar.zst
pelias-config-json: |
{
"logger": {
Expand Down
2 changes: 1 addition & 1 deletion k8s/configs/planet/opentripplanner-barcelona-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: ConfigMap
metadata:
name: otp-barcelona-config
data:
graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/Barcelona.graph.obj.zst
graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/Barcelona.graph.obj.zst
router-config-json: ""

2 changes: 1 addition & 1 deletion k8s/configs/planet/opentripplanner-losangeles-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: ConfigMap
metadata:
name: otp-losangeles-config
data:
graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/LosAngeles.graph.obj.zst
graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/LosAngeles.graph.obj.zst
router-config-json: ""

2 changes: 1 addition & 1 deletion k8s/configs/planet/opentripplanner-pugetsound-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ConfigMap
metadata:
name: otp-pugetsound-config
data:
graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/PugetSound.graph.obj.zst
graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/PugetSound.graph.obj.zst
router-config-json: |
{
"updaters": [
Expand Down
Loading