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

Merge master

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-07-09 16:56:19 +02:00
commit 214ba40dfa
66 changed files with 2226 additions and 1578 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Docs/Themes/mapcomplete-changes.md
View file

@ -33,6 +33,7 @@ Available languages:
- en - en
- da - da
- de - de
- fr
This document is autogenerated from [assets/themes/mapcomplete-changes/mapcomplete-changes.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/mapcomplete-changes/mapcomplete-changes.json) This document is autogenerated from [assets/themes/mapcomplete-changes/mapcomplete-changes.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/mapcomplete-changes/mapcomplete-changes.json)

66
Docs/URL_Parameters.md
View file

@ -27,17 +27,17 @@ This document gives an overview of which URL-parameters can be used to influence
12. [ fs-homepage-link ](#-fs-homepage-link-) 12. [ fs-homepage-link ](#-fs-homepage-link-)
13. [ fs-share-screen ](#-fs-share-screen-) 13. [ fs-share-screen ](#-fs-share-screen-)
14. [ fs-geolocation ](#-fs-geolocation-) 14. [ fs-geolocation ](#-fs-geolocation-)
15. [ fs-all-questions ](#-fs-all-questions-) 15. [ fs-layers-enabled ](#-fs-layers-enabled-)
16. [ fs-export ](#-fs-export-) 16. [ fs-all-questions ](#-fs-all-questions-)
17. [ test ](#-test-) 17. [ fs-export ](#-fs-export-)
18. [ debug ](#-debug-) 18. [ test ](#-test-)
19. [ moreprivacy ](#-moreprivacy-) 19. [ debug ](#-debug-)
20. [ overpassUrl ](#-overpassurl-) 20. [ moreprivacy ](#-moreprivacy-)
21. [ overpassTimeout ](#-overpasstimeout-) 21. [ overpassUrl ](#-overpassurl-)
22. [ overpassMaxZoom ](#-overpassmaxzoom-) 22. [ overpassTimeout ](#-overpasstimeout-)
23. [ osmApiTileSize ](#-osmapitilesize-) 23. [ overpassMaxZoom ](#-overpassmaxzoom-)
24. [ background ](#-background-) 24. [ osmApiTileSize ](#-osmapitilesize-)
25. [ fs-layers-enabled ](#-fs-layers-enabled-) 25. [ background ](#-background-)
26. [ z ](#-z-) 26. [ z ](#-z-)
27. [ lat ](#-lat-) 27. [ lat ](#-lat-)
28. [ lon ](#-lon-) 28. [ lon ](#-lon-)
@ -251,12 +251,23 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src
fs-layers-enabled
-------------------
If set to false, all layers will be disabled - except the explicitly enabled layers
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L162)
The default value is _true_
fs-all-questions fs-all-questions
------------------ ------------------
Always show all questions Always show all questions
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L161) This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L165)
The default value is _false_ The default value is _false_
@ -267,7 +278,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src
Enable the export as GeoJSON and CSV button Enable the export as GeoJSON and CSV button
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L167) This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L171)
The default value is _true_ The default value is _true_
@ -278,7 +289,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src
If true, 'dryrun' mode is activated. The app will behave as normal, except that changes to OSM will be printed onto the console instead of actually uploaded to osm.org If true, 'dryrun' mode is activated. The app will behave as normal, except that changes to OSM will be printed onto the console instead of actually uploaded to osm.org
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L181) This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L185)
The default value is _false_ The default value is _false_
@ -289,7 +300,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src
If true, shows some extra debugging help such as all the available tags on every object If true, shows some extra debugging help such as all the available tags on every object
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L187) This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L191)
The default value is _false_ The default value is _false_
@ -300,7 +311,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src
If true, the location distance indication will not be written to the changeset and other privacy enhancing measures might be taken. If true, the location distance indication will not be written to the changeset and other privacy enhancing measures might be taken.
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L193) This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L197)
The default value is _false_ The default value is _false_
@ -311,7 +322,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src
Point mapcomplete to a different overpass-instance. Example: https://overpass-api.de/api/interpreter Point mapcomplete to a different overpass-instance. Example: https://overpass-api.de/api/interpreter
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L199) This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L203)
The default value is _https://overpass-api.de/api/interpreter,https://overpass.kumi.systems/api/interpreter,https://overpass.openstreetmap.ru/cgi/interpreter_ The default value is _https://overpass-api.de/api/interpreter,https://overpass.kumi.systems/api/interpreter,https://overpass.openstreetmap.ru/cgi/interpreter_
@ -322,7 +333,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src
Set a different timeout (in seconds) for queries in overpass Set a different timeout (in seconds) for queries in overpass
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L210) This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L214)
The default value is _30_ The default value is _30_
@ -333,7 +344,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src
point to switch between OSM-api and overpass point to switch between OSM-api and overpass
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L218) This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L222)
The default value is _16_ The default value is _16_
@ -344,7 +355,7 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src
Tilesize when the OSM-API is used to fetch data within a BBOX Tilesize when the OSM-API is used to fetch data within a BBOX
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L226) This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L230)
The default value is _17_ The default value is _17_
@ -355,23 +366,12 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src
The id of the background layer to start with The id of the background layer to start with
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L233) This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L237)
No default value set No default value set
fs-layers-enabled
-------------------
If set to false, all layers will be disabled - except the explicitly enabled layers
This documentation is defined in the source code at [FeatureSwitchState.ts](/src/Logic/State/FeatureSwitchState.ts#L239)
The default value is _true_
z z
--- ---
@ -487,7 +487,7 @@ This documentation is defined in the source code at [FilteredLayer.ts](/src/Mode
The mode the application starts in, e.g. 'map', 'dashboard' or 'statistics' The mode the application starts in, e.g. 'map', 'dashboard' or 'statistics'
This documentation is defined in the source code at [generateDocs.ts](ervdvn/git/MapComplete/scripts/generateDocs.ts#L439) This documentation is defined in the source code at [generateDocs.ts](ervdvn/git2/MapComplete/scripts/generateDocs.ts#L439)
The default value is _map_ The default value is _map_

6
assets/layers/address/address.json
View file

@ -84,7 +84,8 @@
"pt_BR": "Endereço conhecido", "pt_BR": "Endereço conhecido",
"he": "כתובת ידועה", "he": "כתובת ידועה",
"eu": "Helbide ezaguna", "eu": "Helbide ezaguna",
"it": "Indirizzo conosciuto" "it": "Indirizzo conosciuto",
"zh_Hant": "已知的地址"
} }
}, },
"pointRendering": [ "pointRendering": [
@ -255,7 +256,8 @@
"pt_BR": "Este endereço fica na rua <b>{addr:street}</b>", "pt_BR": "Este endereço fica na rua <b>{addr:street}</b>",
"he": "כתובת זו נמצאת ברחוב <b>{addr:street}</b>", "he": "כתובת זו נמצאת ברחוב <b>{addr:street}</b>",
"eu": "Helbide hau <b>{addr:street}</b> kalean dago", "eu": "Helbide hau <b>{addr:street}</b> kalean dago",
"it": "L’indirizzo è in via <b>{addr:street}</b>" "it": "L’indirizzo è in via <b>{addr:street}</b>",
"zh_Hant": "此地址位於街道 <b>{addr:street}</b>"
}, },
"question": { "question": {
"en": "What street is this address located in?", "en": "What street is this address located in?",

24
assets/layers/animal_shelter/animal_shelter.json
View file

@ -7,7 +7,8 @@
"zh_Hans": "动物收容所", "zh_Hans": "动物收容所",
"pt": "Abrigo para animais", "pt": "Abrigo para animais",
"ca": "Refugis d'animals", "ca": "Refugis d'animals",
"pl": "Schroniska dla zwierząt" "pl": "Schroniska dla zwierząt",
"fr": "Abri pour animaux"
}, },
"description": { "description": {
"en": "An animal shelter is a facility where animals in trouble are brought and facility's staff (volunteers or not) feeds them and cares of them, rehabilitating and healing them if necessary. This definition includes kennels for abandoned dogs, catteries for abandoned cats, shelters for other abandoned pets and wildlife recovery centres. ", "en": "An animal shelter is a facility where animals in trouble are brought and facility's staff (volunteers or not) feeds them and cares of them, rehabilitating and healing them if necessary. This definition includes kennels for abandoned dogs, catteries for abandoned cats, shelters for other abandoned pets and wildlife recovery centres. ",
@ -26,7 +27,8 @@
"zh_Hans": "动物收容所", "zh_Hans": "动物收容所",
"pt": "Abrigo para animais", "pt": "Abrigo para animais",
"ca": "Refugi d'animals", "ca": "Refugi d'animals",
"pl": "Schronisko dla zwierząt" "pl": "Schronisko dla zwierząt",
"fr": "Un refuge animalier"
}, },
"mappings": [ "mappings": [
{ {
@ -75,7 +77,8 @@
"zh_Hans": "动物收容所", "zh_Hans": "动物收容所",
"pt": "um abrigo para animais", "pt": "um abrigo para animais",
"ca": "un refugi d'animals", "ca": "un refugi d'animals",
"pl": "schronisko dla zwierząt" "pl": "schronisko dla zwierząt",
"fr": "refuge animalier"
}, },
"tags": [ "tags": [
"amenity=animal_shelter" "amenity=animal_shelter"
@ -96,14 +99,16 @@
"es": "¿Cómo se llama este refugio de animales?", "es": "¿Cómo se llama este refugio de animales?",
"zh_Hans": "这个动物收容所叫什么名字？", "zh_Hans": "这个动物收容所叫什么名字？",
"ca": "Quin nom té aquest refugi d'animals?", "ca": "Quin nom té aquest refugi d'animals?",
"pl": "Jak nazywa się to schronisko dla zwierząt?" "pl": "Jak nazywa się to schronisko dla zwierząt?",
"fr": "Quel est le nom de ce refuge animalier ?"
}, },
"render": { "render": {
"en": "This animal shelter is named <b>{name}</b>", "en": "This animal shelter is named <b>{name}</b>",
"de": "Der Name des Tierheims lautet <b>{name}</b>", "de": "Der Name des Tierheims lautet <b>{name}</b>",
"es": "Este refugio de animales se llama <b>{name}</b>", "es": "Este refugio de animales se llama <b>{name}</b>",
"zh_Hans": "这个动物收容所叫 <b>{name}</b>", "zh_Hans": "这个动物收容所叫 <b>{name}</b>",
"pl": "To schronisko dla zwierząt nazywa się <b>{name}</b>" "pl": "To schronisko dla zwierząt nazywa się <b>{name}</b>",
"fr": "Ce refuge s'appelle <b>{name}</b>"
} }
}, },
"website", "website",
@ -127,7 +132,8 @@
"es": "Los animales permanecen aquí hasta que son adoptados por un nuevo propietario", "es": "Los animales permanecen aquí hasta que son adoptados por un nuevo propietario",
"zh_Hans": "动物被饲养在这里直到被新主人收养", "zh_Hans": "动物被饲养在这里直到被新主人收养",
"ca": "Els animals romanen ací fins que son adoptats per un nou propietari", "ca": "Els animals romanen ací fins que son adoptats per un nou propietari",
"pl": "Zwierzęta są tutaj dopóki nie znajdą nowego właściciela" "pl": "Zwierzęta są tutaj dopóki nie znajdą nowego właściciela",
"fr": "Les animaux sont gardés jusqu'à ce qu'ils soient adoptés par un nouveau maître"
}, },
"if": "purpose=adoption" "if": "purpose=adoption"
}, },
@ -137,7 +143,8 @@
"de": "Tiere werden hier bis zum Ende Ihres Lebens untergebracht", "de": "Tiere werden hier bis zum Ende Ihres Lebens untergebracht",
"es": "Los animales reciben cuidados para el resto de su vida", "es": "Los animales reciben cuidados para el resto de su vida",
"zh_Hans": "动物的余生都得到照顾", "zh_Hans": "动物的余生都得到照顾",
"ca": "Els animals reben cures per a la resta de la seva vida" "ca": "Els animals reben cures per a la resta de la seva vida",
"fr": "Les animaux sont recueillis pour le reste de leur vie"
}, },
"if": "purpose=sanctuary" "if": "purpose=sanctuary"
}, },
@ -148,7 +155,8 @@
"es": "Los animales heridos se rehabilitan aquí hasta que pueden ser liberados de nuevo en la naturaleza ", "es": "Los animales heridos se rehabilitan aquí hasta que pueden ser liberados de nuevo en la naturaleza ",
"zh_Hans": "受伤的动物在这里康复，直到它们可以再次被释放到大自然中 ", "zh_Hans": "受伤的动物在这里康复，直到它们可以再次被释放到大自然中 ",
"ca": "Els animals ferits es rehabiliten aquí fins que puguen ser alliberats de nou a la natura ", "ca": "Els animals ferits es rehabiliten aquí fins que puguen ser alliberats de nou a la natura ",
"pl": "Ranne zwierzęta przechodzą tutaj rehabilitację do momentu, kiedy mogą zostać wypuszczone na wolność " "pl": "Ranne zwierzęta przechodzą tutaj rehabilitację do momentu, kiedy mogą zostać wypuszczone na wolność ",
"fr": "Les animaux blessés sont soignés jusqu'à ce qu'ils soient en état d'être relâchés dans la nature "
}, },
"if": "purpose=release" "if": "purpose=release"
} }

3
assets/layers/atm/atm.json
View file

@ -29,7 +29,8 @@
"pl": "Bankomaty do wypłacania pieniędzy", "pl": "Bankomaty do wypłacania pieniędzy",
"pt_BR": "Caixas eletrônicos para sacar dinheiro", "pt_BR": "Caixas eletrônicos para sacar dinheiro",
"pt": "Multibancos para levantar dinheiro", "pt": "Multibancos para levantar dinheiro",
"it": "Sportelli Bancomat per prelevare denaro" "it": "Sportelli Bancomat per prelevare denaro",
"zh_Hant": "自動櫃員機以提款"
}, },
"source": { "source": {
"osmTags": "amenity=atm" "osmTags": "amenity=atm"

2
assets/layers/bench/bench.json
View file

@ -196,7 +196,7 @@
"it": "Questa panchina <b>non</b> ha uno schienale", "it": "Questa panchina <b>non</b> ha uno schienale",
"ru": "Без спинки", "ru": "Без спинки",
"zh_Hans": "<b>没有</b>靠背", "zh_Hans": "<b>没有</b>靠背",
"zh_Hant": "靠背：無", "zh_Hant": "此長椅<b>沒有</b>靠背",
"nb_NO": "Rygglene: Nei", "nb_NO": "Rygglene: Nei",
"fi": "Selkänoja: ei", "fi": "Selkänoja: ei",
"pl": "<b>Nie</b> posiada oparcia", "pl": "<b>Nie</b> posiada oparcia",

7
assets/layers/bicycle_rental/bicycle_rental.json
View file

@ -466,6 +466,13 @@
"pt": "Capacetes de ciclismo podem ser alugados aqui", "pt": "Capacetes de ciclismo podem ser alugados aqui",
"pl": "Można tutaj wypożyczyć kaski rowerowe" "pl": "Można tutaj wypożyczyć kaski rowerowe"
} }
},
{
"if": "rental=cargo_bike",
"then": {
"en": "Cargo bikes can be rented here",
"nl": "Bakfietsen kunnen hier gehuurd worden"
}
} }
], ],
"condition": { "condition": {

93
assets/layers/charging_station/charging_station.json
View file

@ -2293,7 +2293,8 @@
"then": { "then": {
"en": "Authentication by a membership card", "en": "Authentication by a membership card",
"nl": "Aanmelden met een lidkaart is mogelijk", "nl": "Aanmelden met een lidkaart is mogelijk",
"de": "Authentifizierung durch eine Mitgliedskarte" "de": "Authentifizierung durch eine Mitgliedskarte",
"fr": "Authentification par carte de membre"
} }
}, },
{ {
@ -2302,7 +2303,8 @@
"then": { "then": {
"en": "Authentication by an app", "en": "Authentication by an app",
"nl": "Aanmelden via een applicatie is mogelijk", "nl": "Aanmelden via een applicatie is mogelijk",
"de": "Authentifizierung per App" "de": "Authentifizierung per App",
"fr": "Authentification par une application"
} }
}, },
{ {
@ -2311,7 +2313,8 @@
"then": { "then": {
"en": "Authentication via phone call is available", "en": "Authentication via phone call is available",
"nl": "Aanmelden door te bellen naar een telefoonnummer is mogelijk", "nl": "Aanmelden door te bellen naar een telefoonnummer is mogelijk",
"de": "Authentifizierung per Anruf ist möglich" "de": "Authentifizierung per Anruf ist möglich",
"fr": "Authentification possible par appel téléphonique"
} }
}, },
{ {
@ -2320,7 +2323,8 @@
"then": { "then": {
"en": "Authentication via SMS is available", "en": "Authentication via SMS is available",
"nl": "Aanmelden via SMS is mogelijk", "nl": "Aanmelden via SMS is mogelijk",
"de": "Authentifizierung per SMS ist möglich" "de": "Authentifizierung per SMS ist möglich",
"fr": "Authentification possible par SMS"
} }
}, },
{ {
@ -2650,6 +2654,7 @@
"nl": "Dit oplaadpunt werkt", "nl": "Dit oplaadpunt werkt",
"ca": "Aquesta estació de càrrega funciona", "ca": "Aquesta estació de càrrega funciona",
"de": "Die Station ist in Betrieb", "de": "Die Station ist in Betrieb",
"fr": "Cette station de recharge fonctionne",
"pl": "Ta stacja ładowania działa" "pl": "Ta stacja ładowania działa"
} }
}, },
@ -3140,8 +3145,8 @@
"socket:schuko:output": { "socket:schuko:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:typee:voltage": "voltage", "socket:typee:voltage": "voltage",
@ -3149,8 +3154,8 @@
"socket:typee:output": { "socket:typee:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:chademo:voltage": "voltage", "socket:chademo:voltage": "voltage",
@ -3158,8 +3163,8 @@
"socket:chademo:output": { "socket:chademo:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:type1_cable:voltage": "voltage", "socket:type1_cable:voltage": "voltage",
@ -3167,8 +3172,8 @@
"socket:type1_cable:output": { "socket:type1_cable:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:type1:voltage": "voltage", "socket:type1:voltage": "voltage",
@ -3176,8 +3181,8 @@
"socket:type1:output": { "socket:type1:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:type1_combo:voltage": "voltage", "socket:type1_combo:voltage": "voltage",
@ -3185,8 +3190,8 @@
"socket:type1_combo:output": { "socket:type1_combo:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:tesla_supercharger:voltage": "voltage", "socket:tesla_supercharger:voltage": "voltage",
@ -3194,8 +3199,8 @@
"socket:tesla_supercharger:output": { "socket:tesla_supercharger:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:type2:voltage": "voltage", "socket:type2:voltage": "voltage",
@ -3203,8 +3208,8 @@
"socket:type2:output": { "socket:type2:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:type2_combo:voltage": "voltage", "socket:type2_combo:voltage": "voltage",
@ -3212,8 +3217,8 @@
"socket:type2_combo:output": { "socket:type2_combo:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:type2_cable:voltage": "voltage", "socket:type2_cable:voltage": "voltage",
@ -3221,8 +3226,8 @@
"socket:type2_cable:output": { "socket:type2_cable:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:tesla_supercharger_ccs:voltage": "voltage", "socket:tesla_supercharger_ccs:voltage": "voltage",
@ -3230,8 +3235,8 @@
"socket:tesla_supercharger_ccs:output": { "socket:tesla_supercharger_ccs:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:tesla_destination:voltage": "voltage", "socket:tesla_destination:voltage": "voltage",
@ -3239,8 +3244,8 @@
"socket:tesla_destination:output": { "socket:tesla_destination:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:USB-A:voltage": "voltage", "socket:USB-A:voltage": "voltage",
@ -3248,8 +3253,8 @@
"socket:USB-A:output": { "socket:USB-A:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:bosch_3pin:voltage": "voltage", "socket:bosch_3pin:voltage": "voltage",
@ -3257,8 +3262,8 @@
"socket:bosch_3pin:output": { "socket:bosch_3pin:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:bosch_5pin:voltage": "voltage", "socket:bosch_5pin:voltage": "voltage",
@ -3266,8 +3271,8 @@
"socket:bosch_5pin:output": { "socket:bosch_5pin:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:bs1363:voltage": "voltage", "socket:bs1363:voltage": "voltage",
@ -3275,8 +3280,8 @@
"socket:bs1363:output": { "socket:bs1363:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:nema5_15:voltage": "voltage", "socket:nema5_15:voltage": "voltage",
@ -3284,8 +3289,8 @@
"socket:nema5_15:output": { "socket:nema5_15:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:sev1011_t23:voltage": "voltage", "socket:sev1011_t23:voltage": "voltage",
@ -3293,8 +3298,8 @@
"socket:sev1011_t23:output": { "socket:sev1011_t23:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:as3112:voltage": "voltage", "socket:as3112:voltage": "voltage",
@ -3302,8 +3307,8 @@
"socket:as3112:output": { "socket:as3112:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
}, },
"socket:nema_5_20:voltage": "voltage", "socket:nema_5_20:voltage": "voltage",
@ -3311,8 +3316,8 @@
"socket:nema_5_20:output": { "socket:nema_5_20:output": {
"quantity": "power", "quantity": "power",
"denominations": [ "denominations": [
"mW", "kW",
"kW" "MW"
] ]
} }
} }

2
assets/layers/charging_station/csvToJson.ts
View file

@ -211,7 +211,7 @@ function run(file, protojson) {
for (const entry of entries) { for (const entry of entries) {
importedUnits[entry.key + ":voltage"] = "voltage" importedUnits[entry.key + ":voltage"] = "voltage"
importedUnits[entry.key + ":current"] = "current" importedUnits[entry.key + ":current"] = "current"
importedUnits[entry.key + ":output"] = { quantity: "power", "denominations": ["mW", "kW"] } importedUnits[entry.key + ":output"] = { quantity: "power", "denominations": ["kW", "MW"] }
} }
const extraUnits = [importedUnits, const extraUnits = [importedUnits,

3
assets/layers/maxspeed/maxspeed.json
View file

@ -19,7 +19,8 @@
"ca": "Mostra la velocitat permesa per a cada carretera", "ca": "Mostra la velocitat permesa per a cada carretera",
"fr": "Affiche les vitesses autorisées sur toutes les routes", "fr": "Affiche les vitesses autorisées sur toutes les routes",
"pl": "Pokazuje dozwoloną prędkość na każdej drodze", "pl": "Pokazuje dozwoloną prędkość na każdej drodze",
"es": "Muestra la velocidad permitida para cada carretera" "es": "Muestra la velocidad permitida para cada carretera",
"zh_Hant": "顯示每條道路的允許速度"
}, },
"source": { "source": {
"osmTags": { "osmTags": {

45
assets/layers/note/note.json
View file

@ -6,7 +6,8 @@
"de": "OpenStreetMap-Hinweise", "de": "OpenStreetMap-Hinweise",
"es": "Notas de OpenStreetMap", "es": "Notas de OpenStreetMap",
"ca": "Notes d'OpenStreetMap", "ca": "Notes d'OpenStreetMap",
"cs": "Poznámky OpenStreetMap" "cs": "Poznámky OpenStreetMap",
"fr": "Notes OpenStreetMap"
}, },
"description": "This layer shows notes on OpenStreetMap. Having this layer in your theme will trigger the 'add new note' functionality in the 'addNewPoint'-popup (or if your theme has no presets, it'll enable adding notes)", "description": "This layer shows notes on OpenStreetMap. Having this layer in your theme will trigger the 'add new note' functionality in the 'addNewPoint'-popup (or if your theme has no presets, it'll enable adding notes)",
"source": { "source": {
@ -33,7 +34,8 @@
"es": "Nota", "es": "Nota",
"pa_PK": "نوٹ", "pa_PK": "نوٹ",
"pl": "Notatka", "pl": "Notatka",
"cs": "Poznámka" "cs": "Poznámka",
"fr": "Note"
}, },
"mappings": [ "mappings": [
{ {
@ -45,7 +47,8 @@
"es": "Nota cerrada", "es": "Nota cerrada",
"pl": "Zamknięta notatka", "pl": "Zamknięta notatka",
"ca": "Nota tancada", "ca": "Nota tancada",
"cs": "Uzavřená poznámka" "cs": "Uzavřená poznámka",
"fr": "Note fermée"
} }
} }
] ]
@ -56,7 +59,8 @@
"en": "See on OpenStreetMap.org", "en": "See on OpenStreetMap.org",
"nl": "Bekijk op OpenStreetMap.org", "nl": "Bekijk op OpenStreetMap.org",
"de": "Auf OpenStreetMap.org ansehen", "de": "Auf OpenStreetMap.org ansehen",
"da": "Se på OpenStreetMap.org" "da": "Se på OpenStreetMap.org",
"fr": "Voir sur OpenStreetMap.org"
}, },
"render": "<a href='https://openstreetmap.org/note/{id}' target='_blank'><img src='./assets/svg/osm-logo-us.svg'></a>" "render": "<a href='https://openstreetmap.org/note/{id}' target='_blank'><img src='./assets/svg/osm-logo-us.svg'></a>"
} }
@ -118,7 +122,8 @@
"es": "<h3>Imágenes cercanas</h3>Las imágenes de debajo son imágenes geoetiquetadas cercanas y pueden ser útiles para encargarse de esta nota.", "es": "<h3>Imágenes cercanas</h3>Las imágenes de debajo son imágenes geoetiquetadas cercanas y pueden ser útiles para encargarse de esta nota.",
"nl": "<h3>Afbeeldingen in de buurt</h3>Onderstaande afbeeldingen zijn afbeeldingen met geo-referentie en die in de buurt genomen zijn. Mogelijks zijn ze nuttig om deze kaartnota af te handelen.", "nl": "<h3>Afbeeldingen in de buurt</h3>Onderstaande afbeeldingen zijn afbeeldingen met geo-referentie en die in de buurt genomen zijn. Mogelijks zijn ze nuttig om deze kaartnota af te handelen.",
"ca": "<h3>Imatges properes</h3>Les imatges de sota són imatges geoetiquetades properes i poden ser útils per a encarregar-se d'aquesta nota.", "ca": "<h3>Imatges properes</h3>Les imatges de sota són imatges geoetiquetades properes i poden ser útils per a encarregar-se d'aquesta nota.",
"cs": "<h3>Obrázky v okolí</h3>Obrázky níže jsou obrázky s geografickými značkami v okolí a mohou vám pomoci s touto poznámkou." "cs": "<h3>Obrázky v okolí</h3>Obrázky níže jsou obrázky s geografickými značkami v okolí a mohou vám pomoci s touto poznámkou.",
"fr": "<h3>Images à proximité</h3>Les images suivantes sont dans les environs de cette note et pourraient aider à sa résolution."
}, },
"special": { "special": {
"type": "nearby_images", "type": "nearby_images",
@ -134,7 +139,8 @@
"de": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle' {_first_user} für Spam oder unangemessene Nachrichten melden</a>", "de": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle' {_first_user} für Spam oder unangemessene Nachrichten melden</a>",
"es": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle'>Reportar {_first_user} por spam o mensajes inapropiados</a>", "es": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle'>Reportar {_first_user} por spam o mensajes inapropiados</a>",
"ca": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle'>Reporta {_first_user} per spam o missatges inapropiats</a>", "ca": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle'>Reporta {_first_user} per spam o missatges inapropiats</a>",
"cs": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle'>Nahlásit uživateli {_first_user} spam nebo nevhodné zprávy</ a>" "cs": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle'>Nahlásit uživateli {_first_user} spam nebo nevhodné zprávy</ a>",
"fr": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle'>Signaler {_first_user} pour du spam ou des messages inapropriés</a>"
}, },
"condition": "_opened_by_anonymous_user=false" "condition": "_opened_by_anonymous_user=false"
}, },
@ -146,7 +152,8 @@
"de": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Notiz als Spam oder unangemessen melden</a>", "de": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Notiz als Spam oder unangemessen melden</a>",
"es": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Reporta esta nota como spam o inapropiada</a>", "es": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Reporta esta nota como spam o inapropiada</a>",
"ca": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Reporta aquesta nota com spam o inapropiada</a>", "ca": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Reporta aquesta nota com spam o inapropiada</a>",
"cs": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Nahlásit tuto poznámku jako spam nebo nevhodnou</a>" "cs": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Nahlásit tuto poznámku jako spam nebo nevhodnou</a>",
"fr": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Signaler cette note comme spam ou contenu inapproprié</a>"
} }
} }
], ],
@ -231,7 +238,8 @@
"de": "<b>Nicht</b> erstellt von {search}", "de": "<b>Nicht</b> erstellt von {search}",
"es": "<b>No</b> abierto por el contributor {search}", "es": "<b>No</b> abierto por el contributor {search}",
"ca": "<b>No</b> obert pel contribuïdor {search}", "ca": "<b>No</b> obert pel contribuïdor {search}",
"cs": "<b>Není</b> otevřeno přispěvatelem {search}" "cs": "<b>Není</b> otevřeno přispěvatelem {search}",
"fr": "<b>Exclure</b>les notes ouvertes par {search}"
} }
} }
] ]
@ -253,7 +261,8 @@
"es": "Editada por última vez por el contributor {search}", "es": "Editada por última vez por el contributor {search}",
"ca": "Editat per última vega pel contribuïdor {search}", "ca": "Editat per última vega pel contribuïdor {search}",
"cs": "Naposledy upravil přispěvatel {search}", "cs": "Naposledy upravil přispěvatel {search}",
"da": "Senest redigeret af bidragsyder {search}" "da": "Senest redigeret af bidragsyder {search}",
"fr": "Dernière modification par {search}"
} }
} }
] ]
@ -274,7 +283,8 @@
"de": "Zuletzt bearbeitet nach dem {search}", "de": "Zuletzt bearbeitet nach dem {search}",
"es": "Abierta después de {search}", "es": "Abierta después de {search}",
"ca": "Oberta després de {search}", "ca": "Oberta després de {search}",
"cs": "Otevřeno po {search}" "cs": "Otevřeno po {search}",
"fr": "Ouverte après le {search}"
} }
} }
] ]
@ -296,7 +306,8 @@
"de": "Erstellt vor dem {search}", "de": "Erstellt vor dem {search}",
"es": "Creada antes de {search}", "es": "Creada antes de {search}",
"ca": "Creada abans de {search}", "ca": "Creada abans de {search}",
"cs": "Vytvořeno před {search}" "cs": "Vytvořeno před {search}",
"fr": "Créée avant le {search}"
} }
} }
] ]
@ -318,7 +329,8 @@
"de": "Erstellt nach dem {search}", "de": "Erstellt nach dem {search}",
"es": "Creada después de {search}", "es": "Creada después de {search}",
"ca": "Creada després de {search}", "ca": "Creada després de {search}",
"cs": "Vytvořeno po {search}" "cs": "Vytvořeno po {search}",
"fr": "Créée après le {search}"
} }
} }
] ]
@ -334,7 +346,8 @@
"de": "Nur Notizen anzeigen, die anonym erstellt wurden", "de": "Nur Notizen anzeigen, die anonym erstellt wurden",
"es": "Solo mostrar las notas abiertas por contributores anómimos", "es": "Solo mostrar las notas abiertas por contributores anómimos",
"ca": "Sols mostrar les notes obertes per contribuïdors anònims", "ca": "Sols mostrar les notes obertes per contribuïdors anònims",
"cs": "Zobrazovat pouze poznámky otevřené anonymním přispěvatelem" "cs": "Zobrazovat pouze poznámky otevřené anonymním přispěvatelem",
"fr": "Montrer uniquement les notes ouvertes par un contributeur anonyme"
} }
} }
] ]
@ -350,7 +363,8 @@
"de": "Nur offene Notizen anzeigen", "de": "Nur offene Notizen anzeigen",
"es": "Solo mostrar las notas abiertas", "es": "Solo mostrar las notas abiertas",
"ca": "Sols mostra les notes obertes", "ca": "Sols mostra les notes obertes",
"cs": "Zobrazit pouze otevřené poznámky" "cs": "Zobrazit pouze otevřené poznámky",
"fr": "Montrer uniquement les notes ouvertes"
} }
} }
] ]
@ -365,7 +379,8 @@
"de": "Alle Notizen", "de": "Alle Notizen",
"es": "Todas las notas", "es": "Todas las notas",
"ca": "Totes les notes", "ca": "Totes les notes",
"cs": "Všechny poznámky" "cs": "Všechny poznámky",
"fr": "Toutes les notes"
} }
}, },
{ {

6
assets/layers/visitor_information_centre/visitor_information_centre.json
View file

@ -43,7 +43,8 @@
"id": "{name}", "id": "{name}",
"es": "{name}", "es": "{name}",
"da": "{name}", "da": "{name}",
"cs": "{name}" "cs": "{name}",
"zh_Hant": "{name}"
}, },
"mappings": [ "mappings": [
{ {
@ -73,7 +74,8 @@
"id": "{name}", "id": "{name}",
"es": "{name}", "es": "{name}",
"da": "{name}", "da": "{name}",
"cs": "{name}" "cs": "{name}",
"zh_Hant": "{name}"
} }
} }
] ]

3
assets/layers/waste_basket/waste_basket.json
View file

@ -321,7 +321,8 @@
"da": "Alle typer", "da": "Alle typer",
"ca": "Tots els tipus", "ca": "Tots els tipus",
"fr": "Tout type", "fr": "Tout type",
"cs": "Všechny typy" "cs": "Všechny typy",
"zh_Hant": "所有類型"
} }
}, },
{ {

42
assets/layers/waste_disposal/waste_disposal.json
View file

@ -35,7 +35,8 @@
"id": "Pembuangan Limbah", "id": "Pembuangan Limbah",
"da": "Bortskaffelse af affald", "da": "Bortskaffelse af affald",
"ca": "Contenidor de fem", "ca": "Contenidor de fem",
"cs": "Nakládání s odpady" "cs": "Nakládání s odpady",
"zh_Hant": "廢棄物處理"
} }
}, },
"pointRendering": [ "pointRendering": [
@ -68,7 +69,8 @@
"da": "en affaldsbeholder", "da": "en affaldsbeholder",
"ca": "un contenidor de basura", "ca": "un contenidor de basura",
"cs": "koš na odpadky", "cs": "koš na odpadky",
"pl": "kosz na śmieci" "pl": "kosz na śmieci",
"zh_Hant": "廢棄物處理桶"
}, },
"tags": [ "tags": [
"amenity=waste_disposal" "amenity=waste_disposal"
@ -95,7 +97,8 @@
"de": "Was für ein Abfalleimer ist das?", "de": "Was für ein Abfalleimer ist das?",
"ca": "Quin tipus de contenidor de brossa és aquest?", "ca": "Quin tipus de contenidor de brossa és aquest?",
"cs": "Co je to za odpadkový koš?", "cs": "Co je to za odpadkový koš?",
"pl": "Co to za pojemnik na śmieci?" "pl": "Co to za pojemnik na śmieci?",
"zh_Hant": "這是甚麼種類的廢棄物處理箱？"
}, },
"mappings": [ "mappings": [
{ {
@ -104,7 +107,8 @@
"en": "This is a medium to large bin for disposal of (household) waste", "en": "This is a medium to large bin for disposal of (household) waste",
"de": "Dies ist eine Mülltonne oder ein Müllcontainer für (Haushalts-)Abfälle", "de": "Dies ist eine Mülltonne oder ein Müllcontainer für (Haushalts-)Abfälle",
"ca": "Es tracta d'un contenidor mitjà o gran per a dipositar residus (domèstics)", "ca": "Es tracta d'un contenidor mitjà o gran per a dipositar residus (domèstics)",
"cs": "Jedná se o střední až velkou popelnici na (domovní) odpad" "cs": "Jedná se o střední až velkou popelnici na (domovní) odpad",
"zh_Hant": "這是一個中型至大型的桶，用於處理（家庭）廢棄物"
} }
}, },
{ {
@ -114,7 +118,8 @@
"de": "Dies ist eigentlich ein Recyclingcontainer", "de": "Dies ist eigentlich ein Recyclingcontainer",
"ca": "En realitat es tracta d'un contenidor de reciclatge", "ca": "En realitat es tracta d'un contenidor de reciclatge",
"cs": "To je vlastně recyklační kontejner", "cs": "To je vlastně recyklační kontejner",
"pl": "W rzeczywistości jest to pojemnik do recyklingu" "pl": "W rzeczywistości jest to pojemnik do recyklingu",
"zh_Hant": "這實際上是一個回收容器"
}, },
"addExtraTags": [ "addExtraTags": [
"recycling_type=container" "recycling_type=container"
@ -132,7 +137,8 @@
"id": "Akses: {access}", "id": "Akses: {access}",
"da": "Adgang: {access}", "da": "Adgang: {access}",
"ca": "Accés: {access}", "ca": "Accés: {access}",
"cs": "Přístup: {access}" "cs": "Přístup: {access}",
"zh_Hant": "存取：{access}"
}, },
"question": { "question": {
"en": "Who can use this waste disposal bin?", "en": "Who can use this waste disposal bin?",
@ -143,7 +149,8 @@
"da": "Hvem kan bruge denne affaldsbeholder?", "da": "Hvem kan bruge denne affaldsbeholder?",
"ca": "Qui pot utilitzar aquest contenidor de brossa?", "ca": "Qui pot utilitzar aquest contenidor de brossa?",
"cs": "Kdo může používat tento koš na odpadky?", "cs": "Kdo může používat tento koš na odpadky?",
"pl": "Kto może korzystać z tego pojemnika na odpady?" "pl": "Kto może korzystać z tego pojemnika na odpady?",
"zh_Hant": "誰可以使用這個廢棄物處理桶？"
}, },
"freeform": { "freeform": {
"key": "access", "key": "access",
@ -161,7 +168,8 @@
"da": "Denne skraldespand kan bruges af alle", "da": "Denne skraldespand kan bruges af alle",
"ca": "Aquest contenidor es pot utilitzat per qualsevol", "ca": "Aquest contenidor es pot utilitzat per qualsevol",
"cs": "Tento koš může používat kdokoli", "cs": "Tento koš může používat kdokoli",
"pl": "Z tego pojemnika może korzystać każdy" "pl": "Z tego pojemnika może korzystać każdy",
"zh_Hant": "這個桶可以給任何人使用"
} }
}, },
{ {
@ -175,7 +183,8 @@
"da": "Denne skraldespand er privat", "da": "Denne skraldespand er privat",
"ca": "Aquest contenidor és privat", "ca": "Aquest contenidor és privat",
"cs": "Tento koš je soukromý", "cs": "Tento koš je soukromý",
"pl": "Ten kosz jest prywatny" "pl": "Ten kosz jest prywatny",
"zh_Hant": "這個桶是私人的"
} }
}, },
{ {
@ -189,7 +198,8 @@
"da": "Denne skraldespand er kun for beboere", "da": "Denne skraldespand er kun for beboere",
"ca": "Aquest contenidor és només per als residents", "ca": "Aquest contenidor és només per als residents",
"cs": "Tento koš je určen pouze pro obyvatele", "cs": "Tento koš je určen pouze pro obyvatele",
"pl": "Ten kosz jest przeznaczony wyłącznie dla mieszkańców" "pl": "Ten kosz jest przeznaczony wyłącznie dla mieszkańców",
"zh_Hant": "這個桶僅供居民使用"
} }
} }
] ]
@ -205,7 +215,8 @@
"da": "Hvor er denne container placeret?", "da": "Hvor er denne container placeret?",
"ca": "On es troba aquest contenidor?", "ca": "On es troba aquest contenidor?",
"cs": "Kde se nachází tento kontejner?", "cs": "Kde se nachází tento kontejner?",
"pl": "Gdzie znajduje się ten kontener?" "pl": "Gdzie znajduje się ten kontener?",
"zh_Hant": "這個容器位於哪裡？"
}, },
"mappings": [ "mappings": [
{ {
@ -219,7 +230,8 @@
"da": "Dette er en underjordisk container", "da": "Dette er en underjordisk container",
"ca": "Aquest contenidor està soterrat", "ca": "Aquest contenidor està soterrat",
"cs": "Jedná se o podzemní kontejner", "cs": "Jedná se o podzemní kontejner",
"pl": "To jest podziemny kontener" "pl": "To jest podziemny kontener",
"zh_Hant": "這是一個地下容器"
} }
}, },
{ {
@ -233,7 +245,8 @@
"da": "Denne container er placeret indendørs", "da": "Denne container er placeret indendørs",
"ca": "Aquest contenidor està situat a l'interior", "ca": "Aquest contenidor està situat a l'interior",
"cs": "Tento kontejner se nachází uvnitř", "cs": "Tento kontejner se nachází uvnitř",
"pl": "Kontener ten znajduje się w pomieszczeniu zamkniętym" "pl": "Kontener ten znajduje się w pomieszczeniu zamkniętym",
"zh_Hant": "這個容器位於室內"
} }
}, },
{ {
@ -247,7 +260,8 @@
"da": "Denne container er placeret udendørs", "da": "Denne container er placeret udendørs",
"ca": "Aquest contenidor està situat a l'aire lliure", "ca": "Aquest contenidor està situat a l'aire lliure",
"cs": "Tento kontejner se nachází venku", "cs": "Tento kontejner se nachází venku",
"pl": "Kontener ten znajduje się na zewnątrz" "pl": "Kontener ten znajduje się na zewnątrz",
"zh_Hant": "這個容器位於室外"
} }
} }
] ]

6
assets/layers/windturbine/windturbine.json
View file

@ -19,7 +19,8 @@
"da": "Moderne vindmøller til produktion af elektricitet", "da": "Moderne vindmøller til produktion af elektricitet",
"ca": "Molins de vent moderns que generen electricitat", "ca": "Molins de vent moderns que generen electricitat",
"cs": "Moderní větrné mlýny vyrábějící elektřinu", "cs": "Moderní větrné mlýny vyrábějící elektřinu",
"pl": "Nowoczesne wiatraki wytwarzające energię elektryczną" "pl": "Nowoczesne wiatraki wytwarzające energię elektryczną",
"zh_Hant": "現代風車產生電力"
}, },
"source": { "source": {
"osmTags": "generator:source=wind" "osmTags": "generator:source=wind"
@ -281,7 +282,8 @@
"sl": "Dodatne informacije za OpenStreetMap strokovnjake: {fixme}", "sl": "Dodatne informacije za OpenStreetMap strokovnjake: {fixme}",
"es": "Información extra para expertos en OpenStreetMap: {fixme}", "es": "Información extra para expertos en OpenStreetMap: {fixme}",
"ca": "Informació addicional per als experts en OpenStreetMap: {fixme}", "ca": "Informació addicional per als experts en OpenStreetMap: {fixme}",
"cs": "Další informace pro odborníky na OpenStreetMap: {fixme}" "cs": "Další informace pro odborníky na OpenStreetMap: {fixme}",
"zh_Hant": "為 OpenStreetMap 專家提供的額外資訊：{fixme}"
}, },
"question": { "question": {
"en": "Is there something wrong with how this is mapped, that you weren't able to fix here? (leave a note to OpenStreetMap experts)", "en": "Is there something wrong with how this is mapped, that you weren't able to fix here? (leave a note to OpenStreetMap experts)",

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

@ -27,7 +27,7 @@
"nb_NO": "Viser minibanker for å ta ut eller sette inn penger", "nb_NO": "Viser minibanker for å ta ut eller sette inn penger",
"es": "Este mapa muestra los cajeros automáticos para retirar o ingresar dinero", "es": "Este mapa muestra los cajeros automáticos para retirar o ingresar dinero",
"id": "Peta ini menunjukkan ATM untuk menarik atau menyetorkan uang", "id": "Peta ini menunjukkan ATM untuk menarik atau menyetorkan uang",
"zh_Hant": "此地圖顯示了提款或存款的 ATM", "zh_Hant": "此地圖顯示了提款或存款的自動櫃員機",
"eu": "Mapa honek dirua atera edo sartzeko kutxazain automatikoak erakusten ditu", "eu": "Mapa honek dirua atera edo sartzeko kutxazain automatikoak erakusten ditu",
"it": "Questa mappa mostra gli sportelli Bancomat per ritirare o depositare del denaro", "it": "Questa mappa mostra gli sportelli Bancomat per ritirare o depositare del denaro",
"pl": "Ta mapa pokazuje bankomaty, w których można wypłacać lub wpłacać pieniądze", "pl": "Ta mapa pokazuje bankomaty, w których można wypłacać lub wpłacać pieniądze",

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

@ -17,7 +17,7 @@
"nl": "Kaart met alle openbare klokken", "nl": "Kaart met alle openbare klokken",
"ca": "Mapa amb tots els rellotges públics", "ca": "Mapa amb tots els rellotges públics",
"de": "Eine Karte mit öffentlichen Uhren", "de": "Eine Karte mit öffentlichen Uhren",
"es": "Mapa con todos los relojes públicos", "es": "Mapa mostrando todos los relojes públicos",
"cs": "Mapa zobrazující veřejné hodiny", "cs": "Mapa zobrazující veřejné hodiny",
"fr": "Carte affichant toutes les horloges publiques", "fr": "Carte affichant toutes les horloges publiques",
"pl": "Mapa pokazująca wszystkie zegary publiczne", "pl": "Mapa pokazująca wszystkie zegary publiczne",

103
assets/themes/mapcomplete-changes/mapcomplete-changes.json
View file

@ -1,20 +1,13 @@
{ {
"id": "mapcomplete-changes", "id": "mapcomplete-changes",
"title": { "title": {
"en": "Changes made with MapComplete", "en": "Changes made with MapComplete"
"da": "Ændringer lavet med MapComplete",
"de": "Änderungen mit MapComplete"
}, },
"shortDescription": { "shortDescription": {
"en": "Shows changes made by MapComplete", "en": "Shows changes made by MapComplete"
"da": "Vis ændringer lavet med MapComplete",
"de": "Änderungen von MapComplete anzeigen"
}, },
"description": { "description": {
"en": "This maps shows all the changes made with MapComplete", "en": "This maps shows all the changes made with MapComplete"
"da": "Dette kort viser alle ændringer foretaget med MapComplete",
"de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
"pl": "Ta mapa pokazuje wszystkie zmiany wprowadzone za pomocą MapComplete"
}, },
"icon": "./assets/svg/logo.svg", "icon": "./assets/svg/logo.svg",
"hideFromOverview": true, "hideFromOverview": true,
@ -25,9 +18,7 @@
{ {
"id": "mapcomplete-changes", "id": "mapcomplete-changes",
"name": { "name": {
"en": "Changeset centers", "en": "Changeset centers"
"de": "Zentrum der Änderungssätze",
"zh_Hant": "變更集中心"
}, },
"minzoom": 0, "minzoom": 0,
"source": { "source": {
@ -37,51 +28,41 @@
}, },
"title": { "title": {
"render": { "render": {
"en": "Changeset for {theme}", "en": "Changeset for {theme}"
"de": "Änderungssatz für {theme}"
} }
}, },
"description": { "description": {
"en": "Shows all MapComplete changes", "en": "Shows all MapComplete changes"
"da": "Vis alle MapComplete-ændringer",
"de": "Alle MapComplete-Änderungen anzeigen"
}, },
"tagRenderings": [ "tagRenderings": [
{ {
"id": "show_changeset_id", "id": "show_changeset_id",
"render": { "render": {
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>", "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
"de": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
} }
}, },
{ {
"id": "contributor", "id": "contributor",
"question": { "question": {
"en": "What contributor did make this change?", "en": "What contributor did make this change?"
"da": "Hvilke bidragsydere lavede denne ændring?",
"de": "Welcher Mitwirkende hat diese Änderung vorgenommen?"
}, },
"freeform": { "freeform": {
"key": "user" "key": "user"
}, },
"render": { "render": {
"en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>", "en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
"da": "Ændring lavet af <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
"de": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
} }
}, },
{ {
"id": "theme-id", "id": "theme-id",
"question": { "question": {
"en": "What theme was used to make this change?", "en": "What theme was used to make this change?"
"de": "Welches Thema wurde für die Änderung verwendet?"
}, },
"freeform": { "freeform": {
"key": "theme" "key": "theme"
}, },
"render": { "render": {
"en": "Change with theme <a href='https://mapcomplete.org/{theme}'>{theme}</a>", "en": "Change with theme <a href='https://mapcomplete.org/{theme}'>{theme}</a>"
"de": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
} }
}, },
{ {
@ -90,23 +71,19 @@
"key": "locale" "key": "locale"
}, },
"question": { "question": {
"en": "What locale (language) was this change made in?", "en": "What locale (language) was this change made in?"
"de": "In welcher Benutzersprache wurde die Änderung vorgenommen?"
}, },
"render": { "render": {
"en": "User locale is {locale}", "en": "User locale is {locale}"
"de": "Benutzersprache {locale}"
} }
}, },
{ {
"id": "host", "id": "host",
"render": { "render": {
"en": "Change with with <a href='{host}'>{host}</a>", "en": "Change with with <a href='{host}'>{host}</a>"
"de": "Änderung über <a href='{host}'>{host}</a>"
}, },
"question": { "question": {
"en": "What host (website) was this change made with?", "en": "What host (website) was this change made with?"
"de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?"
}, },
"freeform": { "freeform": {
"key": "host" "key": "host"
@ -127,13 +104,10 @@
{ {
"id": "version", "id": "version",
"question": { "question": {
"en": "What version of MapComplete was used to make this change?", "en": "What version of MapComplete was used to make this change?"
"de": "Mit welcher MapComplete Version wurde die Änderung vorgenommen?"
}, },
"render": { "render": {
"en": "Made with {editor}", "en": "Made with {editor}"
"da": "Lavet med {editor}",
"de": "Erstellt mit {editor}"
}, },
"freeform": { "freeform": {
"key": "editor" "key": "editor"
@ -519,10 +493,7 @@
} }
], ],
"question": { "question": {
"en": "Themename contains {search}", "en": "Themename contains {search}"
"da": "Temanavn indeholder {search}",
"de": "Themenname enthält {search}",
"pl": "Nazwa tematu zawiera {search}"
} }
} }
] ]
@ -538,9 +509,7 @@
} }
], ],
"question": { "question": {
"en": "Themename does <b>not</b> contain {search}", "en": "Themename does <b>not</b> contain {search}"
"da": "Temanavn indeholder <b>ikke</b> {search}",
"de": "Themename enthält <b>not</b> {search}"
} }
} }
] ]
@ -556,9 +525,7 @@
} }
], ],
"question": { "question": {
"en": "Made by contributor {search}", "en": "Made by contributor {search}"
"da": "Lavet af bidragsyder {search}",
"de": "Erstellt vom Mitwirkenden {search}"
} }
} }
] ]
@ -574,9 +541,7 @@
} }
], ],
"question": { "question": {
"en": "<b>Not</b> made by contributor {search}", "en": "<b>Not</b> made by contributor {search}"
"da": "<b>Ikke</b> lavet af bidragsyder {search}",
"de": "<b>Nicht</b> erstellt von Mitwirkendem {search}"
} }
} }
] ]
@ -593,9 +558,7 @@
} }
], ],
"question": { "question": {
"en": "Made before {search}", "en": "Made before {search}"
"da": "Lavet før {search}",
"de": "Erstellt vor {search}"
} }
} }
] ]
@ -612,9 +575,7 @@
} }
], ],
"question": { "question": {
"en": "Made after {search}", "en": "Made after {search}"
"da": "Lavet efter {search}",
"de": "Erstellt nach {search}"
} }
} }
] ]
@ -630,8 +591,7 @@
} }
], ],
"question": { "question": {
"en": "User language (iso-code) {search}", "en": "User language (iso-code) {search}"
"de": "Benutzersprache (ISO-Code) {search}"
} }
} }
] ]
@ -647,8 +607,7 @@
} }
], ],
"question": { "question": {
"en": "Made with host {search}", "en": "Made with host {search}"
"de": "Erstellt mit Host {search}"
} }
} }
] ]
@ -659,8 +618,7 @@
{ {
"osmTags": "add-image>0", "osmTags": "add-image>0",
"question": { "question": {
"en": "Changeset added at least one image", "en": "Changeset added at least one image"
"de": "Änderungssatz hat mindestens ein Bild hinzugefügt"
} }
} }
] ]
@ -671,8 +629,7 @@
{ {
"osmTags": "theme!=grb", "osmTags": "theme!=grb",
"question": { "question": {
"en": "Exclude GRB theme", "en": "Exclude GRB theme"
"de": "GRB-Thema ausschließen"
} }
} }
] ]
@ -683,8 +640,7 @@
{ {
"osmTags": "theme!=etymology", "osmTags": "theme!=etymology",
"question": { "question": {
"en": "Exclude etymology theme", "en": "Exclude etymology theme"
"de": "Etymologie-Thema ausschließen"
} }
} }
] ]
@ -699,8 +655,7 @@
{ {
"id": "link_to_more", "id": "link_to_more",
"render": { "render": {
"en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>", "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
"de": "Weitere Statistiken gibt es <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
} }
}, },
{ {

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

@ -9,7 +9,7 @@
"ja": "オープントイレマップ", "ja": "オープントイレマップ",
"zh_Hant": "公共廁所", "zh_Hant": "公共廁所",
"pl": "Publiczne toalety", "pl": "Publiczne toalety",
"it": "Mappa libera delle toilet", "it": "Servizi igienici pubblici",
"nb_NO": "Åpent toalettkart", "nb_NO": "Åpent toalettkart",
"hu": "WC-térkép", "hu": "WC-térkép",
"ca": "Lavabos públics", "ca": "Lavabos públics",

9
langs/de.json
View file

@ -322,6 +322,7 @@
"openStreetMapIntro": "<h3>Eine offene Karte</h3><p>Eine Karte, die jeder frei nutzen und bearbeiten kann. Ein einziger Ort, um alle Geoinformationen zu speichern. Unterschiedliche, kleine, inkompatible und veraltete Karten werden nirgendwo gebraucht.</p><p><b><a href='https://OpenStreetMap.org' target='_blank'>OpenStreetMap</a></b> ist nicht die feindliche Karte. Die Kartendaten können frei verwendet werden (mit <a href='https://osm.org/copyright' target='_blank'>Benennung und Veröffentlichung von Änderungen an diesen Daten</a>). Jeder kann neue Daten hinzufügen und Fehler korrigieren. Diese Webseite nutzt OpenStreetMap. Alle Daten stammen von dort, und Ihre Antworten und Korrekturen werden überall verwendet.</p><p>Viele Menschen und Anwendungen nutzen bereits OpenStreetMap: <a href='https://organicmaps.app/' target='_blank'>Organic Maps</a>, <a href='https://osmAnd.net' target='_blank'>OsmAnd</a>; auch die Kartendaten von Facebook, Instagram, Apple-maps und Bing-maps stammen (teilweise) von OpenStreetMap.</p>", "openStreetMapIntro": "<h3>Eine offene Karte</h3><p>Eine Karte, die jeder frei nutzen und bearbeiten kann. Ein einziger Ort, um alle Geoinformationen zu speichern. Unterschiedliche, kleine, inkompatible und veraltete Karten werden nirgendwo gebraucht.</p><p><b><a href='https://OpenStreetMap.org' target='_blank'>OpenStreetMap</a></b> ist nicht die feindliche Karte. Die Kartendaten können frei verwendet werden (mit <a href='https://osm.org/copyright' target='_blank'>Benennung und Veröffentlichung von Änderungen an diesen Daten</a>). Jeder kann neue Daten hinzufügen und Fehler korrigieren. Diese Webseite nutzt OpenStreetMap. Alle Daten stammen von dort, und Ihre Antworten und Korrekturen werden überall verwendet.</p><p>Viele Menschen und Anwendungen nutzen bereits OpenStreetMap: <a href='https://organicmaps.app/' target='_blank'>Organic Maps</a>, <a href='https://osmAnd.net' target='_blank'>OsmAnd</a>; auch die Kartendaten von Facebook, Instagram, Apple-maps und Bing-maps stammen (teilweise) von OpenStreetMap.</p>",
"openTheMap": "Karte öffnen", "openTheMap": "Karte öffnen",
"openTheMapAtGeolocation": "Zum eigenen Standort zoomen", "openTheMapAtGeolocation": "Zum eigenen Standort zoomen",
"openTheMapReason": "zum anzeigen, bearbeiten und hinzufügen von informationen",
"opening_hours": { "opening_hours": {
"all_days_from": "Geöffnet täglich {ranges}", "all_days_from": "Geöffnet täglich {ranges}",
"closed_permanently": "Geschlossen auf unbestimmte Zeit", "closed_permanently": "Geschlossen auf unbestimmte Zeit",
@ -401,9 +402,15 @@
"copiedToClipboard": "Verknüpfung in Zwischenablage kopiert", "copiedToClipboard": "Verknüpfung in Zwischenablage kopiert",
"documentation": "Für weitere Informationen über verfügbare URL-Parameter, <a href='https://github.com/pietervdvn/MapComplete/blob/develop/Docs/URL_Parameters.md' target='_blank'>siehe Dokumentation</a>", "documentation": "Für weitere Informationen über verfügbare URL-Parameter, <a href='https://github.com/pietervdvn/MapComplete/blob/develop/Docs/URL_Parameters.md' target='_blank'>siehe Dokumentation</a>",
"embedIntro": "<h3>Karte in Webseiten einbetten</h3>Betten Sie diese Karte in Ihre Webseite ein. <br/>Wir ermutigen Sie gern dazu - Sie müssen nicht mal um Erlaubnis fragen.<br/> Die Karte ist kostenlos und wird es immer sein. Je mehr Leute die Karte benutzen, desto wertvoller wird sie.", "embedIntro": "<h3>Karte in Webseiten einbetten</h3>Betten Sie diese Karte in Ihre Webseite ein. <br/>Wir ermutigen Sie gern dazu - Sie müssen nicht mal um Erlaubnis fragen.<br/> Die Karte ist kostenlos und wird es immer sein. Je mehr Leute die Karte benutzen, desto wertvoller wird sie.",
"fsUserbadge": "Anmeldefeld aktivieren", "fsBackground": "Umschalten von Hintergründen aktivieren",
"fsFilter": "Aktiviere die Möglichkeit, Ebenen und Filter umzuschalten",
"fsGeolocation": "Geolokation aktivieren",
"fsUserbadge": "Aktiviere den Login-Button und damit die Möglichkeit, Änderungen vorzunehmen",
"fsWelcomeMessage": "Begrüßung und Registerkarten anzeigen", "fsWelcomeMessage": "Begrüßung und Registerkarten anzeigen",
"intro": "<h3>Karte teilen</h3> Mit dem folgenden Link können Sie diese Karte mit Freunden und Familie teilen:", "intro": "<h3>Karte teilen</h3> Mit dem folgenden Link können Sie diese Karte mit Freunden und Familie teilen:",
"openLayers": "Öffne das Ebenen- und Filter-Menü",
"options": "Optionen teilen",
"stateIsIncluded": "Der aktuelle Zustand der Ebenen und Filter ist im gemeinsamen Link und iFrame enthalten.",
"thanksForSharing": "Danke für das Teilen!", "thanksForSharing": "Danke für das Teilen!",
"title": "Diese Karte teilen" "title": "Diese Karte teilen"
}, },

36
langs/es.json
View file

@ -20,6 +20,7 @@
"cancel": "Cancelar", "cancel": "Cancelar",
"cannotBeDeleted": "Esta función no puede ser eliminada", "cannotBeDeleted": "Esta función no puede ser eliminada",
"delete": "Eliminar", "delete": "Eliminar",
"deletedTitle": "Característica eliminada",
"explanations": { "explanations": {
"hardDelete": "Este elemento será eliminado en OpenStreetMap. Puede ser recuperado por un colaborador experimentado", "hardDelete": "Este elemento será eliminado en OpenStreetMap. Puede ser recuperado por un colaborador experimentado",
"retagNoOtherThemes": "Esta característica será reclasificada y ocultada en esta aplicación", "retagNoOtherThemes": "Esta característica será reclasificada y ocultada en esta aplicación",
@ -27,6 +28,7 @@
"selectReason": "Por favor, seleccione el motivo por el que esta característica debe ser eliminada", "selectReason": "Por favor, seleccione el motivo por el que esta característica debe ser eliminada",
"softDelete": "Esta característica se actualizará y se ocultará de esta aplicación. <span class='subtle'>{reason}</span>" "softDelete": "Esta característica se actualizará y se ocultará de esta aplicación. <span class='subtle'>{reason}</span>"
}, },
"isChanged": "Esta característica ha sido cambiada y ya no coincide con esta capa",
"isDeleted": "Esta función se ha eliminado", "isDeleted": "Esta función se ha eliminado",
"isntAPoint": "Solo los nodos pueden ser eliminados, esta característica es una vía, área o relación.", "isntAPoint": "Solo los nodos pueden ser eliminados, esta característica es una vía, área o relación.",
"loading": "Inspeccionando las propiedades para comprobar si esta característica puede ser eliminada.", "loading": "Inspeccionando las propiedades para comprobar si esta característica puede ser eliminada.",
@ -45,6 +47,18 @@
"useSomethingElse": "Utilice otro editor de OpenStreetMap para eliminarlo", "useSomethingElse": "Utilice otro editor de OpenStreetMap para eliminarlo",
"whyDelete": "¿Por qué debería eliminarse este elemento?" "whyDelete": "¿Por qué debería eliminarse este elemento?"
}, },
"external": {
"allAreApplied": "Todos los valores externos desaparecidos han sido copiados en OpenStreetMap",
"allIncluded": "El dato cargado desde {source} está contenida en OpenStreetMap",
"apply": "Aplicar",
"applyAll": "Aplicar todos los valores perdidos",
"conflicting": {
"intro": "OpenStreetMap tiene un valor diferente al sitio web de origen para los siguientes valores.",
"title": "Elementos conflictivos"
},
"currentInOsmIs": "Por el momento, OpenStreetMap tiene el siguiente valor registrado:",
"done": "Listo"
},
"favourite": { "favourite": {
"loginNeeded": "<h3>Entrar</h3>El diseño personalizado sólo está disponible para los usuarios de OpenStreetMap", "loginNeeded": "<h3>Entrar</h3>El diseño personalizado sólo está disponible para los usuarios de OpenStreetMap",
"panelIntro": "<h3>Tu tema personal</h3>Activa tus capas favoritas de todas los temas oficiales", "panelIntro": "<h3>Tu tema personal</h3>Activa tus capas favoritas de todas los temas oficiales",
@ -136,7 +150,7 @@
"intro": "Has marcado un lugar del que no conocemos los datos.<br/>", "intro": "Has marcado un lugar del que no conocemos los datos.<br/>",
"layerNotEnabled": "La capa {layer} no está habilitada. Activa esta capa para poder añadir un elemento", "layerNotEnabled": "La capa {layer} no está habilitada. Activa esta capa para poder añadir un elemento",
"openLayerControl": "Abrir el control de capas", "openLayerControl": "Abrir el control de capas",
"pleaseLogin": "Por favor inicia sesión para añadir un nuevo elemento", "pleaseLogin": "Por favor inicia sesión con OpenStreetMap para añadir un nuevo elemento",
"presetInfo": "El nuevo POI tendrá {tags}", "presetInfo": "El nuevo POI tendrá {tags}",
"stillLoading": "Los datos se siguen cargando. Espera un poco antes de añadir una nueva función.", "stillLoading": "Los datos se siguen cargando. Espera un poco antes de añadir una nueva función.",
"title": "Añadir un elemento nuevo", "title": "Añadir un elemento nuevo",
@ -242,7 +256,7 @@
"openTheMap": "Abrir el mapa", "openTheMap": "Abrir el mapa",
"opening_hours": { "opening_hours": {
"closed_permanently": "Cerrado - sin día de apertura conocido", "closed_permanently": "Cerrado - sin día de apertura conocido",
"closed_until": "Cerrado hasta {date}", "closed_until": "Abierto el {date}",
"error_loading": "Error: no se han podido visualizar esos horarios de apertura.", "error_loading": "Error: no se han podido visualizar esos horarios de apertura.",
"loadingCountry": "Determinando país…", "loadingCountry": "Determinando país…",
"not_all_rules_parsed": "El horario de esta tienda es complejo. Las normas siguientes serán ignoradas en la entrada:", "not_all_rules_parsed": "El horario de esta tienda es complejo. Las normas siguientes serán ignoradas en la entrada:",
@ -275,7 +289,7 @@
"removeLocationHistory": "Eliminar el historial de ubicaciones", "removeLocationHistory": "Eliminar el historial de ubicaciones",
"returnToTheMap": "Volver al mapa", "returnToTheMap": "Volver al mapa",
"save": "Guardar", "save": "Guardar",
"screenToSmall": "Abrir {theme} en una ventana nueva", "screenToSmall": "Abrir <i>{theme}</i> en una ventana nueva",
"search": { "search": {
"error": "Alguna cosa no ha ido bien…", "error": "Alguna cosa no ha ido bien…",
"nothing": "Nada encontrado…", "nothing": "Nada encontrado…",
@ -285,7 +299,7 @@
"sharescreen": { "sharescreen": {
"copiedToClipboard": "Enlace copiado en el portapapeles", "copiedToClipboard": "Enlace copiado en el portapapeles",
"embedIntro": "<h3>Inclúyelo en tu página web</h3>Incluye este mapa en tu página web. <br/> Te animamos a que lo hagas, no hace falta que pidas permiso. <br/> Es gratis, y siempre lo será. A más gente que lo use más valioso será.", "embedIntro": "<h3>Inclúyelo en tu página web</h3>Incluye este mapa en tu página web. <br/> Te animamos a que lo hagas, no hace falta que pidas permiso. <br/> Es gratis, y siempre lo será. A más gente que lo use más valioso será.",
"fsUserbadge": "Activar el botón de entrada", "fsUserbadge": "Activa el botón de inicio de sesión y por lo tanto la posibilidad de hacer cambios",
"fsWelcomeMessage": "Muestra el mensaje emergente de bienvenida y pestañas asociadas", "fsWelcomeMessage": "Muestra el mensaje emergente de bienvenida y pestañas asociadas",
"intro": "<h3>Comparte este mapa</h3> Comparte este mapa copiando el enlace de debajo y enviándolo a amigos y familia:", "intro": "<h3>Comparte este mapa</h3> Comparte este mapa copiando el enlace de debajo y enviándolo a amigos y familia:",
"thanksForSharing": "Gracias por compartir!", "thanksForSharing": "Gracias por compartir!",
@ -318,7 +332,7 @@
}, },
"welcomeBack": "¡Bienvenido de nuevo!", "welcomeBack": "¡Bienvenido de nuevo!",
"welcomeExplanation": { "welcomeExplanation": {
"addNew": "Toque el mapa para añadir un nuevo POI.", "addNew": "¿Un artículo falta? Utilice el botón en la parte inferior izquierda para añadir un nuevo punto de interés.",
"general": "En este mapa, puedes ver, editar y agregar <i>puntos de interés</i>. Haz zoom para ver los POI, toca uno para ver o editar la información. Todos los datos proceden y se guardan en OpenStreetMap, que puede reutilizarse libremente." "general": "En este mapa, puedes ver, editar y agregar <i>puntos de interés</i>. Haz zoom para ver los POI, toca uno para ver o editar la información. Todos los datos proceden y se guardan en OpenStreetMap, que puede reutilizarse libremente."
}, },
"wikipedia": { "wikipedia": {
@ -370,13 +384,13 @@
"index": { "index": {
"#": "Estos textos son mostrados sobre los botones del tema cuando no hay un tema cargado", "#": "Estos textos son mostrados sobre los botones del tema cuando no hay un tema cargado",
"featuredThemeTitle": "Esta semana destacamos", "featuredThemeTitle": "Esta semana destacamos",
"intro": "MapComplete a un visor y editor de OpenStreetMap, que te muestra información sobre un tema específico.", "intro": "Mapas sobre diversos temas a los que contribuye",
"logIn": "Inicia sesión para ver otros temas que visitaste anteriormente", "logIn": "Inicia sesión para ver otros temas que visitaste anteriormente",
"pickTheme": "Elige un tema de abajo para empezar.", "pickTheme": "Elige un tema de abajo para empezar.",
"title": "Le damos la bienvenida a MapComplete" "title": "MapComplete"
}, },
"move": { "move": {
"cancel": "Cancelar movimiento", "cancel": "Elige una razón diferente",
"cannotBeMoved": "Esta característica no se puede mover.", "cannotBeMoved": "Esta característica no se puede mover.",
"confirmMove": "Mover aquí", "confirmMove": "Mover aquí",
"inviteToMove": { "inviteToMove": {
@ -393,7 +407,7 @@
"partOfRelation": "Esta característica es parte de una relación. Utiliza otro editor para moverla.", "partOfRelation": "Esta característica es parte de una relación. Utiliza otro editor para moverla.",
"pointIsMoved": "Este punto ha sido eliminado", "pointIsMoved": "Este punto ha sido eliminado",
"reasons": { "reasons": {
"reasonInaccurate": "La localización de este objeto no es precisa y debe de ser movida algunos metros", "reasonInaccurate": "La ubicación es inexacta por unos pocos metros",
"reasonRelocation": "El objeto a sido relocalizado a una localización completamente diferente" "reasonRelocation": "El objeto a sido relocalizado a una localización completamente diferente"
}, },
"selectReason": "¿Por qué has movido este objeto?", "selectReason": "¿Por qué has movido este objeto?",
@ -441,7 +455,7 @@
"geodataTitle": "Tu geoubicación", "geodataTitle": "Tu geoubicación",
"intro": "La privacidad es importante - tanto para el individual como para la sociedad. MapComplete intenta respetar tu privacidad tanto como sea posible - hasta el punto de que no se necesita ningún banner de cookies molesto es necesario. De todas formas, nos gustaría informarte de qué información se recolecta y se comparte, bajo que circunstancias y por qué se hacen estos compromisos.", "intro": "La privacidad es importante - tanto para el individual como para la sociedad. MapComplete intenta respetar tu privacidad tanto como sea posible - hasta el punto de que no se necesita ningún banner de cookies molesto es necesario. De todas formas, nos gustaría informarte de qué información se recolecta y se comparte, bajo que circunstancias y por qué se hacen estos compromisos.",
"items": { "items": {
"changesYouMake": " Los cambios que has hecho", "changesYouMake": "Los cambios que has hecho",
"date": "Cuándo se efectuó el cambio", "date": "Cuándo se efectuó el cambio",
"distanceIndicator": "Una indicación de como de cerca estabas a los objetos cambiados. Otros mapeadores pueden utilizar esta información para determina si un cambio se hizo basándose en un sondeo o en una investigación remota", "distanceIndicator": "Una indicación de como de cerca estabas a los objetos cambiados. Otros mapeadores pueden utilizar esta información para determina si un cambio se hizo basándose en un sondeo o en una investigación remota",
"language": "El idioma de la interfaz de usuario", "language": "El idioma de la interfaz de usuario",
@ -459,7 +473,7 @@
"reviews": { "reviews": {
"affiliated_reviewer_warning": "(Revisión afiliada)", "affiliated_reviewer_warning": "(Revisión afiliada)",
"name_required": "Se requiere un nombre para mostrar y crear comentarios", "name_required": "Se requiere un nombre para mostrar y crear comentarios",
"no_reviews_yet": "Aún no hay reseñas. ¡Sé el primero en escribir una y ayuda a los datos abiertos y a los negocios!", "no_reviews_yet": "Todavía no hay comentarios. ¡Sé el primero!",
"saved": "Reseña guardada. ¡Gracias por compartir!", "saved": "Reseña guardada. ¡Gracias por compartir!",
"saving_review": "Guardando…", "saving_review": "Guardando…",
"title": "{count} comentarios", "title": "{count} comentarios",

2
langs/fr.json
View file

@ -232,6 +232,7 @@
"openStreetMapIntro": "<h3>Une carte ouverte</h3><p>Utilisable et éditable librement. Une seule et unique plateforme regroupant toutes les informations géographiques ? Toutes ces différentes cartes isolées, incompatibles et obsolètes ne sont plus utiles.</p><p><b><a href=\"https://OpenStreetMap.org\" target=\"_blank\">OpenStreetMap</a></b> n’est pas un énième concurrent. Toutes les données de cette carte peuvent être utilisé librement (avec <a href=\"https://osm.org/copyright\" target=\"_blank\"> attribution et publication des changements de données</a>). De plus tout le monde est libre d'ajouter de nouvelles données et corriger les erreurs. Ce site utilise également OpenStreetMap. Toutes les données en proviennent et tous les ajouts et modifications y seront également ajoutés.</p><p>De nombreux individus et applications utilisent déjà OpenStreetMap : <a href=\"https://maps.me/\" target=\"_blank\">Maps.me</a>, <a href=\"https://osmAnd.net\" target=\"_blank\">OsmAnd</a>, mais aussi les cartes de Facebook, Instagram, Apple Maps et Bing Maps sont (en partie) alimentées par OpenStreetMap</p>", "openStreetMapIntro": "<h3>Une carte ouverte</h3><p>Utilisable et éditable librement. Une seule et unique plateforme regroupant toutes les informations géographiques ? Toutes ces différentes cartes isolées, incompatibles et obsolètes ne sont plus utiles.</p><p><b><a href=\"https://OpenStreetMap.org\" target=\"_blank\">OpenStreetMap</a></b> n’est pas un énième concurrent. Toutes les données de cette carte peuvent être utilisé librement (avec <a href=\"https://osm.org/copyright\" target=\"_blank\"> attribution et publication des changements de données</a>). De plus tout le monde est libre d'ajouter de nouvelles données et corriger les erreurs. Ce site utilise également OpenStreetMap. Toutes les données en proviennent et tous les ajouts et modifications y seront également ajoutés.</p><p>De nombreux individus et applications utilisent déjà OpenStreetMap : <a href=\"https://maps.me/\" target=\"_blank\">Maps.me</a>, <a href=\"https://osmAnd.net\" target=\"_blank\">OsmAnd</a>, mais aussi les cartes de Facebook, Instagram, Apple Maps et Bing Maps sont (en partie) alimentées par OpenStreetMap</p>",
"openTheMap": "Ouvrir la carte", "openTheMap": "Ouvrir la carte",
"openTheMapAtGeolocation": "Zoom sur votre position", "openTheMapAtGeolocation": "Zoom sur votre position",
"openTheMapReason": "pour la voir, l'éditer et modifier des informations",
"opening_hours": { "opening_hours": {
"closed_permanently": "Fermé", "closed_permanently": "Fermé",
"closed_until": "Fermé jusqu'au {date}", "closed_until": "Fermé jusqu'au {date}",
@ -368,6 +369,7 @@
"intro": "MapComplete autorise les raccourcis clavier suivants :", "intro": "MapComplete autorise les raccourcis clavier suivants :",
"key": "Combinaison de touches", "key": "Combinaison de touches",
"openLayersPanel": "Ouvre le panneau fond-de-plan, couches et filtres", "openLayersPanel": "Ouvre le panneau fond-de-plan, couches et filtres",
"selectFavourites": "Ouvrir la page des favoris",
"selectMapnik": "Appliquer le fond de carte OpenStreetMap-carto", "selectMapnik": "Appliquer le fond de carte OpenStreetMap-carto",
"selectSearch": "Sélectionner la barre de recherche de lieux", "selectSearch": "Sélectionner la barre de recherche de lieux",
"title": "Raccourcis clavier", "title": "Raccourcis clavier",

482
langs/layers/fr.json
View file

@ -35,6 +35,23 @@
"1": { "1": {
"title": "un panneau à affiches scellé au sol" "title": "un panneau à affiches scellé au sol"
}, },
"10": {
"description": "Une pièce de textile imperméable avec un message imprimé, ancrée de façon permanente sur un mur.",
"title": "une bâche"
},
"11": {
"title": "un totem"
},
"12": {
"description": "Désigne une enseigne publicitaire, une enseigne néon, les logos ou des indications d'entrées",
"title": "une enseigne"
},
"13": {
"title": "une sculpture"
},
"14": {
"title": "une peinture murale"
},
"2": { "2": {
"title": "un panneau à affiches monté sur un mur" "title": "un panneau à affiches monté sur un mur"
}, },
@ -60,23 +77,6 @@
}, },
"9": { "9": {
"title": "un écran fixé sur un abri de transport" "title": "un écran fixé sur un abri de transport"
},
"10": {
"description": "Une pièce de textile imperméable avec un message imprimé, ancrée de façon permanente sur un mur.",
"title": "une bâche"
},
"11": {
"title": "un totem"
},
"12": {
"description": "Désigne une enseigne publicitaire, une enseigne néon, les logos ou des indications d'entrées",
"title": "une enseigne"
},
"13": {
"title": "une sculpture"
},
"14": {
"title": "une peinture murale"
} }
}, },
"tagRenderings": { "tagRenderings": {
@ -168,6 +168,9 @@
"1": { "1": {
"then": "C'est un petit panneau" "then": "C'est un petit panneau"
}, },
"10": {
"then": "C'est une peinture murale"
},
"2": { "2": {
"then": "C'est une colonne" "then": "C'est une colonne"
}, },
@ -191,9 +194,6 @@
}, },
"9": { "9": {
"then": "C'est un totem" "then": "C'est un totem"
},
"10": {
"then": "C'est une peinture murale"
} }
}, },
"question": "De quel type de dispositif publicitaire s'agit-il ?", "question": "De quel type de dispositif publicitaire s'agit-il ?",
@ -205,6 +205,9 @@
"1": { "1": {
"then": "Petit panneau" "then": "Petit panneau"
}, },
"10": {
"then": "Peinture murale"
},
"3": { "3": {
"then": "Colonne" "then": "Colonne"
}, },
@ -225,9 +228,6 @@
}, },
"9": { "9": {
"then": "Totem" "then": "Totem"
},
"10": {
"then": "Peinture murale"
} }
} }
} }
@ -300,6 +300,36 @@
"render": "Station d’ambulances" "render": "Station d’ambulances"
} }
}, },
"animal_shelter": {
"name": "Abri pour animaux",
"presets": {
"0": {
"title": "refuge animalier"
}
},
"tagRenderings": {
"2": {
"question": "Quel est le nom de ce refuge animalier ?",
"render": "Ce refuge s'appelle <b>{name}</b>"
},
"6": {
"mappings": {
"0": {
"then": "Les animaux sont gardés jusqu'à ce qu'ils soient adoptés par un nouveau maître"
},
"1": {
"then": "Les animaux sont recueillis pour le reste de leur vie"
},
"2": {
"then": "Les animaux blessés sont soignés jusqu'à ce qu'ils soient en état d'être relâchés dans la nature "
}
}
}
},
"title": {
"render": "Un refuge animalier"
}
},
"artwork": { "artwork": {
"description": "Une carte ouverte de statues, bustes, graffitis et autres œuvres d'art de par le monde", "description": "Une carte ouverte de statues, bustes, graffitis et autres œuvres d'art de par le monde",
"name": "Œuvres d'art", "name": "Œuvres d'art",
@ -328,6 +358,15 @@
"1": { "1": {
"then": "Peinture murale" "then": "Peinture murale"
}, },
"10": {
"then": "Azulejo (faïence latine)"
},
"11": {
"then": "Carrelage"
},
"12": {
"then": "Sculpture sur bois"
},
"2": { "2": {
"then": "Peinture" "then": "Peinture"
}, },
@ -351,15 +390,6 @@
}, },
"9": { "9": {
"then": "Relief" "then": "Relief"
},
"10": {
"then": "Azulejo (faïence latine)"
},
"11": {
"then": "Carrelage"
},
"12": {
"then": "Sculpture sur bois"
} }
}, },
"question": "Quel est le type de cette œuvre d'art ?", "question": "Quel est le type de cette œuvre d'art ?",
@ -1757,6 +1787,31 @@
} }
} }
} }
},
"tagRenderings": {
"Authentication": {
"mappings": {
"0": {
"then": "Authentification par carte de membre"
},
"1": {
"then": "Authentification par une application"
},
"2": {
"then": "Authentification possible par appel téléphonique"
},
"3": {
"then": "Authentification possible par SMS"
}
}
},
"Operational status": {
"mappings": {
"0": {
"then": "Cette station de recharge fonctionne"
}
}
}
} }
}, },
"climbing": { "climbing": {
@ -2451,6 +2506,15 @@
"1": { "1": {
"then": "Cette piste cyclable est goudronée" "then": "Cette piste cyclable est goudronée"
}, },
"10": {
"then": "Cette piste cyclable est faite en graviers fins"
},
"11": {
"then": "Cette piste cyclable est en cailloux"
},
"12": {
"then": "Cette piste cyclable est faite en sol brut"
},
"2": { "2": {
"then": "Cette piste cyclable est asphaltée" "then": "Cette piste cyclable est asphaltée"
}, },
@ -2474,15 +2538,6 @@
}, },
"9": { "9": {
"then": "Cette piste cyclable est faite en graviers" "then": "Cette piste cyclable est faite en graviers"
},
"10": {
"then": "Cette piste cyclable est faite en graviers fins"
},
"11": {
"then": "Cette piste cyclable est en cailloux"
},
"12": {
"then": "Cette piste cyclable est faite en sol brut"
} }
}, },
"question": "De quoi est faite la surface de la piste cyclable ?", "question": "De quoi est faite la surface de la piste cyclable ?",
@ -2531,6 +2586,15 @@
"1": { "1": {
"then": "Cette piste cyclable est pavée" "then": "Cette piste cyclable est pavée"
}, },
"10": {
"then": "Cette piste cyclable est faite en graviers fins"
},
"11": {
"then": "Cette piste cyclable est en cailloux"
},
"12": {
"then": "Cette piste cyclable est faite en sol brut"
},
"2": { "2": {
"then": "Cette piste cyclable est asphaltée" "then": "Cette piste cyclable est asphaltée"
}, },
@ -2554,15 +2618,6 @@
}, },
"9": { "9": {
"then": "Cette piste cyclable est faite en graviers" "then": "Cette piste cyclable est faite en graviers"
},
"10": {
"then": "Cette piste cyclable est faite en graviers fins"
},
"11": {
"then": "Cette piste cyclable est en cailloux"
},
"12": {
"then": "Cette piste cyclable est faite en sol brut"
} }
}, },
"question": "De quel materiel est faite cette rue ?", "question": "De quel materiel est faite cette rue ?",
@ -3412,6 +3467,21 @@
"1": { "1": {
"then": "C'est une friterie" "then": "C'est une friterie"
}, },
"10": {
"then": "Des plats chinois sont servis ici"
},
"11": {
"then": "Des plats grecs sont servis ici"
},
"12": {
"then": "Des plats indiens sont servis ici"
},
"13": {
"then": "Des plats turcs sont servis ici"
},
"14": {
"then": "Des plats thaïlandais sont servis ici"
},
"2": { "2": {
"then": "Restaurant Italien" "then": "Restaurant Italien"
}, },
@ -3435,21 +3505,6 @@
}, },
"9": { "9": {
"then": "Des plats français sont servis ici" "then": "Des plats français sont servis ici"
},
"10": {
"then": "Des plats chinois sont servis ici"
},
"11": {
"then": "Des plats grecs sont servis ici"
},
"12": {
"then": "Des plats indiens sont servis ici"
},
"13": {
"then": "Des plats turcs sont servis ici"
},
"14": {
"then": "Des plats thaïlandais sont servis ici"
} }
}, },
"question": "Quelle type de nourriture est servie ici ?", "question": "Quelle type de nourriture est servie ici ?",
@ -3843,11 +3898,11 @@
}, },
"room-type": { "room-type": {
"mappings": { "mappings": {
"4": {
"then": "C'est une salle de classe"
},
"14": { "14": {
"then": "C'est un bureau" "then": "C'est un bureau"
},
"4": {
"then": "C'est une salle de classe"
} }
} }
} }
@ -4128,6 +4183,18 @@
"1": { "1": {
"then": "C'est une plaque" "then": "C'est une plaque"
}, },
"10": {
"then": "C'est une croix"
},
"11": {
"then": "C'est une plaque bleue (spécifique aux pays anglo-saxons)"
},
"12": {
"then": "C'est un char historique, placé de manière permanente dans l'espace public comme mémorial"
},
"13": {
"then": "C'est un arbre du souvenir"
},
"2": { "2": {
"then": "C'est un banc commémoratif" "then": "C'est un banc commémoratif"
}, },
@ -4151,18 +4218,6 @@
}, },
"9": { "9": {
"then": "C'est un obélisque" "then": "C'est un obélisque"
},
"10": {
"then": "C'est une croix"
},
"11": {
"then": "C'est une plaque bleue (spécifique aux pays anglo-saxons)"
},
"12": {
"then": "C'est un char historique, placé de manière permanente dans l'espace public comme mémorial"
},
"13": {
"then": "C'est un arbre du souvenir"
} }
}, },
"question": "C'est un mémorial de guerre", "question": "C'est un mémorial de guerre",
@ -4300,12 +4355,103 @@
}, },
"note": { "note": {
"filter": { "filter": {
"10": {
"options": {
"0": {
"question": "Toutes les notes"
}
}
},
"2": { "2": {
"options": { "options": {
"0": { "0": {
"question": "Ouverte par {search}" "question": "Ouverte par {search}"
} }
} }
},
"3": {
"options": {
"0": {
"question": "<b>Exclure</b>les notes ouvertes par {search}"
}
}
},
"4": {
"options": {
"0": {
"question": "Dernière modification par {search}"
}
}
},
"5": {
"options": {
"0": {
"question": "Ouverte après le {search}"
}
}
},
"6": {
"options": {
"0": {
"question": "Créée avant le {search}"
}
}
},
"7": {
"options": {
"0": {
"question": "Créée après le {search}"
}
}
},
"8": {
"options": {
"0": {
"question": "Montrer uniquement les notes ouvertes par un contributeur anonyme"
}
}
},
"9": {
"options": {
"0": {
"question": "Montrer uniquement les notes ouvertes"
}
}
},
"10": {
"options": {
"0": {
"question": "Toutes les notes"
}
}
}
},
"name": "Notes OpenStreetMap",
"tagRenderings": {
"nearby-images": {
"render": {
"before": "<h3>Images à proximité</h3>Les images suivantes sont dans les environs de cette note et pourraient aider à sa résolution."
}
},
"report-contributor": {
"render": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={_first_user_id}&reportable_type=User' target='_blank' class='subtle'>Signaler {_first_user} pour du spam ou des messages inapropriés</a>"
},
"report-note": {
"render": "<a href='https://www.openstreetmap.org/reports/new?reportable_id={id}&reportable_type=Note' target='_blank'>Signaler cette note comme spam ou contenu inapproprié</a>"
}
},
"title": {
"mappings": {
"0": {
"then": "Note fermée"
}
},
"render": "Note"
},
"titleIcons": {
"0": {
"ariaLabel": "Voir sur OpenStreetMap.org"
} }
} }
}, },
@ -5254,30 +5400,6 @@
"1": { "1": {
"question": "Recyclage de piles et batteries domestiques" "question": "Recyclage de piles et batteries domestiques"
}, },
"2": {
"question": "Recyclage d'emballage de boissons"
},
"3": {
"question": "Recyclage de boites de conserve et de canettes"
},
"4": {
"question": "Recyclage de vêtements"
},
"5": {
"question": "Recyclage des huiles de friture"
},
"6": {
"question": "Recyclage des huiles de moteur"
},
"7": {
"question": "Recyclage des lampes fluorescentes"
},
"8": {
"question": "Recyclage des déchets verts"
},
"9": {
"question": "Recyclage des bouteilles en verre et des bocaux"
},
"10": { "10": {
"question": "Recyclage de tout type de verre" "question": "Recyclage de tout type de verre"
}, },
@ -5308,11 +5430,35 @@
"19": { "19": {
"question": "Recyclage des autres déchets" "question": "Recyclage des autres déchets"
}, },
"2": {
"question": "Recyclage d'emballage de boissons"
},
"20": { "20": {
"question": "Recyclage des cartouches d'imprimante" "question": "Recyclage des cartouches d'imprimante"
}, },
"21": { "21": {
"question": "Recyclage des vélos" "question": "Recyclage des vélos"
},
"3": {
"question": "Recyclage de boites de conserve et de canettes"
},
"4": {
"question": "Recyclage de vêtements"
},
"5": {
"question": "Recyclage des huiles de friture"
},
"6": {
"question": "Recyclage des huiles de moteur"
},
"7": {
"question": "Recyclage des lampes fluorescentes"
},
"8": {
"question": "Recyclage des déchets verts"
},
"9": {
"question": "Recyclage des bouteilles en verre et des bocaux"
} }
} }
}, },
@ -5375,30 +5521,6 @@
"1": { "1": {
"then": "Les briques alimentaires en carton peuvent être recyclées ici" "then": "Les briques alimentaires en carton peuvent être recyclées ici"
}, },
"2": {
"then": "Les boites de conserve et canettes peuvent être recyclées ici"
},
"3": {
"then": "Les vêtements peuvent être recyclés ici"
},
"4": {
"then": "Les huiles de friture peuvent être recyclées ici"
},
"5": {
"then": "Les huiles de moteur peuvent être recyclées ici"
},
"6": {
"then": "Les lampes fluorescentes peuvent être recyclées ici"
},
"7": {
"then": "Les déchets verts peuvent être recyclés ici"
},
"8": {
"then": "Les déchets organiques peuvent être recyclés ici"
},
"9": {
"then": "Les bouteilles en verre et bocaux peuvent être recyclés ici"
},
"10": { "10": {
"then": "Tout type de verre peut être recyclé ici" "then": "Tout type de verre peut être recyclé ici"
}, },
@ -5426,6 +5548,9 @@
"19": { "19": {
"then": "La ferraille peut être recyclée ici" "then": "La ferraille peut être recyclée ici"
}, },
"2": {
"then": "Les boites de conserve et canettes peuvent être recyclées ici"
},
"20": { "20": {
"then": "Les chaussures peuvent être recyclées ici" "then": "Les chaussures peuvent être recyclées ici"
}, },
@ -5443,6 +5568,27 @@
}, },
"25": { "25": {
"then": "Les vélos peuvent être recyclés ici" "then": "Les vélos peuvent être recyclés ici"
},
"3": {
"then": "Les vêtements peuvent être recyclés ici"
},
"4": {
"then": "Les huiles de friture peuvent être recyclées ici"
},
"5": {
"then": "Les huiles de moteur peuvent être recyclées ici"
},
"6": {
"then": "Les lampes fluorescentes peuvent être recyclées ici"
},
"7": {
"then": "Les déchets verts peuvent être recyclés ici"
},
"8": {
"then": "Les déchets organiques peuvent être recyclés ici"
},
"9": {
"then": "Les bouteilles en verre et bocaux peuvent être recyclés ici"
} }
}, },
"question": "Que peut-on recycler ici ?" "question": "Que peut-on recycler ici ?"
@ -6891,6 +7037,27 @@
"1": { "1": {
"question": "Vente de boissons" "question": "Vente de boissons"
}, },
"10": {
"question": "Vente de lait"
},
"11": {
"question": "Vente de pain"
},
"12": {
"question": "Vente d'œufs"
},
"13": {
"question": "Vente de fromage"
},
"14": {
"question": "Vente de miel"
},
"15": {
"question": "Vente de pommes de terre"
},
"19": {
"question": "Vente de fleurs"
},
"2": { "2": {
"question": "Ventre de confiseries" "question": "Ventre de confiseries"
}, },
@ -6914,27 +7081,6 @@
}, },
"9": { "9": {
"question": "Vente de chambres à air pour vélo" "question": "Vente de chambres à air pour vélo"
},
"10": {
"question": "Vente de lait"
},
"11": {
"question": "Vente de pain"
},
"12": {
"question": "Vente d'œufs"
},
"13": {
"question": "Vente de fromage"
},
"14": {
"question": "Vente de miel"
},
"15": {
"question": "Vente de pommes de terre"
},
"19": {
"question": "Vente de fleurs"
} }
} }
} }
@ -6992,6 +7138,24 @@
"1": { "1": {
"then": "Vent des confiseries" "then": "Vent des confiseries"
}, },
"10": {
"then": "Vent du pain"
},
"11": {
"then": "Vent des œufs"
},
"12": {
"then": "Vent du fromage"
},
"13": {
"then": "Vent du miel"
},
"14": {
"then": "Vent des pommes de terre"
},
"18": {
"then": "Vent des fleurs"
},
"2": { "2": {
"then": "Vent de la nourriture" "then": "Vent de la nourriture"
}, },
@ -7015,24 +7179,6 @@
}, },
"9": { "9": {
"then": "Vent du lait" "then": "Vent du lait"
},
"10": {
"then": "Vent du pain"
},
"11": {
"then": "Vent des œufs"
},
"12": {
"then": "Vent du fromage"
},
"13": {
"then": "Vent du miel"
},
"14": {
"then": "Vent des pommes de terre"
},
"18": {
"then": "Vent des fleurs"
} }
}, },
"question": "Que vent ce distributeur ?", "question": "Que vent ce distributeur ?",
@ -7235,4 +7381,4 @@
"render": "éolienne" "render": "éolienne"
} }
} }
} }

105
langs/layers/zh_Hant.json
View file

@ -16,8 +16,12 @@
"render": "門牌號碼是 <b>{addr:housenumber}</b>" "render": "門牌號碼是 <b>{addr:housenumber}</b>"
}, },
"street": { "street": {
"question": "地址所在的道路是？" "question": "地址所在的道路是？",
"render": "此地址位於街道 <b>{addr:street}</b>"
} }
},
"title": {
"render": "已知的地址"
} }
}, },
"advertising": { "advertising": {
@ -52,6 +56,12 @@
"1": { "1": {
"then": "壁畫" "then": "壁畫"
}, },
"10": {
"then": "Azulejo (西班牙雕塑作品名稱)"
},
"11": {
"then": "瓷磚"
},
"2": { "2": {
"then": "繪畫" "then": "繪畫"
}, },
@ -75,12 +85,6 @@
}, },
"9": { "9": {
"then": "寬慰" "then": "寬慰"
},
"10": {
"then": "Azulejo (西班牙雕塑作品名稱)"
},
"11": {
"then": "瓷磚"
} }
}, },
"question": "這是什麼類型的藝術品？", "question": "這是什麼類型的藝術品？",
@ -104,6 +108,9 @@
"render": "藝術品" "render": "藝術品"
} }
}, },
"atm": {
"description": "自動櫃員機以提款"
},
"barrier": { "barrier": {
"tagRenderings": { "tagRenderings": {
"bicycle=yes/no": { "bicycle=yes/no": {
@ -132,7 +139,7 @@
"then": "靠背：有" "then": "靠背：有"
}, },
"2": { "2": {
"then": "靠背：無" "then": "此長椅<b>沒有</b>靠背"
} }
}, },
"question": "這個長椅是否有靠背？" "question": "這個長椅是否有靠背？"
@ -576,6 +583,9 @@
} }
} }
}, },
"maxspeed": {
"description": "顯示每條道路的允許速度"
},
"postboxes": { "postboxes": {
"description": "這圖層顯示郵筒。", "description": "這圖層顯示郵筒。",
"name": "郵筒", "name": "郵筒",
@ -808,10 +818,84 @@
} }
} }
}, },
"visitor_information_centre": {
"title": {
"mappings": {
"1": {
"then": "{name}"
}
},
"render": "{name}"
}
},
"walls_and_buildings": { "walls_and_buildings": {
"description": "特殊的內建圖層顯示所有牆壁與建築。這個圖層對於規畫要靠牆的東西 (例如 AED、郵筒、入口、地址、監視器等) 相當實用。這個圖層預設顯示而且無法由使用者開關。" "description": "特殊的內建圖層顯示所有牆壁與建築。這個圖層對於規畫要靠牆的東西 (例如 AED、郵筒、入口、地址、監視器等) 相當實用。這個圖層預設顯示而且無法由使用者開關。"
}, },
"waste_basket": {
"filter": {
"0": {
"options": {
"0": {
"question": "所有類型"
}
}
}
}
},
"waste_disposal": {
"presets": {
"0": {
"title": "廢棄物處理桶"
}
},
"tagRenderings": {
"access": {
"mappings": {
"0": {
"then": "這個桶可以給任何人使用"
},
"1": {
"then": "這個桶是私人的"
},
"2": {
"then": "這個桶僅供居民使用"
}
},
"question": "誰可以使用這個廢棄物處理桶？",
"render": "存取：{access}"
},
"disposal-location": {
"mappings": {
"0": {
"then": "這是一個地下容器"
},
"1": {
"then": "這個容器位於室內"
},
"2": {
"then": "這個容器位於室外"
}
},
"question": "這個容器位於哪裡？"
},
"type": {
"mappings": {
"0": {
"then": "這是一個中型至大型的桶，用於處理（家庭）廢棄物"
},
"1": {
"then": "這實際上是一個回收容器"
}
},
"question": "這是甚麼種類的廢棄物處理箱？"
}
},
"title": {
"render": "廢棄物處理"
}
},
"windturbine": { "windturbine": {
"description": "現代風車產生電力",
"name": "風機", "name": "風機",
"presets": { "presets": {
"0": { "0": {
@ -838,6 +922,9 @@
"turbine-start-date": { "turbine-start-date": {
"question": "這個風機何時開始營運？", "question": "這個風機何時開始營運？",
"render": "這個風機從 {start_date} 開始運轉。" "render": "這個風機從 {start_date} 開始運轉。"
},
"windturbine-fixme": {
"render": "為 OpenStreetMap 專家提供的額外資訊：{fixme}"
} }
}, },
"title": { "title": {
@ -849,4 +936,4 @@
"render": "風機" "render": "風機"
} }
} }
} }

1
langs/nl.json
View file

@ -259,6 +259,7 @@
"openStreetMapIntro": "<h3>Een open kaart</h3><p>Zou het niet fantastisch zijn als er een open kaart zou zijn die door iedereen aangepast én gebruikt kan worden? Een kaart waar iedereen zijn interesses aan zou kunnen toevoegen? Dan zouden er geen duizend-en-één verschillende kleine kaartjes, websites, ... meer nodig zijn</p><p><b><a href=\"https://OpenStreetMap.org\" target=\"_blank\">OpenStreetMap</a></b> is deze open kaart. Je mag de kaartdata gratis gebruiken (mits <a href=\"https://osm.org/copyright\" target=\"_blank\">bronvermelding en herpublicatie van aanpassingen</a>). Daarenboven mag je de kaart ook gratis aanpassen als je een account maakt. Ook deze website is gebaseerd op OpenStreetMap. Als je hier een vraag beantwoord, gaat het antwoord daar ook naartoe</p><p>Tenslotte zijn er reeds vele gebruikers van OpenStreetMap. Denk maar <a href=\"https://organicmaps.app//\" target=\"_blank\">Organic Maps</a>, <a href=\"https://osmAnd.net\" target=\"_blank\">OsmAnd</a>, verschillende gespecialiseerde routeplanners, de achtergrondkaarten op Facebook, Instagram,...<br/>;Zelfs Apple Maps en Bing-Maps gebruiken OpenStreetMap in hun kaarten!</p><p></p><p>Kortom, als je hier een punt toevoegd of een vraag beantwoord, zal dat na een tijdje ook in al dié applicaties te zien zijn.</p>", "openStreetMapIntro": "<h3>Een open kaart</h3><p>Zou het niet fantastisch zijn als er een open kaart zou zijn die door iedereen aangepast én gebruikt kan worden? Een kaart waar iedereen zijn interesses aan zou kunnen toevoegen? Dan zouden er geen duizend-en-één verschillende kleine kaartjes, websites, ... meer nodig zijn</p><p><b><a href=\"https://OpenStreetMap.org\" target=\"_blank\">OpenStreetMap</a></b> is deze open kaart. Je mag de kaartdata gratis gebruiken (mits <a href=\"https://osm.org/copyright\" target=\"_blank\">bronvermelding en herpublicatie van aanpassingen</a>). Daarenboven mag je de kaart ook gratis aanpassen als je een account maakt. Ook deze website is gebaseerd op OpenStreetMap. Als je hier een vraag beantwoord, gaat het antwoord daar ook naartoe</p><p>Tenslotte zijn er reeds vele gebruikers van OpenStreetMap. Denk maar <a href=\"https://organicmaps.app//\" target=\"_blank\">Organic Maps</a>, <a href=\"https://osmAnd.net\" target=\"_blank\">OsmAnd</a>, verschillende gespecialiseerde routeplanners, de achtergrondkaarten op Facebook, Instagram,...<br/>;Zelfs Apple Maps en Bing-Maps gebruiken OpenStreetMap in hun kaarten!</p><p></p><p>Kortom, als je hier een punt toevoegd of een vraag beantwoord, zal dat na een tijdje ook in al dié applicaties te zien zijn.</p>",
"openTheMap": "Raadpleeg de kaart", "openTheMap": "Raadpleeg de kaart",
"openTheMapAtGeolocation": "Ga naar jouw locatie", "openTheMapAtGeolocation": "Ga naar jouw locatie",
"openTheMapReason": "om informatie te zien, te wijzigen en toe te voegen",
"opening_hours": { "opening_hours": {
"all_days_from": "Elke dag geopend {ranges}", "all_days_from": "Elke dag geopend {ranges}",
"closed_permanently": "Gesloten voor onbepaalde tijd", "closed_permanently": "Gesloten voor onbepaalde tijd",

66
langs/themes/es.json
View file

@ -440,7 +440,7 @@
"title": "Gimnasios de escalada, clubes y lugares" "title": "Gimnasios de escalada, clubes y lugares"
}, },
"clock": { "clock": {
"description": "Mapa con todos los relojes públicos", "description": "Mapa mostrando todos los relojes públicos",
"title": "Relojes" "title": "Relojes"
}, },
"cycle_highways": { "cycle_highways": {
@ -956,6 +956,33 @@
"onwheels": { "onwheels": {
"description": "En este mapa se muestran los lugares accesibles al público en silla de ruedas, que pueden añadirse fácilmente", "description": "En este mapa se muestran los lugares accesibles al público en silla de ruedas, que pueden añadirse fácilmente",
"layers": { "layers": {
"19": {
"override": {
"=title": {
"render": "Estadísticas"
}
}
},
"20": {
"override": {
"+tagRenderings": {
"0": {
"render": {
"special": {
"text": "Importar"
}
}
},
"1": {
"render": {
"special": {
"message": "Añadir todas las etiquetas sugeridas"
}
}
}
}
}
},
"4": { "4": {
"override": { "override": {
"filter": { "filter": {
@ -998,33 +1025,6 @@
"override": { "override": {
"name": "Plazas de aparcamiento para discapacitados" "name": "Plazas de aparcamiento para discapacitados"
} }
},
"19": {
"override": {
"=title": {
"render": "Estadísticas"
}
}
},
"20": {
"override": {
"+tagRenderings": {
"0": {
"render": {
"special": {
"text": "Importar"
}
}
},
"1": {
"render": {
"special": {
"message": "Añadir todas las etiquetas sugeridas"
}
}
}
}
}
} }
}, },
"title": "Sobre ruedas" "title": "Sobre ruedas"
@ -1240,10 +1240,6 @@
"stations": { "stations": {
"description": "Ver, editar y añadir detalles a una estación de tren", "description": "Ver, editar y añadir detalles a una estación de tren",
"layers": { "layers": {
"3": {
"description": "Capa que muestra las estaciones de tren",
"name": "Estación de Tren"
},
"16": { "16": {
"description": "Pantallas que muestran los trenes que saldrán de esta estación", "description": "Pantallas que muestran los trenes que saldrán de esta estación",
"name": "Tableros de salidas", "name": "Tableros de salidas",
@ -1275,6 +1271,10 @@
"title": { "title": {
"render": "Tablero de salidas" "render": "Tablero de salidas"
} }
},
"3": {
"description": "Capa que muestra las estaciones de tren",
"name": "Estación de Tren"
} }
}, },
"title": "Estaciones de tren" "title": "Estaciones de tren"
@ -1453,4 +1453,4 @@
"shortDescription": "Un mapa con papeleras", "shortDescription": "Un mapa con papeleras",
"title": "Papeleras" "title": "Papeleras"
} }
} }

67
langs/themes/fr.json
View file

@ -833,6 +833,9 @@
}, },
"title": "Ressauts et traversées" "title": "Ressauts et traversées"
}, },
"mapcomplete-changes": {
"title": "Modifications faites avec MapComplete"
},
"maproulette": { "maproulette": {
"description": "Thème MapRoulette permettant d’afficher, rechercher, filtrer et résoudre les tâches.", "description": "Thème MapRoulette permettant d’afficher, rechercher, filtrer et résoudre les tâches.",
"title": "Tâches MapRoulette" "title": "Tâches MapRoulette"
@ -868,6 +871,33 @@
"onwheels": { "onwheels": {
"description": "Sur cette carte nous pouvons voir et ajouter les différents endroits publiques accessibles aux chaises roulantes", "description": "Sur cette carte nous pouvons voir et ajouter les différents endroits publiques accessibles aux chaises roulantes",
"layers": { "layers": {
"19": {
"override": {
"=title": {
"render": "Statistiques"
}
}
},
"20": {
"override": {
"+tagRenderings": {
"0": {
"render": {
"special": {
"text": "Importation"
}
}
},
"1": {
"render": {
"special": {
"message": "Ajouter tous les attributs suggérés"
}
}
}
}
}
},
"4": { "4": {
"override": { "override": {
"filter": { "filter": {
@ -910,33 +940,6 @@
"override": { "override": {
"name": "Places de stationnement pour personnes handicapées" "name": "Places de stationnement pour personnes handicapées"
} }
},
"19": {
"override": {
"=title": {
"render": "Statistiques"
}
}
},
"20": {
"override": {
"+tagRenderings": {
"0": {
"render": {
"special": {
"text": "Importation"
}
}
},
"1": {
"render": {
"special": {
"message": "Ajouter tous les attributs suggérés"
}
}
}
}
}
} }
}, },
"title": "OnWheels" "title": "OnWheels"
@ -1100,10 +1103,6 @@
"stations": { "stations": {
"description": "Voir, modifier et ajouter des détails à une gare ferroviaire", "description": "Voir, modifier et ajouter des détails à une gare ferroviaire",
"layers": { "layers": {
"3": {
"description": "Couche montrant les gares",
"name": "Gares ferroviaires"
},
"16": { "16": {
"description": "Panneau affichant les trains au départ depuis cette gare", "description": "Panneau affichant les trains au départ depuis cette gare",
"name": "Panneaux des départs", "name": "Panneaux des départs",
@ -1135,6 +1134,10 @@
"title": { "title": {
"render": "Tableau des départs" "render": "Tableau des départs"
} }
},
"3": {
"description": "Couche montrant les gares",
"name": "Gares ferroviaires"
} }
}, },
"title": "Gares ferroviaires" "title": "Gares ferroviaires"
@ -1256,4 +1259,4 @@
"shortDescription": "Une carte des poubelles", "shortDescription": "Une carte des poubelles",
"title": "Poubelles" "title": "Poubelles"
} }
} }

4
langs/themes/it.json
View file

@ -698,7 +698,7 @@
}, },
"toilets": { "toilets": {
"description": "Una cartina dei servizi igienici pubblici", "description": "Una cartina dei servizi igienici pubblici",
"title": "Mappa libera delle toilet" "title": "Servizi igienici pubblici"
}, },
"trees": { "trees": {
"description": "Mappa tutti gli alberi!", "description": "Mappa tutti gli alberi!",
@ -714,4 +714,4 @@
"shortDescription": "Una cartina dei cestini dei rifiuti", "shortDescription": "Una cartina dei cestini dei rifiuti",
"title": "Cestino dei rifiuti" "title": "Cestino dei rifiuti"
} }
} }

12
langs/themes/zh_Hant.json
View file

@ -13,7 +13,7 @@
"title": "藝術品" "title": "藝術品"
}, },
"atm": { "atm": {
"description": "此地圖顯示了提款或存款的 ATM", "description": "此地圖顯示了提款或存款的自動櫃員機",
"layers": { "layers": {
"3": { "3": {
"override": { "override": {
@ -597,10 +597,6 @@
}, },
"stations": { "stations": {
"layers": { "layers": {
"3": {
"description": "顯示火車站的圖層",
"name": "火車站"
},
"16": { "16": {
"name": "出發板", "name": "出發板",
"presets": { "presets": {
@ -621,6 +617,10 @@
"title": { "title": {
"render": "時刻表" "render": "時刻表"
} }
},
"3": {
"description": "顯示火車站的圖層",
"name": "火車站"
} }
}, },
"title": "火車站" "title": "火車站"
@ -722,4 +722,4 @@
"shortDescription": "垃圾筒的地圖", "shortDescription": "垃圾筒的地圖",
"title": "垃圾筒" "title": "垃圾筒"
} }
} }

33
langs/zh_Hant.json
View file

@ -58,14 +58,16 @@
}, },
"currentInOsmIs": "目前，OpenStreetMap 記錄了以下值：", "currentInOsmIs": "目前，OpenStreetMap 記錄了以下值：",
"done": "完成", "done": "完成",
"error": "錯誤", "error": "無法從網站載入已連結的資料",
"lastModified": "外部資料已經最近修改於 {date}",
"loadedFrom": "下列資料透過內嵌 JSON-LD 由 <a href={url}>{source}</a> 載入", "loadedFrom": "下列資料透過內嵌 JSON-LD 由 <a href={url}>{source}</a> 載入",
"missing": { "missing": {
"intro": "開放街圖沒有下列屬性的資訊", "intro": "開放街圖沒有下列屬性的資訊",
"title": "遺失的物件" "title": "遺失的物件"
}, },
"noDataLoaded": "外部網站沒有可以載入的已連結資料", "noDataLoaded": "外部網站沒有可以載入的已連結資料",
"overwrite": "在 OpenStreetMap 中覆寫" "overwrite": "在 OpenStreetMap 中覆寫",
"title": "已從外部網站載入結構化資料"
}, },
"favourite": { "favourite": {
"loginNeeded": "<h3>登入</h3>只有開放街圖使用者才有個人化樣式", "loginNeeded": "<h3>登入</h3>只有開放街圖使用者才有個人化樣式",
@ -185,6 +187,7 @@
"editId": "開啟開放街圖線上編輯器", "editId": "開啟開放街圖線上編輯器",
"editJosm": "採用 JOSM 編輯", "editJosm": "採用 JOSM 編輯",
"followOnMastodon": "在 Mastodon 追蹤 MapComplete", "followOnMastodon": "在 Mastodon 追蹤 MapComplete",
"gotoSourceCode": "檢視原始碼",
"iconAttribution": { "iconAttribution": {
"title": "使用的圖示" "title": "使用的圖示"
}, },
@ -197,6 +200,8 @@
"openIssueTracker": "提出臭蟲報告", "openIssueTracker": "提出臭蟲報告",
"openMapillary": "開啟 Mapillary", "openMapillary": "開啟 Mapillary",
"openOsmcha": "請見 {theme} 的最新編輯", "openOsmcha": "請見 {theme} 的最新編輯",
"openOsmchaLastWeek": "檢視最近 7 天的編輯",
"openThemeDocumentation": "開啟專題地圖 {name} 的文件",
"seeOnMapillary": "在 Mapillary 觀看這張影像", "seeOnMapillary": "在 Mapillary 觀看這張影像",
"themeBy": "由 {author} 維護主題", "themeBy": "由 {author} 維護主題",
"title": "版權與署名", "title": "版權與署名",
@ -317,10 +322,11 @@
"openStreetMapIntro": "<h3>開放的地圖</h3><p>如果有一份地圖，任何人都能使用與自由編輯，單一的地圖能夠儲存所有地理相關資訊。不同的、範圍小的，不相容甚至過時不再被需要的地圖。</p><p><b><a href=\"https://OpenStreetMap.org\" target=\"_blank\">開放街圖</a></b>不是敵人的地圖，人人都能自由使用這些圖資， (只要<a href=\"https://osm.org/copyright\" target=\"_blank\">署名與公開變動這資料</a>)。任何人都能新增新資料與修正錯誤，這些網站也用開放街圖，資料也都來自開放街圖，你的答案與修正也會加被用到/p&gt;</p><p>許多人與應用程式已經採用開放街圖了：<a href=\"https://organicmaps.app//\" target=\"_blank\">Organic Maps</a>、<a href=\"https://osmAnd.net\" target=\"_blank\">OsmAnd</a>，還有 Facebook、Instagram，蘋果地圖、Bing 地圖(部分)採用開放街圖。</p>", "openStreetMapIntro": "<h3>開放的地圖</h3><p>如果有一份地圖，任何人都能使用與自由編輯，單一的地圖能夠儲存所有地理相關資訊。不同的、範圍小的，不相容甚至過時不再被需要的地圖。</p><p><b><a href=\"https://OpenStreetMap.org\" target=\"_blank\">開放街圖</a></b>不是敵人的地圖，人人都能自由使用這些圖資， (只要<a href=\"https://osm.org/copyright\" target=\"_blank\">署名與公開變動這資料</a>)。任何人都能新增新資料與修正錯誤，這些網站也用開放街圖，資料也都來自開放街圖，你的答案與修正也會加被用到/p&gt;</p><p>許多人與應用程式已經採用開放街圖了：<a href=\"https://organicmaps.app//\" target=\"_blank\">Organic Maps</a>、<a href=\"https://osmAnd.net\" target=\"_blank\">OsmAnd</a>，還有 Facebook、Instagram，蘋果地圖、Bing 地圖(部分)採用開放街圖。</p>",
"openTheMap": "開啟地圖", "openTheMap": "開啟地圖",
"openTheMapAtGeolocation": "縮放到你的位置", "openTheMapAtGeolocation": "縮放到你的位置",
"openTheMapReason": "以檢視、編輯和增加資訊",
"opening_hours": { "opening_hours": {
"all_days_from": "每天都有營業 {ranges}", "all_days_from": "每天都有營業 {ranges}",
"closed_permanently": "不清楚關閉多久了", "closed_permanently": "不清楚關閉多久了",
"closed_until": "{date} 起關閉", "closed_until": "開放於 {date}",
"error": "無法解析營業時間", "error": "無法解析營業時間",
"error_loading": "錯誤：無法視覺化開放時間。", "error_loading": "錯誤：無法視覺化開放時間。",
"friday": "星期五時 {ranges}", "friday": "星期五時 {ranges}",
@ -354,6 +360,7 @@
"versionInfo": "v{version} - {date} 產生的" "versionInfo": "v{version} - {date} 產生的"
}, },
"pickLanguage": "選擇語言", "pickLanguage": "選擇語言",
"poweredByMapComplete": "由 MapComplete 提供支援—群眾外包，OpenStreetMap 的專題地圖",
"poweredByOsm": "由開放街圖資料驅動", "poweredByOsm": "由開放街圖資料驅動",
"questionBox": { "questionBox": {
"answeredMultiple": "你回答 {answered} 問題", "answeredMultiple": "你回答 {answered} 問題",
@ -377,9 +384,10 @@
}, },
"readYourMessages": "請先閱讀開放街圖訊息之前再來新增新圖徵。", "readYourMessages": "請先閱讀開放街圖訊息之前再來新增新圖徵。",
"removeLocationHistory": "刪除位置歷史", "removeLocationHistory": "刪除位置歷史",
"retry": "重試",
"returnToTheMap": "回到地圖", "returnToTheMap": "回到地圖",
"save": "儲存", "save": "儲存",
"screenToSmall": "在新視窗開啟 {theme}", "screenToSmall": "在新視窗中開啟 <i>{theme}</i>",
"search": { "search": {
"error": "有狀況發生了…", "error": "有狀況發生了…",
"nothing": "沒有找到…", "nothing": "沒有找到…",
@ -388,14 +396,21 @@
"searching": "搜尋中…" "searching": "搜尋中…"
}, },
"searchAnswer": "搜尋選項…", "searchAnswer": "搜尋選項…",
"seeIndex": "查看所有專題地圖的概覽",
"share": "分享", "share": "分享",
"sharescreen": { "sharescreen": {
"copiedToClipboard": "複製連結到簡貼簿", "copiedToClipboard": "複製連結到簡貼簿",
"documentation": "要知道更多可以用的網址參數，<a href='https://github.com/pietervdvn/MapComplete/blob/develop/Docs/URL_Parameters.md' target='_blank'>參考這份文章</a>", "documentation": "要知道更多可以用的網址參數，<a href='https://github.com/pietervdvn/MapComplete/blob/develop/Docs/URL_Parameters.md' target='_blank'>參考這份文章</a>",
"embedIntro": "<h3>嵌入到你的網站</h3>請考慮將這份地圖嵌入您的網站。<br/>地圖毋須額外授權，非常歡迎您多加利用。<br/>一切都是免費的，而且之後也是免費的，越有更多人使用，則越顯得它的價值。", "embedIntro": "<h3>嵌入到你的網站</h3>請考慮將這份地圖嵌入您的網站。<br/>地圖毋須額外授權，非常歡迎您多加利用。<br/>一切都是免費的，而且之後也是免費的，越有更多人使用，則越顯得它的價值。",
"fsUserbadge": "啟用登入按鈕", "fsBackground": "啟用切換背景",
"fsFilter": "啟用切換圖層和過濾器的可能性",
"fsGeolocation": "啟用地理定位",
"fsUserbadge": "啟用登入按鈕，從而可以進行變更",
"fsWelcomeMessage": "顯示歡迎訊息以及相關頁籤", "fsWelcomeMessage": "顯示歡迎訊息以及相關頁籤",
"intro": "<h3>分享這地圖</h3>複製下面的連結來向朋友與家人分享這份地圖：", "intro": "<h3>分享這地圖</h3>複製下面的連結來向朋友與家人分享這份地圖：",
"openLayers": "開啟圖層和過濾器選單",
"options": "分享選項",
"stateIsIncluded": "目前的圖層和過濾器狀態已包含在分享連結和 iframe 中。",
"thanksForSharing": "感謝分享！", "thanksForSharing": "感謝分享！",
"title": "分享這份地圖" "title": "分享這份地圖"
}, },
@ -592,14 +607,16 @@
}, },
"index": { "index": {
"#": "當沒有載入主題時，這些文字會在主題按鈕上面顯示", "#": "當沒有載入主題時，這些文字會在主題按鈕上面顯示",
"about": "關於 MapComplete",
"featuredThemeTitle": "這週的焦點", "featuredThemeTitle": "這週的焦點",
"intro": "關於您貢獻的各種主題的地圖", "intro": "關於您貢獻的各種主題的地圖",
"learnMore": "瞭解更多",
"logIn": "登入來看其他你先前查看的主題", "logIn": "登入來看其他你先前查看的主題",
"pickTheme": "請挑選主題來開始。", "pickTheme": "請挑選主題來開始。",
"title": "MapComplete" "title": "MapComplete"
}, },
"move": { "move": {
"cancel": "取消移動", "cancel": "選擇不同的原因",
"cannotBeMoved": "這個圖徵無法移動。", "cannotBeMoved": "這個圖徵無法移動。",
"confirmMove": "移動至這裏", "confirmMove": "移動至這裏",
"inviteToMove": { "inviteToMove": {
@ -616,7 +633,7 @@
"partOfRelation": "這個圖徵是關聯的一部分，請用其他編輯器來移動。", "partOfRelation": "這個圖徵是關聯的一部分，請用其他編輯器來移動。",
"pointIsMoved": "這個點已經被移動了", "pointIsMoved": "這個點已經被移動了",
"reasons": { "reasons": {
"reasonInaccurate": "這個物件的位置並不準確，應該移動個幾公尺", "reasonInaccurate": "位置不準確，誤差幾公尺",
"reasonRelocation": "你的物件已經移動到完全不同的位置" "reasonRelocation": "你的物件已經移動到完全不同的位置"
}, },
"selectReason": "為什麼你移動這個物件？", "selectReason": "為什麼你移動這個物件？",
@ -709,7 +726,7 @@
"i_am_affiliated": "我是這物件的相關關係者", "i_am_affiliated": "我是這物件的相關關係者",
"i_am_affiliated_explanation": "檢查你是否是店主、創造者或是員工…", "i_am_affiliated_explanation": "檢查你是否是店主、創造者或是員工…",
"name_required": "需要有名稱才能顯示和創造審核", "name_required": "需要有名稱才能顯示和創造審核",
"no_reviews_yet": "還沒有審核，當第一個撰寫者來幫助開放資料與商家吧！", "no_reviews_yet": "還沒有評論。成為第一個！",
"non_place_review": "並未顯示一篇與地點無關的評論。", "non_place_review": "並未顯示一篇與地點無關的評論。",
"non_place_reviews": "並未顯示 {n} 篇與地點無關的評論。", "non_place_reviews": "並未顯示 {n} 篇與地點無關的評論。",
"question": "你會怎麼評分 {title()} ？", "question": "你會怎麼評分 {title()} ？",

16
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "mapcomplete", "name": "mapcomplete",
"version": "0.44.0", "version": "0.44.4",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mapcomplete", "name": "mapcomplete",
"version": "0.44.0", "version": "0.44.4",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
"@comunica/core": "^3.0.1", "@comunica/core": "^3.0.1",
@ -7893,9 +7893,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001636", "version": "1.0.30001640",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz",
"integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==", "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -25250,9 +25250,9 @@
"version": "2.0.1" "version": "2.0.1"
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30001636", "version": "1.0.30001640",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz",
"integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==", "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==",
"dev": true "dev": true
}, },
"canonicalize": { "canonicalize": {

4
scripts/downloadNsiLogos.ts
View file

@ -105,12 +105,12 @@ class DownloadNsiLogos extends Script {
) )
for (let j = 0; j < results.length; j++) { for (let j = 0; j < results.length; j++) {
let didDownload = results[j] let didDownload = results[j]
if(didDownload !== "error"){ if (didDownload !== "error") {
continue continue
} }
console.log("Retrying", items[i + j].id, type) console.log("Retrying", items[i + j].id, type)
didDownload = await this.downloadLogo(items[i + j], type, basePath) didDownload = await this.downloadLogo(items[i + j], type, basePath)
if(didDownload === "error"){ if (didDownload === "error") {
console.log("Failed again:", items[i + j].id) console.log("Failed again:", items[i + j].id)
} }
} }

128
scripts/generateLayerOverview.ts
View file

@ -55,7 +55,7 @@ class ParseLayer extends Conversion<
convert( convert(
path: string, path: string,
context: ConversionContext, context: ConversionContext
): { ): {
parsed: LayerConfig parsed: LayerConfig
raw: LayerConfigJson raw: LayerConfigJson
@ -110,7 +110,7 @@ class AddIconSummary extends DesugaringStep<{ raw: LayerConfigJson; parsed: Laye
const fixed = json.raw const fixed = json.raw
const layerConfig = json.parsed const layerConfig = json.parsed
const pointRendering: PointRenderingConfig = layerConfig.mapRendering.find((pr) => const pointRendering: PointRenderingConfig = layerConfig.mapRendering.find((pr) =>
pr.location.has("point"), pr.location.has("point")
) )
const defaultTags = layerConfig.GetBaseTags() const defaultTags = layerConfig.GetBaseTags()
fixed["_layerIcon"] = Utils.NoNull( fixed["_layerIcon"] = Utils.NoNull(
@ -125,7 +125,7 @@ class AddIconSummary extends DesugaringStep<{ raw: LayerConfigJson; parsed: Laye
result["color"] = c result["color"] = c
} }
return result return result
}), })
) )
return { raw: fixed, parsed: layerConfig } return { raw: fixed, parsed: layerConfig }
} }
@ -147,7 +147,7 @@ class LayerOverviewUtils extends Script {
private static extractLayerIdsFrom( private static extractLayerIdsFrom(
themeFile: LayoutConfigJson, themeFile: LayoutConfigJson,
includeInlineLayers = true, includeInlineLayers = true
): string[] { ): string[] {
const publicLayerIds: string[] = [] const publicLayerIds: string[] = []
if (!Array.isArray(themeFile.layers)) { if (!Array.isArray(themeFile.layers)) {
@ -214,10 +214,10 @@ class LayerOverviewUtils extends Script {
| LayerConfigJson | LayerConfigJson
| string | string
| { | {
builtin builtin
} }
)[] )[]
}[], }[]
) { ) {
const perId = new Map<string, any>() const perId = new Map<string, any>()
for (const theme of themes) { for (const theme of themes) {
@ -258,7 +258,7 @@ class LayerOverviewUtils extends Script {
writeFileSync( writeFileSync(
"./src/assets/generated/theme_overview.json", "./src/assets/generated/theme_overview.json",
JSON.stringify(sorted, null, " "), JSON.stringify(sorted, null, " "),
{ encoding: "utf8" }, { encoding: "utf8" }
) )
} }
@ -270,7 +270,7 @@ class LayerOverviewUtils extends Script {
writeFileSync( writeFileSync(
`${LayerOverviewUtils.themePath}${theme.id}.json`, `${LayerOverviewUtils.themePath}${theme.id}.json`,
JSON.stringify(theme, null, " "), JSON.stringify(theme, null, " "),
{ encoding: "utf8" }, { encoding: "utf8" }
) )
} }
@ -281,12 +281,12 @@ class LayerOverviewUtils extends Script {
writeFileSync( writeFileSync(
`${LayerOverviewUtils.layerPath}${layer.id}.json`, `${LayerOverviewUtils.layerPath}${layer.id}.json`,
JSON.stringify(layer, null, " "), JSON.stringify(layer, null, " "),
{ encoding: "utf8" }, { encoding: "utf8" }
) )
} }
static asDict( static asDict(
trs: QuestionableTagRenderingConfigJson[], trs: QuestionableTagRenderingConfigJson[]
): Map<string, QuestionableTagRenderingConfigJson> { ): Map<string, QuestionableTagRenderingConfigJson> {
const d = new Map<string, QuestionableTagRenderingConfigJson>() const d = new Map<string, QuestionableTagRenderingConfigJson>()
for (const tr of trs) { for (const tr of trs) {
@ -299,12 +299,12 @@ class LayerOverviewUtils extends Script {
getSharedTagRenderings( getSharedTagRenderings(
doesImageExist: DoesImageExist, doesImageExist: DoesImageExist,
bootstrapTagRenderings: Map<string, QuestionableTagRenderingConfigJson>, bootstrapTagRenderings: Map<string, QuestionableTagRenderingConfigJson>,
bootstrapTagRenderingsOrder: string[], bootstrapTagRenderingsOrder: string[]
): QuestionableTagRenderingConfigJson[] ): QuestionableTagRenderingConfigJson[]
getSharedTagRenderings( getSharedTagRenderings(
doesImageExist: DoesImageExist, doesImageExist: DoesImageExist,
bootstrapTagRenderings: Map<string, QuestionableTagRenderingConfigJson> = null, bootstrapTagRenderings: Map<string, QuestionableTagRenderingConfigJson> = null,
bootstrapTagRenderingsOrder: string[] = [], bootstrapTagRenderingsOrder: string[] = []
): QuestionableTagRenderingConfigJson[] { ): QuestionableTagRenderingConfigJson[] {
const prepareLayer = new PrepareLayer( const prepareLayer = new PrepareLayer(
{ {
@ -315,7 +315,7 @@ class LayerOverviewUtils extends Script {
}, },
{ {
addTagRenderingsToContext: true, addTagRenderingsToContext: true,
}, }
) )
const path = "assets/layers/questions/questions.json" const path = "assets/layers/questions/questions.json"
@ -335,7 +335,7 @@ class LayerOverviewUtils extends Script {
return this.getSharedTagRenderings( return this.getSharedTagRenderings(
doesImageExist, doesImageExist,
dict, dict,
sharedQuestions.tagRenderings.map((tr) => tr["id"]), sharedQuestions.tagRenderings.map((tr) => tr["id"])
) )
} }
@ -375,8 +375,8 @@ class LayerOverviewUtils extends Script {
if (contents.indexOf("<text") > 0) { if (contents.indexOf("<text") > 0) {
console.warn( console.warn(
"The SVG at " + "The SVG at " +
path + path +
" contains a `text`-tag. This is highly discouraged. Every machine viewing your theme has their own font libary, and the font you choose might not be present, resulting in a different font being rendered. Solution: open your .svg in inkscape (or another program), select the text and convert it to a path", " contains a `text`-tag. This is highly discouraged. Every machine viewing your theme has their own font libary, and the font you choose might not be present, resulting in a different font being rendered. Solution: open your .svg in inkscape (or another program), select the text and convert it to a path"
) )
errCount++ errCount++
} }
@ -392,14 +392,14 @@ class LayerOverviewUtils extends Script {
args args
.find((a) => a.startsWith("--themes=")) .find((a) => a.startsWith("--themes="))
?.substring("--themes=".length) ?.substring("--themes=".length)
?.split(",") ?? [], ?.split(",") ?? []
) )
const layerWhitelist = new Set( const layerWhitelist = new Set(
args args
.find((a) => a.startsWith("--layers=")) .find((a) => a.startsWith("--layers="))
?.substring("--layers=".length) ?.substring("--layers=".length)
?.split(",") ?? [], ?.split(",") ?? []
) )
const forceReload = args.some((a) => a == "--force") const forceReload = args.some((a) => a == "--force")
@ -428,11 +428,11 @@ class LayerOverviewUtils extends Script {
sharedLayers, sharedLayers,
recompiledThemes, recompiledThemes,
forceReload, forceReload,
themeWhitelist, themeWhitelist
) )
new ValidateThemeEnsemble().convertStrict( new ValidateThemeEnsemble().convertStrict(
Array.from(sharedThemes.values()).map((th) => new LayoutConfig(th, true)), Array.from(sharedThemes.values()).map((th) => new LayoutConfig(th, true))
) )
if (recompiledThemes.length > 0) { if (recompiledThemes.length > 0) {
@ -440,7 +440,7 @@ class LayerOverviewUtils extends Script {
"./src/assets/generated/known_layers.json", "./src/assets/generated/known_layers.json",
JSON.stringify({ JSON.stringify({
layers: Array.from(sharedLayers.values()).filter((l) => l.id !== "favourite"), layers: Array.from(sharedLayers.values()).filter((l) => l.id !== "favourite"),
}), })
) )
} }
@ -461,7 +461,7 @@ class LayerOverviewUtils extends Script {
const proto: LayoutConfigJson = JSON.parse( const proto: LayoutConfigJson = JSON.parse(
readFileSync("./assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json", { readFileSync("./assets/themes/mapcomplete-changes/mapcomplete-changes.proto.json", {
encoding: "utf8", encoding: "utf8",
}), })
) )
const protolayer = <LayerConfigJson>( const protolayer = <LayerConfigJson>(
proto.layers.filter((l) => l["id"] === "mapcomplete-changes")[0] proto.layers.filter((l) => l["id"] === "mapcomplete-changes")[0]
@ -478,12 +478,12 @@ class LayerOverviewUtils extends Script {
layers: ScriptUtils.getLayerFiles().map((f) => f.parsed), layers: ScriptUtils.getLayerFiles().map((f) => f.parsed),
themes: ScriptUtils.getThemeFiles().map((f) => f.parsed), themes: ScriptUtils.getThemeFiles().map((f) => f.parsed),
}, },
ConversionContext.construct([], []), ConversionContext.construct([], [])
) )
for (const [_, theme] of sharedThemes) { for (const [_, theme] of sharedThemes) {
theme.layers = theme.layers.filter( theme.layers = theme.layers.filter(
(l) => Constants.added_by_default.indexOf(l["id"]) < 0, (l) => Constants.added_by_default.indexOf(l["id"]) < 0
) )
} }
@ -492,7 +492,7 @@ class LayerOverviewUtils extends Script {
"./src/assets/generated/known_themes.json", "./src/assets/generated/known_themes.json",
JSON.stringify({ JSON.stringify({
themes: Array.from(sharedThemes.values()), themes: Array.from(sharedThemes.values()),
}), })
) )
} }
@ -504,7 +504,7 @@ class LayerOverviewUtils extends Script {
private parseLayer( private parseLayer(
doesImageExist: DoesImageExist, doesImageExist: DoesImageExist,
prepLayer: PrepareLayer, prepLayer: PrepareLayer,
sharedLayerPath: string, sharedLayerPath: string
): { ): {
raw: LayerConfigJson raw: LayerConfigJson
parsed: LayerConfig parsed: LayerConfig
@ -515,7 +515,7 @@ class LayerOverviewUtils extends Script {
const parsed = parser.convertStrict(sharedLayerPath, context) const parsed = parser.convertStrict(sharedLayerPath, context)
const result = AddIconSummary.singleton.convertStrict( const result = AddIconSummary.singleton.convertStrict(
parsed, parsed,
context.inOperation("AddIconSummary"), context.inOperation("AddIconSummary")
) )
return { ...result, context } return { ...result, context }
} }
@ -523,7 +523,7 @@ class LayerOverviewUtils extends Script {
private buildLayerIndex( private buildLayerIndex(
doesImageExist: DoesImageExist, doesImageExist: DoesImageExist,
forceReload: boolean, forceReload: boolean,
whitelist: Set<string>, whitelist: Set<string>
): Map<string, LayerConfigJson> { ): Map<string, LayerConfigJson> {
// First, we expand and validate all builtin layers. These are written to src/assets/generated/layers // First, we expand and validate all builtin layers. These are written to src/assets/generated/layers
// At the same time, an index of available layers is built. // At the same time, an index of available layers is built.
@ -578,17 +578,17 @@ class LayerOverviewUtils extends Script {
console.log( console.log(
"Recompiled layers " + "Recompiled layers " +
recompiledLayers.join(", ") + recompiledLayers.join(", ") +
" and skipped " + " and skipped " +
skippedLayers.length + skippedLayers.length +
" layers. Detected " + " layers. Detected " +
warningCount + warningCount +
" warnings", " warnings"
) )
// We always need the calculated tags of 'usersettings', so we export them separately // We always need the calculated tags of 'usersettings', so we export them separately
this.extractJavascriptCodeForLayer( this.extractJavascriptCodeForLayer(
state.sharedLayers.get("usersettings"), state.sharedLayers.get("usersettings"),
"./src/Logic/State/UserSettingsMetaTagging.ts", "./src/Logic/State/UserSettingsMetaTagging.ts"
) )
return sharedLayers return sharedLayers
@ -605,8 +605,8 @@ class LayerOverviewUtils extends Script {
private extractJavascriptCode(themeFile: LayoutConfigJson) { private extractJavascriptCode(themeFile: LayoutConfigJson) {
const allCode = [ const allCode = [
"import {Feature} from 'geojson'", "import {Feature} from 'geojson'",
"import { ExtraFuncType } from \"../../../Logic/ExtraFunctions\";", 'import { ExtraFuncType } from "../../../Logic/ExtraFunctions";',
"import { Utils } from \"../../../Utils\"", 'import { Utils } from "../../../Utils"',
"export class ThemeMetaTagging {", "export class ThemeMetaTagging {",
" public static readonly themeName = " + JSON.stringify(themeFile.id), " public static readonly themeName = " + JSON.stringify(themeFile.id),
"", "",
@ -618,8 +618,8 @@ class LayerOverviewUtils extends Script {
allCode.push( allCode.push(
" public metaTaggging_for_" + " public metaTaggging_for_" +
id + id +
"(feat: Feature, helperFunctions: Record<ExtraFuncType, (feature: Feature) => Function>) {", "(feat: Feature, helperFunctions: Record<ExtraFuncType, (feature: Feature) => Function>) {"
) )
allCode.push(" const {" + ExtraFunctions.types.join(", ") + "} = helperFunctions") allCode.push(" const {" + ExtraFunctions.types.join(", ") + "} = helperFunctions")
for (const line of code) { for (const line of code) {
@ -630,10 +630,10 @@ class LayerOverviewUtils extends Script {
if (!isStrict) { if (!isStrict) {
allCode.push( allCode.push(
" Utils.AddLazyProperty(feat.properties, '" + " Utils.AddLazyProperty(feat.properties, '" +
attributeName + attributeName +
"', () => " + "', () => " +
expression + expression +
" ) ", " ) "
) )
} else { } else {
attributeName = attributeName.substring(0, attributeName.length - 1).trim() attributeName = attributeName.substring(0, attributeName.length - 1).trim()
@ -678,7 +678,7 @@ class LayerOverviewUtils extends Script {
const code = l.calculatedTags ?? [] const code = l.calculatedTags ?? []
allCode.push( allCode.push(
" public metaTaggging_for_" + l.id + "(feat: {properties: Record<string, string>}) {", " public metaTaggging_for_" + l.id + "(feat: {properties: Record<string, string>}) {"
) )
for (const line of code) { for (const line of code) {
const firstEq = line.indexOf("=") const firstEq = line.indexOf("=")
@ -688,10 +688,10 @@ class LayerOverviewUtils extends Script {
if (!isStrict) { if (!isStrict) {
allCode.push( allCode.push(
" Utils.AddLazyProperty(feat.properties, '" + " Utils.AddLazyProperty(feat.properties, '" +
attributeName + attributeName +
"', () => " + "', () => " +
expression + expression +
" ) ", " ) "
) )
} else { } else {
attributeName = attributeName.substring(0, attributeName.length - 2).trim() attributeName = attributeName.substring(0, attributeName.length - 2).trim()
@ -716,14 +716,14 @@ class LayerOverviewUtils extends Script {
sharedLayers: Map<string, LayerConfigJson>, sharedLayers: Map<string, LayerConfigJson>,
recompiledThemes: string[], recompiledThemes: string[],
forceReload: boolean, forceReload: boolean,
whitelist: Set<string>, whitelist: Set<string>
): Map<string, LayoutConfigJson> { ): Map<string, LayoutConfigJson> {
console.log(" ---------- VALIDATING BUILTIN THEMES ---------") console.log(" ---------- VALIDATING BUILTIN THEMES ---------")
const themeFiles = ScriptUtils.getThemeFiles() const themeFiles = ScriptUtils.getThemeFiles()
const fixed = new Map<string, LayoutConfigJson>() const fixed = new Map<string, LayoutConfigJson>()
const publicLayers = LayerOverviewUtils.publicLayerIdsFrom( const publicLayers = LayerOverviewUtils.publicLayerIdsFrom(
themeFiles.map((th) => th.parsed), themeFiles.map((th) => th.parsed)
) )
const trs = this.getSharedTagRenderings(new DoesImageExist(licensePaths, existsSync)) const trs = this.getSharedTagRenderings(new DoesImageExist(licensePaths, existsSync))
@ -763,15 +763,15 @@ class LayerOverviewUtils extends Script {
LayerOverviewUtils.themePath + "/" + themePath.substring(themePath.lastIndexOf("/")) LayerOverviewUtils.themePath + "/" + themePath.substring(themePath.lastIndexOf("/"))
const usedLayers = Array.from( const usedLayers = Array.from(
LayerOverviewUtils.extractLayerIdsFrom(themeFile, false), LayerOverviewUtils.extractLayerIdsFrom(themeFile, false)
).map((id) => LayerOverviewUtils.layerPath + id + ".json") ).map((id) => LayerOverviewUtils.layerPath + id + ".json")
if (!forceReload && !this.shouldBeUpdated([themePath, ...usedLayers], targetPath)) { if (!forceReload && !this.shouldBeUpdated([themePath, ...usedLayers], targetPath)) {
fixed.set( fixed.set(
themeFile.id, themeFile.id,
JSON.parse( JSON.parse(
readFileSync(LayerOverviewUtils.themePath + themeFile.id + ".json", "utf8"), readFileSync(LayerOverviewUtils.themePath + themeFile.id + ".json", "utf8")
), )
) )
ScriptUtils.erasableLog("Skipping", themeFile.id) ScriptUtils.erasableLog("Skipping", themeFile.id)
skippedThemes.push(themeFile.id) skippedThemes.push(themeFile.id)
@ -782,23 +782,23 @@ class LayerOverviewUtils extends Script {
new PrevalidateTheme().convertStrict( new PrevalidateTheme().convertStrict(
themeFile, themeFile,
ConversionContext.construct([themePath], ["PrepareLayer"]), ConversionContext.construct([themePath], ["PrepareLayer"])
) )
try { try {
themeFile = new PrepareTheme(convertState, { themeFile = new PrepareTheme(convertState, {
skipDefaultLayers: true, skipDefaultLayers: true,
}).convertStrict( }).convertStrict(
themeFile, themeFile,
ConversionContext.construct([themePath], ["PrepareLayer"]), ConversionContext.construct([themePath], ["PrepareLayer"])
) )
new ValidateThemeAndLayers( new ValidateThemeAndLayers(
new DoesImageExist(licensePaths, existsSync, knownTagRenderings), new DoesImageExist(licensePaths, existsSync, knownTagRenderings),
themePath, themePath,
true, true,
knownTagRenderings, knownTagRenderings
).convertStrict( ).convertStrict(
themeFile, themeFile,
ConversionContext.construct([themePath], ["PrepareLayer"]), ConversionContext.construct([themePath], ["PrepareLayer"])
) )
if (themeFile.icon.endsWith(".svg")) { if (themeFile.icon.endsWith(".svg")) {
@ -850,16 +850,16 @@ class LayerOverviewUtils extends Script {
t.shortDescription ?? new Translation(t.description).FirstSentence(), t.shortDescription ?? new Translation(t.description).FirstSentence(),
mustHaveLanguage: t.mustHaveLanguage?.length > 0, mustHaveLanguage: t.mustHaveLanguage?.length > 0,
} }
}), })
) )
} }
console.log( console.log(
"Recompiled themes " + "Recompiled themes " +
recompiledThemes.join(", ") + recompiledThemes.join(", ") +
" and skipped " + " and skipped " +
skippedThemes.length + skippedThemes.length +
" themes", " themes"
) )
return fixed return fixed

39
scripts/generateSummaryTileCache.ts
View file

@ -19,9 +19,16 @@ class GenerateSummaryTileCache extends Script {
} }
} }
async fetchTile(z: number, x: number, y: number, layersSummed: string): Promise<Feature<Point>> { async fetchTile(
z: number,
x: number,
y: number,
layersSummed: string
): Promise<Feature<Point>> {
const index = Tiles.tile_index(z, x, y) const index = Tiles.tile_index(z, x, y)
let feature: Feature<Point> | any = (await SummaryTileSource.downloadTile(index, this.url, layersSummed).AsPromise())[0] let feature: Feature<Point> | any = (
await SummaryTileSource.downloadTile(index, this.url, layersSummed).AsPromise()
)[0]
if (!feature) { if (!feature) {
feature = { properties: { total: 0 } } feature = { properties: { total: 0 } }
} }
@ -34,7 +41,13 @@ class GenerateSummaryTileCache extends Script {
return feature return feature
} }
async fetchTileRecursive(z: number, x: number, y: number, layersSummed: string, sleepMs = 0): Promise<Feature<Point>> { async fetchTileRecursive(
z: number,
x: number,
y: number,
layersSummed: string,
sleepMs = 0
): Promise<Feature<Point>> {
const index = Tiles.tile_index(z, x, y) const index = Tiles.tile_index(z, x, y)
const path = this.cacheDir + "tile_" + z + "_" + x + "_" + y + ".json" const path = this.cacheDir + "tile_" + z + "_" + x + "_" + y + ".json"
if (existsSync(path)) { if (existsSync(path)) {
@ -48,11 +61,12 @@ class GenerateSummaryTileCache extends Script {
feature = await this.fetchTile(z, x, y, layersSummed) feature = await this.fetchTile(z, x, y, layersSummed)
} else { } else {
const parts = [ const parts = [
await this.fetchTileRecursive(z + 1, x * 2, y * 2, layersSummed), await this.fetchTileRecursive(z + 1, x * 2, y * 2, layersSummed),
await this.fetchTileRecursive(z + 1, x * 2 + 1, y * 2, layersSummed), await this.fetchTileRecursive(z + 1, x * 2 + 1, y * 2, layersSummed),
await this.fetchTileRecursive(z + 1, x * 2, y * 2 + 1, layersSummed), await this.fetchTileRecursive(z + 1, x * 2, y * 2 + 1, layersSummed),
await this.fetchTileRecursive(z + 1, x * 2 + 1, y * 2 + 1, layersSummed)] await this.fetchTileRecursive(z + 1, x * 2 + 1, y * 2 + 1, layersSummed),
const sum = this.sumTotals(parts.map(f => f.properties)) ]
const sum = this.sumTotals(parts.map((f) => f.properties))
feature = <Feature<Point>>{ feature = <Feature<Point>>{
type: "Feature", type: "Feature",
properties: sum, properties: sum,
@ -77,14 +91,13 @@ class GenerateSummaryTileCache extends Script {
return sum return sum
} }
async main(args: string[]): Promise<void> { async main(args: string[]): Promise<void> {
const layers = await Utils.downloadJson<{ layers: string[]; meta: object }>(
const layers = await Utils.downloadJson<{ layers: string[], meta: object }>(this.url + "/status.json") this.url + "/status.json"
const layersSummed = layers.layers.map(l => encodeURIComponent(l)).join("+") )
const layersSummed = layers.layers.map((l) => encodeURIComponent(l)).join("+")
const r = await this.fetchTileRecursive(0, 0, 0, layersSummed) const r = await this.fetchTileRecursive(0, 0, 0, layersSummed)
console.log(r) console.log(r)
} }
} }

12
src/Logic/FeatureSource/TiledFeatureSource/SummaryTileSource.ts
View file

@ -84,7 +84,11 @@ export class SummaryTileSource extends DynamicTileSource {
zoomRounded, zoomRounded,
0, // minzoom 0, // minzoom
(tileIndex) => { (tileIndex) => {
const features = SummaryTileSource.downloadTile(tileIndex, cacheserver, layersSummed) const features = SummaryTileSource.downloadTile(
tileIndex,
cacheserver,
layersSummed
)
const [z] = Tiles.tile_from_index(tileIndex) const [z] = Tiles.tile_from_index(tileIndex)
return new StaticFeatureSource( return new StaticFeatureSource(
features.map( features.map(
@ -103,7 +107,11 @@ export class SummaryTileSource extends DynamicTileSource {
) )
} }
public static downloadTile(tileIndex: number, cacheserver: string, layersSummed: string): Store<Feature<Point>[]>{ public static downloadTile(
tileIndex: number,
cacheserver: string,
layersSummed: string
): Store<Feature<Point>[]> {
const [z, x, y] = Tiles.tile_from_index(tileIndex) const [z, x, y] = Tiles.tile_from_index(tileIndex)
let coordinates = Tiles.centerPointOf(z, x, y) let coordinates = Tiles.centerPointOf(z, x, y)
const url = `${cacheserver}/${layersSummed}/${z}/${x}/${y}.json` const url = `${cacheserver}/${layersSummed}/${z}/${x}/${y}.json`

2
src/Logic/Osm/Actions/ChangeLocationAction.ts
View file

@ -14,7 +14,7 @@ export default class ChangeLocationAction extends OsmChangeAction {
}[] = [ }[] = [
{ {
value: "relocated|improve_accuraccy|...", value: "relocated|improve_accuraccy|...",
docs: "Will appear if the ", docs: "Will appear if the point has been moved",
changeType: ["move"], changeType: ["move"],
specialMotivation: true, specialMotivation: true,
}, },

13
src/Logic/Osm/Actions/DeleteAction.ts
View file

@ -20,6 +20,19 @@ export default class DeleteAction extends OsmChangeAction {
private readonly _id: OsmId private readonly _id: OsmId
private readonly _hardDelete: boolean private readonly _hardDelete: boolean
static metatags: {
readonly key?: string
readonly value?: string
readonly docs: string
readonly changeType: string[]
readonly specialMotivation?: boolean
}[] = [
{
docs: "Will appear if the object was deleted",
changeType: ["deletion"],
specialMotivation: true,
},
]
constructor( constructor(
id: OsmId, id: OsmId,
softDeletionTags: TagsFilter | undefined, softDeletionTags: TagsFilter | undefined,

158
src/Logic/Osm/Changes.ts
View file

@ -20,6 +20,7 @@ import Table from "../../UI/Base/Table"
import ChangeLocationAction from "./Actions/ChangeLocationAction" import ChangeLocationAction from "./Actions/ChangeLocationAction"
import ChangeTagAction from "./Actions/ChangeTagAction" import ChangeTagAction from "./Actions/ChangeTagAction"
import FeatureSwitchState from "../State/FeatureSwitchState" import FeatureSwitchState from "../State/FeatureSwitchState"
import DeleteAction from "./Actions/DeleteAction"
/** /**
* Handles all changes made to OSM. * Handles all changes made to OSM.
@ -55,7 +56,7 @@ export class Changes {
featureSwitches?: FeatureSwitchState featureSwitches?: FeatureSwitchState
}, },
leftRightSensitive: boolean = false, leftRightSensitive: boolean = false,
reportError?: (string: string | Error) => void reportError?: (string: string | Error) => void,
) { ) {
this._leftRightSensitive = leftRightSensitive this._leftRightSensitive = leftRightSensitive
// We keep track of all changes just as well // We keep track of all changes just as well
@ -70,7 +71,7 @@ export class Changes {
state.osmConnection, state.osmConnection,
state.featurePropertiesStore, state.featurePropertiesStore,
this, this,
(e) => this._reportError(e) (e) => this._reportError(e),
) )
this.historicalUserLocations = state.historicalUserLocations this.historicalUserLocations = state.historicalUserLocations
@ -84,7 +85,7 @@ export class Changes {
modifiedObjects: OsmObject[] modifiedObjects: OsmObject[]
newObjects: OsmObject[] newObjects: OsmObject[]
deletedObjects: OsmObject[] deletedObjects: OsmObject[]
} },
): string { ): string {
const changedElements = allChanges.modifiedObjects ?? [] const changedElements = allChanges.modifiedObjects ?? []
const newElements = allChanges.newObjects ?? [] const newElements = allChanges.newObjects ?? []
@ -173,10 +174,11 @@ export class Changes {
docs: "The identifier of the used background layer, this will probably be an identifier from the [editor layer index](https://github.com/osmlab/editor-layer-index)", docs: "The identifier of the used background layer, this will probably be an identifier from the [editor layer index](https://github.com/osmlab/editor-layer-index)",
}, },
], ],
"default" "default",
), ),
...addSource(ChangeTagAction.metatags, "ChangeTag"), ...addSource(ChangeTagAction.metatags, "ChangeTag"),
...addSource(ChangeLocationAction.metatags, "ChangeLocation"), ...addSource(ChangeLocationAction.metatags, "ChangeLocation"),
...addSource(DeleteAction.metatags, "DeleteAction")
// TODO // TODO
/* /*
...DeleteAction.metatags, ...DeleteAction.metatags,
@ -201,7 +203,7 @@ export class Changes {
: "", : "",
]), ]),
source, source,
]) ]),
), ),
]) ])
} }
@ -250,7 +252,7 @@ export class Changes {
const changeDescriptions = await action.Perform(this) const changeDescriptions = await action.Perform(this)
changeDescriptions[0].meta.distanceToObject = this.calculateDistanceToChanges( changeDescriptions[0].meta.distanceToObject = this.calculateDistanceToChanges(
action, action,
changeDescriptions changeDescriptions,
) )
this.applyChanges(changeDescriptions) this.applyChanges(changeDescriptions)
} }
@ -264,7 +266,7 @@ export class Changes {
public CreateChangesetObjects( public CreateChangesetObjects(
changes: ChangeDescription[], changes: ChangeDescription[],
downloadedOsmObjects: OsmObject[] downloadedOsmObjects: OsmObject[],
): { ): {
newObjects: OsmObject[] newObjects: OsmObject[]
modifiedObjects: OsmObject[] modifiedObjects: OsmObject[]
@ -316,6 +318,8 @@ export class Changes {
r.members = change.changes["members"] r.members = change.changes["members"]
osmObj = r osmObj = r
break break
default:
throw "Got an invalid change.type: " + change.type
} }
if (osmObj === undefined) { if (osmObj === undefined) {
throw "Hmm? This is a bug" throw "Hmm? This is a bug"
@ -424,14 +428,14 @@ export class Changes {
result.modifiedObjects.length, result.modifiedObjects.length,
"modified;", "modified;",
result.deletedObjects, result.deletedObjects,
"deleted" "deleted",
) )
return result return result
} }
private calculateDistanceToChanges( private calculateDistanceToChanges(
change: OsmChangeAction, change: OsmChangeAction,
changeDescriptions: ChangeDescription[] changeDescriptions: ChangeDescription[],
) { ) {
const locations = this.historicalUserLocations?.features?.data const locations = this.historicalUserLocations?.features?.data
if (locations === undefined) { if (locations === undefined) {
@ -451,7 +455,7 @@ export class Changes {
.filter((feat) => feat.geometry.type === "Point") .filter((feat) => feat.geometry.type === "Point")
.filter((feat) => { .filter((feat) => {
const visitTime = new Date( const visitTime = new Date(
(<GeoLocationPointProperties>(<any>feat.properties)).date (<GeoLocationPointProperties>(<any>feat.properties)).date,
) )
// In seconds // In seconds
const diff = (now.getTime() - visitTime.getTime()) / 1000 const diff = (now.getTime() - visitTime.getTime()) / 1000
@ -498,42 +502,58 @@ export class Changes {
...recentLocationPoints.map((gpsPoint) => { ...recentLocationPoints.map((gpsPoint) => {
const otherCoor = GeoOperations.centerpointCoordinates(gpsPoint) const otherCoor = GeoOperations.centerpointCoordinates(gpsPoint)
return GeoOperations.distanceBetween(coor, otherCoor) return GeoOperations.distanceBetween(coor, otherCoor)
}) }),
) ),
) ),
) )
} }
/** /**
* Upload the selected changes to OSM. * Gets a single, fresh version of the requested osmObject with some error handling
* Returns 'true' if successful and if they can be removed */
private async getOsmObject(id: string, downloader: OsmObjectDownloader) {
try {
try {
// Important: we do **not** cache this request, we _always_ need a fresh version!
const osmObj = await downloader.DownloadObjectAsync(id, 0)
return { id, osmObj }
} catch (e) {
const msg = "Could not download OSM-object" +
id +
" trying again before dropping it from the changes (" +
e +
")"
this._reportError(msg)
const osmObj = await downloader.DownloadObjectAsync(id, 0)
return { id, osmObj }
}
} catch (e) {
const msg = "Could not download OSM-object" +
id +
" dropping it from the changes (" +
e +
")"
this._reportError(msg)
this.errors.data.push(e)
this.errors.ping()
return undefined
}
}
/**
* Upload the selected changes to OSM. This is typically called with changes for a single theme
* @return pending changes which could not be uploaded for some reason; undefined or empty array if successful
*/ */
private async flushSelectChanges( private async flushSelectChanges(
pending: ChangeDescription[], pending: ChangeDescription[],
openChangeset: UIEventSource<number> openChangeset: UIEventSource<number>,
): Promise<boolean> { ): Promise<ChangeDescription[]> {
const self = this
const neededIds = Changes.GetNeededIds(pending) const neededIds = Changes.GetNeededIds(pending)
// We _do not_ pass in the Changes object itself - we want the data from OSM directly in order to apply the changes // We _do not_ pass in the Changes object itself - we want the data from OSM directly in order to apply the changes
const downloader = new OsmObjectDownloader(this.backend, undefined) const downloader = new OsmObjectDownloader(this.backend, undefined)
let osmObjects = await Promise.all<{ id: string; osmObj: OsmObject | "deleted" }>( let osmObjects = await Promise.all<{ id: string; osmObj: OsmObject | "deleted" }>(
neededIds.map(async (id) => { neededIds.map(id => this.getOsmObject(id, downloader)),
try {
// Important: we do **not** cache this request, we _always_ need a fresh version!
const osmObj = await downloader.DownloadObjectAsync(id, 0)
return { id, osmObj }
} catch (e) {
const msg = "Could not download OSM-object" +
id +
" dropping it from the changes (" +
e +
")"
this._reportError(msg)
this.errors.data.push(e)
this.errors.ping()
return undefined
}
})
) )
osmObjects = Utils.NoNull(osmObjects) osmObjects = Utils.NoNull(osmObjects)
@ -554,7 +574,7 @@ export class Changes {
if (pending.length == 0) { if (pending.length == 0) {
console.log("No pending changes...") console.log("No pending changes...")
return true return undefined
} }
const perType = Array.from( const perType = Array.from(
@ -562,15 +582,15 @@ export class Changes {
pending pending
.filter( .filter(
(descr) => (descr) =>
descr.meta.changeType !== undefined && descr.meta.changeType !== null descr.meta.changeType !== undefined && descr.meta.changeType !== null,
) )
.map((descr) => descr.meta.changeType) .map((descr) => descr.meta.changeType),
), ),
([key, count]) => ({ ([key, count]) => ({
key: key, key: key,
value: count, value: count,
aggregate: true, aggregate: true,
}) }),
) )
const motivations = pending const motivations = pending
.filter((descr) => descr.meta.specialMotivation !== undefined) .filter((descr) => descr.meta.specialMotivation !== undefined)
@ -581,7 +601,7 @@ export class Changes {
const distances = Utils.NoNull(pending.map((descr) => descr.meta.distanceToObject)) const distances = Utils.NoNull(pending.map((descr) => descr.meta.distanceToObject))
distances.sort((a, b) => a - b) distances.sort((a, b) => a - b)
const perBinCount = Constants.distanceToChangeObjectBins.map((_) => 0) const perBinCount = Constants.distanceToChangeObjectBins.map(() => 0)
let j = 0 let j = 0
const maxDistances = Constants.distanceToChangeObjectBins const maxDistances = Constants.distanceToChangeObjectBins
@ -609,7 +629,7 @@ export class Changes {
value: count, value: count,
aggregate: true, aggregate: true,
} }
}) }),
) )
// This method is only called with changedescriptions for this theme // This method is only called with changedescriptions for this theme
@ -633,26 +653,42 @@ export class Changes {
...perBinMessage, ...perBinMessage,
] ]
const refused: ChangeDescription[] = []
let toUpload: ChangeDescription[] = []
pending.forEach(c => {
if (c.id < 0) {
toUpload.push(c)
return
}
const matchFound = !!objects.find(o => o.id === c.id && o.type === c.type)
if (matchFound) {
toUpload.push(c)
} else {
refused.push(c)
}
})
await this._changesetHandler.UploadChangeset( await this._changesetHandler.UploadChangeset(
(csId, remappings) => { (csId, remappings) => {
if (remappings.size > 0) { if (remappings.size > 0) {
pending = pending.map((ch) => ChangeDescriptionTools.rewriteIds(ch, remappings)) toUpload = toUpload.map((ch) => ChangeDescriptionTools.rewriteIds(ch, remappings))
} }
const changes: { const changes: {
newObjects: OsmObject[] newObjects: OsmObject[]
modifiedObjects: OsmObject[] modifiedObjects: OsmObject[]
deletedObjects: OsmObject[] deletedObjects: OsmObject[]
} = self.CreateChangesetObjects(pending, objects) } = this.CreateChangesetObjects(toUpload, objects)
return Changes.createChangesetFor("" + csId, changes) return Changes.createChangesetFor("" + csId, changes)
}, },
metatags, metatags,
openChangeset openChangeset,
) )
console.log("Upload successful!") console.log("Upload successful! Refused changes are",refused)
return true return refused
} }
private async flushChangesAsync(): Promise<void> { private async flushChangesAsync(): Promise<void> {
@ -670,44 +706,42 @@ export class Changes {
pendingPerTheme.get(theme).push(changeDescription) pendingPerTheme.get(theme).push(changeDescription)
} }
const successes = await Promise.all( const refusedChanges: ChangeDescription[][] = await Promise.all(
Array.from(pendingPerTheme, async ([theme, pendingChanges]) => { Array.from(pendingPerTheme, async ([theme, pendingChanges]) => {
try { try {
const openChangeset = UIEventSource.asInt( const openChangeset = UIEventSource.asInt(
this.state.osmConnection.GetPreference( this.state.osmConnection.GetPreference(
"current-open-changeset-" + theme "current-open-changeset-" + theme,
) ),
) )
console.log( console.log(
"Using current-open-changeset-" + "Using current-open-changeset-" +
theme + theme +
" from the preferences, got " + " from the preferences, got " +
openChangeset.data openChangeset.data,
) )
const result = await self.flushSelectChanges(pendingChanges, openChangeset) const refused = await self.flushSelectChanges(pendingChanges, openChangeset)
if (result) { if (!refused) {
this.errors.setData([]) this.errors.setData([])
} }
return result return refused
} catch (e) { } catch (e) {
this._reportError(e) this._reportError(e)
console.error("Could not upload some changes:", e) console.error("Could not upload some changes:", e)
this.errors.data.push(e) this.errors.data.push(e)
this.errors.ping() this.errors.ping()
return false return pendingChanges
} }
}) }),
) )
if (!successes.some((s) => s == false)) { // We keep all the refused changes to try them again
// All changes successfull, we clear the data! this.pendingChanges.setData(refusedChanges.flatMap(c => c))
this.pendingChanges.setData([])
}
} catch (e) { } catch (e) {
console.error( console.error(
"Could not handle changes - probably an old, pending changeset in localstorage with an invalid format; erasing those", "Could not handle changes - probably an old, pending changeset in localstorage with an invalid format; erasing those",
e e,
) )
this.errors.data.push(e) this.errors.data.push(e)
this.errors.ping() this.errors.ping()

4
src/Logic/Osm/ChangesetHandler.ts
View file

@ -154,7 +154,7 @@ export class ChangesetHandler {
if (this._reportError) { if (this._reportError) {
this._reportError(e) this._reportError(e)
} }
console.warn("Could not open/upload changeset due to ", e, "trying t") console.warn("Could not open/upload changeset due to ", e, "trying again with a another fresh changeset ")
openChangeset.setData(undefined) openChangeset.setData(undefined)
throw e throw e
@ -187,7 +187,7 @@ export class ChangesetHandler {
await this.UpdateTags(csId, rewrittenTags) await this.UpdateTags(csId, rewrittenTags)
} catch (e) { } catch (e) {
if (this._reportError) { if (this._reportError) {
this._reportError(e) this._reportError("Could not reuse changeset, might be closed: " + e.stacktrace ?? "" + e)
} }
console.warn("Could not upload, changeset is probably closed: ", e) console.warn("Could not upload, changeset is probably closed: ", e)
openChangeset.setData(undefined) openChangeset.setData(undefined)

63
src/Logic/State/FeatureSwitchState.ts
View file

@ -18,14 +18,14 @@ class FeatureSwitchUtils {
key, key,
"" + defaultValue, "" + defaultValue,
documentation, documentation,
{ stackOffset: -1 }, { stackOffset: -1 }
) )
// It takes the current layout, extracts the default value for this query parameter. A query parameter event source is then retrieved and flattened // It takes the current layout, extracts the default value for this query parameter. A query parameter event source is then retrieved and flattened
return queryParam.sync( return queryParam.sync(
(str) => (str === undefined ? defaultValue : str !== "false"), (str) => (str === undefined ? defaultValue : str !== "false"),
[], [],
(b) => (b == defaultValue ? undefined : "" + b), (b) => (b == defaultValue ? undefined : "" + b)
) )
} }
} }
@ -37,7 +37,7 @@ export class OsmConnectionFeatureSwitches {
this.featureSwitchFakeUser = QueryParameters.GetBooleanQueryParameter( this.featureSwitchFakeUser = QueryParameters.GetBooleanQueryParameter(
"fake-user", "fake-user",
false, false,
"If true, 'dryrun' mode is activated and a fake user account is loaded", "If true, 'dryrun' mode is activated and a fake user account is loaded"
) )
} }
} }
@ -99,14 +99,14 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches {
this.featureSwitchEnableLogin = FeatureSwitchUtils.initSwitch( this.featureSwitchEnableLogin = FeatureSwitchUtils.initSwitch(
"fs-enable-login", "fs-enable-login",
layoutToUse?.enableUserBadge ?? true, layoutToUse?.enableUserBadge ?? true,
"Disables/Enables logging in and thus disables editing all together. This effectively puts MapComplete into read-only mode.", "Disables/Enables logging in and thus disables editing all together. This effectively puts MapComplete into read-only mode."
) )
{ {
if (QueryParameters.wasInitialized("fs-userbadge")) { if (QueryParameters.wasInitialized("fs-userbadge")) {
// userbadge is the legacy name for 'enable-login' // userbadge is the legacy name for 'enable-login'
this.featureSwitchEnableLogin.setData( this.featureSwitchEnableLogin.setData(
QueryParameters.GetBooleanQueryParameter("fs-userbadge", undefined, "Legacy") QueryParameters.GetBooleanQueryParameter("fs-userbadge", undefined, "Legacy")
.data, .data
) )
} }
} }
@ -114,64 +114,66 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches {
this.featureSwitchSearch = FeatureSwitchUtils.initSwitch( this.featureSwitchSearch = FeatureSwitchUtils.initSwitch(
"fs-search", "fs-search",
layoutToUse?.enableSearch ?? true, layoutToUse?.enableSearch ?? true,
"Disables/Enables the search bar", "Disables/Enables the search bar"
) )
this.featureSwitchBackgroundSelection = FeatureSwitchUtils.initSwitch( this.featureSwitchBackgroundSelection = FeatureSwitchUtils.initSwitch(
"fs-background", "fs-background",
layoutToUse?.enableBackgroundLayerSelection ?? true, layoutToUse?.enableBackgroundLayerSelection ?? true,
"Disables/Enables the background layer control where a user can enable e.g. aerial imagery", "Disables/Enables the background layer control where a user can enable e.g. aerial imagery"
) )
this.featureSwitchFilter = FeatureSwitchUtils.initSwitch( this.featureSwitchFilter = FeatureSwitchUtils.initSwitch(
"fs-filter", "fs-filter",
layoutToUse?.enableLayers ?? true, layoutToUse?.enableLayers ?? true,
"Disables/Enables the filter view where a user can enable/disable MapComplete-layers or filter for certain properties", "Disables/Enables the filter view where a user can enable/disable MapComplete-layers or filter for certain properties"
) )
this.featureSwitchWelcomeMessage = FeatureSwitchUtils.initSwitch( this.featureSwitchWelcomeMessage = FeatureSwitchUtils.initSwitch(
"fs-welcome-message", "fs-welcome-message",
true, true,
"Disables/enables the help menu or welcome message", "Disables/enables the help menu or welcome message"
) )
this.featureSwitchCommunityIndex = FeatureSwitchUtils.initSwitch( this.featureSwitchCommunityIndex = FeatureSwitchUtils.initSwitch(
"fs-community-index", "fs-community-index",
this.featureSwitchEnableLogin.data, this.featureSwitchEnableLogin.data,
"Disables/enables the button to get in touch with the community", "Disables/enables the button to get in touch with the community"
) )
this.featureSwitchExtraLinkEnabled = FeatureSwitchUtils.initSwitch( this.featureSwitchExtraLinkEnabled = FeatureSwitchUtils.initSwitch(
"fs-iframe-popout", "fs-iframe-popout",
true, true,
"Disables/Enables the extraLink button. By default, if in iframe mode and the welcome message is hidden, a popout button to the full mapcomplete instance is shown instead (unless disabled with this switch or another extraLink button is enabled)", "Disables/Enables the extraLink button. By default, if in iframe mode and the welcome message is hidden, a popout button to the full mapcomplete instance is shown instead (unless disabled with this switch or another extraLink button is enabled)"
) )
this.featureSwitchBackToThemeOverview = FeatureSwitchUtils.initSwitch( this.featureSwitchBackToThemeOverview = FeatureSwitchUtils.initSwitch(
"fs-homepage-link", "fs-homepage-link",
layoutToUse?.enableMoreQuests ?? true, layoutToUse?.enableMoreQuests ?? true,
"Disables/Enables the various links which go back to the index page with the theme overview", "Disables/Enables the various links which go back to the index page with the theme overview"
) )
this.featureSwitchShareScreen = FeatureSwitchUtils.initSwitch( this.featureSwitchShareScreen = FeatureSwitchUtils.initSwitch(
"fs-share-screen", "fs-share-screen",
layoutToUse?.enableShareScreen ?? true, layoutToUse?.enableShareScreen ?? true,
"Disables/Enables the 'Share-screen'-tab in the welcome message", "Disables/Enables the 'Share-screen'-tab in the welcome message"
) )
this.featureSwitchGeolocation = FeatureSwitchUtils.initSwitch( this.featureSwitchGeolocation = FeatureSwitchUtils.initSwitch(
"fs-geolocation", "fs-geolocation",
layoutToUse?.enableGeolocation ?? true, layoutToUse?.enableGeolocation ?? true,
"Disables/Enables the geolocation button", "Disables/Enables the geolocation button"
) )
this.featureSwitchLayerDefault = QueryParameters.GetBooleanQueryParameter("fs-layers-enabled", true, this.featureSwitchLayerDefault = QueryParameters.GetBooleanQueryParameter(
"If set to false, all layers will be disabled - except the explicitly enabled layers", "fs-layers-enabled",
true,
"If set to false, all layers will be disabled - except the explicitly enabled layers"
) )
this.featureSwitchShowAllQuestions = FeatureSwitchUtils.initSwitch( this.featureSwitchShowAllQuestions = FeatureSwitchUtils.initSwitch(
"fs-all-questions", "fs-all-questions",
layoutToUse?.enableShowAllQuestions ?? false, layoutToUse?.enableShowAllQuestions ?? false,
"Always show all questions", "Always show all questions"
) )
this.featureSwitchEnableExport = FeatureSwitchUtils.initSwitch( this.featureSwitchEnableExport = FeatureSwitchUtils.initSwitch(
"fs-export", "fs-export",
layoutToUse?.enableExportButton ?? true, layoutToUse?.enableExportButton ?? true,
"Enable the export as GeoJSON and CSV button", "Enable the export as GeoJSON and CSV button"
) )
let testingDefaultValue = false let testingDefaultValue = false
@ -185,60 +187,59 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches {
this.featureSwitchIsTesting = QueryParameters.GetBooleanQueryParameter( this.featureSwitchIsTesting = QueryParameters.GetBooleanQueryParameter(
"test", "test",
testingDefaultValue, testingDefaultValue,
"If true, 'dryrun' mode is activated. The app will behave as normal, except that changes to OSM will be printed onto the console instead of actually uploaded to osm.org", "If true, 'dryrun' mode is activated. The app will behave as normal, except that changes to OSM will be printed onto the console instead of actually uploaded to osm.org"
) )
this.featureSwitchIsDebugging = QueryParameters.GetBooleanQueryParameter( this.featureSwitchIsDebugging = QueryParameters.GetBooleanQueryParameter(
"debug", "debug",
false, false,
"If true, shows some extra debugging help such as all the available tags on every object", "If true, shows some extra debugging help such as all the available tags on every object"
) )
this.featureSwitchMorePrivacy = QueryParameters.GetBooleanQueryParameter( this.featureSwitchMorePrivacy = QueryParameters.GetBooleanQueryParameter(
"moreprivacy", "moreprivacy",
layoutToUse.enableMorePrivacy, layoutToUse.enableMorePrivacy,
"If true, the location distance indication will not be written to the changeset and other privacy enhancing measures might be taken.", "If true, the location distance indication will not be written to the changeset and other privacy enhancing measures might be taken."
) )
this.overpassUrl = QueryParameters.GetQueryParameter( this.overpassUrl = QueryParameters.GetQueryParameter(
"overpassUrl", "overpassUrl",
(layoutToUse?.overpassUrl ?? Constants.defaultOverpassUrls).join(","), (layoutToUse?.overpassUrl ?? Constants.defaultOverpassUrls).join(","),
"Point mapcomplete to a different overpass-instance. Example: https://overpass-api.de/api/interpreter", "Point mapcomplete to a different overpass-instance. Example: https://overpass-api.de/api/interpreter"
).sync( ).sync(
(param) => param?.split(","), (param) => param?.split(","),
[], [],
(urls) => urls?.join(","), (urls) => urls?.join(",")
) )
this.overpassTimeout = UIEventSource.asInt( this.overpassTimeout = UIEventSource.asInt(
QueryParameters.GetQueryParameter( QueryParameters.GetQueryParameter(
"overpassTimeout", "overpassTimeout",
"" + layoutToUse?.overpassTimeout, "" + layoutToUse?.overpassTimeout,
"Set a different timeout (in seconds) for queries in overpass", "Set a different timeout (in seconds) for queries in overpass"
), )
) )
this.overpassMaxZoom = UIEventSource.asFloat( this.overpassMaxZoom = UIEventSource.asFloat(
QueryParameters.GetQueryParameter( QueryParameters.GetQueryParameter(
"overpassMaxZoom", "overpassMaxZoom",
"" + layoutToUse?.overpassMaxZoom, "" + layoutToUse?.overpassMaxZoom,
" point to switch between OSM-api and overpass", " point to switch between OSM-api and overpass"
), )
) )
this.osmApiTileSize = UIEventSource.asInt( this.osmApiTileSize = UIEventSource.asInt(
QueryParameters.GetQueryParameter( QueryParameters.GetQueryParameter(
"osmApiTileSize", "osmApiTileSize",
"" + layoutToUse?.osmApiTileSize, "" + layoutToUse?.osmApiTileSize,
"Tilesize when the OSM-API is used to fetch data within a BBOX", "Tilesize when the OSM-API is used to fetch data within a BBOX"
), )
) )
this.backgroundLayerId = QueryParameters.GetQueryParameter( this.backgroundLayerId = QueryParameters.GetQueryParameter(
"background", "background",
layoutToUse?.defaultBackgroundId, layoutToUse?.defaultBackgroundId,
"The id of the background layer to start with", "The id of the background layer to start with"
) )
} }
} }

14
src/Logic/State/LayerState.ts
View file

@ -35,13 +35,23 @@ export default class LayerState {
* @param context * @param context
* @param layersEnabledByDefault * @param layersEnabledByDefault
*/ */
constructor(osmConnection: OsmConnection, layers: LayerConfig[], context: string, layersEnabledByDefault: Store<boolean>) { constructor(
osmConnection: OsmConnection,
layers: LayerConfig[],
context: string,
layersEnabledByDefault: Store<boolean>
) {
this.osmConnection = osmConnection this.osmConnection = osmConnection
const filteredLayers = new Map() const filteredLayers = new Map()
for (const layer of layers) { for (const layer of layers) {
filteredLayers.set( filteredLayers.set(
layer.id, layer.id,
FilteredLayer.initLinkedState(layer, context, this.osmConnection, layersEnabledByDefault) FilteredLayer.initLinkedState(
layer,
context,
this.osmConnection,
layersEnabledByDefault
)
) )
} }
this.filteredLayers = filteredLayers this.filteredLayers = filteredLayers

48
src/Logic/State/UserSettingsMetaTagging.ts
View file

@ -1,14 +1,42 @@
import { Utils } from "../../Utils" import { Utils } from "../../Utils"
/** This code is autogenerated - do not edit. Edit ./assets/layers/usersettings/usersettings.json instead */ /** This code is autogenerated - do not edit. Edit ./assets/layers/usersettings/usersettings.json instead */
export class ThemeMetaTagging { export class ThemeMetaTagging {
public static readonly themeName = "usersettings" public static readonly themeName = "usersettings"
public metaTaggging_for_usersettings(feat: {properties: Record<string, string>}) { public metaTaggging_for_usersettings(feat: { properties: Record<string, string> }) {
Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_md', () => feat.properties._description.match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)?.at(1) ) Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_md", () =>
Utils.AddLazyProperty(feat.properties, '_d', () => feat.properties._description?.replace(/&lt;/g,'<')?.replace(/&gt;/g,'>') ?? '' ) feat.properties._description
Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_a', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.href.match(/mastodon|en.osm.town/) !== null)[0]?.href }) (feat) ) .match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)
Utils.AddLazyProperty(feat.properties, '_mastodon_link', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.getAttribute("rel")?.indexOf('me') >= 0)[0]?.href})(feat) ) ?.at(1)
Utils.AddLazyProperty(feat.properties, '_mastodon_candidate', () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a ) )
feat.properties['__current_backgroun'] = 'initial_value' Utils.AddLazyProperty(
} feat.properties,
} "_d",
() => feat.properties._description?.replace(/&lt;/g, "<")?.replace(/&gt;/g, ">") ?? ""
)
Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_a", () =>
((feat) => {
const e = document.createElement("div")
e.innerHTML = feat.properties._d
return Array.from(e.getElementsByTagName("a")).filter(
(a) => a.href.match(/mastodon|en.osm.town/) !== null
)[0]?.href
})(feat)
)
Utils.AddLazyProperty(feat.properties, "_mastodon_link", () =>
((feat) => {
const e = document.createElement("div")
e.innerHTML = feat.properties._d
return Array.from(e.getElementsByTagName("a")).filter(
(a) => a.getAttribute("rel")?.indexOf("me") >= 0
)[0]?.href
})(feat)
)
Utils.AddLazyProperty(
feat.properties,
"_mastodon_candidate",
() => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a
)
feat.properties["__current_backgroun"] = "initial_value"
}
}

12
src/Models/Constants.ts
View file

@ -169,7 +169,17 @@ export default class Constants {
public static readonly maptilerApiKey = "GvoVAJgu46I5rZapJuAy" public static readonly maptilerApiKey = "GvoVAJgu46I5rZapJuAy"
public static readonly SummaryServer: string = Constants.config.summary_server public static readonly SummaryServer: string = Constants.config.summary_server
public static allServers: string[] = [Constants.SummaryServer, Constants.VectorTileServer, Constants.GeoIpServer, Constants.ErrorReportServer, Constants.countryCoderEndpoint, Constants.osmAuthConfig.url, Constants.nominatimEndpoint, Constants.linkedDataProxy, ...Constants.defaultOverpassUrls] public static allServers: string[] = [
Constants.SummaryServer,
Constants.VectorTileServer,
Constants.GeoIpServer,
Constants.ErrorReportServer,
Constants.countryCoderEndpoint,
Constants.osmAuthConfig.url,
Constants.nominatimEndpoint,
Constants.linkedDataProxy,
...Constants.defaultOverpassUrls,
]
private static isRetina(): boolean { private static isRetina(): boolean {
if (Utils.runningFromConsole) { if (Utils.runningFromConsole) {

4
src/Models/FilteredLayer.ts
View file

@ -104,12 +104,12 @@ export default class FilteredLayer {
) )
} else { } else {
let isShown = layer.shownByDefault let isShown = layer.shownByDefault
if(enabledByDefault !== undefined && enabledByDefault.data === false){ if (enabledByDefault !== undefined && enabledByDefault.data === false) {
isShown = false isShown = false
} }
isDisplayed = QueryParameters.GetBooleanQueryParameter( isDisplayed = QueryParameters.GetBooleanQueryParameter(
FilteredLayer.queryParameterKey(layer), FilteredLayer.queryParameterKey(layer),
isShown , isShown,
"Whether or not layer " + layer.id + " is shown" "Whether or not layer " + layer.id + " is shown"
) )
} }

5
src/Models/MenuState.ts
View file

@ -39,7 +39,9 @@ export class MenuState {
/** /**
* Standalone copyright panel * Standalone copyright panel
*/ */
public readonly copyrightPanelIsOpened: UIEventSource<boolean> = new UIEventSource<boolean>(false) public readonly copyrightPanelIsOpened: UIEventSource<boolean> = new UIEventSource<boolean>(
false
)
public readonly communityIndexPanelIsOpened: UIEventSource<boolean> = new UIEventSource(false) public readonly communityIndexPanelIsOpened: UIEventSource<boolean> = new UIEventSource(false)
public readonly allToggles: { public readonly allToggles: {
@ -140,7 +142,6 @@ export class MenuState {
name: "background", name: "background",
showOverOthers: true, showOverOthers: true,
}, },
] ]
for (const toggle of this.allToggles) { for (const toggle of this.allToggles) {
toggle.toggle.addCallback((isOpen) => { toggle.toggle.addCallback((isOpen) => {

13
src/Models/ThemeConfig/LayoutConfig.ts
View file

@ -336,13 +336,12 @@ export default class LayoutConfig implements LayoutInformation {
...json, ...json,
layers: json.layers.filter((l) => l["id"] !== "favourite"), layers: json.layers.filter((l) => l["id"] !== "favourite"),
} }
const usedImages = const usedImages = new ExtractImages(this.official, undefined)
new ExtractImages(this.official, undefined) .convertStrict(
.convertStrict( jsonNoFavourites,
jsonNoFavourites, ConversionContext.construct([json.id], ["ExtractImages"])
ConversionContext.construct([json.id], ["ExtractImages"]) )
) .flatMap((i) => i.path)
.flatMap((i) => i.path)
usedImages.sort() usedImages.sort()
this.usedImages = Utils.Dedup(usedImages) this.usedImages = Utils.Dedup(usedImages)

109
src/Models/ThemeViewState.ts
View file

@ -158,7 +158,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
this.featureSwitches = new FeatureSwitchState(layout) this.featureSwitches = new FeatureSwitchState(layout)
this.guistate = new MenuState( this.guistate = new MenuState(
this.featureSwitches.featureSwitchWelcomeMessage.data, this.featureSwitches.featureSwitchWelcomeMessage.data,
layout.id, layout.id
) )
this.map = new UIEventSource<MlMap>(undefined) this.map = new UIEventSource<MlMap>(undefined)
const geolocationState = new GeoLocationState() const geolocationState = new GeoLocationState()
@ -174,14 +174,14 @@ export default class ThemeViewState implements SpecialVisualizationState {
oauth_token: QueryParameters.GetQueryParameter( oauth_token: QueryParameters.GetQueryParameter(
"oauth_token", "oauth_token",
undefined, undefined,
"Used to complete the login", "Used to complete the login"
), ),
}) })
this.userRelatedState = new UserRelatedState( this.userRelatedState = new UserRelatedState(
this.osmConnection, this.osmConnection,
layout, layout,
this.featureSwitches, this.featureSwitches,
this.mapProperties, this.mapProperties
) )
this.userRelatedState.fixateNorth.addCallbackAndRunD((fixated) => { this.userRelatedState.fixateNorth.addCallbackAndRunD((fixated) => {
this.mapProperties.allowRotating.setData(fixated !== "yes") this.mapProperties.allowRotating.setData(fixated !== "yes")
@ -192,17 +192,22 @@ export default class ThemeViewState implements SpecialVisualizationState {
geolocationState, geolocationState,
this.selectedElement, this.selectedElement,
this.mapProperties, this.mapProperties,
this.userRelatedState.gpsLocationHistoryRetentionTime, this.userRelatedState.gpsLocationHistoryRetentionTime
) )
this.geolocationControl = new GeolocationControlState(this.geolocation, this.mapProperties) this.geolocationControl = new GeolocationControlState(this.geolocation, this.mapProperties)
this.availableLayers = AvailableRasterLayers.layersAvailableAt( this.availableLayers = AvailableRasterLayers.layersAvailableAt(
this.mapProperties.location, this.mapProperties.location,
this.osmConnection.isLoggedIn, this.osmConnection.isLoggedIn
) )
const self = this const self = this
this.layerState = new LayerState(this.osmConnection, layout.layers, layout.id, this.featureSwitches.featureSwitchLayerDefault) this.layerState = new LayerState(
this.osmConnection,
layout.layers,
layout.id,
this.featureSwitches.featureSwitchLayerDefault
)
{ {
const overlayLayerStates = new Map<string, { isDisplayed: UIEventSource<boolean> }>() const overlayLayerStates = new Map<string, { isDisplayed: UIEventSource<boolean> }>()
@ -210,7 +215,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
const isDisplayed = QueryParameters.GetBooleanQueryParameter( const isDisplayed = QueryParameters.GetBooleanQueryParameter(
"overlay-" + rasterInfo.id, "overlay-" + rasterInfo.id,
rasterInfo.defaultState ?? true, rasterInfo.defaultState ?? true,
"Whether or not overlay layer " + rasterInfo.id + " is shown", "Whether or not overlay layer " + rasterInfo.id + " is shown"
) )
const state = { isDisplayed } const state = { isDisplayed }
overlayLayerStates.set(rasterInfo.id, state) overlayLayerStates.set(rasterInfo.id, state)
@ -235,7 +240,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
this.osmConnection.Backend(), this.osmConnection.Backend(),
(id) => self.layerState.filteredLayers.get(id).isDisplayed, (id) => self.layerState.filteredLayers.get(id).isDisplayed,
mvtAvailableLayers, mvtAvailableLayers,
this.fullNodeDatabase, this.fullNodeDatabase
) )
let currentViewIndex = 0 let currentViewIndex = 0
@ -253,7 +258,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
id: "current_view_" + currentViewIndex, id: "current_view_" + currentViewIndex,
}), }),
] ]
}), })
) )
this.featuresInView = new BBoxFeatureSource(layoutSource, this.mapProperties.bounds) this.featuresInView = new BBoxFeatureSource(layoutSource, this.mapProperties.bounds)
@ -271,19 +276,19 @@ export default class ThemeViewState implements SpecialVisualizationState {
featureSwitches: this.featureSwitches, featureSwitches: this.featureSwitches,
}, },
layout?.isLeftRightSensitive() ?? false, layout?.isLeftRightSensitive() ?? false,
(e) => this.reportError(e), (e) => this.reportError(e)
) )
this.historicalUserLocations = this.geolocation.historicalUserLocations this.historicalUserLocations = this.geolocation.historicalUserLocations
this.newFeatures = new NewGeometryFromChangesFeatureSource( this.newFeatures = new NewGeometryFromChangesFeatureSource(
this.changes, this.changes,
layoutSource, layoutSource,
this.featureProperties, this.featureProperties
) )
layoutSource.addSource(this.newFeatures) layoutSource.addSource(this.newFeatures)
const perLayer = new PerLayerFeatureSourceSplitter( const perLayer = new PerLayerFeatureSourceSplitter(
Array.from(this.layerState.filteredLayers.values()).filter( Array.from(this.layerState.filteredLayers.values()).filter(
(l) => l.layerDef?.source !== null, (l) => l.layerDef?.source !== null
), ),
new ChangeGeometryApplicator(this.indexedFeatures, this.changes), new ChangeGeometryApplicator(this.indexedFeatures, this.changes),
{ {
@ -294,10 +299,10 @@ export default class ThemeViewState implements SpecialVisualizationState {
"Got ", "Got ",
features.length, features.length,
"leftover features, such as", "leftover features, such as",
features[0].properties, features[0].properties
) )
}, },
}, }
) )
this.perLayer = perLayer.perLayer this.perLayer = perLayer.perLayer
} }
@ -337,12 +342,12 @@ export default class ThemeViewState implements SpecialVisualizationState {
this.lastClickObject = new LastClickFeatureSource( this.lastClickObject = new LastClickFeatureSource(
this.layout, this.layout,
this.mapProperties.lastClickLocation, this.mapProperties.lastClickLocation,
this.userRelatedState.addNewFeatureMode, this.userRelatedState.addNewFeatureMode
) )
this.osmObjectDownloader = new OsmObjectDownloader( this.osmObjectDownloader = new OsmObjectDownloader(
this.osmConnection.Backend(), this.osmConnection.Backend(),
this.changes, this.changes
) )
this.perLayerFiltered = this.showNormalDataOn(this.map) this.perLayerFiltered = this.showNormalDataOn(this.map)
@ -353,7 +358,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
currentZoom: this.mapProperties.zoom, currentZoom: this.mapProperties.zoom,
layerState: this.layerState, layerState: this.layerState,
bounds: this.visualFeedbackViewportBounds, bounds: this.visualFeedbackViewportBounds,
}, }
) )
this.hasDataInView = new NoElementsInViewDetector(this).hasFeatureInView this.hasDataInView = new NoElementsInViewDetector(this).hasFeatureInView
this.imageUploadManager = new ImageUploadManager( this.imageUploadManager = new ImageUploadManager(
@ -361,11 +366,13 @@ export default class ThemeViewState implements SpecialVisualizationState {
Imgur.singleton, Imgur.singleton,
this.featureProperties, this.featureProperties,
this.osmConnection, this.osmConnection,
this.changes, this.changes
) )
this.favourites = new FavouritesFeatureSource(this) this.favourites = new FavouritesFeatureSource(this)
this.featureSummary = this.setupSummaryLayer(new LayerConfig(<LayerConfigJson>summaryLayer, "summaryLayer", true)) this.featureSummary = this.setupSummaryLayer(
new LayerConfig(<LayerConfigJson>summaryLayer, "summaryLayer", true)
)
this.toCacheSavers = this.initSaveToLocalStorage() this.toCacheSavers = this.initSaveToLocalStorage()
this.initActors() this.initActors()
this.drawSpecialLayers() this.drawSpecialLayers()
@ -404,7 +411,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
LayoutSource.fromCacheZoomLevel, LayoutSource.fromCacheZoomLevel,
fs, fs,
this.featureProperties, this.featureProperties,
fs.layer.layerDef.maxAgeOfCache, fs.layer.layerDef.maxAgeOfCache
) )
toLocalStorage.set(layerId, storage) toLocalStorage.set(layerId, storage)
}) })
@ -417,7 +424,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
const doShowLayer = this.mapProperties.zoom.map( const doShowLayer = this.mapProperties.zoom.map(
(z) => (z) =>
(fs.layer.isDisplayed?.data ?? true) && z >= (fs.layer.layerDef?.minzoom ?? 0), (fs.layer.isDisplayed?.data ?? true) && z >= (fs.layer.layerDef?.minzoom ?? 0),
[fs.layer.isDisplayed], [fs.layer.isDisplayed]
) )
if (!doShowLayer.data && this.featureSwitches.featureSwitchFilter.data === false) { if (!doShowLayer.data && this.featureSwitches.featureSwitchFilter.data === false) {
@ -434,7 +441,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
fs.layer, fs.layer,
fs, fs,
(id) => this.featureProperties.getStore(id), (id) => this.featureProperties.getStore(id),
this.layerState.globalFilters, this.layerState.globalFilters
) )
filteringFeatureSource.set(layerName, filtered) filteringFeatureSource.set(layerName, filtered)
@ -575,7 +582,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
return return
} }
this.selectClosestAtCenter(0) this.selectClosestAtCenter(0)
}, }
) )
for (let i = 1; i < 9; i++) { for (let i = 1; i < 9; i++) {
@ -593,7 +600,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
onUp: true, onUp: true,
}, },
doc, doc,
() => this.selectClosestAtCenter(i - 1), () => this.selectClosestAtCenter(i - 1)
) )
} }
@ -610,7 +617,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
if (this.featureSwitches.featureSwitchBackgroundSelection.data) { if (this.featureSwitches.featureSwitchBackgroundSelection.data) {
this.guistate.backgroundLayerSelectionIsOpened.setData(true) this.guistate.backgroundLayerSelectionIsOpened.setData(true)
} }
}, }
) )
Hotkeys.RegisterHotkey( Hotkeys.RegisterHotkey(
{ {
@ -622,14 +629,14 @@ export default class ThemeViewState implements SpecialVisualizationState {
if (this.featureSwitches.featureSwitchFilter.data) { if (this.featureSwitches.featureSwitchFilter.data) {
this.guistate.openFilterView() this.guistate.openFilterView()
} }
}, }
) )
Hotkeys.RegisterHotkey( Hotkeys.RegisterHotkey(
{ shift: "O" }, { shift: "O" },
Translations.t.hotkeyDocumentation.selectMapnik, Translations.t.hotkeyDocumentation.selectMapnik,
() => { () => {
this.mapProperties.rasterLayer.setData(AvailableRasterLayers.osmCarto) this.mapProperties.rasterLayer.setData(AvailableRasterLayers.osmCarto)
}, }
) )
const setLayerCategory = (category: EliCategory) => { const setLayerCategory = (category: EliCategory) => {
const available = this.availableLayers.data const available = this.availableLayers.data
@ -637,7 +644,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
const best = RasterLayerUtils.SelectBestLayerAccordingTo( const best = RasterLayerUtils.SelectBestLayerAccordingTo(
available, available,
category, category,
current.data, current.data
) )
console.log("Best layer for category", category, "is", best.properties.id) console.log("Best layer for category", category, "is", best.properties.id)
current.setData(best) current.setData(best)
@ -646,26 +653,26 @@ export default class ThemeViewState implements SpecialVisualizationState {
Hotkeys.RegisterHotkey( Hotkeys.RegisterHotkey(
{ nomod: "O" }, { nomod: "O" },
Translations.t.hotkeyDocumentation.selectOsmbasedmap, Translations.t.hotkeyDocumentation.selectOsmbasedmap,
() => setLayerCategory("osmbasedmap"), () => setLayerCategory("osmbasedmap")
) )
Hotkeys.RegisterHotkey( Hotkeys.RegisterHotkey(
{ nomod: "M" }, { nomod: "M" },
Translations.t.hotkeyDocumentation.selectMap, Translations.t.hotkeyDocumentation.selectMap,
() => setLayerCategory("map"), () => setLayerCategory("map")
) )
Hotkeys.RegisterHotkey( Hotkeys.RegisterHotkey(
{ nomod: "P" }, { nomod: "P" },
Translations.t.hotkeyDocumentation.selectAerial, Translations.t.hotkeyDocumentation.selectAerial,
() => setLayerCategory("photo"), () => setLayerCategory("photo")
) )
Hotkeys.RegisterHotkey( Hotkeys.RegisterHotkey(
{ nomod: "L" }, { nomod: "L" },
Translations.t.hotkeyDocumentation.geolocate, Translations.t.hotkeyDocumentation.geolocate,
() => { () => {
this.geolocationControl.handleClick() this.geolocationControl.handleClick()
}, }
) )
return true return true
}) })
@ -677,7 +684,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
Translations.t.hotkeyDocumentation.translationMode, Translations.t.hotkeyDocumentation.translationMode,
() => { () => {
Locale.showLinkToWeblate.setData(!Locale.showLinkToWeblate.data) Locale.showLinkToWeblate.setData(!Locale.showLinkToWeblate.data)
}, }
) )
} }
@ -688,7 +695,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
const normalLayers = this.layout.layers.filter( const normalLayers = this.layout.layers.filter(
(l) => (l) =>
Constants.priviliged_layers.indexOf(<any>l.id) < 0 && Constants.priviliged_layers.indexOf(<any>l.id) < 0 &&
!l.id.startsWith("note_import"), !l.id.startsWith("note_import")
) )
const maxzoom = Math.min(...normalLayers.map((l) => l.minzoom)) const maxzoom = Math.min(...normalLayers.map((l) => l.minzoom))
@ -696,7 +703,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
(l) => (l) =>
Constants.priviliged_layers.indexOf(<any>l.id) < 0 && Constants.priviliged_layers.indexOf(<any>l.id) < 0 &&
l.source.geojsonSource === undefined && l.source.geojsonSource === undefined &&
l.doCount, l.doCount
) )
const summaryTileSource = new SummaryTileSource( const summaryTileSource = new SummaryTileSource(
Constants.SummaryServer, Constants.SummaryServer,
@ -705,7 +712,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
this.mapProperties, this.mapProperties,
{ {
isActive: this.mapProperties.zoom.map((z) => z < maxzoom), isActive: this.mapProperties.zoom.map((z) => z < maxzoom),
}, }
) )
const src = new SummaryTileSourceRewriter(summaryTileSource, this.layerState.filteredLayers) const src = new SummaryTileSourceRewriter(summaryTileSource, this.layerState.filteredLayers)
@ -727,12 +734,12 @@ export default class ThemeViewState implements SpecialVisualizationState {
gps_location_history: this.geolocation.historicalUserLocations, gps_location_history: this.geolocation.historicalUserLocations,
gps_track: this.geolocation.historicalUserLocationsTrack, gps_track: this.geolocation.historicalUserLocationsTrack,
selected_element: new StaticFeatureSource( selected_element: new StaticFeatureSource(
this.selectedElement.map((f) => (f === undefined ? empty : [f])), this.selectedElement.map((f) => (f === undefined ? empty : [f]))
), ),
range: new StaticFeatureSource( range: new StaticFeatureSource(
this.mapProperties.maxbounds.map((bbox) => this.mapProperties.maxbounds.map((bbox) =>
bbox === undefined ? empty : <Feature[]>[bbox.asGeoJson({ id: "range" })], bbox === undefined ? empty : <Feature[]>[bbox.asGeoJson({ id: "range" })]
), )
), ),
current_view: this.currentView, current_view: this.currentView,
favourite: this.favourites, favourite: this.favourites,
@ -747,7 +754,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
ShowDataLayer.showRange( ShowDataLayer.showRange(
this.map, this.map,
new StaticFeatureSource([bbox.asGeoJson({ id: "range" })]), new StaticFeatureSource([bbox.asGeoJson({ id: "range" })]),
this.featureSwitches.featureSwitchIsTesting, this.featureSwitches.featureSwitchIsTesting
) )
} }
const currentViewLayer = this.layout.layers.find((l) => l.id === "current_view") const currentViewLayer = this.layout.layers.find((l) => l.id === "current_view")
@ -761,7 +768,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
currentViewLayer, currentViewLayer,
this.layout, this.layout,
this.osmObjectDownloader, this.osmObjectDownloader,
this.featureProperties, this.featureProperties
) )
}) })
} }
@ -805,20 +812,20 @@ export default class ThemeViewState implements SpecialVisualizationState {
const lastClickLayerConfig = new LayerConfig( const lastClickLayerConfig = new LayerConfig(
<LayerConfigJson>last_click_layerconfig, <LayerConfigJson>last_click_layerconfig,
"last_click", "last_click"
) )
const lastClickFiltered = const lastClickFiltered =
lastClickLayerConfig.isShown === undefined lastClickLayerConfig.isShown === undefined
? specialLayers.last_click ? specialLayers.last_click
: specialLayers.last_click.features.mapD((fs) => : specialLayers.last_click.features.mapD((fs) =>
fs.filter((f) => { fs.filter((f) => {
const matches = lastClickLayerConfig.isShown.matchesProperties( const matches = lastClickLayerConfig.isShown.matchesProperties(
f.properties, f.properties
) )
console.debug("LastClick ", f, "matches", matches) console.debug("LastClick ", f, "matches", matches)
return matches return matches
}), })
) )
new ShowDataLayer(this.map, { new ShowDataLayer(this.map, {
features: new StaticFeatureSource(lastClickFiltered), features: new StaticFeatureSource(lastClickFiltered),
layer: lastClickLayerConfig, layer: lastClickLayerConfig,
@ -863,7 +870,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
this.mapProperties.rasterLayer, this.mapProperties.rasterLayer,
this.availableLayers, this.availableLayers,
this.featureSwitches.backgroundLayerId, this.featureSwitches.backgroundLayerId,
this.userRelatedState.preferredBackgroundLayer, this.userRelatedState.preferredBackgroundLayer
) )
} }

7
src/UI/Base/Copyable.svelte
View file

@ -1,5 +1,4 @@
<script lang="ts"> <script lang="ts">
import { Utils } from "../../Utils" import { Utils } from "../../Utils"
import Share from "@babeard/svelte-heroicons/solid/Share" import Share from "@babeard/svelte-heroicons/solid/Share"
import { DocumentDuplicateIcon } from "@rgossiaux/svelte-heroicons/outline" import { DocumentDuplicateIcon } from "@rgossiaux/svelte-heroicons/outline"
@ -30,8 +29,7 @@
} }
</script> </script>
<div class="flex flex-col w-full"> <div class="flex w-full flex-col">
<div class="flex w-full"> <div class="flex w-full">
<div class="literal-code w-full" on:click={(e) => Utils.selectTextIn(e.target)}> <div class="literal-code w-full" on:click={(e) => Utils.selectTextIn(e.target)}>
{text} {text}
@ -48,11 +46,8 @@
</button> </button>
{/if} {/if}
</div> </div>
</div> </div>
<div class="flex justify-center"> <div class="flex justify-center">
{#if isCopied} {#if isCopied}
<Tr t={tr.copiedToClipboard} cls="thanks m-2" /> <Tr t={tr.copiedToClipboard} cls="thanks m-2" />

20
src/UI/BigComponents/AboutMapComplete.svelte
View file

@ -1,5 +1,4 @@
<script lang="ts"> <script lang="ts">
import Translations from "../i18n/Translations" import Translations from "../i18n/Translations"
import { Utils } from "../../Utils" import { Utils } from "../../Utils"
import Hotkeys from "../Base/Hotkeys" import Hotkeys from "../Base/Hotkeys"
@ -24,7 +23,6 @@
let layout = state.layout let layout = state.layout
let featureSwitches = state.featureSwitches let featureSwitches = state.featureSwitches
</script> </script>
<div class="link-underline links-w-full m-2 flex flex-col gap-y-1"> <div class="link-underline links-w-full m-2 flex flex-col gap-y-1">
@ -51,16 +49,14 @@
<a <a
class="flex" class="flex"
href={"https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Themes/" + href={"https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Themes/" + layout.id + ".md"}
layout.id +
".md"}
target="_blank" target="_blank"
> >
<DocumentChartBar class="h-6 w-6" /> <DocumentChartBar class="h-6 w-6" />
<Tr <Tr
t={Translations.t.general.attribution.openThemeDocumentation.Subs({ t={Translations.t.general.attribution.openThemeDocumentation.Subs({
name: layout.title, name: layout.title,
})} })}
/> />
</a> </a>
@ -74,10 +70,7 @@
<Tr t={Translations.t.general.attribution.donate} /> <Tr t={Translations.t.general.attribution.donate} />
</a> </a>
<button <button class="as-link" on:click={() => state.guistate.communityIndexPanelIsOpened.setData(true)}>
class="as-link"
on:click={() => state.guistate.communityIndexPanelIsOpened.setData(true)}
>
<Community class="h-6 w-6" /> <Community class="h-6 w-6" />
<Tr t={Translations.t.communityIndex.title} /> <Tr t={Translations.t.communityIndex.title} />
</button> </button>
@ -88,10 +81,7 @@
<MapillaryLink large={false} mapProperties={state.mapProperties} /> <MapillaryLink large={false} mapProperties={state.mapProperties} />
</If> </If>
<button <button class="as-link" on:click={() => state.guistate.privacyPanelIsOpened.setData(true)}>
class="as-link"
on:click={() => state.guistate.privacyPanelIsOpened.setData(true)}
>
<EyeIcon class="h-6 w-6 pr-1" /> <EyeIcon class="h-6 w-6 pr-1" />
<Tr t={Translations.t.privacy.title} /> <Tr t={Translations.t.privacy.title} />
</button> </button>

6
src/UI/BigComponents/CopyrightPanel.ts
View file

@ -40,9 +40,9 @@ export default class CopyrightPanel extends Combine {
const t = Translations.t.general.attribution const t = Translations.t.general.attribution
const layoutToUse = state.layout const layoutToUse = state.layout
const iconAttributions: BaseUIElement[] =layoutToUse.getUsedImages().map( const iconAttributions: BaseUIElement[] = layoutToUse
CopyrightPanel.IconAttribution .getUsedImages()
) .map(CopyrightPanel.IconAttribution)
let maintainer: BaseUIElement = undefined let maintainer: BaseUIElement = undefined
if (layoutToUse.credits !== undefined && layoutToUse.credits !== "") { if (layoutToUse.credits !== undefined && layoutToUse.credits !== "") {

63
src/UI/BigComponents/ShareScreen.svelte
View file

@ -31,8 +31,7 @@
*/ */
let needsThemeRedirect = url.port !== "" || url.hostname.match(/^[0-9]/) || !state.layout.official let needsThemeRedirect = url.port !== "" || url.hostname.match(/^[0-9]/) || !state.layout.official
let layoutId = state.layout.id let layoutId = state.layout.id
let baseLink = let baseLink = `${url.protocol}//${url.host}/${needsThemeRedirect ? "theme.html" : layoutId}?`
`${url.protocol}//${url.host}/${needsThemeRedirect ? "theme.html" : layoutId}?`
let showWelcomeMessage = true let showWelcomeMessage = true
let enableLogin = true let enableLogin = true
@ -45,7 +44,8 @@
enableLogin: boolean, enableLogin: boolean,
enableFilters: boolean, enableFilters: boolean,
enableBackground: boolean, enableBackground: boolean,
enableGeolocation: boolean) { enableGeolocation: boolean
) {
const layout = state.layout const layout = state.layout
let excluded = Utils.NoNull([ let excluded = Utils.NoNull([
showWelcomeMessage ? undefined : "fs-welcome-message", showWelcomeMessage ? undefined : "fs-welcome-message",
@ -53,7 +53,6 @@
enableFilters ? undefined : "fs-filter", enableFilters ? undefined : "fs-filter",
enableBackground ? undefined : "fs-background", enableBackground ? undefined : "fs-background",
enableGeolocation ? undefined : "fs-geolocation", enableGeolocation ? undefined : "fs-geolocation",
]) ])
const layerParamsWhitelist: string[] = ["fs-layers-enabled=false"] const layerParamsWhitelist: string[] = ["fs-layers-enabled=false"]
const layerParamsBlacklist: string[] = [] const layerParamsBlacklist: string[] = []
@ -79,9 +78,10 @@
const layersBlack = layerParamsBlacklist.join("&") const layersBlack = layerParamsBlacklist.join("&")
const layersWhite = layerParamsWhitelist.join("&") const layersWhite = layerParamsWhitelist.join("&")
const layers = layersBlack.length < layersWhite.length ? layerParamsBlacklist : layerParamsWhitelist const layers =
layersBlack.length < layersWhite.length ? layerParamsBlacklist : layerParamsWhitelist
const params = QueryParameters.GetParts(new Set(excluded)) const params = QueryParameters.GetParts(new Set(excluded))
.filter(part => !part.startsWith("layer-")) .filter((part) => !part.startsWith("layer-"))
.concat(...layers) .concat(...layers)
.concat(excluded.map((k) => k + "=" + false)) .concat(excluded.map((k) => k + "=" + false))
linkToShare = baseLink + Utils.Dedup(params).join("&") linkToShare = baseLink + Utils.Dedup(params).join("&")
@ -91,30 +91,42 @@
} }
} }
$: calculateLinkToShare(showWelcomeMessage, enableLogin, enableFilters, enableBackground, enableGeolocation) $: calculateLinkToShare(
showWelcomeMessage,
enableLogin,
enableFilters,
enableBackground,
enableGeolocation
)
let iframeCode: string let iframeCode: string
$: iframeCode = `<iframe src="${linkToShare}" $: iframeCode = `<iframe src="${linkToShare}"
${enableGeolocation ? 'allow="geolocation"' : ""} width="100%" height="100%" style="min-width: 250px; min-height: 250px" ${
enableGeolocation ? 'allow="geolocation"' : ""
} width="100%" height="100%" style="min-width: 250px; min-height: 250px"
title="${state.layout.title?.txt ?? "MapComplete"} with MapComplete"> title="${state.layout.title?.txt ?? "MapComplete"} with MapComplete">
</iframe>` </iframe>`
Array.from(state.layerState.filteredLayers.values()).forEach(flayer => flayer.isDisplayed.addCallbackAndRunD(_ => { Array.from(state.layerState.filteredLayers.values()).forEach((flayer) =>
calculateLinkToShare(showWelcomeMessage, enableLogin, enableFilters, enableBackground, enableGeolocation) flayer.isDisplayed.addCallbackAndRunD((_) => {
})) calculateLinkToShare(
showWelcomeMessage,
enableLogin,
enableFilters,
enableBackground,
enableGeolocation
)
})
)
</script> </script>
<div class="flex flex-col"> <div class="flex flex-col">
<div class="flex flex-col"> <div class="flex flex-col">
<Tr t={tr.intro} /> <Tr t={tr.intro} />
<Copyable {state} text={linkToShare}/> <Copyable {state} text={linkToShare} />
</div> </div>
<div class="flex justify-center"> <div class="flex justify-center">
<ToSvelte <ToSvelte
construct={() => new Img(new Qr(linkToShare).toImageElement(125)).SetStyle("width: 125px")} construct={() => new Img(new Qr(linkToShare).toImageElement(125)).SetStyle("width: 125px")}
/> />
@ -122,11 +134,11 @@
<Tr t={tr.embedIntro} /> <Tr t={tr.embedIntro} />
<Copyable text={iframeCode}/> <Copyable text={iframeCode} />
<AccordionSingle> <AccordionSingle>
<div slot="header"> <div slot="header">
<Tr t={tr.options}/> <Tr t={tr.options} />
</div> </div>
<div class="link-underline my-1 flex flex-col"> <div class="link-underline my-1 flex flex-col">
<label> <label>
@ -139,13 +151,11 @@
<Tr t={tr.fsUserbadge} /> <Tr t={tr.fsUserbadge} />
</label> </label>
<label> <label>
<input bind:checked={enableFilters} type="checkbox" id="share_enable_filter" /> <input bind:checked={enableFilters} type="checkbox" id="share_enable_filter" />
<Tr t={tr.fsFilter} /> <Tr t={tr.fsFilter} />
</label> </label>
<label> <label>
<input bind:checked={enableBackground} type="checkbox" id="share_enable_background" /> <input bind:checked={enableBackground} type="checkbox" id="share_enable_background" />
<Tr t={tr.fsBackground} /> <Tr t={tr.fsBackground} />
@ -157,15 +167,16 @@
</label> </label>
<span> <span>
<Tr t={tr.stateIsIncluded} />
<Tr t={tr.stateIsIncluded}/> <a
<a class="inline-block w-fit cursor-pointer" on:click={() => state.guistate.filtersPanelIsOpened.set(true)}> class="inline-block w-fit cursor-pointer"
<Tr t={tr.openLayers}/> on:click={() => state.guistate.filtersPanelIsOpened.set(true)}
</a> >
<Tr t={tr.openLayers} />
</a>
</span> </span>
<Tr cls="link-underline" t={tr.documentation} /> <Tr cls="link-underline" t={tr.documentation} />
</div> </div>
</AccordionSingle> </AccordionSingle>
</div> </div>

2
src/UI/BigComponents/ThemeButton.svelte
View file

@ -86,7 +86,7 @@
</script> </script>
{#if theme.id !== personal.id || $unlockedPersonal} {#if theme.id !== personal.id || $unlockedPersonal}
<a class="my-1 flex w-full items-center text-ellipsis rounded low-interaction p-1" href={$href}> <a class="low-interaction my-1 flex w-full items-center text-ellipsis rounded p-1" href={$href}>
<Marker icons={theme.icon} size="block h-8 w-8 sm:h-11 sm:w-11 m-1 sm:mx-2 md:mx-4 shrink-0" /> <Marker icons={theme.icon} size="block h-8 w-8 sm:h-11 sm:w-11 m-1 sm:mx-2 md:mx-4 shrink-0" />
<span class="flex flex-col overflow-hidden text-ellipsis text-xl font-bold"> <span class="flex flex-col overflow-hidden text-ellipsis text-xl font-bold">

2
src/UI/BigComponents/ThemeIntroPanel.svelte
View file

@ -63,7 +63,7 @@
<!-- Buttons: open map, go to location, search --> <!-- Buttons: open map, go to location, search -->
<NextButton clss="primary w-full" on:click={() => state.guistate.themeIsOpened.setData(false)}> <NextButton clss="primary w-full" on:click={() => state.guistate.themeIsOpened.setData(false)}>
<div class="flex flex-col w-full items-center"> <div class="flex w-full flex-col items-center">
<div class="flex w-full justify-center text-2xl"> <div class="flex w-full justify-center text-2xl">
<Tr t={Translations.t.general.openTheMap} /> <Tr t={Translations.t.general.openTheMap} />
</div> </div>

76
src/UI/Popup/Notes/AddNoteComment.svelte
View file

@ -57,7 +57,6 @@
tags.data["closed_at"] = new Date().toISOString() tags.data["closed_at"] = new Date().toISOString()
NoteCommentElement.addCommentTo(txt.data, tags, state) NoteCommentElement.addCommentTo(txt.data, tags, state)
tags.ping() tags.ping()
} }
async function reopenNote() { async function reopenNote() {
@ -67,7 +66,6 @@
NoteCommentElement.addCommentTo(txt.data, tags, state) NoteCommentElement.addCommentTo(txt.data, tags, state)
tags.ping() tags.ping()
isProcessing.set(false) isProcessing.set(false)
} }
</script> </script>
@ -89,43 +87,43 @@
</label> </label>
{#if $isProcessing} {#if $isProcessing}
<Loading/> <Loading />
{:else} {:else}
<div class="flex flex-col"> <div class="flex flex-col">
{#if $txt?.length > 0} {#if $txt?.length > 0}
<button class="primary flex" on:click|preventDefault={() => addComment()}> <button class="primary flex" on:click|preventDefault={() => addComment()}>
<!-- Add a comment --> <!-- Add a comment -->
<Speech_bubble class="h-7 w-7 pr-2" /> <Speech_bubble class="h-7 w-7 pr-2" />
<Tr t={t.addCommentPlaceholder} /> <Tr t={t.addCommentPlaceholder} />
</button> </button>
{:else} {:else}
<div class="alert w-full"> <div class="alert w-full">
<Tr t={t.typeText} /> <Tr t={t.typeText} />
</div> </div>
{/if} {/if}
{#if !$isClosed} {#if !$isClosed}
<button class="flex items-center" on:click|preventDefault={() => closeNote()}> <button class="flex items-center" on:click|preventDefault={() => closeNote()}>
<Resolved class="h-8 w-8 pr-2" /> <Resolved class="h-8 w-8 pr-2" />
<!-- Close note --> <!-- Close note -->
{#if $txt === undefined || $txt === ""} {#if $txt === undefined || $txt === ""}
<Tr t={t.closeNote} /> <Tr t={t.closeNote} />
{:else} {:else}
<Tr t={t.addCommentAndClose} /> <Tr t={t.addCommentAndClose} />
{/if} {/if}
</button> </button>
{:else} {:else}
<button class="flex items-center" on:click|preventDefault={() => reopenNote()}> <button class="flex items-center" on:click|preventDefault={() => reopenNote()}>
<!-- Reopen --> <!-- Reopen -->
<Note class="h-7 w-7 pr-2" /> <Note class="h-7 w-7 pr-2" />
{#if $txt === undefined || $txt === ""} {#if $txt === undefined || $txt === ""}
<Tr t={t.reopenNote} /> <Tr t={t.reopenNote} />
{:else} {:else}
<Tr t={t.reopenNoteAndComment} /> <Tr t={t.reopenNoteAndComment} />
{/if} {/if}
</button> </button>
{/if} {/if}
</div> </div>
{/if} {/if}
</form> </form>
</LoginToggle> </LoginToggle>

1
src/UI/Studio/QuestionPreview.svelte
View file

@ -66,7 +66,6 @@
<div class="flex"> <div class="flex">
<div class="m-4 flex w-full flex-col"> <div class="m-4 flex w-full flex-col">
<NextButton clss="primary" on:click={() => state.highlightedItem.setData({ path, schema })}> <NextButton clss="primary" on:click={() => state.highlightedItem.setData({ path, schema })}>
{#if schema.hints.question} {#if schema.hints.question}
{schema.hints.question} {schema.hints.question}

16
src/UI/Studio/SchemaBasedArray.svelte
View file

@ -104,7 +104,9 @@
return `${singular} ${i}` return `${singular} ${i}`
} }
let genIconF: (x: any) => ({ icon: string, color: string }) = <any>Function("value", "return " + schema.hints.icon) let genIconF: (x: any) => { icon: string; color: string } = <any>(
Function("value", "return " + schema.hints.icon)
)
console.log("Icon lambda is", schema.hints.icon, path, genIconF("test")) console.log("Icon lambda is", schema.hints.icon, path, genIconF("test"))
function genIcon(value: any): string { function genIcon(value: any): string {
@ -117,7 +119,6 @@
} }
return genIconF(value)?.color return genIconF(value)?.color
} }
</script> </script>
<div class="pl-2"> <div class="pl-2">
@ -160,13 +161,14 @@
{#if schema.hints.icon} {#if schema.hints.icon}
<Icon clss="w-6 h-6" icon={genIcon(value)} color={genColor(value)} /> <Icon clss="w-6 h-6" icon={genIcon(value)} color={genColor(value)} />
{/if} {/if}
{singular} {i} {singular}
{i}
{#if schema.hints.title} {#if schema.hints.title}
<div class="subtle ml-2"> <div class="subtle ml-2">
<Tr t={Translations.T(genTitle(value, singular, i))}/> <Tr t={Translations.T(genTitle(value, singular, i))} />
</div> </div>
{/if} {/if}
</h3> </h3>
<button <button
class="h-fit w-fit rounded-full border border-black p-1" class="h-fit w-fit rounded-full border border-black p-1"
@ -177,9 +179,9 @@
<TrashIcon class="h-4 w-4" /> <TrashIcon class="h-4 w-4" />
</button> </button>
</div> </div>
{:else if typeof value === "string"} {:else if typeof value === "string"}
Builtin: <b>{value}</b> Builtin: <b>{value}</b>
{:else} {:else}
<Tr cls="font-bold" t={Translations.T(value?.question ?? value?.render)}/> <Tr cls="font-bold" t={Translations.T(value?.question ?? value?.render)}/>
{/if} {/if}
</span> </span>

7
src/UI/Studio/TagInput/BasicTagInput.svelte
View file

@ -128,8 +128,11 @@
on:submit on:submit
/> />
</div> </div>
<a target="_blank" href="https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md"> <a
<QuestionMarkCircle class="w-6 h-6"/> target="_blank"
href="https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md"
>
<QuestionMarkCircle class="h-6 w-6" />
</a> </a>
{#if $feedbackKey} {#if $feedbackKey}

2
src/UI/Studio/configMeta.ts
View file

@ -23,7 +23,7 @@ export interface ConfigMeta {
typesdefault?: string typesdefault?: string
suggestions?: [] suggestions?: []
title?: string title?: string
multianswer?: "true" | string, multianswer?: "true" | string
icon?: string icon?: string
} }
required: boolean required: boolean

4
src/UI/StudioGUI.svelte
View file

@ -203,9 +203,7 @@
state.selectedTab.setData(Number(tab)) state.selectedTab.setData(Number(tab))
} }
uid.AsPromise().then( uid.AsPromise().then((uid) => selectStateBasedOnHash(uid))
uid => selectStateBasedOnHash(uid)
)
function backToStudio() { function backToStudio() {
console.log("Back to studio") console.log("Back to studio")

34
src/UI/ThemeViewGUI.svelte
View file

@ -104,7 +104,7 @@
if (id.startsWith("current_view")) { if (id.startsWith("current_view")) {
return currentViewLayer return currentViewLayer
} }
if(id.startsWith("summary_")){ if (id.startsWith("summary_")) {
console.log("Not selecting a summary object. The summary object is", element) console.log("Not selecting a summary object. The summary object is", element)
return undefined return undefined
} }
@ -125,11 +125,11 @@
state.mapProperties.installCustomKeyboardHandler(viewport) state.mapProperties.installCustomKeyboardHandler(viewport)
let canZoomIn = mapproperties.maxzoom.map( let canZoomIn = mapproperties.maxzoom.map(
(mz) => mapproperties.zoom.data < mz, (mz) => mapproperties.zoom.data < mz,
[mapproperties.zoom], [mapproperties.zoom]
) )
let canZoomOut = mapproperties.minzoom.map( let canZoomOut = mapproperties.minzoom.map(
(mz) => mapproperties.zoom.data > mz, (mz) => mapproperties.zoom.data > mz,
[mapproperties.zoom], [mapproperties.zoom]
) )
function updateViewport() { function updateViewport() {
@ -166,7 +166,7 @@
onDestroy( onDestroy(
rasterLayer.addCallbackAndRunD((l) => { rasterLayer.addCallbackAndRunD((l) => {
rasterLayerName = l.properties.name rasterLayerName = l.properties.name
}), })
) )
let previewedImage = state.previewedImage let previewedImage = state.previewedImage
@ -197,7 +197,7 @@
let openMapButton: UIEventSource<HTMLElement> = new UIEventSource<HTMLElement>(undefined) let openMapButton: UIEventSource<HTMLElement> = new UIEventSource<HTMLElement>(undefined)
let openMenuButton: UIEventSource<HTMLElement> = new UIEventSource<HTMLElement>(undefined) let openMenuButton: UIEventSource<HTMLElement> = new UIEventSource<HTMLElement>(undefined)
let openCurrentViewLayerButton: UIEventSource<HTMLElement> = new UIEventSource<HTMLElement>( let openCurrentViewLayerButton: UIEventSource<HTMLElement> = new UIEventSource<HTMLElement>(
undefined, undefined
) )
let _openNewElementButton: HTMLButtonElement let _openNewElementButton: HTMLButtonElement
let openNewElementButton: UIEventSource<HTMLElement> = new UIEventSource<HTMLElement>(undefined) let openNewElementButton: UIEventSource<HTMLElement> = new UIEventSource<HTMLElement>(undefined)
@ -257,7 +257,9 @@
on:keydown={forwardEventToMap} on:keydown={forwardEventToMap}
htmlElem={openMapButton} htmlElem={openMapButton}
> >
<div class="m-0.5 mx-1 flex cursor-pointer items-center max-[480px]:w-full sm:mx-1 md:mx-2"> <div
class="m-0.5 mx-1 flex cursor-pointer items-center max-[480px]:w-full sm:mx-1 md:mx-2"
>
<Marker icons={layout.icon} size="h-4 w-4 md:h-8 md:w-8 mr-0.5 sm:mr-1 md:mr-2" /> <Marker icons={layout.icon} size="h-4 w-4 md:h-8 md:w-8 mr-0.5 sm:mr-1 md:mr-2" />
<b class="mr-1"> <b class="mr-1">
<Tr t={layout.title} /> <Tr t={layout.title} />
@ -354,10 +356,10 @@
<a <a
class="bg-black-transparent pointer-events-auto ml-1 h-fit max-h-12 cursor-pointer self-end self-center overflow-hidden rounded-2xl px-1 text-white opacity-50 hover:opacity-100" class="bg-black-transparent pointer-events-auto ml-1 h-fit max-h-12 cursor-pointer self-end self-center overflow-hidden rounded-2xl px-1 text-white opacity-50 hover:opacity-100"
on:click={() => { on:click={() => {
if(featureSwitches.featureSwitchWelcomeMessage.data){ if (featureSwitches.featureSwitchWelcomeMessage.data) {
state.guistate.themeViewTab.setData("copyright") state.guistate.themeViewTab.setData("copyright")
state.guistate.themeIsOpened.setData(true) state.guistate.themeIsOpened.setData(true)
}else{ } else {
state.guistate.copyrightPanelIsOpened.setData(true) state.guistate.copyrightPanelIsOpened.setData(true)
} }
}} }}
@ -520,11 +522,10 @@
<Tr t={Translations.t.general.attribution.title} /> <Tr t={Translations.t.general.attribution.title} />
</div> </div>
<div slot="content2" class="flex flex-col m-2"> <div slot="content2" class="m-2 flex flex-col">
<ToSvelte construct={() => new CopyrightPanel(state)} /> <ToSvelte construct={() => new CopyrightPanel(state)} />
</div> </div>
<div class="flex" slot="title3"> <div class="flex" slot="title3">
<Share class="h-4 w-4" /> <Share class="h-4 w-4" />
<Tr t={Translations.t.general.sharescreen.title} /> <Tr t={Translations.t.general.sharescreen.title} />
@ -650,15 +651,14 @@
<FloatOver on:close={() => state.guistate.privacyPanelIsOpened.setData(false)}> <FloatOver on:close={() => state.guistate.privacyPanelIsOpened.setData(false)}>
<div class="flex h-full flex-col overflow-hidden"> <div class="flex h-full flex-col overflow-hidden">
<h1 class="low-interaction m-0 flex items-center p-4 drop-shadow-md"> <h1 class="low-interaction m-0 flex items-center p-4 drop-shadow-md">
<Tr t= {Translations.t.general.attribution.title}/> <Tr t={Translations.t.general.attribution.title} />
</h1> </h1>
<div class="overflow-auto p-4"> <div class="overflow-auto p-4">
<h2> <h2>
<Tr t={Translations.t.general.menu.aboutMapComplete} />
<Tr t={Translations.t.general.menu.aboutMapComplete} />
</h2> </h2>
<AboutMapComplete {state} /> <AboutMapComplete {state} />
<ToSvelte construct={() => new CopyrightPanel(state)} /> <ToSvelte construct={() => new CopyrightPanel(state)} />
</div> </div>
</div> </div>
</FloatOver> </FloatOver>

13
src/Utils.ts
View file

@ -978,7 +978,16 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
} }
} }
xhr.send(content) xhr.send(content)
xhr.onerror = (ev: ProgressEvent<EventTarget>) => reject("Could not get "+url+", xhr status code is "+xhr.status+" ("+xhr.statusText+")") xhr.onerror = (ev: ProgressEvent<EventTarget>) =>
reject(
"Could not get " +
url +
", xhr status code is " +
xhr.status +
" (" +
xhr.statusText +
")"
)
}) })
} }
@ -1072,7 +1081,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
const injected = Utils.injectedDownloads[url] const injected = Utils.injectedDownloads[url]
if (injected !== undefined) { if (injected !== undefined) {
console.debug("Using injected resource for test for URL", url) console.debug("Using injected resource for test for URL", url)
return {content: injected} return { content: injected }
} }
const result = await Utils.downloadAdvanced( const result = await Utils.downloadAdvanced(
url, url,

2
src/assets/contributors.json
View file

@ -1,7 +1,7 @@
{ {
"contributors": [ "contributors": [
{ {
"commits": 7612, "commits": 7646,
"contributor": "Pieter Vander Vennet" "contributor": "Pieter Vander Vennet"
}, },
{ {

2
src/assets/language_in_country.json
View file

@ -469,9 +469,9 @@
"na" "na"
], ],
"NZ": [ "NZ": [
"en",
"en", "en",
"mi", "mi",
"en",
"mi" "mi"
], ],
"OM": [ "OM": [

4
src/assets/language_native.json
View file

@ -1,6 +1,5 @@
{ {
"ca": "català", "ca": "català",
"cs": "čeština",
"da": "dansk", "da": "dansk",
"de": "Deutsch", "de": "Deutsch",
"en": "English", "en": "English",
@ -12,7 +11,7 @@
"gl": "lingua galega", "gl": "lingua galega",
"he": "עברית", "he": "עברית",
"hu": "magyar", "hu": "magyar",
"id": "bahasa Indonesia", "id": "Indonesia",
"it": "italiano", "it": "italiano",
"ja": "日本語", "ja": "日本語",
"nb_NO": "bokmål", "nb_NO": "bokmål",
@ -23,6 +22,7 @@
"ru": "русский язык", "ru": "русский язык",
"sl": "slovenščina", "sl": "slovenščina",
"sv": "svenska", "sv": "svenska",
"zgh": "ⵜⴰⵎⴰⵣⵉⵖⵜ ⵜⴰⵏⴰⵡⴰⵢⵜ ⵜⴰⵎⵖⵔⵉⴱⵉⵜ",
"zh_Hans": "简体中文", "zh_Hans": "简体中文",
"zh_Hant": "繁體中文" "zh_Hant": "繁體中文"
} }

1632
src/assets/language_translations.json
View file

File diff suppressed because it is too large Load diff

32
src/assets/translators.json
View file

@ -1,11 +1,11 @@
{ {
"contributors": [ "contributors": [
{ {
"commits": 378, "commits": 382,
"contributor": "Pieter Vander Vennet" "contributor": "Pieter Vander Vennet"
}, },
{ {
"commits": 351, "commits": 352,
"contributor": "kjon" "contributor": "kjon"
}, },
{ {
@ -21,7 +21,7 @@
"contributor": "Robin van der Linde" "contributor": "Robin van der Linde"
}, },
{ {
"commits": 69, "commits": 70,
"contributor": "mcliquid" "contributor": "mcliquid"
}, },
{ {
@ -84,6 +84,10 @@
"commits": 18, "commits": 18,
"contributor": "el_libre como el chaval" "contributor": "el_libre como el chaval"
}, },
{
"commits": 15,
"contributor": "Patchanka64"
},
{ {
"commits": 15, "commits": 15,
"contributor": "macpac" "contributor": "macpac"
@ -112,10 +116,6 @@
"commits": 13, "commits": 13,
"contributor": "Joost" "contributor": "Joost"
}, },
{
"commits": 12,
"contributor": "Patchanka64"
},
{ {
"commits": 12, "commits": 12,
"contributor": "Ettore Atalan" "contributor": "Ettore Atalan"
@ -132,6 +132,10 @@
"commits": 11, "commits": 11,
"contributor": "Túllio Franca" "contributor": "Túllio Franca"
}, },
{
"commits": 10,
"contributor": "Manuel Tassi"
},
{ {
"commits": 10, "commits": 10,
"contributor": "brunnerpaul" "contributor": "brunnerpaul"
@ -158,7 +162,7 @@
}, },
{ {
"commits": 9, "commits": 9,
"contributor": "Manuel Tassi" "contributor": "hugoalh"
}, },
{ {
"commits": 9, "commits": 9,
@ -212,10 +216,6 @@
"commits": 7, "commits": 7,
"contributor": "Niels Elgaard Larsen" "contributor": "Niels Elgaard Larsen"
}, },
{
"commits": 6,
"contributor": "hugoalh"
},
{ {
"commits": 6, "commits": 6,
"contributor": "Juele juele" "contributor": "Juele juele"
@ -256,6 +256,10 @@
"commits": 6, "commits": 6,
"contributor": "lvgx" "contributor": "lvgx"
}, },
{
"commits": 5,
"contributor": "Franco"
},
{ {
"commits": 5, "commits": 5,
"contributor": "Christian Schmidt" "contributor": "Christian Schmidt"
@ -328,10 +332,6 @@
"commits": 3, "commits": 3,
"contributor": "Paolo Mauri" "contributor": "Paolo Mauri"
}, },
{
"commits": 3,
"contributor": "Franco"
},
{ {
"commits": 3, "commits": 3,
"contributor": "Peter Brodersen" "contributor": "Peter Brodersen"