Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue201 compare vulnerabilities #218

Merged
merged 3 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,459 changes: 232 additions & 2,227 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
"geostyler-sld-parser": "^6.1.2",
"html-to-image": "^1.11.11",
"leaflet": "^1.9.4",
"leaflet-side-by-side": "^2.2.0",
"mapbox-gl": "^3.1.2",
"prop-types": "^15.8.1",
"react": "^18.2.0",
Expand Down
189 changes: 189 additions & 0 deletions src/components/side-by-side/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
const L = require('leaflet');
require('./layout.css');
require('./range.css');

let mapWasDragEnabled;
let mapWasTapEnabled;

function getRangeEvent(rangeInput) {
return 'oninput' in rangeInput ? 'input' : 'change';
}

function cancelMapDrag() {
mapWasDragEnabled = this._map.dragging.enabled();
mapWasTapEnabled = this._map.tap && this._map.tap.enabled();
this._map.dragging.disable();
this._map.tap && this._map.tap.disable();
}

function uncancelMapDrag(e) {
this._refocusOnMap(e);
if (mapWasDragEnabled) {
this._map.dragging.enable();
}
if (mapWasTapEnabled) {
this._map.tap.enable();
}
}

// convert arg to an array - returns empty array if arg is undefined
function asArray(arg) {
return (arg === 'undefined') ? [] : Array.isArray(arg) ? arg : [arg];
}

function noop() {
}

L.Control.SideBySide = L.Control.extend({
options: {
thumbSize: 42,
padding: 0
},

initialize: function (leftLayers, rightLayers, options) {
this.setLeftLayers(leftLayers);
this.setRightLayers(rightLayers);
L.setOptions(this, options);
},

getPosition: function () {
const rangeValue = this._range.value;
const offset = (0.5 - rangeValue) * (2 * this.options.padding + this.options.thumbSize);
return this._map.getSize().x * rangeValue + offset;
},

setPosition: noop,

includes: L.Evented.prototype || L.Mixin.Events,

addTo: function (map) {
this.remove();
this._map = map;

const container = this._container = L.DomUtil.create('div', 'leaflet-sbs', map._controlContainer);

this._divider = L.DomUtil.create('div', 'leaflet-sbs-divider', container);
const range = this._range = L.DomUtil.create('input', 'leaflet-sbs-range', container);
range.type = 'range';
range.min = 0;
range.max = 1;
range.step = 'any';
range.value = 0.5;
range.style.paddingLeft = range.style.paddingRight = this.options.padding + 'px';
this._addEvents();
this._updateLayers();
return this;
},

remove: function () {
if (!this._map) {
return this;
}
if (this._leftLayer) {
this._leftLayer.getContainer().style.clip = '';
}
if (this._rightLayer) {
this._rightLayer.getContainer().style.clip = '';
}
this._removeEvents();
L.DomUtil.remove(this._container);

this._map = null;

return this;
},

setLeftLayers: function (leftLayers) {
this._leftLayers = asArray(leftLayers);
this._updateLayers();
return this;
},

setRightLayers: function (rightLayers) {
this._rightLayers = asArray(rightLayers);
this._updateLayers();
return this;
},

_updateClip: function () {
const map = this._map;
const nw = map.containerPointToLayerPoint([0, 0]);
const se = map.containerPointToLayerPoint(map.getSize());
const clipX = nw.x + this.getPosition();
const dividerX = this.getPosition();

this._divider.style.left = dividerX + 'px';
this.fire('dividermove', {x: dividerX});
const clipLeft = 'rect(' + [nw.y, clipX, se.y, nw.x].join('px,') + 'px)';
const clipRight = 'rect(' + [nw.y, se.x, se.y, clipX].join('px,') + 'px)';
if (this._leftLayer) {
this._leftLayer.getContainer().style.clip = clipLeft;
}
if (this._rightLayer) {
this._rightLayer.getContainer().style.clip = clipRight;
}
},

_updateLayers: function () {
if (!this._map) {
return this;
}
const prevLeft = this._leftLayer;
const prevRight = this._rightLayer;
this._leftLayer = this._rightLayer = null;
this._leftLayers.forEach(function (layer) {
if (this._map.hasLayer(layer)) {
this._leftLayer = layer;
}
}, this);
this._rightLayers.forEach(function (layer) {
if (this._map.hasLayer(layer)) {
this._rightLayer = layer;
}
}, this);
if (prevLeft !== this._leftLayer) {
prevLeft && this.fire('leftlayerremove', {layer: prevLeft});
this._leftLayer && this.fire('leftlayeradd', {layer: this._leftLayer});
}
if (prevRight !== this._rightLayer) {
prevRight && this.fire('rightlayerremove', {layer: prevRight});
this._rightLayer && this.fire('rightlayeradd', {layer: this._rightLayer});
}
this._updateClip();
},

_addEvents: function () {
const range = this._range;
const map = this._map;
if (!map || !range) return;
map.on("move", this._updateClip, this);
map.on("layeradd layerremove", this._updateLayers, this);
L.DomEvent.on(range, getRangeEvent(range), this._updateClip, this);
L.DomEvent.on(range, "touchstart", cancelMapDrag, this);
L.DomEvent.on(range, "touchend", uncancelMapDrag, this);
L.DomEvent.on(range, "mousedown", cancelMapDrag, this);
L.DomEvent.on(range, "mouseup", uncancelMapDrag, this);
},

_removeEvents: function () {
const range = this._range;
const map = this._map;
if (range) {
L.DomEvent.off(range, getRangeEvent(range), this._updateClip, this);
L.DomEvent.off(range, "touchstart", cancelMapDrag, this);
L.DomEvent.off(range, "touchend", uncancelMapDrag, this);
L.DomEvent.off(range, "mousedown", cancelMapDrag, this);
L.DomEvent.off(range, "mouseup", uncancelMapDrag, this);
}
if (map) {
map.off("layeradd layerremove", this._updateLayers, this);
map.off("move", this._updateClip, this);
}
},
});

L.control.sideBySide = function (leftLayers, rightLayers, options) {
return new L.Control.SideBySide(leftLayers, rightLayers, options);
};

module.exports = L.Control.SideBySide;
18 changes: 18 additions & 0 deletions src/components/side-by-side/layout.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.leaflet-sbs-range {
position: absolute;
top: 50%;
width: 100%;
z-index: 999;
}

.leaflet-sbs-divider {
position: absolute;
top: 0;
bottom: 0;
left: 50%;
margin-left: -2px;
width: 4px;
background-color: #fff;
pointer-events: none;
z-index: 999;
}
Loading