Move some javascript functions out of global scope

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

diff --git a/app/assets/javascripts/embed.js b/app/assets/javascripts/embed.js
index 914eabb5b381ec3e0e7426057892c3eb29778382..05877b1e286cbaeeb985b92d2136a84e3bb54bd3 100644 (file)
--- a/app/assets/javascripts/embed.js
+++ b/app/assets/javascripts/embed.js
@@ -5,34 +5,42 @@ window.onload = function () {
   var query = (window.location.search || '?').substr(1),
       args  = {};
 
-  query.replace(/([^&=]+)=?([^&]*)(?:&+|$)/g, function(match, key, value) {
-    value = value.split(",");
-    if (value.length == 1)
-      value = value[0];
-    args[key] = value;
-  });
+  var pairs = query.split('&');
+  for (var i = 0; i < pairs.length; i++) {
+    var parts = pairs[i].split('=');
+    args[parts[0]] = decodeURIComponent(parts[1] || '');
+  }
 
   var map = L.map("map");
   map.attributionControl.setPrefix('');
 
-  if (!args.layer || args.layer == "mapnik" || args.layer == "osmarender") {
+  if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender") {
     new L.OSM.Mapnik().addTo(map);
-  } else if (args.layer == "cyclemap" || args.layer == "cycle map") {
+  } else if (args.layer === "cyclemap" || args.layer === "cycle map") {
     new L.OSM.CycleMap().addTo(map);
-  } else if (args.layer == "transportmap") {
+  } else if (args.layer === "transportmap") {
     new L.OSM.TransportMap().addTo(map);
-  } else if (args.layer == "mapquest") {
+  } else if (args.layer === "mapquest") {
     new L.OSM.MapQuestOpen().addTo(map);
+  } else if (args.layer === "hot") {
+    new L.OSM.HOT().addTo(map);
   }
 
   if (args.marker) {
-    L.marker(args.marker).addTo(map);
+    L.marker(args.marker.split(','), {icon: L.icon({
+      iconUrl: OSM.MARKER_ICON,
+      iconSize: new L.Point(25, 41),
+      iconAnchor: new L.Point(12, 41),
+      shadowUrl: OSM.MARKER_SHADOW,
+      shadowSize: new L.Point(41, 41)
+    })}).addTo(map);
   }
 
   if (args.bbox) {
-    map.fitBounds([L.latLng(args.bbox[1], args.bbox[0]),
-                   L.latLng(args.bbox[3], args.bbox[2])])
+    var bbox = args.bbox.split(',');
+    map.fitBounds([L.latLng(bbox[1], bbox[0]),
+                   L.latLng(bbox[3], bbox[2])]);
   } else {
     map.fitWorld();
-  }  
+  }
 };