Tidy up some recent commits:

[rails.git] / public / javascripts / site.js

diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index 5340ea99eeb4b3a64ae1aa31060319dc2c002702..c509fc5eff6947b54be040c63144c621b4046ffb 100644 (file)
--- a/public/javascripts/site.js
+++ b/public/javascripts/site.js
@@ -2,7 +2,7 @@
  * Called as the user scrolls/zooms around to aniplate hrefs of the
  * view tab and various other links
  */
  * Called as the user scrolls/zooms around to aniplate hrefs of the
  * view tab and various other links
  */

-function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat, obj_type, obj_id) {
+function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,objid) {

   var decimals = Math.pow(10, Math.floor(zoom/3));
   var node;
 
   var decimals = Math.pow(10, Math.floor(zoom/3));
   var node;
 


@@ -18,8 +18,8 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat, obj_type,
     if (layers) {
       args["layers"] = layers;
     }
     if (layers) {
       args["layers"] = layers;
     }

-    if (obj_type && obj_id) {
-      args[obj_type] = obj_id;
+    if (objtype && objid) {
+      args[objtype] = objid;

     }
     node.href = setArgs(node.href, args);
   }
     }
     node.href = setArgs(node.href, args);
   }


@@ -92,17 +92,38 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat, obj_type,
   if (node) {
     var args = getArgs(node.href);
     var code = makeShortCode(lat, lon, zoom);
   if (node) {
     var args = getArgs(node.href);
     var code = makeShortCode(lat, lon, zoom);

+    var prefix = shortlinkPrefix();
+
+    // Add ?{node,way,relation}=id to the arguments
+    if (objtype && objid) {
+      args[objtype] = objid;
+    }
+

     // little hack. may the gods of hardcoding please forgive me, or 
     // show me the Right way to do it.
     if (layers && (layers != "B000FTF")) {
       args["layers"] = layers;
     // little hack. may the gods of hardcoding please forgive me, or 
     // show me the Right way to do it.
     if (layers && (layers != "B000FTF")) {
       args["layers"] = layers;

-      node.href = setArgs("http://osm.org/go/" + code, args);
+      node.href = setArgs(prefix + "/go/" + code, args);

     } else {
     } else {

-      node.href = "http://osm.org/go/" + code;
+      node.href = prefix + "/go/" + code;

     }
   }
 }
 
     }
   }
 }
 

+/*
+ * Get the URL prefix to use for a short link
+ */
+function shortlinkPrefix() {
+  if (window.location.hostname.match(/^www\.openstreetmap\.org/i)) {
+    return "http://osm.org";
+  } else {
+    return "";     
+  }
+}
+
+/*
+ * Called to get the arguments from a URL as a hash.
+ */

 function getArgs(url) {
   var args = new Object();
   var querystart = url.indexOf("?");
 function getArgs(url) {
   var args = new Object();
   var querystart = url.indexOf("?");


@@ -142,7 +163,7 @@ function setArgs(url, args) {
 }
 
 /*
 }
 
 /*

- * Called to get the arguments from a URL as a hash.
+ * Called to get a CSS property for an element.

  */
 function getStyle(el, property) {
   var style;
  */
 function getStyle(el, property) {
   var style;