From: Tom Hughes <tom@compton.nu>
Date: Sun, 16 Mar 2014 16:20:39 +0000 (+0000)
Subject: Merge branch 'master' into overpass
X-Git-Tag: live~4334^2~19
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/203ba58bab01b7a61cdff8974cbbfe4f7f639cb1?hp=-c

Merge branch 'master' into overpass
---

203ba58bab01b7a61cdff8974cbbfe4f7f639cb1
diff --combined app/assets/javascripts/index.js
index ddec2bffe,96e03539a..54ccb88ed
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@@ -5,7 -5,6 +5,7 @@@
  //= require leaflet.key
  //= require leaflet.note
  //= require leaflet.share
 +//= require leaflet.query
  //= require index/search
  //= require index/browse
  //= require index/export
@@@ -13,7 -12,6 +13,7 @@@
  //= require index/history
  //= require index/note
  //= require index/new_note
 +//= require index/query
  //= require router
  
  (function() {
@@@ -125,11 -123,6 +125,11 @@@ $(document).ready(function () 
      sidebar: sidebar
    }).addTo(map);
  
 +  L.OSM.query({
 +    position: position,
 +    sidebar: sidebar
 +  }).addTo(map);
 +
    L.control.scale()
      .addTo(map);
  
@@@ -271,10 -264,11 +271,11 @@@
  
      function addObject(type, id, center) {
        var bounds = map.addObject({type: type, id: parseInt(id)}, function(bounds) {
-         if (!window.location.hash && bounds.isValid()) {
-           OSM.router.moveListenerOff();
-           map.once('moveend', OSM.router.moveListenerOn);
-           if (center || !map.getBounds().contains(bounds)) map.fitBounds(bounds);
+         if (!window.location.hash && bounds.isValid() &&
+             (center || !map.getBounds().contains(bounds))) {
+           OSM.router.withoutMoveListener(function () {
+             map.fitBounds(bounds);
+           });
          }
        });
      }
@@@ -301,8 -295,7 +302,8 @@@
      "/node/:id(/history)":         OSM.Browse(map, 'node'),
      "/way/:id(/history)":          OSM.Browse(map, 'way'),
      "/relation/:id(/history)":     OSM.Browse(map, 'relation'),
 -    "/changeset/:id":              OSM.Browse(map, 'changeset')
 +    "/changeset/:id":              OSM.Browse(map, 'changeset'),
 +    "/query":                      OSM.Query(map)
    });
  
    if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {