diff --git a/builds/planet/assemble-planet-pbf/src/main.rs b/builds/planet/assemble-planet-pbf/src/main.rs index 33aa3cb49..68063b957 100644 --- a/builds/planet/assemble-planet-pbf/src/main.rs +++ b/builds/planet/assemble-planet-pbf/src/main.rs @@ -183,8 +183,11 @@ mod distribution { Ok(child) => child, Err(err) => { if let std::io::ErrorKind::NotFound = err.kind() { - eprintln!("aria2c is missing. Install aria2c and try again."); + eprintln!("aria2c is missing. Install aria2c and try again: `apt install aria2c`"); + } else { + eprintln!("err running aria2c: {err:?}"); } + return Err(err.into()); } }; @@ -266,7 +269,7 @@ mod osmio { Ok(child) => child, Err(err) => { if let std::io::ErrorKind::NotFound = err.kind() { - eprintln!("osmium is missing. Install osmium and try again."); + eprintln!("osmium is missing. Install osmium and try again: `apt install osmium-tool`"); } return Err(err.into()); } diff --git a/builds/planet/env.sh b/builds/planet/env.sh index 3917e2647..e7cd7c02e 100644 --- a/builds/planet/env.sh +++ b/builds/planet/env.sh @@ -1,4 +1,4 @@ -export HEADWAY_PLANET_VERSION=v1.47 +export HEADWAY_PLANET_VERSION=v1.49 export HEADWAY_AREA=maps-earth-planet-${HEADWAY_PLANET_VERSION} export HEADWAY_AREA_TAG="$HEADWAY_AREA" export HEADWAY_COUNTRIES="ALL" diff --git a/k8s/configs/planet-dev/deployment-config.yaml b/k8s/configs/planet-dev/deployment-config.yaml index 08adeb520..b0e0d99a2 100644 --- a/k8s/configs/planet-dev/deployment-config.yaml +++ b/k8s/configs/planet-dev/deployment-config.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: deployment-config data: - area: maps-earth-planet-v1.47 + area: maps-earth-planet-v1.49 public-url: https://maps.earth bbox: "" enable-transit-routing: "1" @@ -13,10 +13,10 @@ data: www-contact-link-text: "Contact Us" 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.47/maps-earth-planet-v1.47.mbtiles - valhalla-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/maps-earth-planet-v1.47.valhalla.tar.zst - placeholder-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/maps-earth-planet-v1.47.placeholder.tar.zst - elasticsearch-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/maps-earth-planet-v1.47.elasticsearch.tar.zst + areamap-source-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/maps-earth-planet-v1.49.mbtiles + valhalla-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/maps-earth-planet-v1.49.valhalla.tar.zst + placeholder-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/maps-earth-planet-v1.49.placeholder.tar.zst + elasticsearch-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/maps-earth-planet-v1.49.elasticsearch.tar.zst pelias-config-json: | { "logger": { diff --git a/k8s/configs/planet-dev/opentripplanner-barcelona-config.yaml b/k8s/configs/planet-dev/opentripplanner-barcelona-config.yaml index 6b40c0ac3..9ecde4dd8 100644 --- a/k8s/configs/planet-dev/opentripplanner-barcelona-config.yaml +++ b/k8s/configs/planet-dev/opentripplanner-barcelona-config.yaml @@ -3,6 +3,6 @@ kind: ConfigMap metadata: name: otp-barcelona-config data: - graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/Barcelona.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/Barcelona.graph.obj.zst router-config-json: "" diff --git a/k8s/configs/planet-dev/opentripplanner-losangeles-config.yaml b/k8s/configs/planet-dev/opentripplanner-losangeles-config.yaml index ca6fccbd0..513fffcdd 100644 --- a/k8s/configs/planet-dev/opentripplanner-losangeles-config.yaml +++ b/k8s/configs/planet-dev/opentripplanner-losangeles-config.yaml @@ -3,6 +3,6 @@ kind: ConfigMap metadata: name: otp-losangeles-config data: - graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/LosAngeles.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/LosAngeles.graph.obj.zst router-config-json: "" diff --git a/k8s/configs/planet-dev/opentripplanner-pugetsound-config.yaml b/k8s/configs/planet-dev/opentripplanner-pugetsound-config.yaml index 989b3c76c..dbd66e1ee 100644 --- a/k8s/configs/planet-dev/opentripplanner-pugetsound-config.yaml +++ b/k8s/configs/planet-dev/opentripplanner-pugetsound-config.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: otp-pugetsound-config data: - graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/PugetSound.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/PugetSound.graph.obj.zst router-config-json: | { "configVersion": "2023-05-24", diff --git a/k8s/configs/planet/deployment-config.yaml b/k8s/configs/planet/deployment-config.yaml index 08adeb520..b0e0d99a2 100644 --- a/k8s/configs/planet/deployment-config.yaml +++ b/k8s/configs/planet/deployment-config.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: deployment-config data: - area: maps-earth-planet-v1.47 + area: maps-earth-planet-v1.49 public-url: https://maps.earth bbox: "" enable-transit-routing: "1" @@ -13,10 +13,10 @@ data: www-contact-link-text: "Contact Us" 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.47/maps-earth-planet-v1.47.mbtiles - valhalla-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/maps-earth-planet-v1.47.valhalla.tar.zst - placeholder-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/maps-earth-planet-v1.47.placeholder.tar.zst - elasticsearch-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/maps-earth-planet-v1.47.elasticsearch.tar.zst + areamap-source-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/maps-earth-planet-v1.49.mbtiles + valhalla-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/maps-earth-planet-v1.49.valhalla.tar.zst + placeholder-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/maps-earth-planet-v1.49.placeholder.tar.zst + elasticsearch-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/maps-earth-planet-v1.49.elasticsearch.tar.zst pelias-config-json: | { "logger": { diff --git a/k8s/configs/planet/opentripplanner-barcelona-config.yaml b/k8s/configs/planet/opentripplanner-barcelona-config.yaml index 6b40c0ac3..9ecde4dd8 100644 --- a/k8s/configs/planet/opentripplanner-barcelona-config.yaml +++ b/k8s/configs/planet/opentripplanner-barcelona-config.yaml @@ -3,6 +3,6 @@ kind: ConfigMap metadata: name: otp-barcelona-config data: - graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/Barcelona.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/Barcelona.graph.obj.zst router-config-json: "" diff --git a/k8s/configs/planet/opentripplanner-losangeles-config.yaml b/k8s/configs/planet/opentripplanner-losangeles-config.yaml index ca6fccbd0..513fffcdd 100644 --- a/k8s/configs/planet/opentripplanner-losangeles-config.yaml +++ b/k8s/configs/planet/opentripplanner-losangeles-config.yaml @@ -3,6 +3,6 @@ kind: ConfigMap metadata: name: otp-losangeles-config data: - graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/LosAngeles.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/LosAngeles.graph.obj.zst router-config-json: "" diff --git a/k8s/configs/planet/opentripplanner-pugetsound-config.yaml b/k8s/configs/planet/opentripplanner-pugetsound-config.yaml index 0dcfeab08..0b2e3e424 100644 --- a/k8s/configs/planet/opentripplanner-pugetsound-config.yaml +++ b/k8s/configs/planet/opentripplanner-pugetsound-config.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: otp-pugetsound-config data: - graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.47/PugetSound.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.49/PugetSound.graph.obj.zst router-config-json: | { "updaters": [