From b998f6f177e9aea9ccce8094a78ceb41458efddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Thu, 29 Nov 2018 14:16:01 +0100
Subject: [PATCH] Re-order fields (like openstreetbrowser-editor orders)
---
car_maxspeed.json | 2 +-
cycle_routes.json | 50 ++++++++++++-------------
pt.json | 94 +++++++++++++++++++++++------------------------
3 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/car_maxspeed.json b/car_maxspeed.json
index b2249f3..b077c96 100644
--- a/car_maxspeed.json
+++ b/car_maxspeed.json
@@ -53,7 +53,7 @@
"{{ trans('unknown') }}",
"{% endif %}"
],
- "markerSymbol": null,
+ "markerSymbol": "",
"listMarkerSymbol": "line",
"style": {
"width": "3",
diff --git a/cycle_routes.json b/cycle_routes.json
index 828dfaf..2cb57ed 100644
--- a/cycle_routes.json
+++ b/cycle_routes.json
@@ -16,18 +16,18 @@
},
"members": true,
"feature": {
- "priority": "{{ const[tags.network].priority|default(4) }}",
+ "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 %}",
"description": "{{ tagTrans('network', tags.network) }}",
+ "markerSymbol": "",
"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 %}",
+ "priority": "{{ const[tags.network].priority|default(4) }}",
"styles": "",
"style:hover": {
- "width": 0
+ "width": "0"
},
"style:selected": {
- "width": 0
- },
- "markerSymbol": ""
+ "width": "0"
+ }
},
"memberFeature": {
"pre": [
@@ -72,62 +72,62 @@
"listExclude": "1",
"styles": "default{% if hover %},hover{% endif %}{% if selected %},selected{% endif %}",
"style": {
- "color": "{{ const[network].color }}",
"width": "4",
+ "color": "{{ const[network].color }}",
+ "opacity": "1",
+ "lineCap": "{% if not dirForward or not dirBackward %}butt{% else %}round{% endif %}",
"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(' · ') }} ",
"textRepeat": "1",
"textOffset": "12",
- "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-repeat": "35",
"pattern-polygon": "true",
+ "pattern-pixelSize": "9",
"pattern-angleCorrection": "{% if dirBackward %}180{% else %}0{% endif %}",
"pattern-path-width": "0",
+ "pattern-path-color": "{{ const[network].color }}",
"pattern-path-fillOpacity": "1",
- "pattern-path-color": "{{ const[network].color }}"
+ "textFontWeight": "bold"
},
"style:hover": {
"pane": "hover",
"width": "4",
+ "color": "black",
+ "lineCap": "{% if hover == 'forward' or hover == 'backward' %}butt{% else %}round{% endif %}",
"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-repeat": "35",
"pattern-polygon": "true",
+ "pattern-pixelSize": "9",
"pattern-angleCorrection": "{% if hover == 'backward' %}180{% else %}0{% endif %}",
"pattern-path-width": "0",
- "pattern-path-fillOpacity": "1",
- "pattern-path-color": "black"
+ "pattern-path-color": "black",
+ "pattern-path-fillOpacity": "1"
},
"style:selected": {
"pane": "selected",
"width": "4",
+ "color": "#3f3f3f",
+ "lineCap": "{% if selected == 'forward' or selected == 'backward' %}butt{% else %}round{% endif %}",
"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-repeat": "35",
"pattern-polygon": "true",
+ "pattern-pixelSize": "9",
"pattern-angleCorrection": "{% if selected == 'backward' %}180{% else %}0{% endif %}",
"pattern-path-width": "0",
- "pattern-path-fillOpacity": "1",
- "pattern-path-color": "#3f3f3f"
+ "pattern-path-color": "#3f3f3f",
+ "pattern-path-fillOpacity": "1"
}
},
"const": {
diff --git a/pt.json b/pt.json
index 7ade18d..9c26bf2 100644
--- a/pt.json
+++ b/pt.json
@@ -69,10 +69,10 @@
"markerSymbol": "",
"styles": "",
"style:hover": {
- "width": 0
+ "width": "0"
},
"style:selected": {
- "width": 0
+ "width": "0"
},
"listStopsExclude": "true",
"listRoutesMarkerSign": "{{ const[tags.route].sign|raw }}",
@@ -136,78 +136,78 @@
"{% endfor %}",
"</ul>"
],
+ "markerSign": " ",
+ "markerSymbol": "{% if isStop and stopCount > 0 %}{% if hover or selected %}{{ markerPointer({ })|raw }}{% endif %}{% endif %}",
"styles": "{% if isStop and stopCount > 0 %}stop{% elseif isWay %}casing,way{% if hover %},hover{% endif %}{% if selected %},selected{% endif %}{% endif %}",
+ "style:hover": {
+ "pane": "hover",
+ "width": "4",
+ "color": "black",
+ "lineCap": "{% if hover == 'forward' or hover == 'backward' %}butt{% else %}round{% endif %}",
+ "dashArray": "{% if hover == 'forward' or hover == 'backward' %}27,8{% endif %}",
+ "dashOffset": "{% if hover == 'backward' %}28{% else %}0{% endif %}",
+ "noClip": "{% if hover == 'forward' or hover == 'backward' %}true{% else %}false{% endif %}",
+ "pattern": "{% if hover == 'forward' or hover == 'backward' %}arrowHead{% endif %}",
+ "pattern-offset": "{% if hover == 'backward' %}4{% else %}30.5{% endif %}",
+ "pattern-repeat": "35",
+ "pattern-polygon": "true",
+ "pattern-pixelSize": "9",
+ "pattern-angleCorrection": "{% if hover == 'backward' %}180{% else %}0{% endif %}",
+ "pattern-path-width": "0",
+ "pattern-path-color": "black",
+ "pattern-path-fillOpacity": "1"
+ },
+ "style:selected": {
+ "pane": "selected",
+ "width": "4",
+ "color": "#3f3f3f",
+ "lineCap": "{% if selected == 'forward' or selected == 'backward' %}butt{% else %}round{% endif %}",
+ "dashArray": "{% if selected == 'forward' or selected == 'backward' %}27,8{% endif %}",
+ "dashOffset": "{% if selected == 'backward' %}28{% else %}0{% endif %}",
+ "noClip": "{% if selected == 'forward' or selected == 'backward' %}true{% else %}false{% endif %}",
+ "pattern": "{% if selected == 'forward' or selected == 'backward' %}arrowHead{% endif %}",
+ "pattern-offset": "{% if selected == 'backward' %}4{% else %}30.5{% endif %}",
+ "pattern-repeat": "35",
+ "pattern-polygon": "true",
+ "pattern-pixelSize": "9",
+ "pattern-angleCorrection": "{% if selected == 'backward' %}180{% else %}0{% endif %}",
+ "pattern-path-width": "0",
+ "pattern-path-color": "#3f3f3f",
+ "pattern-path-fillOpacity": "1"
+ },
"listStopsMarkerSign": null,
"listStopsMarkerSymbol": "{{ markerCircle({ width: 5, color: color, fillOpacity: '1', radius: 3 })|raw }}",
"listStopsExclude": "{{ not isStop or stopCount == 0 }}",
"listStopsTitle": "{% if tags %}{{ tags.name|default(stopName)|default(trans('unknown')) }}{% else %}<li>{{ trans('loading') }}</li>{% endif %}",
"listStopsDescription": "{{ refs|join(' · ') }}",
"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",
+ "color": "{{ color|default('#ff0000') }}",
"radius": "3",
"zIndex": "1"
},
"style:way": {
- "color": "{{ color|default('#ff0000') }}",
"width": "4",
+ "color": "{{ color|default('#ff0000') }}",
+ "opacity": "1",
+ "lineCap": "{% if not dirForward or not dirBackward %}butt{% else %}round{% endif %}",
"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(' · ') }} ",
"textRepeat": "1",
"textOffset": "12",
- "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: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-angleCorrection": "{% if dirBackward %}180{% else %}0{% endif %}",
"pattern-path-width": "0",
+ "pattern-path-color": "{{ color|default('#ff0000') }}",
"pattern-path-fillOpacity": "1",
- "pattern-path-color": "#3f3f3f"
+ "textFontWeight": "bold"
}
},
"info": [