From e5dbeee6215ad7642fe87ba10a6700b480bcb9d1 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Fri, 22 Apr 2022 03:12:34 +0200
Subject: [PATCH] Fix maxspeed theme: make sure it compiles

---
 assets/themes/maxspeed/license_info.json | 152 +++++++++++++++++++++++
 assets/themes/maxspeed/licenses.json     |  10 --
 assets/themes/maxspeed/maxspeed.json     |  99 ++++++++-------
 assets/themes/maxspeed/maxspeed_logo.svg |  68 ++++++----
 4 files changed, 255 insertions(+), 74 deletions(-)
 create mode 100644 assets/themes/maxspeed/license_info.json
 delete mode 100644 assets/themes/maxspeed/licenses.json

diff --git a/assets/themes/maxspeed/license_info.json b/assets/themes/maxspeed/license_info.json
new file mode 100644
index 0000000000..a712dc2b63
--- /dev/null
+++ b/assets/themes/maxspeed/license_info.json
@@ -0,0 +1,152 @@
+[
+  {
+    "path": "maxspeed_10.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_100.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_110.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_120.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_130.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_140.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_20.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_30.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_40.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_50.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_60.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_70.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_80.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_90.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  },
+  {
+    "path": "maxspeed_logo.svg",
+    "license": "CC 4.0",
+    "authors": [
+      "yopaseopor"
+    ],
+    "sources": [
+      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/themes/maxspeed/licenses.json b/assets/themes/maxspeed/licenses.json
deleted file mode 100644
index 0fb559476e..0000000000
--- a/assets/themes/maxspeed/licenses.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "path": "maxspeed_logo.svg",
-    "license": "CC 4.0",
-    "authors": ["yopaseopor"]
-    "sources": [
-      "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg"
-    ]
-  }
-]
diff --git a/assets/themes/maxspeed/maxspeed.json b/assets/themes/maxspeed/maxspeed.json
index 76e804c67f..1ca9a90375 100644
--- a/assets/themes/maxspeed/maxspeed.json
+++ b/assets/themes/maxspeed/maxspeed.json
@@ -16,7 +16,7 @@
     "en": "Complete the maxspeed properties of a way."
   },
   "maintainer": "",
-  "icon": "maxspeed_logo.svg",
+  "icon": "./assets/themes/maxspeed/maxspeed_logo.svg",
   "version": "0",
   "startLat": 0,
   "startLon": 0,
@@ -138,50 +138,16 @@
           ]
         }
       },
-	  "allowSplit":true
-	  "units": {
-		  "appliesTo": ["maxspeed"]}
-    "applicableUnits": [
-    {
-"canonicalDenomination": "km/h",
-"alternativeDenomination": ["km/u", "kmh", "kph"]
-"default": true,
-"human": {
-"en": "kilometers/hour",
-"ca": "quilòmetres/hora",
-"es": "kilómetros/hora",
-"nl": "kilometers/uur"
-},
-"humanShort": {
-"en": "km/h",
-"ca": "km/h",
-"es": "km/h",
-"nl": "km/u"
-}
-},
-{
-"canonicalDenomination": "mph",
-"alternativeDenomination": ["m/u", "mh", "m/ph"]
-"default": false,
-"human": {
-"en": "miles/hour",
-"ca": "milles/hora",
-"es": "millas/hora",
-"nl": "miles/uur"
-},
-"humanShort": {
-"en": "mph",
-"ca": "mph",
-"es": "mph",
-"nl": "mph"
-}
-},
+      "allowSplit": true,
       "mapRendering": [
         {
           "icon": {
+            "render": null,
             "mappings": [
-              "if":"maxspeed~[1-9]0|1[0-4]0",
-              "then": "maxspeed_{maxspeed}.svg"
+              {
+                "if": "maxspeed~[1-9]0|1[0-4]0",
+                "then": "./assets/themes/maxspeed/maxspeed_{maxspeed}.svg"
+              }
             ]
           },
           "iconSize": {
@@ -206,7 +172,56 @@
             "render": "3"
           }
         }
+      ],
+      "units": [
+        {
+          "applicableUnits": [
+            {
+              "#": "km/h is the default for a maxspeed; should be empty string",
+              "canonicalDenomination": "",
+              "alternativeDenomination": [
+                "km/u",
+                "kmh",
+                "kph"
+              ],
+              "default": true,
+              "human": {
+                "en": "kilometers/hour",
+                "ca": "quilòmetres/hora",
+                "es": "kilómetros/hora",
+                "nl": "kilometers/uur"
+              },
+              "humanShort": {
+                "en": "km/h",
+                "ca": "km/h",
+                "es": "km/h",
+                "nl": "km/u"
+              }
+            },
+            {
+              "canonicalDenomination": "mph",
+              "alternativeDenomination": [
+                "m/u",
+                "mh",
+                "m/ph"
+              ],
+              "human": {
+                "en": "miles/hour",
+                "ca": "milles/hora",
+                "es": "millas/hora",
+                "nl": "miles/uur"
+              },
+              "humanShort": {
+                "en": "mph",
+                "ca": "mph",
+                "es": "mph",
+                "nl": "mph"
+              }
+            }
+          ],
+          "appliesToKey": [ "maxspeed"]
+        }
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/themes/maxspeed/maxspeed_logo.svg b/assets/themes/maxspeed/maxspeed_logo.svg
index 90da471c49..c3d27d3109 100644
--- a/assets/themes/maxspeed/maxspeed_logo.svg
+++ b/assets/themes/maxspeed/maxspeed_logo.svg
@@ -1,23 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg version="1.1" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" width="769.688px" height="769.656px" viewBox="-360.791 -360.781 769.688 769.656" xml:space="preserve">
-<path fill="#E41408" d="M-360.791,24.031c0-212.523,172.305-384.812,384.852-384.812c212.508,0,384.836,172.289,384.836,384.812
-	c0,212.531-172.328,384.844-384.836,384.844C-188.486,408.875-360.791,236.562-360.791,24.031"/>
-<path fill="#FFFFFF" d="M-258.15,24.031c0-155.852,126.336-282.203,282.211-282.203c155.852,0,282.18,126.352,282.18,282.203
-	c0,155.875-126.328,282.188-282.18,282.188C-131.814,306.219-258.15,179.906-258.15,24.031"/>
-<path fill-rule="evenodd" d="M-171.814,70.122c1.99,7.914,5.869,19.652,7.836,25.548c7.861,15.619,23.453,33.308,39.15,39.1
-	c23.531,9.827,58.777,9.827,84.301,2.017c19.6-7.809,37.184-25.497,43.08-45.047c1.912-7.861,3.93-19.653,3.93-25.443
-	c0-9.828-3.93-19.602-5.895-27.515c-5.947-7.81-15.699-13.704-23.533-17.583c5.896-1.915,13.705-7.81,19.602-13.707
-	C4.465-4.352,6.482-23.849,0.588-39.52C-5.359-61.085-26.824-82.6-48.391-88.497c-19.6-5.896-47.01-5.896-66.611,0
-	c-5.869,2.017-13.705,5.896-19.576,7.81c-19.652,11.791-35.246,37.34-35.246,60.769l52.91,5.844
-	c-2.02-9.774,3.877-21.514,13.703-25.445c9.828-5.896,23.455-7.861,33.281-3.827c9.826,1.862,17.584,11.585,17.584,23.428
-	c-1.939,5.844-5.869,11.74-11.715,13.706c-9.746,5.896-25.443,7.86-37.236,5.896v47.012c9.773-2.017,25.496-2.017,33.307,0
-	c9.775,1.913,17.637,7.809,19.6,17.634c1.992,9.776-1.963,19.55-9.824,23.48c-5.846,3.931-13.705,5.897-21.541,5.897
-	c-3.881,0-11.768-1.967-15.645-1.967c-11.688-3.931-21.514-15.618-21.514-29.375L-171.814,70.122"/>
-<path fill-rule="evenodd" d="M238.88-28.869c-9.768-40.66-48.752-69.882-91.009-69.882c-40.66,0-79.645,29.222-91.047,69.882
-	c-8.132,29.22-8.132,69.88,0,97.505c11.402,40.623,50.387,69.844,91.047,69.844c42.257,0,81.241-29.221,91.009-69.844
-	C247.011,41.012,247.011,0.352,238.88-28.869z M190.128,52.375c-3.268,19.492-21.127,34.123-42.257,34.123
-	c-19.495,0-37.428-14.631-40.66-34.123c-3.268-19.495-3.268-45.487,0-63.385c3.232-21.126,21.165-35.757,40.66-35.757
-	c21.13,0,38.989,14.63,42.257,35.757C193.355,6.888,193.355,32.88,190.128,52.375z"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="770"
+   height="770"
+   viewBox="-360.791 -360.781 770.00001 769.99999"
+   xml:space="preserve"
+   sodipodi:docname="maxspeed_logo.svg"
+   inkscape:version="1.1.2 (1:1.1+202202050950+0a00cf5339)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs13" /><sodipodi:namedview
+   id="namedview11"
+   pagecolor="#505050"
+   bordercolor="#eeeeee"
+   borderopacity="1"
+   inkscape:pageshadow="0"
+   inkscape:pageopacity="0"
+   inkscape:pagecheckerboard="0"
+   showgrid="false"
+   width="770px"
+   inkscape:zoom="1.1264773"
+   inkscape:cx="381.72097"
+   inkscape:cy="414.56673"
+   inkscape:current-layer="Layer_1" />
+<path
+   fill="#e41408"
+   d="m -360.791,24.031 c 0,-212.523 172.305,-384.812 384.852,-384.812 212.508,0 384.836,172.289 384.836,384.812 0,212.531 -172.328,384.844 -384.836,384.844 -212.547,0 -384.852,-172.313 -384.852,-384.844"
+   id="path2" />
+<path
+   fill="#ffffff"
+   d="m -258.15,24.031 c 0,-155.852 126.336,-282.203 282.211,-282.203 155.852,0 282.18,126.352 282.18,282.203 0,155.875 -126.328,282.188 -282.18,282.188 -155.875,0 -282.211,-126.313 -282.211,-282.188"
+   id="path4" />
+<path
+   fill-rule="evenodd"
+   d="m -171.814,70.122 c 1.99,7.914 5.869,19.652 7.836,25.548 7.861,15.619 23.453,33.308 39.15,39.1 23.531,9.827 58.777,9.827 84.301,2.017 19.6,-7.809 37.184,-25.497 43.08,-45.047 1.912,-7.861 3.93,-19.653 3.93,-25.443 0,-9.828 -3.93,-19.602 -5.895,-27.515 -5.947,-7.81 -15.699,-13.704 -23.533,-17.583 5.896,-1.915 13.705,-7.81 19.602,-13.707 7.808,-11.844 9.825,-31.341 3.931,-47.012 -5.947,-21.565 -27.412,-43.08 -48.979,-48.977 -19.6,-5.896 -47.01,-5.896 -66.611,0 -5.869,2.017 -13.705,5.896 -19.576,7.81 -19.652,11.791 -35.246,37.34 -35.246,60.769 l 52.91,5.844 c -2.02,-9.774 3.877,-21.514 13.703,-25.445 9.828,-5.896 23.455,-7.861 33.281,-3.827 9.826,1.862 17.584,11.585 17.584,23.428 -1.939,5.844 -5.869,11.74 -11.715,13.706 -9.746,5.896 -25.443,7.86 -37.236,5.896 v 47.012 c 9.773,-2.017 25.496,-2.017 33.307,0 9.775,1.913 17.637,7.809 19.6,17.634 1.992,9.776 -1.963,19.55 -9.824,23.48 -5.846,3.931 -13.705,5.897 -21.541,5.897 -3.881,0 -11.768,-1.967 -15.645,-1.967 -11.688,-3.931 -21.514,-15.618 -21.514,-29.375 l -54.9,7.757"
+   id="path6" />
+<path
+   fill-rule="evenodd"
+   d="m 238.88,-28.869 c -9.768,-40.66 -48.752,-69.882 -91.009,-69.882 -40.66,0 -79.645,29.222 -91.047,69.882 -8.132,29.22 -8.132,69.88 0,97.505 11.402,40.623 50.387,69.844 91.047,69.844 42.257,0 81.241,-29.221 91.009,-69.844 8.131,-27.624 8.131,-68.284 0,-97.505 z m -48.752,81.244 c -3.268,19.492 -21.127,34.123 -42.257,34.123 -19.495,0 -37.428,-14.631 -40.66,-34.123 -3.268,-19.495 -3.268,-45.487 0,-63.385 3.232,-21.126 21.165,-35.757 40.66,-35.757 21.13,0 38.989,14.63 42.257,35.757 3.227,17.898 3.227,43.89 0,63.385 z"
+   id="path8" />
 </svg>