Browse Source

natural: include place=island (z>=9) and place=islet (z>=13)

pedestrian
parent
commit
cec3fac810
  1. 39
      natural.json

39
natural.json

@ -20,36 +20,49 @@
"9": [ "9": [
"(", "(",
"node[natural~\"^(peak|volcano|valley)$\"];", "node[natural~\"^(peak|volcano|valley)$\"];",
"nwr[place~\"^(island)$\"];",
")" ")"
], ],
"13": [ "13": [
"(", "(",
"nwr[natural~\"^(peak|volcano|wood|glacier|cape|peninsula|beach|coastline|reef|hill|valley|ridge|arete|saddle|sinkhole|cave_entrance|isthmus)$\"];", "nwr[natural~\"^(peak|volcano|wood|glacier|cape|peninsula|beach|coastline|reef|hill|valley|ridge|arete|saddle|sinkhole|cave_entrance|isthmus)$\"];",
"nwr[place~\"^(island|islet)$\"];",
")" ")"
], ],
"16": [ "16": [
"(", "(",
"nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser|tree)$\"];", "nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser|tree)$\"];",
"nwr[place~\"^(island|islet)$\"];",
")" ")"
], ],
"18": [ "18": [
"(", "(",
"nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser)$\"];", "nwr[natural][natural!~\"^(water|divide|bay|strait|spring|hot_spring|geyser)$\"];",
"nwr[place~\"^(island|islet)$\"];",
")" ")"
] ]
}, },
"feature": { "feature": {
"pre": [
"{% if tags.place in [ 'island', 'islet' ] %}",
"{% set key = 'place' %}",
"{% set value = tags.place %}",
"{% else %}",
"{% set key = 'natural' %}",
"{% set value = tags.natural %}",
"{% endif %}"
],
"title": [ "title": [
"{{ localizedTag(tags, 'name') | default(trans('unnamed')) }}", "{{ localizedTag(tags, 'name') | default(trans('unnamed')) }}",
"{% if tags.natural == 'peak' and tags.ele %}({{ tags.ele }}m){% endif %}" "{% if tags.natural == 'peak' and tags.ele %}({{ tags.ele }}m){% endif %}"
], ],
"description": "{{ tagTrans('natural', tags.natural) }}",
"description": "{{ tagTrans(key, value) }}",
"style": { "style": {
"color": "{{ const[tags.natural].color|default('#f2756a') }}"
"color": "{{ const[value].color|default('#f2756a') }}"
}, },
"markerSign": "<span style='color: white'>{{ const[tags.natural].sign|raw }}</span>",
"markerSymbol": "{{ markerPointer({ fillColor: const[tags.natural].color|default('#f2756a') })|raw }}",
"listMarkerSymbol": "{{ markerCircle({ fillColor: const[tags.natural].color|default('#f2756a') })|raw }}"
"markerSign": "<span style='color: white'>{{ const[value].sign|raw }}</span>",
"markerSymbol": "{{ markerPointer({ fillColor: const[value].color|default('#f2756a') })|raw }}",
"listMarkerSymbol": "{{ markerCircle({ fillColor: const[value].color|default('#f2756a') })|raw }}"
}, },
"filter": { "filter": {
"type": { "type": {
@ -57,12 +70,26 @@
"key": "natural", "key": "natural",
"type": "select", "type": "select",
"show_default": "true", "show_default": "true",
"values": "{% set list = [] %}{% for k, v in const %}<option value=\"{{ k }}\">{% set list = list|merge([ k ]) %}{{ tagTrans('natural', k) }}</option>{% endfor %}<option weight='1' value='other' query='nwr[natural][natural!~\"^(|.*;)({{ list|join('|') }})(|;.*)$\"]'>{{ trans('other') }}</option>",
"values": "{% set list = [] %}{% for k, v in const %}<option value=\"{{ k }}\" {% if v.key %}query='nwr[\"{{ v.key }}\"=\"{{ k }}\"]'{% endif %}>{% set list = list|merge([ k ]) %}{{ tagTrans(v.key|default('natural'), k) }}</option>{% endfor %}<option weight='1' value='other' query='nwr[natural][natural!~\"^(|.*;)({{ list|join('|') }})(|;.*)$\"]'>{{ trans('other') }}</option>",
"sort": "natsort", "sort": "natsort",
"op": "has" "op": "has"
} }
}, },
"const": { "const": {
"island": {
"zoom": 9,
"sign": "<img data-src='temaki:island_trees_building'>",
"color": "#cfb997",
"key": "place",
"group": "landform"
},
"islet": {
"zoom": 13,
"sign": "<img data-src='temaki:island_trees_building'>",
"color": "#cfb997",
"key": "place",
"group": "landform"
},
"wood": { "wood": {
"zoom": 13, "zoom": 13,
"sign": "<i class='fas fa-tree'></i>", "sign": "<i class='fas fa-tree'></i>",

Loading…
Cancel
Save