Contours

queries.yaml

@@ -9,6 +9,7 @@ all:
   - boundaries
   - transit
   - admin_areas
+  - contours
 
 sources:
 
@@ -148,6 +149,10 @@ 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]
@@ -326,6 +331,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
 post_process:
   - fn: vectordatasource.transform.build_fence
     params:
@@ -480,6 +494,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:

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.6
 future==0.16.0
 gunicorn==19.9.0
 hiredis==0.2.0

spreadsheets/collision_rank.yaml

@@ -108,6 +108,9 @@
 - {$layer: 'water', kind: 'sea'}
 - {$layer: 'pois', kind: 'nature_reserve'}
 - {$layer: 'water', kind: 'lake'}
+# for contours
+- _reserved: {count: 10}
+- {$layer: 'contours', kind: 'std'}
 # for shields & etc
 - _reserved: {count: 10}
 - {$layer: 'roads', kind: 'highway', kind_detail: 'motorway'}

spreadsheets/sort_rank/contours.csv

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

vectordatasource/meta/python.py

@@ -580,7 +580,7 @@ def compile(self, matchers, fn_name):
 def parse_layers(yaml_path, output_fn, fn_name_fn):
     layer_data = []
     layers = ('landuse', 'pois', 'transit', 'water', 'places', 'boundaries',
-              'buildings', 'roads', 'earth', 'admin_areas')
+              'buildings', 'roads', 'earth', 'admin_areas', 'contours')
 
     filter_compiler = FilterCompiler()
 

vectordatasource/meta/sql.py

@@ -49,6 +49,9 @@
         'ne_10m_roads',
         'planet_osm_line',
     ],
+    'contours': [
+        'contours',
+    ],
     'transit': [
         'planet_osm_line',
         'planet_osm_polygon',
@@ -683,6 +686,8 @@ def table_is_polygonal(name):
 def calculate_meta_source_for_table(name):
     if table_is_osm(name) or name == 'admin_areas':
         return 'osm'
+    elif name == 'contours':
+        return 'vfp'
     elif name.startswith('ne_'):
         return 'ne'
     elif name.startswith('wof_'):

vectordatasource/sort.py

@@ -95,3 +95,7 @@ def water(features, zoom):
 
 def transit(features, zoom):
     return _sort_features_by_key(features, _by_feature_id)
+
+
+def contours(features, zoom):
+    return _sort_by_area_then_id(features)

yaml/contours.yaml

@@ -0,0 +1,15 @@
+global:
+  - &output_properties
+    source: {col: source}
+    min_zoom: {col: min_zoom}
+    ele: {col: ele}
+
+filters:
+  - filter:
+      geom_type: line
+    min_zoom: 13
+    table: vfp
+    output:
+      <<: *output_properties
+      kind: std
+