Merge pull request #3581 from harry-wood/discourage-note-report

[rails.git] / app / assets / javascripts / leaflet.share.js

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 92f6cd881f8264e7e9a980963257e060adbb8e11..1817e71ccd03d2b759618cf3dd576e3f08cf69d3 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -1,10 +1,10 @@
 L.OSM.share = function (options) {
   var control = L.control(options),
 L.OSM.share = function (options) {
   var control = L.control(options),

-    marker = L.marker([0, 0], {draggable: true}),
-    locationFilter = new L.LocationFilter({
-      enableButton: false,
-      adjustButton: false
-    });
+      marker = L.marker([0, 0], { draggable: true }),
+      locationFilter = new L.LocationFilter({
+        enableButton: false,
+        adjustButton: false
+      });

 
   control.onAdd = function (map) {
     var $container = $("<div>")
 
   control.onAdd = function (map) {
     var $container = $("<div>")


@@ -25,9 +25,8 @@ L.OSM.share = function (options) {
       .attr("class", "sidebar_heading")
       .appendTo($ui)
       .append(
       .attr("class", "sidebar_heading")
       .appendTo($ui)
       .append(

-        $("<span>")
-          .text(I18n.t("javascripts.close"))
-          .attr("class", "icon close")
+        $("<button type='button' class='btn-close float-end mt-1'>")
+          .attr("aria-label", I18n.t("javascripts.close"))

           .bind("click", toggle))
       .append(
         $("<h4>")
           .bind("click", toggle))
       .append(
         $("<h4>")


@@ -44,19 +43,20 @@ L.OSM.share = function (options) {
       .appendTo($linkSection);
 
     var $form = $("<form>")
       .appendTo($linkSection);
 
     var $form = $("<form>")

-      .attr("class", "standard-form")

       .appendTo($linkSection);
 
     $("<div>")
       .appendTo($linkSection);
 
     $("<div>")

-      .attr("class", "form-row")
+      .attr("class", "form-check mb-3")

       .appendTo($form)
       .append(
         $("<label>")
           .attr("for", "link_marker")
       .appendTo($form)
       .append(
         $("<label>")
           .attr("for", "link_marker")

+          .attr("class", "form-check-label")

           .append(
             $("<input>")
               .attr("id", "link_marker")
               .attr("type", "checkbox")
           .append(
             $("<input>")
               .attr("id", "link_marker")
               .attr("type", "checkbox")

+              .attr("class", "form-check-input")

               .bind("change", toggleMarker))
           .append(I18n.t("javascripts.share.include_marker")));
 
               .bind("change", toggleMarker))
           .append(I18n.t("javascripts.share.include_marker")));
 


@@ -76,7 +76,7 @@ L.OSM.share = function (options) {
         .attr("for", "embed_html")
         .attr("href", "#")
         .text(I18n.t("javascripts.share.embed")))
         .attr("for", "embed_html")
         .attr("href", "#")
         .text(I18n.t("javascripts.share.embed")))

-      .on("click", "a", function(e) {
+      .on("click", "a", function (e) {

         e.preventDefault();
         var id = "#" + $(this).attr("for");
         $linkSection.find(".share-tabs a")
         e.preventDefault();
         var id = "#" + $(this).attr("for");
         $linkSection.find(".share-tabs a")


@@ -91,7 +91,7 @@ L.OSM.share = function (options) {
       });
 
     $("<div>")
       });
 
     $("<div>")

-      .attr("class", "form-row share-tab")
+      .attr("class", "share-tab")

       .css("display", "block")
       .appendTo($form)
       .append($("<input>")
       .css("display", "block")
       .appendTo($form)
       .append($("<input>")


@@ -100,7 +100,7 @@ L.OSM.share = function (options) {
         .on("click", select));
 
     $("<div>")
         .on("click", select));
 
     $("<div>")

-      .attr("class", "form-row share-tab")
+      .attr("class", "share-tab")

       .appendTo($form)
       .append($("<input>")
         .attr("id", "short_input")
       .appendTo($form)
       .append($("<input>")
         .attr("id", "short_input")


@@ -108,7 +108,7 @@ L.OSM.share = function (options) {
         .on("click", select));
 
     $("<div>")
         .on("click", select));
 
     $("<div>")

-      .attr("class", "form-row share-tab")
+      .attr("class", "share-tab")

       .appendTo($form)
       .append(
         $("<textarea>")
       .appendTo($form)
       .append(
         $("<textarea>")


@@ -116,7 +116,7 @@ L.OSM.share = function (options) {
           .on("click", select))
       .append(
         $("<p>")
           .on("click", select))
       .append(
         $("<p>")

-          .attr("class", "deemphasize")
+          .attr("class", "text-muted")

           .text(I18n.t("javascripts.share.paste_html"))
           .appendTo($linkSection));
 
           .text(I18n.t("javascripts.share.paste_html"))
           .appendTo($linkSection));
 


@@ -147,32 +147,32 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("id", "export-warning")
 
     $("<div>")
       .attr("id", "export-warning")

-      .attr("class", "deemphasize")
+      .attr("class", "text-muted")

       .text(I18n.t("javascripts.share.only_standard_layer"))
       .appendTo($imageSection);
 
     $form = $("<form>")
       .attr("id", "export-image")
       .text(I18n.t("javascripts.share.only_standard_layer"))
       .appendTo($imageSection);
 
     $form = $("<form>")
       .attr("id", "export-image")

-      .attr("class", "standard-form")

       .attr("action", "/export/finish")
       .attr("method", "post")
       .appendTo($imageSection);
 
     $("<div>")
       .attr("action", "/export/finish")
       .attr("method", "post")
       .appendTo($imageSection);
 
     $("<div>")

-      .attr("class", "form-row")
+      .attr("class", "mb-3 form-check")

       .appendTo($form)
       .append(
         $("<label>")
           .attr("for", "image_filter")
       .appendTo($form)
       .append(
         $("<label>")
           .attr("for", "image_filter")

+          .attr("class", "form-check-label")

           .append(
             $("<input>")
               .attr("id", "image_filter")
               .attr("type", "checkbox")
           .append(
             $("<input>")
               .attr("id", "image_filter")
               .attr("type", "checkbox")

+              .attr("class", "form-check-input")

               .bind("change", toggleFilter))
           .append(I18n.t("javascripts.share.custom_dimensions")));
 
     $("<div>")
               .bind("change", toggleFilter))
           .append(I18n.t("javascripts.share.custom_dimensions")));
 
     $("<div>")

-      .attr("class", "form-row")

       .appendTo($form)
       .append(
         $("<label>")
       .appendTo($form)
       .append(
         $("<label>")


@@ -187,7 +187,6 @@ L.OSM.share = function (options) {
         .append($("<option>").val("pdf").text("PDF")));
 
     $("<div>")
         .append($("<option>").val("pdf").text("PDF")));
 
     $("<div>")

-      .attr("class", "form-row")

       .appendTo($form)
       .append($("<label>")
         .attr("for", "mapnik_scale")
       .appendTo($form)
       .append($("<label>")
         .attr("for", "mapnik_scale")


@@ -199,7 +198,7 @@ L.OSM.share = function (options) {
         .attr("type", "text")
         .on("change", update));
 
         .attr("type", "text")
         .on("change", update));
 

-    ["minlon", "minlat", "maxlon", "maxlat"].forEach(function(name) {
+    ["minlon", "minlat", "maxlon", "maxlat"].forEach(function (name) {

       $("<input>")
         .attr("id", "mapnik_" + name)
         .attr("name", name)
       $("<input>")
         .attr("id", "mapnik_" + name)
         .attr("name", name)


@@ -222,13 +221,19 @@ L.OSM.share = function (options) {
       .attr("type", "hidden")
       .appendTo($form);
 
       .attr("type", "hidden")
       .appendTo($form);
 

+    var args = {
+      width: "<span id=\"mapnik_image_width\"></span>",
+      height: "<span id=\"mapnik_image_height\"></span>"
+    };
+

     $("<p>")
     $("<p>")

-      .attr("class", "deemphasize")
-      .html(I18n.t("javascripts.share.image_size") + " <span id=\"mapnik_image_width\"></span> x <span id=\"mapnik_image_height\"></span>")
+      .attr("class", "text-muted")
+      .html(I18n.t("javascripts.share.image_dimensions", args))

       .appendTo($form);
 
     $("<input>")
       .attr("type", "submit")
       .appendTo($form);
 
     $("<input>")
       .attr("type", "submit")

+      .attr("class", "btn btn-primary")

       .attr("value", I18n.t("javascripts.share.download"))
       .appendTo($form);
 
       .attr("value", I18n.t("javascripts.share.download"))
       .appendTo($form);
 


@@ -313,7 +318,7 @@ L.OSM.share = function (options) {
         "\"": "&quot;",
         "'": "&#x27;"
       };
         "\"": "&quot;",
         "'": "&#x27;"
       };

-      return string === null ? "" : (string + "").replace(/[&<>"']/g, function(match) {
+      return string === null ? "" : String(string).replace(/[&<>"']/g, function (match) {

         return htmlEscapes[match];
       });
     }
         return htmlEscapes[match];
       });
     }


@@ -364,9 +369,9 @@ L.OSM.share = function (options) {
       }
 
       var scale = $("#mapnik_scale").val(),
       }
 
       var scale = $("#mapnik_scale").val(),

-        size = L.bounds(L.CRS.EPSG3857.project(bounds.getSouthWest()),
-                        L.CRS.EPSG3857.project(bounds.getNorthEast())).getSize(),
-        maxScale = Math.floor(Math.sqrt(size.x * size.y / 0.3136));
+          size = L.bounds(L.CRS.EPSG3857.project(bounds.getSouthWest()),
+                          L.CRS.EPSG3857.project(bounds.getNorthEast())).getSize(),
+          maxScale = Math.floor(Math.sqrt(size.x * size.y / 0.3136));

 
       $("#mapnik_minlon").val(bounds.getWest());
       $("#mapnik_minlat").val(bounds.getSouth());
 
       $("#mapnik_minlon").val(bounds.getWest());
       $("#mapnik_minlat").val(bounds.getSouth());


@@ -396,11 +401,11 @@ L.OSM.share = function (options) {
 
     function getScale() {
       var bounds = map.getBounds(),
 
     function getScale() {
       var bounds = map.getBounds(),

-        centerLat = bounds.getCenter().lat,
-        halfWorldMeters = 6378137 * Math.PI * Math.cos(centerLat * Math.PI / 180),
-        meters = halfWorldMeters * (bounds.getEast() - bounds.getWest()) / 180,
-        pixelsPerMeter = map.getSize().x / meters,
-        metersPerPixel = 1 / (92 * 39.3701);
+          centerLat = bounds.getCenter().lat,
+          halfWorldMeters = 6378137 * Math.PI * Math.cos(centerLat * Math.PI / 180),
+          meters = halfWorldMeters * (bounds.getEast() - bounds.getWest()) / 180,
+          pixelsPerMeter = map.getSize().x / meters,
+          metersPerPixel = 1 / (92 * 39.3701);

       return Math.round(1 / (pixelsPerMeter * metersPerPixel));
     }
 
       return Math.round(1 / (pixelsPerMeter * metersPerPixel));
     }