Move 'icons.json' into a regular library-layer

2023-02-03 03:54:59 +01:00 · 2023-02-03 03:54:59 +01:00 · a8a5ce8ded
commit a8a5ce8ded
parent 8bfd0d35ba
20 changed files with 167 additions and 139 deletions
--- a/assets/layers/bicycle_library/bicycle_library.json
+++ b/assets/layers/bicycle_library/bicycle_library.json
@ -320,7 +320,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        },
        {
          "if": "service:bicycle:pump=yes",
--- a/assets/layers/bike_shop/bike_shop.json
+++ b/assets/layers/bike_shop/bike_shop.json
@ -781,7 +781,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        },
        {
          "if": "service:bicycle:pump=yes",
--- a/assets/layers/cafe_pub/cafe_pub.json
+++ b/assets/layers/cafe_pub/cafe_pub.json
@ -334,7 +334,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        }
      ],
      "label": {
--- a/assets/layers/climbing_club/climbing_club.json
+++ b/assets/layers/climbing_club/climbing_club.json
@ -166,7 +166,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        }
      ],
      "iconSize": {
--- a/assets/layers/climbing_gym/climbing_gym.json
+++ b/assets/layers/climbing_gym/climbing_gym.json
@ -213,7 +213,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        }
      ],
      "iconSize": {
--- a/assets/layers/fitness_centre/fitness_centre.json
+++ b/assets/layers/fitness_centre/fitness_centre.json
@ -94,7 +94,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        }
      ]
    }
--- a/assets/layers/fitness_station/fitness_station.json
+++ b/assets/layers/fitness_station/fitness_station.json
@ -402,7 +402,7 @@
              "opening_hours~*"
            ]
          },
-          "then": "isOpen"
+          "then": "icons.isOpen"
        }
      ]
    }
--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@ -1045,7 +1045,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        },
        {
          "if": {
--- a/assets/layers/icons/icons.json
+++ b/assets/layers/icons/icons.json
@ -0,0 +1,131 @@
+{
+  "id": "icons",
+  "description": {
+    "en": "A layer acting as library for icon-tagrenderings, especially to show as badge next to a POI"
+  },
+  "source": {
+    "osmTags": "id~*"
+  },
+  "title": null,
+  "tagRenderings": [
+    {
+      "id": "wikipedialink",
+      "labels": [
+        "defaults"
+      ],
+      "render": "<a href='https://wikipedia.org/wiki/{wikipedia}' target='_blank'><img src='./assets/svg/wikipedia.svg' textmode='\uD83D\uDCD6' alt='Wikipedia'/></a>",
+      "condition": {
+        "or": [
+          "wikipedia~*",
+          "wikidata~*"
+        ]
+      },
+      "mappings": [
+        {
+          "#": "ignore-image-in-then",
+          "if": "wikipedia=",
+          "then": "<a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'><img src='./assets/svg/wikidata.svg' alt='WD'/></a>"
+        }
+      ]
+    },
+    {
+      "id": "isOpen",
+      "labels": [
+        "defaults"
+      ],
+      "#": "Shows a coloured clock if opening hours are parsed. Uses the metatagging, suitable to use as a (badged) overlay",
+      "mappings": [
+        {
+          "if": "_isOpen=yes",
+          "then": "clock:#0f0;ring:#0f0"
+        },
+        {
+          "if": "_isOpen=no",
+          "then": "circle:#f00;clock:#fff"
+        },
+        {
+          "#": "Still loading the country",
+          "if": {
+            "and": [
+              "_isOpen=",
+              "opening_hours~*"
+            ]
+          },
+          "then": "clock:#ff0;ring:#ff0"
+        },
+        {
+          "#": "Still loading the country",
+          "if": {
+            "and": [
+              "_isOpen=parse_error",
+              "opening_hours~*"
+            ]
+          },
+          "then": "circle:#f0f;clock:#fff"
+        }
+      ]
+    },
+    {
+      "id": "phonelink",
+      "labels": [
+        "defaults"
+      ],
+      "render": "<a href='tel:{phone}'><img textmode='\uD83D\uDCDE' alt='phone' src='./assets/tagRenderings/phone.svg'/></a>",
+      "condition": "phone~*"
+    },
+    {
+      "id": "emaillink",
+      "labels": [
+        "defaults"
+      ],
+      "render": "<a href='mailto:{email}'><img textmode='✉️' alt='email' src='./assets/tagRenderings/send_email.svg'/></a>",
+      "condition": "email~*"
+    },
+    {
+      "id": "smokingicon",
+      "labels": [
+        "defaults"
+      ],
+      "mappings": [
+        {
+          "#": "ignore-image-in-then",
+          "if": "smoking=no",
+          "then": "<img textmode='\uD83D\uDEAD️' alt='no-smoking' src='./assets/tagRenderings/no_smoking.svg'/>"
+        },
+        {
+          "#": "ignore-image-in-then",
+          "if": "smoking=yes",
+          "then": "<img textmode='\uD83D\uDEAC️' alt='smoking-allowed' src='./assets/tagRenderings/smoking.svg'/>"
+        }
+      ]
+    },
+
+    {
+      "id": "sharelink",
+      "labels": [
+        "defaults"
+      ],
+      "render": "{share_link()}"
+    },
+    {
+      "id": "osmlink",
+      "labels": [
+        "defaults"
+      ],
+      "render": "<a href='https://openstreetmap.org/{id}' target='_blank'><img alt='on osm' textmode='\uD83D\uDDFA️' src='./assets/svg/osm-logo-us.svg'/></a>",
+      "mappings": [
+        {
+          "if": "id~.*/-.*",
+          "then": ""
+        },
+        {
+          "#": "ignore-image-in-then",
+          "if": "_backend~*",
+          "then": "<a href='{_backend}/{id}' target='_blank'><img src='./assets/svg/osm-logo-us.svg'/></a>"
+        }
+      ],
+      "condition": "id~(node|way|relation)/[0-9]*"
+    }
+  ],
+  "mapRendering": null
+}
--- a/assets/layers/parcel_lockers/parcel_lockers.json
+++ b/assets/layers/parcel_lockers/parcel_lockers.json
@ -259,7 +259,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        }
      ],
      "iconSize": "40,40,center",
--- a/assets/layers/pharmacy/pharmacy.json
+++ b/assets/layers/pharmacy/pharmacy.json
@ -119,7 +119,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        }
      ],
      "label": {
--- a/assets/layers/playground/playground.json
+++ b/assets/layers/playground/playground.json
@ -578,7 +578,7 @@
              "opening_hours~*"
            ]
          },
-          "then": "isOpen"
+          "then": "icons.isOpen"
        }
      ],
      "iconSize": {
--- a/assets/layers/postoffices/postoffices.json
+++ b/assets/layers/postoffices/postoffices.json
@ -433,7 +433,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        },
        {
          "if": "shop~*",
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@ -326,7 +326,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        },
        {
          "if": {
--- a/assets/layers/sport_pitch/sport_pitch.json
+++ b/assets/layers/sport_pitch/sport_pitch.json
@ -553,7 +553,7 @@
              "opening_hours~*"
            ]
          },
-          "then": "isOpen"
+          "then": "icons.isOpen"
        },
        {
          "if": {
--- a/assets/layers/sports_centre/sports_centre.json
+++ b/assets/layers/sports_centre/sports_centre.json
@ -49,7 +49,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        }
      ],
      "location": [
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@ -700,7 +700,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        }
      ],
      "location": [
--- a/assets/layers/toilet_at_amenity/toilet_at_amenity.json
+++ b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
@ -372,7 +372,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        },
        {
          "if": "shop~*",
--- a/assets/layers/veterinary/veterinary.json
+++ b/assets/layers/veterinary/veterinary.json
@ -79,7 +79,7 @@
      "iconBadges": [
        {
          "if": "opening_hours~*",
-          "then": "isOpen"
+          "then": "icons.isOpen"
        }
      ]
    },
--- a/assets/tagRenderings/icons.json
+++ b/assets/tagRenderings/icons.json
@ -1,103 +0,0 @@
-{
-  "id": "shared_icons",
-  "defaults": {
-    "builtin": [
-      "phonelink",
-      "emaillink",
-      "wikipedialink",
-      "smokingicon",
-      "osmlink",
-      "sharelink"
-    ],
-    "override": {}
-  },
-  "wikipedialink": {
-    "render": "<a href='https://wikipedia.org/wiki/{wikipedia}' target='_blank'><img src='./assets/svg/wikipedia.svg' textmode='\uD83D\uDCD6' alt='Wikipedia'/></a>",
-    "condition": {
-      "or": [
-        "wikipedia~*",
-        "wikidata~*"
-      ]
-    },
-    "mappings": [
-      {
-        "#": "ignore-image-in-then",
-        "if": "wikipedia=",
-        "then": "<a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'><img src='./assets/svg/wikidata.svg' alt='WD'/></a>"
-      }
-    ]
-  },
-  "isOpen": {
-    "#": "Shows a coloured clock if opening hours are parsed. Uses the metatagging, suitable to use as a (badged) overlay",
-    "mappings": [
-      {
-        "if": "_isOpen=yes",
-        "then": "clock:#0f0;ring:#0f0"
-      },
-      {
-        "if": "_isOpen=no",
-        "then": "circle:#f00;clock:#fff"
-      },
-      {
-        "#": "Still loading the country",
-        "if": {
-          "and": [
-            "_isOpen=",
-            "opening_hours~*"
-          ]
-        },
-        "then": "clock:#ff0;ring:#ff0"
-      },
-      {
-        "#": "Still loading the country",
-        "if": {
-          "and": [
-            "_isOpen=parse_error",
-            "opening_hours~*"
-          ]
-        },
-        "then": "circle:#f0f;clock:#fff"
-      }
-    ]
-  },
-  "phonelink": {
-    "render": "<a href='tel:{phone}'><img textmode='\uD83D\uDCDE' alt='phone' src='./assets/tagRenderings/phone.svg'/></a>",
-    "condition": "phone~*"
-  },
-  "emaillink": {
-    "render": "<a href='mailto:{email}'><img textmode='✉️' alt='email' src='./assets/tagRenderings/send_email.svg'/></a>",
-    "condition": "email~*"
-  },
-  "smokingicon": {
-    "mappings": [
-      {
-        "#": "ignore-image-in-then",
-        "if": "smoking=no",
-        "then": "<img textmode='\uD83D\uDEAD️' alt='no-smoking' src='./assets/tagRenderings/no_smoking.svg'/>"
-      },
-      {
-        "#": "ignore-image-in-then",
-        "if": "smoking=yes",
-        "then": "<img textmode='\uD83D\uDEAC️' alt='smoking-allowed' src='./assets/tagRenderings/smoking.svg'/>"
-      }
-    ]
-  },
-  "osmlink": {
-    "render": "<a href='https://openstreetmap.org/{id}' target='_blank'><img alt='on osm' textmode='\uD83D\uDDFA️' src='./assets/svg/osm-logo-us.svg'/></a>",
-    "mappings": [
-      {
-        "if": "id~.*/-.*",
-        "then": ""
-      },
-      {
-        "#": "ignore-image-in-then",
-        "if": "_backend~*",
-        "then": "<a href='{_backend}/{id}' target='_blank'><img src='./assets/svg/osm-logo-us.svg'/></a>"
-      }
-    ],
-    "condition": "id~(node|way|relation)/[0-9]*"
-  },
-  "sharelink": {
-    "render": "{share_link()}"
-  }
-}