uptodate with en.yml 16746

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

diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index f9c3e7a54e823bb4500876ccd5b42a50506b242b..3e28e0c0a059ab0650c48e770aea2a6835121480 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);
   }


@@ -55,6 +55,9 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat, obj_type,
       args.lat = lat;
       args.lon = lon;
       args.zoom = zoom;
       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 {
       node.href = setArgs("/edit", args);
       node.style.fontStyle = 'normal';
     } else {


@@ -94,10 +97,23 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat, obj_type,
     var code = makeShortCode(lat, lon, zoom);
     var prefix = shortlinkPrefix();
 
     var code = makeShortCode(lat, lon, zoom);
     var prefix = shortlinkPrefix();
 

-    // little hack. may the gods of hardcoding please forgive me, or 
-    // show me the Right way to do it.
-    if (layers && (layers != "B000FTF")) {
+    // 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;
       args["layers"] = 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 = prefix + "/go/" + code;
       node.href = setArgs(prefix + "/go/" + code, args);
     } else {
       node.href = prefix + "/go/" + code;


@@ -105,23 +121,20 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat, obj_type,
   }
 }
 
   }
 }
 

-

 /*
 /*

- * This is a hack to hardcode opestreetmap.org -> osm.org in the
- * shortlink
+ * Get the URL prefix to use for a short link

  */
 function shortlinkPrefix() {
  */
 function shortlinkPrefix() {

-    var hostname = window.location.hostname;
-    var normalized_hostname = hostname.replace(/^:www\./i,'');
-    var prefix = '';
-
-    if (normalized_hostname.match(/^openstreetmap\.org$/i)) {
-        prefix = "http://osm.org";
-    }
-
-    return prefix;
+  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("?");


@@ -161,7 +174,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;


@@ -221,7 +234,7 @@ function makeShortCode(lat, lon, zoom) {
        str += char_array.charAt(digit);
     }
     for (var i = 0; i < ((zoom + 8) % 3); ++i) {
        str += char_array.charAt(digit);
     }
     for (var i = 0; i < ((zoom + 8) % 3); ++i) {

-       str += "=";
+       str += "-";

     }
     return str;
 }
     }
     return str;
 }