Merge branch 'master' into openstreetbugs

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

diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index 3e28e0c0a059ab0650c48e770aea2a6835121480..813b3ae92919da715bf38b7096bbad722e7a645a 100644 (file)
--- a/public/javascripts/site.js
+++ b/public/javascripts/site.js
@@ -9,89 +9,55 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
   lat = Math.round(lat * decimals) / decimals;
   lon = Math.round(lon * decimals) / decimals;
 
   lat = Math.round(lat * decimals) / decimals;
   lon = Math.round(lon * decimals) / decimals;
 

-  node = document.getElementById("permalinkanchor");
-  if (node) {
-    var args = getArgs(node.href);
-    args["lat"] = lat;
-    args["lon"] = lon;
-    args["zoom"] = zoom;
-    if (layers) {
-      args["layers"] = layers;
-    }
-    if (objtype && objid) {
-      args[objtype] = objid;
-    }
-    node.href = setArgs(node.href, args);
-  }
-
-  node = document.getElementById("viewanchor");
-  if (node) {
-    var args = getArgs(node.href);
-    args["lat"] = lat;
-    args["lon"] = lon;
-    args["zoom"] = zoom;
-    if (layers) {
-      args["layers"] = layers;
-    }
-    node.href = setArgs(node.href, args);
+  if (minlon) {
+    minlon = Math.round(minlon * decimals) / decimals;
+    minlat = Math.round(minlat * decimals) / decimals;
+    maxlon = Math.round(maxlon * decimals) / decimals;
+    maxlat = Math.round(maxlat * decimals) / decimals;

   }
 
   }
 

-  node = document.getElementById("exportanchor");
-  if (node) {
-    var args = getArgs(node.href);
-    args["lat"] = lat;
-    args["lon"] = lon;
-    args["zoom"] = zoom;
-    if (layers) {
-      args["layers"] = layers;
-    }
-    node.href = setArgs(node.href, args);
-  }
+  $$(".geolink").each(function (link) {
+    var args = getArgs(link.href);

 
 

-  node = document.getElementById("editanchor");
-  if (node) {
-    if (zoom >= 13) {
-      var args = new Object();
+    if (link.hasClassName("llz")) {

       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 = 'javascript:alert("zoom in to edit map");';
-      node.style.fontStyle = 'italic';
+    } else if (minlon && link.hasClassName("bbox")) {
+      args.bbox = minlon + "," + minlat + "," + maxlon + "," + maxlat;

     }
     }

-  }
-  
-  node = document.getElementById("historyanchor");
-  if (node) {
-    if (zoom >= 11) {
-      var args = new Object();
-      //set bbox param from 'extents' object
-      if (typeof minlon == "number" &&
-         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 {
-      node.href = 'javascript:alert("zoom in to see editing history");';
-      node.style.fontStyle = 'italic';
+
+    if (layers && link.hasClassName("layers")) {
+      args.layers = layers;
+    }
+
+    if (objtype && link.hasClassName("object")) {
+      args[objtype] = objid;

     }
     }

-  }

 
 

-  node = document.getElementById("shortlinkanchor");
+    if (link.hasClassName("minzoom[0-9]+")) {
+      $w(link.className).each(function (classname) {
+        if (match = classname.match(/^minzoom([0-9]+)$/)) {
+          var minzoom = match[1];
+          var name = link.id.replace(/anchor$/, "");
+
+          if (zoom >= minzoom) {
+            link.onclick = null;
+            link.title = i18n("javascripts.site." + name + "_tooltip");
+            link.removeClassName("disabled");
+          } else {
+            link.onclick = function () { alert(i18n("javascripts.site." + name + "_zoom_alert")); return false; };
+            link.title = i18n("javascripts.site." + name + "_disabled_tooltip");
+            link.addClassName("disabled");
+          }
+        }
+      });
+    }
+
+    link.href = setArgs(link.href, args);
+  });
+
+  node = $("shortlinkanchor");

   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);


@@ -102,12 +68,13 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
       args[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")) {
+    // This is a hack to omit the default mapnik layer from the shortlink.
+    if (layers && layers != "M") {

       args["layers"] = layers;
     }
       args["layers"] = layers;
     }

+    else {
+      delete args["layers"];
+    }

 
     // Here we're assuming that all parameters but ?layers= and
     // ?{node,way,relation}= can be safely omitted from the shortlink
 
     // Here we're assuming that all parameters but ?layers= and
     // ?{node,way,relation}= can be safely omitted from the shortlink


@@ -128,7 +95,7 @@ function shortlinkPrefix() {
   if (window.location.hostname.match(/^www\.openstreetmap\.org/i)) {
     return "http://osm.org";
   } else {
   if (window.location.hostname.match(/^www\.openstreetmap\.org/i)) {
     return "http://osm.org";
   } else {

-    return "";     
+    return "";

   }
 }
 
   }
 }
 


@@ -198,43 +165,57 @@ function getStyle(el, property) {
  * rails and then later by javascript.
  */
 function i18n(string, keys) {
  * rails and then later by javascript.
  */
 function i18n(string, keys) {

+  string = i18n_strings[string] || string
+

   for (var key in keys) {
     var re_key = '\\[\\[' + key + '\\]\\]';
     var re = new RegExp(re_key, "g");
   for (var key in keys) {
     var re_key = '\\[\\[' + key + '\\]\\]';
     var re = new RegExp(re_key, "g");

-      
+

     string = string.replace(re, keys[key]);
   }
     string = string.replace(re, keys[key]);
   }

-   
+

   return string;
   return string;

-} 
+}

 
 

+/*
+ * Called to interlace the bits in x and y, making a Morton code.
+ */
+function interlace(x, y) {
+    x = (x | (x << 8)) & 0x00ff00ff;
+    x = (x | (x << 4)) & 0x0f0f0f0f;
+    x = (x | (x << 2)) & 0x33333333;
+    x = (x | (x << 1)) & 0x55555555;
+
+    y = (y | (y << 8)) & 0x00ff00ff;
+    y = (y | (y << 4)) & 0x0f0f0f0f;
+    y = (y | (y << 2)) & 0x33333333;
+    y = (y | (y << 1)) & 0x55555555;
+
+    return (x << 1) | y;
+}
+
+/*
+ * Called to create a short code for the short link.
+ */

 function makeShortCode(lat, lon, zoom) {
     char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_@";
     var x = Math.round((lon + 180.0) * ((1 << 30) / 90.0));
     var y = Math.round((lat +  90.0) * ((1 << 30) / 45.0));
 function makeShortCode(lat, lon, zoom) {
     char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_@";
     var x = Math.round((lon + 180.0) * ((1 << 30) / 90.0));
     var y = Math.round((lat +  90.0) * ((1 << 30) / 45.0));

-    // hack around the fact that JS apparently only allows 53-bit integers?!?
-    // note that, although this reduces the accuracy of the process, it's fine for
-    // z18 so we don't need to care for now.
-    var c1 = 0, c2 = 0;
-    for (var i = 31; i > 16; --i) {
-       c1 = (c1 << 1) | ((x >> i) & 1);
-       c1 = (c1 << 1) | ((y >> i) & 1);
-    }
-    for (var i = 16; i > 1; --i) {
-       c2 = (c2 << 1) | ((x >> i) & 1);
-       c2 = (c2 << 1) | ((y >> i) & 1);
-    }
+    // JavaScript only has to keep 32 bits of bitwise operators, so this has to be
+    // done in two parts. each of the parts c1/c2 has 30 bits of the total in it
+    // and drops the last 4 bits of the full 64 bit Morton code.

     var str = "";
     var str = "";

+    var c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff);

     for (var i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
     for (var i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {

-       digit = (c1 >> (24 - 6 * i)) & 0x3f;
-       str += char_array.charAt(digit);
+        digit = (c1 >> (24 - 6 * i)) & 0x3f;
+        str += char_array.charAt(digit);

     }
     for (var i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) {
     }
     for (var i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) {

-       digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f;
-       str += char_array.charAt(digit);
+        digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f;
+        str += char_array.charAt(digit);

     }
     for (var i = 0; i < ((zoom + 8) % 3); ++i) {
     }
     for (var i = 0; i < ((zoom + 8) % 3); ++i) {

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

     }
     return str;
 }
     }
     return str;
 }