Add extra icons, change size, add tactile paving

assets/layers/kerbs/flush.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(15.081 -7.1438)">
+  <rect transform="matrix(.70705 .70716 -.70705 .70716 0 0)" x="-3.2362" y="13.603" width="4.2255" height="4.2255" fill="#349340" stop-color="#000000" stroke="#bfe8c4" stroke-linecap="round" stroke-width=".26458"/>
+  <path d="m-13.229 11.112h0.79375l1.0583-0.52917 0.79375 1e-6" fill="none" stop-color="#000000" stroke="#7fd28a" stroke-width=".52917" style="-inkscape-stroke:none;font-variation-settings:normal"/>
+ </g>
+</svg>

assets/layers/kerbs/kerbs.json

@@ -23,22 +23,27 @@
       "location": [
         "point"
       ],
-      "icon": "./assets/layers/kerbs/KerbIcon.svg",
-      "iconSize": "25,23,center",
-      "iconBadges": [
-        {
-          "if": "kerb=raised",
-          "then": "square:#f44e42"
-        },
-        {
-          "if": "kerb=lowered",
-          "then": "triangle:#11ff00"
-        },
-        {
-          "if": "kerb=flush",
-          "then": "circle:#11ff00"
-        }
-      ]
+      "icon": {
+        "render": "./assets/layers/kerbs/KerbIcon.svg",
+        "mappings": [
+          {
+            "if": "kerb=raised",
+            "then": "./assets/layers/kerbs/raised.svg"
+          },
+          {
+            "if": "kerb=lowered",
+            "then": "./assets/layers/kerbs/lowered.svg"
+          },
+          {
+            "if": "kerb=flush",
+            "then": "./assets/layers/kerbs/flush.svg"
+          },
+          {
+            "if": "kerb=no",
+            "then": "./assets/layers/kerbs/no.svg"
+          }
+        ]
+      }
     },
     {
       "color": "#f44e42",
@@ -91,6 +96,33 @@
           "hideInAnswer": true
         }
       ]
+    },
+    {
+      "id": "tactile-paving",
+      "question": {
+        "en": "Is there tactile paving at this kerb?"
+      },
+      "mappings": [
+        {
+          "if": "tactile_paving=yes",
+          "then": {
+            "en": "This kerb has tactile paving."
+          }
+        },
+        {
+          "if": "tactile_paving=no",
+          "then": {
+            "en": "This kerb does not have tactile paving."
+          }
+        },
+        {
+          "if": "tactile_paving=incorrect",
+          "then": {
+            "en": "This kerb has tactile paving, but it is incorrect"
+          },
+          "hideInAnswer": true
+        }
+      ]
     }
   ],
   "presets": [
@@ -109,7 +141,10 @@
       "preciseInput": {
         "maxSnapDistance": 10,
         "preferredBackground": "photo",
-        "snapToLayer": ["cycleways_and_roads", "kerbs"]
+        "snapToLayer": [
+          "cycleways_and_roads",
+          "kerbs"
+        ]
       }
     }
   ]

assets/layers/kerbs/license_info.json

@@ -8,5 +8,45 @@
     "sources": [
       "https://commons.wikimedia.org/wiki/File:KerbIcon.svg"
     ]
+  },
+  {
+    "path": "flush.svg",
+    "license": "CC0",
+    "authors": [
+      "Jeroen Hoek"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dflush.svg"
+    ]
+  },
+  {
+    "path": "lowered.svg",
+    "license": "CC0",
+    "authors": [
+      "Jeroen Hoek"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dlowered.svg"
+    ]
+  },
+  {
+    "path": "no.svg",
+    "license": "CC0",
+    "authors": [
+      "Jeroen Hoek"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dno.svg"
+    ]
+  },
+  {
+    "path": "raised.svg",
+    "license": "CC0",
+    "authors": [
+      "Jeroen Hoek"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Draised.svg"
+    ]
   }
 ]

assets/layers/kerbs/lowered.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <rect transform="matrix(.70705 .70716 -.70705 .70716 0 0)" x="2.3773" y="-2.1127" width="4.2255" height="4.2255" fill="#34938a" stop-color="#000000" stroke="#bfe8e5" stroke-linecap="round" stroke-width=".26458"/>
+ <path d="m1.8521 3.9692h0.79375l1.0583-1.0587h0.79375" fill="none" stop-color="#000000" stroke="#7fd2ca" stroke-width=".52917" style="-inkscape-stroke:none;font-variation-settings:normal"/>
+</svg>

assets/layers/kerbs/no.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <rect transform="matrix(.70705 .70716 -.70705 .70716 0 0)" x="2.3774" y="-2.1131" width="4.2255" height="4.2255" fill="#363636" stop-color="#000000" stroke="#adadad" stroke-linecap="round" stroke-width=".26458"/>
+  <path d="m2.1167 3.9688h2.1167" fill="none" stroke="#5c5c5c" stroke-width=".52917"/>
+ </g>
+</svg>

assets/layers/kerbs/raised.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <rect transform="matrix(.70705 .70716 -.70705 .70716 0 0)" x="2.3774" y="-2.1128" width="4.2255" height="4.2255" fill="#933434" stop-color="#000000" stroke="#e8bfbf" stroke-linecap="round" stroke-width=".26458"/>
+  <path d="m1.8521 3.9688 1.3229-4e-7v-1.3229l1.3229 5e-7" fill="none" stop-color="#000000" stroke="#d27f7f" stroke-width=".52917" style="-inkscape-stroke:none;font-variation-settings:normal"/>
+ </g>
+</svg>