From 0f8d3471dce7a61498dd5018e112c2d0e2469e39 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Thu, 22 Jul 2021 09:43:24 +0200
Subject: [PATCH] Cyclestreet question fixed for new cycleways

---
 assets/themes/cycle_infra/cycle_infra.json | 51 +++++++++++++++++++---
 langs/themes/en.json                       | 21 ++++++---
 langs/themes/nl.json                       | 21 ++++++---
 3 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index 94c75cbdad..69b0e059d0 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -751,13 +751,6 @@
                 "nl": "Er is een apart getekend fietspad."
               }
             },
-            {
-              "if": "cyclestreet=yes",
-              "then": {
-                "nl": "Dit is een fietsstraat.",
-                "en": "This is a cyclestreet."
-              }
-            },
             {
               "if": "cycleway=",
               "then": {
@@ -791,6 +784,50 @@
             "en": "Unknown cycleway situation",
             "nl": "Onbekende fietspad situatie"
           }
+        },
+        {
+          "question": {
+            "en": "Is this a cyclestreet?",
+            "nl": "Is dit een fietsstraat?"
+          },
+          "condition": {
+            "and": [
+              "highway!=cycleway",
+              "highway!=path"
+            ]
+          },
+          "mappings": [
+            {
+              "if": "cyclestreet=yes",
+              "then": {
+                "en": "This is a cyclestreet, and a 30km/h zone.",
+                "nl": "Dit is een fietstraat, en dus een 30km/h zone"
+              },
+              "addExtraTags": [
+                "overtaking:motor_vehicle=no",
+                "maxspeed=30"
+              ],
+              "hideInAnswer": "_country!=be"
+            },
+            {
+              "if": "cyclestreet=yes",
+              "then": {
+                "en": "This is a cyclestreet",
+                "nl": "Dit is een fietstraat"
+              },
+              "hideInAnswer": "_country=be"
+            },
+            {
+              "if": "cyclestreet=",
+              "then": {
+                "en": "This is not a cyclestreet.",
+                "nl": "Dit is niet een fietstraat"
+              },
+              "addExtraTags": [
+                "overtaking:motor_vehicle="
+              ]
+            }
+          ]
         }
       ]
     },
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 2cc532c274..367128e6ca 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -942,19 +942,30 @@
                                 "then": "There is a seperately drawn cycleway"
                             },
                             "4": {
-                                "then": "This is a cyclestreet."
-                            },
-                            "5": {
                                 "then": "There is no cycleway known here"
                             },
-                            "6": {
+                            "5": {
                                 "then": "There is no cycleway"
                             },
-                            "7": {
+                            "6": {
                                 "then": "There is no cycleway"
                             }
                         },
                         "render": "Unknown cycleway situation"
+                    },
+                    "1": {
+                        "question": "Is this a cyclestreet?",
+                        "mappings": {
+                            "0": {
+                                "then": "This is a cyclestreet, and a 30km/h zone."
+                            },
+                            "1": {
+                                "then": "This is a cyclestreet"
+                            },
+                            "2": {
+                                "then": "This is not a cyclestreet."
+                            }
+                        }
                     }
                 }
             },
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 70b6a208d0..8f41e1de1a 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -746,19 +746,30 @@
                                 "then": "Er is een apart getekend fietspad."
                             },
                             "4": {
-                                "then": "Dit is een fietsstraat."
-                            },
-                            "5": {
                                 "then": "Er is geen fietspad bekend hier"
                             },
-                            "6": {
+                            "5": {
                                 "then": "Er is geen fietspad aanwezig"
                             },
-                            "7": {
+                            "6": {
                                 "then": "Er is geen fietspad aanwezig"
                             }
                         },
                         "render": "Onbekende fietspad situatie"
+                    },
+                    "1": {
+                        "question": "Is dit een fietsstraat?",
+                        "mappings": {
+                            "0": {
+                                "then": "Dit is een fietstraat, en dus een 30km/h zone"
+                            },
+                            "1": {
+                                "then": "Dit is een fietstraat"
+                            },
+                            "2": {
+                                "then": "Dit is niet een fietstraat"
+                            }
+                        }
                     }
                 }
             },