Merge branch 'master' into power_facilities

TESTING.md

@@ -5,7 +5,7 @@ The OpenMapTiles SQL tests ensure that OSM data is properly imported and updated
 
 Usage:
 
-`make clean && make sql-test`
+`make clean && make test-sql`
 
 ## How it works
 

docker-compose.yml

@@ -64,7 +64,6 @@ services:
       - postgres
     env_file: .env
     environment:
-      FILTER_MAPNIK_OUTPUT: ${FILTER_MAPNIK_OUTPUT}
       MBTILES_NAME: ${MBTILES_FILE}
       # Control tilelive-copy threads
       COPY_CONCURRENCY: ${COPY_CONCURRENCY}
@@ -78,7 +77,6 @@ services:
       - postgres
     env_file: .env
     environment:
-      FILTER_MAPNIK_OUTPUT: ${FILTER_MAPNIK_OUTPUT}
       MBTILES_NAME: ${MBTILES_FILE}
       BBOX: ${BBOX}
       MIN_ZOOM: ${MIN_ZOOM}

layers/transportation/highway_name.sql

@@ -6,10 +6,6 @@ SELECT hstore(string_agg(nullif(slice_language_tags(tags ||
                        'name:en', CASE WHEN length(name_en) > 15 THEN osml10n_street_abbrev_en(name_en) ELSE NULLIF(name_en, '') END,
                        'name:de', CASE WHEN length(name_de) > 15 THEN osml10n_street_abbrev_de(name_de) ELSE NULLIF(name_de, '') END
                      ]))::text,
-                     ''), ','))
+                     ''), ','));
-                     || get_basic_names(tags, geometry);
 $$ LANGUAGE SQL IMMUTABLE
-                STRICT
                 PARALLEL SAFE;
-
-

layers/transportation/transportation.sql

@@ -376,15 +376,14 @@ FROM (
            AND
                CASE WHEN zoom_level = 12 THEN
                          CASE WHEN transportation_filter_z12(hl.highway, hl.construction) THEN TRUE
-                              WHEN n.route_rank = 1 THEN TRUE
+                              WHEN hl.highway IN ('track', 'path') THEN n.route_rank = 1
                          END
                     WHEN zoom_level = 13 THEN
                          CASE WHEN man_made='pier' THEN NOT ST_IsClosed(hl.geometry)
-                              WHEN hl.highway = 'path' THEN (
+                              WHEN hl.highway IN ('track', 'path') THEN (hl.name <> ''
-                                                        hl.name <> ''
+                                                                   OR n.route_rank BETWEEN 1 AND 2
-                                                     OR n.route_rank BETWEEN 1 AND 2
+                                                                   OR hl.sac_scale <> ''
-                                                     OR hl.sac_scale <> ''
+                                                                   )
-                                                   )
                               ELSE transportation_filter_z13(hl.highway, public_transport, hl.construction, service)
                          END
                     WHEN zoom_level >= 14 THEN

layers/transportation/update_transportation_merge.sql

@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS osm_transportation_name_network AS
 SELECT
     geometry,
     osm_id,
-    tags,
+    tags || get_basic_names(tags, geometry) AS tags,
     ref,
     highway,
     subclass,

layers/transportation_name/update_transportation_name.sql

@@ -8,7 +8,7 @@
 -- etldoc: osm_aerialway_linestring ->  osm_transportation_name_linestring
 CREATE TABLE IF NOT EXISTS osm_transportation_name_linestring AS
 SELECT (ST_Dump(geometry)).geom AS geometry,
-       tags,
+       tags || get_basic_names(tags, geometry) AS tags,
        ref,
        highway,
        subclass,
@@ -278,7 +278,7 @@ BEGIN
     SELECT
         geometry,
         osm_id,
-        tags,
+        tags || get_basic_names(tags, geometry) AS tags,
         ref,
         highway,
         subclass,
@@ -493,7 +493,7 @@ BEGIN
 
     INSERT INTO osm_transportation_name_linestring
     SELECT (ST_Dump(geometry)).geom AS geometry,
-           tags,
+           tags|| get_basic_names(tags, geometry) AS tags,
            ref,
            highway,
            subclass,