From f345fe54a874372e94f403410672f18241af2b34 Mon Sep 17 00:00:00 2001
From: Stefan Siegl <stesie@brokenpipe.de>
Date: Sun, 21 Mar 2021 11:23:45 +0100
Subject: [PATCH] Use nwr[] shortcut in all overpass queries

---
 layers/overpass/amenity/financial/atm.geojson                 | 4 ++--
 layers/overpass/amenity/financial/bank.geojson                | 4 ++--
 layers/overpass/amenity/others/bench.geojson                  | 4 ++--
 layers/overpass/amenity/others/kneipp_water_cure.geojson      | 2 +-
 layers/overpass/amenity/others/public_bath.geojson            | 2 +-
 layers/overpass/amenity/others/shelter.geojson                | 2 +-
 layers/overpass/amenity/others/shower.geojson                 | 2 +-
 layers/overpass/amenity/others/telephone.geojson              | 2 +-
 layers/overpass/amenity/others/toilets.geojson                | 2 +-
 layers/overpass/amenity/others/water_point.geojson            | 2 +-
 layers/overpass/amenity/sustenance/bar.geojson                | 2 +-
 layers/overpass/amenity/sustenance/bbq.geojson                | 4 ++--
 layers/overpass/amenity/sustenance/biergarten.geojson         | 2 +-
 layers/overpass/amenity/sustenance/cafe.geojson               | 2 +-
 layers/overpass/amenity/sustenance/drinking_water.geojson     | 2 +-
 layers/overpass/amenity/sustenance/fast_food.geojson          | 2 +-
 layers/overpass/amenity/sustenance/food_court.geojson         | 2 +-
 layers/overpass/amenity/sustenance/ice_cream.geojson          | 2 +-
 layers/overpass/amenity/sustenance/pub.geojson                | 2 +-
 layers/overpass/amenity/sustenance/restaurant.geojson         | 2 +-
 .../overpass/amenity/transportation/bicycle_parking.geojson   | 2 +-
 layers/overpass/amenity/transportation/bicycle_rental.geojson | 2 +-
 .../amenity/transportation/bicycle_repair_station.geojson     | 2 +-
 layers/overpass/amenity/transportation/boat_rental.geojson    | 2 +-
 layers/overpass/amenity/transportation/boat_sharing.geojson   | 2 +-
 layers/overpass/amenity/transportation/bus_station.geojson    | 2 +-
 layers/overpass/amenity/transportation/car_rental.geojson     | 2 +-
 layers/overpass/amenity/transportation/car_sharing.geojson    | 2 +-
 layers/overpass/amenity/transportation/car_wash.geojson       | 2 +-
 .../overpass/amenity/transportation/charging_station.geojson  | 2 +-
 layers/overpass/amenity/transportation/ferry_terminal.geojson | 2 +-
 layers/overpass/amenity/transportation/fuel.geojson           | 2 +-
 layers/overpass/amenity/transportation/grit_bin.geojson       | 2 +-
 .../amenity/transportation/motorcycle_parking.geojson         | 2 +-
 layers/overpass/amenity/transportation/parking.geojson        | 2 +-
 .../overpass/amenity/transportation/parking_entrance.geojson  | 2 +-
 layers/overpass/amenity/transportation/parking_space.geojson  | 2 +-
 layers/overpass/amenity/transportation/taxi.geojson           | 2 +-
 .../amenity/transportation/vehicle_inspection.geojson         | 2 +-
 layers/overpass/shop/food/bakery.geojson                      | 2 +-
 layers/overpass/shop/food/beverages.geojson                   | 2 +-
 layers/overpass/shop/food/butcher.geojson                     | 2 +-
 layers/overpass/shop/food/cheese.geojson                      | 2 +-
 layers/overpass/shop/food/coffee.geojson                      | 2 +-
 layers/overpass/shop/food/convenience.geojson                 | 2 +-
 layers/overpass/shop/food/greengrocer.geojson                 | 2 +-
 layers/overpass/shop/food/health_food.geojson                 | 2 +-
 layers/overpass/shop/food/ice_cream.geojson                   | 2 +-
 layers/overpass/shop/food/organic.geojson                     | 2 +-
 layers/overpass/tourism/apartment.geojson                     | 2 +-
 layers/overpass/tourism/artwork.geojson                       | 2 +-
 layers/overpass/tourism/attraction.geojson                    | 2 +-
 layers/overpass/tourism/camp_site.geojson                     | 2 +-
 layers/overpass/tourism/caravan_site.geojson                  | 2 +-
 layers/overpass/tourism/chalet.geojson                        | 2 +-
 layers/overpass/tourism/gallery.geojson                       | 2 +-
 layers/overpass/tourism/guest_house.geojson                   | 2 +-
 layers/overpass/tourism/hostel.geojson                        | 2 +-
 layers/overpass/tourism/hotel.geojson                         | 2 +-
 layers/overpass/tourism/information.geojson                   | 2 +-
 layers/overpass/tourism/motel.geojson                         | 2 +-
 layers/overpass/tourism/museum.geojson                        | 2 +-
 layers/overpass/tourism/picnic_site.geojson                   | 2 +-
 layers/overpass/tourism/viewpoint.geojson                     | 2 +-
 layers/overpass/tourism/wilderness_hut.geojson                | 2 +-
 65 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/layers/overpass/amenity/financial/atm.geojson b/layers/overpass/amenity/financial/atm.geojson
index 5d58833..01c609d 100644
--- a/layers/overpass/amenity/financial/atm.geojson
+++ b/layers/overpass/amenity/financial/atm.geojson
@@ -5,7 +5,7 @@
     "id": "atm",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=atm]; node[amenity=bank][atm][atm!=no]; way[amenity=bank][atm][atm!=no];);"
+    "query": "(nwr[amenity=atm]; nwr[amenity=bank][atm][atm!=no];);"
   },
   "type": "Feature"
-}
\ No newline at end of file
+}
diff --git a/layers/overpass/amenity/financial/bank.geojson b/layers/overpass/amenity/financial/bank.geojson
index 40e12d1..37413f2 100644
--- a/layers/overpass/amenity/financial/bank.geojson
+++ b/layers/overpass/amenity/financial/bank.geojson
@@ -5,7 +5,7 @@
     "id": "bank",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=bank]; way[amenity=bank];);"
+    "query": "nwr[amenity=bank];"
   },
   "type": "Feature"
-}
\ No newline at end of file
+}
diff --git a/layers/overpass/amenity/others/bench.geojson b/layers/overpass/amenity/others/bench.geojson
index ac657fc..8db612f 100644
--- a/layers/overpass/amenity/others/bench.geojson
+++ b/layers/overpass/amenity/others/bench.geojson
@@ -5,7 +5,7 @@
     "id": "bench",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "node[amenity=bench];"
+    "query": "nwr[amenity=bench];"
   },
   "type": "Feature"
-}
\ No newline at end of file
+}
diff --git a/layers/overpass/amenity/others/kneipp_water_cure.geojson b/layers/overpass/amenity/others/kneipp_water_cure.geojson
index cb112a7..9ca3c08 100644
--- a/layers/overpass/amenity/others/kneipp_water_cure.geojson
+++ b/layers/overpass/amenity/others/kneipp_water_cure.geojson
@@ -5,7 +5,7 @@
     "id": "kneipp_water_cure",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=kneipp_water_cure]; way[amenity=kneipp_water_cure];);"
+    "query": "nwr[amenity=kneipp_water_cure];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/others/public_bath.geojson b/layers/overpass/amenity/others/public_bath.geojson
index dd43dcc..717f347 100644
--- a/layers/overpass/amenity/others/public_bath.geojson
+++ b/layers/overpass/amenity/others/public_bath.geojson
@@ -5,7 +5,7 @@
     "id": "public_bath",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=public_bath]; way[amenity=public_bath];);"
+    "query": "nwr[amenity=public_bath];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/others/shelter.geojson b/layers/overpass/amenity/others/shelter.geojson
index 4345031..2c68553 100644
--- a/layers/overpass/amenity/others/shelter.geojson
+++ b/layers/overpass/amenity/others/shelter.geojson
@@ -5,7 +5,7 @@
     "id": "shelter",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=shelter]; way[amenity=shelter];);"
+    "query": "nwr[amenity=shelter];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/others/shower.geojson b/layers/overpass/amenity/others/shower.geojson
index 1d362a5..1c33a0f 100644
--- a/layers/overpass/amenity/others/shower.geojson
+++ b/layers/overpass/amenity/others/shower.geojson
@@ -5,7 +5,7 @@
     "id": "shower",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=shower]; way[amenity=shower];);"
+    "query": "nwr[amenity=shower];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/others/telephone.geojson b/layers/overpass/amenity/others/telephone.geojson
index 2274f74..9195f74 100644
--- a/layers/overpass/amenity/others/telephone.geojson
+++ b/layers/overpass/amenity/others/telephone.geojson
@@ -5,7 +5,7 @@
     "id": "telephone",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "node[amenity=telephone];"
+    "query": "nwr[amenity=telephone];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/others/toilets.geojson b/layers/overpass/amenity/others/toilets.geojson
index 7f65e2d..bde8d98 100644
--- a/layers/overpass/amenity/others/toilets.geojson
+++ b/layers/overpass/amenity/others/toilets.geojson
@@ -5,7 +5,7 @@
     "id": "toilets",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=toilets]; way[amenity=toilets];);"
+    "query": "nwr[amenity=toilets];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/others/water_point.geojson b/layers/overpass/amenity/others/water_point.geojson
index bd32f78..8f5dc56 100644
--- a/layers/overpass/amenity/others/water_point.geojson
+++ b/layers/overpass/amenity/others/water_point.geojson
@@ -5,7 +5,7 @@
     "id": "water_point",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "node[amenity=water_point];"
+    "query": "nwr[amenity=water_point];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/sustenance/bar.geojson b/layers/overpass/amenity/sustenance/bar.geojson
index e862300..c2655ba 100644
--- a/layers/overpass/amenity/sustenance/bar.geojson
+++ b/layers/overpass/amenity/sustenance/bar.geojson
@@ -5,7 +5,7 @@
     "id": "bar",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=bar]; way[amenity=bar];);"
+    "query": "nwr[amenity=bar];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/sustenance/bbq.geojson b/layers/overpass/amenity/sustenance/bbq.geojson
index 7951801..ad25235 100644
--- a/layers/overpass/amenity/sustenance/bbq.geojson
+++ b/layers/overpass/amenity/sustenance/bbq.geojson
@@ -1,11 +1,11 @@
 {
   "geometry": null,
   "properties": {
-    "name": "Bbq",
+    "name": "BBQ",
     "id": "bbq",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "node[amenity=bbq];"
+    "query": "nwr[amenity=bbq];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/sustenance/biergarten.geojson b/layers/overpass/amenity/sustenance/biergarten.geojson
index c4da215..5e27630 100644
--- a/layers/overpass/amenity/sustenance/biergarten.geojson
+++ b/layers/overpass/amenity/sustenance/biergarten.geojson
@@ -5,7 +5,7 @@
     "id": "biergarten",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=biergarten]; way[amenity=biergarten];);"
+    "query": "nwr[amenity=biergarten];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/sustenance/cafe.geojson b/layers/overpass/amenity/sustenance/cafe.geojson
index f8c3dda..64f248d 100644
--- a/layers/overpass/amenity/sustenance/cafe.geojson
+++ b/layers/overpass/amenity/sustenance/cafe.geojson
@@ -5,7 +5,7 @@
     "id": "cafe",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=cafe]; way[amenity=cafe];);"
+    "query": "nwr[amenity=cafe];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/sustenance/drinking_water.geojson b/layers/overpass/amenity/sustenance/drinking_water.geojson
index 0b36d34..1b148db 100644
--- a/layers/overpass/amenity/sustenance/drinking_water.geojson
+++ b/layers/overpass/amenity/sustenance/drinking_water.geojson
@@ -5,7 +5,7 @@
     "id": "drinking_water",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "node[amenity=drinking_water];"
+    "query": "nwr[amenity=drinking_water];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/sustenance/fast_food.geojson b/layers/overpass/amenity/sustenance/fast_food.geojson
index a104fba..1ac1272 100644
--- a/layers/overpass/amenity/sustenance/fast_food.geojson
+++ b/layers/overpass/amenity/sustenance/fast_food.geojson
@@ -5,7 +5,7 @@
     "id": "fast_food",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=fast_food]; way[amenity=fast_food];);"
+    "query": "nwr[amenity=fast_food];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/sustenance/food_court.geojson b/layers/overpass/amenity/sustenance/food_court.geojson
index 0f429f9..dd61c01 100644
--- a/layers/overpass/amenity/sustenance/food_court.geojson
+++ b/layers/overpass/amenity/sustenance/food_court.geojson
@@ -5,7 +5,7 @@
     "id": "food_court",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=food_court]; way[amenity=food_court];);"
+    "query": "nwr[amenity=food_court];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/sustenance/ice_cream.geojson b/layers/overpass/amenity/sustenance/ice_cream.geojson
index efa7196..c1d4136 100644
--- a/layers/overpass/amenity/sustenance/ice_cream.geojson
+++ b/layers/overpass/amenity/sustenance/ice_cream.geojson
@@ -5,7 +5,7 @@
     "id": "ice_cream",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=ice_cream]; way[amenity=ice_cream];);"
+    "query": "nwr[amenity=ice_cream];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/sustenance/pub.geojson b/layers/overpass/amenity/sustenance/pub.geojson
index 3c89ac2..2e6c666 100644
--- a/layers/overpass/amenity/sustenance/pub.geojson
+++ b/layers/overpass/amenity/sustenance/pub.geojson
@@ -5,7 +5,7 @@
     "id": "pub",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=pub]; way[amenity=pub];);"
+    "query": "nwr[amenity=pub];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/sustenance/restaurant.geojson b/layers/overpass/amenity/sustenance/restaurant.geojson
index 6ce7564..d5f5fe6 100644
--- a/layers/overpass/amenity/sustenance/restaurant.geojson
+++ b/layers/overpass/amenity/sustenance/restaurant.geojson
@@ -5,7 +5,7 @@
     "id": "restaurant",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=restaurant]; way[amenity=restaurant];);"
+    "query": "nwr[amenity=restaurant];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/bicycle_parking.geojson b/layers/overpass/amenity/transportation/bicycle_parking.geojson
index beb2fde..c937325 100644
--- a/layers/overpass/amenity/transportation/bicycle_parking.geojson
+++ b/layers/overpass/amenity/transportation/bicycle_parking.geojson
@@ -5,7 +5,7 @@
     "id": "bicycle_parking",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=bicycle_parking]; way[amenity=bicycle_parking];);"
+    "query": "nwr[amenity=bicycle_parking];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/bicycle_rental.geojson b/layers/overpass/amenity/transportation/bicycle_rental.geojson
index 2bd49aa..87be338 100644
--- a/layers/overpass/amenity/transportation/bicycle_rental.geojson
+++ b/layers/overpass/amenity/transportation/bicycle_rental.geojson
@@ -5,7 +5,7 @@
     "id": "bicycle_rental",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=bicycle_rental]; way[amenity=bicycle_rental];);"
+    "query": "nwr[amenity=bicycle_rental];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/bicycle_repair_station.geojson b/layers/overpass/amenity/transportation/bicycle_repair_station.geojson
index ae89666..06585f8 100644
--- a/layers/overpass/amenity/transportation/bicycle_repair_station.geojson
+++ b/layers/overpass/amenity/transportation/bicycle_repair_station.geojson
@@ -5,7 +5,7 @@
     "id": "bicycle_repair_station",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=bicycle_repair_station]; way[amenity=bicycle_repair_station];);"
+    "query": "nwr[amenity=bicycle_repair_station];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/boat_rental.geojson b/layers/overpass/amenity/transportation/boat_rental.geojson
index bd0cc69..7925cd4 100644
--- a/layers/overpass/amenity/transportation/boat_rental.geojson
+++ b/layers/overpass/amenity/transportation/boat_rental.geojson
@@ -5,7 +5,7 @@
     "id": "boat_rental",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=boat_rental]; way[amenity=boat_rental];);"
+    "query": "nwr[amenity=boat_rental];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/boat_sharing.geojson b/layers/overpass/amenity/transportation/boat_sharing.geojson
index 49f2289..bb90f8c 100644
--- a/layers/overpass/amenity/transportation/boat_sharing.geojson
+++ b/layers/overpass/amenity/transportation/boat_sharing.geojson
@@ -5,7 +5,7 @@
     "id": "boat_sharing",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=boat_sharing]; way[amenity=boat_sharing];);"
+    "query": "nwr[amenity=boat_sharing];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/bus_station.geojson b/layers/overpass/amenity/transportation/bus_station.geojson
index a5322b4..e4a668f 100644
--- a/layers/overpass/amenity/transportation/bus_station.geojson
+++ b/layers/overpass/amenity/transportation/bus_station.geojson
@@ -5,7 +5,7 @@
     "id": "bus_station",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=bus_station]; way[amenity=bus_station];);"
+    "query": "nwr[amenity=bus_station];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/car_rental.geojson b/layers/overpass/amenity/transportation/car_rental.geojson
index 0fdd64e..907c567 100644
--- a/layers/overpass/amenity/transportation/car_rental.geojson
+++ b/layers/overpass/amenity/transportation/car_rental.geojson
@@ -5,7 +5,7 @@
     "id": "car_rental",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=car_rental]; way[amenity=car_rental];);"
+    "query": "nwr[amenity=car_rental];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/car_sharing.geojson b/layers/overpass/amenity/transportation/car_sharing.geojson
index a707cde..be6c5a5 100644
--- a/layers/overpass/amenity/transportation/car_sharing.geojson
+++ b/layers/overpass/amenity/transportation/car_sharing.geojson
@@ -5,7 +5,7 @@
     "id": "car_sharing",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=car_sharing]; way[amenity=car_sharing];);"
+    "query": "nwr[amenity=car_sharing];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/car_wash.geojson b/layers/overpass/amenity/transportation/car_wash.geojson
index 3be3a6d..4d0a7ea 100644
--- a/layers/overpass/amenity/transportation/car_wash.geojson
+++ b/layers/overpass/amenity/transportation/car_wash.geojson
@@ -5,7 +5,7 @@
     "id": "car_wash",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=car_wash]; way[amenity=car_wash];);"
+    "query": "nwr[amenity=car_wash];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/charging_station.geojson b/layers/overpass/amenity/transportation/charging_station.geojson
index 3865375..e2c13f9 100644
--- a/layers/overpass/amenity/transportation/charging_station.geojson
+++ b/layers/overpass/amenity/transportation/charging_station.geojson
@@ -5,7 +5,7 @@
     "id": "charging_station",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "node[amenity=charging_station];"
+    "query": "nwr[amenity=charging_station];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/ferry_terminal.geojson b/layers/overpass/amenity/transportation/ferry_terminal.geojson
index 7fc39cf..1d2b96a 100644
--- a/layers/overpass/amenity/transportation/ferry_terminal.geojson
+++ b/layers/overpass/amenity/transportation/ferry_terminal.geojson
@@ -5,7 +5,7 @@
     "id": "ferry_terminal",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=ferry_terminal]; way[amenity=ferry_terminal];);"
+    "query": "nwr[amenity=ferry_terminal];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/fuel.geojson b/layers/overpass/amenity/transportation/fuel.geojson
index 80d8fb3..725a9f8 100644
--- a/layers/overpass/amenity/transportation/fuel.geojson
+++ b/layers/overpass/amenity/transportation/fuel.geojson
@@ -5,7 +5,7 @@
     "id": "fuel",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=fuel]; way[amenity=fuel];);"
+    "query": "nwr[amenity=fuel];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/grit_bin.geojson b/layers/overpass/amenity/transportation/grit_bin.geojson
index 184700f..f794769 100644
--- a/layers/overpass/amenity/transportation/grit_bin.geojson
+++ b/layers/overpass/amenity/transportation/grit_bin.geojson
@@ -5,7 +5,7 @@
     "id": "grit_bin",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "node[amenity=grit_bin];"
+    "query": "nwr[amenity=grit_bin];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/motorcycle_parking.geojson b/layers/overpass/amenity/transportation/motorcycle_parking.geojson
index 59782af..7d83725 100644
--- a/layers/overpass/amenity/transportation/motorcycle_parking.geojson
+++ b/layers/overpass/amenity/transportation/motorcycle_parking.geojson
@@ -5,7 +5,7 @@
     "id": "motorcycle_parking",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=motorcycle_parking]; way[amenity=motorcycle_parking];);"
+    "query": "nwr[amenity=motorcycle_parking];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/parking.geojson b/layers/overpass/amenity/transportation/parking.geojson
index d426744..c624ef7 100644
--- a/layers/overpass/amenity/transportation/parking.geojson
+++ b/layers/overpass/amenity/transportation/parking.geojson
@@ -5,7 +5,7 @@
     "id": "parking",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=parking]; way[amenity=parking];);"
+    "query": "nwr[amenity=parking];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/parking_entrance.geojson b/layers/overpass/amenity/transportation/parking_entrance.geojson
index 2be3c89..44a359d 100644
--- a/layers/overpass/amenity/transportation/parking_entrance.geojson
+++ b/layers/overpass/amenity/transportation/parking_entrance.geojson
@@ -5,7 +5,7 @@
     "id": "parking_entrance",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "node[amenity=parking_entrance];"
+    "query": "nwr[amenity=parking_entrance];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/parking_space.geojson b/layers/overpass/amenity/transportation/parking_space.geojson
index 19c626c..60c60c7 100644
--- a/layers/overpass/amenity/transportation/parking_space.geojson
+++ b/layers/overpass/amenity/transportation/parking_space.geojson
@@ -5,7 +5,7 @@
     "id": "parking_space",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=parking_space]; way[amenity=parking_space];);"
+    "query": "nwr[amenity=parking_space];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/taxi.geojson b/layers/overpass/amenity/transportation/taxi.geojson
index 8d28dc8..91cf98b 100644
--- a/layers/overpass/amenity/transportation/taxi.geojson
+++ b/layers/overpass/amenity/transportation/taxi.geojson
@@ -5,7 +5,7 @@
     "id": "taxi",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=taxi]; way[amenity=taxi];);"
+    "query": "nwr[amenity=taxi];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/amenity/transportation/vehicle_inspection.geojson b/layers/overpass/amenity/transportation/vehicle_inspection.geojson
index 8fb6a62..4abab91 100644
--- a/layers/overpass/amenity/transportation/vehicle_inspection.geojson
+++ b/layers/overpass/amenity/transportation/vehicle_inspection.geojson
@@ -5,7 +5,7 @@
     "id": "vehicle_inspection",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[amenity=vehicle_inspection]; way[amenity=vehicle_inspection];);"
+    "query": "nwr[amenity=vehicle_inspection];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/shop/food/bakery.geojson b/layers/overpass/shop/food/bakery.geojson
index 6578551..407cad5 100644
--- a/layers/overpass/shop/food/bakery.geojson
+++ b/layers/overpass/shop/food/bakery.geojson
@@ -5,7 +5,7 @@
     "id": "bakery",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[shop=bakery]; way[shop=bakery];);"
+    "query": "nwr[shop=bakery];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/shop/food/beverages.geojson b/layers/overpass/shop/food/beverages.geojson
index ce73780..c9c0796 100644
--- a/layers/overpass/shop/food/beverages.geojson
+++ b/layers/overpass/shop/food/beverages.geojson
@@ -5,7 +5,7 @@
     "id": "beverages",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[shop=beverages]; way[shop=beverages];);"
+    "query": "nwr[shop=beverages];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/shop/food/butcher.geojson b/layers/overpass/shop/food/butcher.geojson
index d94f505..4e35dda 100644
--- a/layers/overpass/shop/food/butcher.geojson
+++ b/layers/overpass/shop/food/butcher.geojson
@@ -5,7 +5,7 @@
     "id": "butcher",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[shop=butcher]; way[shop=butcher];);"
+    "query": "nwr[shop=butcher];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/shop/food/cheese.geojson b/layers/overpass/shop/food/cheese.geojson
index e675eed..5b35e5d 100644
--- a/layers/overpass/shop/food/cheese.geojson
+++ b/layers/overpass/shop/food/cheese.geojson
@@ -5,7 +5,7 @@
     "id": "cheese",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[shop=cheese]; way[shop=cheese];);"
+    "query": "nwr[shop=cheese];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/shop/food/coffee.geojson b/layers/overpass/shop/food/coffee.geojson
index 29d8a1d..dd5cb6b 100644
--- a/layers/overpass/shop/food/coffee.geojson
+++ b/layers/overpass/shop/food/coffee.geojson
@@ -5,7 +5,7 @@
     "id": "coffee",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[shop=coffee]; way[shop=coffee];);"
+    "query": "nwr[shop=coffee];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/shop/food/convenience.geojson b/layers/overpass/shop/food/convenience.geojson
index c1545ed..415f2f2 100644
--- a/layers/overpass/shop/food/convenience.geojson
+++ b/layers/overpass/shop/food/convenience.geojson
@@ -5,7 +5,7 @@
     "id": "convenience",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[shop=convenience]; way[shop=convenience];);"
+    "query": "nwr[shop=convenience];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/shop/food/greengrocer.geojson b/layers/overpass/shop/food/greengrocer.geojson
index 8cd063f..f7fc1c9 100644
--- a/layers/overpass/shop/food/greengrocer.geojson
+++ b/layers/overpass/shop/food/greengrocer.geojson
@@ -5,7 +5,7 @@
     "id": "greengrocer",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[shop=greengrocer]; way[shop=greengrocer];);"
+    "query": "nwr[shop=greengrocer];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/shop/food/health_food.geojson b/layers/overpass/shop/food/health_food.geojson
index becbd45..182a189 100644
--- a/layers/overpass/shop/food/health_food.geojson
+++ b/layers/overpass/shop/food/health_food.geojson
@@ -5,7 +5,7 @@
     "id": "health_food",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[shop=health_food]; way[shop=health_food];);"
+    "query": "nwr[shop=health_food];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/shop/food/ice_cream.geojson b/layers/overpass/shop/food/ice_cream.geojson
index 9293187..9376491 100644
--- a/layers/overpass/shop/food/ice_cream.geojson
+++ b/layers/overpass/shop/food/ice_cream.geojson
@@ -5,7 +5,7 @@
     "id": "ice_cream",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[shop=ice_cream]; way[shop=ice_cream];);"
+    "query": "nwr[shop=ice_cream];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/shop/food/organic.geojson b/layers/overpass/shop/food/organic.geojson
index dd2a680..b923699 100644
--- a/layers/overpass/shop/food/organic.geojson
+++ b/layers/overpass/shop/food/organic.geojson
@@ -5,7 +5,7 @@
     "id": "organic",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[shop~'supermarket|convenience'][organic][organic!=no]; way[shop~'supermarket|convenience'][organic][organic!=no];);"
+    "query": "nwr[shop~'supermarket|convenience'][organic][organic!=no];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/apartment.geojson b/layers/overpass/tourism/apartment.geojson
index 1138461..a9f86f5 100644
--- a/layers/overpass/tourism/apartment.geojson
+++ b/layers/overpass/tourism/apartment.geojson
@@ -5,7 +5,7 @@
     "id": "apartment",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=apartment]; way[tourism=apartment];);"
+    "query": "nwr[tourism=apartment];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/artwork.geojson b/layers/overpass/tourism/artwork.geojson
index 6fe2b88..bee6f10 100644
--- a/layers/overpass/tourism/artwork.geojson
+++ b/layers/overpass/tourism/artwork.geojson
@@ -5,7 +5,7 @@
     "id": "artwork",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=artwork]; way[tourism=artwork];);"
+    "query": "nwr[tourism=artwork];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/attraction.geojson b/layers/overpass/tourism/attraction.geojson
index 031fc8c..84af152 100644
--- a/layers/overpass/tourism/attraction.geojson
+++ b/layers/overpass/tourism/attraction.geojson
@@ -5,7 +5,7 @@
     "id": "attraction",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=attraction]; way[tourism=attraction];);"
+    "query": "nwr[tourism=attraction];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/camp_site.geojson b/layers/overpass/tourism/camp_site.geojson
index d13313c..18c26e1 100644
--- a/layers/overpass/tourism/camp_site.geojson
+++ b/layers/overpass/tourism/camp_site.geojson
@@ -5,7 +5,7 @@
     "id": "camp_site",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=camp_site]; way[tourism=camp_site];);"
+    "query": "nwr[tourism=camp_site];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/caravan_site.geojson b/layers/overpass/tourism/caravan_site.geojson
index bbe557f..39b09bf 100644
--- a/layers/overpass/tourism/caravan_site.geojson
+++ b/layers/overpass/tourism/caravan_site.geojson
@@ -5,7 +5,7 @@
     "id": "caravan_site",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=caravan_site]; way[tourism=caravan_site];);"
+    "query": "nwr[tourism=caravan_site];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/chalet.geojson b/layers/overpass/tourism/chalet.geojson
index e006812..2d1da33 100644
--- a/layers/overpass/tourism/chalet.geojson
+++ b/layers/overpass/tourism/chalet.geojson
@@ -5,7 +5,7 @@
     "id": "chalet",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=chalet]; way[tourism=chalet];);"
+    "query": "nwr[tourism=chalet];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/gallery.geojson b/layers/overpass/tourism/gallery.geojson
index 9c4265f..54cef87 100644
--- a/layers/overpass/tourism/gallery.geojson
+++ b/layers/overpass/tourism/gallery.geojson
@@ -5,7 +5,7 @@
     "id": "gallery",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=gallery]; way[tourism=gallery];);"
+    "query": "nwr[tourism=gallery];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/guest_house.geojson b/layers/overpass/tourism/guest_house.geojson
index 46fbd01..3c2b3e1 100644
--- a/layers/overpass/tourism/guest_house.geojson
+++ b/layers/overpass/tourism/guest_house.geojson
@@ -5,7 +5,7 @@
     "id": "guest_house",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=guest_house]; way[tourism=guest_house];);"
+    "query": "nwr[tourism=guest_house];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/hostel.geojson b/layers/overpass/tourism/hostel.geojson
index 8a80d94..bfa70a6 100644
--- a/layers/overpass/tourism/hostel.geojson
+++ b/layers/overpass/tourism/hostel.geojson
@@ -5,7 +5,7 @@
     "id": "hostel",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=hostel]; way[tourism=hostel];);"
+    "query": "nwr[tourism=hostel];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/hotel.geojson b/layers/overpass/tourism/hotel.geojson
index a149d10..b61ec57 100644
--- a/layers/overpass/tourism/hotel.geojson
+++ b/layers/overpass/tourism/hotel.geojson
@@ -5,7 +5,7 @@
     "id": "hotel",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=hotel]; way[tourism=hotel];);"
+    "query": "nwr[tourism=hotel];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/information.geojson b/layers/overpass/tourism/information.geojson
index ffec3e3..88326b5 100644
--- a/layers/overpass/tourism/information.geojson
+++ b/layers/overpass/tourism/information.geojson
@@ -5,7 +5,7 @@
     "id": "information",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=information]; way[tourism=information];);"
+    "query": "nwr[tourism=information];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/motel.geojson b/layers/overpass/tourism/motel.geojson
index 61890f1..b576540 100644
--- a/layers/overpass/tourism/motel.geojson
+++ b/layers/overpass/tourism/motel.geojson
@@ -5,7 +5,7 @@
     "id": "motel",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=motel]; way[tourism=motel];);"
+    "query": "nwr[tourism=motel];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/museum.geojson b/layers/overpass/tourism/museum.geojson
index b2ce3ef..d9936ef 100644
--- a/layers/overpass/tourism/museum.geojson
+++ b/layers/overpass/tourism/museum.geojson
@@ -5,7 +5,7 @@
     "id": "museum",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=museum]; way[tourism=museum];);"
+    "query": "nwr[tourism=museum];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/picnic_site.geojson b/layers/overpass/tourism/picnic_site.geojson
index b0f104e..07ba7ea 100644
--- a/layers/overpass/tourism/picnic_site.geojson
+++ b/layers/overpass/tourism/picnic_site.geojson
@@ -5,7 +5,7 @@
     "id": "picnic_site",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=picnic_site]; way[tourism=picnic_site];);"
+    "query": "nwr[tourism=picnic_site];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/viewpoint.geojson b/layers/overpass/tourism/viewpoint.geojson
index 719f313..434e1fb 100644
--- a/layers/overpass/tourism/viewpoint.geojson
+++ b/layers/overpass/tourism/viewpoint.geojson
@@ -5,7 +5,7 @@
     "id": "viewpoint",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "node[tourism=viewpoint];"
+    "query": "nwr[tourism=viewpoint];"
   },
   "type": "Feature"
 }
diff --git a/layers/overpass/tourism/wilderness_hut.geojson b/layers/overpass/tourism/wilderness_hut.geojson
index d79c9e5..a97577e 100644
--- a/layers/overpass/tourism/wilderness_hut.geojson
+++ b/layers/overpass/tourism/wilderness_hut.geojson
@@ -5,7 +5,7 @@
     "id": "wilderness_hut",
     "overlay": true,
     "dataSource": "OverpassAPI",
-    "query": "(node[tourism=wilderness_hut]; way[tourism=wilderness_hut];);"
+    "query": "nwr[tourism=wilderness_hut];"
   },
   "type": "Feature"
 }