Nominatim results zoom to the result location

[rails.git] / app / assets / javascripts / leaflet.map.js.erb

diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb
index f598a48393c9d0d8be108602a1b7c7bd814deb1a..bfb3685a1750e9fd772707c2922b5646c497426d 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -178,10 +178,11 @@ L.OSM.Map = L.Map.extend({
     };
 
     var changesetStyle = {
-      weight: 1,
+      weight: 4,
       color: '#FF9500',
       opacity: 1,
-      fillOpacity: 0
+      fillOpacity: 0,
+      clickable: false
     };
 
     this._object = object;
@@ -218,9 +219,13 @@ L.OSM.Map = L.Map.extend({
         map._objectLayer.addData(xml);
         map._objectLayer.addTo(map);
 
-        var bounds = map._objectLayer.getBounds();
-        if (bounds.isValid()) {
-          map.fitBounds(bounds);
+        if (!window.location.hash) {
+          var bounds = map._objectLayer.getBounds();
+          if (bounds.isValid()) {
+            OSM.route.moveListenerOff();
+            map.once('moveend', OSM.route.moveListenerOn);
+            map.fitBounds(bounds);
+          }
         }
       }
     });
@@ -230,6 +235,14 @@ L.OSM.Map = L.Map.extend({
     this._object = null;
     if (this._objectLoader) this._objectLoader.abort();
     if (this._objectLayer) this.removeLayer(this._objectLayer);
+  },
+
+  getState: function() {
+    return {
+      center: this.getCenter().wrap(),
+      zoom: this.getZoom(),
+      layers: this.getLayersCode()
+    }
   }
 });