Detabify and tidy up some more of the bugs code

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

diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index b6566fa810aea39da85fb4a61de998e37cf30ec6..840617e175e8201ba3749ec15bcc048eb852214a 100644 (file)
--- a/public/javascripts/site.js
+++ b/public/javascripts/site.js
@@ -9,7 +9,7 @@ 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");
+  node = $("permalinkanchor");

   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;
   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;


@@ -24,7 +24,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     node.href = setArgs(node.href, args);
   }
 
     node.href = setArgs(node.href, args);
   }
 

-  node = document.getElementById("viewanchor");
+  node = $("viewanchor");

   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;
   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;


@@ -36,7 +36,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     node.href = setArgs(node.href, args);
   }
 
     node.href = setArgs(node.href, args);
   }
 

-  node = document.getElementById("exportanchor");
+  node = $("exportanchor");

   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;
   if (node) {
     var args = getArgs(node.href);
     args["lat"] = lat;


@@ -48,7 +48,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     node.href = setArgs(node.href, args);
   }
 
     node.href = setArgs(node.href, args);
   }
 

-  node = document.getElementById("editanchor");
+  node = $("editanchor");

   if (node) {
     if (zoom >= 13) {
       var args = new Object();
   if (node) {
     if (zoom >= 13) {
       var args = new Object();


@@ -59,22 +59,63 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
         args[objtype] = objid;
       }
       node.href = setArgs("/edit", args);
         args[objtype] = objid;
       }
       node.href = setArgs("/edit", args);

-      node.style.fontStyle = 'normal';
+      node.title = i18n("javascripts.site.edit_tooltip");
+      node.removeClassName("disabled");

     } else {
     } else {

-      node.href = 'javascript:alert("zoom in to edit map");';
-      node.style.fontStyle = 'italic';
+      node.href = 'javascript:alert(i18n("javascripts.site.edit_zoom_alert"));';
+      node.title = i18n("javascripts.site.edit_disabled_tooltip");
+      node.addClassName("disabled");

     }
   }
 
     }
   }
 

-  node = document.getElementById("historyanchor");
+  node = $("potlatchanchor");
+  if (node) {
+    var args = new Object();
+    args.editor = "potlatch";
+    args.lat = lat;
+    args.lon = lon;
+    args.zoom = zoom;
+    if (objtype && objid) {
+      args[objtype] = objid;
+    }
+    node.href = setArgs("/edit", args);
+  }
+
+  node = $("potlatch2anchor");
+  if (node) {
+    var args = new Object();
+    args.editor = "potlatch2";
+    args.lat = lat;
+    args.lon = lon;
+    args.zoom = zoom;
+    if (objtype && objid) {
+      args[objtype] = objid;
+    }
+    node.href = setArgs("/edit", args);
+  }
+
+  node = $("josmanchor");
+  if (node) {
+    var args = new Object();
+    args.editor = "josm";
+    args.lat = lat;
+    args.lon = lon;
+    args.zoom = zoom;
+    if (objtype && objid) {
+      args[objtype] = objid;
+    }
+    node.href = setArgs("/edit", args);
+  }
+
+  node = $("historyanchor");

   if (node) {
     if (zoom >= 11) {
       var args = new Object();
       //set bbox param from 'extents' object
       if (typeof minlon == "number" &&
   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") {
+          typeof minlat == "number" &&
+          typeof maxlon == "number" &&
+          typeof maxlat == "number") {

 
         minlon = Math.round(minlon * decimals) / decimals;
         minlat = Math.round(minlat * decimals) / decimals;
 
         minlon = Math.round(minlon * decimals) / decimals;
         minlat = Math.round(minlat * decimals) / decimals;


@@ -84,14 +125,16 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
       }
 
       node.href = setArgs("/history", args);
       }
 
       node.href = setArgs("/history", args);

-      node.style.fontStyle = 'normal';
+      node.title = i18n("javascripts.site.history_tooltip");
+      node.removeClassName("disabled");

     } else {
     } else {

-      node.href = 'javascript:alert("zoom in to see editing history");';
-      node.style.fontStyle = 'italic';
+      node.href = 'javascript:alert(i18n("javascripts.site.history_zoom_alert"));';
+      node.title = i18n("javascripts.site.history_disabled_tooltip");
+      node.addClassName("disabled");

     }
   }
 
     }
   }
 

-  node = document.getElementById("shortlinkanchor");
+  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,10 +145,8 @@ 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;
     }
     else {
       args["layers"] = layers;
     }
     else {


@@ -201,6 +242,8 @@ 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");


@@ -211,33 +254,45 @@ function i18n(string, keys) {
   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;
 }