Skip to content

Commit

Permalink
Use baselayerchange/overlaylayerchange instead of layeradd/layerremov…
Browse files Browse the repository at this point in the history
…e for speed up Map Data layer render
  • Loading branch information
deevroman committed Jan 16, 2025
1 parent a6c6f26 commit 12fee32
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/assets/javascripts/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ $(document).ready(function () {
var expiry = new Date();
expiry.setYear(expiry.getFullYear() + 10);

map.on("moveend layeradd layerremove", function () {
map.on("moveend baselayerchange overlaylayerchange", function () {
updateLinks(
map.getCenter().wrap(),
map.getZoom(),
Expand Down
16 changes: 6 additions & 10 deletions app/assets/javascripts/index/layers/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,14 @@ OSM.initializeDataLayer = function (map) {
onSelect(e.layer);
});

map.on("layeradd", function (e) {
if (e.layer === dataLayer) {
map.on("moveend", updateData);
updateData();
}
dataLayer.on("add", function () {
map.on("moveend", updateData);
updateData();
});

map.on("layerremove", function (e) {
if (e.layer === dataLayer) {
map.off("moveend", updateData);
$("#browse_status").empty();
}
dataLayer.on("remove", function () {
map.off("moveend", updateData);
$("#browse_status").empty();
});

function updateData() {
Expand Down
10 changes: 10 additions & 0 deletions app/assets/javascripts/leaflet.map.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,21 @@ L.OSM.Map = L.Map.extend({
layersAdded = "";

for (var i = this.baseLayers.length - 1; i >= 0; i--) {
var baselayerChanged = false;
if (layers.indexOf(this.baseLayers[i].options.code) >= 0) {
baselayerChanged = !this.hasLayer(this.baseLayers[i]);
this.addLayer(this.baseLayers[i]);
layersAdded = layersAdded + this.baseLayers[i].options.code;
} else if (i === 0 && layersAdded === "") {
baselayerChanged = !this.hasLayer(this.baseLayers[i]);
this.addLayer(this.baseLayers[i]);
} else {
baselayerChanged = this.hasLayer(this.baseLayers[i]);
this.removeLayer(this.baseLayers[i]);
}
if (baselayerChanged) {
this.fire("baselayerchange", { layer: this.baseLayers[i] });
}
}
},

Expand Down Expand Up @@ -295,6 +302,7 @@ L.OSM.Map = L.Map.extend({
}

if (callback) callback(this._objectLayer.getBounds());
this.fire("overlaylayerchange", { layer: this._objectLayer });
} else { // element handled by L.OSM.DataLayer
var map = this;
this._objectLoader = $.ajax({
Expand Down Expand Up @@ -326,6 +334,7 @@ L.OSM.Map = L.Map.extend({
map._objectLayer.addTo(map);

if (callback) callback(map._objectLayer.getBounds());
map.fire("overlaylayerchange", { layer: map._objectLayer });
}
});
}
Expand All @@ -335,6 +344,7 @@ L.OSM.Map = L.Map.extend({
this._object = null;
if (this._objectLoader) this._objectLoader.abort();
if (this._objectLayer) this.removeLayer(this._objectLayer);
this.fire("overlaylayerchange", { layer: this._objectLayer });
},

getState: function () {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/leaflet.share.js
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ L.OSM.share = function (options) {

marker.on("dragend", movedMarker);
map.on("move", movedMap);
map.on("moveend layeradd layerremove", update);
map.on("moveend baselayerchange overlaylayerchange", update);

$ui
.on("show", shown)
Expand Down

0 comments on commit 12fee32

Please sign in to comment.