X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5fc7a47f6daf5c05da31794b6ba5a7c7dfd0c931..286bffa3dba448f4364c6798f35003d8c6eefc4a:/app/assets/javascripts/application.js?ds=inline

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index eb338aa93..83c17b6ec 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -2,195 +2,140 @@
 //= require jquery_ujs
 //= require jquery.timers
 //= require jquery.cookie
+//= require jquery.throttle-debounce
+//= require bootstrap.tooltip
+//= require bootstrap.dropdown
 //= require augment
+//= require osm
 //= require leaflet
 //= require leaflet.osm
+//= require leaflet.hash
+//= require leaflet.zoom
+//= require leaflet.extend
 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
-//= require osm
 //= require piwik
 //= require map
-//= require menu
-//= require sidebar
 //= require richtext
-//= require resize
-//= 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));
-    return function(x) {
-         return Math.round(x * decimals) / decimals;
-    };
+    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) {
-  var toPrecision = zoomPrecision(zoom);
-  bounds = normalBounds(bounds);
-  var node;
-
-  var lat = toPrecision(loc.lat),
-      lon = toPrecision(loc.lon || loc.lng);
-
-  if (bounds) {
-    var minlon = toPrecision(bounds.getWest()),
-        minlat = toPrecision(bounds.getSouth()),
-        maxlon = toPrecision(bounds.getEast()),
-        maxlat = toPrecision(bounds.getNorth());
-  }
-
-  $(".geolink").each(setGeolink);
-  $("#shortlinkanchor").each(setShortlink);
-
-  function setGeolink(index, link) {
-    var base = link.href.split('?')[0];
-    var qs = link.href.split('?')[1];
-    var args = querystring.parse(qs);
-
-    if ($(link).hasClass("llz")) {
-      $.extend(args, {
-          lat: '' + lat,
-          lon: '' + lon,
-          zoom: '' + zoom
-      });
-    } else if (minlon && $(link).hasClass("bbox")) {
-      $.extend(args, {
-          bbox: minlon + "," + minlat + "," + maxlon + "," + maxlat
-      });
-    }
+function updatelinks(loc, zoom, layers, object) {
+  $(".geolink").each(function(index, link) {
+    var href = link.href.split(/[?#]/)[0],
+        args = querystring.parse(link.search.substring(1));
 
-    if (layers && $(link).hasClass("layers")) args.layers = layers;
     if (object && $(link).hasClass("object")) args[object.type] = object.id;
 
-    var minzoom = $(link).data("minzoom");
-    if (minzoom) {
-        var name = link.id.replace(/anchor$/, "");
+    var query = querystring.stringify(args);
+    if (query) href += '?' + query;
 
-        $(link).off("click.minzoom");
+    args = {
+      lat: loc.lat,
+      lon: loc.lon || loc.lng,
+      zoom: zoom
+    };
 
-        if (zoom >= minzoom) {
-          $(link).attr("title", I18n.t("javascripts.site." + name + "_tooltip"))
-              .removeClass("disabled");
-        } else {
-          $(link).on("click.minzoom", minZoomAlert)
-              .attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip"))
-              .addClass("disabled");
-        }
+    if (layers && $(link).hasClass("layers")) {
+      args.layers = layers;
     }
 
-    link.href = base + '?' + querystring.stringify(args);
-  }
-
-
-  function setShortlink() {
-    var base = link.href.split('?')[0],
-        qs = link.href.split('?')[1],
-        args = querystring.parse(qs),
-        code = makeShortCode(lat, lon, zoom),
-        prefix = shortlinkPrefix();
+    href += OSM.formatHash(args);
 
-    // Add ?{node,way,relation}=id to the arguments
-    if (object) {
-      args[object.type] = object.id;
-    }
-
-    // This is a hack to omit the default mapnik layer from the shortlink.
-    if (layers && layers != "M") {
-      args.layers = layers;
-    } else {
-      delete args.layers;
-    }
+    link.href = href;
+  });
 
-    // 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 || object) {
-      this.href = prefix + "/go/" + code + '?' + querystring.stringify(args);
-    } else {
-      this.href = prefix + "/go/" + code;
-    }
-  }
+  var editDisabled = zoom < 13;
+  $('#edit_tab')
+    .tooltip({placement: 'bottom'})
+    .off('click.minzoom')
+    .on('click.minzoom', function() { return !editDisabled; })
+    .toggleClass('disabled', editDisabled)
+    .attr('data-original-title', editDisabled ?
+      I18n.t('javascripts.site.edit_disabled_tooltip') : '');
 }
 
-function minZoomAlert() {
-    alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false;
+// 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('|');
 }
 
-/*
- * Get the URL prefix to use for a short link
- */
-function shortlinkPrefix() {
-  if (window.location.hostname.match(/^www\.openstreetmap\.org/i)) {
-    return "http://osm.org";
-  } else {
-    return "";
-  }
+function escapeHTML(string) {
+  var htmlEscapes = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#x27;'
+  };
+  return string == null ? '' : (string + '').replace(/[&<>"']/g, function(match) {
+      return htmlEscapes[match];
+  });
 }
 
-/*
- * 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;
+function maximiseMap() {
+  $("#content").addClass("maximised");
 }
 
-/*
- * 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));
-    // 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 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) {
-        digit = (c1 >> (24 - 6 * i)) & 0x3f;
-        str += char_array.charAt(digit);
-    }
-    for (var i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) {
-        digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f;
-        str += char_array.charAt(digit);
-    }
-    for (var i = 0; i < ((zoom + 8) % 3); ++i) {
-        str += "-";
-    }
-    return str;
+function minimiseMap() {
+  $("#content").removeClass("maximised");
 }
 
 /*
- * Forms which have been cached by rails may have he wrong
+ * 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);
+
+  $("#menu-icon").on("click", function() {
+    $("header").toggleClass("closed");
+  });
+
+  $("nav.primary li a").on("click", function() {
+    $("header").toggleClass("closed");
+  });
 });