From ce4b2c67e11e0262cb02f95f130c7c1ddfd7e263 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Sat, 14 Dec 2024 14:28:42 -0500 Subject: [PATCH 1/7] Table generalization for transport_lines --- .github/workflows/chartpress.yaml | 2 +- .../config/layers/transport_lines.json | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/chartpress.yaml b/.github/workflows/chartpress.yaml index 84fd49f1..3df7c758 100644 --- a/.github/workflows/chartpress.yaml +++ b/.github/workflows/chartpress.yaml @@ -5,7 +5,7 @@ on: - 'main' - 'staging' - 'development' - - 'transport_lines' + - 'imposm_transport' jobs: build: runs-on: ubuntu-20.04 diff --git a/images/tiler-imposm/config/layers/transport_lines.json b/images/tiler-imposm/config/layers/transport_lines.json index 6465dc30..56ac6fa1 100644 --- a/images/tiler-imposm/config/layers/transport_lines.json +++ b/images/tiler-imposm/config/layers/transport_lines.json @@ -9,47 +9,47 @@ }, "generalized_tables": { "transport_lines_z5": { - "source": "transport_lines_z6", + "source": "transport_lines", "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction') AND tunnel = 0 AND bridge = 0", "tolerance": 1000 }, "transport_lines_z6": { - "source": "transport_lines_z7", + "source": "transport_lines", "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')", "tolerance": 200 }, "transport_lines_z7": { - "source": "transport_lines_z8", + "source": "transport_lines", "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed')", "tolerance": 150 }, "transport_lines_z8": { - "source": "transport_lines_z9", + "source": "transport_lines", "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed')", "tolerance": 100 }, "transport_lines_z9": { - "source": "transport_lines_z10", + "source": "transport_lines", "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed')", "tolerance": 50 }, "transport_lines_z10": { - "source": "transport_lines_z11", + "source": "transport_lines", "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed')", "tolerance": 20 }, "transport_lines_z11": { - "source": "transport_lines_z12", + "source": "transport_lines", "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed', 'type', 'tram', 'funicular', 'monorail')", "tolerance": 15 }, "transport_lines_z12": { - "source": "transport_lines_z13_15", + "source": "transport_lines", "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed', 'tram', 'funicular', 'monorail', 'taxiway', 'runway', 'raceway', 'residential', 'service', 'unclassified')", "tolerance": 10 }, "transport_lines_z13_15": { - "source": "transport_lines_z16_20", + "source": "transport_lines", "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed', 'tram', 'funicular', 'monorail', 'taxiway', 'runway', 'raceway', 'residential', 'service', 'unclassified')", "tolerance": 5 }, From 0cde2de786d1b2507ab0158af918d702e9d77d9d Mon Sep 17 00:00:00 2001 From: Rub21 Date: Sat, 14 Dec 2024 14:35:43 -0500 Subject: [PATCH 2/7] Update path for imposm3.json config file --- images/tiler-imposm/start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/tiler-imposm/start.sh b/images/tiler-imposm/start.sh index bb6831f6..7ed67232 100755 --- a/images/tiler-imposm/start.sh +++ b/images/tiler-imposm/start.sh @@ -33,7 +33,7 @@ python build_imposm3_config.py echo "\"cachedir\": \"$CACHE_DIR\"," echo "\"diffdir\": \"$DIFF_DIR\"," echo "\"connection\": \"postgis://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB\"," - echo "\"mapping\": \"config/imposm3.json\"," + echo "\"mapping\": \"/osm/config/imposm3.json\"," echo "\"replication_url\": \"$REPLICATION_URL\"" echo "}" } >"$WORKDIR/config.json" @@ -123,7 +123,7 @@ function updateData() { # Check if the limit file exists if [ -z "$TILER_IMPORT_LIMIT" ]; then - imposm run -config "$WORKDIR/config.json" -expiretiles-dir "$IMPOSM3_EXPIRE_DIR" & + imposm run -config "$WORKDIR/config.json" -expiretiles-dir "$IMPOSM3_EXPIRE_DIR" -httpprofile ":6060" & else imposm run -config "$WORKDIR/config.json" -limitto "$WORKDIR/$LIMITFILE" -expiretiles-dir "$IMPOSM3_EXPIRE_DIR" & fi From 2b2cbeb6a7cf6006dd24f836da0eb4af6660fd42 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Sat, 14 Dec 2024 21:41:44 -0500 Subject: [PATCH 3/7] Revert transport_line import layer --- .../config/layers/transport_lines.json | 53 +++---------------- 1 file changed, 7 insertions(+), 46 deletions(-) diff --git a/images/tiler-imposm/config/layers/transport_lines.json b/images/tiler-imposm/config/layers/transport_lines.json index 56ac6fa1..1e6c6d42 100644 --- a/images/tiler-imposm/config/layers/transport_lines.json +++ b/images/tiler-imposm/config/layers/transport_lines.json @@ -8,54 +8,15 @@ ] }, "generalized_tables": { - "transport_lines_z5": { - "source": "transport_lines", - "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction') AND tunnel = 0 AND bridge = 0", - "tolerance": 1000 - }, - "transport_lines_z6": { - "source": "transport_lines", - "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')", - "tolerance": 200 - }, - "transport_lines_z7": { - "source": "transport_lines", - "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed')", - "tolerance": 150 - }, - "transport_lines_z8": { - "source": "transport_lines", - "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed')", - "tolerance": 100 - }, - "transport_lines_z9": { - "source": "transport_lines", - "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed')", - "tolerance": 50 - }, - "transport_lines_z10": { - "source": "transport_lines", - "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed')", - "tolerance": 20 - }, - "transport_lines_z11": { - "source": "transport_lines", - "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed', 'type', 'tram', 'funicular', 'monorail')", - "tolerance": 15 - }, - "transport_lines_z12": { - "source": "transport_lines", - "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed', 'tram', 'funicular', 'monorail', 'taxiway', 'runway', 'raceway', 'residential', 'service', 'unclassified')", - "tolerance": 10 - }, - "transport_lines_z13_15": { - "source": "transport_lines", - "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed', 'tram', 'funicular', 'monorail', 'taxiway', 'runway', 'raceway', 'residential', 'service', 'unclassified')", - "tolerance": 5 + "transport_lines_gen0": { + "source": "transport_lines_gen1", + "sql_filter": null, + "tolerance": 200.0 }, - "transport_lines_z16_20": { + "transport_lines_gen1": { "source": "transport_lines", - "sql_filter": "(type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed', 'tram', 'funicular', 'monorail', 'taxiway', 'runway', 'raceway', 'residential', 'service', 'unclassified', 'subway', 'track', 'living_street', 'footway', 'cycleway', 'path', 'pier', 'steps', 'pedestrian', 'ferry') OR class IN ('railway', 'route'))" + "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link') OR class IN('railway', 'route')", + "tolerance": 50.0 } }, "tables": { From 5dd61439fed3a30537a15bb97eb60ea202c0de4d Mon Sep 17 00:00:00 2001 From: Rub21 Date: Sat, 14 Dec 2024 22:24:01 -0500 Subject: [PATCH 4/7] Update transport layer update --- .../config/layers/transport_lines.json | 29 ++++++++++++++----- images/tiler-imposm/start.sh | 6 ++-- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/images/tiler-imposm/config/layers/transport_lines.json b/images/tiler-imposm/config/layers/transport_lines.json index 1e6c6d42..f78f1658 100644 --- a/images/tiler-imposm/config/layers/transport_lines.json +++ b/images/tiler-imposm/config/layers/transport_lines.json @@ -8,15 +8,30 @@ ] }, "generalized_tables": { - "transport_lines_gen0": { - "source": "transport_lines_gen1", + "transport_lines_z6_7": { + "source": "transport_lines_z8_9", "sql_filter": null, - "tolerance": 200.0 + "tolerance": 150 }, - "transport_lines_gen1": { + "transport_lines_z8_9": { + "source": "transport_lines_z10_11", + "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed')", + "tolerance": 50 + }, + "transport_lines_z10_11": { + "source": "transport_lines_z12_13", + "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed', 'type', 'tram', 'funicular', 'monorail')", + "tolerance": 15 + }, + "transport_lines_z12_13": { + "source": "transport_lines_z14_20", + "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'construction', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'miniature', 'narrow_gauge', 'dismantled', 'abandoned', 'disused', 'razed', 'rail', 'light_rail', 'preserved', 'proposed', 'tram', 'funicular', 'monorail', 'taxiway', 'runway', 'raceway', 'residential', 'service', 'unclassified') OR class IN ('railway', 'route')", + "tolerance": 5 + }, + "transport_lines_z14_20": { "source": "transport_lines", - "sql_filter": "type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link') OR class IN('railway', 'route')", - "tolerance": 50.0 + "sql_filter": null, + "tolerance": 0 } }, "tables": { @@ -179,4 +194,4 @@ } } } -} +} \ No newline at end of file diff --git a/images/tiler-imposm/start.sh b/images/tiler-imposm/start.sh index 7ed67232..21c73a7f 100755 --- a/images/tiler-imposm/start.sh +++ b/images/tiler-imposm/start.sh @@ -17,13 +17,13 @@ INIT_FILE=/mnt/data/init_done PG_CONNECTION="postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB" +mkdir -p "$CACHE_DIR" "$DIFF_DIR" "$IMPOSM3_EXPIRE_DIR" + # tracking file -TRACKING_FILE="$WORKDIR/uploaded_files.log" +TRACKING_FILE="$WORKDIR/uploaded_files.log" [ -f "$TRACKING_FILE" ] || touch "$TRACKING_FILE" -mkdir -p "$CACHE_DIR" "$DIFF_DIR" "$IMPOSM3_EXPIRE_DIR" - # Create config map for imposm python build_imposm3_config.py From 01798e45e78f532ad1dd3f45ba9248513feef972 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Sat, 14 Dec 2024 22:47:26 -0500 Subject: [PATCH 5/7] Transport lines layer start from zoom 5 --- images/tiler-imposm/config/layers/transport_lines.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/tiler-imposm/config/layers/transport_lines.json b/images/tiler-imposm/config/layers/transport_lines.json index f78f1658..6bfe7f3a 100644 --- a/images/tiler-imposm/config/layers/transport_lines.json +++ b/images/tiler-imposm/config/layers/transport_lines.json @@ -8,7 +8,7 @@ ] }, "generalized_tables": { - "transport_lines_z6_7": { + "transport_lines_z5_7": { "source": "transport_lines_z8_9", "sql_filter": null, "tolerance": 150 From 4abe268b5199518ded06f9d7e6c556d937049788 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Sat, 14 Dec 2024 22:59:35 -0500 Subject: [PATCH 6/7] Fix transport lines layer --- .../config/providers/transport_lines.toml | 177 +----------------- .../providers/transport_lines.zoom.toml | 44 +---- 2 files changed, 17 insertions(+), 204 deletions(-) diff --git a/images/tiler-server/config/providers/transport_lines.toml b/images/tiler-server/config/providers/transport_lines.toml index a4040008..ac6f6e1a 100644 --- a/images/tiler-server/config/providers/transport_lines.toml +++ b/images/tiler-server/config/providers/transport_lines.toml @@ -1,5 +1,5 @@ [[providers.layers]] -name = "transport_lines_z5" +name = "transport_lines_z5_7" geometry_fieldname = "geometry" geometry_type = "linestring" id_fieldname = "osm_id" @@ -22,13 +22,13 @@ SELECT isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} FROM - osm_transport_lines_z5 + osm_transport_lines_z5_7 WHERE geometry && !BBOX! """ [[providers.layers]] -name = "transport_lines_z6" +name = "transport_lines_z8_9" geometry_fieldname = "geometry" geometry_type = "linestring" id_fieldname = "osm_id" @@ -50,13 +50,13 @@ SELECT isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} FROM - osm_transport_lines_z6 + osm_transport_lines_z8_9 WHERE geometry && !BBOX! """ [[providers.layers]] -name = "transport_lines_z7" +name = "transport_lines_z10_11" geometry_fieldname = "geometry" geometry_type = "linestring" id_fieldname = "osm_id" @@ -78,13 +78,13 @@ SELECT isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} FROM - osm_transport_lines_z7 + osm_transport_lines_z10_11 WHERE geometry && !BBOX! """ [[providers.layers]] -name = "transport_lines_z8" +name = "transport_lines_z12_13" geometry_fieldname = "geometry" geometry_type = "linestring" id_fieldname = "osm_id" @@ -106,13 +106,13 @@ SELECT isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} FROM - osm_transport_lines_z8 + osm_transport_lines_z12_13 WHERE geometry && !BBOX! """ [[providers.layers]] -name = "transport_lines_z9" +name = "transport_lines_z14_20" geometry_fieldname = "geometry" geometry_type = "linestring" id_fieldname = "osm_id" @@ -134,164 +134,7 @@ SELECT isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} FROM - osm_transport_lines_z9 -WHERE - geometry && !BBOX! -""" - -[[providers.layers]] -name = "transport_lines_z10" -geometry_fieldname = "geometry" -geometry_type = "linestring" -id_fieldname = "osm_id" -sql = """ -SELECT - ST_AsMVTGeom(geometry, !BBOX!) AS geometry, - ABS(osm_id) AS osm_id, - ref, - class, - type, - service, - name, - electrified, - highspeed, - usage, - start_date, - end_date, - isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, - isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, - {{LENGUAGES}} -FROM - osm_transport_lines_z10 -WHERE - geometry && !BBOX! -""" - - -[[providers.layers]] -name = "transport_lines_z11" -geometry_fieldname = "geometry" -geometry_type = "linestring" -id_fieldname = "osm_id" -sql = """ -SELECT - ST_AsMVTGeom(geometry, !BBOX!) AS geometry, - ABS(osm_id) AS osm_id, - name, - ref, - class, - type, - tunnel, - bridge, - access, - service, - ford, - electrified, - highspeed, - usage, - start_date, - end_date, - isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, - isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, - {{LENGUAGES}} -FROM - osm_transport_lines_z11 -WHERE - geometry && !BBOX! -""" - -[[providers.layers]] -name = "transport_lines_z12" -geometry_fieldname = "geometry" -geometry_type = "linestring" -id_fieldname = "osm_id" -sql = """ -SELECT - ST_AsMVTGeom(geometry, !BBOX!) AS geometry, - ABS(osm_id) AS osm_id, - name, - ref, - class, - type, - tunnel, - bridge, - access, - service, - ford, - electrified, - highspeed, - usage, - start_date, - end_date, - isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, - isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, - {{LENGUAGES}} -FROM - osm_transport_lines_z12 -WHERE - geometry && !BBOX! -""" - -[[providers.layers]] -name = "transport_lines_z13_15" -geometry_fieldname = "geometry" -geometry_type = "linestring" -id_fieldname = "osm_id" -sql = """ -SELECT - ST_AsMVTGeom(geometry, !BBOX!) AS geometry, - ABS(osm_id) AS osm_id, - name, - ref, - class, - type, - tunnel, - bridge, - access, - service, - ford, - electrified, - highspeed, - usage, - start_date, - end_date, - isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, - isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, - {{LENGUAGES}} -FROM - osm_transport_lines_z13_15 -WHERE - geometry && !BBOX! -""" - -[[providers.layers]] -name = "transport_lines_z16_20" -geometry_fieldname = "geometry" -geometry_type = "linestring" -id_fieldname = "osm_id" -sql = """ -SELECT - ST_AsMVTGeom(geometry, !BBOX!) AS geometry, - ABS(osm_id) AS osm_id, - name, - ref, - class, - type, - tunnel, - bridge, - access, - service, - ford, - electrified, - highspeed, - usage, - start_date, - end_date, - isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, - isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, - {{LENGUAGES}} -FROM - osm_transport_lines_z16_20 + osm_transport_lines_z14_20 WHERE geometry && !BBOX! """ diff --git a/images/tiler-server/config/providers/transport_lines.zoom.toml b/images/tiler-server/config/providers/transport_lines.zoom.toml index 593f63c0..91ed08f4 100644 --- a/images/tiler-server/config/providers/transport_lines.zoom.toml +++ b/images/tiler-server/config/providers/transport_lines.zoom.toml @@ -1,59 +1,29 @@ [[maps.layers]] name = "transport_lines" -provider_layer = "osm.transport_lines_z5" +provider_layer = "osm.transport_lines_z5_7" min_zoom = 5 -max_zoom = 5 - -[[maps.layers]] -name = "transport_lines" -provider_layer = "osm.transport_lines_z6" -min_zoom = 6 -max_zoom = 6 - -[[maps.layers]] -name = "transport_lines" -provider_layer = "osm.transport_lines_z7" -min_zoom = 7 max_zoom = 7 [[maps.layers]] name = "transport_lines" -provider_layer = "osm.transport_lines_z8" +provider_layer = "osm.transport_lines_z8_9" min_zoom = 8 -max_zoom = 10 - -[[maps.layers]] -name = "transport_lines" -provider_layer = "osm.transport_lines_z9" -min_zoom = 9 max_zoom = 9 [[maps.layers]] name = "transport_lines" -provider_layer = "osm.transport_lines_z10" +provider_layer = "osm.transport_lines_z10_11" min_zoom = 10 -max_zoom = 10 - -[[maps.layers]] -name = "transport_lines" -provider_layer = "osm.transport_lines_z11" -min_zoom = 11 max_zoom = 11 [[maps.layers]] name = "transport_lines" -provider_layer = "osm.transport_lines_z12" +provider_layer = "osm.transport_lines_z12_13" min_zoom = 12 -max_zoom = 12 - -[[maps.layers]] -name = "transport_lines" -provider_layer = "osm.transport_lines_z13_15" -min_zoom = 13 -max_zoom = 15 +max_zoom = 13 [[maps.layers]] name = "transport_lines" -provider_layer = "osm.transport_lines_z16_20" -min_zoom = 16 +provider_layer = "osm.transport_lines_z14_20" +min_zoom = 14 max_zoom = 20 From 6eee24a4ffffb939fe7a121c585f30e7fa0d3c45 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Sat, 14 Dec 2024 23:07:53 -0500 Subject: [PATCH 7/7] Update configs --- values.production.template.yaml | 8 ++--- values.staging.template.yaml | 52 ++++++++++++++++----------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/values.production.template.yaml b/values.production.template.yaml index 26fc20f8..11b5010b 100644 --- a/values.production.template.yaml +++ b/values.production.template.yaml @@ -362,7 +362,7 @@ osm-seed: label_value: api_db env: POSTGRES_HOST: {{PRODUCTION_TILER_DB_HOST}} - POSTGRES_DB: tiler_osm_production + POSTGRES_DB: tiler_osm_prod POSTGRES_USER: postgres POSTGRES_PASSWORD: {{PRODUCTION_TILER_DB_PASSWORD}} POSTGRES_PORT: 5432 @@ -455,9 +455,9 @@ osm-seed: label_value: web_large env: TILER_IMPORT_FROM: osm - TILER_IMPORT_PBF_URL: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/planet-241210_0000.osm.pbf + TILER_IMPORT_PBF_URL: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/planet-241214_1202.osm.pbf REPLICATION_URL: http://s3.amazonaws.com/planet.openhistoricalmap.org/replication/minute/ - SEQUENCE_NUMBER: "1673798" + SEQUENCE_NUMBER: "1675330" OVERWRITE_STATE: false UPLOAD_EXPIRED_FILES: true IMPORT_NATURAL_EARTH: true @@ -467,7 +467,7 @@ osm-seed: accessMode: ReadWriteOnce mountPath: /mnt/data # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID: vol-0000b3892d5975652 + AWS_ElasticBlockStore_volumeID: vol-0debb846502c98aee AWS_ElasticBlockStore_size: 50Gi resources: enabled: false diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 8293030d..028a81d2 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -388,7 +388,7 @@ osm-seed: enabled: true env: POSTGRES_HOST: {{STAGING_TILER_DB_HOST}} - POSTGRES_DB: tiler_osm_production # Kuberntes existing db called, tiler-osm + POSTGRES_DB: tiler_osm_prod # Kuberntes existing db called, tiler-osm POSTGRES_USER: postgres POSTGRES_PASSWORD: {{STAGING_TILER_DB_PASSWORD}} POSTGRES_PORT: 5432 @@ -404,11 +404,11 @@ osm-seed: resources: enabled: false requests: - memory: "6Gi" - cpu: "1500m" + memory: 6Gi + cpu: 1500m limits: - memory: "6Gi" - cpu: "1700m" + memory: 6Gi + cpu: 1700m nodeSelector: enabled: true label_key: nodegroup_type @@ -483,29 +483,29 @@ osm-seed: enabled: false env: TILER_IMPORT_FROM: osm - TILER_IMPORT_PBF_URL: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/planet-241210_0000.osm.pbf + TILER_IMPORT_PBF_URL: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/planet-241214_1202.osm.pbf REPLICATION_URL: http://s3.amazonaws.com/planet.openhistoricalmap.org/replication/minute/ - SEQUENCE_NUMBER: "1673798" + SEQUENCE_NUMBER: '1675330' OVERWRITE_STATE: false UPLOAD_EXPIRED_FILES: true IMPORT_NATURAL_EARTH: true IMPORT_OSM_LAND: true - IMPOSM3_IMPORT_LAYERS: "all" + IMPOSM3_IMPORT_LAYERS: all persistenceDisk: enabled: true accessMode: ReadWriteOnce mountPath: /mnt/data # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID: vol-081cd24f507bd0647 + AWS_ElasticBlockStore_volumeID: vol-0debb846502c98aee AWS_ElasticBlockStore_size: 50Gi resources: enabled: false requests: - memory: "20Gi" - cpu: "8" + memory: 20Gi + cpu: '8' limits: - memory: "24Gi" - cpu: "10" + memory: 24Gi + cpu: '10' nodeSelector: enabled: true label_key: nodegroup_type @@ -548,11 +548,11 @@ osm-seed: resources: enabled: false requests: - memory: "2Gi" - cpu: "1" + memory: 2Gi + cpu: '1' limits: - memory: "10Gi" - cpu: "2" + memory: 10Gi + cpu: '2' autoscaling: enabled: false minReplicas: 1 @@ -572,11 +572,11 @@ osm-seed: resources: enabled: true requests: - memory: "1Gi" - cpu: "500m" + memory: 1Gi + cpu: '500m' limits: - memory: "1Gi" - cpu: "600m" + memory: 1Gi + cpu: '600m' env: KILL_PROCESS: manually MAX_NUM_PS: 4 @@ -985,10 +985,10 @@ ohm: resources: enabled: false requests: - memory: '20Gi' + memory: 20Gi cpu: '8' limits: - memory: '24Gi' + memory: 24Gi cpu: '10' nodeSelector: enabled: true @@ -1001,17 +1001,17 @@ ohm: schedule: '* * * * *' env: GEOJSON_URL: https://osmseed-dev.s3.us-east-1.amazonaws.com/tiler/wold-usa-eu.geojson - ZOOM_LEVELS: '7,8,9' + ZOOM_LEVELS: 7,8,9 CONCURRENCY: 64 S3_BUCKET: osmseed-dev OUTPUT_FILE: /logs/tiler_benchmark.log resources: enabled: false requests: - memory: '20Gi' + memory: 20Gi cpu: '8' limits: - memory: '24Gi' + memory: 24Gi cpu: '10' nodeSelector: enabled: true