From 60debcf6ed46ee45b45d6c2a3f640336ca3d0686 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 12 Apr 2022 13:16:45 +0200 Subject: [PATCH] Linting of maxspees theme --- assets/themes/maxspeed/maxspeed.json | 413 ++++++++++++++------------- 1 file changed, 209 insertions(+), 204 deletions(-) diff --git a/assets/themes/maxspeed/maxspeed.json b/assets/themes/maxspeed/maxspeed.json index 3f17c1879..2ca0523c3 100644 --- a/assets/themes/maxspeed/maxspeed.json +++ b/assets/themes/maxspeed/maxspeed.json @@ -1,5 +1,5 @@ { - "id": "velocidad", + "id": "maxspeeds", "title": { "es": "Velocidad", "ca": "Velocitat", @@ -15,11 +15,6 @@ "ca": "Completarem les propietats de la velocitat de la via que faltin.", "en": "Complete the maxspeed properties of a way." }, - "language": [ - "es", - "ca", - "en" - ], "maintainer": "", "icon": "ES_R301.png", "version": "0", @@ -27,35 +22,15 @@ "startLon": 0, "startZoom": 1, "widenFactor": 0.01, - "socialImage": "", "layers": [ { - "id": "velocidad", + "id": "maxspeed", "name": { "es": "Velocidad", "ca": "Velocitat", "en": "Maxspeed" }, "minzoom": 16, - "overpassTags": { - "or": [ - "highway=residential", - "highway=living_street", - "highway=motorway", - "highway=tertiary", - "highway=service", - "highway=unclassified", - "highway=secondary", - "highway=primary", - "highway=trunk", - "highway=motorway", - "highway=tertiary_link", - "highway=secondary_link", - "highway=primary_link", - "highway=trunk_link", - "highway=motorway_link" - ] - }, "title": { "render": { "es": "Nombre: {name}", @@ -96,7 +71,8 @@ }, "freeform": { "key": "maxspeed" - } + }, + "id": "maxspeed-maxspeed" }, { "render": { @@ -137,184 +113,213 @@ "en": "No one way" } } - ] + ], + "id": "maxspeed-oneway" } ], - "hideUnderlayingFeaturesMinPercentage": 0, - "icon": { - "mappings": [ - { - "if": { - "and": [ - "maxspeed=10" - ] - }, - "then": { - "es": "ES_R301_10.png", - "ca": "ES_R301_10.png", - "en": "ES_R301_10.png" - } - }, - { - "if": { - "and": [ - "maxspeed=20" - ] - }, - "then": { - "es": "ES_R301_20.png", - "ca": "ES_R301_20.png", - "en": "ES_R301_20.png" - } - }, - { - "if": { - "and": [ - "maxspeed=30" - ] - }, - "then": { - "es": "ES_R301_30.png", - "ca": "ES_R301_30.png", - "en": "ES_R301_30.png" - } - }, - { - "if": { - "and": [ - "maxspeed=40" - ] - }, - "then": { - "es": "ES_R301_40.png", - "ca": "ES_R301_40.png", - "en": "ES_R301_40.png" - } - }, - { - "if": { - "and": [ - "maxspeed=50" - ] - }, - "then": { - "es": "ES_R301_50.png", - "ca": "ES_R301_50.png", - "en": "ES_R301_50.png" - } - }, - { - "if": { - "and": [ - "maxspeed=60" - ] - }, - "then": { - "es": "ES_R301_60.png", - "ca": "ES_R301_60.png", - "en": "ES_R301_60.png" - } - }, - { - "if": { - "and": [ - "maxspeed=70" - ] - }, - "then": { - "es": "ES_R301_70.png", - "ca": "ES_R301_70.png", - "en": "ES_R301_70.png" - } - }, - { - "if": { - "and": [ - "maxspeed=80" - ] - }, - "then": { - "es": "ES_R301_80.png", - "ca": "ES_R301_80.png", - "en": "ES_R301_80.png" - } - }, - { - "if": { - "and": [ - "maxspeed=90" - ] - }, - "then": { - "es": "ES_R301_90.png", - "ca": "ES_R301_90.png", - "en": "ES_R301_90.png" - } - }, - { - "if": { - "and": [ - "maxspeed=100" - ] - }, - "then": { - "es": "ES_R301_100.png", - "ca": "ES_R301_100.png", - "en": "ES_R301_100.png" - } - }, - { - "if": { - "and": [ - "maxspeed=110" - ] - }, - "then": { - "es": "ES_R301_110.png", - "ca": "ES_R301_110.png", - "en": "ES_R301_110.png" - } - }, - { - "if": { - "and": [ - "maxspeed=120" - ] - }, - "then": { - "es": "ES_R301_120.png", - "ca": "ES_R301_120.png", - "en": "ES_R301_120.png" - } - } - ] - }, - "width": { - "render": "3" - }, - "iconSize": { - "render": "20,20,center" - }, - "color": { - "render": "#000000", - "mappings": [ - { - "if": { - "and": [ - "maxspeed=" - ] - }, - "then": { - "es": "#ff0000", - "ca": "#ff0000", - "en": "#ff0000" - } - } - ] - }, "presets": [], - "wayHandling": 2 + "source": { + "osmTags": { + "or": [ + "highway=residential", + "highway=living_street", + "highway=motorway", + "highway=tertiary", + "highway=service", + "highway=unclassified", + "highway=secondary", + "highway=primary", + "highway=trunk", + "highway=motorway", + "highway=tertiary_link", + "highway=secondary_link", + "highway=primary_link", + "highway=trunk_link", + "highway=motorway_link" + ] + } + }, + "mapRendering": [ + { + "icon": { + "mappings": [ + { + "if": { + "and": [ + "maxspeed=10" + ] + }, + "then": { + "es": "ES_R301_10.png", + "ca": "ES_R301_10.png", + "en": "ES_R301_10.png" + } + }, + { + "if": { + "and": [ + "maxspeed=20" + ] + }, + "then": { + "es": "ES_R301_20.png", + "ca": "ES_R301_20.png", + "en": "ES_R301_20.png" + } + }, + { + "if": { + "and": [ + "maxspeed=30" + ] + }, + "then": { + "es": "ES_R301_30.png", + "ca": "ES_R301_30.png", + "en": "ES_R301_30.png" + } + }, + { + "if": { + "and": [ + "maxspeed=40" + ] + }, + "then": { + "es": "ES_R301_40.png", + "ca": "ES_R301_40.png", + "en": "ES_R301_40.png" + } + }, + { + "if": { + "and": [ + "maxspeed=50" + ] + }, + "then": { + "es": "ES_R301_50.png", + "ca": "ES_R301_50.png", + "en": "ES_R301_50.png" + } + }, + { + "if": { + "and": [ + "maxspeed=60" + ] + }, + "then": { + "es": "ES_R301_60.png", + "ca": "ES_R301_60.png", + "en": "ES_R301_60.png" + } + }, + { + "if": { + "and": [ + "maxspeed=70" + ] + }, + "then": { + "es": "ES_R301_70.png", + "ca": "ES_R301_70.png", + "en": "ES_R301_70.png" + } + }, + { + "if": { + "and": [ + "maxspeed=80" + ] + }, + "then": { + "es": "ES_R301_80.png", + "ca": "ES_R301_80.png", + "en": "ES_R301_80.png" + } + }, + { + "if": { + "and": [ + "maxspeed=90" + ] + }, + "then": { + "es": "ES_R301_90.png", + "ca": "ES_R301_90.png", + "en": "ES_R301_90.png" + } + }, + { + "if": { + "and": [ + "maxspeed=100" + ] + }, + "then": { + "es": "ES_R301_100.png", + "ca": "ES_R301_100.png", + "en": "ES_R301_100.png" + } + }, + { + "if": { + "and": [ + "maxspeed=110" + ] + }, + "then": { + "es": "ES_R301_110.png", + "ca": "ES_R301_110.png", + "en": "ES_R301_110.png" + } + }, + { + "if": { + "and": [ + "maxspeed=120" + ] + }, + "then": { + "es": "ES_R301_120.png", + "ca": "ES_R301_120.png", + "en": "ES_R301_120.png" + } + } + ] + }, + "iconSize": { + "render": "20,20,center" + }, + "location": [ + "point", + "centroid" + ] + }, + { + "color": { + "render": "#000000", + "mappings": [ + { + "if": { + "and": [ + "maxspeed=" + ] + }, + "then": { + "es": "#ff0000", + "ca": "#ff0000", + "en": "#ff0000" + } + } + ] + }, + "width": { + "render": "3" + } + } + ] } - ], - "roamingRenderings": [] + ] } \ No newline at end of file