diff --git a/Docs/SpecialRenderings.md b/Docs/SpecialRenderings.md
index 1ee07467df..68b3340624 100644
--- a/Docs/SpecialRenderings.md
+++ b/Docs/SpecialRenderings.md
@@ -65,6 +65,8 @@ Instead of using `{"render": {"en": "{some_special_visualisation(some_arg, some
* [Example usage of export_as_geojson](#example-usage-of-export_as_geojson)
+ [open_in_iD](#open_in_id)
* [Example usage of open_in_iD](#example-usage-of-open_in_id)
+ + [open_in_josm](#open_in_josm)
+ * [Example usage of open_in_josm](#example-usage-of-open_in_josm)
+ [clear_location_history](#clear_location_history)
* [Example usage of clear_location_history](#example-usage-of-clear_location_history)
+ [close_note](#close_note)
@@ -562,6 +564,16 @@ id_of_object_to_apply_this_one | _undefined_ | If specified, applies the the tag
+### open_in_josm
+
+ Opens the current view in the JOSM-editor
+
+#### Example usage of open_in_josm
+
+ `{open_in_josm()}`
+
+
+
### clear_location_history
A button to remove the travelled track information from the device
diff --git a/assets/contributors.json b/assets/contributors.json
index de2af62502..a763e64dba 100644
--- a/assets/contributors.json
+++ b/assets/contributors.json
@@ -1,7 +1,7 @@
{
"contributors": [
{
- "commits": 3827,
+ "commits": 3833,
"contributor": "Pieter Vander Vennet"
},
{
diff --git a/assets/themes/grb_import/grb.json b/assets/themes/grb_import/grb.json
index 5a7ad09d32..4004952682 100644
--- a/assets/themes/grb_import/grb.json
+++ b/assets/themes/grb_import/grb.json
@@ -500,13 +500,12 @@
},
{
"if": {
-
- "and": [
- "id~relation/*",
- "_overlap_percentage>50",
- "_reverse_overlap_percentage>50",
- "_overlaps_with!="
- ]
+ "and": [
+ "id~relation/*",
+ "_overlap_percentage>50",
+ "_reverse_overlap_percentage>50",
+ "_overlaps_with!="
+ ]
},
"then": {
"en": "This building has holes and is modeled as a relation. As such, it cannot be conflated. Conflate it manually via the building export site {open_in_josm()}"
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 383bb4853e..ebbab1be76 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -1,21 +1,13 @@
{
"id": "mapcomplete-changes",
"title": {
- "en": "Changes made with MapComplete",
- "de": "Änderungen mit MapComplete",
- "es": "Cambios hechos con MapComplete",
- "nb_NO": "Endringer utført med MapComplete"
+ "en": "Changes made with MapComplete"
},
"shortDescription": {
- "en": "Shows changes made by MapComplete",
- "de": "Zeigt Änderungen von MapComplete",
- "es": "Muestra los cambios hechos por MapComplete",
- "nb_NO": "Vis endringer utført med MapComplete"
+ "en": "Shows changes made by MapComplete"
},
"description": {
- "en": "This maps shows all the changes made with MapComplete",
- "de": "Diese Karte zeigt alle Änderungen die mit MapComplete gemacht wurden",
- "es": "Este mapa muestra todos los cambios hechos con MapComplete"
+ "en": "This maps shows all the changes made with MapComplete"
},
"maintainer": "",
"icon": "./assets/svg/logo.svg",
@@ -30,10 +22,7 @@
{
"id": "mapcomplete-changes",
"name": {
- "en": "Changeset centers",
- "de": "Schwerpunkte von Änderungssätzen",
- "es": "Centros de conjuntos de cambios",
- "nb_NO": "Endringssettsenter"
+ "en": "Changeset centers"
},
"minzoom": 0,
"source": {
@@ -47,47 +36,35 @@
],
"title": {
"render": {
- "en": "Changeset for {theme}",
- "de": "Änderungen für {theme}",
- "es": "Conjunto de cambios para {theme}",
- "nb_NO": "Endringssett for {theme}"
+ "en": "Changeset for {theme}"
}
},
"description": {
- "en": "Shows all MapComplete changes",
- "de": "Zeigt alle MapComplete Änderungen",
- "es": "Muestra todos los cambios de MapComplete"
+ "en": "Shows all MapComplete changes"
},
"tagRenderings": [
{
"id": "render_id",
"render": {
- "en": "Changeset {id}",
- "de": "Änderung {id}",
- "es": "Conjunto de cambios {id}",
- "nb_NO": "Endringssett {id}"
+ "en": "Changeset {id}"
}
},
{
"id": "contributor",
"render": {
- "en": "Change made by {_last_edit:contributor}",
- "de": "Änderung wurde von {_last_edit:contributor} gemacht",
- "es": "Cambio hecho por {_last_edit:contributor}"
+ "en": "Change made by {_last_edit:contributor}"
}
},
{
"id": "theme",
"render": {
- "en": "Change with theme {theme}",
- "de": "Änderung mit Thema {theme}"
+ "en": "Change with theme {theme}"
},
"mappings": [
{
"if": "theme~http.*",
"then": {
- "en": "Change with unofficial theme {theme}",
- "de": "Änderung mit inoffiziellem Thema {theme}"
+ "en": "Change with unofficial theme {theme}"
}
}
]
@@ -355,9 +332,7 @@
}
],
"question": {
- "en": "Themename contains {search}",
- "de": "Themenname enthält {search}",
- "nb_NO": "Temanavn inneholder {search}"
+ "en": "Themename contains {search}"
}
}
]
@@ -373,9 +348,7 @@
}
],
"question": {
- "en": "Made by contributor {search}",
- "de": "Erstellt von {search}",
- "es": "Hecho por contributor/a {search}"
+ "en": "Made by contributor {search}"
}
}
]
@@ -391,9 +364,7 @@
}
],
"question": {
- "en": "Not made by contributor {search}",
- "de": "Nicht erstellt von {search}",
- "es": "No hecho por contributor/a {search}"
+ "en": "Not made by contributor {search}"
}
}
]
@@ -408,9 +379,7 @@
{
"id": "link_to_more",
"render": {
- "en": "More statistics can be found here",
- "de": "Weitere Statistiken finden Sie hier",
- "es": "Se pueden encontrar más estadísticas aquí"
+ "en": "More statistics can be found here"
}
},
{
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 4493db4cf7..3ed20746f9 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -612,6 +612,9 @@
"mappings": {
"0": {
"then": "Did not yet calculate the metatags... Reopen this popup"
+ },
+ "1": {
+ "then": "This building has holes and is modeled as a relation. As such, it cannot be conflated. Conflate it manually via the building export site {open_in_josm()}"
}
}
}