Record time of closure of a bug.

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

diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index c509fc5eff6947b54be040c63144c621b4046ffb..c17500f571701c9ebb5fff2ec317db5bf7eba09a 100644 (file)
--- a/public/javascripts/site.js
+++ b/public/javascripts/site.js
@@ -1,3 +1,4 @@
+

 /*
  * 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


@@ -55,14 +56,19 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
       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.href = setArgs("/edit", args);

+      node.title = i18n("javascripts.site.edit_tooltip");

       node.style.fontStyle = 'normal';
     } else {
       node.style.fontStyle = 'normal';
     } else {

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

       node.style.fontStyle = 'italic';
     }
   }
       node.style.fontStyle = 'italic';
     }
   }

-  
+

   node = document.getElementById("historyanchor");
   if (node) {
     if (zoom >= 11) {
   node = document.getElementById("historyanchor");
   if (node) {
     if (zoom >= 11) {


@@ -72,18 +78,20 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
          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;
         maxlon = Math.round(maxlon * decimals) / decimals;
         maxlat = Math.round(maxlat * decimals) / decimals;
         args.bbox = minlon + "," + minlat + "," + maxlon + "," + maxlat;
       }
         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.href = setArgs("/history", args);

+      node.title = i18n("javascripts.site.history_tooltip");

       node.style.fontStyle = 'normal';
     } else {
       node.style.fontStyle = 'normal';
     } else {

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

       node.style.fontStyle = 'italic';
     }
   }
       node.style.fontStyle = 'italic';
     }
   }


@@ -99,10 +107,21 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
       args[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")) {
+    // 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;

+    }
+    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 = prefix + "/go/" + code;
       node.href = setArgs(prefix + "/go/" + code, args);
     } else {
       node.href = prefix + "/go/" + code;


@@ -117,7 +136,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 "";

   }
 }
 
   }
 }
 


@@ -187,15 +206,17 @@ 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;

-} 
+}

 
 function makeShortCode(lat, lon, zoom) {
     char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_@";
 
 function makeShortCode(lat, lon, zoom) {
     char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_@";


@@ -223,7 +244,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;
 }