nakarte

Source code of https://map.sikmir.ru (fork)
git clone git://git.sikmir.ru/nakarte
Log | Files | Refs | LICENSE

commit 4b94081fcdf839a2876d890511795b44d028afc1
parent cc9fcb77ec9a7d72a662f65951214a48ec8476ea
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Sun, 27 Nov 2016 02:56:41 +0300

[canvasMarkers] moved map pane creation to CanvasMarker.onAdd

Diffstat:
Msrc/lib/leaflet.layer.canvasMarkers/canvasMarkers.js | 6++++--
Msrc/lib/leaflet.layer.westraPasses/westraPasses.js | 3+--
2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib/leaflet.layer.canvasMarkers/canvasMarkers.js b/src/lib/leaflet.layer.canvasMarkers/canvasMarkers.js @@ -212,8 +212,7 @@ L.Layer.CanvasMarkers = L.GridLayer.extend({ ctx.font = L.Util.template('bold {size}px {name}', {'name': this.options.labelFontName, 'size': this.options.labelFontSize} ); - for (let markerId of Object.keys(markerJobs)) { - const job = markerJobs[markerId]; + for (let [markerId, job] of Object.entries(markerJobs)) { let img = this._images[job.icon.url]; job.img = img; const imgW = Math.round(img.width * this.options.iconScale); @@ -386,6 +385,9 @@ L.Layer.CanvasMarkers = L.GridLayer.extend({ }, onAdd: function(map) { + if (this.options.pane === 'rasterMarker' && !map.getPane('rasterMarker')) { + map.createPane('rasterMarker').style.zIndex = 550; + } L.GridLayer.prototype.onAdd.call(this, map); map.on('mousemove', this.onMouseMove, this); map.on('mouseout', this.onMouseOut, this); diff --git a/src/lib/leaflet.layer.westraPasses/westraPasses.js b/src/lib/leaflet.layer.westraPasses/westraPasses.js @@ -12,7 +12,7 @@ L.Layer.WestraPasses = L.Layer.extend({ initialize: function(baseUrl, options) { L.setOptions(this, options); - this.markers = new westraPasesMarkers(baseUrl, {pane: 'rasterMarker'}); + this.markers = new westraPasesMarkers(baseUrl); this.regions1 = new L.Layer.GeoJSONAjax(baseUrl + this.options.fileRegions1, { className: 'westra-region-polygon', onEachFeature: this._setRegionLabel.bind(this, 'regions1'), @@ -78,7 +78,6 @@ L.Layer.WestraPasses = L.Layer.extend({ onAdd: function(map) { this._map = map; - map.createPane('rasterMarker').style.zIndex = 550; this.markers.loadData(); this.regions1.loadData(); this.regions2.loadData();