Changeset discussions

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

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 59d880efc7913a9fea9854270ca98c58216cbe49..033b2de8122e991513ab9f431ba8a504b4b2c4aa 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -46,6 +46,7 @@ OSM = {
       mapParams.mlat = parseFloat(params.mlat);
     }
 
       mapParams.mlat = parseFloat(params.mlat);
     }
 

+    // Old-style object parameters; still in use for edit links e.g. /edit?way=1234

     if (params.node) {
       mapParams.object = {type: 'node', id: parseInt(params.node)};
     } else if (params.way) {
     if (params.node) {
       mapParams.object = {type: 'node', id: parseInt(params.node)};
     } else if (params.way) {


@@ -61,6 +62,15 @@ OSM = {
       mapParams.lon = hash.center.lng;
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;
       mapParams.lon = hash.center.lng;
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;

+    } else if (params.bbox) {
+      var bbox = params.bbox.split(',');
+      mapParams.bounds = L.latLngBounds(
+        [parseFloat(bbox[1]), parseFloat(bbox[0])],
+        [parseFloat(bbox[3]), parseFloat(bbox[2])]);
+    } else if (params.minlon && params.minlat && params.maxlon && params.maxlat) {
+      mapParams.bounds = L.latLngBounds(
+        [parseFloat(params.minlat), parseFloat(params.minlon)],
+        [parseFloat(params.maxlat), parseFloat(params.maxlon)]);

     } else if (params.lon && params.lat) {
       mapParams.lon = parseFloat(params.lon);
       mapParams.lat = parseFloat(params.lat);
     } else if (params.lon && params.lat) {
       mapParams.lon = parseFloat(params.lon);
       mapParams.lat = parseFloat(params.lat);


@@ -101,12 +111,29 @@ OSM = {
   },
 
   parseHash: function(hash) {
   },
 
   parseHash: function(hash) {

-    if (hash.indexOf('#') === 0) {
-      hash = hash.substr(1);
+    var args = {};
+
+    var i = hash.indexOf('#');
+    if (i < 0) {
+      return args;
+    }
+
+    hash = querystring.parse(hash.substr(i + 1));
+
+    var map = (hash.map || '').split('/'),
+      zoom = parseInt(map[0], 10),
+      lat = parseFloat(map[1]),
+      lon = parseFloat(map[2]);
+
+    if (!isNaN(zoom) && !isNaN(lat) && !isNaN(lon)) {
+      args.center = new L.LatLng(lat, lon);
+      args.zoom = zoom;

     }
     }

-    hash = querystring.parse(hash);
-    var args = L.Hash.parseHash(hash.map || '') || {};
-    if (hash.layers) args.layers = hash.layers;
+
+    if (hash.layers) {
+      args.layers = hash.layers;
+    }
+

     return args;
   },
 
     return args;
   },
 


@@ -118,7 +145,7 @@ OSM = {
       zoom = args.getZoom();
       layers = args.getLayersCode();
     } else {
       zoom = args.getZoom();
       layers = args.getLayersCode();
     } else {

-      center = L.latLng(args.lat, args.lon);
+      center = args.center || L.latLng(args.lat, args.lon);

       zoom = args.zoom;
       layers = args.layers || '';
     }
       zoom = args.zoom;
       layers = args.layers || '';
     }


@@ -126,7 +153,7 @@ OSM = {
     center = center.wrap();
     layers = layers.replace('M', '');
 
     center = center.wrap();
     layers = layers.replace('M', '');
 

-    var precision = zoomPrecision(zoom),
+    var precision = OSM.zoomPrecision(zoom),

       hash = '#map=' + zoom +
         '/' + center.lat.toFixed(precision) +
         '/' + center.lng.toFixed(precision);
       hash = '#map=' + zoom +
         '/' + center.lat.toFixed(precision) +
         '/' + center.lng.toFixed(precision);


@@ -136,5 +163,16 @@ OSM = {
     }
 
     return hash;
     }
 
     return hash;

+  },
+
+  zoomPrecision: function(zoom) {
+    return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
+  },
+
+  locationCookie: function(map) {
+    var center = map.getCenter().wrap(),
+      zoom = map.getZoom(),
+      precision = OSM.zoomPrecision(zoom);
+    return [center.lng.toFixed(precision), center.lat.toFixed(precision), zoom, map.getLayersCode()].join('|');

   }
 };
   }
 };