From 40884b9976e95be3c078a9619b9dfb423da90888 Mon Sep 17 00:00:00 2001
From: ImreSamu <ImreSamu@users.noreply.github.com>
Date: Sat, 7 Jan 2017 14:55:08 +0100
Subject: [PATCH] imposm3 mapping change to the new reject/require syntax

---
 layers/boundary/mapping.yaml   | 10 +++++++---
 layers/building/mapping.yaml   | 10 ++++++----
 layers/place/mapping.yaml      | 36 ++++++++++++++++++++++------------
 layers/water/mapping.yaml      |  6 ++++--
 layers/water_name/mapping.yaml |  6 ++++--
 5 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/layers/boundary/mapping.yaml b/layers/boundary/mapping.yaml
index 5eee06e4..a5e70348 100644
--- a/layers/boundary/mapping.yaml
+++ b/layers/boundary/mapping.yaml
@@ -37,9 +37,13 @@ tables:
       name: admin_level
       type: integer
     filters:
-      exclude_tags:
-      - [ "admin_level", "__nil__" ]
-      - [ "natural", "coastline" ]
+      #exclude_tags:
+      #- [ "admin_level", "__nil__" ]
+      #- [ "natural", "coastline" ]
+      reject:
+        natural:  ["coastline"]
+      require:
+        admin_level: ["__any__"]  
     mapping:
       boundary:
       - administrative
diff --git a/layers/building/mapping.yaml b/layers/building/mapping.yaml
index e4489f09..f4c4e85c 100644
--- a/layers/building/mapping.yaml
+++ b/layers/building/mapping.yaml
@@ -42,8 +42,10 @@ tables:
       - terminal
       - hangar
     filters:
-      exclude_tags:
-      - [ "building", "no" ]
-      - [ "building", "none" ]
-      - [ "building", "No" ]
+      # exclude_tags:
+      # - [ "building", "no" ]
+      # - [ "building", "none" ]
+      # - [ "building", "No" ]
+      reject:
+        building: ["no","none","No"]    
     type: polygon
diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml
index ab14e415..fff292fa 100644
--- a/layers/place/mapping.yaml
+++ b/layers/place/mapping.yaml
@@ -56,8 +56,10 @@ tables:
     - *name
     - *name_en
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      #exclude_tags:
+      #- [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]      
     mapping:
       place:
       - continent
@@ -82,8 +84,10 @@ tables:
     - *name_ja
     - *rank
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      #exclude_tags:
+      #- [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]      
     mapping:
       place:
       - country
@@ -110,8 +114,10 @@ tables:
     - *name_ja
     - *rank
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      #exclude_tags:
+      #- [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]      
     mapping:
       place:
       - island
@@ -136,8 +142,10 @@ tables:
     - *name_ja
     - *rank
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      #exclude_tags:
+      #- [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]
     mapping:
       place:
       - island
@@ -171,8 +179,10 @@ tables:
       type: string
     - *rank
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      #exclude_tags:
+      #- [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]      
     mapping:
       place:
       - state
@@ -206,8 +216,10 @@ tables:
       type: string
     - *rank
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      #exclude_tags:
+      #- [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]
     mapping:
       place:
       - city
diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml
index e923fb08..c7c6d8e6 100644
--- a/layers/water/mapping.yaml
+++ b/layers/water/mapping.yaml
@@ -57,8 +57,10 @@ tables:
       key: waterway
       type: string
     filters:
-      exclude_tags:
-      - [ "covered", "yes" ]
+      #exclude_tags:
+      #- [ "covered", "yes" ]
+      reject:
+        covered: ["yes"]
     mapping:
       landuse:
       - reservoir
diff --git a/layers/water_name/mapping.yaml b/layers/water_name/mapping.yaml
index c1d35cce..14a3ea7f 100644
--- a/layers/water_name/mapping.yaml
+++ b/layers/water_name/mapping.yaml
@@ -17,8 +17,10 @@ tables:
       key: place
       type: string
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      #exclude_tags:
+      #- [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]
     mapping:
       place:
       - ocean