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.

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

planet v1.36 #298

Merged
merged 3 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion builds/planet/env.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export HEADWAY_AREA=maps-earth-planet-v1.30
export HEADWAY_AREA=maps-earth-planet-v1.36
export HEADWAY_AREA_TAG="$HEADWAY_AREA"
export HEADWAY_COUNTRIES="ALL"
export HEADWAY_PUBLIC_URL=https://maps.earth
Expand Down
2 changes: 1 addition & 1 deletion builds/planet/transit/barcelona.gtfs_feeds.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mdb_source_id,data_type,entity_type,location.country_code,location.subdivision_name,location.municipality,provider,name,note,static_reference,urls.direct_download,urls.authentication_type,urls.authentication_info,urls.api_key_parameter_name,urls.latest,urls.license,location.bounding_box.minimum_latitude,location.bounding_box.maximum_latitude,location.bounding_box.minimum_longitude,location.bounding_box.maximum_longitude,location.bounding_box.extracted_on,status,features
1003,gtfs,,ES,Barcelona,,TRAM,,,,https://opendata.tram.cat/GTFS/zip/TBX.zip,,,,https://storage.googleapis.com/storage/v1/b/mdb-latest/o/es-barcelona-tram-gtfs-1003.zip?alt=media,,41.356672,41.392206,2.053372,2.143175,2022-03-17T19:32:13+00:00,,
1004,gtfs,,ES,Barcelona,,Trambesòs,,,,https://opendata.tram.cat/GTFS/zip/TBS.zip,,,,https://storage.googleapis.com/storage/v1/b/mdb-latest/o/es-barcelona-trambesos-gtfs-1004.zip?alt=media,,41.387614,41.439967,2.186892,2.233219,2022-03-17T19:32:16+00:00,,
1007,gtfs,,ES,Barcelona,,Transports Metropolitans de Barcelona (TMB),,,,https://navitia.opendatasoft.com/explore/dataset/es/files/5dd5c0e92f2050c35ef4b809a92c7849/download/,,,,https://data.maps.earth/gtfs/es/barcelona_tmb.gtfs.zip,,41.287688,41.499883,2.046171,2.245194,2022-03-17T19:32:37+00:00,,
1007,gtfs,,ES,Barcelona,,Transports Metropolitans de Barcelona (TMB),,,,https://navitia.opendatasoft.com/explore/dataset/es/files/5dd5c0e92f2050c35ef4b809a92c7849/download/,,,,https://data.example.com/gtfs/es/barcelona_tmb.gtfs.zip,,41.287688,41.499883,2.046171,2.245194,2022-03-17T19:32:37+00:00,,
16 changes: 8 additions & 8 deletions k8s/configs/planet-dev/deployment-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ kind: ConfigMap
metadata:
name: deployment-config
data:
area: maps-earth-planet-v1.30
area: maps-earth-planet-v1.36
public-url: https://maps.earth
bbox: ""
enable-transit-routing: "1"
natural-earth-source-url: https://data.example.com/0.6.0/natural_earth.mbtiles
mbtiles-source-url: https://data.example.com/0.6.0/maps-earth-planet-v1.30/maps-earth-planet-v1.30.mbtiles
valhalla-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.30/maps-earth-planet-v1.30.valhalla.tar.zst
placeholder-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.30/maps-earth-planet-v1.30.placeholder.tar.zst
elasticsearch-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.30/maps-earth-planet-v1.30.elasticsearch.tar.zst
mbtiles-source-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/maps-earth-planet-v1.36.mbtiles
valhalla-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/maps-earth-planet-v1.36.valhalla.tar.zst
placeholder-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/maps-earth-planet-v1.36.placeholder.tar.zst
elasticsearch-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/maps-earth-planet-v1.36.elasticsearch.tar.zst
pelias-config-json: |
{
"logger": {
Expand Down Expand Up @@ -61,9 +61,6 @@ data:
}
]
},
"openaddresses": {
"datapath": "/data/openaddresses"
},
"whosonfirst": {
"datapath": "/data/whosonfirst",
"importPostalcodes": true
Expand All @@ -73,6 +70,9 @@ data:
"files": [
"extract.0sv"
]
},
"openaddresses": {
"datapath": "/data/openaddresses"
}
}
}
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.6.0/maps-earth-planet-v1.30/Barcelona.graph.obj.zst
graph-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/Barcelona.graph.obj.zst
router-config-json: ""

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.6.0/maps-earth-planet-v1.30/LosAngeles.graph.obj.zst
graph-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/LosAngeles.graph.obj.zst
router-config-json: ""

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.6.0/maps-earth-planet-v1.30/PugetSound.graph.obj.zst
graph-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/PugetSound.graph.obj.zst
router-config-json: |
{
"configVersion": "2023-05-24",
Expand Down
16 changes: 8 additions & 8 deletions k8s/configs/planet/deployment-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ kind: ConfigMap
metadata:
name: deployment-config
data:
area: maps-earth-planet-v1.30
area: maps-earth-planet-v1.36
public-url: https://maps.earth
bbox: ""
enable-transit-routing: "1"
natural-earth-source-url: https://data.example.com/0.6.0/natural_earth.mbtiles
mbtiles-source-url: https://data.example.com/0.6.0/maps-earth-planet-v1.30/maps-earth-planet-v1.30.mbtiles
valhalla-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.30/maps-earth-planet-v1.30.valhalla.tar.zst
placeholder-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.30/maps-earth-planet-v1.30.placeholder.tar.zst
elasticsearch-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.30/maps-earth-planet-v1.30.elasticsearch.tar.zst
mbtiles-source-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/maps-earth-planet-v1.36.mbtiles
valhalla-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/maps-earth-planet-v1.36.valhalla.tar.zst
placeholder-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/maps-earth-planet-v1.36.placeholder.tar.zst
elasticsearch-artifact-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/maps-earth-planet-v1.36.elasticsearch.tar.zst
pelias-config-json: |
{
"logger": {
Expand Down Expand Up @@ -61,9 +61,6 @@ data:
}
]
},
"openaddresses": {
"datapath": "/data/openaddresses"
},
"whosonfirst": {
"datapath": "/data/whosonfirst",
"importPostalcodes": true
Expand All @@ -73,6 +70,9 @@ data:
"files": [
"extract.0sv"
]
},
"openaddresses": {
"datapath": "/data/openaddresses"
}
}
}
2 changes: 1 addition & 1 deletion k8s/configs/planet/opentripplanner-barcelona-config.yaml
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.6.0/maps-earth-planet-v1.30/Barcelona.graph.obj.zst
graph-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/Barcelona.graph.obj.zst
router-config-json: ""

2 changes: 1 addition & 1 deletion k8s/configs/planet/opentripplanner-losangeles-config.yaml
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.6.0/maps-earth-planet-v1.30/LosAngeles.graph.obj.zst
graph-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/LosAngeles.graph.obj.zst
router-config-json: ""

3 changes: 1 addition & 2 deletions k8s/configs/planet/opentripplanner-pugetsound-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ kind: ConfigMap
metadata:
name: otp-pugetsound-config
data:
graph-url: https://data.example.com/0.6.0/maps-earth-planet-v1.30/PugetSound.graph.obj.zst
graph-url: https://data.example.com/0.6.0/maps-earth-planet-v1.36/PugetSound.graph.obj.zst
router-config-json: |
{
"configVersion": "2023-05-24",
"updaters": [
{
"feedId": "headway-1080",
Expand Down
40 changes: 10 additions & 30 deletions k8s/configs/seattle-dev/deployment-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ data:
"esclient": {
"apiVersion": "7.5",
"hosts": [
{
"host": "pelias-elasticsearch"
}
{ "host": "pelias-elasticsearch" }
]
},
"elasticsearch": {
Expand All @@ -37,15 +35,9 @@ data:
},
"api": {
"services": {
"placeholder": {
"url": "http://pelias-placeholder:4100"
},
"libpostal": {
"url": "http://pelias-libpostal:4400"
},
"pip": {
"url": "http://pelias-pip:4400"
}
"placeholder": { "url": "http://pelias-placeholder:4100" },
"libpostal": { "url": "http://pelias-libpostal:4400" },
"pip": { "url": "http://pelias-pip:4400" }
}
},
"imports": {
Expand All @@ -55,30 +47,18 @@ data:
"openstreetmap": {
"leveldbpath": "/tmp",
"datapath": "/data/openstreetmap",
"import": [
{
"filename": "data.osm.pbf"
}
]
"import": [{
"filename": "data.osm.pbf"
}]
},
"whosonfirst": {
"datapath": "/data/whosonfirst",
"importPostalcodes": true,
"countryCode": [
"US"
]
"countryCode": ["US"],
"importPostalcodes": true
},
"polyline": {
"datapath": "/data/polylines",
"files": [
"extract.0sv"
]
},
"openaddresses": {
"datapath": "/data/openaddresses",
"files": [
"us/wa/king.csv"
]
"files": [ "extract.0sv" ]
}
}
}
Loading