Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-07-16 01:43:24 +02:00
commit 93ae7441d1
98 changed files with 2446 additions and 725 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/themes/artwork/artwork.json
View file

@ -374,7 +374,7 @@
"en": "Is there a website with more information about this artwork?",
"nl": "Op welke website kan men meer informatie vinden over dit kunstwerk?",
"fr": "Sur quel site web pouvons-nous trouver plus d'informations sur cette œuvre d'art?",
"de": "Auf welcher Website gibt es mehr Informationen über dieses Kunstwerk?",
"de": "Gibt es eine Website mit weiteren Informationen über dieses Kunstwerk?",
"it": "Esiste un sito web con maggiori informazioni su quest’opera?",
"ru": "Есть ли сайт с более подробной информацией об этой работе?",
"ja": "この作品についての詳しい情報はどのウェブサイトにありますか?",

6
assets/themes/bicycle_library/bicycle_library.json
View file

@ -10,7 +10,8 @@
"ja",
"fr",
"zh_Hant",
"nb_NO"
"nb_NO",
"de"
],
"title": {
"en": "Bicycle libraries",
@ -20,7 +21,8 @@
"ja": "自転車ライブラリ",
"fr": "Vélothèques",
"zh_Hant": "單車圖書館",
"nb_NO": "Sykkelbibliotek"
"nb_NO": "Sykkelbibliotek",
"de": "Fahrradbibliothek"
},
"description": {
"nl": "Een fietsbibliotheek is een plaats waar men een fiets kan lenen, vaak voor een klein bedrag per jaar. Een typisch voorbeeld zijn kinderfietsbibliotheken, waar men een fiets op maat van het kind kan lenen. Is het kind de fiets ontgroeid, dan kan het te kleine fietsje omgeruild worden voor een grotere.",

39
assets/themes/campersites/campersites.json
View file

@ -23,7 +23,8 @@
"it": "Questo sito raccoglie tutti i luoghi ufficiali dove sostare con il camper e aree dove è possibile scaricare acque grigie e nere. Puoi aggiungere dettagli riguardanti i servizi forniti e il loro costo. Aggiungi foto e recensioni. Questo è al contempo un sito web e una web app. I dati sono memorizzati su OpenStreetMap in modo tale che siano per sempre liberi e riutilizzabili da qualsiasi app.",
"ru": "На этом сайте собраны все официальные места остановки кемперов и места, где можно сбросить серую и черную воду. Вы можете добавить подробную информацию о предоставляемых услугах и их стоимости. Добавлять фотографии и отзывы. Это веб-сайт и веб-приложение. Данные хранятся в OpenStreetMap, поэтому они будут бесплатными всегда и могут быть повторно использованы любым приложением.",
"ja": "このWebサイトでは、すべてのキャンピングカーの公式停車場所と、汚水を捨てることができる場所を収集します。提供されるサービスとコストに関する詳細を追加できます。写真とレビューを追加します。これはウェブサイトとウェブアプリです。データはOpenStreetMapに保存されるので、永遠に無料で、どんなアプリからでも再利用できます。",
"zh_Hant": "這個網站收集所有官方露營地點，以及那邊能排放廢水。你可以加上詳細的服務項目與價格，加上圖片以及評價。這是網站與網路 app，資料則是存在開放街圖，因此會永遠免費，而且可以被所有 app 再利用。"
"zh_Hant": "這個網站收集所有官方露營地點，以及那邊能排放廢水。你可以加上詳細的服務項目與價格，加上圖片以及評價。這是網站與網路 app，資料則是存在開放街圖，因此會永遠免費，而且可以被所有 app 再利用。",
"nl": "Deze website verzamelt en toont alle officiële plaatsen waar een camper mag overnachten en afvalwater kan lozen. Ook jij kan extra gegevens toevoegen, zoals welke services er geboden worden en hoeveel dit kot, ook afbeeldingen en reviews kan je toevoegen. De data wordt op OpenStreetMap opgeslaan en is dus altijd gratis te hergebruiken, ook door andere applicaties."
},
"language": [
"en",
@ -53,7 +54,8 @@
"ru": "Площадки для кемпинга",
"ja": "キャンプサイト",
"fr": "Campings",
"zh_Hant": "露營地"
"zh_Hant": "露營地",
"nl": "Camperplaatsen"
},
"minzoom": 10,
"source": {
@ -71,7 +73,8 @@
"ru": "Место для кемпинга {name}",
"ja": "キャンプサイト {name}",
"fr": "Camping {name}",
"zh_Hant": "露營地 {name}"
"zh_Hant": "露營地 {name}",
"nl": "Camperplaats {name}"
},
"mappings": [
{
@ -86,7 +89,8 @@
"ru": "Место для кемпинга без названия",
"ja": "無名のキャンプサイト",
"fr": "Camping sans nom",
"zh_Hant": "沒有名稱的露營地"
"zh_Hant": "沒有名稱的露營地",
"nl": "Camper site"
}
}
]
@ -97,7 +101,8 @@
"ru": "площадки для кемпинга",
"ja": "キャンプサイト",
"fr": "campings",
"zh_Hant": "露營地"
"zh_Hant": "露營地",
"nl": "camperplaatsen"
},
"tagRenderings": [
"images",
@ -108,7 +113,8 @@
"ru": "Это место называется {name}",
"ja": "この場所は {name} と呼ばれています",
"fr": "Cet endroit s'appelle {nom}",
"zh_Hant": "這個地方叫做 {name}"
"zh_Hant": "這個地方叫做 {name}",
"nl": "Deze plaats heet {name}"
},
"question": {
"en": "What is this place called?",
@ -117,7 +123,8 @@
"it": "Come viene chiamato questo luogo?",
"ja": "ここは何というところですか?",
"fr": "Comment s'appelle cet endroit ?",
"zh_Hant": "這個地方叫做什麼？"
"zh_Hant": "這個地方叫做什麼？",
"nl": "Wat is de naam van deze plaats?"
},
"freeform": {
"key": "name"
@ -130,7 +137,8 @@
"ru": "Взимается ли в этом месте плата?",
"ja": "ここは有料ですか?",
"fr": "Cet endroit est-il payant ?",
"zh_Hant": "這個地方收費嗎？"
"zh_Hant": "這個地方收費嗎？",
"nl": "Moet men betalen om deze camperplaats te gebruiken?"
},
"mappings": [
{
@ -144,7 +152,8 @@
"it": "Devi pagare per usarlo",
"ru": "За использование нужно платить",
"ja": "使用料を支払う必要がある",
"zh_Hant": "你要付費才能使用"
"zh_Hant": "你要付費才能使用",
"nl": "Gebruik is betalend"
}
},
{
@ -162,7 +171,8 @@
"ja": "無料で使用可能",
"fr": "Peut être utilisé gratuitement",
"nb_NO": "Kan brukes gratis",
"zh_Hant": "可以免費使用"
"zh_Hant": "可以免費使用",
"nl": "Kan gratis gebruikt worden"
}
},
{
@ -179,7 +189,8 @@
"ru": "Это место взимает {charge}",
"ja": "この場所は{charge} が必要",
"nb_NO": "Dette stedet tar {charge}",
"zh_Hant": "這個地方收費 {charge}"
"zh_Hant": "這個地方收費 {charge}",
"nl": "Deze plaats vraagt {charge}"
},
"question": {
"en": "How much does this place charge?",
@ -188,7 +199,8 @@
"ja": "ここはいくらかかりますか？",
"fr": "Combien coûte cet endroit ?",
"nb_NO": "pø",
"zh_Hant": "這個地方收多少費用？"
"zh_Hant": "這個地方收多少費用？",
"nl": "Hoeveel kost deze plaats?"
},
"freeform": {
"key": "charge"
@ -774,7 +786,8 @@
"question": {
"en": "Who can use this dump station?",
"ja": "このゴミ捨て場は誰が使えるんですか?",
"it": "Chi può utilizzare questo luogo di sversamento?"
"it": "Chi può utilizzare questo luogo di sversamento?",
"ru": "Кто может использовать эту станцию утилизации?"
},
"mappings": [
{

13
assets/themes/charging_stations/charging_stations.json
View file

@ -6,7 +6,8 @@
"ru": "Зарядные станции",
"ja": "充電ステーション",
"zh_Hant": "充電站",
"it": "Stazioni di ricarica"
"it": "Stazioni di ricarica",
"nl": "Oplaadpunten"
},
"shortDescription": {
"en": "A worldwide map of charging stations",
@ -29,6 +30,7 @@
"ja",
"zh_Hant",
"it",
"nl",
"nb_NO"
],
"maintainer": "",
@ -48,7 +50,8 @@
"ja": "充電ステーション",
"zh_Hant": "充電站",
"nb_NO": "Ladestasjoner",
"it": "Stazioni di ricarica"
"it": "Stazioni di ricarica",
"nl": "Oplaadpunten"
},
"minzoom": 10,
"source": {
@ -65,7 +68,8 @@
"ja": "充電ステーション",
"zh_Hant": "充電站",
"nb_NO": "Ladestasjon",
"it": "Stazione di ricarica"
"it": "Stazione di ricarica",
"nl": "Oplaadpunt"
}
},
"description": {
@ -74,7 +78,8 @@
"ja": "充電ステーション",
"zh_Hant": "充電站",
"nb_NO": "En ladestasjon",
"it": "Una stazione di ricarica"
"it": "Una stazione di ricarica",
"nl": "Een oplaadpunt"
},
"tagRenderings": [
"images",

13
assets/themes/climbing/climbing.json
View file

@ -547,7 +547,12 @@
}
},
{
"if": "climbing=site",
"if": {
"or": [
"climbing=site",
"climbing=area"
]
},
"then": {
"en": "Climbing site",
"nl": "Klimsite"
@ -727,7 +732,7 @@
"_contained_climbing_route_ids=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').map(p => p.id)",
"_difficulty_hist=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').map(p => p['climbing:grade:french'])",
"_length_hist=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').map(p => p['climbing:length'])",
"_contained_climbing_routes_count=JSON.parse(_contained_climbing_routes).length"
"_contained_climbing_routes_count=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').length"
]
},
{
@ -1400,8 +1405,8 @@
"_embedding_feature_properties=feat.overlapWith('climbing').map(f => f.feat.properties).filter(p => p !== undefined).map(p => {return{access: p.access, id: p.id, name: p.name, climbing: p.climbing, 'access:description': p['access:description']}})",
"_embedding_features_with_access=JSON.parse(feat.properties._embedding_feature_properties ?? '[]').filter(p => p.access !== undefined)[0]",
"_embedding_feature_with_rock=JSON.parse(feat.properties._embedding_feature_properties ?? '[]').filter(p => p.rock !== undefined)[0] ?? '{}'",
"_embedding_features_with_rock:rock=JSON.parse(_embedding_feature_with_rock)?.rock",
"_embedding_features_with_rock:id=JSON.parse(_embedding_feature_with_rock)?.id",
"_embedding_features_with_rock:rock=JSON.parse(feat.properties._embedding_feature_with_rock ?? '{}')?.rock",
"_embedding_features_with_rock:id=JSON.parse(feat.properties._embedding_feature_with_rock ?? '{}')?.id",
"_embedding_feature:access=JSON.parse(feat.properties._embedding_features_with_access ?? '{}').access",
"_embedding_feature:access:description=JSON.parse(feat.properties._embedding_features_with_access ?? '{}')['access:description']",
"_embedding_feature:id=JSON.parse(feat.properties._embedding_features_with_access ?? '{}').id"

12
assets/themes/openwindpowermap/license_info.json Normal file
View file

@ -0,0 +1,12 @@
[
{
"authors": [
"Iconathon"
],
"path": "wind_turbine.svg",
"license": "CC0",
"sources": [
"https://commons.wikimedia.org/wiki/File:Wind_Turbine_(2076)_-_The_Noun_Project.svg"
]
}
]

204
assets/themes/openwindpowermap/openwindpowermap.json Normal file
View file

@ -0,0 +1,204 @@
{
"id": "openwindpowermap",
"title": {
"en": "OpenWindPowerMap"
},
"maintainer": "Seppe Santens",
"icon": "./assets/themes/openwindpowermap/wind_turbine.svg",
"description": {
"en": "A map for showing and editing wind turbines."
},
"language": [
"en",
"nl"
],
"version": "2021-06-18",
"startLat": 50.52,
"startLon": 4.643,
"startZoom": 8,
"clustering": {
"maxZoom": 8
},
"layers": [
{
"id": "windturbine",
"name": {
"en": "wind turbine"
},
"source": {
"osmTags": "generator:source=wind"
},
"minzoom": 10,
"wayHandling": 1,
"title": {
"render": {
"en": "wind turbine"
},
"mappings": [
{
"if": "name~*",
"then": {
"en": "{name}"
}
}
]
},
"icon": "./assets/themes/openwindpowermap/wind_turbine.svg",
"iconSize": "40, 40, bottom",
"label": {
"mappings": [
{
"if": "generator:output:electricity~^[0-9]+.*[W]$",
"then": "<div style='background-color: rgba(0,0,0,0.3); color: white; font-size: 8px; padding: 0.25em; border-radius:0.5em'>{generator:output:electricity}</div>"
}
]
},
"tagRenderings": [
{
"render": {
"en": "The power output of this wind turbine is {generator:output:electricity}."
},
"question": {
"en": "What is the power output of this wind turbine? (e.g. 2.3 MW)"
},
"freeform": {
"key": "generator:output:electricity",
"type": "pfloat"
}
},
{
"render": {
"en": "This wind turbine is operated by {operator}."
},
"question": {
"en": "Who operates this wind turbine?"
},
"freeform": {
"key": "operator"
}
},
{
"render": {
"en": "The total height (including rotor radius) of this wind turbine is {height} metres."
},
"question": {
"en": "What is the total height of this wind turbine (including rotor radius), in metres?"
},
"freeform": {
"key": "height",
"type": "pfloat"
}
},
{
"render": {
"en": "The rotor diameter of this wind turbine is {rotor:diameter} metres."
},
"question": {
"en": "What is the rotor diameter of this wind turbine, in metres?"
},
"freeform": {
"key": "rotor:diameter",
"type": "float"
}
},
{
"render": {
"en": "This wind turbine went into operation on/in {start_date}."
},
"question": {
"en": "When did this wind turbine go into operation?"
},
"freeform": {
"key": "start_date",
"type": "date"
}
},
"images"
],
"presets": [
{
"tags": [
"power=generator",
"generator:source=wind"
],
"title": {
"en": "wind turbine"
}
}
]
}
],
"units": [
{
"appliesToKey": [
"generator:output:electricity"
],
"applicableUnits": [
{
"canonicalDenomination": "MW",
"alternativeDenomination": [
"megawatts",
"megawatt"
],
"human": {
"en": " megawatts",
"nl": " megawatt"
}
},
{
"canonicalDenomination": "kW",
"alternativeDenomination": [
"kilowatts",
"kilowatt"
],
"human": {
"en": " kilowatts",
"nl": " kilowatt"
}
},
{
"canonicalDenomination": "W",
"alternativeDenomination": [
"watts",
"watt"
],
"human": {
"en": " watts",
"nl": " watt"
}
},
{
"canonicalDenomination": "GW",
"alternativeDenomination": [
"gigawatts",
"gigawatt"
],
"human": {
"en": " gigawatts",
"nl": " gigawatt"
}
}
],
"eraseInvalidValues": true
},
{
"appliesToKey": [
"height",
"rotor:diameter"
],
"applicableUnits": [
{
"canonicalDenomination": "m",
"alternativeDenomination": [
"meter"
],
"human": {
"en": " meter",
"nl": " meter"
}
}
]
}
],
"defaultBackgroundId": "CartoDB.Voyager"
}

4
assets/themes/openwindpowermap/wind_turbine.svg Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 58.391 100" enable-background="new 0 0 58.391 100" xml:space="preserve"><circle cx="38.721" cy="33.621" r="4.148"></circle><path d="M45.875,29.436C57.268,8.877,59.217,0.677,58.122,0.045c-1.091-0.631-7.217,5.15-19.313,25.282
C41.822,25.359,44.447,27.003,45.875,29.436z"></path><path d="M30.424,33.621c0-1.486,0.397-2.879,1.083-4.087C8.059,29.949,0,32.359,0,33.621c0,1.261,8.058,3.672,31.505,4.086
C30.821,36.5,30.424,35.108,30.424,33.621z"></path><path d="M45.884,37.794c-1.424,2.436-4.046,4.083-7.061,4.119C50.911,62.021,57.03,67.798,58.124,67.167
C59.217,66.535,57.271,58.34,45.884,37.794z"></path><path d="M34.573,42.889v1.795V100h8.297V56.07C40.49,52.552,37.745,48.22,34.573,42.889z"></path></svg>
Side by side

After

Width:  |  Height:  |  Size: 965 B

37
assets/themes/shops/shops.json
View file

@ -23,6 +23,7 @@
"ja",
"zh_Hant",
"ru",
"nl",
"ca",
"id"
],
@ -41,7 +42,8 @@
"en": "Shop",
"fr": "Magasin",
"ru": "Магазин",
"ja": "店"
"ja": "店",
"nl": "Winkel"
},
"minzoom": 16,
"source": {
@ -56,7 +58,8 @@
"en": "Shop",
"fr": "Magasin",
"ru": "Магазин",
"ja": "店"
"ja": "店",
"nl": "Winkel"
},
"mappings": [
{
@ -90,7 +93,8 @@
"description": {
"en": "A shop",
"fr": "Un magasin",
"ja": "ショップ"
"ja": "ショップ",
"nl": "Een winkel"
},
"tagRenderings": [
"images",
@ -99,7 +103,8 @@
"en": "What is the name of this shop?",
"fr": "Qu'est-ce que le nom de ce magasin?",
"ru": "Как называется магазин?",
"ja": "このお店の名前は何ですか?"
"ja": "このお店の名前は何ですか?",
"nl": "Wat is de naam van deze winkel?"
},
"render": "This shop is called <i>{name}</i>",
"freeform": {
@ -143,7 +148,8 @@
"en": "Supermarket",
"fr": "Supermarché",
"ru": "Супермаркет",
"ja": "スーパーマーケット"
"ja": "スーパーマーケット",
"nl": "Supermarkt"
}
},
{
@ -169,7 +175,8 @@
"en": "Hairdresser",
"fr": "Coiffeur",
"ru": "Парикмахерская",
"ja": "理容師"
"ja": "理容師",
"nl": "Kapper"
}
},
{
@ -181,7 +188,8 @@
"then": {
"en": "Bakery",
"fr": "Boulangerie",
"ja": "ベーカリー"
"ja": "ベーカリー",
"nl": "Bakkerij"
}
},
{
@ -223,7 +231,8 @@
"question": {
"en": "What is the phone number?",
"fr": "Quel est le numéro de téléphone ?",
"ja": "電話番号は何番ですか?"
"ja": "電話番号は何番ですか?",
"nl": "Wat is het telefoonnummer?"
},
"freeform": {
"key": "phone",
@ -242,7 +251,8 @@
"question": {
"en": "What is the website of this shop?",
"fr": "Quel est le site internet de ce magasin ?",
"ja": "このお店のホームページは何ですか?"
"ja": "このお店のホームページは何ですか?",
"nl": "Wat is de website van deze winkel?"
},
"freeform": {
"key": "website",
@ -277,7 +287,8 @@
"question": {
"en": "What are the opening hours of this shop?",
"fr": "Quels sont les horaires d'ouverture de ce magasin ?",
"ja": "この店の営業時間は何時から何時までですか?"
"ja": "この店の営業時間は何時から何時までですか?",
"nl": "Wat zijn de openingsuren van deze winkel?"
},
"freeform": {
"key": "opening_hours",
@ -316,13 +327,15 @@
"en": "Shop",
"fr": "Magasin",
"ru": "Магазин",
"ja": "店"
"ja": "店",
"nl": "Winkel"
},
"description": {
"en": "Add a new shop",
"fr": "Ajouter un nouveau magasin",
"ru": "Добавить новый магазин",
"ja": "新しい店を追加する"
"ja": "新しい店を追加する",
"nl": "Voeg een nieuwe winkel toe"
}
}
],