From 6928ff96f3049f60b4e228ce625dc5a8b6d7abbf Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 20 Dec 2024 15:26:14 -0500 Subject: [PATCH] Fix tegola layers config columns Updare base image for tiler cache Fix admin_level as number Updare base image for tiler cache --- images/tiler-cache/Dockerfile | 2 +- .../providers/admin_boundaries_centroids.toml | 73 +++++++------ .../providers/admin_boundaries_lines.toml | 56 +++++----- .../providers/admin_boundaries_maritime.toml | 8 +- .../config/providers/route_lines.toml | 4 +- .../config/providers/transport_lines.toml | 102 +++++++++--------- .../providers/water_areas.centroids.toml | 24 ++--- .../config/providers/water_areas.toml | 28 ++--- .../config/providers/water_lines.toml | 16 +-- values.production.template.yaml | 7 +- values.staging.template.yaml | 4 +- 11 files changed, 159 insertions(+), 165 deletions(-) diff --git a/images/tiler-cache/Dockerfile b/images/tiler-cache/Dockerfile index b8d1feb6..aecf77f2 100644 --- a/images/tiler-cache/Dockerfile +++ b/images/tiler-cache/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1951.hc772955 +FROM ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1964.h8703c77 RUN apk update && apk add --no-cache \ proj \ diff --git a/images/tiler-server/config/providers/admin_boundaries_centroids.toml b/images/tiler-server/config/providers/admin_boundaries_centroids.toml index 56101be2..151a4afc 100644 --- a/images/tiler-server/config/providers/admin_boundaries_centroids.toml +++ b/images/tiler-server/config/providers/admin_boundaries_centroids.toml @@ -7,11 +7,11 @@ sql = """ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, - admin_level, - name, - type, - start_date, - end_date, + admin_level, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -31,11 +31,11 @@ sql = """ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, - admin_level, - name, - type, - start_date, - end_date, + admin_level, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -55,11 +55,11 @@ sql = """ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, - admin_level, - name, - type, - start_date, - end_date, + admin_level, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -79,11 +79,11 @@ sql = """ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, - admin_level, - name, - type, - start_date, - end_date, + admin_level, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -103,11 +103,11 @@ sql = """ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, - admin_level, - name, - type, - start_date, - end_date, + admin_level, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -118,7 +118,6 @@ WHERE AND geometry && !BBOX! """ - [[providers.layers]] name = "admin_boundaries_centroid_z13_15" geometry_fieldname = "geometry" @@ -128,11 +127,11 @@ sql = """ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, - admin_level, - name, - type, - start_date, - end_date, + admin_level, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -152,11 +151,11 @@ sql = """ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, - admin_level, - name, - type, - start_date, - end_date, + admin_level, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -165,4 +164,4 @@ FROM WHERE has_label = 0 AND geometry && !BBOX! -""" \ No newline at end of file +""" diff --git a/images/tiler-server/config/providers/admin_boundaries_lines.toml b/images/tiler-server/config/providers/admin_boundaries_lines.toml index dfc680cd..70577032 100644 --- a/images/tiler-server/config/providers/admin_boundaries_lines.toml +++ b/images/tiler-server/config/providers/admin_boundaries_lines.toml @@ -8,10 +8,10 @@ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, admin_level, - name, - type, - start_date, - end_date, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -31,10 +31,10 @@ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, admin_level, - name, - type, - start_date, - end_date, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -55,10 +55,10 @@ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, admin_level, - name, - type, - start_date, - end_date, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -78,10 +78,10 @@ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, admin_level, - name, - type, - start_date, - end_date, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -101,10 +101,10 @@ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, admin_level, - name, - type, - start_date, - end_date, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -124,10 +124,10 @@ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, admin_level, - name, - type, - start_date, - end_date, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -147,10 +147,10 @@ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, admin_level, - name, - type, - start_date, - end_date, + NULLIF(name, '') AS name, + NULLIF(type, '') AS type, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} diff --git a/images/tiler-server/config/providers/admin_boundaries_maritime.toml b/images/tiler-server/config/providers/admin_boundaries_maritime.toml index 5de4577a..ac42f1b5 100644 --- a/images/tiler-server/config/providers/admin_boundaries_maritime.toml +++ b/images/tiler-server/config/providers/admin_boundaries_maritime.toml @@ -35,8 +35,8 @@ SELECT name, type, maritime, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -59,8 +59,8 @@ SELECT name, type, maritime, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} diff --git a/images/tiler-server/config/providers/route_lines.toml b/images/tiler-server/config/providers/route_lines.toml index bfab752a..3b5cf487 100644 --- a/images/tiler-server/config/providers/route_lines.toml +++ b/images/tiler-server/config/providers/route_lines.toml @@ -21,8 +21,8 @@ SELECT interval, duration, tourism, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} diff --git a/images/tiler-server/config/providers/transport_lines.toml b/images/tiler-server/config/providers/transport_lines.toml index ac6f6e1a..bd481324 100644 --- a/images/tiler-server/config/providers/transport_lines.toml +++ b/images/tiler-server/config/providers/transport_lines.toml @@ -7,17 +7,17 @@ sql = """ SELECT ST_AsMVTGeom(geometry, !BBOX!) AS geometry, ABS(osm_id) AS osm_id, - type, - tunnel, - bridge, - ref, - service, - name, - electrified, - highspeed, - usage, - start_date, - end_date, + NULLIF(type, '') AS type, + NULLIF(tunnel, '') AS tunnel, + NULLIF(bridge, '') AS bridge, + NULLIF(ref, '') AS ref, + NULLIF(service, '') AS service, + NULLIF(name, '') AS name, + NULLIF(electrified, '') AS electrified, + NULLIF(highspeed, '') AS highspeed, + NULLIF(usage, '') AS usage, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -36,16 +36,16 @@ 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, + NULLIF(ref, '') AS ref, + NULLIF(class, '') AS class, + NULLIF(type, '') AS type, + NULLIF(service, '') AS service, + NULLIF(name, '') AS name, + NULLIF(electrified, '') AS electrified, + NULLIF(highspeed, '') AS highspeed, + NULLIF(usage, '') AS usage, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -64,16 +64,16 @@ 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, + NULLIF(ref, '') AS ref, + NULLIF(class, '') AS class, + NULLIF(type, '') AS type, + NULLIF(service, '') AS service, + NULLIF(name, '') AS name, + NULLIF(electrified, '') AS electrified, + NULLIF(highspeed, '') AS highspeed, + NULLIF(usage, '') AS usage, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -92,16 +92,16 @@ 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, + NULLIF(ref, '') AS ref, + NULLIF(class, '') AS class, + NULLIF(type, '') AS type, + NULLIF(service, '') AS service, + NULLIF(name, '') AS name, + NULLIF(electrified, '') AS electrified, + NULLIF(highspeed, '') AS highspeed, + NULLIF(usage, '') AS usage, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -120,16 +120,16 @@ 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, + NULLIF(ref, '') AS ref, + NULLIF(class, '') AS class, + NULLIF(type, '') AS type, + NULLIF(service, '') AS service, + NULLIF(name, '') AS name, + NULLIF(electrified, '') AS electrified, + NULLIF(highspeed, '') AS highspeed, + NULLIF(usage, '') AS usage, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} diff --git a/images/tiler-server/config/providers/water_areas.centroids.toml b/images/tiler-server/config/providers/water_areas.centroids.toml index e503606a..71e1c025 100644 --- a/images/tiler-server/config/providers/water_areas.centroids.toml +++ b/images/tiler-server/config/providers/water_areas.centroids.toml @@ -10,8 +10,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -33,8 +33,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -57,8 +57,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -81,8 +81,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -104,8 +104,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -129,8 +129,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} diff --git a/images/tiler-server/config/providers/water_areas.toml b/images/tiler-server/config/providers/water_areas.toml index 4e632dd0..1f9f355e 100644 --- a/images/tiler-server/config/providers/water_areas.toml +++ b/images/tiler-server/config/providers/water_areas.toml @@ -10,8 +10,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -33,8 +33,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -57,8 +57,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -80,8 +80,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -103,8 +103,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -126,8 +126,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -149,8 +149,8 @@ SELECT name, type, area, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} diff --git a/images/tiler-server/config/providers/water_lines.toml b/images/tiler-server/config/providers/water_lines.toml index 387c030f..2d442526 100644 --- a/images/tiler-server/config/providers/water_lines.toml +++ b/images/tiler-server/config/providers/water_lines.toml @@ -10,8 +10,8 @@ SELECT name, type, bridge, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -33,8 +33,8 @@ SELECT name, type, bridge, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -56,8 +56,8 @@ SELECT name, type, bridge, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} @@ -79,8 +79,8 @@ SELECT name, type, bridge, - start_date, - end_date, + NULLIF(start_date, '') AS start_date, + NULLIF(end_date, '') AS end_date, isodatetodecimaldate(pad_date(start_date, 'start'), FALSE) AS start_decdate, isodatetodecimaldate(pad_date(end_date, 'end'), FALSE) AS end_decdate, {{LENGUAGES}} diff --git a/values.production.template.yaml b/values.production.template.yaml index c30d87df..4d26d684 100644 --- a/values.production.template.yaml +++ b/values.production.template.yaml @@ -929,7 +929,7 @@ ohm: env: REGION_NAME: us-east-1 NAMESPACE: default # Namespace to run the job - DOCKER_IMAGE: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1951.hc772955 # TODO, this should be automatically updated from tiler server image + DOCKER_IMAGE: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1964.h8703c77 # TODO, this should be automatically updated from tiler server image SQS_QUEUE_URL: {{PRODUCTION_SQS_QUEUE_URL}} NODEGROUP_TYPE: web_large # Nodegroup type to run the purge and seed job # Maximum number of active jobs in high concurrency queue @@ -968,13 +968,8 @@ ohm: schedule: '0 */3 * * *' env: GEOJSON_URL: https://osmseed-dev.s3.us-east-1.amazonaws.com/tiler/usa-eu.geojson -<<<<<<< HEAD ZOOM_LEVELS: '8,9,10' CONCURRENCY: 256 -======= - ZOOM_LEVELS: '8,9' - CONCURRENCY: 100 ->>>>>>> main S3_BUCKET: osmseed-dev OUTPUT_FILE: /logs/tiler_benchmark.log resources: diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 96b5676e..22e65028 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -480,7 +480,7 @@ osm-seed: # ==================================================================================================== tilerImposm: - enabled: true + enabled: false env: TILER_IMPORT_FROM: osm TILER_IMPORT_PBF_URL: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/planet-241214_1202.osm.pbf @@ -966,7 +966,7 @@ ohm: env: REGION_NAME: us-east-1 NAMESPACE: default # Namespace to run the job - DOCKER_IMAGE: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1913.ha63e895 # TODO, this should be automatically updated from tiler server image + DOCKER_IMAGE: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.1964.h8703c77 # TODO, this should be automatically updated from tiler server image SQS_QUEUE_URL: {{STAGING_SQS_QUEUE_URL}} NODEGROUP_TYPE: web_large # Nodegroup type to run the job MAX_ACTIVE_JOBS: 2 # Maximum number of active jobs in high concurrency queue