diff --git a/wien-hvnr.json b/wien-hvnr.json index c048de3..d758a5c 100644 --- a/wien-hvnr.json +++ b/wien-hvnr.json @@ -35,9 +35,9 @@ "{% set dirBackward = false %}", "{% set hover = false %}", "{% set selected = false %}", - "{% set missingDirForward = false %}", - "{% set missingDirBackward = false %}", - "{% set missingPriority = 4 %}", + "{% set proposedDirForward = false %}", + "{% set proposedDirBackward = false %}", + "{% set proposedPriority = 4 %}", "", "{% for master in masters if master.tags.route == 'bicycle' %}", " {% set masterNetwork = '' %}", @@ -58,17 +58,17 @@ " {% if master.flags.selected %}{% set selected = master.role|default('both') %}{% endif %}", "{% endfor %}", "", - "{% for master in masters if master.tags.missing == 'yes' %}", + "{% for master in masters if master.tags.proposed == 'bicycle' %}", " {% set masterNetwork = '' %}", " {% if master.tags.cycle_network|matches('^AT:Vienna:') %}{% set masterNetwork = master.tags.cycle_network %}{% endif %}", " {% set _p = const[masterNetwork].priority|default(4) %}", - " {% if _p < missingPriority %}", - " {% set missingPriority = _p %}", + " {% if _p < proposedPriority %}", + " {% set proposedPriority = _p %}", " {% set network = masterNetwork %}", " {% endif %}", - " {% if master.role == 'forward' %}{% set missingDirForward = true %}", - " {% elseif master.role == 'backward' %}{% set missingDirBackward = true %}", - " {% else %}{% set missingDirForward = true %}{% set missingDirBackward = true %}", + " {% if master.role == 'forward' %}{% set proposedDirForward = true %}", + " {% elseif master.role == 'backward' %}{% set proposedDirBackward = true %}", + " {% else %}{% set proposedDirForward = true %}{% set proposedDirBackward = true %}", " {% endif %}", " {% if master.flags.hover %}{% set hover = master.role|default('both') %}{% endif %}", " {% if master.flags.selected %}{% set selected = master.role|default('both') %}{% endif %}", @@ -94,25 +94,25 @@ "</ul>" ], "listExclude": "1", - "styles": "{% if missingPriority < 4 %}missing{% else %}default{% endif %}{% if hover %},hover{% endif %}{% if selected %},selected{% endif %}", - "style:missing": { - "width": "{% if missingPriority < 4 %}6{% else %}0{% endif %}", - "color": "{{ const[network].missing }}", + "styles": "{% if proposedPriority < 4 %}proposed{% else %}default{% endif %}{% if hover %},hover{% endif %}{% if selected %},selected{% endif %}", + "style:proposed": { + "width": "{% if proposedPriority < 4 %}6{% else %}0{% endif %}", + "color": "{{ const[network].proposedColor }}", "opacity": "1", - "lineCap": "{% if not missingDirForward or not missingDirBackward %}butt{% else %}round{% endif %}", - "dashArray": "{% if not missingDirForward or not missingDirBackward %}27,8{% endif %}", - "dashOffset": "{% if missingDirBackward %}28{% else %}0{% endif %}", - "noClip": "{% if not missingDirForward or not missingDirBackward %}true{% else %}false{% endif %}", + "lineCap": "{% if not proposedDirForward or not proposedDirBackward %}butt{% else %}round{% endif %}", + "dashArray": "{% if not proposedDirForward or not proposedDirBackward %}27,8{% endif %}", + "dashOffset": "{% if proposedDirBackward %}28{% else %}0{% endif %}", + "noClip": "{% if not proposedDirForward or not proposedDirBackward %}true{% else %}false{% endif %}", "textRepeat": "1", "textOffset": "12", - "pattern": "{% if missingDirForward and missingDirBackward %}{% else %}arrowHead{% endif %}", - "pattern-offset": "{% if missingDirBackward %}4{% else %}30.5{% endif %}", + "pattern": "{% if proposedDirForward and proposedDirBackward %}{% else %}arrowHead{% endif %}", + "pattern-offset": "{% if proposedDirBackward %}4{% else %}30.5{% endif %}", "pattern-repeat": "35", "pattern-polygon": "true", "pattern-pixelSize": "9", - "pattern-angleCorrection": "{% if missingDirBackward %}180{% else %}0{% endif %}", + "pattern-angleCorrection": "{% if proposedDirBackward %}180{% else %}0{% endif %}", "pattern-path-width": "0", - "pattern-path-color": "{{ const[network].missing }}", + "pattern-path-color": "{{ const[network].proposedColor }}", "pattern-path-fillOpacity": "1", "textFontWeight": "bold" }, @@ -179,21 +179,21 @@ "AT:Vienna:Basisrouten": { "title": "Basisroute", "color": "#0000ff", - "missing": "#ff0000", + "proposedColor": "#ff0000", "priority": 1, "zoom": 6 }, "AT:Vienna:Grundnetz": { "title": "Grundnetz", "color": "#0066ff", - "missing": "#ff6600", + "proposedColor": "#ff4400", "priority": 2, "zoom": 12 }, "AT:Vienna:Erweitertes_Grundnetz": { "title": "Erw. Grundnetz", "color": "#00bbff", - "missing": "#ffbb00", + "proposedColor": "#ff7700", "priority": 3, "zoom": 14 }