From f942be227a138f3bb675968a5e28049de1f07ffc Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@gmail.com>
Date: Fri, 11 Sep 2020 02:42:22 +0200
Subject: [PATCH] Add cycling-themed layer

---
 Customizations/JSON/FromJSON.ts               |  2 +
 Customizations/Layouts/Cyclofix.ts            |  2 +-
 assets/layers/bike_cafe/bike_cafes.json       | 11 ++----
 .../cycling_themed_objects.json               | 38 +++++++++----------
 4 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/Customizations/JSON/FromJSON.ts b/Customizations/JSON/FromJSON.ts
index 1701f0a..c8e2520 100644
--- a/Customizations/JSON/FromJSON.ts
+++ b/Customizations/JSON/FromJSON.ts
@@ -17,6 +17,7 @@ import * as bike_repair_station from "../../assets/layers/bike_repair_station/bi
 import * as birdhides from "../../assets/layers/bird_hide/birdhides.json"
 import * as nature_reserve from "../../assets/layers/nature_reserve/nature_reserve.json"
 import * as bike_cafes from "../../assets/layers/bike_cafe/bike_cafes.json"
+import * as cycling_themed_objects from "../../assets/layers/cycling_themed_object/cycling_themed_objects.json"
 
 import {Utils} from "../../Utils";
 import ImageCarouselWithUploadConstructor from "../../UI/Image/ImageCarouselWithUpload";
@@ -43,6 +44,7 @@ export class FromJSON {
             FromJSON.Layer(birdhides),
             FromJSON.Layer(nature_reserve),
             FromJSON.Layer(bike_cafes),
+            FromJSON.Layer(cycling_themed_objects)
         ];
 
         for (const layer of sharedLayersList) {
diff --git a/Customizations/Layouts/Cyclofix.ts b/Customizations/Layouts/Cyclofix.ts
index cfcc34f..614039d 100644
--- a/Customizations/Layouts/Cyclofix.ts
+++ b/Customizations/Layouts/Cyclofix.ts
@@ -20,7 +20,7 @@ export default class Cyclofix extends Layout {
             "cyclofix",
             ["en", "nl", "fr", "gl"],
             Translations.t.cyclofix.title,
-            ["bike_repair_station", "bike_cafes", new BikeShops(), "drinking_water", "bike_parking", new BikeOtherShops(),
+            ["bike_repair_station", "bike_cafes", new BikeShops(), "drinking_water", "bike_parking", new BikeOtherShops(),"bike_themed_object",
                 // The first of november, halloween and the second of november, we remember our dead
                 ...(Cyclofix.RememberTheDead() ? ["ghost_bike"] : [])],
             16,
diff --git a/assets/layers/bike_cafe/bike_cafes.json b/assets/layers/bike_cafe/bike_cafes.json
index ee2b388..9c9115c 100644
--- a/assets/layers/bike_cafe/bike_cafes.json
+++ b/assets/layers/bike_cafe/bike_cafes.json
@@ -6,10 +6,10 @@
     "fr": "Café vélo",
     "gl": "Café de ciclistas"
   },
-  "minzoom": 12,
+  "minzoom": 14,
   "overpassTags": {
     "and": [
-      "amenity~pub|bar|cafe",
+      "amenity~pub|bar|cafe|restaurant",
       {
         "#": "Note the double tilde in 'service:bicycle' which interprets the key as regex too",
         "or": [
@@ -149,12 +149,7 @@
         "fr": "Quel est le site internet de {name}?",
         "gl": "Cal é a páxina web de {name}?"
       },
-      "render": {
-        "en": "<a href='{website}' target='_blank'>{website}</a>",
-        "nl": "<a href='{website}' target='_blank'>{website}</a>",
-        "fr": "<a href='{website}' target='_blank'>{website}</a>",
-        "gl": "<a href='{website}' target='_blank'>{website}</a>"
-      },
+      "render": "<a href='{website}' target='_blank'>{website}</a>",
       "freeform": {
         "key": "website"
       }
diff --git a/assets/layers/cycling_themed_object/cycling_themed_objects.json b/assets/layers/cycling_themed_object/cycling_themed_objects.json
index f0a23d3..be9dbc5 100644
--- a/assets/layers/cycling_themed_object/cycling_themed_objects.json
+++ b/assets/layers/cycling_themed_object/cycling_themed_objects.json
@@ -1,11 +1,11 @@
 {
-  "id": "bike_cafes",
+  "id": "bike_themed_object",
   "name": {
     "en": "Bike related object",
     "nl": "Fietsgerelateerd object",
     "fr": "Objet cycliste"
   },
-  "minzoom": 12,
+  "minzoom": 16,
   "overpassTags": "theme~cycling|bicycle",
   "title": {
     "render": {
@@ -28,18 +28,27 @@
   "description": {},
   "tagRenderings": [
     {
-      "render": "<a href='{website}' target='_blank'>{website}</a>"
+      "render": "<a href='{website}' target='_blank'>{website}</a>",
+      "freeform": {
+        "key": "website"
+      }
     },
     {
-      "render": "<a href='tel:{phone}'>{phone}</a>"
+      "render": "<a href='tel:{phone}'>{phone}</a>",
+      "freeform": {
+        "key": "phone"
+      }
     },
     {
-      "render": "<a href='mailto:{email}' target='_blank'>{email}</a>"
+      "render": "<a href='mailto:{email}' target='_blank'>{email}</a>",
+      "freeform": {
+        "key": "email"
+      }
     }
   ],
   "hideUnderlayingFeaturesMinPercentage": 0,
   "icon": {
-    "render": "./assets/layers/bike_cafe/bike_cafe.svg"
+    "render": "./assets/layers/cycling_themed_object/other_services.svg"
   },
   "width": {
     "render": "2"
@@ -48,21 +57,8 @@
     "render": "50,50,bottom"
   },
   "color": {
-    "render": "#694E2D"
+    "render": "#00f"
   },
-  "presets": [
-    {
-      "title": {
-        "en": "Bike cafe",
-        "nl": "Fietscafé",
-        "fr": "Café Vélo",
-        "gl": "Café de ciclistas"
-      },
-      "tags": [
-        "amenity=pub",
-        "pub=cycling"
-      ]
-    }
-  ],
+  "presets": [],
   "wayHandling": 2
 }
\ No newline at end of file