Use nwr[] shortcut in all overpass queries

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }

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"
 }