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

[rails.git] / app / assets / javascripts / index / changeset.js

diff --git a/app/assets/javascripts/index/changeset.js b/app/assets/javascripts/index/changeset.js
index 75a1f7b4dfa770463867cf7fafafbaf05babb1e3..caf40f6b6e7322ce5923e3f8b201a6a41ac73d42 100644 (file)
--- a/app/assets/javascripts/index/changeset.js
+++ b/app/assets/javascripts/index/changeset.js
@@ -1,30 +1,26 @@
 OSM.Changeset = function (map) {
   var page = {},
 OSM.Changeset = function (map) {
   var page = {},

-      content = $("#sidebar_content"),
-      currentChangesetId;
+      content = $("#sidebar_content");

 
 

-  page.pushstate = page.popstate = function (path, id) {
+  page.pushstate = page.popstate = function (path) {

     OSM.loadSidebarContent(path, function () {
     OSM.loadSidebarContent(path, function () {

-      page.load(path, id);
+      page.load();

     });
   };
 
     });
   };
 

-  page.load = function (path, id) {
-    if (id) currentChangesetId = id;
-    initialize();
-    addChangeset(currentChangesetId, true);
-  };
+  page.load = function () {
+    const changesetData = content.find("[data-changeset]").data("changeset");
+    changesetData.type = "changeset";

 
 

-  function addChangeset(id, center) {
-    map.addObject({ type: "changeset", id: parseInt(id, 10) }, function (bounds) {
-      if (!window.location.hash && bounds.isValid() &&
-          (center || !map.getBounds().contains(bounds))) {
+    initialize();
+    map.addObject(changesetData, function (bounds) {
+      if (!window.location.hash && bounds.isValid()) {

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

-  }
+  };

 
   function updateChangeset(method, url, include_data) {
     var data;
 
   function updateChangeset(method, url, include_data) {
     var data;