X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1d8e66016c4cdf465d06198cfbbfe76613ed3bfc..908a6ef409518d86bfd2cdf0d2a82a6c312821c8:/public/javascripts/site.js?ds=sidebyside

diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index 23ea3bc68..b6566fa81 100644
--- 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
  */
-function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat) {
+function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,objid) {
   var decimals = Math.pow(10, Math.floor(zoom/3));
   var node;
 
@@ -18,6 +18,9 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat) {
     if (layers) {
       args["layers"] = layers;
     }
+    if (objtype && objid) {
+      args[objtype] = objid;
+    }
     node.href = setArgs(node.href, args);
   }
 
@@ -52,6 +55,9 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat) {
       args.lat = lat;
       args.lon = lon;
       args.zoom = zoom;
+      if (objtype && objid) {
+        args[objtype] = objid;
+      }
       node.href = setArgs("/edit", args);
       node.style.fontStyle = 'normal';
     } else {
@@ -59,7 +65,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat) {
       node.style.fontStyle = 'italic';
     }
   }
-  
+
   node = document.getElementById("historyanchor");
   if (node) {
     if (zoom >= 11) {
@@ -69,14 +75,14 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat) {
 	  typeof minlat == "number" &&
 	  typeof maxlon == "number" &&
 	  typeof maxlat == "number") {
-      
+
         minlon = Math.round(minlon * decimals) / decimals;
         minlat = Math.round(minlat * decimals) / decimals;
         maxlon = Math.round(maxlon * decimals) / decimals;
         maxlat = Math.round(maxlat * decimals) / decimals;
         args.bbox = minlon + "," + minlat + "," + maxlon + "," + maxlat;
       }
-      
+
       node.href = setArgs("/history", args);
       node.style.fontStyle = 'normal';
     } else {
@@ -89,17 +95,49 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat) {
   if (node) {
     var args = getArgs(node.href);
     var code = makeShortCode(lat, lon, zoom);
-    // little hack. may the gods of hardcoding please forgive me, or 
-    // show me the Right way to do it.
-    if (layers && (layers != "B000FTF")) {
+    var prefix = shortlinkPrefix();
+
+    // Add ?{node,way,relation}=id to the arguments
+    if (objtype && objid) {
+      args[objtype] = objid;
+    }
+
+    // This is a hack to omit the default mapnik layer (B000FTF) from
+    // the shortlink. B000FTFT is then the "Object" layer which we get
+    // on /?{node,way,relation}=id
+    if (layers && (layers != "B000FTF") && (layers != "B000FTFT")) {
       args["layers"] = layers;
-      node.href = setArgs("/go/" + code, args);
+    }
+    else {
+      delete args["layers"];
+    }
+
+    // Here we're assuming that all parameters but ?layers= and
+    // ?{node,way,relation}= can be safely omitted from the shortlink
+    // which encodes lat/lon/zoom. If new URL parameters are added to
+    // the main slippy map this needs to be changed.
+    if (args["layers"] || args[objtype]) {
+      node.href = setArgs(prefix + "/go/" + code, args);
     } else {
-      node.href = "/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("?");
@@ -139,7 +177,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;
@@ -166,12 +204,12 @@ function i18n(string, keys) {
   for (var key in keys) {
     var re_key = '\\[\\[' + key + '\\]\\]';
     var re = new RegExp(re_key, "g");
-      
+
     string = string.replace(re, keys[key]);
   }
-   
+
   return string;
-} 
+}
 
 function makeShortCode(lat, lon, zoom) {
     char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_@";
@@ -199,7 +237,7 @@ function makeShortCode(lat, lon, zoom) {
 	str += char_array.charAt(digit);
     }
     for (var i = 0; i < ((zoom + 8) % 3); ++i) {
-	str += "=";
+	str += "-";
     }
     return str;
 }