diff --git a/assets/layers/scouting_group/license_info.json b/assets/layers/scouting_group/license_info.json new file mode 100644 index 0000000000..4f72db43f6 --- /dev/null +++ b/assets/layers/scouting_group/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "scouting.svg", + "license": "CC-BY-SA-3.0", + "authors": [ + "Daniel Lienert (Brucelie)" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Deutsche_Pfadfinderschaft_Sankt_Georg.png" + ] + } +] \ No newline at end of file diff --git a/assets/layers/scouting_group/scouting.svg b/assets/layers/scouting_group/scouting.svg new file mode 100644 index 0000000000..f9740cb7fa --- /dev/null +++ b/assets/layers/scouting_group/scouting.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + +image/svg+xml + + diff --git a/assets/layers/scouting_groups/Deutsche_Pfadfinderschaft_Sankt_Georg.png.license b/assets/layers/scouting_group/scouting.svg.license similarity index 100% rename from assets/layers/scouting_groups/Deutsche_Pfadfinderschaft_Sankt_Georg.png.license rename to assets/layers/scouting_group/scouting.svg.license diff --git a/assets/layers/scouting_group/scouting_group.json b/assets/layers/scouting_group/scouting_group.json new file mode 100644 index 0000000000..2a4e0795c1 --- /dev/null +++ b/assets/layers/scouting_group/scouting_group.json @@ -0,0 +1,93 @@ +{ + "id": "scouting_group", + "name": { + "en": "Scouting groups", + "de": "Pfadfinder:innenstämme" + }, + "description": { + "en": "A map showing scouting groups." + }, + "source": { + "osmTags": "club=scout" + }, + "minzoom": 4, + "title": { + "render": { + "en": "{name}" + } + }, + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "marker": [ + { + "icon": { + "builtin": "nsi_brand.icon", + "override": { + "render": "./assets/layers/scouting_group/scouting.svg" + } + } + } + ] + } + ], + "lineRendering": [ + { + "width": 1, + "color": "blue" + } + ], + "presets": [ + { + "title": { + "en": "scouting group", + "de": "Pfadfinder:innenstamm" + }, + "tags": [ + "club=scout" + ] + } + ], + "tagRenderings": [ + { + "question": { + "de": "Was ist der Stammesname?", + "en": "What is the name of this group?" + }, + "render": { + "en": "The name of this group is {name}", + "de": "Dieser Stamm heißt {name}" + }, + "freeform": { + "key": "name" + }, + "id": "name" + }, + { + "question": { + "de": "Zu welchem Verband/Bund gehört {name}", + "en": "To which scout association does {name} belong?" + }, + "render": { + "en": "The scout association of this group is {brand}", + "de": "Dieser Stamm ist im Verband {brand}" + }, + "freeform": { + "key": "brand" + }, + "id": "association" + }, + "contact", + "questions", + "mastodon" + ], + "filter": [ + "nsi_brand.brand" + ], + "allowMove": true, + "credits": "Osmwithspace", + "credits:uid": 8770388 +} diff --git a/assets/layers/scouting_groups/Deutsche_Pfadfinderschaft_Sankt_Georg.png b/assets/layers/scouting_groups/Deutsche_Pfadfinderschaft_Sankt_Georg.png deleted file mode 100644 index 0f3a5b27ae..0000000000 Binary files a/assets/layers/scouting_groups/Deutsche_Pfadfinderschaft_Sankt_Georg.png and /dev/null differ diff --git a/assets/layers/scouting_groups/Verband_Christlicher_Pfadfinderinnen_und_Pfadfinder_(VCP)_Logo_(Lilie).svg b/assets/layers/scouting_groups/Verband_Christlicher_Pfadfinderinnen_und_Pfadfinder_(VCP)_Logo_(Lilie).svg deleted file mode 100644 index e366c19f0f..0000000000 --- a/assets/layers/scouting_groups/Verband_Christlicher_Pfadfinderinnen_und_Pfadfinder_(VCP)_Logo_(Lilie).svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/assets/layers/scouting_groups/Verband_Christlicher_Pfadfinderinnen_und_Pfadfinder_(VCP)_Logo_(Lilie).svg.license b/assets/layers/scouting_groups/Verband_Christlicher_Pfadfinderinnen_und_Pfadfinder_(VCP)_Logo_(Lilie).svg.license deleted file mode 100644 index 771c81c6c1..0000000000 --- a/assets/layers/scouting_groups/Verband_Christlicher_Pfadfinderinnen_und_Pfadfinder_(VCP)_Logo_(Lilie).svg.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-FileCopyrightText: Unknown author -SPDX-License-Identifier: Public domain \ No newline at end of file diff --git a/assets/layers/scouting_groups/WikiProject_Scouting_fleur-de-lis_outline.svg b/assets/layers/scouting_groups/WikiProject_Scouting_fleur-de-lis_outline.svg deleted file mode 100644 index 219707a655..0000000000 --- a/assets/layers/scouting_groups/WikiProject_Scouting_fleur-de-lis_outline.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - -image/svg+xml - - - - - - - - - - - - - \ No newline at end of file diff --git a/assets/layers/scouting_groups/WikiProject_Scouting_fleur-de-lis_outline.svg.license b/assets/layers/scouting_groups/WikiProject_Scouting_fleur-de-lis_outline.svg.license deleted file mode 100644 index 9b03fb5bcd..0000000000 --- a/assets/layers/scouting_groups/WikiProject_Scouting_fleur-de-lis_outline.svg.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-FileCopyrightText: https://commons.wikimedia.org/wiki/User:Gothika -SPDX-License-Identifier: CC-BY-SA-4.0 \ No newline at end of file diff --git a/assets/layers/scouting_groups/license_info.json b/assets/layers/scouting_groups/license_info.json deleted file mode 100644 index f8f254c80f..0000000000 --- a/assets/layers/scouting_groups/license_info.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "path": "WikiProject_Scouting_fleur-de-lis_outline.svg", - "license": "CC-BY-SA-3.0", - "authors": [ - "Daniel Lienert (Brucelie)" - ], - "sources": [ - "https://commons.wikimedia.org/wiki/File:Deutsche_Pfadfinderschaft_Sankt_Georg.png" - ] - }, - { - "path": "Verband_Christlicher_Pfadfinderinnen_und_Pfadfinder_(VCP)_Logo_(Lilie).svg", - "license": "Public domain", - "authors": [ - "Unknown author" - ], - "sources": [ - "https://commons.wikimedia.org/wiki/File:Verband_Christlicher_Pfadfinderinnen_und_Pfadfinder_(VCP)_Logo_(Lilie).svg" - ] - }, - { - "path": "WikiProject_Scouting_fleur-de-lis_outline.svg", - "license": "CC-BY-SA-4.0", - "authors": [ - "Gothika" - ], - "sources": [ - "https://commons.wikimedia.org/wiki/File:WikiProject_Scouting_fleur-de-lis_outline.svg" - ] - } -] \ No newline at end of file diff --git a/assets/layers/scouting_groups/scouting_groups.json b/assets/layers/scouting_groups/scouting_groups.json deleted file mode 100644 index 9cc7a01770..0000000000 --- a/assets/layers/scouting_groups/scouting_groups.json +++ /dev/null @@ -1,205 +0,0 @@ -{ - "credits": "Osmwithspace", - "filter": [ - { - "id": "association", - "options": [ - { - "question": { - "en": "scout association", - "de": "Bund/Verband" - } - }, - { - "question": { - "en": "Bund der Pfadfinderinnen und Pfadfinder" - }, - "osmTags": "brand=Bund der Pfadfinderinnen und Pfadfinder" - }, - { - "question": { - "en": "Bund Muslimischer Pfadfinderinnen und Pfadfinder Deutschlands" - }, - "osmTags": "brand=Bund Muslimischer Pfadfinderinnen und Pfadfinder Deutschlands" - }, - { - "question": { - "en": "Deutsche Pfadfinderschaft Sankt Georg" - }, - "osmTags": "brand=Deutsche Pfadfinderschaft Sankt Georg" - }, - { - "question": { - "en": "Norges KFUK-KFUM-speidere" - }, - "osmTags": "brand=Norges KFUK-KFUM-speidere" - }, - { - "question": { - "en": "Pfadfinderinnenschaft St. Georg" - }, - "osmTags": "brand=Pfadfinderinnenschaft St. Georg" - }, - { - "question": { - "en": "The Scout Association" - }, - "osmTags": "brand=The Scout Association" - }, - { - "question": { - "en": "Verband Christlicher Pfadfinder*innen" - }, - "osmTags": "brand=Verband Christlicher Pfadfinder*innen" - }, - { - "question": { - "en": "other", - "de": "andere" - }, - "osmTags": { - "and": [ - "brand!=Bund der Pfadfinderinnen und Pfadfinder", - "brand!=Bund Muslimischer Pfadfinderinnen und Pfadfinder Deutschlands", - "brand!=Deutsche Pfadfinderschaft Sankt Georg", - "brand!=Norges KFUK-KFUM-speidere", - "brand!=Pfadfinderinnenschaft St. Georg", - "brand!=The Scout Association", - "brand!=Verband Christlicher Pfadfinder*innen" - ] - } - } - ] - } - ], - "minzoom": 7, - "pointRendering": [ - { - "location": [ - "point", - "centroid" - ], - "marker": [ - { - "icon": { - "render": "./assets/layers/scouting_groups/WikiProject_Scouting_fleur-de-lis_outline.svg", - "mappings": [ - { - "if": { - "or": [ - "brand=Bund der Pfadfinderinnen und Pfadfinder", - "name~.*BdP.*", - "name~.*Bund der Pfadfinderinnen und Pfadfinder.*", - "operator~.*BdP.*", - "operator~.*Bund der Pfadfinderinnen und Pfadfinder.*" - ] - }, - "then": "./assets/layers/scouting_groups/WikiProject_Scouting_fleur-de-lis_outline.svg" - }, - { - "if": { - "or": [ - "brand=Deutsche Pfadfinderschaft Sankt Georg", - "name~.*DPSG.*", - "name~.*Deutsche Pfadfinderschaft Sankt Georg.*", - "operator~.*DPSG.*", - "operator~.*Deutsche Pfadfinderschaft Sankt Georg.*" - ] - }, - "then": "./assets/layers/scouting_groups/Deutsche_Pfadfinderschaft_Sankt_Georg.png" - }, - { - "if": "brand=Norges KFUK-KFUM-speidere", - "then": "./assets/layers/scouting_groups/WikiProject_Scouting_fleur-de-lis_outline.svg" - }, - { - "if": "brand=The Scout Association", - "then": "./assets/layers/scouting_groups/WikiProject_Scouting_fleur-de-lis_outline.svg" - }, - { - "if": { - "or": [ - "brand=Verband Christlicher Pfadfinder*innen", - "name~.*VCP.*", - "name~.*Verband Christlicher Pfadfinder*innen.*", - "operator~.*VCP.*", - "operator~.*Verband Christlicher Pfadfinder*innen.*" - ] - }, - "then": "./assets/layers/scouting_groups/Verband_Christlicher_Pfadfinderinnen_und_Pfadfinder_(VCP)_Logo_(Lilie).svg" - } - ] - } - } - ] - } - ], - "tagRenderings": [ - { - "question": { - "de": "Was ist der Stammesname?", - "en": "What is the name of this group?" - }, - "render": { - "en": "The name of this group is {name}", - "de": "Dieser Stamm heißt {name}" - }, - "freeform": { - "key": "name" - }, - "id": "name" - }, - { - "question": { - "de": "Zu welchem Verband/Bund gehört {name}", - "en": "To which scout association does {name} belong?" - }, - "render": { - "en": "The scout association of this group is {brand}", - "de": "Dieser Stamm ist im Verband {brand}" - }, - "freeform": { - "key": "brand" - }, - "id": "association" - }, - "contact", - "questions", - "mastodon" - ], - "lineRendering": [ - { - "width": 1, - "color": "blue" - } - ], - "id": "scouting_groups", - "name": { - "en": "scouting groups", - "de": "Pfadfinder:innenstämme" - }, - "source": { - "osmTags": "club=scout" - }, - "description": { - "en": "A map showing scouting groups." - }, - "title": { - "render": { - "en": "{name}" - } - }, - "presets": [ - { - "title": { - "en": "scouting group", - "de": "Pfadfinder:innenstamm" - }, - "tags": [ - "club=scout" - ] - } - ], - "credits:uid": 8770388, - "allowMove": false -} \ No newline at end of file diff --git a/assets/themes/scouting/scouting.json b/assets/themes/scouting/scouting.json new file mode 100644 index 0000000000..2d61b83939 --- /dev/null +++ b/assets/themes/scouting/scouting.json @@ -0,0 +1,14 @@ +{ + "id": "scouting", + "title": { + "en": "Scouting groups" + }, + "description": { + "en": "A scouting group is a social youth movement with a heavy emphasis on the outdoors. Activities range from camping, hiking, aquatics, backpacking, exploring nature, ..." + }, + "icon": "./assets/layers/scouting_group/scouting.svg", + "defaultBackgroundId": "protomaps.dark", + "layers": [ + "scouting_group" + ] +} diff --git a/scripts/downloadNsiLogos.ts b/scripts/downloadNsiLogos.ts index d09a3659e9..46f9f0c28a 100644 --- a/scripts/downloadNsiLogos.ts +++ b/scripts/downloadNsiLogos.ts @@ -167,13 +167,11 @@ class DownloadNsiLogos extends Script { } const config: LayerConfigJson = { - "#dont-translate": "*", - "#no-index": "yes", id: "nsi_" + type, - source: "special:library", description: { en: "Exposes part of the NSI to reuse in other themes, e.g. for rendering", }, + source: "special:library", pointRendering: null, tagRenderings: [ iconsTr, @@ -187,6 +185,7 @@ class DownloadNsiLogos extends Script { }, ], allowMove: false, + "#dont-translate": "*", } const path = "./assets/layers/nsi_" + type mkdirSync(path, { recursive: true })