OpenStreetBrowser
/
main
2
0
Fork 7
Code Issues 5 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'pattern'

office
Stephan Bösch-Plepelits 6 years ago
parent
acc5de362e ddd764584b
commit
d39ecac46b
2 changed files with 146 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 70
      cycle_routes.json
  2. 86
      pt.json

70
cycle_routes.json
View File

@ -21,6 +21,12 @@
"listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': const[tags.network].color|default(const[''].color) })|raw }}", "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': const[tags.network].color|default(const[''].color) })|raw }}",
"title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}", "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}",
"styles": "", "styles": "",
"style:hover": {
"width": 0
},
"style:selected": {
"width": 0
},
"markerSymbol": "" "markerSymbol": ""
}, },
"memberFeature": { "memberFeature": {
@ -28,6 +34,10 @@
"{% set priority = 4 %}", "{% set priority = 4 %}",
"{% set network = '' %}", "{% set network = '' %}",
"{% set refs = [] %}", "{% set refs = [] %}",
"{% set dirForward = false %}",
"{% set dirBackward = false %}",
"{% set hover = false %}",
"{% set selected = false %}",
"", "",
"{% for master in masters %}", "{% for master in masters %}",
" {% set _p = const[master.tags.network].priority|default(4) %}", " {% set _p = const[master.tags.network].priority|default(4) %}",
@ -38,6 +48,12 @@
" {% if master.tags.ref %}", " {% if master.tags.ref %}",
" {% set refs = refs|merge([ master.tags.ref ]) %}", " {% set refs = refs|merge([ master.tags.ref ]) %}",
" {% endif %}", " {% endif %}",
" {% if master.role == 'forward' %}{% set dirForward = true %}",
" {% elseif master.role == 'backward' %}{% set dirBackward = true %}",
" {% else %}{% set dirForward = true %}{% set dirBackward = true %}",
" {% endif %}",
" {% if master.flags.hover %}{% set hover = master.role|default('both') %}{% endif %}",
" {% if master.flags.selected %}{% set selected = master.role|default('both') %}{% endif %}",
"{% endfor %}" "{% endfor %}"
], ],
"title": "", "title": "",
@ -54,14 +70,64 @@
"</ul>" "</ul>"
], ],
"listExclude": "1", "listExclude": "1",
"styles": "default{% if hover %},hover{% endif %}{% if selected %},selected{% endif %}",
"style": { "style": {
"color": "{{ const[network].color }}", "color": "{{ const[network].color }}",
"width": 4,
"width": "4",
"dashArray": "{% if not dirForward or not dirBackward %}27,8{% endif %}",
"dashOffset": "{% if dirBackward %}28{% else %}0{% endif %}",
"lineCap": "{% if not dirForward or not dirBackward %}butt{% else %}round{% endif %}",
"noClip": "{% if not dirForward or not dirBackward %}true{% else %}false{% endif %}",
"opacity": 1, "opacity": 1,
"text": "{{ refs|join(' · ') }} ", "text": "{{ refs|join(' · ') }} ",
"textRepeat": "1", "textRepeat": "1",
"textOffset": "12", "textOffset": "12",
"textFontWeight": "bold"
"textFontWeight": "bold",
"pattern": "{% if dirForward and dirBackward %}{% else %}arrowHead{% endif %}",
"pattern-pixelSize": "9",
"pattern-repeat": "35",
"pattern-offset": "{% if dirBackward %}4{% else %}30.5{% endif %}",
"pattern-polygon": "true",
"pattern-angleCorrection": "{% if dirBackward %}180{% else %}0{% endif %}",
"pattern-path-width": "0",
"pattern-path-fillOpacity": "1",
"pattern-path-color": "{{ const[network].color }}"
},
"style:hover": {
"pane": "hover",
"width": "4",
"dashArray": "{% if hover == 'forward' or hover == 'backward' %}27,8{% endif %}",
"dashOffset": "{% if hover == 'backward' %}28{% else %}0{% endif %}",
"lineCap": "{% if hover == 'forward' or hover == 'backward' %}butt{% else %}round{% endif %}",
"noClip": "{% if hover == 'forward' or hover == 'backward' %}true{% else %}false{% endif %}",
"color": "black",
"pattern": "{% if hover == 'forward' or hover == 'backward' %}arrowHead{% endif %}",
"pattern-pixelSize": "9",
"pattern-repeat": "35",
"pattern-offset": "{% if hover == 'backward' %}4{% else %}30.5{% endif %}",
"pattern-polygon": "true",
"pattern-angleCorrection": "{% if hover == 'backward' %}180{% else %}0{% endif %}",
"pattern-path-width": "0",
"pattern-path-fillOpacity": "1",
"pattern-path-color": "black"
},
"style:selected": {
"pane": "selected",
"width": "4",
"dashArray": "{% if selected == 'forward' or selected == 'backward' %}27,8{% endif %}",
"dashOffset": "{% if selected == 'backward' %}28{% else %}0{% endif %}",
"lineCap": "{% if selected == 'forward' or selected == 'backward' %}butt{% else %}round{% endif %}",
"noClip": "{% if selected == 'forward' or selected == 'backward' %}true{% else %}false{% endif %}",
"color": "#3f3f3f",
"pattern": "{% if selected == 'forward' or selected == 'backward' %}arrowHead{% endif %}",
"pattern-pixelSize": "9",
"pattern-repeat": "35",
"pattern-offset": "{% if selected == 'backward' %}4{% else %}30.5{% endif %}",
"pattern-polygon": "true",
"pattern-angleCorrection": "{% if selected == 'backward' %}180{% else %}0{% endif %}",
"pattern-path-width": "0",
"pattern-path-fillOpacity": "1",
"pattern-path-color": "#3f3f3f"
} }
}, },
"const": { "const": {

86
pt.json
View File

@ -67,6 +67,12 @@
], ],
"markerSymbol": "", "markerSymbol": "",
"styles": "", "styles": "",
"style:hover": {
"width": 0
},
"style:selected": {
"width": 0
},
"listStopsExclude": "true", "listStopsExclude": "true",
"listRoutesMarkerSign": "{{ const[tags.route].sign|raw }}", "listRoutesMarkerSign": "{{ const[tags.route].sign|raw }}",
"listRoutesMarkerSymbol": "{{ markerCircle({fillColor:const[tags.route].color})|raw }}", "listRoutesMarkerSymbol": "{{ markerCircle({fillColor:const[tags.route].color})|raw }}",
@ -82,6 +88,10 @@
"{% set isWay = false %}", "{% set isWay = false %}",
"{% set aRoute = null %}", "{% set aRoute = null %}",
"{% set refs = [] %}", "{% set refs = [] %}",
"{% set dirForward = false %}",
"{% set dirBackward = false %}",
"{% set hover = false %}",
"{% set selected = false %}",
"{% for master in masters %}", "{% for master in masters %}",
" {% if master.tags.public_transport == 'stop_area' %}", " {% if master.tags.public_transport == 'stop_area' %}",
" {% set stopName = master.tags.name %}", " {% set stopName = master.tags.name %}",
@ -97,7 +107,14 @@
" {% if master.tags.ref %}", " {% if master.tags.ref %}",
" {% set refs = refs|merge([ master.tags.ref ]) %}", " {% set refs = refs|merge([ master.tags.ref ]) %}",
" {% endif %}", " {% endif %}",
" {% if master.dir == 'forward' %}{% set dirForward = true %}",
" {% elseif master.dir == 'backward' %}{% set dirBackward = true %}",
" {% else %}{% set dirForward = true %}{% set dirBackward = true %}",
" {% endif %}",
" {% endif %}", " {% endif %}",
"",
" {% if master.flags.hover %}{% set hover = master.dir|default('both') %}{% endif %}",
" {% if master.flags.selected %}{% set selected = master.dir|default('both') %}{% endif %}",
"{% endfor %}", "{% endfor %}",
"", "",
"{% set refs = refs|unique|natsort({ insensitive: true }) %}", "{% set refs = refs|unique|natsort({ insensitive: true }) %}",
@ -112,31 +129,84 @@
" <li data-object=\"{{ master.id }}\">", " <li data-object=\"{{ master.id }}\">",
" <span class='markerParent'><div class='marker'>{{ markerCircle({fillColor:const[master.tags.route].color})|raw }}</div><div class='icon'>{{ const[master.tags.route].sign|raw }}</div></span>", " <span class='markerParent'><div class='marker'>{{ markerCircle({fillColor:const[master.tags.route].color})|raw }}</div><div class='icon'>{{ const[master.tags.route].sign|raw }}</div></span>",
" <span class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}</span>", " <span class='title'>{% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}</span>",
" <span class='description'>{{ tagTrans('route', master.tags.route) }}</span>",
" <span class='description'>{{ tagTrans('route', master.tags.route) }}{{ master.dir }}</span>",
" </li>", " </li>",
" {% endif %}", " {% endif %}",
"{% endfor %}", "{% endfor %}",
"</ul>" "</ul>"
], ],
"styles": "{% if isStop and stopCount > 0 %}stop{% elseif isWay %}way{% else %}{% endif %}",
"styles": "{% if isStop and stopCount > 0 %}stop{% elseif isWay %}casing,way{% if hover %},hover{% endif %}{% if selected %},selected{% endif %}{% endif %}",
"listStopsMarkerSign": null, "listStopsMarkerSign": null,
"listStopsMarkerSymbol": "{{ markerCircle({ width: 5, color: color, fillOpacity: '1', radius: 3 })|raw }}", "listStopsMarkerSymbol": "{{ markerCircle({ width: 5, color: color, fillOpacity: '1', radius: 3 })|raw }}",
"listStopsExclude": "{{ not isStop or stopCount == 0 }}", "listStopsExclude": "{{ not isStop or stopCount == 0 }}",
"listStopsTitle": "{% if tags %}{{ tags.name|default(stopName)|default(trans('unknown')) }}{% else %}<li>{{ trans('loading') }}</li>{% endif %}", "listStopsTitle": "{% if tags %}{{ tags.name|default(stopName)|default(trans('unknown')) }}{% else %}<li>{{ trans('loading') }}</li>{% endif %}",
"listStopsDescription": "{{ refs|join(' · ') }}", "listStopsDescription": "{{ refs|join(' · ') }}",
"listRoutesExclude": "true", "listRoutesExclude": "true",
"markerSymbol": "{% if isStop and stopCount > 0 %}{% if hover or selected %}{{ markerPointer({ })|raw }}{% endif %}{% endif %}",
"markerSign": " ",
"style:stop": {
"color": "{{ color|default('#ff0000') }}",
"width": "4",
"radius": "3",
"zIndex": "1"
},
"style:way": { "style:way": {
"width": "3",
"color": "{{ color|default('#ff0000') }}", "color": "{{ color|default('#ff0000') }}",
"width": "4",
"dashArray": "{% if not dirForward or not dirBackward %}27,8{% endif %}",
"dashOffset": "{% if dirBackward %}28{% else %}0{% endif %}",
"lineCap": "{% if not dirForward or not dirBackward %}butt{% else %}round{% endif %}",
"noClip": "{% if not dirForward or not dirBackward %}true{% else %}false{% endif %}",
"opacity": 1,
"text": "{{ refs|join(' · ') }} ", "text": "{{ refs|join(' · ') }} ",
"textRepeat": "1", "textRepeat": "1",
"textOffset": "12", "textOffset": "12",
"textFontWeight": "bold"
"textFontWeight": "bold",
"pattern": "{% if dirForward and dirBackward %}{% else %}arrowHead{% endif %}",
"pattern-pixelSize": "9",
"pattern-repeat": "35",
"pattern-offset": "{% if dirBackward %}4{% else %}30.5{% endif %}",
"pattern-polygon": "true",
"pattern-angleCorrection": "{% if dirBackward %}180{% else %}0{% endif %}",
"pattern-path-width": "0",
"pattern-path-fillOpacity": "1",
"pattern-path-color": "{{ color|default('#ff0000') }}"
}, },
"style:stop": {
"width": "5",
"color": "{{ color|default('#ff0000') }}",
"radius": "3"
"style:hover": {
"pane": "hover",
"width": "4",
"dashArray": "{% if hover == 'forward' or hover == 'backward' %}27,8{% endif %}",
"dashOffset": "{% if hover == 'backward' %}28{% else %}0{% endif %}",
"lineCap": "{% if hover == 'forward' or hover == 'backward' %}butt{% else %}round{% endif %}",
"noClip": "{% if hover == 'forward' or hover == 'backward' %}true{% else %}false{% endif %}",
"color": "black",
"pattern": "{% if hover == 'forward' or hover == 'backward' %}arrowHead{% endif %}",
"pattern-pixelSize": "9",
"pattern-repeat": "35",
"pattern-offset": "{% if hover == 'backward' %}4{% else %}30.5{% endif %}",
"pattern-polygon": "true",
"pattern-angleCorrection": "{% if hover == 'backward' %}180{% else %}0{% endif %}",
"pattern-path-width": "0",
"pattern-path-fillOpacity": "1",
"pattern-path-color": "black"
},
"style:selected": {
"pane": "selected",
"width": "4",
"dashArray": "{% if selected == 'forward' or selected == 'backward' %}27,8{% endif %}",
"dashOffset": "{% if selected == 'backward' %}28{% else %}0{% endif %}",
"lineCap": "{% if selected == 'forward' or selected == 'backward' %}butt{% else %}round{% endif %}",
"noClip": "{% if selected == 'forward' or selected == 'backward' %}true{% else %}false{% endif %}",
"color": "#3f3f3f",
"pattern": "{% if selected == 'forward' or selected == 'backward' %}arrowHead{% endif %}",
"pattern-pixelSize": "9",
"pattern-repeat": "35",
"pattern-offset": "{% if selected == 'backward' %}4{% else %}30.5{% endif %}",
"pattern-polygon": "true",
"pattern-angleCorrection": "{% if selected == 'backward' %}180{% else %}0{% endif %}",
"pattern-path-width": "0",
"pattern-path-fillOpacity": "1",
"pattern-path-color": "#3f3f3f"
} }
}, },
"info": [ "info": [

Write Preview
Loading…
Cancel
Save