From c96047e2925743bd06b2a9764b77fd037b21a510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at> Date: Tue, 22 Nov 2022 18:48:32 +0100 Subject: [PATCH 1/5] tourism_attractions: fix filter queries --- tourism_attractions.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tourism_attractions.json b/tourism_attractions.json index a07cb26..4a4a394 100644 --- a/tourism_attractions.json +++ b/tourism_attractions.json @@ -61,11 +61,10 @@ "type": { "name": "{{ trans('filter:type') }}", "show_default": "true", - "query": "nwr[{{ value }}]", + "query": "nwr[tourism^{{ value }}]", "type": "select", "key": "tourism", - "values": "{% set list = [] %}{% for t, v in const %}<option value=\"{{ t }}\">{% set list = list|merge([ t ]) %}{{ tagTrans('tourism', t) }}</option>{% endfor %}", - "op": "has" + "values": "{% set list = [] %}{% for t, v in const %}<option value=\"{{ t }}\">{% set list = list|merge([ t ]) %}{{ tagTrans('tourism', t) }}</option>{% endfor %}" } } } From 8f7e4c92f610048b2558f759614298951d52b77d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at> Date: Fri, 25 Nov 2022 14:05:40 +0100 Subject: [PATCH 2/5] xmas: do no longer use 'unnamed', fall back to 'name' or nothing --- xmas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmas.json b/xmas.json index 6c1d67b..4bd9df9 100644 --- a/xmas.json +++ b/xmas.json @@ -21,7 +21,7 @@ "{% set isCurrent = meta.timestamp >= \"now\"|date_modify('-10 month')|date('Y') %}", "{% set bgColor = isCurrent ? '#f2756a' : 'red' %}" ], - "title": "{{ attribute(tags, \"xmas:name\")|default(trans(\"unnamed\")) }}", + "title": "{{ attribute(tags, \"xmas:name\")|default(tags.name) }}", "description": "{{ tagTransList(\"xmas:feature\", attribute(tags, \"xmas:feature\")) }}", "body": [ "{% if not isCurrent %}", From b402da9763849e70716b4801c91b27116b765c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at> Date: Wed, 7 Dec 2022 18:34:57 +0100 Subject: [PATCH 3/5] xmas: icons for additional features --- xmas.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmas.json b/xmas.json index 4bd9df9..8edfc09 100644 --- a/xmas.json +++ b/xmas.json @@ -73,10 +73,13 @@ "listMarkerSymbol": "{{ markerCircle({\"fillColor\":bgColor})|raw }}" }, "const": { - "market": "<img data-src='maki:commercial'>", - "tree": "<i class=\"fa fa-tree\" aria-hidden=\"true\"></i>", + "market": "<img data-src='maki:commercial?fill=#333333'>", "shop": "<i class=\"fa fa-shopping-basket\" aria-hidden=\"true\"></i>", - "event": "<img data-src='maki:amusement-park'>" + "tree": "<i class=\"fa fa-tree\" aria-hidden=\"true\"></i>", + "crib": "<i class=\"fas fa-bed\"></i>", + "event": "<img data-src='maki:amusement-park?fill=#333333'>", + "lighting": "<i class=\"far fa-star\"></i>", + "pyramid": "𓉴" }, "info": [ "<table>", From 5d7c568397300fe4f0d89303c20bd0b1a8a47ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at> Date: Wed, 7 Dec 2022 19:20:22 +0100 Subject: [PATCH 4/5] xmas: filter by type --- xmas.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xmas.json b/xmas.json index 8edfc09..d3ff883 100644 --- a/xmas.json +++ b/xmas.json @@ -81,6 +81,15 @@ "lighting": "<i class=\"far fa-star\"></i>", "pyramid": "𓉴" }, + "filter": { + "type": { + "name": "{{ trans('filter:type') }}", + "show_default": "true", + "query": "nwr[\"xmas:feature\"=\"{{ value }}\"]", + "type": "select", + "values": "{% for k, v in const %}<option value=\"{{ k }}\">{{ tagTrans('xmas:feature', k) }}</option>{% endfor %}<option value=\"other\" query=\"nwr['xmas:feature']{% for k, v in const %}['xmas:feature'!='{{ k }}']{% endfor %}\" weight=\"1\">{{ trans('other') }}</option>" + } + }, "info": [ "<table>", "{% for value, icon in const %}", From f44bfc6696d5d4b87e88da469c70c48dd153c867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Babos?= <gabor.babos@gmail.com> Date: Wed, 7 Dec 2022 14:27:18 +0000 Subject: [PATCH 5/5] Translated using Weblate (Hungarian) Currently translated at 100.0% (102 of 102 strings) Translation: OpenStreetBrowser/Main Categories Translate-URL: http://weblate.openstreetbrowser.org/projects/openstreetbrowser/main-categories/hu/ --- lang/hu.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lang/hu.json b/lang/hu.json index 131893d..003cddd 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -97,5 +97,8 @@ "category:developments": "Tervek Ă©s Ă©pĂtkezĂ©sek", "category:proposals": "Tervezett objektumok", "category:heritage": "Ă–röksĂ©gvĂ©delem", - "deprecated": "Ez a cĂmke (%s) elavult. A további rĂ©szleteket <a target='_blank' href=\"%s\">lásd itt</a>." + "deprecated": "Ez a cĂmke (%s) elavult. A további rĂ©szleteket <a target='_blank' href=\"%s\">lásd itt</a>.", + "category:culture-media": "KultĂşra – mĂ©dia/Wikidata", + "category:fixme": "JavĂts ki! / Fix me", + "category:osm-qa": "OpenStreetMap minĹ‘sĂ©gellenĹ‘rzĂ©s" }