From 6c3de2005965fe894511792226cc4c882268ff3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sat, 27 Jan 2018 22:11:31 +0100 Subject: [PATCH] Adapt to new marker handling --- buildings.json | 2 +- car_maxspeed.json | 2 +- power.json | 2 +- railway-electrification.json | 2 +- water.json | 2 +- works.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildings.json b/buildings.json index 6b262cac3..5eb9cb320 100644 --- a/buildings.json +++ b/buildings.json @@ -13,7 +13,7 @@ ] }, "feature": { - "markerSign": null, + "markerSymbol": null, "priority": [ "{% set p = 100 %}", "{% if tags.name %}{% set p = p - 10 %}{% endif %}", diff --git a/car_maxspeed.json b/car_maxspeed.json index fbfc74107..3ca53a8ab 100644 --- a/car_maxspeed.json +++ b/car_maxspeed.json @@ -48,7 +48,7 @@ "{{ trans('unknown') }}", "{% endif %}" ], - "markerSign": null, + "markerSymbol": null, "listMarkerSymbol": "line", "style": { "width": "3", diff --git a/power.json b/power.json index baa3ffb7f..b2723692f 100644 --- a/power.json +++ b/power.json @@ -28,7 +28,7 @@ "{% set x='generator:method' %}{% if tags[x] %}
{{ keyTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}", "{% set x='generator:type' %}{% if tags[x] %}
{{ tagTransList('generator:type') }}: {{ tagTrans('generator:type', tags[x]) }}{% endif %}" ], - "markerSign": null, + "markerSymbol": null, "priority": "{% if tags.power == 'plant' %}0{% elseif tags.power == 'generator' or tags.power == 'line' %}1{% elseif tags.power == 'substation' %}2{% else %}3{% endif %}" } } diff --git a/railway-electrification.json b/railway-electrification.json index 8db35c562..4aca9b8a0 100644 --- a/railway-electrification.json +++ b/railway-electrification.json @@ -52,7 +52,7 @@ "{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}
", "{% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}
{% endif %}" ], - "markerSign": null, + "markerSymbol": null, "listMarkerSymbol": "line", "styles": "casing,default", "priority": "{% if tags.railway == 'station' %}0{% elseif tags.railway in [ 'halt', 'tram_stop' ] %}1{% else %}5{% endif %}", diff --git a/water.json b/water.json index 267dbdd12..accb12258 100644 --- a/water.json +++ b/water.json @@ -33,7 +33,7 @@ "{{ tagTrans('natural', tags.natural) }}", "{% endif %}" ], - "markerSign": null, + "markerSymbol": null, "listMarkerSymbol": [ "{% if tags.natural == 'water' %}", "polygon", diff --git a/works.json b/works.json index d406a0532..abeeeebb9 100644 --- a/works.json +++ b/works.json @@ -15,6 +15,6 @@ "12": "(node[landuse~'^(industrial)$'];way[landuse~'^(industrial)$'];relation[landuse~'^(industrial)$'];)" }, "feature": { - "markerSign": null + "markerSymbol": null } }