X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dbd88d893f3c3fce9cafd666b94396988646d81f..51d778097f031631a38236e7ab9a37f75a4580dc:/app/assets/javascripts/leaflet.layers.js?ds=sidebyside
diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index eedf718d3..1a34b05c2 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -1,55 +1,34 @@
-L.OSM.layers = function(options) {
- var control = L.control(options);
+L.OSM.layers = function (options) {
+ var control = L.OSM.sidebarPane(options, "layers", "javascripts.map.layers.title", "javascripts.map.layers.header");
- control.onAdd = function (map) {
+ control.onAddPane = function (map, button, $ui, toggle) {
var layers = options.layers;
- var $container = $('<div>')
- .attr('class', 'control-layers');
-
- var button = $('<a>')
- .attr('class', 'control-button')
- .attr('href', '#')
- .attr('title', I18n.t('javascripts.map.layers.title'))
- .html('<span class="icon layers"></span>')
- .on('click', toggle)
- .appendTo($container);
-
- var $ui = $('<div>')
- .attr('class', 'layers-ui');
-
- $('<div>')
- .attr('class', 'sidebar_heading')
- .appendTo($ui)
- .append(
- $('<span>')
- .text(I18n.t('javascripts.close'))
- .attr('class', 'icon close')
- .bind('click', toggle))
- .append(
- $('<h4>')
- .text(I18n.t('javascripts.map.layers.header')));
-
- var baseSection = $('<div>')
- .attr('class', 'section base-layers')
+ var baseSection = $("<div>")
+ .attr("class", "base-layers d-grid gap-3 p-3 border-bottom border-secondary-subtle")
.appendTo($ui);
- var baseLayers = $('<ul>')
- .appendTo(baseSection);
+ layers.forEach(function (layer, i) {
+ var id = "map-ui-layer-" + i;
- layers.forEach(function(layer) {
- var item = $('<li>')
- .appendTo(baseLayers);
+ var buttonContainer = $("<div class='position-relative'>")
+ .appendTo(baseSection);
- if (map.hasLayer(layer)) {
- item.addClass('active');
- }
+ var mapContainer = $("<div class='position-absolute top-0 start-0 bottom-0 end-0 z-0'>")
+ .appendTo(buttonContainer);
- var div = $('<div>')
- .appendTo(item);
+ var input = $("<input type='radio' class='btn-check' name='layer'>")
+ .prop("id", id)
+ .prop("checked", map.hasLayer(layer))
+ .appendTo(buttonContainer);
- map.whenReady(function() {
- var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false})
+ var item = $("<label class='btn btn-outline-primary border-4 rounded-3 bg-transparent position-absolute top-0 start-0 bottom-0 end-0 m-n1 overflow-hidden'>")
+ .prop("for", id)
+ .append($("<span class='badge position-absolute top-0 start-0 rounded-top-0 rounded-start-0 py-1 px-2 bg-body bg-opacity-75 text-body text-wrap text-start fs-6 lh-base'>").append(layer.options.name))
+ .appendTo(buttonContainer);
+
+ map.whenReady(function () {
+ var miniMap = L.map(mapContainer[0], { attributionControl: false, zoomControl: false, keyboard: false })
.addLayer(new layer.constructor({ apikey: layer.options.apikey }));
miniMap.dragging.disable();
@@ -58,17 +37,17 @@ L.OSM.layers = function(options) {
miniMap.scrollWheelZoom.disable();
$ui
- .on('show', shown)
- .on('hide', hide);
+ .on("show", shown)
+ .on("hide", hide);
function shown() {
miniMap.invalidateSize();
- setView({animate: false});
- map.on('moveend', moved);
+ setView({ animate: false });
+ map.on("moveend", moved);
}
function hide() {
- map.off('moveend', moved);
+ map.off("moveend", moved);
}
function moved() {
@@ -80,115 +59,98 @@ L.OSM.layers = function(options) {
}
});
- var label = $('<label>')
- .appendTo(item);
-
- var input = $('<input>')
- .attr('type', 'radio')
- .prop('checked', map.hasLayer(layer))
- .appendTo(label);
-
- label.append(layer.options.name);
-
- item.on('click', function() {
- layers.forEach(function(other) {
+ input.on("click", function () {
+ layers.forEach(function (other) {
if (other === layer) {
map.addLayer(other);
} else {
map.removeLayer(other);
}
});
- map.fire('baselayerchange', {layer: layer});
+ map.fire("baselayerchange", { layer: layer });
});
- item.on('dblclick', toggle);
+ item.on("dblclick", toggle);
- map.on('layeradd layerremove', function() {
- item.toggleClass('active', map.hasLayer(layer));
- input.prop('checked', map.hasLayer(layer));
+ map.on("layeradd layerremove", function () {
+ input.prop("checked", map.hasLayer(layer));
});
});
- if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {
- var overlaySection = $('<div>')
- .attr('class', 'section overlay-layers')
+ if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
+ var overlaySection = $("<div>")
+ .attr("class", "overlay-layers p-3")
.appendTo($ui);
- $('<p>')
- .text(I18n.t('javascripts.map.layers.overlays'))
- .attr("class", "deemphasize")
+ $("<p>")
+ .text(I18n.t("javascripts.map.layers.overlays"))
+ .attr("class", "text-muted")
.appendTo(overlaySection);
- var overlays = $('<ul>')
+ var overlays = $("<ul class='list-unstyled form-check'>")
.appendTo(overlaySection);
var addOverlay = function (layer, name, maxArea) {
- var item = $('<li>')
- .tooltip({
- placement: 'top'
- })
+ var item = $("<li>")
.appendTo(overlays);
- var label = $('<label>')
+ if (name === "notes" || name === "data") {
+ item
+ .attr("title", I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip"))
+ .tooltip("disable");
+ }
+
+ var label = $("<label>")
+ .attr("class", "form-check-label")
.appendTo(item);
var checked = map.hasLayer(layer);
- var input = $('<input>')
- .attr('type', 'checkbox')
- .prop('checked', checked)
+ var input = $("<input>")
+ .attr("type", "checkbox")
+ .attr("class", "form-check-input")
+ .prop("checked", checked)
.appendTo(label);
- label.append(I18n.t('javascripts.map.layers.' + name));
+ label.append(I18n.t("javascripts.map.layers." + name));
- input.on('change', function() {
- checked = input.is(':checked');
+ input.on("change", function () {
+ checked = input.is(":checked");
if (checked) {
map.addLayer(layer);
} else {
map.removeLayer(layer);
}
- map.fire('overlaylayerchange', {layer: layer});
+ map.fire("overlaylayerchange", { layer: layer });
});
- map.on('layeradd layerremove', function() {
- input.prop('checked', map.hasLayer(layer));
+ map.on("layeradd layerremove", function () {
+ input.prop("checked", map.hasLayer(layer));
});
- map.on('zoomend', function() {
+ map.on("zoomend", function () {
var disabled = map.getBounds().getSize() >= maxArea;
- $(input).prop('disabled', disabled);
+ $(input).prop("disabled", disabled);
- if (disabled && $(input).is(':checked')) {
- $(input).prop('checked', false)
- .trigger('change');
+ if (disabled && $(input).is(":checked")) {
+ $(input).prop("checked", false)
+ .trigger("change");
checked = true;
- } else if (!disabled && !$(input).is(':checked') && checked) {
- $(input).prop('checked', true)
- .trigger('change');
+ } else if (!disabled && !$(input).is(":checked") && checked) {
+ $(input).prop("checked", true)
+ .trigger("change");
}
- $(item).attr('class', disabled ? 'disabled' : '');
- item.attr('data-original-title', disabled ?
- I18n.t('javascripts.site.map_' + name + '_zoom_in_tooltip') : '');
+ $(item)
+ .attr("class", disabled ? "disabled" : "")
+ .tooltip(disabled ? "enable" : "disable");
});
};
- addOverlay(map.noteLayer, 'notes', OSM.MAX_NOTE_REQUEST_AREA);
- addOverlay(map.dataLayer, 'data', OSM.MAX_REQUEST_AREA);
- addOverlay(map.gpsLayer, 'gps', Number.POSITIVE_INFINITY);
+ addOverlay(map.noteLayer, "notes", OSM.MAX_NOTE_REQUEST_AREA);
+ addOverlay(map.dataLayer, "data", OSM.MAX_REQUEST_AREA);
+ addOverlay(map.gpsLayer, "gps", Number.POSITIVE_INFINITY);
}
-
- options.sidebar.addPane($ui);
-
- function toggle(e) {
- e.stopPropagation();
- e.preventDefault();
- options.sidebar.togglePane($ui, button);
- $('.leaflet-control .control-button').tooltip('hide');
- }
-
- return $container[0];
};
return control;