Import both area and webmerc_area, use area for filtering (#198)

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:

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
-

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:

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:

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:

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

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