Add an overlay opacity slider

This commit is contained in:
Phyks (Lucas Verney) 2019-06-29 21:55:48 +02:00
parent 6b5be516d8
commit 7666daa10f
5 changed files with 73 additions and 13 deletions

View file

@ -245,7 +245,7 @@ https://css-tricks.com/svg-line-animation-works/
}
/* invert track and selection styles to get partial gradient for "selection" */
.slider.slider-vertical .slider-track {
.slider .slider-track {
width: 8px;
margin-left: 1px;
background-image: linear-gradient(to right, #f0f0f0 0%, #e9e9e9 100%);
@ -253,8 +253,8 @@ https://css-tricks.com/svg-line-animation-works/
inset 1px 0px 1px rgba(230, 230, 230, 1);
}
.control-slider:hover .slider-track,
.control-slider:active .slider-track {
.control-slider:hover #route .slider-track,
.control-slider:active #route .slider-track {
background-image: linear-gradient(to bottom, magenta 0%, white 100%);
}
@ -267,6 +267,11 @@ https://css-tricks.com/svg-line-animation-works/
.slider.slider-vertical .slider-tick,
.slider.slider-vertical .slider-handle {
cursor: ns-resize;
}
.slider .slider-tick,
.slider .slider-handle {
cursor: ew-resize;
box-sizing: border-box;
background: none;
outline: none;
@ -314,6 +319,10 @@ button.btn {
line-height: 30px;
}
#leaflet-control-layers-overlays-opacity-slider .leaflet-bar {
box-shadow: none;
}
/* smaller tab height */
.nav > li > a {
padding: 2px 15px;

View file

@ -795,6 +795,20 @@
</h1>
<div id="layers-control-wrapper"></div>
<div class="leaflet-control-layers-separator"></div>
<div
class="leaflet-control-layers-overlays-opacity"
>
<p>
<span
data-i18n="sidebar.layers.overlay-opacity"
>Overlay transparency</span
>
<span
id="leaflet-control-layers-overlays-opacity-slider"
></span>
</p>
</div>
<div class="leaflet-control-layers-separator"></div>
<div id="layers-button-group">
<div hidden id="tree-button-group">
<button

View file

@ -20,6 +20,7 @@ BR.LayersTab = BR.ControlLayers.extend({
L.DomUtil.get('layers-control-wrapper').appendChild(this._section);
this.initOpacitySlider(map);
this.initButtons();
this.initJsTree();
@ -46,6 +47,31 @@ BR.LayersTab = BR.ControlLayers.extend({
);
},
initOpacitySlider: function(map) {
var self = this;
var overlayOpacitySlider = new BR.OpacitySlider({
id: 'overlay',
reversed: false,
orientation: 'horizontal',
defaultValue: 1,
title: i18next.t('layers.opacity-slider'),
callback: function(opacity) {
for (var i = 0; i < self._layers.length; i++) {
if (
!self._layers[i].overlay ||
!map.hasLayer(self._layers[i].layer)
) {
continue;
}
self._layers[i].layer.setOpacity(opacity);
}
}
}).onAdd(map);
L.DomUtil.get(
'leaflet-control-layers-overlays-opacity-slider'
).appendChild(overlayOpacitySlider);
},
initButtons: function() {
var expandTree = function(e) {
this.jstree.open_all();

View file

@ -1,16 +1,23 @@
BR.OpacitySlider = L.Control.extend({
options: {
id: '',
position: 'topleft',
reversed: true,
orientation: 'vertical',
defaultValue: BR.conf.defaultOpacity,
title: i18next.t('map.opacity-slider'),
callback: function(opacity) {}
},
onAdd: function(map) {
var container = L.DomUtil.create('div', 'leaflet-bar control-slider'),
input = $('<input id="slider" type="text"/>'),
input = $(
'<input id="slider-' + this.options.id + '" type="text"/>'
),
item = BR.Util.localStorageAvailable()
? localStorage.opacitySliderValue
? localStorage['opacitySliderValue' + this.options.id]
: null,
value = item ? parseInt(item) : BR.conf.defaultOpacity * 100,
value = item ? parseInt(item) : this.options.defaultValue * 100,
minOpacity = (BR.conf.minOpacity || 0) * 100;
if (value < minOpacity) {
@ -34,17 +41,18 @@ BR.OpacitySlider = L.Control.extend({
};
$(container).html(input);
$(container).attr('title', i18next.t('map.opacity-slider'));
$(container).attr('title', this.options.title);
input
.slider({
id: this.options.id,
min: 0,
max: 100,
step: 1,
value: value,
orientation: 'vertical',
reversed: true,
selection: 'before', // inverted, serves as track style, see css
orientation: this.options.orientation,
reversed: this.options.reversed,
selection: this.options.reversed ? 'before' : 'after', // inverted, serves as track style, see css
tooltip: 'hide'
})
.on('slideStart', function(evt) {
@ -54,9 +62,11 @@ BR.OpacitySlider = L.Control.extend({
.on('slide slideStop', { self: this }, function(evt) {
evt.data.self.options.callback(evt.value / 100);
})
.on('slideStop', function(evt) {
.on('slideStop', { self: this }, function(evt) {
if (BR.Util.localStorageAvailable()) {
localStorage.opacitySliderValue = evt.value;
localStorage[
'opacitySliderValue' + evt.data.self.options.id
] = evt.value;
}
L.DomUtil.enableTextSelection();

View file

@ -283,6 +283,7 @@
map.addControl(
new BR.OpacitySlider({
id: 'route',
callback: L.bind(routing.setOpacity, routing)
})
);