From a2955eaf912003a87a0810c67133ace916f2f56e Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Sat, 21 Aug 2021 23:09:34 +0200
Subject: [PATCH] Add contact information for bicycle repair stations, add a
 'report defective pump' button

---
 .../bike_repair_station.json                  | 35 +++++++++++++++++++
 langs/layers/de.json                          | 14 ++++----
 langs/layers/en.json                          | 21 +++++++----
 langs/layers/fr.json                          | 14 ++++----
 langs/layers/gl.json                          | 12 +++----
 langs/layers/it.json                          | 14 ++++----
 langs/layers/nl.json                          | 18 ++++++----
 langs/layers/pl.json                          |  8 ++---
 langs/layers/pt_BR.json                       | 10 +++---
 langs/layers/ru.json                          | 10 +++---
 10 files changed, 103 insertions(+), 53 deletions(-)

diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json
index 82975d50a..3f1c686cb 100644
--- a/assets/layers/bike_repair_station/bike_repair_station.json
+++ b/assets/layers/bike_repair_station/bike_repair_station.json
@@ -226,6 +226,30 @@
         }
       ]
     },
+    
+    {
+      "question": {
+        "en": "What is the email address of the maintainer?",
+        "nl": "Wat is het email-adres van de beheerder?"
+      },
+      "freeform": {
+        "key": "email",
+        "type": "email"
+      },
+      "render": "<a href='mailto:{email}'>{email}</a>"
+    },
+    {
+      "question": {
+        "en": "What is the phone number of the maintainer?",
+        "nl": "Wat is het telefoonnummer van de beheerder?"
+      },
+      "freeform": {
+        "key": "phone",
+        "type": "phone"
+      },
+      "render": "<a href='tel:{phone}'>{phone}</a>"
+    },
+    
     {
       "question": {
         "nl": "Wanneer is dit fietsherstelpunt open?",
@@ -342,6 +366,7 @@
       ]
     },
     {
+      "#": "Operational status",
       "question": {
         "en": "Is the bike pump still operational?",
         "nl": "Werkt de fietspomp nog?",
@@ -382,6 +407,16 @@
         }
       ]
     },
+    {
+      "#": "Email maintainer",
+      "condition": {
+        "and": ["email~*", "service:bicycle:pump:operational_status=broken"]
+      },
+      "render": {
+        "en": "<a href='mailto:{email}?subject=Broken bicycle pump&body=Hello,%0D%0A%0D%0AWith this email, I&#39;d like to inform you that the bicycle pump located at https://mapcomplete.osm.be/cyclofix#{id} is broken.'>Report this bicycle pump as broken</a>",
+        "nl": "<a href='mailto:{email}?subject=Kapotte fietspomp&body=Geachte,%0D%0A%0D%0AGraag had ik u gemeld dat een fietspomp defect is. De fietspomp bevindt zich hier: https://mapcomplete.osm.be/cyclofix#{id}.'>Rapporteer deze fietspomp als kapot</a>"
+      }
+    },
     {
       "question": {
         "en": "What valves are supported?",
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 3ed8abf07..db09b9b4a 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -407,7 +407,7 @@
                 "question": "Wer wartet diese Fahrradpumpe?",
                 "render": "Gewartet von {operator}"
             },
-            "3": {
+            "5": {
                 "question": "Wann ist diese Fahrradreparaturstelle geöffnet?",
                 "mappings": {
                     "0": {
@@ -418,7 +418,7 @@
                     }
                 }
             },
-            "4": {
+            "6": {
                 "question": "Verfügt diese Fahrrad-Reparaturstation über Spezialwerkzeug zur Reparatur von Fahrradketten?",
                 "mappings": {
                     "0": {
@@ -429,7 +429,7 @@
                     }
                 }
             },
-            "5": {
+            "7": {
                 "question": "Hat diese Fahrradstation einen Haken, an dem Sie Ihr Fahrrad aufhängen können, oder einen Ständer, um es anzuheben?",
                 "mappings": {
                     "0": {
@@ -440,7 +440,7 @@
                     }
                 }
             },
-            "6": {
+            "8": {
                 "question": "Ist die Fahrradpumpe noch funktionstüchtig?",
                 "mappings": {
                     "0": {
@@ -451,7 +451,7 @@
                     }
                 }
             },
-            "7": {
+            "10": {
                 "question": "Welche Ventile werden unterstützt?",
                 "render": "Diese Pumpe unterstützt die folgenden Ventile: {valves}",
                 "mappings": {
@@ -466,7 +466,7 @@
                     }
                 }
             },
-            "8": {
+            "11": {
                 "question": "Ist dies eine elektrische Fahrradpumpe?",
                 "mappings": {
                     "0": {
@@ -477,7 +477,7 @@
                     }
                 }
             },
-            "9": {
+            "12": {
                 "question": "Verfügt die Pumpe über einen Druckanzeiger oder ein Manometer?",
                 "mappings": {
                     "0": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 139e3edc9..3f02b7530 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -527,6 +527,12 @@
                 "render": "Maintained by {operator}"
             },
             "3": {
+                "question": "What is the email address of the maintainer?"
+            },
+            "4": {
+                "question": "What is the phone number of the maintainer?"
+            },
+            "5": {
                 "question": "When is this bicycle repair point open?",
                 "mappings": {
                     "0": {
@@ -537,7 +543,7 @@
                     }
                 }
             },
-            "4": {
+            "6": {
                 "question": "Does this bike repair station have a special tool to repair your bike chain?",
                 "mappings": {
                     "0": {
@@ -548,7 +554,7 @@
                     }
                 }
             },
-            "5": {
+            "7": {
                 "question": "Does this bike station have a hook to hang your bike on or a stand to raise it?",
                 "mappings": {
                     "0": {
@@ -559,7 +565,7 @@
                     }
                 }
             },
-            "6": {
+            "8": {
                 "question": "Is the bike pump still operational?",
                 "mappings": {
                     "0": {
@@ -570,7 +576,10 @@
                     }
                 }
             },
-            "7": {
+            "9": {
+                "render": "<a href='mailto:{email}?subject=Broken bicycle pump&body=Hello,\n\nWith this email, I'd like to inform you that the bicycle pump located at https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} is broken.'>Report this bicycle pump as broken</a>"
+            },
+            "10": {
                 "question": "What valves are supported?",
                 "render": "This pump supports the following valves: {valves}",
                 "mappings": {
@@ -585,7 +594,7 @@
                     }
                 }
             },
-            "8": {
+            "11": {
                 "question": "Is this an electric bike pump?",
                 "mappings": {
                     "0": {
@@ -596,7 +605,7 @@
                     }
                 }
             },
-            "9": {
+            "12": {
                 "question": "Does the pump have a pressure indicator or manometer?",
                 "mappings": {
                     "0": {
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index 04a7c7b77..f5be61008 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -435,7 +435,7 @@
                 "question": "Qui maintient cette pompe à vélo ?",
                 "render": "Mantenue par {operator}"
             },
-            "3": {
+            "5": {
                 "question": "Quand ce point de réparation de vélo est-il ouvert ?",
                 "mappings": {
                     "0": {
@@ -446,7 +446,7 @@
                     }
                 }
             },
-            "4": {
+            "6": {
                 "question": "Est-ce que cette station vélo a un outil specifique pour réparer la chaîne du vélo ?",
                 "mappings": {
                     "0": {
@@ -457,7 +457,7 @@
                     }
                 }
             },
-            "5": {
+            "7": {
                 "question": "Est-ce que cette station vélo à un crochet pour suspendre son vélo ou une accroche pour l'élevé ?",
                 "mappings": {
                     "0": {
@@ -468,7 +468,7 @@
                     }
                 }
             },
-            "6": {
+            "8": {
                 "question": "La pompe à vélo fonctionne-t-elle toujours ?",
                 "mappings": {
                     "0": {
@@ -479,7 +479,7 @@
                     }
                 }
             },
-            "7": {
+            "10": {
                 "question": "Quelles valves sont compatibles ?",
                 "render": "Cette pompe est compatible avec les valves suivantes : {valves}",
                 "mappings": {
@@ -494,7 +494,7 @@
                     }
                 }
             },
-            "8": {
+            "11": {
                 "question": "Est-ce que cette pompe est électrique ?",
                 "mappings": {
                     "0": {
@@ -505,7 +505,7 @@
                     }
                 }
             },
-            "9": {
+            "12": {
                 "question": "Est-ce que la pompe à un manomètre integré ?",
                 "mappings": {
                     "0": {
diff --git a/langs/layers/gl.json b/langs/layers/gl.json
index 39c286135..d0ff3955f 100644
--- a/langs/layers/gl.json
+++ b/langs/layers/gl.json
@@ -170,7 +170,7 @@
                     }
                 }
             },
-            "4": {
+            "6": {
                 "question": "Esta estación de arranxo de bicicletas ten unha ferramenta especial para arranxar a cadea da túa bicicleta?",
                 "mappings": {
                     "0": {
@@ -181,7 +181,7 @@
                     }
                 }
             },
-            "5": {
+            "7": {
                 "question": "Esta estación de bicicletas ten un guindastre para pendurar a túa bicicleta ou un soporte para elevala?",
                 "mappings": {
                     "0": {
@@ -192,7 +192,7 @@
                     }
                 }
             },
-            "6": {
+            "8": {
                 "question": "Segue a funcionar a bomba de ar?",
                 "mappings": {
                     "0": {
@@ -203,7 +203,7 @@
                     }
                 }
             },
-            "7": {
+            "10": {
                 "question": "Que válvulas son compatíbeis?",
                 "render": "Esta bomba de ar admite as seguintes válvulas: {valves}",
                 "mappings": {
@@ -218,7 +218,7 @@
                     }
                 }
             },
-            "8": {
+            "11": {
                 "question": "Esta é unha bomba de ar eléctrica?",
                 "mappings": {
                     "0": {
@@ -229,7 +229,7 @@
                     }
                 }
             },
-            "9": {
+            "12": {
                 "question": "Ten a bomba de ar un indicador de presión ou un manómetro?",
                 "mappings": {
                     "0": {
diff --git a/langs/layers/it.json b/langs/layers/it.json
index 4602ccfe5..ee16873f7 100644
--- a/langs/layers/it.json
+++ b/langs/layers/it.json
@@ -435,7 +435,7 @@
                 "question": "Chi gestisce questa pompa per bici?",
                 "render": "Manutenuta da {operator}"
             },
-            "3": {
+            "5": {
                 "question": "Quando è aperto questo punto riparazione bici?",
                 "mappings": {
                     "0": {
@@ -446,7 +446,7 @@
                     }
                 }
             },
-            "4": {
+            "6": {
                 "question": "Questa stazione di riparazione bici ha un attrezzo speciale per riparare la catena della bici?",
                 "mappings": {
                     "0": {
@@ -457,7 +457,7 @@
                     }
                 }
             },
-            "5": {
+            "7": {
                 "question": "Questa stazione bici ha un gancio per tenere sospesa la bici o un supporto per alzarla?",
                 "mappings": {
                     "0": {
@@ -468,7 +468,7 @@
                     }
                 }
             },
-            "6": {
+            "8": {
                 "question": "La pompa per bici è sempre funzionante?",
                 "mappings": {
                     "0": {
@@ -479,7 +479,7 @@
                     }
                 }
             },
-            "7": {
+            "10": {
                 "question": "Quali valvole sono supportate?",
                 "render": "Questa pompa è compatibile con le seguenti valvole: {valves}",
                 "mappings": {
@@ -494,7 +494,7 @@
                     }
                 }
             },
-            "8": {
+            "11": {
                 "question": "Questa pompa per bici è elettrica?",
                 "mappings": {
                     "0": {
@@ -505,7 +505,7 @@
                     }
                 }
             },
-            "9": {
+            "12": {
                 "question": "Questa pompa ha l’indicatore della pressione o il manometro?",
                 "mappings": {
                     "0": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 683f34f34..f63a3fb01 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -526,6 +526,12 @@
                 "render": "Beheer door {operator}"
             },
             "3": {
+                "question": "Wat is het email-adres van de beheerder?"
+            },
+            "4": {
+                "question": "Wat is het telefoonnummer van de beheerder?"
+            },
+            "5": {
                 "question": "Wanneer is dit fietsherstelpunt open?",
                 "mappings": {
                     "0": {
@@ -536,7 +542,7 @@
                     }
                 }
             },
-            "4": {
+            "6": {
                 "question": "Heeft dit herstelpunt een speciale reparatieset voor je ketting?",
                 "mappings": {
                     "0": {
@@ -547,7 +553,7 @@
                     }
                 }
             },
-            "5": {
+            "7": {
                 "question": "Heeft dit herstelpunt een haak of standaard om je fiets op te hangen/zetten?",
                 "mappings": {
                     "0": {
@@ -558,7 +564,7 @@
                     }
                 }
             },
-            "6": {
+            "8": {
                 "question": "Werkt de fietspomp nog?",
                 "mappings": {
                     "0": {
@@ -569,7 +575,7 @@
                     }
                 }
             },
-            "7": {
+            "10": {
                 "question": "Welke ventielen werken er met de pomp?",
                 "render": "Deze pomp werkt met de volgende ventielen: {valves}",
                 "mappings": {
@@ -584,7 +590,7 @@
                     }
                 }
             },
-            "8": {
+            "11": {
                 "question": "Is dit een electrische fietspomp?",
                 "mappings": {
                     "0": {
@@ -595,7 +601,7 @@
                     }
                 }
             },
-            "9": {
+            "12": {
                 "question": "Heeft deze pomp een luchtdrukmeter?",
                 "mappings": {
                     "0": {
diff --git a/langs/layers/pl.json b/langs/layers/pl.json
index 6e2c68613..eb235e651 100644
--- a/langs/layers/pl.json
+++ b/langs/layers/pl.json
@@ -144,7 +144,7 @@
     },
     "bike_repair_station": {
         "tagRenderings": {
-            "6": {
+            "8": {
                 "question": "Czy pompka rowerowa jest nadal sprawna?",
                 "mappings": {
                     "0": {
@@ -155,11 +155,11 @@
                     }
                 }
             },
-            "7": {
+            "10": {
                 "question": "Jakie zawory są obsługiwane?",
                 "render": "Ta pompka obsługuje następujące zawory: {valves}"
             },
-            "8": {
+            "11": {
                 "question": "Czy jest to elektryczna pompka do roweru?",
                 "mappings": {
                     "0": {
@@ -170,7 +170,7 @@
                     }
                 }
             },
-            "9": {
+            "12": {
                 "question": "Czy pompka posiada wskaźnik ciśnienia lub manometr?",
                 "mappings": {
                     "0": {
diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json
index 039ea8de3..bef8cac72 100644
--- a/langs/layers/pt_BR.json
+++ b/langs/layers/pt_BR.json
@@ -393,7 +393,7 @@
                 "question": "Quem faz a manutenção desta bomba de ciclo?",
                 "render": "Mantida por {operator}"
             },
-            "3": {
+            "5": {
                 "mappings": {
                     "0": {
                         "then": "Sempre aberto"
@@ -403,7 +403,7 @@
                     }
                 }
             },
-            "4": {
+            "6": {
                 "mappings": {
                     "0": {
                         "then": "Há uma ferramenta de corrente"
@@ -413,7 +413,7 @@
                     }
                 }
             },
-            "5": {
+            "7": {
                 "mappings": {
                     "0": {
                         "then": "Há um gancho ou um suporte"
@@ -423,7 +423,7 @@
                     }
                 }
             },
-            "8": {
+            "11": {
                 "mappings": {
                     "0": {
                         "then": "Bomba manual"
@@ -433,7 +433,7 @@
                     }
                 }
             },
-            "9": {
+            "12": {
                 "mappings": {
                     "0": {
                         "then": "Há um manômetro"
diff --git a/langs/layers/ru.json b/langs/layers/ru.json
index 4f44e3ce7..1e363798b 100644
--- a/langs/layers/ru.json
+++ b/langs/layers/ru.json
@@ -329,7 +329,7 @@
             }
         },
         "tagRenderings": {
-            "3": {
+            "5": {
                 "question": "Когда работает эта точка обслуживания велосипедов?",
                 "mappings": {
                     "0": {
@@ -337,7 +337,7 @@
                     }
                 }
             },
-            "6": {
+            "8": {
                 "question": "Велосипедный насос все еще работает?",
                 "mappings": {
                     "0": {
@@ -348,7 +348,7 @@
                     }
                 }
             },
-            "7": {
+            "10": {
                 "render": "Этот насос поддерживает следующие клапаны: {valves}",
                 "mappings": {
                     "0": {
@@ -359,7 +359,7 @@
                     }
                 }
             },
-            "8": {
+            "11": {
                 "question": "Это электрический велосипедный насос?",
                 "mappings": {
                     "0": {
@@ -370,7 +370,7 @@
                     }
                 }
             },
-            "9": {
+            "12": {
                 "mappings": {
                     "0": {
                         "then": "Есть манометр"