Merge remote-tracking branch 'upstream/pull/2267'

openstreetmap · Jun 20, 2019 · 16cbc2e · 16cbc2e
2 parents 80427b3 + 7fb85f1
commit 16cbc2e
Show file tree

Hide file tree

Showing 71 changed files with 5,345 additions and 2,580 deletions.
diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb
@@ -20,14 +20,15 @@ $(document).ready(function () {
 
     if (hashParams.background) params.background = hashParams.background;
     if (hashParams.comment) params.comment = hashParams.comment;
-    if (hashParams.hashtags) params.hashtags = hashParams.hashtags;
-    if (hashParams.source) params.source = hashParams.source;
     if (hashParams.disable_features) params.disable_features = hashParams.disable_features;
-    if (hashParams.offset) params.offset = hashParams.offset;
-    if (hashParams.walkthrough) params.walkthrough = hashParams.walkthrough;
+    if (hashParams.hashtags) params.hashtags = hashParams.hashtags;
     if (hashParams.locale) params.locale = hashParams.locale;
     if (hashParams.maprules) params.maprules = hashParams.maprules;
+    if (hashParams.offset) params.offset = hashParams.offset;
+    if (hashParams.photo_overlay) params.photo_overlay = hashParams.photo_overlay;
     if (hashParams.presets) params.presets = hashParams.presets;
+    if (hashParams.source) params.source = hashParams.source;
+    if (hashParams.walkthrough) params.walkthrough = hashParams.walkthrough;
 
     if (id.data("gpx")) {
       params.gpx = id.data("gpx");

diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
diff --git a/vendor/assets/iD/iD/img/fa-sprite.svg b/vendor/assets/iD/iD/img/fa-sprite.svg
diff --git a/vendor/assets/iD/iD/locales/af.json b/vendor/assets/iD/iD/locales/af.json
@@ -161,22 +161,11 @@
             "description": "Agtergrond stellings",
             "reset": "begin van voor"
         },
-        "restore": {
-            "heading": "Jy het verandering wat nog gebêre moet word",
-            "description": "Wil jy graag ongebêrede veranderinge heroep van 'n vorige kaart veranderingssessie?"
-        },
         "save": {
             "title": "Stoor",
             "no_changes": "Geen verandering om te stoor.",
             "unsaved_changes": "Jy het ongestoorde veranderinge"
         },
-        "success": {
-            "just_edited": "Jy het nou net 'n OpenStreetMapKaart bydra gemaak!"
-        },
-        "splash": {
-            "welcome": "Welkom by die iD OpenStreetMap program",
-            "walkthrough": "Begin die Deurloop"
-        },
         "source_switch": {
             "live": "lewendig",
             "lose_changes": "Jy het ongebêrede verandering, as jy die van kaart server verander gaan jy die veranderings weggooi. Is jy seker jy wil van kaart server verander?",

diff --git a/vendor/assets/iD/iD/locales/ar-AA.json b/vendor/assets/iD/iD/locales/ar-AA.json
@@ -133,9 +133,6 @@
             "description": "إعدادات الخلفية",
             "reset": "أعد للوضع السابق"
         },
-        "restore": {
-            "description": "هل ترغب في استعادة التغييرات غير المحفوظة من جلسة التحرير السابق؟"
-        },
         "save": {
             "title": "حفظ",
             "no_changes": ".لا تغييرات للحفظ"

diff --git a/vendor/assets/iD/iD/locales/ar.json b/vendor/assets/iD/iD/locales/ar.json
diff --git a/vendor/assets/iD/iD/locales/ast.json b/vendor/assets/iD/iD/locales/ast.json
@@ -386,7 +386,6 @@
         },
         "geocoder": {
             "search": "Buscar en tol mundu...",
-            "no_results_visible": "Nun hai resultaos nel área visible del mapa",
             "no_results_worldwide": "Nun s'alcontraron resultaos"
         },
         "geolocate": {
@@ -526,12 +525,6 @@
                 "tooltip": "Les árees dibúxense col rellenu completu"
             }
         },
-        "restore": {
-            "heading": "Tien cambios ensin guardar",
-            "description": "¿Quier recuperar los cambios ensin guardar d'una sesión d'edición anterior?",
-            "restore": "Restaurar los mios cambios",
-            "reset": "Descartar los mios cambios"
-        },
         "save": {
             "title": "Guardar",
             "no_changes": "Nun hai cambios que guardar.",
@@ -554,19 +547,12 @@
             }
         },
         "success": {
-            "just_edited": "¡Acaba d'editar OpenStreetMap!",
             "help_link_text": "Detalles"
         },
         "confirm": {
             "okay": "Aceutar",
             "cancel": "Encaboxar"
         },
-        "splash": {
-            "welcome": "Bienllegáu al editor d'OpenStreetMap iD",
-            "text": "iD ye una ferramienta amistosa pero potente pa collaborar col meyor mapamundi llibre del mundu. Esta ye la versión {version}. Pa más información visite {website} ya informe de fallos en {github}.",
-            "walkthrough": "Aniciar la Visita guiada",
-            "start": "Editar agora"
-        },
         "source_switch": {
             "live": "en vivo",
             "lose_changes": "Tien cambios ensin guardar. Camudar el sirvidor de mapes descartarálos. ¿Ta seguru de que quier intercambiar de sirvidores?",
@@ -3112,28 +3098,16 @@
                 "landuse/military/barracks": {
                     "name": "Cuartel"
                 },
-                "landuse/military/bunker": {
-                    "name": "Bunquer militar"
-                },
-                "landuse/military/checkpoint": {
-                    "name": "Puntu de control"
-                },
                 "landuse/military/danger_area": {
                     "name": "Área de peligru"
                 },
                 "landuse/military/naval_base": {
                     "name": "Base naval",
                     "terms": "Arsenal"
                 },
-                "landuse/military/nuclear_explosion_site": {
-                    "name": "Llugar d'españíu nuclear"
-                },
                 "landuse/military/obstacle_course": {
                     "name": "Recorríu d'obstáculos"
                 },
-                "landuse/military/office": {
-                    "name": "Oficina militar"
-                },
                 "landuse/military/range": {
                     "name": "Campu de tiru"
                 },