From 331e1d2f534f3110f40598a34778d7387d369130 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 22 Apr 2022 16:25:37 +0200 Subject: [PATCH 1/2] Update licenses.json --- assets/themes/maxspeed/licenses.json | 144 ++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-) diff --git a/assets/themes/maxspeed/licenses.json b/assets/themes/maxspeed/licenses.json index 0fb559476..bfa58bcc3 100644 --- a/assets/themes/maxspeed/licenses.json +++ b/assets/themes/maxspeed/licenses.json @@ -1,8 +1,150 @@ [ + { + "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"] + "authors": [ + "yopaseopor" + ], "sources": [ "https://raw.githubusercontent.com/yopaseopor/beta_preset_josm/master/ES/traffic_signs/ES/ES_R301-30.svg" ] From 6f2cb1768bb61c97c185d7b4c5c831a48ef117fe Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 22 Apr 2022 16:25:52 +0200 Subject: [PATCH 2/2] Update maxspeed.json --- assets/themes/maxspeed/maxspeed.json | 97 ++++++++++++++++------------ 1 file changed, 56 insertions(+), 41 deletions(-) diff --git a/assets/themes/maxspeed/maxspeed.json b/assets/themes/maxspeed/maxspeed.json index 76e804c67..0a3abede4 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,6 +172,55 @@ "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"] + } ] } ]