fixes #593 by moving all path like ways to zoom 13; remove bogus high…

…way=minor and highway=footpath
tilezen · Apr 5, 2016 · d002653 · d002653
1 parent 0631907
commit d002653
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/data/functions.sql b/data/functions.sql
@@ -42,10 +42,10 @@ BEGIN
     WHEN highway_val IN ('secondary')                                         THEN 10
     WHEN highway_val IN ('motorway_link', 'tertiary')                         THEN 11
     WHEN highway_val IN ('trunk_link', 'residential', 'unclassified', 'road') THEN 12
-    WHEN highway_val IN ('primary_link', 'secondary_link', 'track',
-                         'pedestrian', 'living_street', 'path')               THEN 13
-    WHEN highway_val IN ('tertiary_link', 'minor', 'footpath', 'footway',
-                         'steps', 'cycleway')                                 THEN 14
+    WHEN highway_val IN ('primary_link', 'secondary_link',
+                         'pedestrian', 'living_street', 'track',
+                         'path', 'footway', 'steps', 'cycleway')              THEN 13
+    WHEN highway_val IN ('tertiary_link')                                     THEN 14
     WHEN highway_val = 'service' THEN CASE
       WHEN service_val IS NULL                                                THEN 14
       WHEN service_val = 'alley'                                              THEN 13

diff --git a/data/migrations/v0.10.0-line.sql b/data/migrations/v0.10.0-line.sql
@@ -6,7 +6,7 @@ UPDATE planet_osm_line
   SET mz_road_level = mz_calculate_road_level(highway, railway, aeroway, route,
     service, aerialway, leisure, sport, man_made, way)
   WHERE
-    highway = 'path';
+    highway IN ('path', 'footpath', 'footway', 'steps', 'cycleway', 'minor');
 
 CREATE INDEX new_planet_osm_line_water_geom_9_index ON planet_osm_line USING gist(way) WHERE mz_water_min_zoom <= 9;
 CREATE INDEX new_planet_osm_line_water_geom_12_index ON planet_osm_line USING gist(way) WHERE mz_water_min_zoom <= 12;
@@ -20,5 +20,4 @@ BEGIN;
   ALTER INDEX new_planet_osm_line_water_geom_9_index RENAME TO planet_osm_line_water_geom_9_index;
   ALTER INDEX new_planet_osm_line_water_geom_12_index RENAME TO planet_osm_line_water_geom_12_index;
   ALTER INDEX new_planet_osm_line_water_geom_15_index RENAME TO planet_osm_line_water_geom_15_index;
-COMMIT;
-
+COMMIT;
diff --git a/spreadsheets/roads.csv b/spreadsheets/roads.csv
@@ -23,8 +23,8 @@ zoom::int,layer::int,kind,highway,type,railway,aeroway,service,aerialway,is_brid
 >=15,-,minor_road,*,*,*,taxiway,*,*,yes,-,426
 >=15,-,highway,motorway_link;trunk_link;primary_link;secondary_link;tertiary_link,*,*,*,*,*,yes,-,425
 >=15,-,minor_road,residential;unclassified;road;living_street,*,*,*,*,*,yes,-,410
->=15,-,minor_road,service;minor,*,*,*,-,*,yes,-,408
->=15,-,minor_road,service;minor,*,*,*,*,*,yes,-,406
+>=15,-,minor_road,service,*,*,*,-,*,yes,-,408
+>=15,-,minor_road,service,*,*,*,*,*,yes,-,406
 >=15,-,rail,*,*,rail;tram;light_rail;narrow_gauge;monorail;subway;funicular,*,spur;siding,*,yes,-,411
 >=15,-,rail,*,*,rail;tram;light_rail;narrow_gauge;monorail;subway;funicular,*,yard,*,yes,-,409
 >=15,-,rail,*,*,rail;tram;light_rail;narrow_gauge;monorail;subway;funicular,*,+,*,yes,-,407
@@ -40,8 +40,8 @@ zoom::int,layer::int,kind,highway,type,railway,aeroway,service,aerialway,is_brid
 >=15,-,minor_road,*,*,*,taxiway,*,*,-,yes,326
 >=15,-,highway,motorway_link;trunk_link;primary_link;secondary_link;tertiary_link,*,*,*,*,*,-,yes,325
 >=15,-,minor_road,residential;unclassified;road;living_street,*,*,*,*,*,-,yes,310
->=15,-,minor_road,service;minor,*,*,*,-,*,-,yes,308
->=15,-,minor_road,service;minor,*,*,*,*,*,-,yes,306
+>=15,-,minor_road,service,*,*,*,-,*,-,yes,308
+>=15,-,minor_road,service,*,*,*,*,*,-,yes,306
 >=15,-,rail,*,*,rail;tram;light_rail;narrow_gauge;monorail;subway;funicular,*,spur;siding,*,-,yes,311
 >=15,-,rail,*,*,rail;tram;light_rail;narrow_gauge;monorail;subway;funicular,*,yard,*,-,yes,309
 >=15,-,rail,*,*,rail;tram;light_rail;narrow_gauge;monorail;subway;funicular,*,+,*,-,yes,307
@@ -62,8 +62,8 @@ zoom::int,layer::int,kind,highway,type,railway,aeroway,service,aerialway,is_brid
 *,*,highway,motorway_link;trunk_link;primary_link;secondary_link;tertiary_link,*,*,*,*,*,*,*,375
 *,*,minor_road,residential;unclassified;road;living_street,*,*,*,*,*,*,*,360
 *,*,*,*,Unknown,*,*,*,*,*,*,360
-*,*,minor_road,service;minor,*,*,*,-,*,*,*,358
-*,*,minor_road,service;minor,*,*,*,*,*,*,*,356
+*,*,minor_road,service,*,*,*,-,*,*,*,358
+*,*,minor_road,service,*,*,*,*,*,*,*,356
 *,*,aerialway,*,*,*,*,*,gondola;cable_car,*,*,442
 *,*,aerialway,*,*,*,*,*,chair_lift,*,*,441
 *,*,aerialway,*,*,*,*,*,+,*,*,440