Start layers pane

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

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 8b621e3aed4473302d4963473b7c9d75556e8d36..80e77f26ca7af5e5969c8bd4200962283e0a14f6 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -17,7 +17,7 @@ var layers;
 var objectLayer;
 var objectLoader;
 
 var objectLayer;
 var objectLoader;
 

-function createMap(divName, options) {
+function createMap(divName, options, moreOptions) {

   if (!layers) {
     layers = [
       {
   if (!layers) {
     layers = [
       {


@@ -51,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}));
   options = $.extend({zoomControl: true, panZoomControl: true, layerControl: true}, options);
 
   map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));


@@ -59,10 +61,6 @@ function createMap(divName, options) {
     map.attributionControl.setPrefix('');
   }
 
     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();
 
 
   var layersControl = L.control.layers();
 


@@ -71,6 +69,13 @@ function createMap(divName, options) {
     map.layersControl = layersControl;
   }
 
     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);
   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);


@@ -96,7 +101,7 @@ function getUserIcon(url) {
   });
 }
 
   });
 }
 

-function addObjectToMap(object, zoom, callback) {
+function addObjectToMap(object, options) {

   if (objectLoader) {
     objectLoader.abort();
   }
   if (objectLoader) {
     objectLoader.abort();
   }


@@ -110,13 +115,10 @@ function addObjectToMap(object, zoom, callback) {
     dataType: "xml",
     success: function (xml) {
       objectLayer = new L.OSM.DataLayer(null, {
     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

         }
       });
 
         }
       });
 


@@ -136,12 +138,12 @@ function addObjectToMap(object, zoom, callback) {
 
       var bounds = objectLayer.getBounds();
 
 
       var bounds = objectLayer.getBounds();
 

-      if (zoom) {
+      if (options.zoom) {

         map.fitBounds(bounds);
       }
 
         map.fitBounds(bounds);
       }
 

-      if (callback) {
-        callback(bounds);
+      if (options.callback) {
+        options.callback(bounds);

       }
 
       objectLayer.addTo(map);
       }
 
       objectLayer.addTo(map);