Merge remote-tracking branch 'upstream/pull/5643'

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index a984a23f97fc7c5e2ede1f183e8d5337325294b3..2e13f69671bec7253adbe5c98887a33c105d7725 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,237 +1,147 @@
-//= require jquery
+//= require jquery3

 //= require jquery_ujs
 //= require jquery_ujs

-//= require jquery.timers
-//= require jquery.cookie
-//= require augment
-//= require leaflet
+//= require jquery.throttle-debounce
+//= require js-cookie/dist/js.cookie
+//= require popper
+//= require bootstrap-sprockets
+//= require osm
+//= require leaflet/dist/leaflet-src

 //= require leaflet.osm
 //= require leaflet.osm

+//= require leaflet.map
+//= require leaflet.zoom

 //= require leaflet.locationfilter
 //= require leaflet.locationfilter

-//= require leaflet.locate
-//= require leaflet.note
-//= require i18n/translations
+//= require i18n

 //= require oauth
 //= require oauth

-//= require osm
-//= require piwik
-//= require map
-//= require menu
-//= require sidebar
-//= require leaflet.share
+//= require matomo

 //= require richtext
 //= require richtext

-//= require resize
-//= require geocoder

 
 

-function zoomPrecision(zoom) {
-    var decimals = Math.pow(10, Math.floor(zoom/3));
-    return function(x) {
-         return Math.round(x * decimals) / decimals;
-    };
-}
+{
+  const application_data = $("head").data();
+
+  I18n.default_locale = OSM.DEFAULT_LOCALE;
+  I18n.locale = application_data.locale;
+  I18n.fallbacks = true;
+
+  OSM.preferred_editor = application_data.preferredEditor;
+  OSM.preferred_languages = application_data.preferredLanguages;
+
+  if (application_data.user) {
+    OSM.user = application_data.user;

 
 

-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]));
+    if (application_data.userHome) {
+      OSM.home = application_data.userHome;
+    }
+  }
+
+  if (application_data.location) {
+    OSM.location = application_data.location;
+  }

 }
 
 /*
 }
 
 /*

- * Called as the user scrolls/zooms around to maniplate hrefs of the
+ * Called as the user scrolls/zooms around to manipulate hrefs of the

  * view tab and various other links
  */
  * 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 args = getArgs(link.href);
-
-    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
-      });
+window.updateLinks = function (loc, zoom, layers, object) {
+  $(".geolink").each(function (index, link) {
+    let href = link.href.split(/[?#]/)[0];
+    const queryArgs = new URLSearchParams(link.search),
+          editlink = $(link).hasClass("editlink");
+
+    for (const arg of ["node", "way", "relation", "changeset", "note"]) {
+      queryArgs.delete(arg);

     }
 
     }
 

-    if (layers && $(link).hasClass("layers")) {
-      args.layers = layers;
+    if (object && editlink) {
+      queryArgs.set(object.type, object.id);

     }
 
     }
 

-    if (object && $(link).hasClass("object")) {
-      args[object.type] = object.id;
-    }
-
-    var minzoom = $(link).data("minzoom");
-    if (minzoom) {
-        var name = link.id.replace(/anchor$/, "");
+    const query = queryArgs.toString();
+    if (query) href += "?" + query;

 
 

-        $(link).off("click.minzoom");
+    const hashArgs = {
+      lat: loc.lat,
+      lon: "lon" in loc ? 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 && !editlink) {
+      hashArgs.layers = layers;

     }
 
     }
 

-    link.href = setArgs(link.href, args);
-  }
+    href += OSM.formatHash(hashArgs);

 
 

+    link.href = href;
+  });

 
 

-  function setShortlink() {
-    var args = getArgs(this.href);
-    var code = makeShortCode(lat, lon, zoom);
-    var prefix = shortlinkPrefix();
+  // Disable the button group and also the buttons to avoid
+  // inconsistent behaviour when zooming
+  var editDisabled = zoom < 13;
+  $("#edit_tab")
+    .tooltip({ placement: "bottom" })
+    .tooltip(editDisabled ? "enable" : "disable")
+    .toggleClass("disabled", editDisabled)
+    .find("a")
+    .toggleClass("disabled", editDisabled);
+};

 
 

-    // Add ?{node,way,relation}=id to the arguments
-    if (object) {
-      args[object.type] = object.id;
-    }
+$(document).ready(function () {
+  // NB: Turns Turbo Drive off by default. Turbo Drive must be opt-in on a per-link and per-form basis
+  // See https://turbo.hotwired.dev/reference/drive#turbo.session.drive
+  Turbo.session.drive = false;

 
 

-    // This is a hack to omit the default mapnik layer from the shortlink.
-    if (layers && layers != "M") {
-      args.layers = layers;
-    } else {
-      delete args.layers;
-    }
+  var headerWidth = 0,
+      compactWidth = 0;
+
+  function updateHeader() {
+    var windowWidth = $(window).width();

 
 

-    // 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 = setArgs(prefix + "/go/" + code, args);
+    if (windowWidth < compactWidth) {
+      $("body").removeClass("compact-nav").addClass("small-nav");
+    } else if (windowWidth < headerWidth) {
+      $("body").addClass("compact-nav").removeClass("small-nav");

     } else {
     } else {

-      this.href = prefix + "/go/" + code;
+      $("body").removeClass("compact-nav").removeClass("small-nav");

     }
   }
     }
   }

-}

 
 

-function minZoomAlert() {
-    alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false;
-}
+  /*
+   * Chrome 60 and later seem to fire the "ready" callback
+   * before the DOM is fully ready causing us to measure the
+   * wrong sizes for the header elements - use a 0ms timeout
+   * to defer the measurement slightly as a workaround.
+   */
+  setTimeout(function () {
+    $("header").children(":visible").each(function (i, e) {
+      headerWidth += $(e).outerWidth();
+    });

 
 

-/*
- * 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 "";
-  }
-}
+    $("body").addClass("compact-nav");

 
 

-/*
- * Called to get the arguments from a URL as a hash.
- */
-function getArgs(url) {
-  var args = {};
-  var querystart = url.indexOf("?");
-
-  if (querystart >= 0) {
-     var querystring = url.substring(querystart + 1);
-     var queryitems = querystring.split("&");
-
-     for (var i = 0; i < queryitems.length; i++) {
-        if (match = queryitems[i].match(/^(.*)=(.*)$/)) {
-           args[unescape(match[1])] = unescape(match[2]);
-        } else {
-           args[unescape(queryitems[i])] = null;
-        }
-     }
-  }
+    $("header").children(":visible").each(function (i, e) {
+      compactWidth += $(e).outerWidth();
+    });

 
 

-  return args;
-}
+    $("body").removeClass("compact-nav");

 
 

-/*
- * Called to set the arguments on a URL from the given hash.
- */
-function setArgs(url, args) {
-   var queryitems = [];
-
-   for (arg in args) {
-      if (args[arg] == null) {
-         queryitems.push(escape(arg));
-      } else {
-         queryitems.push(escape(arg) + "=" + escape(args[arg]));
-      }
-   }
-
-   return url.replace(/\?.*$/, "") + "?" + queryitems.join("&");
-}
+    $("header").removeClass("text-nowrap");
+    $("header nav.secondary > ul").removeClass("flex-nowrap");

 
 

-/*
- * 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;
-}
+    updateHeader();

 
 

-/*
- * 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;
-}
+    $(window).resize(updateHeader);
+    $(document).on("turbo:render", updateHeader);
+  }, 0);

 
 

-/*
- * Forms which have been cached by rails may have he 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 (e) {
+    e.preventDefault();
+    $("header").toggleClass("closed");
+  });
+
+  $("nav.primary li a").on("click", function () {
+    $("header").toggleClass("closed");
+  });
+
+  $("#edit_tab")
+    .attr("title", I18n.t("javascripts.site.edit_disabled_tooltip"));

 });
 });