Contours

.gitignore

@@ -19,11 +19,13 @@ data/*.dbf
 data/*.prj
 data/*.shx
 data/*.qpj
+data/*.qmd
 data/wof_neighbourhoods.pgdump
 data/*.README.html
 data/*.VERSION.txt
 data/*.json
 data/wikidata_snapshot.sql
+data/wof_snapshot.sql
 
 # python compiled bytecode and development files
 *.pyc

data/Makefile-prepare-data.jinja2

@@ -1,7 +1,7 @@
 # clip input to the bounds of EPSG:3857 _before_ projecting. this ensures that
 # there are no unprojectable points, but that the data fills the all the way to
 # the corners of the world.
-OGR_CLIP_OPTS=-clipsrc -180 -85.051128779806604 180 85.051128779806604
+OGR_CLIP_OPTS=
 
 all: download shapefiles
 

data/functions.sql

@@ -127,15 +127,16 @@ FROM (
     unnest(tags) AS unnested
   FROM (
     SELECT
-      mz_modify_network(hstore(tags))->ARRAY['route','network','ref'] AS tags
+      mz_modify_network(hstore(tags))->ARRAY['route','network','ref','osmc:symbol'] AS tags
     FROM
       planet_osm_rels
     WHERE
       parts && ARRAY[way_id] AND
       parts[way_off+1:rel_off] && ARRAY[way_id] AND
       hstore(tags) ? 'route' AND
       (hstore(tags) ? 'network' OR
-       hstore(tags) ? 'ref')
+       hstore(tags) ? 'ref') AND
+      hstore(tags) ? 'osmc:symbol'
     ) inner1
   ) inner2;
 $$ LANGUAGE sql STABLE;

data/perform-sql-updates.sh

@@ -61,8 +61,8 @@ echo -e "\nFixing short_name region (state) abbreviation labels in OSM"
 psql $PSQLOPTS  $@ -f apply-short_name_fixes.sql
 
 # Some major roads in Seattle, Washington, USA are misstagged in Daylight 1.15
-echo -e "\nFixing funky road classification in Seattle, Washington, USA in OSM"
-psql $PSQLOPTS  $@ -f apply-highway_99_fixes.sql
+#echo -e "\nFixing funky road classification in Seattle, Washington, USA in OSM"
+#psql $PSQLOPTS  $@ -f apply-highway_99_fixes.sql
 
 # apply updates in parallel across tables
 echo -e "\nApplying updates in parallel across tables..."

queries.yaml

@@ -153,11 +153,15 @@ sources:
     - template: buffered_land.jinja2
       start_zoom: 8
 
+  contours:
+    - template: contours.jinja2
+      start_zoom: 13
+
 layers:
   water:
     geometry_types: [Point, MultiPoint, Polygon, MultiPolygon, LineString, MultiLineString]
     simplify_before_intersect: true
-    simplify_start: 0
+    simplify_start: 8
     transform:
       - vectordatasource.transform.tags_create_dict
       - vectordatasource.transform.tags_name_i18n
@@ -167,21 +171,21 @@ layers:
       - vectordatasource.transform.add_id_to_properties
       - vectordatasource.transform.detect_osm_relation
       - vectordatasource.transform.remove_feature_id
-      - vectordatasource.transform.truncate_min_zoom_to_1dp
+      - vectordatasource.transform.truncate_min_zoom_to_2dp
     sort: vectordatasource.sort.water
     area-inclusion-threshold: 1
   earth:
     geometry_types: [Point, MultiPoint, Polygon, MultiPolygon, LineString, MultiLineString]
     simplify_before_intersect: true
-    simplify_start: 0
+    simplify_start: 8
     transform:
       - vectordatasource.transform.tags_create_dict
       - vectordatasource.transform.tags_name_i18n
       - vectordatasource.transform.tags_remove
       - vectordatasource.transform.detect_osm_relation
       - vectordatasource.transform.add_id_to_properties
       - vectordatasource.transform.remove_feature_id
-      - vectordatasource.transform.truncate_min_zoom_to_1dp
+      - vectordatasource.transform.truncate_min_zoom_to_2dp
     sort: vectordatasource.sort.earth
     area-inclusion-threshold: 1
   places:
@@ -216,13 +220,13 @@ layers:
       - vectordatasource.transform.remove_feature_id
       - vectordatasource.transform.normalize_operator_values
       - vectordatasource.transform.major_airport_detector
-      - vectordatasource.transform.truncate_min_zoom_to_1dp
+      - vectordatasource.transform.truncate_min_zoom_to_2dp
     sort: vectordatasource.sort.landuse
     area-inclusion-threshold: 1
   roads:
     geometry_types: [LineString, MultiLineString]
-    simplify_start: 4
-    tolerance: 1.0
+    simplify_start: 8
+    tolerance: 2.0
     transform:
       - vectordatasource.transform.tags_create_dict
       - vectordatasource.transform.tags_name_i18n
@@ -241,7 +245,7 @@ layers:
       - vectordatasource.transform.road_trim_properties
       - vectordatasource.transform.remove_feature_id
       - vectordatasource.transform.tags_remove
-      - vectordatasource.transform.truncate_min_zoom_to_1dp
+      - vectordatasource.transform.truncate_min_zoom_to_2dp
     sort: vectordatasource.sort.roads
     area-inclusion-threshold: 1
   buildings:
@@ -263,7 +267,7 @@ layers:
       - vectordatasource.transform.normalize_tourism_kind
       - vectordatasource.transform.building_trim_properties
       - vectordatasource.transform.remove_feature_id
-      - vectordatasource.transform.truncate_min_zoom_to_1dp
+      - vectordatasource.transform.truncate_min_zoom_to_2dp
     sort: vectordatasource.sort.buildings
     area-inclusion-threshold: 1
   pois:
@@ -288,22 +292,22 @@ layers:
       - vectordatasource.transform.major_airport_detector
       - vectordatasource.transform.elevation_to_meters
       - vectordatasource.transform.normalize_operator_values
-      - vectordatasource.transform.truncate_min_zoom_to_1dp
+      - vectordatasource.transform.truncate_min_zoom_to_2dp
     sort: vectordatasource.sort.pois
     area-inclusion-threshold: 1
   boundaries:
     geometry_types: [Polygon, MultiPolygon, LineString, MultiLineString]
     simplify_before_intersect: true
-    simplify_start: 0
-    tolerance: 1.0
+    simplify_start: 8
+    tolerance: 2.0
     transform:
       - vectordatasource.transform.tags_create_dict
       - vectordatasource.transform.tags_name_i18n
       - vectordatasource.transform.admin_level_as_int
       - vectordatasource.transform.add_id_to_properties
       - vectordatasource.transform.detect_osm_relation
       - vectordatasource.transform.remove_feature_id
-      - vectordatasource.transform.truncate_min_zoom_to_1dp
+      - vectordatasource.transform.truncate_min_zoom_to_2dp
       - vectordatasource.transform.remap_viewpoint_kinds
       - vectordatasource.transform.unpack_viewpoint_claims
       # note: the next line needs to come after anything else that touches the kind:XX values.
@@ -314,7 +318,7 @@ layers:
     area-inclusion-threshold: 1
   transit:
     geometry_types: [LineString, MultiLineString, Polygon, MultiPolygon]
-    simplify_start: 5
+    simplify_start: 8
     tolerance: 1.0
     transform:
       - vectordatasource.transform.tags_create_dict
@@ -326,7 +330,7 @@ layers:
       - vectordatasource.transform.route_name
       - vectordatasource.transform.parse_layer_as_float
       - vectordatasource.transform.remove_feature_id
-      - vectordatasource.transform.truncate_min_zoom_to_1dp
+      - vectordatasource.transform.truncate_min_zoom_to_2dp
     sort: vectordatasource.sort.transit
     area-inclusion-threshold: 1
   admin_areas:
@@ -341,6 +345,15 @@ layers:
       - vectordatasource.transform.add_id_to_properties
       - vectordatasource.transform.remove_feature_id
     area-inclusion-threshold: 1
+  contours:
+    geometry_types: [LineString, MultiLineString]
+    simplify_start: 999
+    tolerance: 2.0
+    transform:
+      - vectordatasource.transform.tags_create_dict
+      - vectordatasource.transform.tags_name_i18n
+      - vectordatasource.transform.tags_remove
+    area-inclusion-threshold: 1
   # optional inline layer, if the file is found on disk it will be used
   landmarks:
     geometry_types: [Point, Polygon, MultiPolygon]
@@ -397,6 +410,7 @@ post_process:
         scree: barren
         shingle: barren
         stone: barren
+        fell: barren
 
         # desert
         bare_rock: desert
@@ -504,6 +518,15 @@ post_process:
     params:
       source_layer: transit
       target_value_type: int
+  - fn: vectordatasource.transform.csv_match_properties
+    resources:
+      matcher:
+        type: file
+        init_fn: vectordatasource.transform.CSVMatcher
+        path: spreadsheets/sort_rank/contours.csv
+    params:
+      source_layer: contours
+      target_value_type: int
   # this needs to run before the water sort_rank csv matcher
   - fn: vectordatasource.transform.exterior_boundaries
     params:
@@ -777,7 +800,7 @@ post_process:
     params:
       source_layer: boundaries
       start_zoom: 0
-      end_zoom: 14
+      end_zoom: 11
       properties:
         - id
         - "id:left"
@@ -947,7 +970,6 @@ post_process:
       properties:
         - id
         - area
-        - boundary
         - layer
         - wikidata_id
         - osm_relation
@@ -1895,7 +1917,6 @@ post_process:
         - addr_housenumber
         - addr_street
         - osm_relation
-      exclude: ['superseded_by']
       # NOTE: max_merged_features is set to keep the time taken for geometry
       # merging down, as it seems to go up with the square of the number of
       # features.

queries/contours.jinja2

@@ -0,0 +1,30 @@
+SELECT
+
+  osm_id AS __id__,
+
+  {% filter geometry %}{{ bounds['line']|bbox_intersection('way') }}{% endfilter %} AS __geometry__,
+
+  -- common properties across all layers
+  jsonb_build_object(
+    'source', 'viewfinderpanoramas.org',
+    'min_zoom', 13,
+    'ele', ele
+  ) AS __contours_properties__
+
+FROM (
+
+  SELECT
+
+    osm_id,
+    ele,
+    way
+
+  FROM
+
+    contours
+
+  WHERE
+
+    {{ bounds['line']|bbox_filter('way', 3857) }}
+
+) p

requirements.txt

@@ -3,6 +3,7 @@ argparse==1.4.0
 ASTFormatter==0.6.4
 boto==2.49.0
 edtf==2.6.0
+fiona==1.8.22
 future==0.16.0
 gunicorn==19.9.0
 hanzidentifier==1.0.2
@@ -25,10 +26,11 @@ Shapely==1.6.2.post1
 simplejson==3.12.0
 six==1.11.0
 StreetNames==0.1.5
-git+https://github.com/tilezen/tilequeue@master#egg=tilequeue
+git+https://github.com/rwrx/tilequeue@master#egg=tilequeue
 git+https://github.com/tilezen/tileserver@master#egg=tileserver
 tqdm==4.31.1
 urllib3==1.25.11
 webcolors<=1.11 ## Last version to support py2
 Werkzeug<=0.16.1
 wsgiref==0.1.2
+zope.dottedname==4.2

spreadsheets/collision_rank.yaml

@@ -676,7 +676,7 @@
 - {$layer: 'landuse', kind: 'land'}
 - {$layer: 'landuse', kind: 'dam'}
 - {$layer: 'landuse', kind: 'groyne'}
-- {$layer: 'landuse', kind: 'dike'}
+- {$layer: 'landuse', kind: 'dyke'}
 - {$layer: 'landuse', kind: 'pier'}
 - {$layer: 'landuse', kind: 'bridge'}
 - {$layer: 'pois', kind: 'stop_area'}
@@ -1020,5 +1020,8 @@
 - {$layer: 'pois', kind: 'waste_basket'}
 - {$layer: 'pois', kind: 'water_point'}
 - {$layer: 'pois', kind: 'watering_place'}
+# for contours
+- _reserved: {count: 10}
+- {$layer: 'contours', kind: 'contour'}
 # catch-all, assign lowest priority
 - { $layer: true }

spreadsheets/sort_rank/contours.csv

@@ -0,0 +1,2 @@
+kind,sort_rank
+*,225

spreadsheets/sort_rank/landuse.csv

@@ -13,7 +13,7 @@ tree_row,*,264
 hedge,*,263
 bridge,*,229
 pier,*,228
-dike,*,227
+dyke,*,227
 cutline,*,226
 groyne,*,225
 breakwater,*,224

spreadsheets/sort_rank/water.csv

@@ -9,6 +9,7 @@ layer::int,kind,boundary,sort_rank
 -3,riverbank,-,7
 -4,riverbank,-,6
 -5,riverbank,-,5
+*,weir,-,205
 *,riverbank,-,204
 *,playa,-,203
 -1,river,-,9

test/test_meta.py

@@ -81,12 +81,12 @@ def setUpClass(cls):
         cls.layer_data, cls.by_name = make_layer_data_props()
 
     def test_layer_data_count(self):
-        self.assertEquals(10, len(self.layer_data))
+        self.assertEquals(11, len(self.layer_data))
 
     def test_layer_names(self):
         exp_layers = set(('landuse', 'pois', 'transit', 'water', 'places',
                           'boundaries', 'buildings', 'roads', 'earth',
-                          'admin_areas'))
+                          'admin_areas', 'contours'))
         self.assertEquals(exp_layers, set(self.by_name.keys()))
 
     def test_layers_called_empty_feature(self):