From 68200e40f3e4a63c0af37cdd64143e9ad3d3d02e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Mon, 26 Jul 2021 20:03:26 +0200
Subject: [PATCH] car_amenities: improve and simplify queries

---
 car_amenities.json | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/car_amenities.json b/car_amenities.json
index 97e47da..e5fbbc1 100644
--- a/car_amenities.json
+++ b/car_amenities.json
@@ -17,18 +17,14 @@
     "query": {
         "13": [
             "(",
-            "node[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
-            "way[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
-            "relation[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
-            "node[amenity~\"^(charging_station)$\"][car!=\"no\"];",
-            "node[amenity~\"^(charging_station)$\"][motorcycle!=\"no\"];",
+            "nwr[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
+            "nwr[amenity~\"^(charging_station)$\"][motorcar!=\"no\"][motorcycle!=\"no\"];",
             ")"
         ],
         "16": [
             "(",
-            "node[amenity~\"^(car_rental|car_sharing|car_wash|charging_station|fuel|motorcycle_parking|parking)$\"];",
-            "way[amenity~\"^(car_rental|car_sharing|car_wash|charging_station|fuel|motorcycle_parking|parking)$\"];",
-            "relation[amenity~\"^(car_rental|car_sharing|car_wash|charging_station|fuel|motorcycle_parking|parking)$\"];",
+            "nwr[amenity~\"^(car_rental|car_sharing|car_wash|fuel|motorcycle_parking|parking)$\"];",
+            "nwr[amenity~\"^(charging_station)$\"][motorcar!=\"no\"][motorcycle!=\"no\"];",
             ")"
         ]
     },