From 72bfccdb3617633b65a36325a296a430d80cc5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 3 Nov 2024 07:37:02 +0100 Subject: [PATCH] car_*: convert to YAML --- car_maxspeed.json | 217 ---------------------------------------------- car_maxspeed.yaml | 206 +++++++++++++++++++++++++++++++++++++++++++ car_routes.json | 82 ------------------ car_routes.yaml | 77 ++++++++++++++++ 4 files changed, 283 insertions(+), 299 deletions(-) delete mode 100644 car_maxspeed.json create mode 100644 car_maxspeed.yaml delete mode 100644 car_routes.json create mode 100644 car_routes.yaml diff --git a/car_maxspeed.json b/car_maxspeed.json deleted file mode 100644 index 4fd0b4a..0000000 --- a/car_maxspeed.json +++ /dev/null @@ -1,217 +0,0 @@ -{ - "type": "overpass", - "name": { - "ca": "Velocitat màxima", - "cs": "Maximální rychlost", - "de": "Höchstgeschwindigkeiten", - "en": "Maxspeed", - "es": "Velocidad máxima", - "fr": "Limites de vitesse", - "gl": "Velocidade máxima", - "hu": "Sebességkorlátozás", - "it": "Velocità massima", - "ja": "最高速度", - "nb": "Fartsgrense", - "nl": "Snelheidslimiet", - "oc": "Limits de velocitat", - "pl": "Prędkość maksymalna", - "pt": "Velocidade máxima", - "pt-br": "Veloc. máxima", - "ro": "Viteza maximă", - "ru": "Максимальная скорость", - "sr": "Максимална брзина", - "tr": "En yüksek hız" - }, - "query": { - "11": "way[highway~\"^(motorway|trunk)$\"];", - "13": "way[highway~\"^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|tertiary)$\"];", - "15": "way[highway~\"^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|residential|unclassified)$\"];", - "17": "way[highway~\"^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|residential|unclassified|service|living_street|pedestrian|track|road)$\"];" - }, - "feature": { - "pre": [ - "{% set maxspeedKmh = null %}", - "{% set maxspeed = null %}", - "{% set unit = null %}", - "", - "{% if tags.maxspeed is defined %}", - " {% if const.colorOther[tags.maxspeed] %}", - " {% set maxspeed = tags.maxspeed %}", - " {% elseif tags.maxspeed|matches(\"^[0-9]+$\") %}", - " {% set maxspeedKmh = tags.maxspeed %}", - " {% set maxspeed = tags.maxspeed %}", - " {% set unit = \"km/h\" %}", - " {% elseif tags.maxspeed|matches( \"(^[0-9]+) mph$\") %}", - " {% set m = tags.maxspeed|matches(\"(^[0-9]+) mph$\") %}", - " {% set maxspeedKmh = m[1] * 1.60934 %}", - " {% set maxspeed = m[1] %}", - " {% set unit = \"mph\" %}", - " {% else %}", - " {% set maxspeed = 'other' %}", - " {% endif %}", - "{% endif %}", - "", - "{% if attribute(tags, 'maxspeed:forward') is defined %}", - " {% set x = attribute(tags, 'maxspeed:forward') %}", - " {% if const.colorOther[x] %}", - " {% set maxspeedF = attribute(tags, 'maxspeed:forward') %}", - " {% elseif attribute(tags, 'maxspeed:forward')|matches(\"^[0-9]+$\") %}", - " {% set maxspeedFKmh = attribute(tags, 'maxspeed:forward') %}", - " {% set maxspeedF = attribute(tags, 'maxspeed:forward') %}", - " {% set unit = \"km/h\" %}", - " {% elseif attribute(tags, 'maxspeed:forward')|matches(\"^[0-9]+ mph$\") %}", - " {% set m = attribute(tags, 'maxspeed:forward')|matches(\"(^[0-9]+) mph$\") %}", - " {% set maxspeedFKmh = m[1] * 1.60934 %}", - " {% set maxspeedF = m[1] %}", - " {% set unit = \"mph\" %}", - " {% else %}", - " {% set maxspeedF = 'other' %}", - " {% endif %}", - "{% endif %}", - "", - "{% if attribute(tags, 'maxspeed:backward') is defined %}", - " {% set x = attribute(tags, 'maxspeed:backward') %}", - " {% if const.colorOther[x] %}", - " {% set maxspeedB = attribute(tags, 'maxspeed:backward') %}", - " {% elseif attribute(tags, 'maxspeed:backward')|matches(\"^[0-9]+$\") %}", - " {% set maxspeedBKmh = attribute(tags, 'maxspeed:backward') %}", - " {% set maxspeedB = attribute(tags, 'maxspeed:backward') %}", - " {% set unit = \"km/h\" %}", - " {% elseif attribute(tags, 'maxspeed:backward')|matches(\"^[0-9]+ mph$\") %}", - " {% set m = attribute(tags, 'maxspeed:backward')|matches(\"(^[0-9]+) mph$\") %}", - " {% set maxspeedBKmh = m[1] * 1.60934 %}", - " {% set maxspeedB = m[1] %}", - " {% set unit = \"mph\" %}", - " {% else %}", - " {% set maxspeedB = 'other' %}", - " {% endif %}", - "{% endif %}", - "", - "{% if const.colorOther[maxspeed] %}", - "{% set color = const.colorOther[maxspeed] %}", - "{% elseif not maxspeedKmh %}", - "{% set color = \"#404040\" %}", - "{% else %}", - "{% set color = colorInterpolate(const.colorMap, (maxspeedKmh - const.offsetColorSpeed) / const.highestColorSpeed) %}", - "{% endif %}", - "", - "{% if const.colorOther[maxspeedF] %}", - "{% set colorF = const.colorOther[maxspeedF] %}", - "{% elseif maxspeedFKmh %}", - "{% set colorF = colorInterpolate(const.colorMap, (maxspeedFKmh - const.offsetColorSpeed) / const.highestColorSpeed) %}", - "{% endif %}", - "", - "{% if const.colorOther[maxspeedB] %}", - "{% set colorB = const.colorOther[maxspeedB] %}", - "{% elseif maxspeedBKmh %}", - "{% set colorB = colorInterpolate(const.colorMap, (maxspeedBKmh - const.offsetColorSpeed) / const.highestColorSpeed) %}", - "{% endif %}" - ], - "description": "{{ tagTransList('highway', tags.highway) }}", - "details": [ - "{% if maxspeedF or maxspeedB %}", - "{{ maxspeedB == 'other' ? attribute(tags, 'maxspeed:backward') : const.colorOther[maxspeedB] ? tagTrans('maxspeed', maxspeedB) : maxspeedB|default(trans('unknown')) }} / {{ maxspeedF == 'other' ? attribute(tags, 'maxspeed:forward') : const.colorOther[maxspeedF] ? tagTrans('maxspeed', maxspeedF) : maxspeedF|default(trans('unknown')) }} {{ unit }}", - "{% elseif maxspeed %}", - "{{ maxspeed == 'other' ? tags.maxspeed : const.colorOther[maxspeed] ? tagTrans('maxspeed', maxspeed) : maxspeed }} {{ unit }}", - "{% elseif tags.maxspeed %}", - "{{ tags.maxspeed }}", - "{% else %}", - "{{ trans('unknown') }}", - "{% endif %}" - ], - "markerSymbol": "", - "listMarkerSymbol": "line", - "styles": "{% if maxspeedB or maxspeedF %}left,right,default{% else %}default{% endif %}", - "style": { - "width": "{% if maxspeedB or maxspeedF %}0{% else %}4{% endif %}", - "color": "{{ color }}", - "text": [ - "{% if maxspeedB or maxspeedF %}", - " {% if maxspeedB %}🡸 {{ maxspeedB == 'other' ? attribute(tags, 'maxspeed:backward') : maxspeedB }} {% endif %}|{% if maxspeedF %} {{ maxspeedF == 'other' ? attribute(tags, 'maxspeed:forward') : maxspeedF }} 🡺{% endif %} ", - "{% else %}", - " {{ maxspeed == 'other' ? tags.maxspeed : maxspeed }} ", - "{% endif %}" - ], - "textRepeat": "1", - "textOffset": "4", - "textFontWeight": "bold" - }, - "style:left": { - "width": "2", - "color": "{{ colorB|default('#404040') }}", - "offset": "-1" - }, - "style:right": { - "width": "2", - "color": "{{ colorF|default('#404040') }}", - "offset": "1" - } - }, - "const": { - "colorMap": [ - "#00af00", - "#ff7f00", - "#ff0000", - "#af00af" - ], - "colorOther": { - "none": "#ff00ff", - "walk": "#00afff", - "other": "#0000ff" - }, - "highestColorSpeed": 150, - "offsetColorSpeed": 10 - }, - "info": [ - "", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - "
{{ markerLine(evaluate({}))|raw }}{{ trans('unknown') }}
{{ markerLine(evaluate({ \"maxspeed\": \"walk\" }))|raw }}{{ tagTrans('maxspeed', 'walk') }}
{{ markerLine(evaluate({ \"maxspeed\": \"none\" }))|raw }}{{ tagTrans('maxspeed', 'none') }}
{{ markerLine(evaluate({ \"maxspeed\": \"other\" }))|raw }}{{ trans('other') }}
", - "
", - "", - "{% for i in range(10, 140, 20) %}", - " ", - " ", - " ", - " ", - "{% endfor %}", - " ", - " ", - " ", - " ", - "
{{ markerLine(evaluate({ \"maxspeed\": i }))|raw }}{{ i }}km/h
{{ markerLine(evaluate({ \"maxspeed\": 150 }))|raw }}≥150km/h
", - "
", - "
", - "", - "{% for i in range(10, 60, 10) %}", - " ", - " ", - " ", - " ", - "{% endfor %}", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - "
{{ markerLine(evaluate({ \"maxspeed\": (i * 1.60934)|round }))|raw }}{{ i }}mph
{{ markerLine(evaluate({ \"maxspeed\": (75 * 1.60934)|round }))|raw }}75mph
{{ markerLine(evaluate({ \"maxspeed\": (95 * 1.60934)|round }))|raw }}≥95mph
", - "
" - ] -} diff --git a/car_maxspeed.yaml b/car_maxspeed.yaml new file mode 100644 index 0000000..fada405 --- /dev/null +++ b/car_maxspeed.yaml @@ -0,0 +1,206 @@ +type: overpass +name: + ca: Velocitat màxima + cs: Maximální rychlost + de: Höchstgeschwindigkeiten + en: Maxspeed + es: Velocidad máxima + fr: Limites de vitesse + gl: Velocidade máxima + hu: Sebességkorlátozás + it: Velocità massima + ja: 最高速度 + nb: Fartsgrense + nl: Snelheidslimiet + oc: Limits de velocitat + pl: Prędkość maksymalna + pt: Velocidade máxima + pt-br: Veloc. máxima + ro: Viteza maximă + ru: Максимальная скорость + sr: Максимална брзина + tr: En yüksek hız +query: + 11: way[highway~"^(motorway|trunk)$"]; + 13: way[highway~"^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|tertiary)$"]; + 15: way[highway~"^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|residential|unclassified)$"]; + 17: way[highway~"^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|residential|unclassified|service|living_street|pedestrian|track|road)$"]; +feature: + pre: |- + {% set maxspeedKmh = null %} + {% set maxspeed = null %} + {% set unit = null %} + + {% if tags.maxspeed is defined %} + {% if const.colorOther[tags.maxspeed] %} + {% set maxspeed = tags.maxspeed %} + {% elseif tags.maxspeed|matches("^[0-9]+$") %} + {% set maxspeedKmh = tags.maxspeed %} + {% set maxspeed = tags.maxspeed %} + {% set unit = "km/h" %} + {% elseif tags.maxspeed|matches( "(^[0-9]+) mph$") %} + {% set m = tags.maxspeed|matches("(^[0-9]+) mph$") %} + {% set maxspeedKmh = m[1] * 1.60934 %} + {% set maxspeed = m[1] %} + {% set unit = "mph" %} + {% else %} + {% set maxspeed = 'other' %} + {% endif %} + {% endif %} + + {% if attribute(tags, 'maxspeed:forward') is defined %} + {% set x = attribute(tags, 'maxspeed:forward') %} + {% if const.colorOther[x] %} + {% set maxspeedF = attribute(tags, 'maxspeed:forward') %} + {% elseif attribute(tags, 'maxspeed:forward')|matches("^[0-9]+$") %} + {% set maxspeedFKmh = attribute(tags, 'maxspeed:forward') %} + {% set maxspeedF = attribute(tags, 'maxspeed:forward') %} + {% set unit = "km/h" %} + {% elseif attribute(tags, 'maxspeed:forward')|matches("^[0-9]+ mph$") %} + {% set m = attribute(tags, 'maxspeed:forward')|matches("(^[0-9]+) mph$") %} + {% set maxspeedFKmh = m[1] * 1.60934 %} + {% set maxspeedF = m[1] %} + {% set unit = "mph" %} + {% else %} + {% set maxspeedF = 'other' %} + {% endif %} + {% endif %} + + {% if attribute(tags, 'maxspeed:backward') is defined %} + {% set x = attribute(tags, 'maxspeed:backward') %} + {% if const.colorOther[x] %} + {% set maxspeedB = attribute(tags, 'maxspeed:backward') %} + {% elseif attribute(tags, 'maxspeed:backward')|matches("^[0-9]+$") %} + {% set maxspeedBKmh = attribute(tags, 'maxspeed:backward') %} + {% set maxspeedB = attribute(tags, 'maxspeed:backward') %} + {% set unit = "km/h" %} + {% elseif attribute(tags, 'maxspeed:backward')|matches("^[0-9]+ mph$") %} + {% set m = attribute(tags, 'maxspeed:backward')|matches("(^[0-9]+) mph$") %} + {% set maxspeedBKmh = m[1] * 1.60934 %} + {% set maxspeedB = m[1] %} + {% set unit = "mph" %} + {% else %} + {% set maxspeedB = 'other' %} + {% endif %} + {% endif %} + + {% if const.colorOther[maxspeed] %} + {% set color = const.colorOther[maxspeed] %} + {% elseif not maxspeedKmh %} + {% set color = "#404040" %} + {% else %} + {% set color = colorInterpolate(const.colorMap, (maxspeedKmh - const.offsetColorSpeed) / const.highestColorSpeed) %} + {% endif %} + + {% if const.colorOther[maxspeedF] %} + {% set colorF = const.colorOther[maxspeedF] %} + {% elseif maxspeedFKmh %} + {% set colorF = colorInterpolate(const.colorMap, (maxspeedFKmh - const.offsetColorSpeed) / const.highestColorSpeed) %} + {% endif %} + + {% if const.colorOther[maxspeedB] %} + {% set colorB = const.colorOther[maxspeedB] %} + {% elseif maxspeedBKmh %} + {% set colorB = colorInterpolate(const.colorMap, (maxspeedBKmh - const.offsetColorSpeed) / const.highestColorSpeed) %} + {% endif %} + description: |- + {{ tagTransList('highway', tags.highway) }} + details: |- + {% if maxspeedF or maxspeedB %} + {{ maxspeedB == 'other' ? attribute(tags, 'maxspeed:backward') : const.colorOther[maxspeedB] ? tagTrans('maxspeed', maxspeedB) : maxspeedB|default(trans('unknown')) }} / {{ maxspeedF == 'other' ? attribute(tags, 'maxspeed:forward') : const.colorOther[maxspeedF] ? tagTrans('maxspeed', maxspeedF) : maxspeedF|default(trans('unknown')) }} {{ unit }} + {% elseif maxspeed %} + {{ maxspeed == 'other' ? tags.maxspeed : const.colorOther[maxspeed] ? tagTrans('maxspeed', maxspeed) : maxspeed }} {{ unit }} + {% elseif tags.maxspeed %} + {{ tags.maxspeed }} + {% else %} + {{ trans('unknown') }} + {% endif %} + markerSymbol: '' + listMarkerSymbol: line + styles: |- + {% if maxspeedB or maxspeedF %}left,right,default{% else %}default{% endif %} + style: + width: '{% if maxspeedB or maxspeedF %}0{% else %}4{% endif %}' + color: '{{ color }}' + text: |- + {% if maxspeedB or maxspeedF %} + {% if maxspeedB %}🡸 {{ maxspeedB == 'other' ? attribute(tags, 'maxspeed:backward') : maxspeedB }} {% endif %}|{% if maxspeedF %} {{ maxspeedF == 'other' ? attribute(tags, 'maxspeed:forward') : maxspeedF }} 🡺{% endif %} + {% else %} + {{ maxspeed == 'other' ? tags.maxspeed : maxspeed }} + {% endif %} + textRepeat: '1' + textOffset: '4' + textFontWeight: bold + style:left: + width: '2' + color: |- + {{ colorB|default('#404040') }} + offset: '-1' + style:right: + width: '2' + color: | + {{ colorF|default('#404040') }} + offset: '1' +const: + colorMap: + - '#00af00' + - '#ff7f00' + - '#ff0000' + - '#af00af' + colorOther: + none: '#ff00ff' + walk: '#00afff' + other: '#0000ff' + highestColorSpeed: 150 + offsetColorSpeed: 10 +info: |- + + + + + + + + + + + + + + + + + +
{{ markerLine(evaluate({}))|raw }}{{ trans('unknown') }}
{{ markerLine(evaluate({ "maxspeed": "walk" }))|raw }}{{ tagTrans('maxspeed', 'walk') }}
{{ markerLine(evaluate({ "maxspeed": "none" }))|raw }}{{ tagTrans('maxspeed', 'none') }}
{{ markerLine(evaluate({ "maxspeed": "other" }))|raw }}{{ trans('other') }}
+
+ + {% for i in range(10, 140, 20) %} + + + + + {% endfor %} + + + + +
{{ markerLine(evaluate({ "maxspeed": i }))|raw }}{{ i }}km/h
{{ markerLine(evaluate({ "maxspeed": 150 }))|raw }}≥150km/h
+
+
+ + {% for i in range(10, 60, 10) %} + + + + + {% endfor %} + + + + + + + + +
{{ markerLine(evaluate({ "maxspeed": (i * 1.60934)|round }))|raw }}{{ i }}mph
{{ markerLine(evaluate({ "maxspeed": (75 * 1.60934)|round }))|raw }}75mph
{{ markerLine(evaluate({ "maxspeed": (95 * 1.60934)|round }))|raw }}≥95mph
+
diff --git a/car_routes.json b/car_routes.json deleted file mode 100644 index 3405d44..0000000 --- a/car_routes.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "overpass", - "name": { - "ca": "Rutes en cotxe", - "cs": "Automobilové cesty", - "de": "Autorouten", - "en": "Car routes", - "es": "Rutas de coche", - "fr": "Itinéraires auto", - "gl": "Rotas automobilísticas", - "hu": "Főútvonalak", - "it": "Tratte automobilistiche", - "ja": "車のルート", - "nb": "Bilruter", - "nl": "Autoroutes", - "oc": "Itineraris auto", - "pl": "Trasy samochodowe", - "pt": "Rotas rodoviárias", - "pt-br": "Rotas rodoviárias", - "ro": "Rute auto", - "ru": "Автомобильные маршруты", - "sr": "Трасе за возила", - "tr": "Araba Rotaları" - }, - "query": { - "10": "relation[type=route][route=road]" - }, - "members": true, - "feature": { - "pre": "{% set color = '#' ~ tags.network|default('')|md5|slice(0, 6) %}", - "description": "{% if tags.network %}{{ tagTrans('network', tags.network) }}{% endif %}", - "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% endif %}", - "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': color })|raw }}", - "markerSymbol": "", - "styles": "" - }, - "memberFeature": { - "pre": [ - "{% set refs = [] %}", - "{% set color = '#d41d8c' %}", - "{% if tags.ref %}", - " {% for ref in tags.ref|split(';') %}", - " {% set refs = refs|merge([ ref|trim ]) %}", - " {% endfor %}", - "{% endif %}", - "", - "{% for master in masters %}", - " {% if master.tags.network %}", - " {% set color = '#' ~ master.tags.network|md5|slice(0, 6) %}", - " {% endif %}", - " {% if master.tags.ref %}", - " {% set refs = refs|merge([ master.tags.ref ]) %}", - " {% endif %}", - "{% endfor %}", - "", - "{% set refs = refs|unique|natsort({ insensitive: true }) %}" - ], - "body": [ - "

Routes

", - "" - ], - "listExclude": "1", - "style": { - "color": "{{ color }}", - "width": 4, - "opacity": 1, - "text": "{{ refs|join(' · ') }} ", - "textRepeat": "1", - "textOffset": "12", - "textFontWeight": "bold" - } - } -} diff --git a/car_routes.yaml b/car_routes.yaml new file mode 100644 index 0000000..b651cee --- /dev/null +++ b/car_routes.yaml @@ -0,0 +1,77 @@ +type: overpass +name: + ca: Rutes en cotxe + cs: Automobilové cesty + de: Autorouten + en: Car routes + es: Rutas de coche + fr: Itinéraires auto + gl: Rotas automobilísticas + hu: Főútvonalak + it: Tratte automobilistiche + ja: 車のルート + nb: Bilruter + nl: Autoroutes + oc: Itineraris auto + pl: Trasy samochodowe + pt: Rotas rodoviárias + pt-br: Rotas rodoviárias + ro: Rute auto + ru: Автомобильные маршруты + sr: Трасе за возила + tr: Araba Rotaları +query: + 10: relation[type=route][route=road] +members: true +feature: + pre: |- + {% set color = '#' ~ tags.network|default('')|md5|slice(0, 6) %} + description: |- + {% if tags.network %}{{ tagTrans('network', tags.network) }}{% endif %} + title: |- + {% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% endif %} + listMarkerSymbol: |- + {{ markerLine({ 'width': 4, 'color': color })|raw }} + markerSymbol: '' + styles: '' +memberFeature: + pre: |- + {% set refs = [] %} + {% set color = '#d41d8c' %} + {% if tags.ref %} + {% for ref in tags.ref|split(';') %} + {% set refs = refs|merge([ ref|trim ]) %} + {% endfor %} + {% endif %} + + {% for master in masters %} + {% if master.tags.network %} + {% set color = '#' ~ master.tags.network|md5|slice(0, 6) %} + {% endif %} + {% if master.tags.ref %} + {% set refs = refs|merge([ master.tags.ref ]) %} + {% endif %} + {% endfor %} + + {% set refs = refs|unique|natsort({ insensitive: true }) %} + body: |- +

Routes

+ + listExclude: 1 + style: + color: '{{ color }}' + width: 4 + opacity: 1 + text: '{{ refs|join(" · ") }} ' + textRepeat: 1 + textOffset: 12 + textFontWeight: bold