Add Fietsambassade logo to cyclofix; various svg- and css fixes

assets/layers/bike_repair_station/bike_repair_station.json

@@ -89,6 +89,14 @@
       }
     ]
   },
+  "titleIcons": [
+    {
+      "render": "<a href='https://fietsambassade.gent.be/' target='_blank'><img src='./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg'/></a>",
+      "condition":  "operator=De Fietsambassade Gent"
+    },
+    "wikipedialink",
+    "osmlink"
+  ],
   "tagRenderings": [
     "images",
     {

assets/layers/bike_shop/bike_shop.json

@@ -12,6 +12,13 @@
     "#": "We select all bicycle shops, sport shops (but we try to weed out non-bicycle related shops), and any shop with a bicycle related tag",
     "or": [
       "shop=bicycle",
+      {
+        "#": "A bicycle rental with a network is something such as villo, bluebike, ... We don't want them",
+        "and": [
+          "amenity=bicycle_rental",
+          "network="
+        ]
+      },
       {
         "#": "if sport is defined and is not bicycle, it is retrackted; if bicycle retail/repair is marked as 'no', it is retracted too.",
         "##": "There will be a few false-positives with this. They will get filtered out by people marking both 'not selling bikes' and 'not repairing bikes'. Furthermore, the OSMers will add a sports-subcategory on it",
@@ -68,7 +75,12 @@
         }
       },
       {
-        "if": "shop!~bicycle",
+        "if": {
+          "and": [
+            "shop!~bicycle",
+            "shop~*"
+          ]
+        },
         "then": "Other shop"
       },
       {
@@ -127,6 +139,23 @@
           "de": "Fahrradgeschäft"
         }
       },
+      {
+        "if": {
+          "and": [
+            "name~*",
+            {
+              "or": [
+                "service:bicycle:rental=yes",
+                "amenity=bicycle_rental"
+              ]
+            }
+          ]
+        },
+        "then": {
+          "nl": "Fietsverhuur <i>{name}</i>",
+          "en": "Bicycle rental <i>{name}</i>"
+        }
+      },
       {
         "if": "name~*",
         "then": {
@@ -141,37 +170,34 @@
   },
   "titleIcons": [
     {
-      "mappings": [
-        {
-          "if": "service:bicycle:pump=yes",
-          "then": "<img src='./assets/layers/bike_shop/pump.svg'>"
-        }
-      ]
+      "render": "<a href='https://fietsambassade.gent.be/' target='_blank'><img src='./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg'/></a>",
+      "condition": "operator=De Fietsambassade Gent"
     },
     {
-      "mappings": [
-        {
-          "if": "service:bicycle:diy=yes",
-          "then": "<img src='./assets/layers/bike_shop/tools.svg'>"
-        }
-      ]
+      "condition": {
+        "or": [
+          "service:bicycle:pump=yes",
+          "service:bicycle:pump=seperate"
+        ]
+      },
+      "render": "<img src='./assets/layers/bike_shop/pump.svg'/>"
     },
     {
-      "mappings": [
-        {
-          "if": {
-            "or": [
-              "service:bicycle:cleaning=yes",
-              "service:bicycle:cleaning=diy"
-            ]
-          },
-          "then": "<img src='./assets/layers/bike_shop/bike_cleaning.svg'>"
-        }
-      ]
+      "condition": "service:bicycle:diy=yes",
+      "render": "<img src='./assets/layers/bike_shop/tools.svg'/>"
     },
+    {
+      "condition": {
+        "or": [
+          "service:bicycle:cleaning=yes",
+          "service:bicycle:cleaning=diy"
+        ]
+      },
+      "render": "<img src='./assets/layers/bike_shop/bike_cleaning.svg'/>"
+    },
+    "phonelink",
     "wikipedialink",
     "osmlink"
-   
   ],
   "description": {
     "en": "A shop specifically selling bicycles or related items",
@@ -182,6 +208,7 @@
     {
       "condition": {
         "and": [
+          "shop~*",
           "shop!~bicycle",
           "shop!~sports"
         ]
@@ -257,6 +284,13 @@
         "type": "opening_hours"
       }
     },
+    "description",
+    {
+      "render": "Enkel voor {access}",
+      "freeform": {
+        "key": "access"
+      }
+    },
     {
       "question": {
         "en": "Does this shop sell bikes?",
@@ -439,6 +473,13 @@
             "gl": "Esta tenda non ofrece unha bomba de ar para uso de calquera persoa",
             "de": "Dieses Geschäft bietet für niemanden eine Fahrradpumpe an"
           }
+        },
+        {
+          "if": "service:bicycle:pump=seperate",
+          "then": {
+            "en": "There is bicycle pump, it is shown as a seperate point ",
+            "nl": "Er is een fietspomp, deze is apart aangeduid"
+          }
         }
       ]
     },
@@ -470,6 +511,13 @@
             "gl": "Non hai ferramentas aquí para arranxar a túa propia bicicleta",
             "de": "Dieses Geschäft bietet keine Werkzeuge für Heimwerkerreparaturen an"
           }
+        },
+        {
+          "if": "service:bicycle:diy=only_sold",
+          "then": {
+            "en": "Tools for DIY repair are only available if you bought/hire the bike in the shop",
+            "nl": "Het gereedschap aan om je fiets zelf te herstellen is enkel voor als je de fiets er kocht of huurt"
+          }
         }
       ]
     },
@@ -521,6 +569,10 @@
   "icon": {
     "render": "./assets/layers/bike_shop/repair_shop.svg",
     "mappings": [
+      {
+        "if": "operator=De Fietsambassade Gent",
+        "then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg"
+      },
       {
         "if": "service:bicycle:retail=yes",
         "then": "./assets/layers/bike_shop/shop.svg"

assets/layers/cycling_themed_object/cycling_themed_objects.json

@@ -7,7 +7,7 @@
     "de": "Mit Fahrrad zusammenhängendes Objekt"
   },
   "minzoom": 13,
-  "overpassTags": "theme~cycling|bicycle",
+  "overpassTags": {"or": ["theme~cycling|bicycle", "sport=cycling"]},
   "title": {
     "render": {
       "en": "Bike related object",
@@ -18,12 +18,13 @@
     "mappings": [
       {
         "if": "name~*",
+        "then":"<i>{name}</i>"
+      },
+      {
+        "if": "leisure=track",
         "then": {
-          "en": "<i>{name}</i>",
-          "nl": "<i>{name}</i>",
-          "fr": "<i>{name}</i>",
-          "gl": "<i>{name}</i>",
-          "de": "<i>{name}</i>"
+          "nl": "Wielerpiste",
+          "en": "Cycle track"
         }
       }
     ]