From 7a33740e6b174fdcb3439786ced4d51b2d7fc083 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Thu, 8 May 2025 16:42:05 +0300 Subject: [PATCH] Split changeset highlight back layer into area and outline --- .../index/history-changesets-layer.js | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/index/history-changesets-layer.js b/app/assets/javascripts/index/history-changesets-layer.js index 747535a16..1074d4b78 100644 --- a/app/assets/javascripts/index/history-changesets-layer.js +++ b/app/assets/javascripts/index/history-changesets-layer.js @@ -57,12 +57,11 @@ OSM.HistoryChangesetBboxBorderLayer = OSM.HistoryChangesetBboxLayer.extend({ } }); -OSM.HistoryChangesetBboxHighlightBackLayer = OSM.HistoryChangesetBboxLayer.extend({ +OSM.HistoryChangesetBboxHighlightAreaLayer = OSM.HistoryChangesetBboxLayer.extend({ _getChangesetStyle: function (changeset) { return { interactive: false, - weight: 6, - color: "var(--changeset-outline-color)", + stroke: false, fillColor: "var(--changeset-fill-color)", fillOpacity: 0.3, className: this._getSidebarRelativeClassName(changeset) + " changeset-highlighted" @@ -70,6 +69,18 @@ OSM.HistoryChangesetBboxHighlightBackLayer = OSM.HistoryChangesetBboxLayer.exten } }); +OSM.HistoryChangesetBboxHighlightOutlineLayer = OSM.HistoryChangesetBboxLayer.extend({ + _getChangesetStyle: function (changeset) { + return { + interactive: false, + weight: 6, + color: "var(--changeset-outline-color)", + fill: false, + className: this._getSidebarRelativeClassName(changeset) + " changeset-highlighted" + }; + } +}); + OSM.HistoryChangesetBboxHighlightBorderLayer = OSM.HistoryChangesetBboxLayer.extend({ _getChangesetStyle: function (changeset) { return { @@ -183,10 +194,12 @@ OSM.HistoryChangesetsLayer = L.FeatureGroup.extend({ if (!changeset) return; if (state) { - this._highlightBackLayer.addChangesetLayer(changeset); + this._highlightAreaLayer.addChangesetLayer(changeset); + this._highlightOutlineLayer.addChangesetLayer(changeset); this._highlightBorderLayer.addChangesetLayer(changeset); } else { - this._highlightBackLayer.removeLayer(id); + this._highlightAreaLayer.removeLayer(id); + this._highlightOutlineLayer.removeLayer(id); this._highlightBorderLayer.removeLayer(id); } }, @@ -205,7 +218,8 @@ OSM.HistoryChangesetsLayer.addInitHook(function () { this._areaLayer = new OSM.HistoryChangesetBboxAreaLayer().addTo(this), this._outlineLayer = new OSM.HistoryChangesetBboxOutlineLayer().addTo(this), this._borderLayer = new OSM.HistoryChangesetBboxBorderLayer().addTo(this), - this._highlightBackLayer = new OSM.HistoryChangesetBboxHighlightBackLayer().addTo(this), + this._highlightAreaLayer = new OSM.HistoryChangesetBboxHighlightAreaLayer().addTo(this), + this._highlightOutlineLayer = new OSM.HistoryChangesetBboxHighlightOutlineLayer().addTo(this), this._highlightBorderLayer = new OSM.HistoryChangesetBboxHighlightBorderLayer().addTo(this) ]; }); -- 2.39.5