Simplify geolink-related code

[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 a3022f9ae905598e165918b9f11042be92f6cba4..215d5b7ca220e746456fa077584b140cd6277b54 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -38,7 +38,7 @@ OSM = {
   },
 
   mapParams: function (search) {
   },
 
   mapParams: function (search) {

-    var params = OSM.params(search), mapParams = {}, bounds, loc, match;
+    var params = OSM.params(search), mapParams = {}, loc, match;

 
     if (params.mlon && params.mlat) {
       mapParams.marker = true;
 
     if (params.mlon && params.mlat) {
       mapParams.marker = true;


@@ -69,21 +69,6 @@ OSM = {
       mapParams.note = parseInt(params.note);
     }
 
       mapParams.note = parseInt(params.note);
     }
 

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

     var hash = OSM.parseHash(location.hash);
 
     // Decide on a map starting position. Various ways of doing this.
     var hash = OSM.parseHash(location.hash);
 
     // Decide on a map starting position. Various ways of doing this.


@@ -92,11 +77,6 @@ OSM = {
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;
       mapParams.object_zoom = false;
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;
       mapParams.object_zoom = false;

-    } else if (bounds) {
-      mapParams.lon = bounds.getCenter().lng; // Not used by main map, but
-      mapParams.lat = bounds.getCenter().lat; // are used by iD/Potlatch.
-      mapParams.bounds = bounds;
-      mapParams.object_zoom = false;

     } 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);