fix map panning to objects when url hash is not empty but has no map location, fixes...

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index c3ee1e3bc9b47729faab64ad478d6a7818cbabb4..b6ead9f2d988eea2e391cd1d9689120a90a9f14e 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -309,8 +309,9 @@ $(document).ready(function () {
     };
 
     function addObject(type, id, center) {
     };
 
     function addObject(type, id, center) {

+      var hashParams = OSM.parseHash(window.location.hash);

       map.addObject({ type: type, id: parseInt(id, 10) }, function (bounds) {
       map.addObject({ type: type, id: parseInt(id, 10) }, function (bounds) {

-        if (!window.location.hash && bounds.isValid() &&
+        if (!hashParams.center && bounds.isValid() &&

             (center || !map.getBounds().contains(bounds))) {
           OSM.router.withoutMoveListener(function () {
             map.fitBounds(bounds);
             (center || !map.getBounds().contains(bounds))) {
           OSM.router.withoutMoveListener(function () {
             map.fitBounds(bounds);

diff --git a/app/assets/javascripts/index/changeset.js b/app/assets/javascripts/index/changeset.js
index 39b4abde15bd7fc836e641733bfec9af1dd8ee14..d3e61270bf7dac9945d0c3a84457d821f39d3b82 100644 (file)
--- a/app/assets/javascripts/index/changeset.js
+++ b/app/assets/javascripts/index/changeset.js
@@ -12,9 +12,10 @@ OSM.Changeset = function (map) {
     const changesetData = content.find("[data-changeset]").data("changeset");
     changesetData.type = "changeset";
 
     const changesetData = content.find("[data-changeset]").data("changeset");
     changesetData.type = "changeset";
 

+    var hashParams = OSM.parseHash(window.location.hash);

     initialize();
     map.addObject(changesetData, function (bounds) {
     initialize();
     map.addObject(changesetData, function (bounds) {

-      if (!window.location.hash && bounds.isValid()) {
+      if (!hashParams.center && bounds.isValid()) {

         OSM.router.withoutMoveListener(function () {
           map.fitBounds(bounds);
         });
         OSM.router.withoutMoveListener(function () {
           map.fitBounds(bounds);
         });

diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js
index e9c51f9bf1df571f6814be4999a10517975fd28b..6a0487aaac21a2622386f66257860975357b833d 100644 (file)
--- a/app/assets/javascripts/index/note.js
+++ b/app/assets/javascripts/index/note.js
@@ -27,13 +27,16 @@ OSM.Note = function (map) {
       var data = $(".details").data();
       if (!data) return;
       var latLng = L.latLng(data.coordinates.split(","));
       var data = $(".details").data();
       if (!data) return;
       var latLng = L.latLng(data.coordinates.split(","));

-      if (!map.getBounds().contains(latLng)) moveToNote();
+      if (!map.getBounds().contains(latLng)) {
+        OSM.router.withoutMoveListener(function () {
+          map.setView(latLng, 15, { reset: true });
+        });
+      }

     });
   };
 
   page.load = function (path, id) {
     initialize(path, id);
     });
   };
 
   page.load = function (path, id) {
     initialize(path, id);

-    moveToNote();

   };
 
   function initialize(path, id) {
   };
 
   function initialize(path, id) {


@@ -48,7 +51,6 @@ OSM.Note = function (map) {
         success: () => {
           OSM.loadSidebarContent(path, () => {
             initialize(path, id);
         success: () => {
           OSM.loadSidebarContent(path, () => {
             initialize(path, id);

-            moveToNote();

           });
         },
         error: (xhr) => {
           });
         },
         error: (xhr) => {


@@ -77,11 +79,19 @@ OSM.Note = function (map) {
     var data = $(".details").data();
 
     if (data) {
     var data = $(".details").data();
 
     if (data) {

+      var hashParams = OSM.parseHash(window.location.hash);

       map.addObject({
         type: "note",
         id: parseInt(id, 10),
         latLng: L.latLng(data.coordinates.split(",")),
         icon: noteIcons[data.status]
       map.addObject({
         type: "note",
         id: parseInt(id, 10),
         latLng: L.latLng(data.coordinates.split(",")),
         icon: noteIcons[data.status]

+      }, function () {
+        if (!hashParams.center) {
+          var latLng = L.latLng(data.coordinates.split(","));
+          OSM.router.withoutMoveListener(function () {
+            map.setView(latLng, 15, { reset: true });
+          });
+        }

       });
     }
   }
       });
     }
   }


@@ -99,18 +109,6 @@ OSM.Note = function (map) {
     }
   }
 
     }
   }
 

-  function moveToNote() {
-    var data = $(".details").data();
-    if (!data) return;
-    var latLng = L.latLng(data.coordinates.split(","));
-
-    if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {
-      OSM.router.withoutMoveListener(function () {
-        map.setView(latLng, 15, { reset: true });
-      });
-    }
-  }
-

   page.unload = function () {
     map.removeObject();
   };
   page.unload = function () {
     map.removeObject();
   };