](https://taginfo.openstreetmap.org/keys/mapcomplete-pictures-license#values) [mapcomplete-pictures-license](https://wiki.openstreetmap.org/wiki/Key:mapcomplete-pictures-license) | Multiple choice | [CC0](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-pictures-license%3DCC0) [CC-BY 4.0](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-pictures-license%3DCC-BY 4.0) [CC-BY-SA 4.0](https://wiki.openstreetmap.org/wiki/Tag:mapcomplete-pictures-license%3DCC-BY-SA 4.0)
[
(meant to charge electrical bikes)",
- "nl": "een oplaadpunt voor elektrische fietsen met een gewoon Europees stopcontact (speciaal bedoeld voor fietsen)",
+ "en": "a charging station for electrical bikes",
+ "nl": "een oplaadpunt voor elektrische fietsen",
"ca": "una estació de càrrega per a bicicletes elèctriques amb un endoll de paret europeu normal (destinat a carregar bicicletes elèctriques)",
"cs": "nabíjecí stanice pro elektrokola s běžnou evropskou zástrčkou (určeno k nabíjení elektrických kol)",
"da": "en ladestation til elektriske cykler med et normalt europæisk vægstik (beregnet til opladning af elektriske cykler)",
- "de": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose (zum Laden von Elektrofahrrädern)",
+ "de": "eine Ladestation für Elektrofahrräder",
"es": "una estación de carga para bicicletas eléctricas con un enchufe de pared europeo normal (pensado para cargar bicicletas eléctricas)"
}
},
diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson
index 828045f39..7f8356a66 100644
--- a/assets/layers/charging_station/charging_station.protojson
+++ b/assets/layers/charging_station/charging_station.protojson
@@ -735,30 +735,32 @@
"point",
"centroid"
],
- "marker": [{
- "icon": "pin",
- "color": "#fff"
- },{
- "icon": {
- "render":"./assets/themes/charging_stations/plug.svg",
- "mappings": [
- {
- "if": "bicycle=yes",
- "then": "./assets/themes/charging_stations/bicycle.svg"
- },
- {
- "if": {
- "or": [
- "car=yes",
- "motorcar=yes"
- ]
+ "marker": [
+ {
+ "icon": "pin",
+ "color": "#fff"
+ },
+ {
+ "icon": {
+ "render": "./assets/themes/charging_stations/plug.svg",
+ "mappings": [
+ {
+ "if": "bicycle=yes",
+ "then": "./assets/themes/charging_stations/bicycle.svg"
},
- "then": "./assets/themes/charging_stations/car.svg"
- }
- ]
-
+ {
+ "if": {
+ "or": [
+ "car=yes",
+ "motorcar=yes"
+ ]
+ },
+ "then": "./assets/themes/charging_stations/car.svg"
+ }
+ ]
+ }
}
- }],
+ ],
"iconBadges": [
{
"if": {
@@ -802,12 +804,11 @@
"tags": [
"amenity=charging_station",
"motorcar=no",
- "bicycle=yes",
- "socket:typee=1"
+ "bicycle=yes"
],
"title": {
- "en": "charging station for electrical bikes with a normal european wall plug 
",
- "nl": "oplaadpunt voor elektrische fietsen met een gewone, europese stekker "
+ "en": "charging station for electrical bikes",
+ "nl": "oplaadpunt voor elektrische fietsen"
}
},
{
@@ -949,4 +950,4 @@
},
"neededChangesets": 10
}
-}
+}
\ No newline at end of file
diff --git a/assets/layers/charging_station/csvToJson.ts b/assets/layers/charging_station/csvToJson.ts
index ff1a50fb6..e0ee8f610 100644
--- a/assets/layers/charging_station/csvToJson.ts
+++ b/assets/layers/charging_station/csvToJson.ts
@@ -91,7 +91,7 @@ function run(file, protojson) {
if (e.countryWhiteList.length > 0) {
// This is a 'hideInAnswer', thus _reverse_ logic!
const countries = e.countryWhiteList.map(country => "_country!=" + country) //HideInAnswer if it is in the wrong country
- json["hideInAnswer"] = {or: countries}
+ json["hideInAnswer"] = {and: countries} // Should be and, as we want to hide if it does not match any of the countries
} else if (e.countryBlackList.length > 0) {
const countries = e.countryBlackList.map(country => "_country=" + country) //HideInAnswer if it is in the wrong country
json["hideInAnswer"] = {or: countries}
diff --git a/assets/layers/charging_station/types.csv b/assets/layers/charging_station/types.csv
index d31c004ba..8d9795616 100644
--- a/assets/layers/charging_station/types.csv
+++ b/assets/layers/charging_station/types.csv
@@ -1,6 +1,6 @@
key,image,description:en,countryWhiteList,countryBlackList,commonVoltages,commonCurrents,commonOutputs,description:nl,associatedVehicleTypes,neverAssociatedWith,extraVisualisationCondition
-socket:schuko,CEE7_4F.svg,Schuko wall plug without ground pin (CEE7/4 type F),be;fr;ma;tn;pl;cs;sk;mo,,230,16,3.6 kW,Schuko stekker zonder aardingspin (CEE7/4 type F),*,,
-socket:typee,TypeE.svg,European wall plug with ground pin (CEE7/4 type E),,,230,16,3 kW;22 kW;,Europese stekker met aardingspin (CEE7/4 type E),*,,
+socket:schuko,CEE7_4F.svg,Schuko wall plug without ground pin (CEE7/4 type F),af;al;dz;as;ad;ao;am;aw;az;by;bt;ba;bg;cv;td;cl;hr;dk;eg;ee;et;fo;fr;pf;ge;gr;gl;gn;gw;is;id;ir;jo;kz;kg;la;lv;lr;ly;lt;lu;mo;mr;md;mc;mn;me;mz;nl;nc;ne;kp;mk;pt;qa;ro;ru;rw;sm;sk;si;kr;es;sr;tj;th;tl;tr;tm;ua;uy;uz;vn,,230,16,3.6 kW,Schuko stekker zonder aardingspin (CEE7/4 type F),*,,
+socket:typee,TypeE.svg,European wall plug with ground pin (CEE7/4 type E),be;bj;bf;bi;cm;cf;td;km;cz;dk;dj;gq;et;fo;fr;gf;pf;gl;gp;gw;la;lr;mg;ml;mq;mr;mu;mc;mn;ma;ne;pl;pt;rw;mf;pm;sn;sk;sy;tl;tn;uz,,230,16,3 kW;22 kW;,Europese stekker met aardingspin (CEE7/4 type E),*,,
socket:chademo,Chademo_type4.svg,Chademo,,,500,120,50 kW,Chademo,car;motorcar;hgv;bus,bicycle;scooter,
socket:type1_cable,Type1_J1772.svg,Type 1 with cable (J1772),,,200;240,32,3.7 kW;7 kW,Type 1 met kabel (J1772),car;motorcar;hgv;bus,bicycle;scooter,
socket:type1,Type1_J1772.svg,Type 1 without cable (J1772),,,200;240,32,3.7 kW;6.6 kW;7 kW;7.2 kW,Type 1 zonder kabel (J1772),car;motorcar;hgv;bus,bicycle;scooter,
diff --git a/assets/layers/climbing_area/climbing_area.json b/assets/layers/climbing_area/climbing_area.json
index 4e77dfac7..6e54aaee8 100644
--- a/assets/layers/climbing_area/climbing_area.json
+++ b/assets/layers/climbing_area/climbing_area.json
@@ -343,6 +343,7 @@
},
"id": "Rock type (crag/rock/cliff only)"
},
+ "reviews",
{
"id": "default_climbing_questions",
"builtin": [
diff --git a/assets/layers/climbing_gym/climbing_gym.json b/assets/layers/climbing_gym/climbing_gym.json
index 476845d0d..87857221a 100644
--- a/assets/layers/climbing_gym/climbing_gym.json
+++ b/assets/layers/climbing_gym/climbing_gym.json
@@ -129,6 +129,7 @@
},
"payment-options",
"opening_hours",
+ "reviews",
{
"id": "shoe_rental",
"question": {
diff --git a/assets/layers/drinking_water/bottle.svg b/assets/layers/drinking_water/bottle.svg
new file mode 100644
index 000000000..2f8217692
--- /dev/null
+++ b/assets/layers/drinking_water/bottle.svg
@@ -0,0 +1,18 @@
+
+
+
+
\ No newline at end of file
diff --git a/assets/layers/drinking_water/bottle.svg.license b/assets/layers/drinking_water/bottle.svg.license
new file mode 100644
index 000000000..1480316c2
--- /dev/null
+++ b/assets/layers/drinking_water/bottle.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Unkown
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/drinking_water/bubbler.svg b/assets/layers/drinking_water/bubbler.svg
new file mode 100644
index 000000000..e0d30f29f
--- /dev/null
+++ b/assets/layers/drinking_water/bubbler.svg
@@ -0,0 +1,18 @@
+
\ No newline at end of file
diff --git a/assets/layers/drinking_water/bubbler.svg.license b/assets/layers/drinking_water/bubbler.svg.license
new file mode 100644
index 000000000..c44973d7b
--- /dev/null
+++ b/assets/layers/drinking_water/bubbler.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: AIGA
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index 23dd623aa..ec4afb95d 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -30,7 +30,8 @@
{
"or": [
"amenity=drinking_water",
- "drinking_water=yes"
+ "drinking_water=yes",
+ "disused:amenity=drinking_water"
]
},
"man_made!=reservoir_covered",
@@ -61,6 +62,11 @@
"cs": "Pitná voda"
}
},
+ "titleIcons": [
+ "icons.defaults",
+ "auto:type",
+ "auto:seasonal"
+ ],
"pointRendering": [
{
"iconBadges": [
@@ -68,10 +74,15 @@
"if": {
"or": [
"operational_status=broken",
- "operational_status=closed"
+ "operational_status=closed",
+ "disused:amenity=drinking_water"
]
},
"then": "close:#c33"
+ },
+ {
+ "if": "tourism=artwork",
+ "then": "circle:white;./assets/layers/artwork/artwork.svg"
}
],
"iconSize": "40,40",
@@ -147,6 +158,10 @@
"mappings": [
{
"if": "operational_status=",
+ "addExtraTags": [
+ "disused:amenity=",
+ "amenity=drinking_water"
+ ],
"then": {
"en": "This drinking water works",
"nl": "Deze drinkwaterfontein werkt",
@@ -190,6 +205,46 @@
],
"id": "Still in use?"
},
+ {
+ "id": "type",
+ "question": {
+ "en": "What type of drinking water point is this?",
+ "nl": "Wat voor soort drinkwaterpunt is dit?"
+ },
+ "mappings": [
+ {
+ "if": "fountain=bubbler",
+ "icon": "./assets/layers/drinking_water/bubbler.svg",
+ "then": {
+ "en": "This is a bubbler fountain. A water jet to drink from is sent upwards, typically controlled by a push button."
+ },
+ "addExtraTags": [
+ "man_made="
+ ]
+ },
+ {
+ "if": "fountain=bottle_refill",
+ "icon": "./assets/layers/drinking_water/bottle.svg",
+ "then": {
+ "en": "This is a bottle refill point where the water is sent downwards, typically controlled by a push button or a motion sensor. Drinking directly from the stream might be very hard or impossible."
+ },
+ "addExtraTags": [
+ "man_made=",
+ "bottle=yes"
+ ]
+ },
+ {
+ "if": "man_made=water_tap",
+ "icon": "./assets/layers/drinking_water/tap.svg",
+ "then": {
+ "en": "This is a water tap. The water flows downward and the stream is controlled by a valve or push-button."
+ },
+ "addExtraTags": [
+ "fountain="
+ ]
+ }
+ ]
+ },
{
"question": {
"en": "How easy is it to fill water bottles?",
@@ -235,8 +290,152 @@
}
}
],
+ "condition": "fountain!=bottle_refill",
"id": "Bottle refill"
},
+ {
+ "id": "fee",
+ "question": {
+ "en": "Is this drinking water point free to use?"
+ },
+ "mappings": [
+ {
+ "if": "fee=no",
+ "then": {
+ "en": "Free to use"
+ }
+ },
+ {
+ "if": "fee=yes",
+ "then": {
+ "en": "One needs to pay to use this drinking water point"
+ }
+ }
+ ]
+ },
+ {
+ "id": "seasonal",
+ "question": {
+ "en": "Is this drinking water point available all year round?"
+ },
+ "mappings": [
+ {
+ "if": "seasonal=no",
+ "then": {
+ "en": "This drinking water point is available all around the year"
+ }
+ },
+ {
+ "if": "seasonal=summer",
+ "then": {
+ "en": "This drinking water point is only available in summer"
+ }
+ },
+ {
+ "if": "seasonal=spring;summer;autumn",
+ "icon": "./assets/layers/drinking_water/no_winter.svg",
+ "then": {
+ "en": "This drinking water point is closed during the winter"
+ }
+ }
+ ]
+ },
+ {
+ "builtin": "opening_hours_24_7",
+ "override": {
+ "questionHint": {
+ "en": "These are the opening hours if the drinking water fountain is operational."
+ },
+ "+mappings": [
+ {
+ "if": {
+ "and": [
+ "seasonal!=no",
+ {
+ "or": [
+ {
+ "and": [
+ "seasonal!~.*winter.*",
+ "_now:date~....-(12|01|02)-.."
+ ]
+ },
+ {
+ "and": [
+ "seasonal!~.*spring.*",
+ "_now:date~....-(03|04|05)-.."
+ ]
+ },
+ {
+ "and": [
+ "seasonal!~.*summer.*",
+ "_now:date~....-(06|07|08)-.."
+ ]
+ },
+ {
+ "and": [
+ "seasonal!~.*autumn.*",
+ "_now:date~....-(09|10|11)-.."
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ "then": {
+ "en": "This drinking water fountain is closed this season. As such, the opening hours are not shown."
+ },
+ "hideInAnswer": true
+ }
+ ]
+ }
+ },
+ {
+ "id": "bench-artwork",
+ "question": {
+ "en": "Does this drinking water fountain have an artistic element?",
+ "nl": "Heeft dit drinkwaterpunt een geintegreerd kunstwerk?"
+ },
+ "mappings": [
+ {
+ "if": "tourism=artwork",
+ "addExtraTags": [
+ "not:tourism:artwork="
+ ],
+ "then": {
+ "en": "This drinking water point has an integrated artwork",
+ "nl": "Dit drinkwaterpunt heeft een geintegreerd kunstwerk"
+ }
+ },
+ {
+ "if": "not:tourism:artwork=yes",
+ "then": {
+ "en": "This drinking water point does not have an integrated artwork",
+ "nl": "Dit drinkwaterpunt heeft geen geïntegreerd kunstwerk"
+ },
+ "addExtraTags": [
+ "tourism="
+ ]
+ },
+ {
+ "if": "tourism=",
+ "then": {
+ "en": "This drinking water point probably doesn't have an integrated artwork",
+ "nl": "Dit drinkwaterpunt heeft waarschijnlijk geen geïntegreerd kunstwerk"
+ },
+ "hideInAnswer": true
+ }
+ ],
+ "questionHint": {
+ "en": "E.g. it has an integrated statue or other non-trivial, creative work",
+ "nl": "Bijvoorbeeld een standbeeld of ander, niet-triviaal kunstwerk"
+ }
+ },
+ {
+ "builtin": "artwork.*artwork-question",
+ "override": {
+ "condition": "tourism=artwork"
+ }
+ },
{
"id": "render-closest-drinking-water",
"render": {
@@ -293,6 +492,19 @@
"ca": "Es tracta d'una aixeta d'aigua o bomba d'aigua amb aigua no potable. Per exemple les aixetes d'aigua amb aigua de pluja per aprofitar i regar les plantes properes
",
"cs": "Jedná se o vodovodní kohoutek nebo vodní čerpadlo s nepitnou vodou.Příkladem jsou vodovodní kohoutky s dešťovou vodou pro zalévání rostlin v okolí
"
}
+ },
+ {
+ "if": {
+ "and": [
+ "amenity=",
+ "man_made=pump",
+ "historic=yes",
+ "drinking_water=no"
+ ]
+ },
+ "then": {
+ "en": "This is a historic, manual water pump where no drinking water can be found"
+ }
}
]
},
diff --git a/assets/layers/drinking_water/license_info.json b/assets/layers/drinking_water/license_info.json
index 343f5d945..57460d021 100644
--- a/assets/layers/drinking_water/license_info.json
+++ b/assets/layers/drinking_water/license_info.json
@@ -1,4 +1,24 @@
[
+ {
+ "path": "bottle.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "Unkown"
+ ],
+ "sources": [
+ "https://www.svgrepo.com/svg/83123/water-bottle"
+ ]
+ },
+ {
+ "path": "bubbler.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "AIGA"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Drinking_Fountain_-_The_Noun_Project.svg"
+ ]
+ },
{
"path": "drips.svg",
"license": "CC-BY-SA-4.0",
@@ -12,5 +32,31 @@
"sources": [
"https://osoc.be/editions/2020/cyclofix"
]
+ },
+ {
+ "path": "no_winter.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "Pieter Vander Vennet"
+ ],
+ "sources": []
+ },
+ {
+ "path": "tap.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "Krzysztof Franek"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Water_DIN-style.svg"
+ ]
+ },
+ {
+ "path": "winter.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "Pieter Vander Vennet"
+ ],
+ "sources": []
}
]
\ No newline at end of file
diff --git a/assets/layers/drinking_water/no_winter.svg b/assets/layers/drinking_water/no_winter.svg
new file mode 100644
index 000000000..5e4766a58
--- /dev/null
+++ b/assets/layers/drinking_water/no_winter.svg
@@ -0,0 +1,81 @@
+
+
diff --git a/assets/layers/drinking_water/no_winter.svg.license b/assets/layers/drinking_water/no_winter.svg.license
new file mode 100644
index 000000000..ed0288300
--- /dev/null
+++ b/assets/layers/drinking_water/no_winter.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Pieter Vander Vennet
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/drinking_water/tap.svg b/assets/layers/drinking_water/tap.svg
new file mode 100644
index 000000000..b2459bfb9
--- /dev/null
+++ b/assets/layers/drinking_water/tap.svg
@@ -0,0 +1,73 @@
+
+
diff --git a/assets/layers/drinking_water/tap.svg.license b/assets/layers/drinking_water/tap.svg.license
new file mode 100644
index 000000000..c27ed8630
--- /dev/null
+++ b/assets/layers/drinking_water/tap.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Krzysztof Franek
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/drinking_water/winter.svg b/assets/layers/drinking_water/winter.svg
new file mode 100644
index 000000000..f1c2df8b4
--- /dev/null
+++ b/assets/layers/drinking_water/winter.svg
@@ -0,0 +1,73 @@
+
+
diff --git a/assets/layers/drinking_water/winter.svg.license b/assets/layers/drinking_water/winter.svg.license
new file mode 100644
index 000000000..ed0288300
--- /dev/null
+++ b/assets/layers/drinking_water/winter.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Pieter Vander Vennet
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/icons/icons.json b/assets/layers/icons/icons.json
index 16edab759..f83be3785 100644
--- a/assets/layers/icons/icons.json
+++ b/assets/layers/icons/icons.json
@@ -27,7 +27,7 @@
{
"#": "ignore-image-in-then",
"if": "wikipedia=",
- "then": "
"
+ "then": ""
}
]
},
diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json
index 3ac8d36a4..2a7d07649 100644
--- a/assets/layers/sport_pitch/sport_pitch.json
+++ b/assets/layers/sport_pitch/sport_pitch.json
@@ -455,6 +455,13 @@
"ca": "La superfície és formigó",
"cs": "Povrch je betonový"
}
+ },
+ {
+ "if": "surface=fine_gravel",
+ "then": {
+ "en": "The surface is fine gravel",
+ "nl": "De ondergrond bestaat uit grind"
+ }
}
],
"id": "sport_pitch-surface"
diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json
index e9a67f822..bee0d87cf 100644
--- a/assets/themes/climbing/climbing.json
+++ b/assets/themes/climbing/climbing.json
@@ -348,8 +348,7 @@
"key": "access:description"
}
},
- "questions",
- "reviews"
+ "questions"
]
}
},
diff --git a/assets/themes/cyclenodes/cyclenodes.json b/assets/themes/cyclenodes/cyclenodes.json
index 2bb5eb2bb..1cf94b90f 100644
--- a/assets/themes/cyclenodes/cyclenodes.json
+++ b/assets/themes/cyclenodes/cyclenodes.json
@@ -112,7 +112,15 @@
"lineRendering": [
{
"width": "4",
- "color": "#00a703"
+ "color": {
+ "render": "#00a703",
+ "mappings": [
+ {
+ "if": "state=proposed",
+ "then": "#f0a513"
+ }
+ ]
+ }
}
],
"pointRendering": null
@@ -134,8 +142,9 @@
},
"source": {
"osmTags": {
- "and": [
- "rcn_ref~*"
+ "or": [
+ "rcn_ref~*",
+ "proposed:rcn_ref~*"
]
}
},
@@ -146,14 +155,15 @@
"centroid"
],
"label": {
+ "render": "?
",
"mappings": [
{
"if": "rcn_ref~*",
- "then": "{rcn_ref}
"
+ "then": "{rcn_ref}
"
},
{
- "if": "rcn_ref=",
- "then": "?
"
+ "if": "proposed:rcn_ref~*",
+ "then": "{proposed:rcn_ref}
"
}
]
}
@@ -162,16 +172,39 @@
"minzoom": 12,
"title": {
"render": {
- "en": "Cycle node {rcn_ref}",
- "de": "Fahrradknotenpunkt {rcn_ref}",
- "es": "nodo ciclista {rcn_ref}",
- "nb_NO": "sykkelnode {rcn_ref}",
- "nl": "Fietsknooppunt {rcn_ref}",
- "fr": "nœud cycliste {rcn_ref}",
- "ca": "node ciclista {rcn_ref}",
- "cs": "uzel cyklu {rcn_ref}",
- "pl": "węzeł rowerowy {rcn_ref}"
- }
+ "en": "Cycle node",
+ "de": "Fahrradknotenpunkt",
+ "es": "nodo ciclista",
+ "nb_NO": "sykkelnode",
+ "nl": "Fietsknooppunt",
+ "fr": "nœud cycliste",
+ "ca": "node ciclista",
+ "cs": "uzel cyklu",
+ "pl": "węzeł rowerowy"
+ },
+ "mappings": [
+ {
+ "if": "rcn_ref~*",
+ "then": {
+ "en": "Cycle node {rcn_ref}",
+ "de": "Fahrradknotenpunkt {rcn_ref}",
+ "es": "nodo ciclista {rcn_ref}",
+ "nb_NO": "sykkelnode {rcn_ref}",
+ "nl": "Fietsknooppunt {rcn_ref}",
+ "fr": "nœud cycliste {rcn_ref}",
+ "ca": "node ciclista {rcn_ref}",
+ "cs": "uzel cyklu {rcn_ref}",
+ "pl": "węzeł rowerowy {rcn_ref}"
+ }
+ },
+ {
+ "if": "proposed:rcn_ref~*",
+ "then": {
+ "en": "Proposed cycle node {proposed:rcn_ref}",
+ "nl": "Voorgesteld fietsknooppunt {proposed:rcn_ref}"
+ }
+ }
+ ]
},
"tagRenderings": [
{
@@ -179,7 +212,8 @@
"question": {
"en": "What is the reference number of this cycling node?",
"nl": "Wat is het referentienummer van dit fietsknooppunt?",
- "de": "Wie lautet die Nummer des Knotenpunkts im Fahrradknotenpunktnetzwerk?"
+ "de": "Wie lautet die Nummer des Knotenpunkts im Fahrradknotenpunktnetzwerk?",
+ "cs": "Jaké je referenční číslo tohoto cyklistického uzlu?"
},
"freeform": {
"key": "rcn_ref",
@@ -187,14 +221,17 @@
"placeholder": {
"en": "e.g. 1",
"nl": "bijv. 1",
- "de": "z.B. 1"
+ "de": "z.B. 1",
+ "cs": "e.g. 1"
}
},
"render": {
"en": "This cycling node has reference number {rcn_ref}",
"nl": "Dit fietsknooppunt heeft referentienummer {rcn_ref}",
- "de": "Knotenpunktnummer {rcn_ref} des Fahrradknotenpunktnetzwerks"
- }
+ "de": "Knotenpunktnummer {rcn_ref} des Fahrradknotenpunktnetzwerks",
+ "cs": "Tento cyklistický uzel má referenční číslo {rcn_ref}"
+ },
+ "condition": "rcn_ref~*"
},
{
"builtin": "survey_date",
@@ -249,7 +286,8 @@
"placeholder": {
"en": "e.g. 3",
"nl": "bijv. 3",
- "de": "z.B. 3"
+ "de": "z.B. 3",
+ "cs": "e.g. 3"
}
},
"id": "node-expected_rcn_route_relations"
@@ -298,12 +336,14 @@
],
"name": {
"en": "Cycling guideposts",
- "de": "Fahrrad-Wegweiser"
+ "de": "Fahrrad-Wegweiser",
+ "cs": "Cyklistické ukazatele"
},
"title": {
"render": {
"en": "Cycling guidepost",
- "de": "Fahrrad-Wegweiser"
+ "de": "Fahrrad-Wegweiser",
+ "cs": "Cyklistický ukazatel"
}
}
},
@@ -330,7 +370,8 @@
],
"title": {
"en": "a route marker for a node to node link",
- "de": "Eine Routenmarkierung für eine Verbindung von Knoten zu Knoten"
+ "de": "Eine Routenmarkierung für eine Verbindung von Knoten zu Knoten",
+ "cs": "značka trasy pro spojení mezi uzlem"
},
"=exampleImages": [
"./assets/layers/route_marker/bicycle_route_marker.jpg"
diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json
index c13fc113b..a52093c2e 100644
--- a/assets/themes/cyclofix/cyclofix.json
+++ b/assets/themes/cyclofix/cyclofix.json
@@ -103,7 +103,11 @@
{
"marker": [
{
- "icon": "pin:#ba2792;./assets/themes/cyclofix/key.svg"
+ "icon": "pin",
+ "color": "#ba2792"
+ },
+ {
+ "icon": "./assets/themes/cyclofix/key.svg"
}
],
"iconSize": "40,40",
diff --git a/assets/themes/facadegardens/facadegardens.json b/assets/themes/facadegardens/facadegardens.json
index c8aa40ba3..c7b2ee42c 100644
--- a/assets/themes/facadegardens/facadegardens.json
+++ b/assets/themes/facadegardens/facadegardens.json
@@ -542,6 +542,9 @@
"leisure=garden",
"garden:type=facade_garden"
],
+ "snapToLayer": [
+ "walls_and_buildings"
+ ],
"title": {
"nl": "een geveltuintje",
"en": "a facade garden",
diff --git a/assets/themes/icecream/icecream.json b/assets/themes/icecream/icecream.json
index e9c135f3e..6f9ebe19f 100644
--- a/assets/themes/icecream/icecream.json
+++ b/assets/themes/icecream/icecream.json
@@ -2,11 +2,13 @@
"id": "icecream",
"title": {
"en": "Icecream",
- "de": "Eiscreme"
+ "de": "Eiscreme",
+ "cs": "Zmrzlina"
},
"description": {
"en": "A map showing ice cream parlors and ice cream vending machines",
- "de": "Eine Karte, die Eisdielen und Eisautomaten zeigt"
+ "de": "Eine Karte, die Eisdielen und Eisautomaten zeigt",
+ "cs": "Mapa zobrazující prodej zmrzliny a automaty na zmrzlinu"
},
"icon": "./assets/layers/ice_cream/ice_cream.svg",
"layers": [
diff --git a/assets/themes/walkingnodes/walkingnodes.json b/assets/themes/walkingnodes/walkingnodes.json
index 3d08f5019..65076cb82 100644
--- a/assets/themes/walkingnodes/walkingnodes.json
+++ b/assets/themes/walkingnodes/walkingnodes.json
@@ -8,7 +8,8 @@
"description": {
"en": "This map shows walking node networks and allows you to add new nodes easily",
"nl": "Deze kaart toont wandelknooppunten en laat je toe om eenvoudigweg nieuwe knooppunten toe te voegen",
- "de": "Diese Karte zeigt Wandernetzwerke und ermöglicht es Ihnen, einfach neue Knoten hinzuzufügen"
+ "de": "Diese Karte zeigt Wandernetzwerke und ermöglicht es Ihnen, einfach neue Knoten hinzuzufügen",
+ "cs": "Tato mapa zobrazuje sítě uzlových bodů a umožňuje snadné přidávání nových uzlů"
},
"icon": "./assets/themes/walkingnodes/logo.svg",
"startZoom": 11,
@@ -34,9 +35,14 @@
"source": {
"osmTags": {
"and": [
+ {
+ "or": [
+ "route=hiking",
+ "route=foot"
+ ]
+ },
"network=rwn",
- "network:type=node_network",
- "route=foot"
+ "network:type=node_network"
]
}
},
@@ -71,7 +77,15 @@
"lineRendering": [
{
"width": "4",
- "color": "#452b29"
+ "color": {
+ "render": "#452b29",
+ "mappings": [
+ {
+ "if": "state=proposed",
+ "then": "#f0a513"
+ }
+ ]
+ }
}
],
"pointRendering": null,
@@ -122,8 +136,9 @@
},
"source": {
"osmTags": {
- "and": [
- "rwn_ref~*"
+ "or": [
+ "rwn_ref~*",
+ "proposed:rwn_ref~*"
]
}
},
@@ -134,14 +149,15 @@
"centroid"
],
"label": {
+ "render": "?
",
"mappings": [
{
"if": "rwn_ref~*",
- "then": "{rwn_ref}
"
+ "then": "{rwn_ref}
"
},
{
- "if": "rwn_ref=",
- "then": "?
"
+ "if": "proposed:rwn_ref~*",
+ "then": "{proposed:rwn_ref}
"
}
]
}
@@ -150,10 +166,26 @@
"minzoom": 12,
"title": {
"render": {
- "en": "Walking node {rwn_ref}",
- "nl": "Wandelknooppunt {rwn_ref}",
- "de": "Wanderknoten {rwn_ref}"
- }
+ "en": "Walking node",
+ "nl": "Wandelknooppunt"
+ },
+ "mappings": [
+ {
+ "if": "rwn_ref~*",
+ "then": {
+ "en": "Walking node {rwn_ref}",
+ "nl": "Wandelknooppunt {rwn_ref}",
+ "de": "Wanderknoten {rwn_ref}"
+ }
+ },
+ {
+ "if": "proposed:rwn_ref~*",
+ "then": {
+ "en": "Proposed walking node {proposed:rwn_ref}",
+ "nl": "Voorgesteld wandelknooppunt {proposed:rwn_ref}"
+ }
+ }
+ ]
},
"tagRenderings": [
{
@@ -161,7 +193,8 @@
"question": {
"en": "What is the reference number of this walking node?",
"nl": "Wat is het referentienummer van dit wandelknooppunt?",
- "de": "Was ist die Referenznummer dieses Wanderknotens?"
+ "de": "Was ist die Referenznummer dieses Wanderknotens?",
+ "cs": "Jaké je referenční číslo tohoto pěšího uzlu?"
},
"freeform": {
"key": "rwn_ref",
@@ -169,14 +202,16 @@
"placeholder": {
"en": "e.g. 1",
"nl": "bijv. 1",
- "de": "z.B. 1"
+ "de": "z.B. 1",
+ "cs": "e.g. 1"
}
},
"render": {
"en": "This walking node has reference number {rwn_ref}",
"nl": "Dit wandelknooppunt heeft referentienummer {rwn_ref}",
"de": "Dieser Wanderknoten hat die Referenznummer {rwn_ref}"
- }
+ },
+ "condition": "rwn_ref~*"
},
{
"builtin": "survey_date",
@@ -197,7 +232,8 @@
"question": {
"en": "How many other walking nodes does this node link to?",
"nl": "Met hoeveel andere wandelknooppunten heeft dit knooppunt een verbinding?",
- "de": "Mit wie vielen anderen Wanderknoten ist dieser Knoten verbunden?"
+ "de": "Mit wie vielen anderen Wanderknoten ist dieser Knoten verbunden?",
+ "cs": "S kolika dalšími pěšími uzly je tento uzel propojen?"
},
"render": {
"en": "This node links to {expected_rwn_route_relations} other walking nodes.",
@@ -210,7 +246,8 @@
"placeholder": {
"en": "e.g. 3",
"nl": "bijv. 3",
- "de": "z.B. 3"
+ "de": "z.B. 3",
+ "cs": "e.g. 3"
}
},
"id": "node-expected_rwn_route_relations"
diff --git a/langs/de.json b/langs/de.json
index dd57056ef..f92a37736 100644
--- a/langs/de.json
+++ b/langs/de.json
@@ -188,7 +188,9 @@
"includeMetaData": "Metadaten übernehmen (letzter Bearbeiter, berechnete Werte, ...)",
"licenseInfo": "Copyright-Hinweis
Die bereitgestellten Daten sind unter ODbL verfügbar. Die Wiederverwendung ist für jeden Zweck frei, aber- die Namensnennung © OpenStreetMap contributors ist darzustellen
- Jede Änderung muss unter der gleichen Lizenz veröffentlicht werden
Log in
A personal layout is only available for OpenStreetMap users", "panelIntro": "Your personal theme
Activate your favourite layers from all the official themes", - "reload": "Reload the data" + "reload": "Reload the data", + }, "favouritePoi": { "button": { @@ -56,7 +57,9 @@ "markAsFavouriteTitle": "Mark this location as favourite location", "markDescription": "Add this location to a personal list of your favourites", "unmark": "Remove from your personal list of favourites", - "unmarkNotDeleted": "This point will not be deleted and still be visible on the appropriate map for you and others" + "unmarkNotDeleted": "This point will not be deleted and still be visible on the appropriate map for you and others", + "tab":"Your favourites", + "title":"Your favourite locations" } }, "flyer": { @@ -428,6 +431,7 @@ "isDeleted": "Deleted", "nearby": { "link": "This picture shows the object", + "noNearbyImages": "No nearby images were found", "seeNearby": "Browse and link nearby pictures", "title": "Nearby streetview imagery" }, diff --git a/langs/fi.json b/langs/fi.json index d0dfdabb2..23dec3b10 100644 --- a/langs/fi.json +++ b/langs/fi.json @@ -1,36 +1,73 @@ { + "advanced": { + "title": "Lisäominaisuudet" + }, "centerMessage": { - "ready": "Valmis!" + "allFilteredAway": "Mikään kohde näkyvällä alueella ei täytä kaikkien suodatinten ehtoja", + "loadingData": "Ladataan dataa…", + "noData": "Ei relevantteja kohteita näkyvällä alueella", + "ready": "Valmis!", + "retrying": "Datan lataaminen epäonnistui. Yritetään uudelleen {count} sekunnin kuluttua…", + "zoomIn": "Lähennä ensin karttaa, jotta data näytetään ja on muokattavissa" + }, + "communityIndex": { + "available": "Tämä yhteisö puhuu kieltä {native}", + "intro": "Ole yhteydessä muihin, jotta voit tutustua heihin, oppia heiltä, …", + "notAvailable": "Tämä yhteisö ei puhu kieltä {native}", + "title": "Ole yhteydessä muihin" }, "delete": { - "explanations": {}, - "reasons": {} - }, - "favourite": {}, - "general": { - "add": { - "import": {} + "cancel": "Peru", + "cannotBeDeleted": "Tätä kohdetta ei voi poistaa", + "delete": "Poista", + "explanations": { + "hardDelete": "Tämä kohde poistetaan OpenStreetMapistä. Kokenut kartoittaja voi palauttaa sen." }, - "apply_button": {}, + "isDeleted": "Tämä kohde on poistettu", + "loginToDelete": "Kohteen poistamiseksi täytyy kirjautua", + "notEnoughExperience": "Tämän kohteen loi joku muu.", + "onlyEditedByLoggedInUser": "Tätä kohdetta ei ole muokannut kukaan muu kuin sinä, joten sen voi huoletta poistaa." + }, + "flyer": { + "callToAction": "Kokeile sitä osoitteessa mapcomplete.org", + "tagline": "Kerää paikkatietoa OpenStreetMapillä" + }, + "general": { "attribution": { - "iconAttribution": {} + "followOnMastodon": "Seuraa MapCompletea Mastodonissa" }, "backgroundMap": "Taustakartta", "cancel": "Peruuta", - "download": {}, - "histogram": {}, - "layerSelection": {}, - "levelSelection": {}, + "download": { + "title": "Lataa" + }, + "error": "Jotain meni vikaan", + "example": "Esimerkki", + "examples": "Esimerkit", "loginWithOpenStreetMap": "Kirjaudu sisään OpenStreetMapilla", - "morescreen": {}, + "logout": "Kirjaudu ulos", + "menu": { + "aboutMapComplete": "Tietoa MapCompletesta" + }, + "morescreen": { + "searchForATheme": "Etsi teemaa" + }, "number": "numero", + "openTheMap": "Avaa kartta", + "openTheMapAtGeolocation": "Zoomaa sijaintiisi", "opening_hours": { + "loadingCountry": "Määritetään maata…", "ph_closed": "suljettu", "ph_not_known": " ", "ph_open": "avattu" }, - "pdf": {}, "pickLanguage": "Valitse kieli: ", + "questionBox": { + "answeredMultiple": "Vastasit {answered} kysymykseen", + "answeredOne": "Vastasit yhteen kysymykseen", + "skippedMultiple": "Ohitit {skipped} kysymystä", + "skippedOne": "Ohitit yhden kysymyksen" + }, "questions": { "websiteIs": "Verkkosivusto: {website}" }, @@ -42,6 +79,7 @@ "thanksForSharing": "Kiitos jakamisesta!" }, "skip": "Ohita tämä kysymys", + "waitingForLocation": "Etsitään nykyistä sijaintiasi…", "weekdays": { "abbreviations": { "friday": "Pe", @@ -60,9 +98,8 @@ "tuesday": "Tiistai", "wednesday": "Keskiviikko" }, - "welcomeExplanation": {}, "wikipedia": { - "previewbox": {} + "addEntry": "Lisää toinen Wikipedia-sivu" } }, "image": { @@ -71,40 +108,27 @@ "dontDelete": "Peruuta", "isDeleted": "Poistettu" }, - "importInspector": {}, - "importLayer": {}, "index": { "title": "Tervetuloa MapCompleteen" }, - "move": { - "inviteToMove": {}, - "reasons": {} + "plantDetection": { + "tryAgain": "Valitse eri laji" }, - "multi_apply": {}, - "notes": {}, - "privacy": {}, "reviews": { "title": "{count} arvostelua", "title_singular": "Yksi arvostelu" }, - "split": {}, - "translations": {}, + "split": { + "splitAgain": "Katkaise tämä tie uudelleen" + }, + "userinfo": { + "editDescription": "Muokkaa profiilin kuvausta", + "noDescriptionCallToAction": "Lisää profiilin kuvaus", + "notLoggedIn": "Olet kirjautunut ulos" + }, "validation": { - "color": {}, - "date": {}, - "direction": {}, - "distance": {}, - "email": {}, - "float": {}, - "int": {}, - "nat": {}, - "opening_hours": {}, - "pfloat": {}, - "phone": {}, - "pnat": {}, - "string": {}, - "text": {}, - "url": {}, - "wikidata": {} + "distance": { + "description": "Etäisyys metreinä" + } } } diff --git a/langs/it.json b/langs/it.json index c3b6f5730..365672221 100644 --- a/langs/it.json +++ b/langs/it.json @@ -1,5 +1,9 @@ { + "advanced": { + "title": "Funzionalità avanzate" + }, "centerMessage": { + "allFilteredAway": "Nessun oggetto nella vista attuale rispetta tutti i filtri", "loadingData": "Caricamento dei dati…", "noData": "Nessuna feature rilevante nella vista corrente", "ready": "Finito!", @@ -46,6 +50,28 @@ "panelIntro": "Il tuo tema personale
Attiva i tuoi livelli preferiti fra tutti i temi ufficiali", "reload": "Ricarica i dati" }, + "flyer": { + "aerial": "Questa mappa usa uno sfondo differente, cioè immagini aeree di Agentschap Informatie Vlaanderen", + "callToAction": "Provalo su mapcomplete.org", + "cyclofix": "Pompe per biciclette, stazioni di riparazione, fontanelle dell’acqua e negozi di biciclette sono su CycloFix", + "description": "Un volantino in formato A4 orizzontale per promuovere MapComplete", + "editing": { + "ex": "Un esempio semplificato di come appare una riserva naturale è mostrato qua sotto.", + "intro": "L’utente è accolto con una cartina con degli oggetti. Selezionandone uno, vengono mostrate le informazioni che riguardano lo riguardano.", + "title": "Com’è fatta l’interfaccia grafica?" + }, + "examples": "Sono disponibili molte mappe tematiche, alcune di queste sono mostrate qui.\n\nNe esistono molte altre online: riguardanti la sanità, le indicazioni all’interno degli edifici, l’accessibilità con la carrozzina, le strutture per il trattamento dei rifiuti, gli attraversamenti pedonali con una colorazione arcobaleno, … Scoprili tutti su mapcomplete.org", + "fakeui": { + "add_images": "Aggiungi immagini con pochi click", + "attributes": "Mostra gli attributi in maniera amichevole", + "edit": "Informazioni errate od obsolete? Il pulsante modifica è lì per questo.", + "question": "Se il valore di un attributo non è ancora conosciuto, MapComplete mostra una domanda", + "see_images": "Mostra immagini dei precedenti contributori, Wikipedia, Mapillary, …", + "wikipedia": "Vengono mostrati gli articoli collegati di Wikipedia" + }, + "frontParagraph": "MapComplete è un’applicazione web facile da usare che permette di raccogliere dati geografici su OpenStreetMap, permettendo così di ottenere e gestire dati rilevanti in una maniera open, crowdsource e riutilizzabile.\n\nA richiesta possono essere aggiunti nuove categorie e attributi.", + "lines_too": "Vengono anche mostrati linee e poligoni. Anche su questi oggetti si possono aggiungere e aggiornare gli attributi e le immagini." + }, "general": { "about": "Modifica e aggiungi con semplicità OpenStreetMap per un certo tema", "add": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 4067c6339..e6d3e3058 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -1993,7 +1993,7 @@ "name": "Ladestationen", "presets": { "0": { - "title": "eine Ladestation für Elektrofahrräder mit einer normalen europäischen Steckdose (zum Laden von Elektrofahrrädern)"
+ "title": "eine Ladestation für Elektrofahrräder"
},
"1": {
"title": "Eine Ladestation für Elektrofahrzeuge"
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 14ed9817b..ea077cf00 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -1267,10 +1267,10 @@
"Bicycle parking type": {
"mappings": {
"0": {
- "then": "Staple racks"
+ "then": "Stands"
},
"1": {
- "then": "Wheel rack/loops"
+ "then": "Wheelbenders / rack"
},
"2": {
"then": "Handlebar holder"
@@ -1993,7 +1993,7 @@
"name": "Charging stations",
"presets": {
"0": {
- "title": "a charging station for electrical bikes with a normal european wall plug (meant to charge electrical bikes)"
+ "title": "a charging station for electrical bikes"
},
"1": {
"title": "a charging station for cars"
@@ -4218,6 +4218,9 @@
},
"1": {
"then": "This is a water tap or water pump with non-drinkable water.Examples are water taps with rain water to tap water for nearby plants
"
+ },
+ "2": {
+ "then": "This is a historic, manual water pump where no drinking water can be found"
}
}
},
@@ -4256,8 +4259,72 @@
"question": "Is this drinking water spot still operational?",
"render": "The operational status is {operational_status}"
},
+ "bench-artwork": {
+ "mappings": {
+ "0": {
+ "then": "This drinking water point has an integrated artwork"
+ },
+ "1": {
+ "then": "This drinking water point does not have an integrated artwork"
+ },
+ "2": {
+ "then": "This drinking water point probably doesn't have an integrated artwork"
+ }
+ },
+ "question": "Does this drinking water fountain have an artistic element?",
+ "questionHint": "E.g. it has an integrated statue or other non-trivial, creative work"
+ },
+ "fee": {
+ "mappings": {
+ "0": {
+ "then": "Free to use"
+ },
+ "1": {
+ "then": "One needs to pay to use this drinking water point"
+ }
+ },
+ "question": "Is this drinking water point free to use?"
+ },
+ "opening_hours_24_7": {
+ "override": {
+ "+mappings": {
+ "0": {
+ "then": "This drinking water fountain is closed this season. As such, the opening hours are not shown."
+ }
+ },
+ "questionHint": "These are the opening hours if the drinking water fountain is operational."
+ }
+ },
"render-closest-drinking-water": {
"render": "There is another drinking water fountain at {_closest_other_drinking_water_distance} meters"
+ },
+ "seasonal": {
+ "mappings": {
+ "0": {
+ "then": "This drinking water point is available all around the year"
+ },
+ "1": {
+ "then": "This drinking water point is only available in summer"
+ },
+ "2": {
+ "then": "This drinking water point is closed during the winter"
+ }
+ },
+ "question": "Is this drinking water point available all year round?"
+ },
+ "type": {
+ "mappings": {
+ "0": {
+ "then": "This is a bubbler fountain. A water jet to drink from is sent upwards, typically controlled by a push button."
+ },
+ "1": {
+ "then": "This is a bottle refill point where the water is sent downwards, typically controlled by a push button or a motion sensor. Drinking directly from the stream might be very hard or impossible."
+ },
+ "2": {
+ "then": "This is a water tap. The water flows downward and the stream is controlled by a valve or push-button."
+ }
+ },
+ "question": "What type of drinking water point is this?"
}
},
"title": {
@@ -8991,6 +9058,9 @@
},
"4": {
"then": "The surface is concrete"
+ },
+ "5": {
+ "then": "The surface is fine gravel"
}
},
"question": "Which is the surface of this sport pitch?",
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index d1d813804..dbc4ccc65 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -1059,7 +1059,7 @@
"name": "Parking à vélo",
"presets": {
"0": {
- "title": "une parking à vélo"
+ "title": "un parking à vélo"
}
},
"tagRenderings": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 8a4b3736c..cc093e2a5 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1842,7 +1842,7 @@
"name": "Oplaadpunten",
"presets": {
"0": {
- "title": "een oplaadpunt voor elektrische fietsen met een gewoon Europees stopcontact (speciaal bedoeld voor fietsen)"
+ "title": "een oplaadpunt voor elektrische fietsen"
},
"1": {
"title": "een oplaadstation voor elektrische auto's"
@@ -4092,8 +4092,26 @@
"question": "Is deze drinkwaterkraan nog steeds werkende?",
"render": "Deze waterkraan-status is {operational_status}"
},
+ "bench-artwork": {
+ "mappings": {
+ "0": {
+ "then": "Dit drinkwaterpunt heeft een geintegreerd kunstwerk"
+ },
+ "1": {
+ "then": "Dit drinkwaterpunt heeft geen geïntegreerd kunstwerk"
+ },
+ "2": {
+ "then": "Dit drinkwaterpunt heeft waarschijnlijk geen geïntegreerd kunstwerk"
+ }
+ },
+ "question": "Heeft dit drinkwaterpunt een geintegreerd kunstwerk?",
+ "questionHint": "Bijvoorbeeld een standbeeld of ander, niet-triviaal kunstwerk"
+ },
"render-closest-drinking-water": {
"render": "Er bevindt zich een ander drinkwaterpunt op {_closest_other_drinking_water_distance} meter"
+ },
+ "type": {
+ "question": "Wat voor soort drinkwaterpunt is dit?"
}
},
"title": {
@@ -7939,6 +7957,9 @@
},
"4": {
"then": "De ondergrond is beton"
+ },
+ "5": {
+ "then": "De ondergrond bestaat uit grind"
}
},
"question": "Wat is de ondergrond van dit sportveld?",
diff --git a/langs/themes/ca.json b/langs/themes/ca.json
index 171590816..e1dd8e763 100644
--- a/langs/themes/ca.json
+++ b/langs/themes/ca.json
@@ -509,7 +509,12 @@
}
},
"title": {
- "render": "node ciclista {rcn_ref}"
+ "mappings": {
+ "0": {
+ "then": "node ciclista {rcn_ref}"
+ }
+ },
+ "render": "node ciclista"
}
}
},
@@ -1159,10 +1164,10 @@
"1": {
"mappings": {
"0": {
- "then": "Sí, hi ha una vorera a aquest costat del carrer"
+ "then": "Hi ha una vorera a aquest costat del carrer"
},
"1": {
- "then": "No, no hi ha vorera per la que caminar"
+ "then": "No hi ha vorera per la que caminar"
},
"2": {
"then": "Hi ha una vorera mapejada separadament per on caminar"
diff --git a/langs/themes/cs.json b/langs/themes/cs.json
index f7fa4de1b..549bc85f6 100644
--- a/langs/themes/cs.json
+++ b/langs/themes/cs.json
@@ -498,9 +498,19 @@
"name": "uzly",
"tagRenderings": {
"node-expected_rcn_route_relations": {
+ "freeform": {
+ "placeholder": "e.g. 3"
+ },
"question": "S kolika dalšími uzly cyklu je tento uzel propojen?",
"render": "Tento uzel je propojen s {expected_rcn_route_relations} dalšími uzly cyklu."
},
+ "node-rxn_ref": {
+ "freeform": {
+ "placeholder": "e.g. 1"
+ },
+ "question": "Jaké je referenční číslo tohoto cyklistického uzlu?",
+ "render": "Tento cyklistický uzel má referenční číslo {rcn_ref}"
+ },
"node-survey:date": {
"override": {
"question": "Kdy byl tento uzel cyklu naposledy zkontrolován?",
@@ -509,7 +519,29 @@
}
},
"title": {
- "render": "uzel cyklu {rcn_ref}"
+ "mappings": {
+ "0": {
+ "then": "uzel cyklu {rcn_ref}"
+ }
+ },
+ "render": "uzel cyklu"
+ }
+ },
+ "2": {
+ "override": {
+ "name": "Cyklistické ukazatele",
+ "title": {
+ "render": "Cyklistický ukazatel"
+ }
+ }
+ },
+ "3": {
+ "override": {
+ "presets": {
+ "0": {
+ "title": "značka trasy pro spojení mezi uzlem"
+ }
+ }
}
}
},
@@ -831,6 +863,10 @@
"description": "Na této mapě najdete hotely ve vašem okolí",
"title": "Hotely"
},
+ "icecream": {
+ "description": "Mapa zobrazující prodej zmrzliny a automaty na zmrzlinu",
+ "title": "Zmrzlina"
+ },
"indoors": {
"description": "Na této mapě jsou zobrazeny veřejně přístupné vnitřní prostory",
"title": "Vnitřní prostory"
@@ -1163,10 +1199,10 @@
"1": {
"mappings": {
"0": {
- "then": "Ano, na této straně silnice je chodník"
+ "then": "Na této straně silnice je chodník"
},
"1": {
- "then": "Ne, není tu žádný chodník"
+ "then": "Není tu žádný chodník"
},
"2": {
"then": "Na mapě je vyznačen samostatný chodník"
@@ -1335,6 +1371,7 @@
"title": "Prodejní automaty"
},
"walkingnodes": {
+ "description": "Tato mapa zobrazuje sítě uzlových bodů a umožňuje snadné přidávání nových uzlů",
"layers": {
"0": {
"name": "propojení mezi uzly",
@@ -1356,7 +1393,21 @@
}
},
"1": {
- "name": "uzly"
+ "name": "uzly",
+ "tagRenderings": {
+ "node-expected_rwn_route_relations": {
+ "freeform": {
+ "placeholder": "e.g. 3"
+ },
+ "question": "S kolika dalšími pěšími uzly je tento uzel propojen?"
+ },
+ "node-rwn_ref": {
+ "freeform": {
+ "placeholder": "e.g. 1"
+ },
+ "question": "Jaké je referenční číslo tohoto pěšího uzlu?"
+ }
+ }
}
}
},
diff --git a/langs/themes/da.json b/langs/themes/da.json
index 73fdd6129..302dce5d0 100644
--- a/langs/themes/da.json
+++ b/langs/themes/da.json
@@ -806,10 +806,10 @@
"1": {
"mappings": {
"0": {
- "then": "Ja, der er et fortov på denne side af vejen"
+ "then": "Der er et fortov på denne side af vejen"
},
"1": {
- "then": "Nej, der er ikke noget fortov at gå på"
+ "then": "Der er ikke noget fortov at gå på"
},
"2": {
"then": "Der er et særskilt kortlagt fortov at gå på"
diff --git a/langs/themes/de.json b/langs/themes/de.json
index cc768eb16..75aa2f5ad 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -524,7 +524,12 @@
}
},
"title": {
- "render": "Fahrradknotenpunkt {rcn_ref}"
+ "mappings": {
+ "0": {
+ "then": "Fahrradknotenpunkt {rcn_ref}"
+ }
+ },
+ "render": "Fahrradknotenpunkt"
}
},
"2": {
@@ -1199,10 +1204,10 @@
"1": {
"mappings": {
"0": {
- "then": "Ja, es gibt einen Bürgersteig auf dieser Straßenseite"
+ "then": "Es gibt einen Bürgersteig auf dieser Straßenseite"
},
"1": {
- "then": "Nein, es gibt keinen Bürgersteig für Fußgänger"
+ "then": "Es gibt keinen Bürgersteig für Fußgänger"
},
"2": {
"then": "Es gibt einen separat kartierten Bürgersteig für Fußgänger"
@@ -1422,7 +1427,11 @@
}
},
"title": {
- "render": "Wanderknoten {rwn_ref}"
+ "mappings": {
+ "0": {
+ "then": "Wanderknoten {rwn_ref}"
+ }
+ }
}
},
"2": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 7d423c5de..5a01a4795 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -524,7 +524,15 @@
}
},
"title": {
- "render": "Cycle node {rcn_ref}"
+ "mappings": {
+ "0": {
+ "then": "Cycle node {rcn_ref}"
+ },
+ "1": {
+ "then": "Proposed cycle node {proposed:rcn_ref}"
+ }
+ },
+ "render": "Cycle node"
}
},
"2": {
@@ -1199,10 +1207,10 @@
"1": {
"mappings": {
"0": {
- "then": "Yes, there is a sidewalk on this side of the road"
+ "then": "There is a sidewalk on this side of the road"
},
"1": {
- "then": "No, there is no sidewalk to walk on"
+ "then": "There is no sidewalk to walk on"
},
"2": {
"then": "There is a separately mapped sidewalk to walk on"
@@ -1422,7 +1430,15 @@
}
},
"title": {
- "render": "Walking node {rwn_ref}"
+ "mappings": {
+ "0": {
+ "then": "Walking node {rwn_ref}"
+ },
+ "1": {
+ "then": "Proposed walking node {proposed:rwn_ref}"
+ }
+ },
+ "render": "Walking node"
}
},
"2": {
diff --git a/langs/themes/es.json b/langs/themes/es.json
index 45cf01b25..cc5186749 100644
--- a/langs/themes/es.json
+++ b/langs/themes/es.json
@@ -509,7 +509,12 @@
}
},
"title": {
- "render": "nodo ciclista {rcn_ref}"
+ "mappings": {
+ "0": {
+ "then": "nodo ciclista {rcn_ref}"
+ }
+ },
+ "render": "nodo ciclista"
}
}
},
@@ -1163,10 +1168,10 @@
"1": {
"mappings": {
"0": {
- "then": "Sí, hay una acera en este lado de la calle"
+ "then": "Hay una acera en este lado de la calle"
},
"1": {
- "then": "No, no hay acera por la que caminar"
+ "then": "No hay acera por la que caminar"
},
"2": {
"then": "Hay una acera mapeada por separado por la que caminar"
diff --git a/langs/themes/fr.json b/langs/themes/fr.json
index 38dbc4d73..371633038 100644
--- a/langs/themes/fr.json
+++ b/langs/themes/fr.json
@@ -506,7 +506,12 @@
}
},
"title": {
- "render": "nœud cycliste {rcn_ref}"
+ "mappings": {
+ "0": {
+ "then": "nœud cycliste {rcn_ref}"
+ }
+ },
+ "render": "nœud cycliste"
}
}
},
@@ -1102,10 +1107,10 @@
"1": {
"mappings": {
"0": {
- "then": "Oui, il y a un trottoir de ce côté de la route"
+ "then": "Il y a un trottoir de ce côté de la route"
},
"1": {
- "then": "Non, il n'y a pas de trottoir où marcher"
+ "then": "Il n'y a pas de trottoir où marcher"
},
"2": {
"then": "Il y a un trottoir où marcher cartographié séparément"
diff --git a/langs/themes/it.json b/langs/themes/it.json
index 45464a5dc..457e34574 100644
--- a/langs/themes/it.json
+++ b/langs/themes/it.json
@@ -599,10 +599,10 @@
"1": {
"mappings": {
"0": {
- "then": "Sì, c'è un marciapiede su questo lato della strada"
+ "then": "C'è un marciapiede su questo lato della strada"
},
"1": {
- "then": "No, non c'è un marciapiede su cui camminare"
+ "then": "Non c'è un marciapiede su cui camminare"
}
}
}
diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json
index abc997dee..aff67e03c 100644
--- a/langs/themes/nb_NO.json
+++ b/langs/themes/nb_NO.json
@@ -283,7 +283,12 @@
"1": {
"name": "noder",
"title": {
- "render": "sykkelnode {rcn_ref}"
+ "mappings": {
+ "0": {
+ "then": "sykkelnode {rcn_ref}"
+ }
+ },
+ "render": "sykkelnode"
}
}
},
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 16e57a9b2..ecf3d12b3 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -475,7 +475,15 @@
}
},
"title": {
- "render": "Fietsknooppunt {rcn_ref}"
+ "mappings": {
+ "0": {
+ "then": "Fietsknooppunt {rcn_ref}"
+ },
+ "1": {
+ "then": "Voorgesteld fietsknooppunt {proposed:rcn_ref}"
+ }
+ },
+ "render": "Fietsknooppunt"
}
}
},
@@ -1156,10 +1164,10 @@
"1": {
"mappings": {
"0": {
- "then": "Ja, er is een stoep aan deze kant van de weg"
+ "then": "Er is een stoep aan deze kant van de weg"
},
"1": {
- "then": "Nee, er is geen stoep om op te lopen"
+ "then": "Er is geen stoep om op te lopen"
},
"2": {
"then": "Er is een apart ingetekende stoep om op te lopen"
@@ -1424,7 +1432,15 @@
}
},
"title": {
- "render": "Wandelknooppunt {rwn_ref}"
+ "mappings": {
+ "0": {
+ "then": "Wandelknooppunt {rwn_ref}"
+ },
+ "1": {
+ "then": "Voorgesteld wandelknooppunt {proposed:rwn_ref}"
+ }
+ },
+ "render": "Wandelknooppunt"
}
}
},
diff --git a/langs/themes/pl.json b/langs/themes/pl.json
index 22eee941e..a8f2b1e2d 100644
--- a/langs/themes/pl.json
+++ b/langs/themes/pl.json
@@ -509,7 +509,12 @@
}
},
"title": {
- "render": "węzeł rowerowy {rcn_ref}"
+ "mappings": {
+ "0": {
+ "then": "węzeł rowerowy {rcn_ref}"
+ }
+ },
+ "render": "węzeł rowerowy"
}
}
},
@@ -1163,10 +1168,10 @@
"1": {
"mappings": {
"0": {
- "then": "Tak, jest chodnik z boku drogi"
+ "then": "Jest chodnik z boku drogi"
},
"1": {
- "then": "Nie, nie ma chodnika, którym można chodzić"
+ "then": "Nie ma chodnika, którym można chodzić"
},
"2": {
"then": "Jest oddzielnie oznaczony chodnik"
diff --git a/package-lock.json b/package-lock.json
index 92308eaa6..1edc8da62 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "mapcomplete",
- "version": "0.34.7",
+ "version": "0.35.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "mapcomplete",
- "version": "0.34.7",
+ "version": "0.35.1",
"license": "GPL-3.0-or-later",
"dependencies": {
"@rgossiaux/svelte-headlessui": "^1.0.2",
@@ -92,7 +92,7 @@
"prettier-plugin-tailwindcss": "^0.3.0",
"read-file": "^0.2.0",
"sass": "^1.58.0",
- "sharp": "^0.30.5",
+ "sharp": "^0.32.6",
"svelte": "^3.55.1",
"svelte-check": "^3.0.2",
"svelte-preprocess": "^5.0.1",
@@ -4704,6 +4704,12 @@
"proxy-from-env": "^1.1.0"
}
},
+ "node_modules/b4a": {
+ "version": "1.6.4",
+ "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
+ "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==",
+ "dev": true
+ },
"node_modules/babel-plugin-polyfill-corejs2": {
"version": "0.1.10",
"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz",
@@ -4993,9 +4999,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001561",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz",
- "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==",
+ "version": "1.0.30001565",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz",
+ "integrity": "sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==",
"dev": true,
"funding": [
{
@@ -5898,9 +5904,9 @@
}
},
"node_modules/detect-libc": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
- "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
+ "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
"dev": true,
"engines": {
"node": ">=8"
@@ -6868,6 +6874,12 @@
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
},
+ "node_modules/fast-fifo": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+ "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+ "dev": true
+ },
"node_modules/fast-glob": {
"version": "3.2.12",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
@@ -9144,6 +9156,12 @@
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
"dev": true
},
+ "node_modules/node-addon-api": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+ "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+ "dev": true
+ },
"node_modules/node-html-parser": {
"version": "6.1.5",
"resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.5.tgz",
@@ -10035,6 +10053,12 @@
}
]
},
+ "node_modules/queue-tick": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+ "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
+ "dev": true
+ },
"node_modules/quick-lru": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
@@ -10679,23 +10703,23 @@
}
},
"node_modules/sharp": {
- "version": "0.30.7",
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.7.tgz",
- "integrity": "sha512-G+MY2YW33jgflKPTXXptVO28HvNOo9G3j0MybYAHeEmby+QuD2U98dT6ueht9cv/XDqZspSpIhoSW+BAKJ7Hig==",
+ "version": "0.32.6",
+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",
+ "integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
"color": "^4.2.3",
- "detect-libc": "^2.0.1",
- "node-addon-api": "^5.0.0",
+ "detect-libc": "^2.0.2",
+ "node-addon-api": "^6.1.0",
"prebuild-install": "^7.1.1",
- "semver": "^7.3.7",
+ "semver": "^7.5.4",
"simple-get": "^4.0.1",
- "tar-fs": "^2.1.1",
+ "tar-fs": "^3.0.4",
"tunnel-agent": "^0.6.0"
},
"engines": {
- "node": ">=12.13.0"
+ "node": ">=14.15.0"
},
"funding": {
"url": "https://opencollective.com/libvips"
@@ -10744,12 +10768,6 @@
"node": ">=10"
}
},
- "node_modules/sharp/node_modules/node-addon-api": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
- "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==",
- "dev": true
- },
"node_modules/sharp/node_modules/semver": {
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
@@ -10765,6 +10783,28 @@
"node": ">=10"
}
},
+ "node_modules/sharp/node_modules/tar-fs": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
+ "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
+ "dev": true,
+ "dependencies": {
+ "mkdirp-classic": "^0.5.2",
+ "pump": "^3.0.0",
+ "tar-stream": "^3.1.5"
+ }
+ },
+ "node_modules/sharp/node_modules/tar-stream": {
+ "version": "3.1.6",
+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
+ "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
+ "dev": true,
+ "dependencies": {
+ "b4a": "^1.6.4",
+ "fast-fifo": "^1.2.0",
+ "streamx": "^2.15.0"
+ }
+ },
"node_modules/sharp/node_modules/yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -11113,6 +11153,16 @@
"node": "*"
}
},
+ "node_modules/streamx": {
+ "version": "2.15.5",
+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.5.tgz",
+ "integrity": "sha512-9thPGMkKC2GctCzyCUjME3yR03x2xNo0GPKGkRw2UMYN+gqWa9uqpyNWhmsNCutU5zHmkUum0LsCRQTXUgUCAg==",
+ "dev": true,
+ "dependencies": {
+ "fast-fifo": "^1.1.0",
+ "queue-tick": "^1.0.1"
+ }
+ },
"node_modules/string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -16879,6 +16929,12 @@
"proxy-from-env": "^1.1.0"
}
},
+ "b4a": {
+ "version": "1.6.4",
+ "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
+ "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==",
+ "dev": true
+ },
"babel-plugin-polyfill-corejs2": {
"version": "0.1.10",
"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz",
@@ -17079,9 +17135,9 @@
"integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="
},
"caniuse-lite": {
- "version": "1.0.30001561",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz",
- "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==",
+ "version": "1.0.30001565",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz",
+ "integrity": "sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==",
"dev": true
},
"canvg": {
@@ -17748,9 +17804,9 @@
"dev": true
},
"detect-libc": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
- "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
+ "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
"dev": true
},
"detective": {
@@ -18485,6 +18541,12 @@
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
},
+ "fast-fifo": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+ "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+ "dev": true
+ },
"fast-glob": {
"version": "3.2.12",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
@@ -20209,6 +20271,12 @@
}
}
},
+ "node-addon-api": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+ "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+ "dev": true
+ },
"node-html-parser": {
"version": "6.1.5",
"resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.5.tgz",
@@ -20786,6 +20854,12 @@
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
},
+ "queue-tick": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+ "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
+ "dev": true
+ },
"quick-lru": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
@@ -21290,18 +21364,18 @@
}
},
"sharp": {
- "version": "0.30.7",
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.7.tgz",
- "integrity": "sha512-G+MY2YW33jgflKPTXXptVO28HvNOo9G3j0MybYAHeEmby+QuD2U98dT6ueht9cv/XDqZspSpIhoSW+BAKJ7Hig==",
+ "version": "0.32.6",
+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",
+ "integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",
"dev": true,
"requires": {
"color": "^4.2.3",
- "detect-libc": "^2.0.1",
- "node-addon-api": "^5.0.0",
+ "detect-libc": "^2.0.2",
+ "node-addon-api": "^6.1.0",
"prebuild-install": "^7.1.1",
- "semver": "^7.3.7",
+ "semver": "^7.5.4",
"simple-get": "^4.0.1",
- "tar-fs": "^2.1.1",
+ "tar-fs": "^3.0.4",
"tunnel-agent": "^0.6.0"
},
"dependencies": {
@@ -21339,12 +21413,6 @@
"yallist": "^4.0.0"
}
},
- "node-addon-api": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
- "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==",
- "dev": true
- },
"semver": {
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
@@ -21354,6 +21422,28 @@
"lru-cache": "^6.0.0"
}
},
+ "tar-fs": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
+ "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
+ "dev": true,
+ "requires": {
+ "mkdirp-classic": "^0.5.2",
+ "pump": "^3.0.0",
+ "tar-stream": "^3.1.5"
+ }
+ },
+ "tar-stream": {
+ "version": "3.1.6",
+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
+ "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
+ "dev": true,
+ "requires": {
+ "b4a": "^1.6.4",
+ "fast-fifo": "^1.2.0",
+ "streamx": "^2.15.0"
+ }
+ },
"yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -21606,6 +21696,16 @@
"resolved": "https://registry.npmjs.org/store/-/store-2.0.12.tgz",
"integrity": "sha512-eO9xlzDpXLiMr9W1nQ3Nfp9EzZieIQc10zPPMP5jsVV7bLOziSFFBP0XoDXACEIFtdI+rIz0NwWVA/QVJ8zJtw=="
},
+ "streamx": {
+ "version": "2.15.5",
+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.5.tgz",
+ "integrity": "sha512-9thPGMkKC2GctCzyCUjME3yR03x2xNo0GPKGkRw2UMYN+gqWa9uqpyNWhmsNCutU5zHmkUum0LsCRQTXUgUCAg==",
+ "dev": true,
+ "requires": {
+ "fast-fifo": "^1.1.0",
+ "queue-tick": "^1.0.1"
+ }
+ },
"string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
diff --git a/package.json b/package.json
index f79fe26b0..d51d0025c 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
"generate:schemas": "ts2json-schema -p src/Models/ThemeConfig/Json/ -o Docs/Schemas/ -t tsconfig.json -R . -m \".*ConfigJson\" && echo 'tsjson is done' && vite-node scripts/fixSchemas.ts ",
"fix:schemas": "vite-node scripts/fixSchemas.ts ",
"watch:schemas": "cd Models/ThemeConfig/Json & ls | entr -s 'npm run generate:schemas' ",
- "generate:service-worker": "tsc src/service-worker.ts --outFile public/service-worker.js && git_hash=$(git rev-parse HEAD) && sed -i \"s/GITHUB-COMMIT/$git_hash/\" public/service-worker.js",
+ "generate:service-worker": "tsc src/service-worker.ts --outFile public/service-worker.js && git_hash=$(git rev-parse HEAD) && sed -i.bak \"s/GITHUB-COMMIT/$git_hash/\" public/service-worker.js && rm public/service-worker.js.bak",
"optimize-images": "cd assets/generated/ && find -name '*.png' -exec optipng '{}' \\; && echo 'PNGs are optimized'",
"generate:stats": "vite-node scripts/GenerateSeries.ts",
"reset:layeroverview": "mkdir -p ./src/assets/generated/layers; echo {\\\"themes\\\":[]} > ./src/assets/generated/known_themes.json && echo {\\\"layers\\\": []} > ./src/assets/generated/known_layers.json && rm -f ./src/assets/generated/layers/*.json && rm -f ./src/assets/generated/themes/*.json && cp ./assets/layers/usersettings/usersettings.json ./src/assets/generated/layers/usersettings.json && echo '{}' > ./src/assets/generated/layers/favourite.json && npm run generate:layeroverview && vite-node scripts/generateLayerOverview.ts -- --force",
@@ -178,7 +178,7 @@
"prettier-plugin-tailwindcss": "^0.3.0",
"read-file": "^0.2.0",
"sass": "^1.58.0",
- "sharp": "^0.30.5",
+ "sharp": "^0.32.6",
"svelte": "^3.55.1",
"svelte-check": "^3.0.2",
"svelte-preprocess": "^5.0.1",
diff --git a/public/css/index-tailwind-output.css b/public/css/index-tailwind-output.css
index f4040f97d..32fb419c0 100644
--- a/public/css/index-tailwind-output.css
+++ b/public/css/index-tailwind-output.css
@@ -841,6 +841,10 @@ video {
margin-right: 3rem;
}
+.mb-4 {
+ margin-bottom: 1rem;
+}
+
.mt-4 {
margin-top: 1rem;
}
@@ -877,10 +881,6 @@ video {
margin-right: 0.25rem;
}
-.mb-4 {
- margin-bottom: 1rem;
-}
-
.ml-1 {
margin-left: 0.25rem;
}
@@ -929,6 +929,10 @@ video {
margin-right: 0.75rem;
}
+.mt-12 {
+ margin-top: 3rem;
+}
+
.mr-12 {
margin-right: 3rem;
}
@@ -1784,6 +1788,10 @@ video {
padding-bottom: 0.5rem;
}
+.pt-1 {
+ padding-top: 0.25rem;
+}
+
.text-center {
text-align: center;
}
@@ -2696,6 +2704,10 @@ a.link-underline {
min-height: 8rem;
}
+.max-w-full {
+ max-width: 100%;
+}
+
.hover\:bg-indigo-200:hover {
--tw-bg-opacity: 1;
background-color: rgb(199 210 254 / var(--tw-bg-opacity));
diff --git a/scripts/generateLayouts.ts b/scripts/generateLayouts.ts
index 53465995b..e9a4102fc 100644
--- a/scripts/generateLayouts.ts
+++ b/scripts/generateLayouts.ts
@@ -15,6 +15,7 @@ import { ImmutableStore } from "../src/Logic/UIEventSource"
import * as crypto from "crypto"
import * as eli from "../src/assets/editor-layer-index.json"
import * as eli_global from "../src/assets/global-raster-layers.json"
+import ValidationUtils from "../src/Models/ThemeConfig/Conversion/ValidationUtils"
const sharp = require("sharp")
const template = readFileSync("theme.html", "utf8")
@@ -264,6 +265,7 @@ async function eliUrls(): Promise
-
-
+
-
-
-
-
+
-
-
-
-
-
diff --git a/src/UI/Base/Dropdown.svelte b/src/UI/Base/Dropdown.svelte
index 71a94a08f..c5f30f8ce 100644
--- a/src/UI/Base/Dropdown.svelte
+++ b/src/UI/Base/Dropdown.svelte
@@ -1,31 +1,31 @@
-
+
+
-
+
-
+
-
+
+
-
diff --git a/src/UI/Base/DragInvitation.svelte b/src/UI/Base/DragInvitation.svelte
index b2eb6c20d..75164c55d 100644
--- a/src/UI/Base/DragInvitation.svelte
+++ b/src/UI/Base/DragInvitation.svelte
@@ -5,7 +5,7 @@
*/
import { Store } from "../../Logic/UIEventSource"
import { onDestroy } from "svelte"
- import Hand from "../../assets/svg/Hand.svelte";
+ import Hand from "../../assets/svg/Hand.svelte"
let mainElem: HTMLElement
export let hideSignal: Store
v{Constants.vNumber}