diff --git a/assets/layers/brothel/brothel.json b/assets/layers/brothel/brothel.json index e0a4de9ecf..a1d4c5650c 100644 --- a/assets/layers/brothel/brothel.json +++ b/assets/layers/brothel/brothel.json @@ -51,27 +51,9 @@ ], "marker": [ { - "icon": "circle", - "color": "white" - }, - { - "icon": "ring", - "color": "#fc6488" + "icon": "./assets/layers/brothel/brothel.svg" } ] - }, - { - "location": [ - "centroid", - "point" - ], - "marker": [ - { - "icon": "heart", - "color": "#fc6488" - } - ], - "iconSize": "28,28" } ], "presets": [ diff --git a/assets/layers/brothel/brothel.svg b/assets/layers/brothel/brothel.svg new file mode 100644 index 0000000000..7a0096608b --- /dev/null +++ b/assets/layers/brothel/brothel.svg @@ -0,0 +1,55 @@ + + diff --git a/assets/layers/brothel/brothel.svg.license b/assets/layers/brothel/brothel.svg.license new file mode 100644 index 0000000000..ed02883002 --- /dev/null +++ b/assets/layers/brothel/brothel.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/brothel/license_info.json b/assets/layers/brothel/license_info.json new file mode 100644 index 0000000000..5c93b1c75c --- /dev/null +++ b/assets/layers/brothel/license_info.json @@ -0,0 +1,10 @@ +[ + { + "path": "brothel.svg", + "license": "CC0-1.0", + "authors": [ + "Pieter Vander Vennet" + ], + "sources": [] + } +] \ No newline at end of file diff --git a/assets/layers/love_hotel/apartment.svg.license b/assets/layers/love_hotel/apartment.svg.license new file mode 100644 index 0000000000..f752f0ddd8 --- /dev/null +++ b/assets/layers/love_hotel/apartment.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM-Carto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/love_hotel/guest_house.svg.license b/assets/layers/love_hotel/guest_house.svg.license new file mode 100644 index 0000000000..281557b341 --- /dev/null +++ b/assets/layers/love_hotel/guest_house.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Geozeisig +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/love_hotel/hostel.svg.license b/assets/layers/love_hotel/hostel.svg.license new file mode 100644 index 0000000000..f752f0ddd8 --- /dev/null +++ b/assets/layers/love_hotel/hostel.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM-Carto +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/love_hotel/hotel.svg b/assets/layers/love_hotel/hotel.svg new file mode 100644 index 0000000000..11c88969ce --- /dev/null +++ b/assets/layers/love_hotel/hotel.svg @@ -0,0 +1,61 @@ + + + + + + + + + diff --git a/assets/layers/love_hotel/hotel.svg.license b/assets/layers/love_hotel/hotel.svg.license new file mode 100644 index 0000000000..01764961f0 --- /dev/null +++ b/assets/layers/love_hotel/hotel.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Andy Allan; Michael Glanznig; Adamant36; Paul Dicker +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/love_hotel/license_info.json b/assets/layers/love_hotel/license_info.json new file mode 100644 index 0000000000..322495cd97 --- /dev/null +++ b/assets/layers/love_hotel/license_info.json @@ -0,0 +1,15 @@ +[ + { + "path": "hotel.svg", + "license": "CC0-1.0", + "authors": [ + "Andy Allan", + "Michael Glanznig", + "Adamant36", + "Paul Dicker" + ], + "sources": [ + "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/tourism/hotel.svg" + ] + } +] \ No newline at end of file diff --git a/assets/layers/love_hotel/love_hotel.json b/assets/layers/love_hotel/love_hotel.json index dfdd8ca808..cd50a3b381 100644 --- a/assets/layers/love_hotel/love_hotel.json +++ b/assets/layers/love_hotel/love_hotel.json @@ -38,26 +38,9 @@ ], "marker": [ { - "icon": "circle", - "color": "white" - }, - { - "icon": "ring", - "color": "blue" + "icon": "./assets/layers/love_hotel/hotel.svg" } ] - }, - { - "location": [ - "point", - "centroid" - ], - "marker": [ - { - "icon": "./assets/layers/tourism_accomodation/hotel.svg" - } - ], - "iconSize": "27,27" } ], "lineRendering": [], diff --git a/assets/layers/love_hotel/motel.svg.license b/assets/layers/love_hotel/motel.svg.license new file mode 100644 index 0000000000..634783d068 --- /dev/null +++ b/assets/layers/love_hotel/motel.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: gmgeo +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/stripclub/stripclub.json b/assets/layers/stripclub/stripclub.json index afcb357ce0..383d4a03db 100644 --- a/assets/layers/stripclub/stripclub.json +++ b/assets/layers/stripclub/stripclub.json @@ -52,18 +52,8 @@ { "icon": "ring", "color": "#be57b4ff" - } - ] - }, - { - "location": [ - "point", - "centroid" - ], - "marker": [ - { - "icon": "./assets/layers/stripclub/stripclub.svg" - } + }, + { "icon": "./assets/layers/stripclub/stripclub.svg"} ] } ], diff --git a/assets/layers/stripclub/stripclub.svg b/assets/layers/stripclub/stripclub.svg index 1aa0a48385..d68d06e4cc 100644 --- a/assets/layers/stripclub/stripclub.svg +++ b/assets/layers/stripclub/stripclub.svg @@ -2,9 +2,9 @@ + id="path2" /> diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index a6952adf0c..7772c96910 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -8,7 +8,8 @@ "fr": "Modifications faites avec MapComplete", "nl": "Wijzigingen gemaakt met MapComplete", "ko": "MapComplete로 이루어진 변경 사항", - "it": "Modifiche fatte con MapComplete" + "it": "Modifiche fatte con MapComplete", + "zh_Hant": "由MapComplete進行的變動" }, "shortDescription": { "en": "Shows changes made by MapComplete", @@ -18,7 +19,8 @@ "fr": "Afficher les modifications faites avec MapComplete", "nl": "Toont wijzigingen gemaakt met MapComplete", "ko": "MapComplete를 통해 이루어진 변경 사항을 표시합니다", - "it": "Mostra le modifiche fatte con MapComplete" + "it": "Mostra le modifiche fatte con MapComplete", + "zh_Hant": "顯示由MapComplete進行的變動" }, "description": { "en": "This maps shows all the changes made with MapComplete", @@ -29,7 +31,8 @@ "fr": "Cette carte montre tous les changements effectués avec MapComplete", "nl": "Deze kaarten tonen alle wijzigingen die zijn gemaakt met MapComplete", "ko": "이 지도는 MapComplete를 사용하여 이루어진 모든 변경 사항을 표시합니다", - "it": "Questa mappa mostra tutte le modifiche effettuate con MapComplete" + "it": "Questa mappa mostra tutte le modifiche effettuate con MapComplete", + "zh_Hant": "這個地圖顯示所有用MapComplete做出的改變" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -47,7 +50,8 @@ "nl": "Changeset centra", "cs": "Changeset centra", "ko": "주요 변경 사항", - "it": "Centri di changeset" + "it": "Centri di changeset", + "zh_Hant": "變更集的中心位置" }, "minzoom": 0, "source": { @@ -63,7 +67,8 @@ "es": "Conjunto de cambios para {theme}", "nl": "Changeset voor {theme}", "ko": "{theme}에 대한 변경 사항", - "it": "Changeset per {theme}" + "it": "Changeset per {theme}", + "zh_Hant": "{theme} 的變更集" } }, "description": { @@ -73,7 +78,8 @@ "cs": "Zobrazí všechny změny MapComplete", "nl": "Toon alle MapComplete-wijzigingen", "ko": "MapComplete의 모든 변화 보기", - "it": "Mostra tutte le modifiche di MapComplete" + "it": "Mostra tutte le modifiche di MapComplete", + "zh_Hant": "顯示所有用MapComplete做出的變動" }, "tagRenderings": [ { @@ -85,7 +91,8 @@ "es": "Conjunto de cambios {id}", "nl": "Changeset {id}", "ko": "변경사항{id}", - "it": "Changeset {id}" + "it": "Changeset {id}", + "zh_Hant": "變更集{id}" } }, { @@ -97,7 +104,8 @@ "es": "¿Qué colaborador realizó este cambio?", "nl": "Welke bijdrager maakte deze verandering?", "ko": "이 변화를 만든 기여자는 누구입니까?", - "it": "Quale contributore ha fatto questa modifica?" + "it": "Quale contributore ha fatto questa modifica?", + "zh_Hant": "貢獻者在這一變動做了什麼？" }, "freeform": { "key": "user" @@ -110,7 +118,8 @@ "fr": "Modification faite par {user}", "nl": "Wijziging aangebracht door {user}", "ko": "변경 사항은 {user}에 의해 만들어졌습니다", - "it": "Modifica effettuata da {user}" + "it": "Modifica effettuata da {user}", + "zh_Hant": "由{user}做的變動" } }, { @@ -122,7 +131,8 @@ "es": "¿Qué tema se utilizó para realizar este cambio?", "nl": "Welk thema werd gebruikt voor deze wijziging?", "ko": "이 변경을 수행하는 데 무슨 테마가 사용되었나요?", - "it": "Quale tema è stato utilizzato per effettuare questa modifica?" + "it": "Quale tema è stato utilizzato per effettuare questa modifica?", + "zh_Hant": "那個主題進行變動的？" }, "freeform": { "key": "theme" @@ -134,7 +144,8 @@ "nl": "Verander met thema {theme}", "cs": "Změna pomocí tématu {theme}", "ko": "테마 변경 사항{theme}", - "it": "Modifica con tema {theme}" + "it": "Modifica con tema {theme}", + "zh_Hant": "由主題改變{theme}" } }, { @@ -149,7 +160,8 @@ "es": "¿En qué configuración regional (idioma) se realizó este cambio?", "nl": "In welke 'locale' (taal) is deze wijziging gemaakt?", "ko": "이 변경은 어떤 지역(언어)로 이루어졌나요?", - "it": "In quale locale (lingua) è stata effettuata questa modifica?" + "it": "In quale locale (lingua) è stata effettuata questa modifica?", + "zh_Hant": "這個變動是用什麼當地 (語言)？" }, "render": { "en": "User locale is {locale}", @@ -158,7 +170,8 @@ "es": "Configuración regional del usuario es {locale}", "nl": "De gebruikerstaal (locale) is {locale}", "ko": "사용자 지역은 {locale} 입니다", - "it": "Il locale dell'utente è {locale}" + "it": "Il locale dell'utente è {locale}", + "zh_Hant": "使用者所在地是 {locale}" } }, { @@ -170,7 +183,8 @@ "es": "Cambio realizado con {host}", "nl": "Gewijzigd met {host}", "ko": "{host}를 사용하여 변경되었습니다", - "it": "Modifica effettuata con {host}" + "it": "Modifica effettuata con {host}", + "zh_Hant": "{host}做出的變動" }, "question": { "en": "What host (website) was this change made with?", @@ -179,7 +193,8 @@ "es": "¿Con qué anfitrión (sitio web) se realizó este cambio?", "nl": "Met welke host (website) is deze wijziging gemaakt?", "ko": "이 변경은 어떤 호스트(웹사이트)를 사용하여 이루어졌나요?", - "it": "Con quale host (sito web) è stata effettuata questa modifica?" + "it": "Con quale host (sito web) è stata effettuata questa modifica?", + "zh_Hant": "什麼主辦方 (網站) 做出這一變動？" }, "freeform": { "key": "host" @@ -202,7 +217,8 @@ "question": { "en": "With what platform was the change made?", "cs": "S jakou platformou byly změny provedeny?", - "it": "Con quale piattaforma è stata effettuata la modifica?" + "it": "Con quale piattaforma è stata effettuata la modifica?", + "zh_Hant": "那個平台進行變動？" }, "mappings": [ { @@ -210,7 +226,8 @@ "then": { "en": "Made on the web", "cs": "Vytvořeno na webu", - "it": "Fatto sul web" + "it": "Fatto sul web", + "zh_Hant": "由網站進行" } }, { @@ -218,7 +235,8 @@ "then": { "en": "Made with the android app", "cs": "Vytvořeno s aplikací pro Android", - "it": "Fatto con l'app Android" + "it": "Fatto con l'app Android", + "zh_Hant": "由Android app進行" } } ] @@ -233,7 +251,8 @@ "fr": "Quelle version de MapCompletee a été utilisée pour faire cette modification ?", "nl": "Welke versie van MapComplete is gebruikt voor deze wijziging?", "ko": "이 변경을 수행하는 데 사용된 MapComplete의 버전은 무엇인가요?", - "it": "Quale versione di MapComplete è stata utilizzata per effettuare questa modifica?" + "it": "Quale versione di MapComplete è stata utilizzata per effettuare questa modifica?", + "zh_Hant": "那個版本的MapComplete用來進行改變？" }, "render": { "en": "Made with {editor}", @@ -243,7 +262,8 @@ "fr": "Fait avec {editor}", "nl": "Gemaakt met {editor}", "ko": "{editor}에 의해 만들어졌습니다", - "it": "Fatto con {editor}" + "it": "Fatto con {editor}", + "zh_Hant": "由 {editor} 進行" }, "freeform": { "key": "editor" @@ -673,7 +693,8 @@ "fr": "Le nom du thème contient {search}", "nl": "Themanaam bevat {search}", "ko": "테마 이름에 {search}가 포함되어 있습니다", - "it": "Il nome del tema contiene {search}" + "it": "Il nome del tema contiene {search}", + "zh_Hant": "含有主題名稱 {search}" } } ] @@ -696,7 +717,8 @@ "fr": "Le nom du thème ne contient pas {search}", "nl": "Themanaam bevat geen {search}", "ko": "테마 이름에 {search}가 포함되어 있지 않습니다", - "it": "Il nome del tema non contiene {search}" + "it": "Il nome del tema non contiene {search}", + "zh_Hant": "主題名稱並不包含 {search}" } } ] @@ -719,7 +741,8 @@ "fr": "Fait par le·a contributeur·trice {search}", "nl": "Toegevoegd door {search}", "ko": "기여자 {search}에 의해 만들어졌습니다", - "it": "Fatto dal contributore {search}" + "it": "Fatto dal contributore {search}", + "zh_Hant": "由貢獻者進行 {search}" } } ] @@ -742,7 +765,8 @@ "fr": "Pas fait par le·a contributeur·trice {search}", "nl": "Niet toegevoegd door {search}", "ko": "{search} 기여자가 만든 것이 아닙니다", - "it": "Non fatto dal contributore {search}" + "it": "Non fatto dal contributore {search}", + "zh_Hant": "並非由貢獻者進行 {search}" } } ] @@ -766,7 +790,8 @@ "fr": "Fait avant {search}", "nl": "Toegevoegd vóór {search}", "ko": "{search} 이전에 만들어졌습니다", - "it": "Fatto prima di {search}" + "it": "Fatto prima di {search}", + "zh_Hant": "之前進行的 {search}" } } ] @@ -790,7 +815,8 @@ "fr": "Fait après {search}", "nl": "Toegevoegd na {search}", "ko": "{search} 이후에 만들어졌습니다", - "it": "Fatto dopo {search}" + "it": "Fatto dopo {search}", + "zh_Hant": "之後進行的 {search}" } } ] @@ -813,7 +839,8 @@ "fr": "Langage utilisateur (code iso) {search}", "nl": "Gebruikerstaal (iso-code) {search}", "ko": "사용자 언어 (iso-code) {search}", - "it": "Lingua utente (codice iso) {search}" + "it": "Lingua utente (codice iso) {search}", + "zh_Hant": "使用者語言 (iso-代碼) {search}" } } ] @@ -835,7 +862,8 @@ "es": "Hecho con el anfitrión {search}", "nl": "Gemaakt met {search}", "ko": "호스트 {search}에 의해 만들어졌습니다", - "it": "Fatto con host {search}" + "it": "Fatto con host {search}", + "zh_Hant": "由主辦方進行 {search}" } } ] @@ -851,7 +879,8 @@ "es": "El conjunto de cambios agregó al menos una imagen", "ko": "주요 변경사항에 최소 하나의 이미지가 추가 되었습니다", "nl": "Changeset voegde minstens één afbeelding toe", - "it": "Il changeset ha aggiunto almeno un'immagine" + "it": "Il changeset ha aggiunto almeno un'immagine", + "zh_Hant": "變更集必須加至少一張照片" }, "osmTags": "add-image>0" } @@ -869,7 +898,8 @@ "es": "Excluir el tema GRB", "nl": "GRB-thema uitsluiten", "ko": "GRB 테마 제외", - "it": "Escludi il tema GRB" + "it": "Escludi il tema GRB", + "zh_Hant": "排除GRB主題" } } ] @@ -886,7 +916,8 @@ "es": "Excluir el tema de etimología", "nl": "Thema etymologie uitsluiten", "ko": "어원 테마 제외", - "it": "Escludi il tema etimologia" + "it": "Escludi il tema etimologia", + "zh_Hant": "排除詞源主題" } } ] @@ -899,7 +930,8 @@ "en": "All platforms", "cs": "Všechny platformy", "de": "Alle Plattformen", - "it": "Tutte le piattaforme" + "it": "Tutte le piattaforme", + "zh_Hant": "所有平台" }, "quesiton": "All platforms" }, @@ -908,7 +940,8 @@ "en": "Made with Android", "cs": "Vytvořeno s Androidem", "de": "Mit Android erstellt", - "it": "Fatto con Android" + "it": "Fatto con Android", + "zh_Hant": "由Android進行" }, "osmTags": "android=yes" }, @@ -917,7 +950,8 @@ "en": "Made on the web", "cs": "Vytvořeno na webu", "de": "Im Internet erstellt", - "it": "Fatto sul web" + "it": "Fatto sul web", + "zh_Hant": "由網路上進行" }, "osmTags": "android=" } @@ -940,7 +974,8 @@ "fr": "Plus de statistiques peuvent être trouvées ici", "nl": "Meer statistieken vind je hier", "ko": "추가 통계는 에서 확인할 수 있습니다", - "it": "Altre statistiche possono essere trovate qui" + "it": "Altre statistiche possono essere trovate qui", + "zh_Hant": "可以在這邊找到更多統計資訊" } }, { diff --git a/assets/themes/openlovemap/cinema.svg b/assets/themes/openlovemap/cinema.svg new file mode 100644 index 0000000000..1d9749d09b --- /dev/null +++ b/assets/themes/openlovemap/cinema.svg @@ -0,0 +1,73 @@ + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/assets/themes/openlovemap/cinema.svg.license b/assets/themes/openlovemap/cinema.svg.license new file mode 100644 index 0000000000..93c4753033 --- /dev/null +++ b/assets/themes/openlovemap/cinema.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: OSM Carto +SPDX-License-Identifier: PUBLIC-DOMAIN \ No newline at end of file diff --git a/assets/themes/openlovemap/condom.svg b/assets/themes/openlovemap/condom.svg new file mode 100644 index 0000000000..5da8b8e47d --- /dev/null +++ b/assets/themes/openlovemap/condom.svg @@ -0,0 +1,58 @@ + + diff --git a/assets/themes/openlovemap/condom.svg.license b/assets/themes/openlovemap/condom.svg.license new file mode 100644 index 0000000000..7ac182ac73 --- /dev/null +++ b/assets/themes/openlovemap/condom.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jesus Jezzini De Anda +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/openlovemap/license_info.json b/assets/themes/openlovemap/license_info.json new file mode 100644 index 0000000000..110dbcf61f --- /dev/null +++ b/assets/themes/openlovemap/license_info.json @@ -0,0 +1,22 @@ +[ + { + "path": "cinema.svg", + "license": "PUBLIC-DOMAIN", + "authors": [ + "OSM Carto" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Cinema-16.svg" + ] + }, + { + "path": "condom.svg", + "license": "CC0-1.0", + "authors": [ + " \tJesus Jezzini De Anda" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Condom_-_The_Noun_Project.svg" + ] + } +] \ No newline at end of file diff --git a/assets/themes/openlovemap/openlovemap.json b/assets/themes/openlovemap/openlovemap.json index bc7385dfbe..8910ff6b18 100644 --- a/assets/themes/openlovemap/openlovemap.json +++ b/assets/themes/openlovemap/openlovemap.json @@ -170,16 +170,11 @@ "builtin": "vending_machine", "override": { "id": "condom_vending_machine", - "pointRendering": [ + "pointRendering=": [ { "marker": [ { - "icon": "circle", - "color": "white" - }, - { - "icon": "ring", - "color": "black" + "icon": "./assets/themes/openlovemap/condom.svg" } ], "location": [ @@ -188,19 +183,6 @@ ], "iconSize": "40,40", "anchor": "center" - }, - { - "marker": [ - { - "icon": "./assets/layers/vending_machine/condom.svg" - } - ], - "location": [ - "centroid", - "point" - ], - "iconSize": "26,26", - "anchor": "center" } ], "=filter": [ @@ -252,16 +234,11 @@ ], "override": { "id": "erotic_cinema", - "pointRendering": [ + "pointRendering=": [ { "marker": [ { - "icon": "circle", - "color": "white" - }, - { - "icon": "ring", - "color": "#734a08" + "icon": "./assets/themes/openlovemap/cinema.svg" } ], "location": [ @@ -270,19 +247,6 @@ ], "iconSize": "40,40", "anchor": "center" - }, - { - "marker": [ - { - "icon": "./assets/layers/cinema/cinema.svg" - } - ], - "location": [ - "centroid", - "point" - ], - "iconSize": "26,26", - "anchor": "center" } ], "=filter": [