merge master, fixx bugs

This commit is contained in:
LiamSimons 2021-07-08 11:31:26 +02:00
commit 502f70d004
19 changed files with 724 additions and 165 deletions

View file

@ -169,7 +169,8 @@
"ru": "Материал: дерево",
"zh_Hans": "材质:木",
"nb_NO": "Materiale: tre",
"zh_Hant": "材質:木頭"
"zh_Hant": "材質:木頭",
"pt_BR": "Material: madeira"
}
},
{
@ -201,7 +202,8 @@
"ru": "Материал: камень",
"zh_Hans": "材质:石头",
"nb_NO": "Materiale: stein",
"zh_Hant": "材質:石頭"
"zh_Hant": "材質:石頭",
"pt_BR": "Material: pedra"
}
},
{
@ -217,7 +219,8 @@
"ru": "Материал: бетон",
"zh_Hans": "材质:混凝土",
"nb_NO": "Materiale: betong",
"zh_Hant": "材質:水泥"
"zh_Hant": "材質:水泥",
"pt_BR": "Material: concreto"
}
},
{
@ -233,7 +236,8 @@
"ru": "Материал: пластик",
"zh_Hans": "材质:塑料",
"nb_NO": "Materiale: plastikk",
"zh_Hant": "材質:塑膠"
"zh_Hant": "材質:塑膠",
"pt_BR": "Material: plástico"
}
},
{
@ -249,7 +253,8 @@
"ru": "Материал: сталь",
"zh_Hans": "材质:不锈钢",
"nb_NO": "Materiale: stål",
"zh_Hant": "材質:鋼鐵"
"zh_Hant": "材質:鋼鐵",
"pt_BR": "Material: aço"
}
}
],
@ -262,7 +267,8 @@
"it": "Di che materiale è fatta questa panchina?",
"zh_Hans": "这个长椅(或座椅)是用什么材料做的?",
"ru": "Из какого материала сделана скамейка?",
"zh_Hant": "這個長椅 (座位) 是什麼做的?"
"zh_Hant": "這個長椅 (座位) 是什麼做的?",
"pt_BR": "De que é feito o banco (assento)?"
}
},
{
@ -275,7 +281,8 @@
"it": "In che direzione si guarda quando si è seduti su questa panchina?",
"ru": "В каком направлении вы смотрите, когда сидите на скамейке?",
"zh_Hans": "坐在长椅上的时候你目视的方向是哪边?",
"zh_Hant": "坐在長椅時是面對那個方向?"
"zh_Hant": "坐在長椅時是面對那個方向?",
"pt_BR": "Em que direção você olha quando está sentado no banco?"
},
"render": {
"en": "When sitting on the bench, one looks towards {direction}°.",
@ -305,7 +312,8 @@
"id": "Warna: {colour}",
"zh_Hans": "颜色: {colour}",
"zh_Hant": "顏色:{colour}",
"nb_NO": "Farge: {colour}"
"nb_NO": "Farge: {colour}",
"pt_BR": "Cor: {colour}"
},
"question": {
"en": "Which colour does this bench have?",
@ -316,7 +324,8 @@
"it": "Di che colore è questa panchina?",
"ru": "Какого цвета скамейка?",
"zh_Hans": "这个长椅是什么颜色的?",
"zh_Hant": "這個長椅是什麼顏色的?"
"zh_Hant": "這個長椅是什麼顏色的?",
"pt_BR": "Qual a cor dessa bancada?"
},
"freeform": {
"key": "colour",
@ -335,7 +344,8 @@
"ru": "Цвет: коричневый",
"zh_Hans": "颜色:棕",
"zh_Hant": "顏色:棕色",
"nb_NO": "Farge: brun"
"nb_NO": "Farge: brun",
"pt_BR": "Cor: marrom"
}
},
{
@ -350,7 +360,8 @@
"ru": "Цвет: зеленый",
"zh_Hans": "颜色:绿",
"zh_Hant": "顏色:綠色",
"nb_NO": "Farge: grønn"
"nb_NO": "Farge: grønn",
"pt_BR": "Cor: verde"
}
},
{
@ -365,7 +376,8 @@
"ru": "Цвет: серый",
"zh_Hans": "颜色:灰",
"zh_Hant": "顏色:灰色",
"nb_NO": "Farge: grå"
"nb_NO": "Farge: grå",
"pt_BR": "Cor: cinza"
}
},
{
@ -380,7 +392,8 @@
"ru": "Цвет: белый",
"zh_Hans": "颜色:白",
"zh_Hant": "顏色:白色",
"nb_NO": "Farge: hvit"
"nb_NO": "Farge: hvit",
"pt_BR": "Cor: branco"
}
},
{
@ -395,7 +408,8 @@
"ru": "Цвет: красный",
"zh_Hans": "颜色:红",
"zh_Hant": "顏色:紅色",
"nb_NO": "Farge: rød"
"nb_NO": "Farge: rød",
"pt_BR": "Cor: vermelho"
}
},
{
@ -410,7 +424,8 @@
"ru": "Цвет: чёрный",
"zh_Hans": "颜色:黑",
"zh_Hant": "顏色:黑色",
"nb_NO": "Farge: svart"
"nb_NO": "Farge: svart",
"pt_BR": "Cor: preto"
}
},
{
@ -425,7 +440,8 @@
"ru": "Цвет: синий",
"zh_Hans": "颜色:蓝",
"zh_Hant": "顏色:藍色",
"nb_NO": "Farge: blå"
"nb_NO": "Farge: blå",
"pt_BR": "Cor: azul"
}
},
{
@ -440,7 +456,8 @@
"ru": "Цвет: желтый",
"zh_Hans": "颜色:黄",
"zh_Hant": "顏色:黃色",
"nb_NO": "Farge: gul"
"nb_NO": "Farge: gul",
"pt_BR": "Cor: amarelo"
}
}
]
@ -454,7 +471,8 @@
"zh_Hans": "上次对这个长椅实地调查是什么时候?",
"de": "Wann wurde diese Bank zuletzt überprüft?",
"ru": "Когда последний раз обследовали эту скамейку?",
"zh_Hant": "上一次探察長椅是什麼時候?"
"zh_Hant": "上一次探察長椅是什麼時候?",
"pt_BR": "Quando esta bancada foi pesquisada pela última vez?"
},
"render": {
"en": "This bench was last surveyed on {survey:date}",
@ -464,7 +482,8 @@
"zh_Hans": "这个长椅于 {survey:date}最后一次实地调查",
"de": "Diese Bank wurde zuletzt überprüft am {survey:date}",
"ru": "Последний раз обследование этой скамейки проводилось {survey:date}",
"zh_Hant": "這個長椅最後是在 {survey:date} 探查的"
"zh_Hant": "這個長椅最後是在 {survey:date} 探查的",
"pt_BR": "Esta bancada foi pesquisada pela última vez em {survey:date}"
},
"freeform": {
"key": "survey:date",
@ -508,7 +527,8 @@
"id": "Bangku",
"zh_Hans": "长椅",
"nb_NO": "Benk",
"zh_Hant": "長椅"
"zh_Hant": "長椅",
"pt_BR": "Banco"
},
"description": {
"en": "Add a new bench",
@ -521,7 +541,8 @@
"ru": "Добавить новую скамейку",
"zh_Hans": "增加一个新的长椅",
"nb_NO": "Legg til en ny benk",
"zh_Hant": "新增長椅"
"zh_Hant": "新增長椅",
"pt_BR": "Adicionar um novo banco"
}
}
]

View file

@ -11,7 +11,8 @@
"ru": "Скамейки на остановках общественного транспорта",
"zh_Hans": "在公交站点的长椅",
"nb_NO": "Benker",
"zh_Hant": "大眾運輸站點的長椅"
"zh_Hant": "大眾運輸站點的長椅",
"pt_BR": "Bancos em pontos de transporte público"
},
"minzoom": 14,
"source": {
@ -35,7 +36,8 @@
"id": "Bangku",
"zh_Hans": "长椅",
"nb_NO": "Benk",
"zh_Hant": "長椅"
"zh_Hant": "長椅",
"pt_BR": "Banco"
},
"mappings": [
{
@ -55,7 +57,8 @@
"it": "Panchina alla fermata del trasporto pubblico",
"ru": "Скамейка на остановке общественного транспорта",
"zh_Hans": "在公交站点的长椅",
"zh_Hant": "大眾運輸站點的長椅"
"zh_Hant": "大眾運輸站點的長椅",
"pt_BR": "Banco em ponto de transporte público"
}
},
{
@ -73,7 +76,8 @@
"it": "Panchina in un riparo",
"zh_Hans": "在庇护所的长椅",
"ru": "Скамейка в укрытии",
"zh_Hant": "涼亭內的長椅"
"zh_Hant": "涼亭內的長椅",
"pt_BR": "Banco em abrigo"
}
}
]
@ -91,7 +95,8 @@
"ru": "{name}",
"id": "{name}",
"zh_Hans": "{name}",
"zh_Hant": "{name}"
"zh_Hant": "{name}",
"pt_BR": "{name}"
},
"freeform": {
"key": "name"

View file

@ -48,7 +48,8 @@
"it": "Una struttura dove le biciclette possono essere prestate per periodi di tempo più lunghi",
"de": "Eine Einrichtung, in der Fahrräder für längere Zeit geliehen werden können",
"ru": "Учреждение, где велосипед может быть арендован на более длительный срок",
"zh_Hant": "能夠長期租用單車的設施"
"zh_Hant": "能夠長期租用單車的設施",
"pt_BR": "Uma instalação onde as bicicletas podem ser emprestadas por períodos mais longos"
},
"tagRenderings": [
"images",
@ -89,7 +90,8 @@
"ru": "Сколько стоит прокат велосипеда?",
"de": "Wie viel kostet das Ausleihen eines Fahrrads?",
"nb_NO": "Hvor mye koster det å leie en sykkel?",
"zh_Hant": "租用單車的費用多少?"
"zh_Hant": "租用單車的費用多少?",
"pt_BR": "Quanto custa um empréstimo de bicicleta?"
},
"render": {
"en": "Lending a bicycle costs {charge}",
@ -100,7 +102,8 @@
"ru": "Стоимость аренды велосипеда {charge}",
"de": "Das Ausleihen eines Fahrrads kostet {charge}",
"nb_NO": "Sykkelleie koster {charge}",
"zh_Hant": "租借單車需要 {charge}"
"zh_Hant": "租借單車需要 {charge}",
"pt_BR": "Custos de empréstimo de bicicleta {charge}"
},
"freeform": {
"key": "charge",
@ -125,7 +128,8 @@
"de": "Das Ausleihen eines Fahrrads ist kostenlos",
"ru": "Прокат велосипедов бесплатен",
"nb_NO": "Det er gratis å leie en sykkel",
"zh_Hant": "租借單車免費"
"zh_Hant": "租借單車免費",
"pt_BR": "Emprestar uma bicicleta é grátis"
}
},
{
@ -156,7 +160,8 @@
"zh_Hans": "谁可以从这里借自行车?",
"de": "Wer kann hier Fahrräder ausleihen?",
"ru": "Кто здесь может арендовать велосипед?",
"zh_Hant": "誰可以在這裡租單車?"
"zh_Hant": "誰可以在這裡租單車?",
"pt_BR": "Quem pode emprestar bicicletas aqui?"
},
"multiAnswer": true,
"mappings": [
@ -170,7 +175,8 @@
"it": "Sono disponibili biciclette per bambini",
"de": "Fahrräder für Kinder verfügbar",
"ru": "Доступны детские велосипеды",
"zh_Hant": "提供兒童單車"
"zh_Hant": "提供兒童單車",
"pt_BR": "Bicicletas para crianças disponíveis"
}
},
{
@ -182,7 +188,8 @@
"it": "Sono disponibili biciclette per adulti",
"de": "Fahrräder für Erwachsene verfügbar",
"ru": "Доступны велосипеды для взрослых",
"zh_Hant": "有提供成人單車"
"zh_Hant": "有提供成人單車",
"pt_BR": "Bicicletas para adulto disponíveis"
}
},
{
@ -194,7 +201,8 @@
"it": "Sono disponibili biciclette per disabili",
"de": "Fahrräder für Behinderte verfügbar",
"ru": "Доступны велосипеды для людей с ограниченными возможностями",
"zh_Hant": "有提供行動不便人士的單車"
"zh_Hant": "有提供行動不便人士的單車",
"pt_BR": "Bicicletas para deficientes físicos disponíveis"
}
}
]

View file

@ -7,7 +7,8 @@
"it": "Distributore automatico di camere daria per bici",
"de": "Fahrradschlauch-Automat",
"ru": "Торговый автомат для велосипедистов",
"zh_Hant": "自行車內胎自動售貨機"
"zh_Hant": "自行車內胎自動售貨機",
"pt_BR": "Máquina de venda automática de tubos de bicicleta"
},
"title": {
"render": {
@ -17,7 +18,8 @@
"it": "Distributore automatico di camere daria per bici",
"de": "Fahrradschlauch-Automat",
"ru": "Торговый автомат для велосипедистов",
"zh_Hant": "自行車內胎自動售貨機"
"zh_Hant": "自行車內胎自動售貨機",
"pt_BR": "Máquina de venda automática de tubos de bicicleta"
},
"mappings": [
{
@ -68,7 +70,8 @@
"it": "Distributore automatico di camere daria per bici",
"de": "Fahrradschlauch-Automat",
"ru": "Торговый автомат для велосипедистов",
"zh_Hant": "自行車內胎自動售貨機"
"zh_Hant": "自行車內胎自動售貨機",
"pt_BR": "Máquina de venda automática de tubos de bicicleta"
},
"tags": [
"amenity=vending_machine",
@ -89,7 +92,8 @@
"it": "Questo distributore automatico funziona ancora?",
"ru": "Этот торговый автомат все еще работает?",
"de": "Ist dieser Automat noch in Betrieb?",
"zh_Hant": "這個自動販賣機仍有運作嗎?"
"zh_Hant": "這個自動販賣機仍有運作嗎?",
"pt_BR": "Esta máquina de venda automática ainda está operacional?"
},
"render": {
"en": "The operational status is <i>{operational_status</i>",
@ -115,7 +119,8 @@
"ru": "Этот торговый автомат работает",
"zh_Hans": "这个借还机正常工作",
"de": "Dieser Automat funktioniert",
"zh_Hant": "這個自動販賣機仍運作"
"zh_Hant": "這個自動販賣機仍運作",
"pt_BR": "Esta máquina de venda automática funciona"
}
},
{
@ -129,7 +134,8 @@
"ru": "Этот торговый автомат сломан",
"zh_Hans": "这个借还机已经损坏",
"de": "Dieser Automat ist kaputt",
"zh_Hant": "這個自動販賣機沒有運作了"
"zh_Hant": "這個自動販賣機沒有運作了",
"pt_BR": "Esta máquina de venda automática está quebrada"
}
},
{
@ -143,7 +149,8 @@
"ru": "Этот торговый автомат закрыт",
"zh_Hans": "这个借还机被关闭了",
"de": "Dieser Automat ist geschlossen",
"zh_Hant": "這個自動販賣機已經關閉了"
"zh_Hant": "這個自動販賣機已經關閉了",
"pt_BR": "Esta máquina de venda automática está fechada"
}
}
]

View file

@ -6,9 +6,13 @@
"minzoom": 12,
"source": {
"osmTags": {
"or": [
"leisure=nature_reserve",
"boundary=protected_area"
"and": [
{
"or": [
"leisure=nature_reserve",
"boundary=protected_area"
]
}
]
}
},

View file

@ -0,0 +1,217 @@
{
"id": "trails",
"name": {
"nl": "paden"
},
"minzoom": 12,
"source": {
"osmTags": {
"and": [
"route=hiking"
]
}
},
"title": {
"render": {
"nl": "Paden"
},
"mappings": [
{
"if": {
"and": [
"name:nl~*"
]
},
"then": {
"nl": "{name:nl}"
}
},
{
"if": {
"and": [
"name~*"
]
},
"then": {
"nl": "{name}"
}
}
]
},
"description": {
"nl": "Paden waarlangs kan gewandeld worden"
},
"tagRenderings": [
"images",
{
"#": "Access tag",
"render": {
"nl": "De toegankelijkheid van dit gebied is: {access:description}"
},
"question": {
"nl": "Is dit gebied toegankelijk?"
},
"freeform": {
"key": "access:description"
},
"mappings": [
{
"if": {
"and": [
"access=yes",
"fee="
]
},
"then": {
"nl": "Vrij toegankelijk"
}
},
{
"if": {
"and": [
"access=no",
"fee="
]
},
"then": {
"nl": "Niet toegankelijk"
}
},
{
"if": {
"and": [
"access=private",
"fee="
]
},
"then": {
"nl": "Niet toegankelijk, want privégebied"
}
},
{
"if": {
"and": [
"access=permissive",
"fee="
]
},
"then": {
"nl": "Toegankelijk, ondanks dat het privegebied is"
}
},
{
"if": {
"and": [
"access=guided",
"fee="
]
},
"then": {
"nl": "Enkel toegankelijk met een gids of tijdens een activiteit"
}
},
{
"if": {
"and": [
"access=yes",
"fee=yes"
]
},
"then": {
"nl": "Toegankelijk mits betaling"
}
}
]
},
{
"#": "Operator tag",
"render": {
"nl": "Beheer door {operator}"
},
"question": {
"nl": "Wie beheert dit pad?"
},
"freeform": {
"key": "operator"
},
"mappings": [
{
"if": {
"and": [
"operator=Natuurpunt"
]
},
"then": {
"nl": "<img src=\"./assets/themes/buurtnatuur/Natuurpunt.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door Natuurpunt"
}
},
{
"if": {
"and": [
"operator~(n|N)atuurpunt.*"
]
},
"then": {
"nl": "<img src=\"./assets/themes/buurtnatuur/Natuurpunt.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door {operator}"
},
"hideInAnswer": true
},
{
"if": {
"and": [
"operator=Agentschap Natuur en Bos"
]
},
"then": {
"nl": "<img src=\"./assets/themes/buurtnatuur/ANB.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door het Agentschap Natuur en Bos"
}
}
]
},
{
"#": "Name:nl-tag",
"render": {
"nl": "Dit gebied heet {name:nl}"
},
"question": {
"nl": "Wat is de Nederlandstalige naam van dit gebied?"
},
"freeform": {
"key": "name:nl"
},
"condition": {
"and": [
"name:nl~*"
]
}
}
],
"hideUnderlayingFeaturesMinPercentage": 10,
"wayHandling": 2,
"icon": {
"render": "./assets/themes/buurtnatuur/nature_reserve.svg"
},
"width": {
"render": "5"
},
"iconSize": {
"render": "50,50,center"
},
"color": {
"render": "#3c3"
},
"presets": [
{
"tags": [
"leisure=nature_reserve",
"fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
],
"title": {
"nl": "Paden"
},
"description": {
"nl": "Voeg een ontbrekend, erkend pad toe."
}
}
]
}

View file

@ -12,7 +12,10 @@
"nl": "Op deze kaart vind je alle natuurgebieden die Natuurpunt ter beschikking stelt",
"en": "On this map you can find all the nature reserves that Natuurpunt offers "
},
"language": ["nl", "en"],
"language": [
"nl",
"en"
],
"maintainer": "",
"icon": "./assets/themes/natuurpunt/natuurpunt.png",
"version": "0",
@ -21,8 +24,32 @@
"startZoom": 12,
"widenFactor": 0.05,
"socialImage": "",
"layers": [
"nature_reserve",
{
"builtin": "nature_reserve",
"override": {
"source": {
"osmTags": {
"+and": [
"operator~.*[nN]atuurpunt.*"
]
}
}
}
},
{
"builtin": "trails",
"override": {
"source": {
"osmTags": {
"+and": [
"operator~.*[nN]atuurpunt.*"
]
}
}
}
},
"drinking_water",
"bench",
"bench_at_pt",

View file

@ -1,10 +1,10 @@
[
{
"authors": [],
"path": "waste_basket.svg",
"license": "CC0",
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Waste-basket-12.svg"
]
}
]
{
"authors": [],
"path": "waste_basket.svg",
"license": "CC0",
"sources": [
"https://wiki.openstreetmap.org/wiki/File:Waste-basket-12.svg"
]
}
]

View file

@ -41,20 +41,7 @@
"render": {
"en": "Waste Basket",
"nl": "Vuilnisbak"
},
"mappings": [
{
"if": {
"and": [
"amenity=waste_basket"
]
},
"then": {
"en": "Waste Basket",
"nl": "Vuilnisbak"
}
}
]
}
},
"description": {
"en": "This is a public waste basket, thrash can, where you can throw away your thrash.",
@ -63,20 +50,7 @@
"tagRenderings": [],
"hideUnderlayingFeaturesMinPercentage": 0,
"icon": {
"render": "./assets/layers/toilet/urinal.svg",
"mappings": [
{
"if": {
"and": [
"amenity=waste_basket"
]
},
"then": {
"en": "Waste Basket",
"nl": "Vuilnisbak"
}
}
]
"render": "./assets/themes/waste_basket/waste_basket.svg"
},
"width": {
"render": "8"
@ -95,27 +69,27 @@
"nl": "Vuilnisbak"
}
}
]
},
"color": {
"render": "#00f"
},
"presets": [
{
"tags": [
"amenity=waste_basket"
],
"title": {
"en": "Waste Basket",
"nl": "Vuilnisbak"
},
"description": {
"en": "Throw away waste",
"nl": "Afval weggooien"
}
}
]
}
],
"roamingRenderings": []
}
},
"color": {
"render": "#00f"
},
"presets": [
{
"tags": [
"amenity=waste_basket"
],
"title": {
"en": "Waste Basket",
"nl": "Vuilnisbak"
},
"description": {
"en": "Throw away waste",
"nl": "Afval weggooien"
}
}
]
}
],
"roamingRenderings": []
}