Prefer hash to other methods of determining location

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 029c0bfd1f1046fe8ef0617b911a48bd6bb4a1d1..2f0c1609750d9321ff4bc1b18a76c1f3e440d7e7 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -19,6 +19,8 @@ $(document).ready(function () {
 
   map.attributionControl.setPrefix('');
 
 
   map.attributionControl.setPrefix('');
 

+  new L.Hash(map);
+

   var layers = [
     new L.OSM.Mapnik({
       attribution: '',
   var layers = [
     new L.OSM.Mapnik({
       attribution: '',


@@ -98,24 +100,21 @@ $(document).ready(function () {
   map.markerLayer = L.layerGroup().addTo(map);
 
   if (!params.object_zoom) {
   map.markerLayer = L.layerGroup().addTo(map);
 
   if (!params.object_zoom) {

-    if (params.bbox) {
-      var bbox = L.latLngBounds([params.minlat, params.minlon],
-                                [params.maxlat, params.maxlon]);
-
-      map.fitBounds(bbox);
-
-      if (params.box) {
-        L.rectangle(bbox, {
-          weight: 2,
-          color: '#e90',
-          fillOpacity: 0
-        }).addTo(map);
-      }
+    if (params.bounds) {
+      map.fitBounds(params.bounds);

     } else {
       map.setView([params.lat, params.lon], params.zoom);
     }
   }
 
     } else {
       map.setView([params.lat, params.lon], params.zoom);
     }
   }
 

+  if (params.box) {
+    L.rectangle(params.box, {
+      weight: 2,
+      color: '#e90',
+      fillOpacity: 0
+    }).addTo(map);
+  }
+

   if (params.layers) {
     var foundLayer = false;
     for (var i = 0; i < layers.length; i++) {
   if (params.layers) {
     var foundLayer = false;
     for (var i = 0; i < layers.length; i++) {