From 88a4290be71cd7ae9a847819fcf283f58bcfa4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sat, 13 Jan 2018 07:00:12 +0100 Subject: [PATCH] Replace parameter 'weight' by 'width' --- buildings.json | 2 +- car_maxspeed.json | 2 +- cycle_routes.json | 2 +- railway-electrification.json | 22 +++++++++++----------- railway-infrastructure.json | 4 ++-- water.json | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/buildings.json b/buildings.json index 8c16eb3..6b262ca 100644 --- a/buildings.json +++ b/buildings.json @@ -28,7 +28,7 @@ "{{ p }}" ], "style": { - "weight": "1", + "width": "1", "color": "#000000", "fillColor": "#000000" } diff --git a/car_maxspeed.json b/car_maxspeed.json index 871a5fe..fbfc741 100644 --- a/car_maxspeed.json +++ b/car_maxspeed.json @@ -51,7 +51,7 @@ "markerSign": null, "listMarkerSymbol": "line", "style": { - "weight": "3", + "width": "3", "color": "{{ color }}" } }, diff --git a/cycle_routes.json b/cycle_routes.json index a3d96f3..918b374 100644 --- a/cycle_routes.json +++ b/cycle_routes.json @@ -13,7 +13,7 @@ "feature": { "priority": "{% if tags.network=='icn' %}0{% elseif tags.network=='ncn' %}1{% elseif tags.network=='rcn' %}2{% else %}3{% endif %}", "style": { - "weight": 4, + "width": 4, "color": "{% if tags.network=='icn' %}#ff0000{% elseif tags.network=='ncn' %}#ff007f{% elseif tags.network=='rcn' %}#7f00ff{% else %}#0000ff{% endif %}", "opacity": 1 } diff --git a/railway-electrification.json b/railway-electrification.json index 9c27746..8db35c5 100644 --- a/railway-electrification.json +++ b/railway-electrification.json @@ -21,16 +21,16 @@ "{%endif %}", "", "{% if tags.service == 'yard' or tags.service == 'siding' or tags.service == 'spur' or tags.service == 'crossover' %}", - " {% set weight=2 %}", + " {% set width=2 %}", " {% else %}", " {% if tags.railway == 'rail' %}", " {% if tags.usage == 'main' or tags.usage == 'branch' %}", - " {% set weight=3 %}", + " {% set width=3 %}", " {% else %}", - " {% set weight=2.5 %}", + " {% set width=2.5 %}", " {% endif %}", " {% else %}", - " {% set weight=2 %}", + " {% set width=2 %}", " {% endif %}", "{% endif %}" ], @@ -57,7 +57,7 @@ "styles": "casing,default", "priority": "{% if tags.railway == 'station' %}0{% elseif tags.railway in [ 'halt', 'tram_stop' ] %}1{% else %}5{% endif %}", "style": { - "weight": "{{ weight }}", + "width": "{{ width }}", "lineCap": "butt", "color": "{{ color }}", "opacity": "1", @@ -71,7 +71,7 @@ ] }, "style:casing": { - "weight": "{{ weight }}", + "width": "{{ width }}", "color": "white", "opacity": "1", "fill": null @@ -81,13 +81,13 @@ "", " {% set color = '#000000' %}", " ", - " ", + " ", " ", " ", "{% for i in range(0, 1000, 200) %}", " {% set color = colorInterpolate([ '#00ff00', 'blue' ], i / 1000) %}", " ", - " ", + " ", " ", " ", "{% endfor %}", @@ -95,18 +95,18 @@ "{% for i in range(3000, 25000, 2000) %}", " {% set color = colorInterpolate([ 'blue', 'red' ], (i - 1000) / 24000) %}", " ", - " ", + " ", " ", " ", "{% endfor %}", "", " ", - " ", + " ", " ", " ", "", " ", - " ", + " ", " ", " ", "
{{ markerLine({ 'weight': 3, 'color': color })|raw }}{{ markerLine({ 'width': 3, 'color': color })|raw }}{{ trans('not electrified') }}
{{ markerLine({ 'weight': 3, 'color': color })|raw }}{{ markerLine({ 'width': 3, 'color': color })|raw }}{{ i }}V
{{ markerLine({ 'weight': 3, 'color': color })|raw }}{{ markerLine({ 'width': 3, 'color': color })|raw }}{{ i }}V
{{ markerLine({ 'weight': 3, 'color': color })|raw }}{{ markerLine({ 'width': 3, 'color': color })|raw }}{{ trans('direct current') }}
{{ markerLine({ 'styles': [ 'casing', 'default' ], 'style:casing': { 'weight': 3, 'color': 'white' }, 'style': { 'weight': '3', 'dashArray': '5,2', 'lineCap': 'butt', 'color': color } })|raw }}{{ markerLine({ 'styles': [ 'casing', 'default' ], 'style:casing': { 'width': 3, 'color': 'white' }, 'style': { 'width': '3', 'dashArray': '5,2', 'lineCap': 'butt', 'color': color } })|raw }}{{ trans('alternating current') }}
" diff --git a/railway-infrastructure.json b/railway-infrastructure.json index fe23bcb..b68a5b3 100644 --- a/railway-infrastructure.json +++ b/railway-infrastructure.json @@ -60,7 +60,7 @@ ], "styles": "{% if tags.railway == 'narrow_gauge' %}default,casing{% else %}default{% endif %}", "style": { - "weight": [ + "width": [ "{% if tags.service == 'yard' or tags.service == 'siding' or tags.service == 'spur' or tags.service == 'crossover' %}", "1", "{% else %}", @@ -106,7 +106,7 @@ ] }, "style:casing": { - "weight": "{% if tags.service == 'yard' or tags.service == 'siding' or tags.service == 'spur' or tags.service == 'crossover' %}5{% else %}{% if tags.railway == 'rail' %}{% if tags.usage == 'main' or tags.usage == 'branch' %}7{% else %}6{% endif %}{% elseif tags.railway == 'platform' %}5{% else %}6{% endif %}{% endif %}", + "width": "{% if tags.service == 'yard' or tags.service == 'siding' or tags.service == 'spur' or tags.service == 'crossover' %}5{% else %}{% if tags.railway == 'rail' %}{% if tags.usage == 'main' or tags.usage == 'branch' %}7{% else %}6{% endif %}{% elseif tags.railway == 'platform' %}5{% else %}6{% endif %}{% endif %}", "color": "{% if tags.railway == 'rail' or tags.railway == 'narrow_gauge' or tags.railway == 'disused' %}{% if tags.usage == 'main' %}#ff8100{% elseif tags.usage == 'branch' %}#daca00{% else %}#000000{% endif %}{% elseif tags.railway == 'subway' %}#0000ff{% elseif tags.railway == 'tram' %}#ff00ff{% elseif tags.railway == 'light_rail' %}#00BD14{% elseif tags.railway == 'platform' %}#3f3f3f{% else %}#000000{% endif %}", "lineCap": "butt", "dashArray": "2,4" diff --git a/water.json b/water.json index 66a91a2..fc1a9ab 100644 --- a/water.json +++ b/water.json @@ -57,7 +57,7 @@ "{% endif %}" ], "style": { - "weight": [ + "width": [ "{% if tags.waterway == 'river' %}", "4", "{% elseif tags.waterway == 'stream' %}",