Merge branch 'master' into develop

This commit is contained in:
Pieter Vander Vennet 2021-12-12 17:35:11 +01:00
commit 04dc373b1e
6 changed files with 480 additions and 305 deletions

View file

@ -58,7 +58,7 @@
"operator~.*[nN]atuurpunt.*"
]
},
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
@ -84,7 +84,7 @@
"operator~.*[nN]atuurpunt.*"
]
},
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_nature_reserve_points.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_nature_reserve_points.geojson",
"isOsmCache": "duplicate"
},
"minzoom": 1,
@ -107,7 +107,7 @@
"operator~.*[nN]atuurpunt.*"
]
},
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_points.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_points.geojson",
"isOsmCache": true
},
"minzoom": 1,
@ -129,7 +129,7 @@
"operator~.*[nN]atuurpunt.*"
]
},
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
@ -158,7 +158,7 @@
"override": {
"minzoom": "15",
"source": {
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
@ -186,7 +186,7 @@
"override": {
"minzoom": 12,
"source": {
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
@ -205,7 +205,7 @@
"override": {
"minzoom": "16",
"source": {
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
@ -223,7 +223,7 @@
"override": {
"minzoom": "16",
"source": {
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
@ -268,7 +268,7 @@
"override": {
"minzoom": "16",
"source": {
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
@ -286,7 +286,7 @@
"override": {
"minzoom": "18",
"source": {
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
@ -304,7 +304,7 @@
"override": {
"minzoom": "18",
"source": {
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 12,
"isOsmCache": true
},

View file

@ -46,7 +46,7 @@
"builtin": "play_forest",
"override": {
"source": {
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14,
"isOsmCache": true
},
@ -65,7 +65,7 @@
"minzoom": 14,
"source": {
"geoJsonLocal": "http://127.0.0.1:8080/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14,
"isOsmCache": true
},
@ -82,7 +82,7 @@
"minzoom": 14,
"source": {
"geoJsonLocal": "http://127.0.0.1:8080/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14,
"isOsmCache": true
},
@ -99,7 +99,7 @@
"minzoom": 14,
"source": {
"geoJsonLocal": "http://127.0.0.1:8080/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14,
"isOsmCache": true
},
@ -115,7 +115,7 @@
"minzoom": 15,
"source": {
"geoJsonLocal": "http://127.0.0.1:8080/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14,
"isOsmCache": true
},
@ -134,7 +134,7 @@
],
"source": {
"geoJsonLocal": "http://127.0.0.1:8080/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14,
"isOsmCache": true
}
@ -154,7 +154,7 @@
"operator~[pP]rovincie Antwerpen"
]
},
"geoJson": "https://pietervdvn.github.io/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/speelplekken_cache/speelplekken_{layer}_{z}_{x}_{y}.geojson",
"geoJsonZoomLevel": 14,
"isOsmCache": true
},

View file

@ -465,5 +465,17 @@
"hydrant": {
"description": "顯示消防栓的地圖圖層。",
"name": "消防栓地圖"
},
"address": {
"description": "地址",
"name": "OSM 上已知的地址",
"tagRenderings": {
"fixme": {
"question": "這裡需要修什麼?請直接解釋"
}
}
},
"cafe_pub": {
"name": "咖啡廳與酒吧"
}
}

View file

@ -374,7 +374,7 @@
"render": "<h3>Schwierigkeitsübersicht</h3>{histogram(_difficulty_hist)}"
},
"Contained routes length hist": {
"render": "<h3>Längenübersicht</h3>{histogramm(_length_hist)}"
"render": "<h3>Längenübersicht</h3>{histogram(_length_hist)}"
},
"Contained_climbing_routes": {
"render": "<h3> Enthält {_contained_climbing_routes_count} Routen</h3> <ul>{_contained_climbing_routes}</ul>"

View file

@ -310,5 +310,149 @@
"description": "繪製所有樹木!",
"shortDescription": "所有樹木的地圖",
"title": "樹木"
},
"openwindpowermap": {
"layers": {
"0": {
"tagRenderings": {
"turbine-operator": {
"question": "這個風機營業商是?",
"render": "這個風機營業商是 {operator}。"
},
"turbine-diameter": {
"question": "這個風力渦輪機的風葉直徑是多少公尺?",
"render": "這個風力渦輪機的風葉直徑是 {rotor:diameter} 公尺。"
},
"turbine-height": {
"render": "這風機的總高度 (包括風葉直徑) 是 {height} 公尺。",
"question": "這個風機的總高度是多少 (包括風葉大小) 公尺?"
}
},
"name": "風機",
"presets": {
"0": {
"title": "風機"
}
}
}
},
"description": "顯示與編輯風機的地圖。"
},
"street_lighting": {
"layers": {
"1": {
"tagRenderings": {
"lit": {
"mappings": {
"2": {
"then": "這個道路晚上有照明"
},
"0": {
"then": "這個道路有照明"
},
"1": {
"then": "這個道路沒有照明"
},
"3": {
"then": "這個道路 24/7 有照明"
}
},
"question": "這道路有路燈嗎?"
}
},
"title": {
"render": "照明道路"
},
"name": "有照明的道路"
},
"2": {
"name": "所有道路",
"tagRenderings": {
"lit": {
"mappings": {
"0": {
"then": "這道路有照明"
},
"1": {
"then": "這道路沒有照明"
},
"2": {
"then": "這道路晚上有照明"
},
"3": {
"then": "這道路 24/7 有照明"
}
},
"question": "這道路有照明嗎?"
}
},
"title": {
"render": "照明"
}
}
},
"description": "在這份地圖你可以找到任何有關路燈的事情",
"title": "道路照明"
},
"postboxes": {
"layers": {
"0": {
"title": {
"render": "郵筒"
},
"description": "這圖層顯示郵筒。",
"name": "郵筒",
"presets": {
"0": {
"title": "郵筒"
}
}
},
"1": {
"tagRenderings": {
"OH": {
"mappings": {
"0": {
"then": "24/7 開放 (包括假日)"
}
},
"render": "開放時間:{opening_hours_table()}",
"question": "這間郵局的開放時間是?"
}
},
"title": {
"render": "郵局"
},
"presets": {
"0": {
"title": "郵局"
}
},
"filter": {
"0": {
"options": {
"0": {
"question": "目前開放"
}
}
}
},
"name": "郵局",
"description": "圖層顯示郵局。"
}
},
"shortDescription": "顯示郵筒與郵局的地圖",
"title": "郵筒與郵局地圖",
"description": "在這份地圖你能找到與新增有關郵局與郵筒的資料,你可以用這份地圖找到寄送您下張明信片的地方!:)<br/>發現錯誤或是有郵筒遺漏嗎?你可以用免費的開放街圖帳號來編輯。 "
},
"parkings": {
"title": "停車場",
"description": "這地圖顯示不同的停車空間",
"shortDescription": "這地圖顯示不同的停車空間"
},
"waste_basket": {
"description": "在這份地圖當中,你可以找到你附近的垃圾筒。如果地圖有遺漏垃圾筒,你可以自己加上去",
"shortDescription": "垃圾筒的地圖",
"title": "垃圾筒"
}
}

View file

@ -266,9 +266,10 @@
},
"index": {
"pickTheme": "請挑選主題來開始。",
"intro": "MapComplete 是開放街圖能夠顯示特定主題的檢視器與編輯器。",
"intro": "MapComplete 是開放街圖能夠顯示特定主題的檢視器與編輯器,能夠顯示與允許更新特定主題的地圖。",
"title": "歡迎使用 MapComplete",
"#": "當沒有載入主題時,這些文字會在主題按鈕上面顯示"
"#": "當沒有載入主題時,這些文字會在主題按鈕上面顯示",
"featuredThemeTitle": "這週的焦點"
},
"centerMessage": {
"retrying": "無法讀取資料,請在 {count} 秒後再試一次…",
@ -280,7 +281,7 @@
"isDeleted": "已移除",
"doDelete": "移除圖片",
"dontDelete": "取消",
"uploadDone": "<span class=\"thanks\">已經新增你的照片,謝謝你的協助!</span>",
"uploadDone": "已經新增你的照片,謝謝你的協助!",
"respectPrivacy": "請別照人像或是車牌,不要上傳 Google 地圖、Google 街景或其他受版權保護的資料來源。",
"uploadFailed": "無法上傳您的圖片。您是否已連線至網際網路,並允許第三方 APIBrave 瀏覽器或 uMatrix 外掛程式都可能會封鎖它們。",
"ccb": "以 CC-BY 授權條款",
@ -290,6 +291,24 @@
"pleaseLogin": "請登入以新增圖片",
"uploadingMultiple": "正在上傳 {count} 張圖片…",
"uploadingPicture": "正在上傳你的圖片…",
"addPicture": "新增圖片"
"addPicture": "新增圖片",
"toBig": "{actual_size} 因此照片太大,請使用最大 {max_size} 的照片",
"uploadMultipleDone": "已經新增 {count} 圖片,謝謝你的幫忙!"
},
"delete": {
"safeDelete": "這點無法安全地刪除。",
"delete": "刪除",
"cannotBeDeleted": "這圖徵無法刪除",
"loginToDelete": "你必須登入才能刪除點",
"isDeleted": "這圖徵已經刪除",
"cancel": "取消"
},
"split": {
"loginToSplit": "你必須登入才能分割道路",
"split": "分開",
"cancel": "取消",
"splitTitle": "請在地圖選擇要在那裡分割道路",
"hasBeenSplit": "這路徑已經分割",
"inviteToSplit": "分割這道路比較小的片段,讓不同道路能有不同的屬性。"
}
}