Simplify sidebar/resize

[rails.git] / app / assets / javascripts / application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 808f30e925c626b205acf5c943e898402f0def97..336d3eab0b1689b3c04409f05cffa6263bb246a6 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -5,6 +5,8 @@
 //= require augment
 //= require leaflet
 //= require leaflet.osm
 //= require augment
 //= require leaflet
 //= require leaflet.osm

+//= require leaflet.zoom
+//= require leaflet.extend

 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth


@@ -14,11 +16,10 @@
 //= require menu
 //= require sidebar
 //= require richtext
 //= require menu
 //= require sidebar
 //= require richtext

-//= require resize

 //= require geocoder
 //= require querystring
 
 //= require geocoder
 //= require querystring
 

-var querystring = require('querystring');
+var querystring = require('querystring-component');

 
 function zoomPrecision(zoom) {
     var decimals = Math.pow(10, Math.floor(zoom/3));
 
 function zoomPrecision(zoom) {
     var decimals = Math.pow(10, Math.floor(zoom/3));


@@ -34,6 +35,27 @@ function normalBounds(bounds) {
         new L.LatLng(bounds[1][0], bounds[1][1]));
 }
 
         new L.LatLng(bounds[1][0], bounds[1][1]));
 }
 

+function remoteEditHandler(bbox, select) {
+  var loaded = false,
+      query = {
+          left: bbox.getWest() - 0.0001,
+          top: bbox.getNorth() + 0.0001,
+          right: bbox.getEast() + 0.0001,
+          bottom: bbox.getSouth() - 0.0001
+      };
+
+  if (select) query.select = select;
+  $("#linkloader")
+    .attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify(query))
+    .load(function() { loaded = true; });
+
+  setTimeout(function () {
+    if (!loaded) alert(I18n.t('site.index.remote_failed'));
+  }, 1000);
+
+  return false;
+}
+

 /*
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
 /*
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links


@@ -62,9 +84,9 @@ function updatelinks(loc, zoom, layers, bounds, object) {
 
     if ($(link).hasClass("llz")) {
       $.extend(args, {
 
     if ($(link).hasClass("llz")) {
       $.extend(args, {

-          lat: '' + lat,
-          lon: '' + lon,
-          zoom: '' + zoom
+          lat: lat,
+          lon: lon,
+          zoom: zoom

       });
     } else if (minlon && $(link).hasClass("bbox")) {
       $.extend(args, {
       });
     } else if (minlon && $(link).hasClass("bbox")) {
       $.extend(args, {


@@ -78,9 +100,7 @@ function updatelinks(loc, zoom, layers, bounds, object) {
     var minzoom = $(link).data("minzoom");
     if (minzoom) {
         var name = link.id.replace(/anchor$/, "");
     var minzoom = $(link).data("minzoom");
     if (minzoom) {
         var name = link.id.replace(/anchor$/, "");

-

         $(link).off("click.minzoom");
         $(link).off("click.minzoom");

-

         if (zoom >= minzoom) {
           $(link).attr("title", I18n.t("javascripts.site." + name + "_tooltip"))
               .removeClass("disabled");
         if (zoom >= minzoom) {
           $(link).attr("title", I18n.t("javascripts.site." + name + "_tooltip"))
               .removeClass("disabled");


@@ -94,27 +114,38 @@ function updatelinks(loc, zoom, layers, bounds, object) {
   }
 }
 
   }
 }
 

+function minZoomAlert() {
+    alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false;
+}
+

 function getShortUrl(map) {
   return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
 function getShortUrl(map) {
   return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ?

-          'http://osm.org/go/' : '/go/') +
+          'http://osm.org/go/' : 'http://' + window.location.hostname + '/go/') +

           makeShortCode(map);
 }
 
           makeShortCode(map);
 }
 

-function minZoomAlert() {
-    alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false;
+function getUrl(map) {
+  var center = map.getCenter(),
+      zoom = map.getZoom(),
+      toZoom = zoomPrecision(zoom);
+
+  return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
+          'http://openstreetmap.org/?' : 'http://' + window.location.hostname + '/?') +
+        querystring.stringify({
+            lat: toZoom(center.lat),
+            lon: toZoom(center.lng),
+            zoom: zoom,
+            layers: map.getLayersCode()
+        });

 }
 
 }
 

-/*
- * Called to create a short code for the short link.
- */
+// Called to create a short code for the short link.

 function makeShortCode(map) {
 function makeShortCode(map) {

-    var lon = map.getCenter().lng,
-        lat = map.getCenter().lat,
-        zoom = map.getZoom(),
+    var zoom = map.getZoom(),

         str = '',
         char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~",
         str = '',
         char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~",

-        x = Math.round((lon + 180.0) * ((1 << 30) / 90.0)),
-        y = Math.round((lat +  90.0) * ((1 << 30) / 45.0)),
+        x = Math.round((map.getCenter().lng + 180.0) * ((1 << 30) / 90.0)),
+        y = Math.round((map.getCenter().lat +  90.0) * ((1 << 30) / 45.0)),

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


@@ -130,9 +161,7 @@ function makeShortCode(map) {
     }
     for (i = 0; i < ((zoom + 8) % 3); ++i) str += "-";
 
     }
     for (i = 0; i < ((zoom + 8) % 3); ++i) str += "-";
 

-    /*
-     * Called to interlace the bits in x and y, making a Morton code.
-     */
+    // 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;
     function interlace(x, y) {
         x = (x | (x << 8)) & 0x00ff00ff;
         x = (x | (x << 4)) & 0x0f0f0f0f;


@@ -148,6 +177,12 @@ function makeShortCode(map) {
     return str;
 }
 
     return str;
 }
 

+// generate a cookie-safe string of map state
+function cookieContent(map) {
+  var center = map.getCenter().wrap();
+  return [center.lng, center.lat, map.getZoom(), map.getLayersCode()].join('|');
+}
+

 /*
  * Forms which have been cached by rails may have the wrong
  * authenticity token, so patch up any forms with the correct
 /*
  * Forms which have been cached by rails may have the wrong
  * authenticity token, so patch up any forms with the correct