pushState based navigation between map-based layouts

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 2b8bc5d26cb0d1ddf12db5ce5849eeaed11e1832..c2397664134deb7e8bc432fbcad32dbf7b61a93a 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -17,7 +17,6 @@
 //= require oauth
 //= require piwik
 //= require map
 //= require oauth
 //= require piwik
 //= require map

-//= require sidebar

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


@@ -28,13 +27,6 @@ function zoomPrecision(zoom) {
     return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
 }
 
     return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
 }
 

-function normalBounds(bounds) {
-    if (bounds instanceof L.LatLngBounds) return bounds;
-    return new L.LatLngBounds(
-        new L.LatLng(bounds[0][0], bounds[0][1]),
-        new L.LatLng(bounds[1][0], bounds[1][1]));
-}
-

 function remoteEditHandler(bbox, select) {
   var loaded = false,
       query = {
 function remoteEditHandler(bbox, select) {
   var loaded = false,
       query = {


@@ -69,31 +61,28 @@ function remoteEditHandler(bbox, select) {
  * 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
  */

-function updatelinks(loc, zoom, layers, bounds, object) {
+function updatelinks(loc, zoom, layers, object) {

   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],
         args = querystring.parse(link.search.substring(1));
 
   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],
         args = querystring.parse(link.search.substring(1));
 

-    if (bounds && $(link).hasClass("bbox")) args.bbox = normalBounds(bounds).toBBoxString();

     if (object && $(link).hasClass("object")) args[object.type] = object.id;
 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
 
     if (object && $(link).hasClass("object")) args[object.type] = object.id;
 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
 

-    if ($(link).hasClass("llz")) {
-      args = {
-        lat: loc.lat,
-        lon: loc.lon || loc.lng,
-        zoom: zoom
-      };
-
-      if (layers && $(link).hasClass("layers")) {
-        args.layers = layers;
-      }
+    args = {
+      lat: loc.lat,
+      lon: loc.lon || loc.lng,
+      zoom: zoom
+    };

 
 

-      href += OSM.formatHash(args);
+    if (layers && $(link).hasClass("layers")) {
+      args.layers = layers;

     }
 
     }
 

+    href += OSM.formatHash(args);
+

     link.href = href;
   });
 
     link.href = href;
   });
 


@@ -105,15 +94,6 @@ function updatelinks(loc, zoom, layers, bounds, object) {
     .toggleClass('disabled', editDisabled)
     .attr('data-original-title', editDisabled ?
       I18n.t('javascripts.site.edit_disabled_tooltip') : '');
     .toggleClass('disabled', editDisabled)
     .attr('data-original-title', editDisabled ?
       I18n.t('javascripts.site.edit_disabled_tooltip') : '');

-
-  var historyDisabled = zoom < 11;
-  $('#history_tab')
-    .tooltip({placement: 'bottom'})
-    .off('click.minzoom')
-    .on('click.minzoom', function() { return !historyDisabled; })
-    .toggleClass('disabled', historyDisabled)
-    .attr('data-original-title', historyDisabled ?
-      I18n.t('javascripts.site.history_disabled_tooltip') : '');

 }
 
 // generate a cookie-safe string of map state
 }
 
 // generate a cookie-safe string of map state


@@ -135,6 +115,14 @@ function escapeHTML(string) {
   });
 }
 
   });
 }
 

+function maximiseMap() {
+  $("#content").addClass("maximised");
+}
+
+function minimiseMap() {
+  $("#content").removeClass("maximised");
+}
+

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