diff --git a/AllTranslationAssets.ts b/AllTranslationAssets.ts
index b2abe6a..866e9a7 100644
--- a/AllTranslationAssets.ts
+++ b/AllTranslationAssets.ts
@@ -44,7 +44,7 @@ export default class AllTranslationAssets {
zoomInFurther: new Translation( {"en":"Zoom in further to add a point.","ca":"Apropa per afegir un punt.","es":"Acerca para añadir un punto.","nl":"Gelieve verder in te zoomen om een punt toe te voegen.","fr":"Rapprochez vous pour ajouter un point.","gl":"Achégate para engadir un punto.","de":"Weiter einzoomen, um einen Punkt hinzuzufügen."} ),
stillLoading: new Translation( {"en":"The data is still loading. Please wait a bit before you add a new point.","ca":"Les dades es segueixen carregant. Espera una mica abans d'afegir cap punt.","es":"Los datos se siguen cargando. Espera un poco antes de añadir ningún punto.","nl":"De data wordt nog geladen. Nog even geduld en dan kan je een punt toevoegen.","fr":"Chargement des donnés. Patientez un instant avant d'ajouter un nouveau point.","gl":"Os datos seguen a cargarse. Agarda un intre antes de engadir ningún punto.","de":"Die Daten werden noch geladen. Bitte warten Sie etwas, bevor Sie einen neuen Punkt hinzufügen."} ),
confirmIntro: new Translation( {"en":"
Add a {title} here?
The point you create here will be visible for everyone. Please, only add things on to the map if they truly exist. A lot of applications use this data.","ca":"Afegir {title} aquí?
El punt que estàs creant el veurà tothom. Només afegeix coses que realment existeixin. Moltes aplicacions fan servir aquestes dades.","es":"Añadir {title} aquí?
El punto que estás creando lo verá todo el mundo. Sólo añade cosas que realmente existan. Muchas aplicaciones usan estos datos.","nl":"Voeg hier een {title} toe?
Het punt dat je hier toevoegt, is zichtbaar voor iedereen. Veel applicaties gebruiken deze data, voeg dus enkel punten toe die echt bestaan.","fr":"Ajouter un/une {title} ici?
Le point que vous ajouter sera visible par tout le monde. Merci d'etre sûr que ce point existe réellement. Beaucoup d'autres applications reposent sur ces données.","gl":"Engadir {title} aquí?
O punto que estás a crear será ollado por todo o mundo. Só engade cousas que realmente existan. Moitas aplicacións empregan estes datos.","de":"Hier einen {title} hinzufügen?
Der Punkt, den Sie hier anlegen, wird für alle sichtbar sein. Bitte fügen Sie der Karte nur dann Dinge hinzu, wenn sie wirklich existieren. Viele Anwendungen verwenden diese Daten."} ),
- confirmButton: new Translation( {"en":"Add a {category} here","ca":"Afegir {category} aquí","es":"Añadir {category} aquí","nl":"Voeg hier een {category} toe","fr":"Ajouter un/une {category} ici","gl":"Engadir {category} aquí","de":"Hier eine {category} hinzufügen"} ),
+ confirmButton: new Translation( {"en":"Add a {category} here.
Your addition is visble for everyone
","ca":"Afegir {category} aquí","es":"Añadir {category} aquí","nl":"Voeg hier een {category} toe
Je toevoeging is voor iedereen zichtbaar
","fr":"Ajouter un/une {category} ici","gl":"Engadir {category} aquí","de":"Hier eine {category} hinzufügen"} ),
openLayerControl: new Translation( {"en":"Open the layer control box","ca":"Obrir el control de capes","es":"Abrir el control de capas","nl":"Open de laag-instellingen","de":"Das Ebenen-Kontrollkästchen öffnen"} ),
layerNotEnabled: new Translation( {"en":"The layer {layer} is not enabled. Enable this layer to add a point","ca":"La capa {layer} no està habilitada. Fes-ho per poder afegir un punt a aquesta capa","es":"La capa {layer} no está habilitada. Hazlo para poder añadir un punto en esta capa","nl":"De laag {layer} is gedeactiveerd. Activeer deze om een punt toe te voegn","de":"Die Ebene {layer} ist nicht aktiviert. Aktivieren Sie diese Ebene, um einen Punkt hinzuzufügen"} ),
},
diff --git a/Customizations/JSON/LayerConfigJson.ts b/Customizations/JSON/LayerConfigJson.ts
index da3747b..7a81554 100644
--- a/Customizations/JSON/LayerConfigJson.ts
+++ b/Customizations/JSON/LayerConfigJson.ts
@@ -126,7 +126,17 @@ export interface LayerConfigJson {
passAllFeatures?:boolean
/**
- * Presets for this layer
+ * Presets for this layer.
+ * A preset shows up when clicking the map on a without data (or when right-clicking/long-pressing);
+ * it will prompt the user to add a new point.
+ *
+ * The most important aspect are the tags, which define which tags the new point will have;
+ * The title is shown in the dialog, along with the first sentence of the description.
+ *
+ * Upon confirmation, the full description is shown beneath the buttons - perfect to add pictures and examples.
+ *
+ * Note: the icon of the preset is determined automatically based on the tags and the icon above. Don't worry about that!
+ * NB: if no presets are defined, the popup to add new points doesn't show up at all
*/
presets?: {
title: string | any,
diff --git a/State.ts b/State.ts
index a84847f..974ae94 100644
--- a/State.ts
+++ b/State.ts
@@ -24,7 +24,7 @@ export default class State {
// The singleton of the global state
public static state: State;
- public static vNumber = "0.2.5-rc2";
+ public static vNumber = "0.2.5";
// The user journey states thresholds when a new feature gets unlocked
public static userJourney = {
diff --git a/UI/SimpleAddUI.ts b/UI/SimpleAddUI.ts
index 2005b9e..22339d5 100644
--- a/UI/SimpleAddUI.ts
+++ b/UI/SimpleAddUI.ts
@@ -28,6 +28,7 @@ export class SimpleAddUI extends UIElement {
}>
= new UIEventSource(undefined);
private confirmButton: UIElement = undefined;
+ private _confirmDescription: UIElement = undefined;
private openLayerControl: UIElement;
private cancelButton: UIElement;
private goToInboxButton: UIElement = new SubtleButton(Svg.envelope_ui(),
@@ -69,7 +70,7 @@ export class SimpleAddUI extends UIElement {
"",
preset.title,
"",
- preset.description !== undefined ? new Combine(["
", preset.description]) : "",
+ preset.description !== undefined ? new Combine(["
", preset.description.FirstSentence()]) : "",
tagInfo
])
).onClick(
@@ -78,9 +79,9 @@ export class SimpleAddUI extends UIElement {
new Combine([
"",
Translations.t.general.add.confirmButton.Subs({category: preset.title}),
- "
",
- preset.description !== undefined ? preset.description : ""]));
+ ""]));
self.confirmButton.onClick(self.CreatePoint(preset.tags, layer));
+ self._confirmDescription = preset.description;
self._confirmPreset.setData({
tags: preset.tags,
layerToAddTo: layer,
@@ -148,6 +149,7 @@ export class SimpleAddUI extends UIElement {
userDetails.data.dryRun ? "TESTING - changes won't be saved" : "",
this.confirmButton,
this.cancelButton,
+ this._confirmDescription,
tagInfo
]).Render();
@@ -190,7 +192,7 @@ export class SimpleAddUI extends UIElement {
}
if (State.state.locationControl.data.zoom < State.userJourney.minZoomLevelToAddNewPoints) {
- return new Combine([header, Translations.t.general.add.zoomInFurther]).Render()
+ return new Combine([header, Translations.t.general.add.zoomInFurther.SetClass("alert")]).Render()
}
if (State.state.layerUpdater.runningQuery.data) {
diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json
index a0e5432..d71665f 100644
--- a/assets/layers/bike_repair_station/bike_repair_station.json
+++ b/assets/layers/bike_repair_station/bike_repair_station.json
@@ -526,7 +526,11 @@
"amenity=bicycle_repair_station",
"service:bicycle:tools=no",
"service:bicycle:pump=yes"
- ]
+ ],
+ "description": {
+ "en": "A device to inflate your tires on a fixed location in the public space.Examples of bicycle pumps
![](./assets/layers/bike_repair_station/pump_example_manual.jpg)
![](./assets/layers/bike_repair_station/pump_example.png)
",
+ "nl": "Een apparaat waar je je fietsbanden kan oppompen, beschikbaar in de publieke ruimte. De fietspomp in je kelder telt dus niet.Voorbeelden
![](./assets/layers/bike_repair_station/pump_example_manual.jpg)
![](./assets/layers/bike_repair_station/pump_example.png)
"
+ }
},
{
"title": {
@@ -540,7 +544,11 @@
"amenity=bicycle_repair_station",
"service:bicycle:tools=yes",
"service:bicycle:pump=yes"
- ]
+ ],
+ "description": {
+ "en": "A device with tools to repair your bike combined with a pump at a fixed location. The tools are often secured with chains against theft.Example
",
+ "nl": "Een apparaat met zowel gereedschap om je fiets te herstellen, met een pomp. Deze zijn op een vastgemaakt op een plaats in de publieke ruimte, bv. aan een paal.Voorbeeld
"
+ }
},
{
"title": {
diff --git a/assets/layers/bike_repair_station/pump_example.png b/assets/layers/bike_repair_station/pump_example.png
new file mode 100644
index 0000000..3957c4a
Binary files /dev/null and b/assets/layers/bike_repair_station/pump_example.png differ
diff --git a/assets/layers/bike_repair_station/pump_example_manual.jpg b/assets/layers/bike_repair_station/pump_example_manual.jpg
new file mode 100644
index 0000000..dda7634
Binary files /dev/null and b/assets/layers/bike_repair_station/pump_example_manual.jpg differ
diff --git a/assets/layers/bike_repair_station/pump_example_round.jpg b/assets/layers/bike_repair_station/pump_example_round.jpg
new file mode 100644
index 0000000..43fa0ac
Binary files /dev/null and b/assets/layers/bike_repair_station/pump_example_round.jpg differ
diff --git a/assets/layers/bike_repair_station/repair_station_example.jpg b/assets/layers/bike_repair_station/repair_station_example.jpg
new file mode 100644
index 0000000..299ceed
Binary files /dev/null and b/assets/layers/bike_repair_station/repair_station_example.jpg differ
diff --git a/assets/layers/nature_reserve/nature_reserve.json b/assets/layers/nature_reserve/nature_reserve.json
index c825380..da54443 100644
--- a/assets/layers/nature_reserve/nature_reserve.json
+++ b/assets/layers/nature_reserve/nature_reserve.json
@@ -341,7 +341,7 @@
}
],
"hideUnderlayingFeaturesMinPercentage": 10,
- "wayHandling": 1,
+ "wayHandling": 2,
"icon": {
"render": "./assets/themes/buurtnatuur/nature_reserve.svg"
},
diff --git a/assets/translations.json b/assets/translations.json
index fc6ee38..2cb0ebf 100644
--- a/assets/translations.json
+++ b/assets/translations.json
@@ -351,10 +351,10 @@
"de": "Hier einen {title} hinzufügen?
Der Punkt, den Sie hier anlegen, wird für alle sichtbar sein. Bitte fügen Sie der Karte nur dann Dinge hinzu, wenn sie wirklich existieren. Viele Anwendungen verwenden diese Daten."
},
"confirmButton": {
- "en": "Add a {category} here",
+ "en": "Add a {category} here.
Your addition is visble for everyone
",
"ca": "Afegir {category} aquí",
"es": "Añadir {category} aquí",
- "nl": "Voeg hier een {category} toe",
+ "nl": "Voeg hier een {category} toe
Je toevoeging is voor iedereen zichtbaar
",
"fr": "Ajouter un/une {category} ici",
"gl": "Engadir {category} aquí",
"de": "Hier eine {category} hinzufügen"