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

bump planet to 1.49 #363

Merged
merged 2 commits into from
Jul 11, 2024
Merged

bump planet to 1.49 #363

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
556208b
bump planet to 1.49
michaelkirk Jun 27, 2024
9296565
better debug output when tools are missing
michaelkirk Jun 27, 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
7 changes: 5 additions & 2 deletions builds/planet/assemble-planet-pbf/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
};
Expand Down Expand Up @@ -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());
}
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.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"
Expand Down
10 changes: 5 additions & 5 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,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"
Expand All @@ -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": {
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.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: ""

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.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: ""

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.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",
Expand Down
10 changes: 5 additions & 5 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,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"
Expand All @@ -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": {
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.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: ""

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.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: ""

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.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": [
Expand Down
Loading