Remove unused

[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 4430943d1e359aa54045efe35762a895076d64da..cb37373518341fb44807973da75bf0732dc53fff 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,7 +1,6 @@
 OSM = {
 OSM = {

-<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %>
-  PIWIK_LOCATION:        <%= PIWIK_LOCATION.to_json %>,
-  PIWIK_SITE:            <%= PIWIK_SITE.to_json %>,
+<% if defined?(PIWIK) %>
+  PIWIK:                 <%= PIWIK.to_json %>,

 <% end %>
 
   MAX_REQUEST_AREA:      <%= MAX_REQUEST_AREA.to_json %>,
 <% end %>
 
   MAX_REQUEST_AREA:      <%= MAX_REQUEST_AREA.to_json %>,


@@ -13,7 +12,7 @@ OSM = {
   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
 
   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
 

-    if (object.type != "node") {
+    if (object.type === "way" || object.type === "relation") {

       url += "/full";
     } else if (object.version) {
       url += "/" + object.version;
       url += "/full";
     } else if (object.version) {
       url += "/" + object.version;


@@ -22,8 +21,8 @@ OSM = {
     return url;
   },
 
     return url;
   },
 

-  mapParams: function (search) {
-    var params = {}, mapParams = {}, bounds, loc;
+  params: function(search) {
+    var params = {};

 
     search = (search || window.location.search).replace('?', '').split(/&|;/);
 
 
     search = (search || window.location.search).replace('?', '').split(/&|;/);
 


@@ -35,41 +34,24 @@ OSM = {
       params[key] = decodeURIComponent(val);
     }
 
       params[key] = decodeURIComponent(val);
     }
 

+    return params;
+  },
+
+  mapParams: function (search) {
+    var params = OSM.params(search), mapParams = {}, loc, match;
+

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

-    if (params.node || params.way || params.relation) {
-      mapParams.object_zoom = true;
-
-      if (params.node) {
-        mapParams.object = {type: 'node', id: parseInt(params.node)};
-      } else if (params.way) {
-        mapParams.object = {type: 'way', id: parseInt(params.way)};
-      } else if (params.relation) {
-        mapParams.object = {type: 'relation', id: parseInt(params.relation)};
-      }
-    }
-
-    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)]);
-    }
-
-    if (params.box === 'yes') {
-      mapParams.box = bounds;
+    if (params.node) {
+      mapParams.object = {type: 'node', id: parseInt(params.node)};
+    } else if (params.way) {
+      mapParams.object = {type: 'way', id: parseInt(params.way)};
+    } else if (params.relation) {
+      mapParams.object = {type: 'relation', id: parseInt(params.relation)};

     }
 
     var hash = OSM.parseHash(location.hash);
     }
 
     var hash = OSM.parseHash(location.hash);


@@ -79,20 +61,14 @@ 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;

-      mapParams.object_zoom = false;
-    } else if (bounds) {
-      mapParams.bounds = bounds;
-      mapParams.object_zoom = false;

     } else if (params.lon && params.lat) {
       mapParams.lon = parseFloat(params.lon);
       mapParams.lat = parseFloat(params.lat);
       mapParams.zoom = parseInt(params.zoom || 5);
     } else if (params.lon && params.lat) {
       mapParams.lon = parseFloat(params.lon);
       mapParams.lat = parseFloat(params.lat);
       mapParams.zoom = parseInt(params.zoom || 5);

-      mapParams.object_zoom = false;

     } else if (params.mlon && params.mlat) {
       mapParams.lon = parseFloat(params.mlon);
       mapParams.lat = parseFloat(params.mlat);
       mapParams.zoom = parseInt(params.zoom || 12);
     } else if (params.mlon && params.mlat) {
       mapParams.lon = parseFloat(params.mlon);
       mapParams.lat = parseFloat(params.mlat);
       mapParams.zoom = parseInt(params.zoom || 12);

-      mapParams.object_zoom = false;

     } else if (loc = $.cookie('_osm_location')) {
       loc = loc.split("|");
       mapParams.lon = parseFloat(loc[0]);
     } else if (loc = $.cookie('_osm_location')) {
       loc = loc.split("|");
       mapParams.lon = parseFloat(loc[0]);


@@ -116,10 +92,6 @@ OSM = {
 
     mapParams.layers = hash.layers || (loc && loc[3]) || '';
 
 
     mapParams.layers = hash.layers || (loc && loc[3]) || '';
 

-    if (params.note) {
-      mapParams.note = parseInt(params.note);
-    }
-

     var scale = parseFloat(params.scale);
     if (scale > 0) {
       mapParams.zoom = Math.log(360.0 / (scale * 512.0)) / Math.log(2.0);
     var scale = parseFloat(params.scale);
     if (scale > 0) {
       mapParams.zoom = Math.log(360.0 / (scale * 512.0)) / Math.log(2.0);


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

-    if (hash.indexOf('#') === 0) {
-      hash = hash.substr(1);
+    var i = hash.indexOf('#');
+    if (i < 0) {
+      return false;

     }
     }

+
+    hash = hash.substr(i + 1);
+
+    if (hash === '') {
+      return false;
+    }
+

     hash = querystring.parse(hash);
     hash = querystring.parse(hash);

-    var args = L.Hash.parseHash(hash.map || '') || {};
-    if (hash.layers) args.layers = hash.layers;
+
+    var args = hash.map.split("/");
+    if (args.length !== 3) {
+      return false;
+    }
+
+    var zoom = parseInt(args[0], 10),
+      lat = parseFloat(args[1]),
+      lon = parseFloat(args[2]);
+
+    if (isNaN(zoom) || isNaN(lat) || isNaN(lon)) {
+      return false;
+    }
+
+    args = {
+      center: new L.LatLng(lat, lon),
+      zoom: zoom
+    };
+
+    if (hash.layers) {
+      args.layers = hash.layers;
+    }
+

     return args;
   },
 
     return args;
   },