X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d1c900901939c1d168ba31f40ea688ff41521dfa..73bbee5df9f01eb927ff6d830f8e74802d0318c8:/app/assets/javascripts/map.js.erb

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index bb1c9a358..80e77f26c 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -1,31 +1,5 @@
 // Leaflet extensions
 L.extend(L.LatLngBounds.prototype, {
-  getSouthLat: function () {
-    return this._southWest.lat;
-  },
-
-  getWestLng: function () {
-    return this._southWest.lng;
-  },
-
-  getNorthLat: function () {
-    return this._northEast.lat;
-  },
-
-  getEastLng: function () {
-    return this._northEast.lng;
-  },
-
-  toBBOX: function () {
-    var decimal = 6;
-    var mult = Math.pow(10, decimal);
-    var xmin = Math.round(this.getWestLng() * mult) / mult;
-    var ymin = Math.round(this.getSouthLat() * mult) / mult;
-    var xmax = Math.round(this.getEastLng() * mult) / mult;
-    var ymax = Math.round(this.getNorthLat() * mult) / mult;
-    return xmin + "," + ymin + "," + xmax + "," + ymax;
-  },
-
   getSize: function () {
     return (this._northEast.lat - this._southWest.lat) *
            (this._northEast.lng - this._southWest.lng);
@@ -36,16 +10,6 @@ L.extend(L.LatLngBounds.prototype, {
   }
 });
 
-L.extend(L.Bounds.prototype, {
-  getWidth: function () {
-   return this.max.x - this.min.x;
-  },
-
-  getHeight: function () {
-   return this.max.y - this.min.y;
-  }
-});
-
 L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
 
 var map;
@@ -53,7 +17,7 @@ var layers;
 var objectLayer;
 var objectLoader;
 
-function createMap(divName, options) {
+function createMap(divName, options, moreOptions) {
   if (!layers) {
     layers = [
       {
@@ -87,6 +51,8 @@ function createMap(divName, options) {
     ];
   }
 
+  moreOptions = moreOptions || {};
+
   options = $.extend({zoomControl: true, panZoomControl: true, layerControl: true}, options);
 
   map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));
@@ -95,10 +61,6 @@ function createMap(divName, options) {
     map.attributionControl.setPrefix('');
   }
 
-  if (options.panZoomControl) {
-    new L.Control.Pan().addTo(map);
-    new L.Control.Zoomslider({stepHeight: 7}).addTo(map);
-  }
 
   var layersControl = L.control.layers();
 
@@ -107,6 +69,13 @@ function createMap(divName, options) {
     map.layersControl = layersControl;
   }
 
+  if (moreOptions.locateControl) {
+    var loc = L.control.locate({
+        position: 'topright'
+    });
+    loc.addTo(map);
+  }
+
   for (var i = 0; i < layers.length; i++) {
     layers[i].layer = new (layers[i].klass)(layers[i]);
     layersControl.addBaseLayer(layers[i].layer, layers[i].name);
@@ -132,7 +101,7 @@ function getUserIcon(url) {
   });
 }
 
-function addObjectToMap(object, zoom, callback) {
+function addObjectToMap(object, options) {
   if (objectLoader) {
     objectLoader.abort();
   }
@@ -146,13 +115,10 @@ function addObjectToMap(object, zoom, callback) {
     dataType: "xml",
     success: function (xml) {
       objectLayer = new L.OSM.DataLayer(null, {
-        style: {
-          strokeColor: "blue",
-          strokeWidth: 3,
-          strokeOpacity: 0.5,
-          fillOpacity: 0.2,
-          fillColor: "lightblue",
-          pointRadius: 6
+        styles: {
+          node: options.style,
+          way: options.style,
+          area: options.style
         }
       });
 
@@ -172,12 +138,12 @@ function addObjectToMap(object, zoom, callback) {
 
       var bounds = objectLayer.getBounds();
 
-      if (zoom) {
+      if (options.zoom) {
         map.fitBounds(bounds);
       }
 
-      if (callback) {
-        callback(bounds);
+      if (options.callback) {
+        options.callback(bounds);
       }
 
       objectLayer.addTo(map);