From 3e6495a134d358131fe1d95f23d023f7a35c26c6 Mon Sep 17 00:00:00 2001 From: Jiri Kozel Date: Fri, 24 Mar 2017 16:46:21 +0100 Subject: [PATCH] Import both area and webmerc_area, use area for filtering (#198) --- layers/aeroway/mapping.yaml | 2 ++ layers/building/mapping.yaml | 11 ++++++++--- layers/landcover/mapping.yaml | 2 ++ layers/landuse/mapping.yaml | 2 ++ layers/park/mapping.yaml | 2 ++ layers/place/mapping.yaml | 2 ++ layers/water/mapping.yaml | 2 ++ 7 files changed, 20 insertions(+), 3 deletions(-) diff --git a/layers/aeroway/mapping.yaml b/layers/aeroway/mapping.yaml index 718a350..8a984d8 100644 --- a/layers/aeroway/mapping.yaml +++ b/layers/aeroway/mapping.yaml @@ -23,6 +23,8 @@ tables: key: aeroway type: string - name: area + type: area + - name: webmerc_area type: webmerc_area mapping: aeroway: diff --git a/layers/building/mapping.yaml b/layers/building/mapping.yaml index 7656364..0ee97ac 100644 --- a/layers/building/mapping.yaml +++ b/layers/building/mapping.yaml @@ -17,6 +17,8 @@ tables: - name: geometry type: validated_geometry - name: area + type: area + - name: webmerc_area type: webmerc_area - name: building key: building @@ -60,7 +62,7 @@ tables: filters: reject: building: ["no","none","No"] - building:part: ["no","none","No"] + building:part: ["no","none","No"] type: polygon # etldoc: imposm3 -> osm_building_relation @@ -71,6 +73,8 @@ tables: - name: geometry type: validated_geometry - name: area + type: area + - name: webmerc_area type: webmerc_area - name: building key: building @@ -157,6 +161,8 @@ tables: - name: geometry type: validated_geometry - name: area + type: area + - name: webmerc_area type: webmerc_area - name: building key: building @@ -212,6 +218,5 @@ tables: filters: reject: building: ["no","none","No"] - building:part: ["no","none","No"] + building:part: ["no","none","No"] type: relation_member - diff --git a/layers/landcover/mapping.yaml b/layers/landcover/mapping.yaml index aa0bb0f..f2922e0 100644 --- a/layers/landcover/mapping.yaml +++ b/layers/landcover/mapping.yaml @@ -58,6 +58,8 @@ tables: key: wetland type: string - name: area + type: area + - name: webmerc_area type: webmerc_area mapping: landuse: diff --git a/layers/landuse/mapping.yaml b/layers/landuse/mapping.yaml index 7527e8a..ef60365 100644 --- a/layers/landuse/mapping.yaml +++ b/layers/landuse/mapping.yaml @@ -39,6 +39,8 @@ tables: key: leisure type: string - name: area + type: area + - name: webmerc_area type: webmerc_area mapping: amenity: diff --git a/layers/park/mapping.yaml b/layers/park/mapping.yaml index 0649d9a..f0eb129 100644 --- a/layers/park/mapping.yaml +++ b/layers/park/mapping.yaml @@ -67,6 +67,8 @@ tables: key: boundary type: string - name: area + type: area + - name: webmerc_area type: webmerc_area mapping: leisure: diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml index 4177002..431132f 100644 --- a/layers/place/mapping.yaml +++ b/layers/place/mapping.yaml @@ -98,6 +98,8 @@ tables: - name: geometry type: geometry - name: area + type: area + - name: webmerc_area type: webmerc_area - *name - *name_en diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml index 2f81b92..fd9a624 100644 --- a/layers/water/mapping.yaml +++ b/layers/water/mapping.yaml @@ -46,6 +46,8 @@ tables: - name: geometry type: validated_geometry - name: area + type: area + - name: webmerc_area type: webmerc_area - key: name name: name