From 6aa1d1a11231eda20564e7540400880fbc0e05f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Tue, 20 Dec 2022 22:34:07 +0100
Subject: [PATCH] footways: for sidewalk=*, do not use 'surface' tag

---
 footways.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/footways.yaml b/footways.yaml
index 8da48e7..f2df254 100644
--- a/footways.yaml
+++ b/footways.yaml
@@ -481,7 +481,10 @@ filter:
       {% set value = "(unpaved|compacted|fine_gravel|gravel|rock|pebblestone|ground|dirt|earth|grass|grass_paver|mud|sand|woodchips|snow|ice|salt)" %}
       {% endif %}
 
-      (nwr[surface~"^{{ value }}$"];nwr[~"sidewalk(:left|:right|:both|):surface"~"^{{ value }}$"];)
+      (
+        nwr[!sidewalk][!"sidewalk:both"][!"sidewalk:right"][!"sidewalk:left"][surface~"^{{ value }}$"];
+        nwr[~"sidewalk(:left|:right|:both|):surface"~"^{{ value }}$"];
+      )
     values:
       all_paved:
         name: "<{{ tagTrans('surface', 'paved') }}>"
@@ -530,7 +533,7 @@ filter:
         name: <{{ trans('empty value') }}>
         query: |
           (
-          nwr[!"surface"];
+          nwr[!sidewalk][!"sidewalk:both"][!"sidewalk:right"][!"sidewalk:left"][!"surface"];
           nwr["sidewalk:left"="yes"][!"sidewalk:left:surface"];
           nwr["sidewalk:right"="yes"][!"sidewalk:right:surface"];
           nwr["sidewalk:both"="yes"][!"sidewalk:both:surface"][!"sidewalk:surface"][!"sidewalk:left:surface"];