From e5d95bcdf139b57cc2e6fd32f23e2c217970c338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 23 Jul 2021 17:46:30 +0200 Subject: [PATCH 1/2] cycle_amenities: exclude charging stations without information about bicycles (bicycle=no was excluded before) fixes #40 --- cycle_amenities.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cycle_amenities.json b/cycle_amenities.json index 925ade8..ed8d219 100644 --- a/cycle_amenities.json +++ b/cycle_amenities.json @@ -13,7 +13,7 @@ "node[amenity~\"^(bicycle_rental)$\"];", "way[amenity~\"^(bicycle_rental)$\"];", "relation[amenity~\"^(bicycle_rental)$\"];", - "node[amenity~\"^(charging_station)$\"][bicycle!=\"no\"];", + "node[amenity~\"^(charging_station)$\"][bicycle][bicycle!=\"no\"];", "node[shop~\"^(bicycle)$\"];", "way[shop~\"^(bicycle)$\"];", "relation[shop~\"^(bicycle)$\"];", @@ -24,7 +24,7 @@ "node[amenity~\"^(bicycle_.*|compressed_air)$\"];", "way[amenity~\"^(bicycle_.*|compressed_air)$\"];", "relation[amenity~\"^(bicycle_.*|compressed_air)$\"];", - "node[amenity~\"^(charging_station)$\"][bicycle!=\"no\"];", + "node[amenity~\"^(charging_station)$\"][bicycle][bicycle!=\"no\"];", "node[shop~\"^(bicycle)$\"];", "way[shop~\"^(bicycle)$\"];", "relation[shop~\"^(bicycle)$\"];", From dbd9e159f7e382f96b256fc0ba051112d2482b64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Mon, 26 Jul 2021 20:03:26 +0200 Subject: [PATCH 2/2] 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\"];", ")" ] },