X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cea0cccc6d73d7543d80d659b0f221f0d3196c0e..2ac8b4b76057c293fc93f492359933db87abfc59:/app/assets/javascripts/application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 2b8bc5d26..354cfe66e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,91 +9,51 @@
 //= require osm
 //= require leaflet
 //= require leaflet.osm
-//= require leaflet.hash
+//= require leaflet.map
 //= require leaflet.zoom
-//= require leaflet.extend
 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
 //= require piwik
-//= require map
-//= require sidebar
 //= require richtext
-//= require geocoder
 //= require querystring
 
 var querystring = require('querystring-component');
 
-function zoomPrecision(zoom) {
-    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 = {
-          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;
-
-  var iframe = $('<iframe>')
-    .hide()
-    .appendTo('body')
-    .attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify(query))
-    .on('load', function() {
-      $(this).remove();
-      loaded = true;
-    });
-
-  setTimeout(function () {
-    if (!loaded) {
-      alert(I18n.t('site.index.remote_failed'));
-      iframe.remove();
-    }
-  }, 1000);
-
-  return false;
-}
-
 /*
  * 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) {
+window.updateLinks = function (loc, zoom, layers, object) {
   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],
-        args = querystring.parse(link.search.substring(1));
+      args = querystring.parse(link.search.substring(1)),
+      editlink = $(link).hasClass("editlink");
 
-    if (bounds && $(link).hasClass("bbox")) args.bbox = normalBounds(bounds).toBBoxString();
-    if (object && $(link).hasClass("object")) args[object.type] = object.id;
+    delete args.node;
+    delete args.way;
+    delete args.relation;
+    delete args.changeset;
+
+    if (object && editlink) {
+      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
-      };
+    args = {
+      lat: loc.lat,
+      lon: 'lon' in loc ? loc.lon : loc.lng,
+      zoom: zoom
+    };
 
-      if (layers && $(link).hasClass("layers")) {
-        args.layers = layers;
-      }
-
-      href += OSM.formatHash(args);
+    if (layers && !editlink) {
+      args.layers = layers;
     }
 
+    href += OSM.formatHash(args);
+
     link.href = href;
   });
 
@@ -105,42 +65,23 @@ function updatelinks(loc, zoom, layers, bounds, object) {
     .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') : '');
-}
+window.maximiseMap = function () {
+  $("#content").addClass("maximised");
+};
 
-// 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('|');
-}
+window.minimiseMap = function () {
+  $("#content").removeClass("maximised");
+};
 
-function escapeHTML(string) {
-  var htmlEscapes = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#x27;'
-  };
-  return string == null ? '' : (string + '').replace(/[&<>"']/g, function(match) {
-      return htmlEscapes[match];
+$(document).ready(function () {
+  $("#menu-icon").on("click", function(e) {
+    e.preventDefault();
+    $("header").toggleClass("closed");
   });
-}
 
-/*
- * Forms which have been cached by rails may have the wrong
- * authenticity token, so patch up any forms with the correct
- * token taken from the page header.
- */
-$(document).ready(function () {
-  var auth_token = $("meta[name=csrf-token]").attr("content");
-  $("form input[name=authenticity_token]").val(auth_token);
+  $("nav.primary li a").on("click", function() {
+    $("header").toggleClass("closed");
+  });
 });