contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge master, fix translations

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-11-07 15:44:22 +01:00
parent 37231969e6
commit e237d84436
44 changed files with 4865 additions and 4059 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -159,25 +159,6 @@
"phone",
"opening_hours"
],
"icon": {
"render": "./assets/themes/climbing/club.svg"
},
"iconOverlays": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
}
],
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#00f"
},
"presets": [
{
"tags": [
@ -228,7 +209,25 @@
}
}
],
"wayHandling": 1
"mapRendering": [
{
"icon": {
"render": "./assets/themes/climbing/club.svg"
},
"iconBadges": [
{
"if": "opening_hours~*",
"then": "isOpen"
}
],
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
]
},
{
"id": "climbing_gym",
@ -318,21 +317,25 @@
"opening_hours",
"reviews"
],
"icon": {
"render": "./assets/themes/climbing/climbing_gym.svg"
},
"iconOverlays": [
"mapRendering": [
{
"if": "opening_hours~*",
"then": "isOpen",
"badge": true
"icon": {
"render": "./assets/themes/climbing/climbing_gym.svg"
},
"iconBadges": [
{
"if": "opening_hours~*",
"then": "isOpen"
}
],
"iconSize": {
"render": "40,40,center"
},
"location": [
"point"
]
}
],
"width": "0",
"iconSize": {
"render": "40,40,center"
},
"wayHandling": 1
]
},
{
"id": "climbing_route",
@ -539,18 +542,6 @@
},
"reviews"
],
"icon": {
"render": "circle:white;./assets/themes/climbing/climbing_route.svg"
},
"width": {
"render": "4"
},
"iconSize": {
"render": "28,28,center"
},
"color": {
"render": "#0f0"
},
"presets": [
{
"title": {
@ -566,7 +557,28 @@
]
}
],
"wayHandling": 2
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/climbing/climbing_route.svg"
},
"iconSize": {
"render": "28,28,center"
},
"location": [
"point",
"centroid"
]
},
{
"color": {
"render": "#0f0"
},
"width": {
"render": "4"
}
}
]
},
{
"id": "climbing",
@ -810,18 +822,6 @@
},
"reviews"
],
"icon": {
"render": "./assets/themes/climbing/climbing_no_rope.svg"
},
"width": {
"render": "8"
},
"iconSize": {
"render": "40,40,center"
},
"color": {
"render": "#d38d5fAA"
},
"presets": [
{
"tags": [
@ -847,7 +847,6 @@
}
}
],
"wayHandling": 2,
"calculatedTags": [
"_contained_climbing_routes_properties=feat.overlapWith('climbing_route').map(f => f.feat.properties).map(p => {return {id: p.id, name: p.name, 'climbing:grade:french': p['climbing:grade:french'], 'climbing:length': p['climbing:length']} })",
"_contained_climbing_routes=JSON.parse(feat.properties._contained_climbing_routes_properties ?? '[]').map(p => `<li><a href='#${p.id}'>${p.name ?? 'climbing route'}</a> (<b>${p['climbing:grade:french'] ?? 'unknown difficulty'}</b>, ${p['climbing:length'] ?? 'unkown length'} meter)</li>`).join('')",
@ -855,6 +854,28 @@
"_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(feat.properties._contained_climbing_routes_properties ?? '[]').length"
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/climbing/climbing_no_rope.svg"
},
"iconSize": {
"render": "40,40,center"
},
"location": [
"point",
"centroid"
]
},
{
"color": {
"render": "#d38d5fAA"
},
"width": {
"render": "8"
}
}
]
},
{
@ -985,14 +1006,22 @@
]
}
],
"icon": "./assets/themes/climbing/climbing_unknown.svg",
"width": {
"render": "2"
},
"color": {
"render": "#ddff55AA"
},
"wayHandling": 0
"mapRendering": [
{
"icon": "./assets/themes/climbing/climbing_unknown.svg",
"location": [
"point"
]
},
{
"color": {
"render": "#ddff55AA"
},
"width": {
"render": "2"
}
}
]
}
],
"overrideAll": {

77
assets/themes/cyclestreets/cyclestreets.json
View file

@ -85,11 +85,20 @@
"de": "Eine Fahrradstraße ist eine Straße, auf der motorisierter Verkehr einen Radfahrer nicht überholen darf"
},
"title": "{name}",
"icon": "./assets/themes/cyclestreets/F111.svg",
"color": "#0000ff",
"width": "10",
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F111.svg",
"location": [
"point"
]
},
{
"color": "#0000ff",
"width": "10"
}
]
},
{
@ -112,7 +121,6 @@
"nb_NO": "Denne gaten vil bli sykkelgate snart"
},
"minzoom": 9,
"wayHandling": 0,
"source": {
"osmTags": "proposed:cyclestreet=yes"
},
@ -139,11 +147,20 @@
}
]
},
"icon": "./assets/themes/cyclestreets/F113.svg",
"color": "#09f9dd",
"width": "5",
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/themes/cyclestreets/F113.svg",
"location": [
"point"
]
},
{
"color": "#09f9dd",
"width": "5"
}
]
},
{
@ -176,7 +193,6 @@
}
},
"minzoom": 18,
"wayHandling": 0,
"title": {
"render": {
"nl": "Straat",
@ -195,23 +211,32 @@
}
]
},
"icon": "./assets/svg/pencil.svg",
"width": "5",
"color": {
"render": "#aaaaaa",
"mappings": [
{
"then": "#0000ff",
"if": "cyclestreet=yes"
},
{
"then": "#09f9dd",
"if": "proposed:cyclestreet=yes"
}
]
},
"tagRenderings": [
"images"
],
"mapRendering": [
{
"icon": "./assets/svg/pencil.svg",
"location": [
"point"
]
},
{
"color": {
"render": "#aaaaaa",
"mappings": [
{
"then": "#0000ff",
"if": "cyclestreet=yes"
},
{
"then": "#09f9dd",
"if": "proposed:cyclestreet=yes"
}
]
},
"width": "5"
}
]
}
],
@ -221,8 +246,8 @@
{
"id": "is_cyclestreet",
"question": {
"nl": "Is deze straat een fietsstraat?",
"en": "Is this street a cyclestreet?",
"nl": "Is de straat <b>{name}</b> een fietsstraat?",
"en": "Is the street <b>{name}</b> a cyclestreet?",
"ja": "この通りはcyclestreetですか?",
"nb_NO": "Er denne gaten en sykkelvei?",
"de": "Ist diese Straße eine Fahrradstraße?",
@ -255,7 +280,7 @@
]
},
"then": {
"nl": "Deze straat i een fietsstraat",
"nl": "Deze straat is een fietsstraat",
"en": "This street is a cyclestreet",
"ja": "この通りはcyclestreetだ",
"nb_NO": "Denne gaten er en sykkelvei",

138
assets/themes/facadegardens/facadegardens.json
View file

@ -87,44 +87,12 @@
"de": "Fassadengärten",
"it": "Giardini verticali"
},
"iconOverlays": [
{
"if": "plant~.*vine.*",
"then": "circle:white;./assets/themes/facadegardens/klimplant.svg",
"badge": true
},
{
"if": "plant~.*groundcover.*",
"then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg",
"badge": true
},
{
"if": "edible=true",
"then": "circle:white;./assets/themes/facadegardens/eetbaar.svg",
"badge": true
},
{
"if": "rain_barel=yes",
"then": "circle:white;./assets/themes/facadegardens/gevelton.svg",
"badge": true
},
{
"if": "plant~.*shrub.*",
"then": "circle:white;./assets/themes/facadegardens/struik.svg",
"badge": true
},
{
"if": "plant~.*flower.*",
"then": "circle:white;./assets/themes/facadegardens/bloei.svg",
"badge": true
}
],
"tagRenderings": [
"images",
{
"render": {
"nl": "Oriëntatie: {direction} (waarbij 0=N en 90=O)",
"en": "Orientation: {direction} (where 0=N and 90=E)",
"en": "Orientation: {direction} (where 0=N and 90=O)",
"ja": "方向: {direction} (0=N で 90=O)",
"fr": "Orientation : {direction} (0 pour le Nord et 90 pour l’Ouest)",
"de": "Ausrichtung: {direction} (wobei 0=N und 90=O)",
@ -402,44 +370,6 @@
"id": "facadegardens-description"
}
],
"icon": {
"render": "circle:white;./assets/themes/facadegardens/geveltuin.svg",
"mappings": [
{
"if": {
"and": [
"direct_sunlight=yes"
]
},
"then": "circle:white;./assets/themes/facadegardens/zon.svg"
},
{
"if": {
"and": [
"direct_sunlight=partial"
]
},
"then": "circle:white;./assets/themes/facadegardens/halfzon.svg"
},
{
"if": {
"and": [
"direct_sunlight=no"
]
},
"then": "circle:white;./assets/themes/facadegardens/schaduw.svg"
}
]
},
"width": {
"render": "8"
},
"iconSize": {
"render": "50,50,center"
},
"color": {
"render": "#00f"
},
"presets": [
{
"tags": [
@ -464,7 +394,71 @@
}
}
],
"wayHandling": 1
"mapRendering": [
{
"icon": {
"render": "circle:white;./assets/themes/facadegardens/geveltuin.svg",
"mappings": [
{
"if": {
"and": [
"direct_sunlight=yes"
]
},
"then": "circle:white;./assets/themes/facadegardens/zon.svg"
},
{
"if": {
"and": [
"direct_sunlight=partial"
]
},
"then": "circle:white;./assets/themes/facadegardens/halfzon.svg"
},
{
"if": {
"and": [
"direct_sunlight=no"
]
},
"then": "circle:white;./assets/themes/facadegardens/schaduw.svg"
}
]
},
"iconBadges": [
{
"if": "plant~.*vine.*",
"then": "circle:white;./assets/themes/facadegardens/klimplant.svg"
},
{
"if": "plant~.*groundcover.*",
"then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg"
},
{
"if": "edible=true",
"then": "circle:white;./assets/themes/facadegardens/eetbaar.svg"
},
{
"if": "rain_barel=yes",
"then": "circle:white;./assets/themes/facadegardens/gevelton.svg"
},
{
"if": "plant~.*shrub.*",
"then": "circle:white;./assets/themes/facadegardens/struik.svg"
},
{
"if": "plant~.*flower.*",
"then": "circle:white;./assets/themes/facadegardens/bloei.svg"
}
],
"iconSize": {
"render": "50,50,center"
},
"location": [
"point"
]
}
]
}
]
}

133
assets/themes/hailhydrant/hailhydrant.json
View file

@ -23,7 +23,7 @@
"ja": "このマップでは、お気に入りの近隣にある消火栓、消防署、救急ステーション、消火器を検索して更新できます。\n\n正確な位置を追跡し(モバイルのみ)、左下コーナーで関連するレイヤを選択できます。このツールを使用して、マップにピン(注視点)を追加または編集したり、利用可能な質問に答えることによって追加の詳細を提供することもできます。\n\nすべての変更は自動的にOpenStreetMapのグローバルデータベースに保存され、他のユーザが自由に再利用できます。",
"zh_Hant": "在這份地圖上面你可以在你喜愛的社區尋找與更新消防栓、消防隊、急救站與滅火器。\n\n你可以追蹤確切位置 (只有行動版) 以及在左下角選擇與你相關的圖層。你也可以使用這工具新增或編輯地圖上的釘子 (興趣點)，以及透過回答一些問題提供額外的資訊。\n\n所有你做出的變動都會自動存到開放街圖這個全球資料庫，而且能自由讓其他人取用。",
"fr": "Sur cette carte on trouve et met à jour les bornes incendies, extincteurs, casernes de pompiers et ambulanciers dans son quartier.<br/>Les options en haut à gauche permettent de localiser sa position (sur téléphone) et de filtrer les éléments. Il est possible d’utiliser cet outil pour ajouter et éditer les points d’intérêt de la carte et d’y ajouter des détails en répondant aux questions.<br/>Toutes les modifications sont automatiquement enregistrées dans la base de données OpenStreetMap et peuvent êtres librement réutilisées par d’autres.",
"de": "Auf dieser Karte können Sie Hydranten, Feuerwachen, Krankenwagen und Feuerlöscher in Ihren bevorzugten Stadtvierteln finden und aktualisieren.\n\nSie können Ihren genauen Standort verfolgen (nur mobil) und in der unteren linken Ecke die für Sie relevanten Ebenen auswählen. Sie können mit diesem Tool auch Pins (Points of Interest) zur Karte hinzufügen oder bearbeiten und durch die Beantwortung verfügbarer Fragen zusätzliche Angaben machen.\n\nAlle von Ihnen vorgenommenen Änderungen werden automatisch in der globalen Datenbank von OpenStreetMap gespeichert und können von anderen frei weiterverwendet werden.",
"de": "Auf dieser Karte können Sie Hydranten, Feuerwachen, Krankenwagen und Feuerlöscher in Ihren bevorzugten Stadtvierteln finden und aktualisieren. \n\nSie können Ihren genauen Standort verfolgen (nur mobil) und in der unteren linken Ecke die für Sie relevanten Ebenen auswählen. Sie können mit diesem Tool auch Pins (Points of Interest) zur Karte hinzufügen oder bearbeiten und durch die Beantwortung verfügbarer Fragen zusätzliche Angaben machen. \n\nAlle von Ihnen vorgenommenen Änderungen werden automatisch in der globalen Datenbank von OpenStreetMap gespeichert und können von anderen frei weiterverwendet werden.",
"it": "In questa cartina puoi vedere e aggiornare idranti, stazioni dei pompieri, stazioni delle ambulanze ed estintori del tuo quartiere preferito.\n\nPuoi seguire la tua posizione precisa (solo su cellulare) e selezionare i livelli che ti interessano nell’angolo in basso a sinistra. Puoi anche usare questo strumento per aggiungere o modificare i PDI sulla mappa e fornire ulteriori dettagli rispondendo alle domande.\n\nTutte le modifiche che farai verranno automaticamente salvate nel database globale di OpenStreetMap e potranno essere riutilizzate liberamente da tutti."
},
"language": [
@ -329,18 +329,6 @@
},
"images"
],
"icon": {
"render": "./assets/themes/hailhydrant/hydrant.svg"
},
"width": {
"render": "8"
},
"iconSize": {
"render": "20,20,center"
},
"color": {
"render": "#00f"
},
"presets": [
{
"tags": [
@ -364,7 +352,28 @@
}
}
],
"wayHandling": 2
"mapRendering": [
{
"icon": {
"render": "./assets/themes/hailhydrant/hydrant.svg"
},
"iconSize": {
"render": "20,20,center"
},
"location": [
"point",
"centroid"
]
},
{
"color": {
"render": "#00f"
},
"width": {
"render": "8"
}
}
]
},
{
"id": "extinguisher",
@ -464,18 +473,6 @@
},
"images"
],
"icon": {
"render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
},
"width": {
"render": "8"
},
"iconSize": {
"render": "20,20,center"
},
"color": {
"render": "#00f"
},
"presets": [
{
"tags": [
@ -500,7 +497,19 @@
}
}
],
"wayHandling": 1
"mapRendering": [
{
"icon": {
"render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
},
"iconSize": {
"render": "20,20,center"
},
"location": [
"point"
]
}
]
},
{
"id": "fire_stations",
@ -521,7 +530,6 @@
]
}
},
"wayHandling": 2,
"title": {
"render": {
"en": "Fire Station",
@ -714,18 +722,6 @@
},
"images"
],
"icon": {
"render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
},
"width": {
"render": "1"
},
"iconSize": {
"render": "35,35,center"
},
"color": {
"render": "#c22"
},
"presets": [
{
"tags": [
@ -748,6 +744,28 @@
"it": "Una caserma dei pompieri è un luogo dove si trovano i mezzi antincendio e i pompieri tra una missione e l’altra."
}
}
],
"mapRendering": [
{
"icon": {
"render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
},
"iconSize": {
"render": "35,35,center"
},
"location": [
"point",
"centroid"
]
},
{
"color": {
"render": "#c22"
},
"width": {
"render": "1"
}
}
]
},
{
@ -938,18 +956,6 @@
},
"images"
],
"icon": {
"render": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
},
"width": {
"render": "1"
},
"iconSize": {
"render": "35,35,center"
},
"color": {
"render": "#00f"
},
"presets": [
{
"tags": [
@ -973,7 +979,28 @@
}
}
],
"wayHandling": 2
"mapRendering": [
{
"icon": {
"render": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
},
"iconSize": {
"render": "35,35,center"
},
"location": [
"point",
"centroid"
]
},
{
"color": {
"render": "#00f"
},
"width": {
"render": "1"
}
}
]
}
],
"defaultBackgroundId": "HDM_HOT"

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

@ -18,7 +18,7 @@
"fr": "Cette carte affiche toutes les cartes (plans) mappés dans OpenStreetMap",
"ja": "このテーマには、OpenStreetMapが知っているすべての(観光)マップが表示されます",
"zh_Hant": "這份主題顯示所有已知的開放街圖上的 (旅遊) 地圖",
"de": "Eine Karte mit allen (touristischen) Karten, die OpenStreetMap kennt",
"de": "Dieses Thema zeigt alle (touristischen) Karten, die OpenStreetMap kennt",
"it": "Questo tema mostra tutte le mappe (turistiche) conosciute da OpenStreetMap"
},
"description": {

30
assets/themes/openwindpowermap/openwindpowermap.json
View file

@ -3,7 +3,7 @@
"title": {
"en": "OpenWindPowerMap",
"fr": "OpenWindPowerMap",
"de": "Freie Windenergie-Karte",
"de": "OpenWindPowerMap",
"it": "OpenWindPowerMap"
},
"maintainer": "Seppe Santens",
@ -44,7 +44,6 @@
"osmTags": "generator:source=wind"
},
"minzoom": 10,
"wayHandling": 1,
"title": {
"render": {
"en": "wind turbine",
@ -65,16 +64,6 @@
}
]
},
"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": [
{
"id": "turbine-output",
@ -269,6 +258,23 @@
}
]
}
],
"mapRendering": [
{
"icon": "./assets/themes/openwindpowermap/wind_turbine.svg",
"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>"
}
]
},
"iconSize": "40, 40, bottom",
"location": [
"point"
]
}
]
}
],

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

@ -20,7 +20,7 @@
"ca": "Crea una interfície basada en totes les capes disponibles de totes les interfícies",
"gl": "Crea un tema baseado en todas as capas dispoñíbeis de todos os temas",
"fr": "Crée un thème personnalisé basé sur toutes les couches disponibles de tous les thèmes",
"de": "Erstellen Sie ein persönliches Thema, das auf allen verfügbaren Ebenen aller Themen basiert. Um Daten anzuzeigen, öffnen Sie die <a href='#filter'>Ebenenauswahl</a>",
"de": "Erstellen Sie ein persönliches Thema auf der Grundlage aller verfügbaren Ebenen aller Themen",
"ja": "すべてのテーマの使用可能なすべてのレイヤーに基づいて個人用テーマを作成する",
"zh_Hant": "從所有可用的主題圖層創建個人化主題",
"ru": "Создать персональную тему на основе доступных слоёв тем",

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

@ -7,7 +7,7 @@
"ja": "遊び場",
"zh_Hant": "遊樂場",
"ru": "Игровые площадки",
"de": "Spielplätze",
"de": "Spielpläzte",
"it": "Parchi giochi",
"nb_NO": "Lekeplasser"
},

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

@ -178,4 +178,4 @@
"allowSplit": true
}
]
}
}

45
assets/themes/speelplekken/speelplekken.json
View file

@ -33,10 +33,14 @@
"osmTags": "shadow=yes",
"isOsmCache": false
},
"color": "#444444",
"width": {
"render": "1"
}
"mapRendering": [
{
"color": "#444444",
"width": {
"render": "1"
}
}
]
},
{
"builtin": "play_forest",
@ -138,7 +142,6 @@
},
{
"id": "walking_routes",
"icon": "./assets/themes/speelplekken/walking_route.svg",
"name": {
"nl": "Wandelroutes van provincie Antwerpen"
},
@ -237,22 +240,26 @@
"questions",
"reviews"
],
"color": {
"render": "#6d6",
"mappings": [
{
"if": "color~*",
"then": "{color}"
"mapRendering": [
{
"color": {
"render": "#6d6",
"mappings": [
{
"if": "color~*",
"then": "{color}"
},
{
"if": "colour~*",
"then": "{colour}"
}
]
},
{
"if": "colour~*",
"then": "{colour}"
"width": {
"render": "9"
}
]
},
"width": {
"render": "9"
}
}
]
}
],
"clustering": {

10
assets/themes/street_lighting/street_lighting.json
View file

@ -104,7 +104,11 @@
},
"source": {
"osmTags": {
"and": ["highway!=", "service!=driveway", "highway!=platform"]
"and": [
"highway!=",
"service!=driveway",
"highway!=platform"
]
}
},
"minZoom": 19,
@ -123,10 +127,10 @@
"mapRendering": [
{
"color": {
"render":"#a9a9a9",
"render": "#a9a9a9",
"mappings": [
{
"if":"lit=no",
"if": "lit=no",
"then": "#303030"
}
]