From 5b430f4b83bfbedd044cc5b7036bd676bd2da318 Mon Sep 17 00:00:00 2001
From: Lukas Martinelli <me@lukasmartinelli.ch>
Date: Wed, 18 Jan 2017 15:06:24 +0100
Subject: [PATCH] Remove commented out code

---
 layers/boundary/mapping.yaml   |  5 +----
 layers/place/mapping.yaml      | 20 ++++----------------
 layers/water/mapping.yaml      |  2 --
 layers/water_name/mapping.yaml |  2 --
 4 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/layers/boundary/mapping.yaml b/layers/boundary/mapping.yaml
index a5e7034..81b0a89 100644
--- a/layers/boundary/mapping.yaml
+++ b/layers/boundary/mapping.yaml
@@ -37,13 +37,10 @@ tables:
       name: admin_level
       type: integer
     filters:
-      #exclude_tags:
-      #- [ "admin_level", "__nil__" ]
-      #- [ "natural", "coastline" ]
       reject:
         natural:  ["coastline"]
       require:
-        admin_level: ["__any__"]  
+        admin_level: ["__any__"]
     mapping:
       boundary:
       - administrative
diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml
index fff292f..6e42b65 100644
--- a/layers/place/mapping.yaml
+++ b/layers/place/mapping.yaml
@@ -56,10 +56,8 @@ tables:
     - *name
     - *name_en
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
-        name: ["__any__"]      
+        name: ["__any__"]
     mapping:
       place:
       - continent
@@ -84,10 +82,8 @@ tables:
     - *name_ja
     - *rank
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
-        name: ["__any__"]      
+        name: ["__any__"]
     mapping:
       place:
       - country
@@ -114,10 +110,8 @@ tables:
     - *name_ja
     - *rank
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
-        name: ["__any__"]      
+        name: ["__any__"]
     mapping:
       place:
       - island
@@ -142,8 +136,6 @@ tables:
     - *name_ja
     - *rank
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
         name: ["__any__"]
     mapping:
@@ -179,10 +171,8 @@ tables:
       type: string
     - *rank
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
-        name: ["__any__"]      
+        name: ["__any__"]
     mapping:
       place:
       - state
@@ -216,8 +206,6 @@ tables:
       type: string
     - *rank
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
         name: ["__any__"]
     mapping:
diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml
index c7c6d8e..b0bf580 100644
--- a/layers/water/mapping.yaml
+++ b/layers/water/mapping.yaml
@@ -57,8 +57,6 @@ tables:
       key: waterway
       type: string
     filters:
-      #exclude_tags:
-      #- [ "covered", "yes" ]
       reject:
         covered: ["yes"]
     mapping:
diff --git a/layers/water_name/mapping.yaml b/layers/water_name/mapping.yaml
index 14a3ea7..fbeaf39 100644
--- a/layers/water_name/mapping.yaml
+++ b/layers/water_name/mapping.yaml
@@ -17,8 +17,6 @@ tables:
       key: place
       type: string
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
         name: ["__any__"]
     mapping: