Don't zoom map when enabling location filter

[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 b8e53d5e0854b9aa0a81695aef8665c43b2e4c3e..e4392827e31425acf0b7fbe88c9944b5f04d2654 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -42,6 +42,8 @@ L.Bounds.include({
   }
 });
 
+L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
+
 var map;
 
 var layers = [
@@ -76,15 +78,22 @@ var layers = [
 ];
 
 function createMap(divName, options) {
-  map = L.map(divName, options);
+  options = $.extend({zoomControl: false, panZoomControl: true, layerControl: true}, options);
+
+  map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));
 
   if (map.attributionControl) {
     map.attributionControl.setPrefix(''); // For tmcw
   }
 
+  if (options.panZoomControl) {
+    new L.Control.Pan().addTo(map);
+    new L.Control.Zoomslider({stepHeight: 7}).addTo(map);
+  }
+
   var layersControl = L.control.layers();
 
-  if (!options || options.layerControl !== false) {
+  if (options.layerControl) {
     layersControl.addTo(map);
   }
 
@@ -111,18 +120,12 @@ function getArrowIcon() {
   });
 }
 
-function addMarkerToMap(position, icon, description) {
-  var marker = L.marker(position, icon ? {icon: icon} : null).addTo(map);
-
-  if (description) {
-    marker.bindPopup(description);
-  }
-
-  return marker;
-}
-
-function removeMarkerFromMap(marker) {
-  map.removeLayer(marker);
+function getUserIcon(url) {
+  return L.icon({
+    iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
+    iconSize: [21, 25],
+    iconAnchor: [12, 27]
+  });
 }
 
 function addObjectToMap(object, zoom, callback) {