diff --git a/car_maxspeed.json b/car_maxspeed.json index 4d1c3ca93..9e31a5f05 100644 --- a/car_maxspeed.json +++ b/car_maxspeed.json @@ -46,9 +46,9 @@ "{{ trans('unknown') }}", "{% endif %}" ], + "markerSign": null, "style": { "color": "{{ color }}" - }, - "markerSign": null + } } } diff --git a/children.json b/children.json index 47d414786..57fe5604c 100644 --- a/children.json +++ b/children.json @@ -8,7 +8,7 @@ "15": "(node[leisure~'^(playground|summer_camp|indoor_play)$'];way[leisure~'^(playground|summer_camp|indoor_play)$'];relation[leisure~'^(playground|summer_camp|indoor_play)$'];node[shop~'^(baby_goods|toys)$'];way[shop~'^(baby_goods|toys)$'];relation[shop~'^(baby_goods|toys)$'];node[amenity=toilets][diaper];way[amenity=toilets][diaper];relation[amenity=toilets][diaper];node[kids_area];way[kids_area];relation[kids_area];);" }, "feature": { - "markerSign": "{% if tags.leisure=='playground' %}⛹{% elseif tags.leisure=='summer_camp'%}🏕{% elseif tags.leisure=='indoor_play' or tags.kids_area %}🏠{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}{% elseif tags.amenity=='toilets' and tags.diaper %}🚽🚼{% endif %}", - "description": "{% if tags.leisure=='playground' %}{{ tagTrans('leisure', 'playground') }}{% elseif tags.leisure=='summer_camp'%}{{ tagTrans('leisure', 'summer_camp') }}{% elseif tags.leisure=='indoor_play' %}{{ tagTrans('leisure', 'indoor_play') }}{% elseif tags.kids_area %}{{ keyTrans('kids_area') }}{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}{{ keyTrans('shop') }}: {{ tagTrans('shop', tags.shop) }}{% elseif tags.amenity=='toilets' and tags.diaper %}{{ tagTrans('amenity', 'toilets') }} with diaper changing table{% endif %}" + "description": "{% if tags.leisure=='playground' %}{{ tagTrans('leisure', 'playground') }}{% elseif tags.leisure=='summer_camp'%}{{ tagTrans('leisure', 'summer_camp') }}{% elseif tags.leisure=='indoor_play' %}{{ tagTrans('leisure', 'indoor_play') }}{% elseif tags.kids_area %}{{ keyTrans('kids_area') }}{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}{{ keyTrans('shop') }}: {{ tagTrans('shop', tags.shop) }}{% elseif tags.amenity=='toilets' and tags.diaper %}{{ tagTrans('amenity', 'toilets') }} with diaper changing table{% endif %}", + "markerSign": "{% if tags.leisure=='playground' %}⛹{% elseif tags.leisure=='summer_camp'%}🏕{% elseif tags.leisure=='indoor_play' or tags.kids_area %}🏠{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}{% elseif tags.amenity=='toilets' and tags.diaper %}🚽🚼{% endif %}" } } diff --git a/communication.json b/communication.json index 1a7f64419..43c3f04f2 100644 --- a/communication.json +++ b/communication.json @@ -23,8 +23,8 @@ }, "feature": { "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTrans('amenity', tags.amenity)) }}", - "markerSign": "{% if tags.amenity=='post_office' %}🏤{% elseif tags.amenity=='post_box'%}📮{% elseif tags.amenity=='internet_cafe' %}💻{% elseif tags.amenity=='telephone' %}✆{% endif %}", + "description": "{{ tagTrans('amenity', tags.amenity) }}", "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}
{% endif %}", - "description": "{{ tagTrans('amenity', tags.amenity) }}" + "markerSign": "{% if tags.amenity=='post_office' %}🏤{% elseif tags.amenity=='post_box'%}📮{% elseif tags.amenity=='internet_cafe' %}💻{% elseif tags.amenity=='telephone' %}✆{% endif %}" } } diff --git a/cycle_amenities.json b/cycle_amenities.json index edbb0cd0a..f6ac9c8c3 100644 --- a/cycle_amenities.json +++ b/cycle_amenities.json @@ -51,6 +51,11 @@ "", "{% set constIndex = (key ~ \"=\" ~ value) %}" ], + "title": [ + "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(trans('unnamed')) }}", + "", + "{% if tags.capacity %}({{ tags.capacity }}){% endif %}" + ], "description": "{{ tagTrans(key, value) }}", "body": [ "{% if tags.capacity %}", @@ -58,11 +63,6 @@ "{% endif %}" ], "markerSign": "{{ const[constIndex]['sign'] }}", - "title": [ - "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(trans('unnamed')) }}", - "", - "{% if tags.capacity %}({{ tags.capacity }}){% endif %}" - ], "priority": [ "{% if const[constIndex] and const[constIndex]['priority']['capacity'] %}", " {% set max=const[constIndex]['priority']['default'] %}", diff --git a/cycle_routes.json b/cycle_routes.json index ad0be8224..a3d96f3ca 100644 --- a/cycle_routes.json +++ b/cycle_routes.json @@ -1,22 +1,21 @@ { + "type": "overpass", "name": { "de": "Radrouten", "en": "Cycle Routes" }, - "type": "overpass", "query": { "6": "relation[type=route][route=bicycle][network~'^(icn)$']", "9": "relation[type=route][route=bicycle][network~'^(icn|ncn)$']", "12": "relation[type=route][route=bicycle][network~'^(icn|ncn|rcn)$']", "15": "relation[type=route][route=bicycle]" }, - "minZoom": 6, "feature": { + "priority": "{% if tags.network=='icn' %}0{% elseif tags.network=='ncn' %}1{% elseif tags.network=='rcn' %}2{% else %}3{% endif %}", "style": { - "color": "{% if tags.network=='icn' %}#ff0000{% elseif tags.network=='ncn' %}#ff007f{% elseif tags.network=='rcn' %}#7f00ff{% else %}#0000ff{% endif %}", "weight": 4, + "color": "{% if tags.network=='icn' %}#ff0000{% elseif tags.network=='ncn' %}#ff007f{% elseif tags.network=='rcn' %}#7f00ff{% else %}#0000ff{% endif %}", "opacity": 1 - }, - "priority": "{% if tags.network=='icn' %}0{% elseif tags.network=='ncn' %}1{% elseif tags.network=='rcn' %}2{% else %}3{% endif %}" + } } } diff --git a/education.json b/education.json index 9cfbee8bf..6372d644f 100644 --- a/education.json +++ b/education.json @@ -22,9 +22,9 @@ "16": "(node[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];way[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];relation[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];)" }, "feature": { - "markerSign": "{% if tags.amenity == 'university' or tags.amenity == 'college' %}🎓{% elseif tags.amenity == 'library' %}🕮{% elseif tags.amenity == 'school' or tags.amenity == 'language_school' %}🏫{% elseif tags.amenity == 'kindergarten' %}⛹{% elseif tags.amenity == 'public_bookcase' %}📚{% endif %}", - "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}
{% endif %}", "description": "{{ tagTrans('amenity', tags.amenity) }}", + "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}
{% endif %}", + "markerSign": "{% if tags.amenity == 'university' or tags.amenity == 'college' %}🎓{% elseif tags.amenity == 'library' %}🕮{% elseif tags.amenity == 'school' or tags.amenity == 'language_school' %}🏫{% elseif tags.amenity == 'kindergarten' %}⛹{% elseif tags.amenity == 'public_bookcase' %}📚{% endif %}", "priority": "{% if tags.amenity == 'university' %}0{% elseif tags.amenity == 'college' %}1{% elseif tags.amenity == 'library' %}2{% elseif tags.amenity == 'school' or tags.amenity == 'language_school' %}3{% elseif tags.amenity == 'kindergarten' %}4{% elseif tags.amenity == 'public_bookcase' %}5{% endif %}" } } diff --git a/gastro.json b/gastro.json index e31e3a264..44504c590 100644 --- a/gastro.json +++ b/gastro.json @@ -20,7 +20,7 @@ "16": "(node[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];way[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];relation[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];);" }, "feature": { - "markerSign": "{% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}", + "description": "{{ tagTrans('amenity', tags.amenity) }}", "body": [ "" ], - "description": "{{ tagTrans('amenity', tags.amenity) }}" + "markerSign": "{% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}" } } diff --git a/index.json b/index.json index b17c2b857..a91bb3235 100644 --- a/index.json +++ b/index.json @@ -2,6 +2,8 @@ "type": "index", "subCategories": [ { + "id": "leisure_sport_shopping", + "type": "index", "name": { "ast": "Recréu, deportes y compres", "ca": "Oci, esport i compres", @@ -21,8 +23,6 @@ "ru": "Досуг", "uk": "Дозвілля" }, - "id": "leisure_sport_shopping", - "type": "index", "subCategories": [ { "id": "gastro" @@ -42,6 +42,8 @@ ] }, { + "id": "services", + "type": "index", "name": { "ast": "Servicios", "ca": "Serveis", @@ -61,8 +63,6 @@ "ru": "Услуги", "uk": "Послуги" }, - "id": "services", - "type": "index", "subCategories": [ { "id": "emergency" @@ -91,6 +91,8 @@ "id": "culture_religion" }, { + "id": "transport", + "type": "index", "name": { "ast": "Tresporte", "cs": "Doprava", @@ -106,19 +108,16 @@ "pl": "Transport", "ro": "Transport", "ru": "Транспорт", - "tr": "Toplu Taşıma", "uk": "Транспорт" }, - "id": "transport", - "type": "index", "subCategories": [ { + "id": "transport_walk", + "type": "index", "name": { "de": "Zu Fuß gehen", "en": "Walking" }, - "id": "transport_walk", - "type": "index", "subCategories": [ { "id": "walk_amenities" @@ -129,12 +128,12 @@ ] }, { + "id": "transport_cycle", + "type": "index", "name": { "de": "Radfahren", "en": "Cycling" }, - "id": "transport_cycle", - "type": "index", "subCategories": [ { "id": "cycle_amenities" @@ -145,6 +144,8 @@ ] }, { + "id": "transport_pt", + "type": "index", "name": { "ast": "Tresporte Públicu", "cs": "Veřejná doprava", @@ -162,8 +163,6 @@ "ru": "Общественный транспорт", "uk": "Громадський транспорт" }, - "id": "transport_pt", - "type": "index", "subCategories": [ { "id": "pt_amenities" @@ -177,6 +176,8 @@ ] }, { + "id": "transport_car", + "type": "index", "name": { "ast": "Tráficu individual", "cs": "Individuální doprava", @@ -191,8 +192,6 @@ "ru": "Частный транспорт", "uk": "Приватний транспорт" }, - "id": "transport_car", - "type": "index", "subCategories": [ { "id": "car_amenities" @@ -205,6 +204,8 @@ ] }, { + "id": "agriculture_industry", + "type": "index", "name": { "ast": "Agricultura ya industria", "cs": "Průmysl a zemědělství", @@ -222,8 +223,6 @@ "ru": "Сельское хозяйство и промышленность", "uk": "Сільське господартво та промисловість" }, - "id": "agriculture_industry", - "type": "index", "subCategories": [ { "id": "agriculture" @@ -277,12 +276,12 @@ "id": "places_geo" }, { + "id": "special", + "type": "index", "name": { "en": "Special", "de": "Spezial" }, - "id": "special", - "type": "index", "subCategories": [ { "id": "wikipedia" diff --git a/places.json b/places.json index 612faa45f..800deaf0e 100644 --- a/places.json +++ b/places.json @@ -29,11 +29,11 @@ }, "feature": { "title": "{% set loc_name = localizedTag(tags, 'name') %}{{ loc_name }}{% if loc_name != tags.name %} ({{ tags.name }}){% endif %}", + "description": "{{ tagTrans('place', tags.place) }}", "body": [ "{% if tags.population %}{{ keyTrans('population') }}: {{ tags.population }}{% endif %} ", "" ], - "description": "{{ tagTrans('place', tags.place) }}", "priority": "{% set priorities = { 'continent': 0, 'country': 1, 'state': 2, 'region': 3, 'city': 4, 'town': 5, 'village': 6, 'suburb': 7, 'hamlet': 8, 'quarter': 9, neighbourhood: 10, 'isolated_dwelling': 11, 'farm': 12 } %}{{ priorities[tags.place] }}" } } diff --git a/places_geo.json b/places_geo.json index 3eb7f7c62..469ccac21 100644 --- a/places_geo.json +++ b/places_geo.json @@ -1,4 +1,5 @@ { + "type": "index", "name": { "ast": "Llugares", "cs": "Sídla", @@ -16,7 +17,6 @@ "ru": "Места", "uk": "Місцевість" }, - "type": "index", "subCategories": [ { "id": "places" diff --git a/power.json b/power.json index f0e353e3b..baa3ffb7f 100644 --- a/power.json +++ b/power.json @@ -21,14 +21,14 @@ "16": "(node[power];way[power];relation[power];)" }, "feature": { - "markerSign": null, + "description": "{{ tagTrans('power', tags.power) }}{% set x='generator:source' %}{% if tags[x] %}, {{ tagTransList('generator:source', tags[x]) }}{% endif %}", + "popupDescription": "{{ tagTrans('power', tags.power) }}", "body": [ "{% set x='generator:source' %}{% if tags[x] %}
{{ keyTrans('generator:source') }}: {{ tagTransList('generator:source', tags[x]) }}{% endif %}", "{% set x='generator:method' %}{% if tags[x] %}
{{ keyTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}", "{% set x='generator:type' %}{% if tags[x] %}
{{ tagTransList('generator:type') }}: {{ tagTrans('generator:type', tags[x]) }}{% endif %}" ], - "description": "{{ tagTrans('power', tags.power) }}{% set x='generator:source' %}{% if tags[x] %}, {{ tagTransList('generator:source', tags[x]) }}{% endif %}", - "priority": "{% if tags.power == 'plant' %}0{% elseif tags.power == 'generator' or tags.power == 'line' %}1{% elseif tags.power == 'substation' %}2{% else %}3{% endif %}", - "popupDescription": "{{ tagTrans('power', tags.power) }}" + "markerSign": null, + "priority": "{% if tags.power == 'plant' %}0{% elseif tags.power == 'generator' or tags.power == 'line' %}1{% elseif tags.power == 'substation' %}2{% else %}3{% endif %}" } } diff --git a/pt_routes.json b/pt_routes.json index d29687867..57be6f5c1 100644 --- a/pt_routes.json +++ b/pt_routes.json @@ -8,11 +8,11 @@ "13": "relation[type=route][route~\"^(bus|trolleybus|ferry|train|tram)$\"];" }, "feature": { - "description": "{{ tagTrans('route', tags.route) }}", "title": [ "{% if tags.ref %}{{ tags.ref }} - {% endif %}", "", "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(trans('unnamed')) }}" - ] + ], + "description": "{{ tagTrans('route', tags.route) }}" } } diff --git a/public.json b/public.json index 66d9bdbba..c7b7ad262 100644 --- a/public.json +++ b/public.json @@ -21,8 +21,8 @@ }, "feature": { "title": "{{ tags.name|default(tags.operator)|default(tagTrans('amenity', tags.amenity)) }}", - "markerSign": "{% if tags.amenity=='post_office' %}🏤{% elseif tags.amenity=='post_box'%}📮{% elseif tags.amenity=='internet_cafe' %}💻{% elseif tags.amenity=='telephone' %}✆{% endif %}", + "description": "{{ tagTrans('amenity', tags.amenity) }}", "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}
{% endif %}", - "description": "{{ tagTrans('amenity', tags.amenity) }}" + "markerSign": "{% if tags.amenity=='post_office' %}🏤{% elseif tags.amenity=='post_box'%}📮{% elseif tags.amenity=='internet_cafe' %}💻{% elseif tags.amenity=='telephone' %}✆{% endif %}" } } diff --git a/railway-electrification.json b/railway-electrification.json index 6eac778b0..07d0018ce 100644 --- a/railway-electrification.json +++ b/railway-electrification.json @@ -34,36 +34,7 @@ " {% endif %}", "{% endif %}" ], - "style:casing": { - "color": "white", - "weight": "{{ weight }}", - "fill": null, - "opacity": "1" - }, - "style": { - "color": "{{ color }}", - "weight": "{{ weight }}", - "dashArray": [ - "{% if not tags.electrified or tags.electrified == 'no' %}", - "{% elseif tags.frequency == 0 %}", - "{% else %}", - "5,2", - "{% endif %}" - ], - "opacity": "1", - "lineCap": "butt" - }, - "styles": "casing,default", - "markerSign": null, - "body": [ - "{{ tagTrans('railway', tags.railway) }}
", - "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}
{% endif %}", - "{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}
{% endif %}", - "{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}
{% endif %}", - "{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}
", - "{% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}
{% endif %}", - "" - ], + "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}", "description": [ "{{ tagTrans('railway', tags.railway) }} -", "", @@ -73,9 +44,37 @@ " {{ tags.voltage|default(trans('unknown')) }}V, {{ tags.frequency|default(trans('unknown')) }}Hz", "{% endif %}" ], + "body": [ + "{{ tagTrans('railway', tags.railway) }}
", + "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}
{% endif %}", + "{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}
{% endif %}", + "{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}
{% endif %}", + "{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}
", + "{% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}
{% endif %}" + ], + "markerSign": null, + "listMarkerSymbol": "line", "priority": "{% if tags.railway == 'station' %}0{% elseif tags.railway in [ 'halt', 'tram_stop' ] %}1{% else %}5{% endif %}", - "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}", - "listMarkerSymbol": "line" + "styles": "casing,default", + "style": { + "weight": "{{ weight }}", + "color": "{{ color }}", + "opacity": "1", + "lineCap": "butt", + "dashArray": [ + "{% if not tags.electrified or tags.electrified == 'no' %}", + "{% elseif tags.frequency == 0 %}", + "{% else %}", + "5,2", + "{% endif %}" + ] + }, + "style:casing": { + "weight": "{{ weight }}", + "color": "white", + "opacity": "1", + "fill": null + } }, "info": [ "", diff --git a/railway-infrastructure.json b/railway-infrastructure.json index 621bb2f43..0b53f8a04 100644 --- a/railway-infrastructure.json +++ b/railway-infrastructure.json @@ -10,23 +10,46 @@ "17": "(node[railway];way[railway];)" }, "feature": { - "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 %}", - "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 %}", - "dashArray": "2,4", - "lineCap": "butt" - }, + "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}", + "description": "{{ tagTrans('railway', tags.railway) }}", + "body": [ + "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}
{% endif %}", + "{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}
{% endif %}", + "{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}
{% endif %}", + "{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}
", + "{% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}
{% endif %}", + "" + ], + "markerSign": "{% if tags.railway in [ 'halt', 'tram_stop', 'station', 'stop', 'subway_entrance' ] %}X{% endif %}", + "markerSymbol": [ + "{% if tags.railway == 'signal' %}", + "", + " ", + "", + "{% else %}", + "{{ markerPointer({})|raw }}", + "{% endif %}" + ], + "listMarkerSymbol": [ + "{% if tags.railway in [ 'station', 'halt', 'tram_stop', 'stop', 'subway_entrance', 'signal' ] %}", + "{% else %}", + "line", + "{% endif %}" + ], + "priority": [ + "{% if tags.railway == 'station' %}0", + "{% elseif tags.railway in [ 'halt' ] %}1", + "{% elseif tags.railway in [ 'tram_stop', 'stop' ] %}2", + "{% elseif tags.railway in [ 'subway_entrance' ] %}3", + "{% else %}5", + "{% endif %}" + ], + "styles": "{% if tags.railway == 'narrow_gauge' %}default,casing{% else %}default{% endif %}", "style": { - "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 %}", "weight": "{% if tags.service == 'yard' or tags.service == 'siding' or tags.service == 'spur' or tags.service == 'crossover' %}1{% else %}{% if tags.railway == 'rail' %}{% if tags.usage == 'main' or tags.usage == 'branch' %}3{% else %}2{% endif %}{% elseif tags.railway == 'platform' %}1{% else %}2{% 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 %}", + "opacity": "1", "dashArray": "{% if tags.railway == 'rail' %}{% elseif tags.railway == 'disused' %}1,5{% elseif tags.railway == 'abandoned' %}1,7{% endif %}", - "fillColor": [ - "{% if tags.railway == 'platform' %}", - "#3f3f3f", - "{% elseif type == 'node' %}", - "#ffffff", - "{% endif %}" - ], "fill": [ "{% if tags.railway == 'platform' %}", "1", @@ -35,7 +58,13 @@ "{% else %}", "{% endif %}" ], - "opacity": "1", + "fillColor": [ + "{% if tags.railway == 'platform' %}", + "#3f3f3f", + "{% elseif type == 'node' %}", + "#ffffff", + "{% endif %}" + ], "fillOpacity": [ "{% if tags.railway == 'platform' %}", "0.2", @@ -44,41 +73,12 @@ "{% endif %}" ] }, - "styles": "{% if tags.railway == 'narrow_gauge' %}default,casing{% else %}default{% endif %}", - "markerSign": "{% if tags.railway in [ 'halt', 'tram_stop', 'station', 'stop', 'subway_entrance' ] %}X{% endif %}", - "body": [ - "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}
{% endif %}", - "{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}
{% endif %}", - "{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}
{% endif %}", - "{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}
", - "{% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}
{% endif %}", - "" - ], - "description": "{{ tagTrans('railway', tags.railway) }}", - "priority": [ - "{% if tags.railway == 'station' %}0", - "{% elseif tags.railway in [ 'halt' ] %}1", - "{% elseif tags.railway in [ 'tram_stop', 'stop' ] %}2", - "{% elseif tags.railway in [ 'subway_entrance' ] %}3", - "{% else %}5", - "{% endif %}" - ], - "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}", - "listMarkerSymbol": [ - "{% if tags.railway in [ 'station', 'halt', 'tram_stop', 'stop', 'subway_entrance', 'signal' ] %}", - "{% else %}", - "line", - "{% endif %}" - ], - "markerSymbol": [ - "{% if tags.railway == 'signal' %}", - "", - " ", - "", - "{% else %}", - "{{ markerPointer({})|raw }}", - "{% endif %}" - ] + "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 %}", + "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" + } }, "info": [ "
", diff --git a/religion.json b/religion.json index c002e8c16..dd27a2ff5 100644 --- a/religion.json +++ b/religion.json @@ -38,6 +38,7 @@ "{% endif %}" ], "description": "{{ tagTrans(key, value) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}", + "popupDescription": "{{ tagTrans(key, value) }}", "body": [ "{% if tags.religion %}", " {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}", @@ -55,7 +56,6 @@ "{% elseif tags.religion == 'jewish' %}✡", "{% elseif tags.religion == 'pagan' %}☆", "{% endif %}" - ], - "popupDescription": "{{ tagTrans(key, value) }}" + ] } } diff --git a/sport.json b/sport.json index db1dc0511..008c933d6 100644 --- a/sport.json +++ b/sport.json @@ -18,12 +18,12 @@ "14": "(node[sport];way[sport];relation[sport])" }, "feature": { + "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTransList('sport', tags.sport)) }}", "description": "{{ tagTransList('sport', tags.sport) }}", "markerSign": [ "{% set firstSport = tags.sport|split(';')[0] %}", "{{ const[firstSport] }}" - ], - "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTransList('sport', tags.sport)) }}" + ] }, "const": { "9pin": "🎳", diff --git a/walk_amenities.json b/walk_amenities.json index a099acd6d..2ce5e877c 100644 --- a/walk_amenities.json +++ b/walk_amenities.json @@ -49,8 +49,8 @@ "", "{% set type_data = const[value] %}" ], - "description": "{{ tagTrans(key, value) }}", "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(tagTrans(key, value)) }}", + "description": "{{ tagTrans(key, value) }}", "markerSign": "{{ type_data.sign|raw }}", "priority": "{{ type_data.priority }}" }, diff --git a/works.json b/works.json index 42c47fd67..d406a0532 100644 --- a/works.json +++ b/works.json @@ -1,4 +1,5 @@ { + "type": "overpass", "name": { "ast": "Fábriques", "cs": "Továrny", @@ -10,12 +11,10 @@ "nl": "Fabrieken", "ru": "Промышленность" }, - "type": "overpass", "query": { "12": "(node[landuse~'^(industrial)$'];way[landuse~'^(industrial)$'];relation[landuse~'^(industrial)$'];)" }, - "minZoom": 12, "feature": { - "markerSign": "" + "markerSign": null } }