Merge pull request #262 from osm2vectortiles/feature/improved-mapping

Ensure no excess data in PostGIS db

osm2vectortiles.tm2source/data.yml

@@ -114,8 +114,12 @@ Layer:
             WHERE z(!scale_denominator!) BETWEEN 8 AND 12
             UNION ALL
             SELECT *
-            FROM waterway_z13toz14
-            WHERE z(!scale_denominator!) BETWEEN 13 AND 14
+            FROM waterway_z13
+            WHERE z(!scale_denominator!) = 13
+            UNION ALL
+            SELECT *
+            FROM waterway_z14
+            WHERE z(!scale_denominator!) = 14
           ) AS waterway
           WHERE geometry && !bbox!
         ) AS data
@@ -964,8 +968,11 @@ Layer:
             SELECT * FROM waterway_label_z8toz12
             WHERE z(!scale_denominator!) BETWEEN 8 AND 12
             UNION ALL
-            SELECT * FROM waterway_label_z13toz14
-            WHERE z(!scale_denominator!) BETWEEN 13 AND 14
+            SELECT * FROM waterway_label_z13
+            WHERE z(!scale_denominator!) = 13
+            UNION ALL
+            SELECT * FROM waterway_label_z14
+            WHERE z(!scale_denominator!) = 14
           ) AS waterway_label
           WHERE geometry && !bbox!
           AND linelabel(z(!scale_denominator!), name, geometry)

src/import-osm/mapping.yml

@@ -32,6 +32,16 @@ tables:
       key: maritime
     - name: area
       type: pseudoarea
+    filters:
+      exclude_tags:
+      - [ "admin_level", "__nil__" ]
+      - [ "admin_level", "3" ]
+      - [ "admin_level", "5" ]
+      - [ "admin_level", "6" ]
+      - [ "admin_level", "7" ]
+      - [ "admin_level", "8" ]
+      - [ "admin_level", "9" ]
+      - [ "admin_level", "10" ]
     mapping:
       boundary:
       - administrative
@@ -442,7 +452,9 @@ tables:
     - key: scalerank
       name: scalerank
       type: integer
-    mapping:
+    filters:
+      exclude_tags:
+      - [ "name", "__nil__" ]
     type_mappings:
       points:
         place:
@@ -857,6 +869,9 @@ tables:
       type: mapping_value
     - name: area
       type: pseudoarea
+    filters:
+      exclude_tags:
+      - [ "name", "__nil__" ]
     mapping:
       amenity:
       - arts_centre
@@ -1158,6 +1173,9 @@ tables:
       type: string
     - name: type
       type: mapping_value
+    filters:
+      exclude_tags:
+      - [ "name", "__nil__" ]
     mapping:
       amenity:
       - arts_centre

src/import-sql/layers/waterway.sql

@@ -3,15 +3,22 @@ CREATE OR REPLACE VIEW waterway_z8toz12 AS
     FROM osm_water_linestring
     WHERE type IN ('river', 'canal');
 
-CREATE OR REPLACE VIEW waterway_z13toz14 AS
+CREATE OR REPLACE VIEW waterway_z13 AS
     SELECT *
     FROM osm_water_linestring
     WHERE type IN ('river', 'canal', 'stream', 'stream_intermittent');
 
+CREATE OR REPLACE VIEW waterway_z14 AS
+    SELECT *
+    FROM osm_water_linestring
+    WHERE type IN ('river', 'canal', 'stream', 'stream_intermittent', 'ditch', 'drain');
+
 CREATE OR REPLACE VIEW waterway_layer AS (
     SELECT osm_id, timestamp, geometry FROM waterway_z8toz12
     UNION
-    SELECT osm_id, timestamp, geometry FROM waterway_z13toz14
+    SELECT osm_id, timestamp, geometry FROM waterway_z13
+    UNION
+    SELECT osm_id, timestamp, geometry FROM waterway_z14
 );
 
 CREATE OR REPLACE FUNCTION waterway_changed_tiles(ts timestamp)

src/import-sql/layers/waterway_label.sql

@@ -3,15 +3,22 @@ CREATE OR REPLACE VIEW waterway_label_z8toz12 AS
     FROM osm_water_linestring
     WHERE type IN ('river', 'canal');
 
-CREATE OR REPLACE VIEW waterway_label_z13toz14 AS
+CREATE OR REPLACE VIEW waterway_label_z13 AS
     SELECT *
     FROM osm_water_linestring
     WHERE type IN ('river', 'canal', 'stream', 'stream_intermittent');
 
+CREATE OR REPLACE VIEW waterway_label_z14 AS
+    SELECT *
+    FROM osm_water_linestring
+    WHERE type IN ('river', 'canal', 'stream', 'stream_intermittent', 'ditch', 'drain');
+
 CREATE OR REPLACE VIEW waterway_label_layer AS (
     SELECT osm_id, timestamp, geometry FROM waterway_label_z8toz12
     UNION
-    SELECT osm_id, timestamp, geometry FROM waterway_label_z13toz14
+    SELECT osm_id, timestamp, geometry FROM waterway_label_z13
+    UNION
+    SELECT osm_id, timestamp, geometry FROM waterway_label_z14
 );
 
 CREATE OR REPLACE FUNCTION waterway_label_changed_tiles(ts timestamp)

tools/mapping-qa-report/report.sql

@@ -41,7 +41,7 @@ WITH vlayers AS (
   )
   UNION SELECT * FROM compare_layer_feature_count(
     'osm_water_polygon_*',
-    array['osm_water_polygon_gen1', 'osm_water_polygon'],
+    array['osm_water_polygon_gen1', 'osm_water_polygon', 'osm_water_point'],
     array['water_layer', 'water_label_layer']
   )
   UNION SELECT * FROM compare_layer_feature_count(