Stop the map overlapping the top bar

[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 e4392827e31425acf0b7fbe88c9944b5f04d2654..393e9cae7d3e88f3b3a01b718e084fe37a8934e2 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -78,12 +78,12 @@ var layers = [
 ];
 
 function createMap(divName, options) {
 ];
 
 function createMap(divName, options) {

-  options = $.extend({zoomControl: false, panZoomControl: true, layerControl: true}, options);
+  options = $.extend({zoomControl: true, panZoomControl: true, layerControl: true}, options);

 
   map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));
 
   if (map.attributionControl) {
 
   map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));
 
   if (map.attributionControl) {

-    map.attributionControl.setPrefix(''); // For tmcw
+    map.attributionControl.setPrefix('');

   }
 
   if (options.panZoomControl) {
   }
 
   if (options.panZoomControl) {


@@ -99,12 +99,11 @@ function createMap(divName, options) {
 
   for (var i = 0; i < layers.length; i++) {
     layers[i].layer = new (layers[i].klass)(layers[i]);
 
   for (var i = 0; i < layers.length; i++) {
     layers[i].layer = new (layers[i].klass)(layers[i]);

-    if (i == 0) {
-      layers[i].layer.addTo(map);
-    }

     layersControl.addBaseLayer(layers[i].layer, layers[i].name);
   }
 
     layersControl.addBaseLayer(layers[i].layer, layers[i].name);
   }
 

+  layers[0].layer.addTo(map);
+

   $("#" + divName).on("resized", function () {
     map.invalidateSize();
   });
   $("#" + divName).on("resized", function () {
     map.invalidateSize();
   });


@@ -112,19 +111,14 @@ function createMap(divName, options) {
   return map;
 }
 
   return map;
 }
 

-function getArrowIcon() {
-  return L.icon({
-    iconUrl: <%= asset_path('arrow.png').to_json %>,
-    iconSize: [25, 22],
-    iconAnchor: [22, 20]
-  });
-}
-

 function getUserIcon(url) {
   return L.icon({
     iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
 function getUserIcon(url) {
   return L.icon({
     iconUrl: url || <%= asset_path('marker-red.png').to_json %>,

-    iconSize: [21, 25],
-    iconAnchor: [12, 27]
+    iconSize: [25, 41],
+    iconAnchor: [12, 41],
+    popupAnchor: [1, -34],
+    shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>,
+    shadowSize: [41, 41]

   });
 }
 
   });
 }
 


@@ -191,7 +185,7 @@ function getMapLayers() {
 
 function setMapLayers(layerConfig) {
   for (var i = 0; i < layers.length; i++) {
 
 function setMapLayers(layerConfig) {
   for (var i = 0; i < layers.length; i++) {

-    if (~layerConfig.indexOf(layers[i].layerCode)) {
+    if (layerConfig.indexOf(layers[i].layerCode) >= 0) {

       map.addLayer(layers[i].layer);
     } else {
       map.removeLayer(layers[i].layer);
       map.addLayer(layers[i].layer);
     } else {
       map.removeLayer(layers[i].layer);