X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/518a51712c7dce533f4e2d72873e01746fbe50e8..190d0fddfcaa3483b6be2c1d0f24ebbf6cdd3fdc:/app/assets/javascripts/leaflet.map.js.erb?ds=sidebyside diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb index 69fd1f3e3..ed89e1fa5 100644 --- a/app/assets/javascripts/leaflet.map.js.erb +++ b/app/assets/javascripts/leaflet.map.js.erb @@ -100,10 +100,6 @@ L.OSM.Map = L.Map.extend({ params.mlon = latLng.lng.toFixed(precision); } - if (this._object) { - params[this._object.type] = this._object.id; - } - var url = 'http://' + OSM.SERVER_URL + '/', query = querystring.stringify(params), hash = OSM.formatHash(this); @@ -178,10 +174,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; @@ -221,8 +218,8 @@ L.OSM.Map = L.Map.extend({ if (!window.location.hash) { var bounds = map._objectLayer.getBounds(); if (bounds.isValid()) { - OSM.route.moveListenerOff(); - map.once('moveend', OSM.route.moveListenerOn); + OSM.router.moveListenerOff(); + map.once('moveend', OSM.router.moveListenerOn); map.fitBounds(bounds); } } @@ -242,6 +239,11 @@ L.OSM.Map = L.Map.extend({ zoom: this.getZoom(), layers: this.getLayersCode() } + }, + + setState: function(state, options) { + if (state.center) this.setView(state.center, state.zoom, options); + this.updateLayers(state.layers); } });