Remove robots.txt block for /user/*/diary

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 95771a4b2ae4645416ac0e26bcfb3f9e229330c5..d84b8ae24794562296d1b3d1a13565539497129b 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -48,6 +48,12 @@ $(document).ready(function () {
       code: "Q",
       keyid: "mapquest",
       name: I18n.t("javascripts.map.base.mapquest")
       code: "Q",
       keyid: "mapquest",
       name: I18n.t("javascripts.map.base.mapquest")

+    }),
+    new L.OSM.HOT({
+      attribution: copyright + ". Tiles courtesy of <a href='http://hot.openstreetmap.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>",
+      code: "H",
+      keyid: "hot",
+      name: I18n.t("javascripts.map.base.hot")

     })
   ];
 
     })
   ];
 


@@ -59,14 +65,12 @@ $(document).ready(function () {
       if (layerParam.indexOf(layers[i].options.code) >= 0) {
         map.addLayer(layers[i]);
         layersAdded = layersAdded + layers[i].options.code;
       if (layerParam.indexOf(layers[i].options.code) >= 0) {
         map.addLayer(layers[i]);
         layersAdded = layersAdded + layers[i].options.code;

+      } else if (i == 0 && layersAdded == "") {
+        map.addLayer(layers[i]);

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

-
-    if (layersAdded == "") {
-      map.addLayer(layers[0]);
-    }

   }
 
   updateLayers(params);
   }
 
   updateLayers(params);


@@ -75,6 +79,12 @@ $(document).ready(function () {
     updateLayers(OSM.mapParams());
   });
 
     updateLayers(OSM.mapParams());
   });
 

+  map.on("baselayerchange", function (e) {
+    if (map.getZoom() > e.layer.options.maxZoom) {
+      map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true });
+    }
+  });
+

   map.noteLayer = new L.LayerGroup();
   map.noteLayer.options = {code: 'N'};
 
   map.noteLayer = new L.LayerGroup();
   map.noteLayer.options = {code: 'N'};