cavalion-blocks
Advanced tools
Comparing version 0.9.33 to 0.9.34
{ | ||
"name": "cavalion-blocks", | ||
"version": "0.9.33", | ||
"version": "0.9.34", | ||
"description": "`blocks-dot-js` `[].js`", | ||
@@ -5,0 +5,0 @@ "main": "README.js", |
@@ -1,2 +0,2 @@ | ||
"leaflet/Crs, leaflet/layers/28992, leaflet/plugins/markercluster, util/Browser, util/HtmlElement"; | ||
"leaflet/Crs, leaflet/layers/28992, leaflet/plugins/markercluster, util/Browser, util/HtmlElement, veldoffice/util/Leaflet"; | ||
// "use strict"; | ||
@@ -12,49 +12,7 @@ | ||
var LeafletUtil = require("veldoffice/util/Leaflet"); | ||
var js = window.js; | ||
var L = window.L; | ||
function createMap(mapDomNode, mapOptions, options) { | ||
var touch = "ontouchstart" in window; | ||
mapOptions = js.mixIn({ zoomControl: false, attributionControl: false, | ||
preferCanvas: !true }, mapOptions || {}); | ||
if(mapOptions.crs === undefined) { | ||
// Assume RD by default (for Veldoffice anyways) | ||
mapOptions.crs = Crs.RD; | ||
} | ||
var map = L.map(mapDomNode, mapOptions); | ||
options = options || {}; | ||
if(Browser.ios !== true && Browser.android !== true) { | ||
/*- TODO move to Map.page */ | ||
HE.addClass(mapDomNode, "desktop"); | ||
} | ||
L.control.layers(options.layers || { | ||
// penbasiskaart: Layers.openbasiskaart().addTo(map), | ||
luchtfoto2017: Layers.luchtfoto2017().addTo(map), | ||
// bgtlijngericht: Layers.bgtlijngericht().addTo(map), | ||
// bgtpastel: Layers.bgtpastel().addTo(map) | ||
});//.addTo(map); | ||
if(options.scale !== false) { | ||
L.control.scale({imperial: false}).addTo(map); | ||
} | ||
return map; | ||
} | ||
function setView(me, map, view, persist) { | ||
beginUpdate(me); | ||
map.once("moveend", function() { | ||
endUpdate(me); | ||
}); | ||
map.setView(view[0], view[1]); | ||
if(persist !== false) { | ||
me.qsa("#state-persist").execute(); | ||
} | ||
} | ||
function beginUpdate(me) { | ||
@@ -74,3 +32,3 @@ me.vars("updating", me.vars("updating") + 1); | ||
var styles = { | ||
"border-top": "1px solid silver", | ||
// "border-top": "1px solid silver", | ||
".map": "top:0;left:0;bottom:0;right:0;position:absolute;", | ||
@@ -122,2 +80,14 @@ overflow: "hidden" | ||
function setView(me, map, view, persist) { | ||
beginUpdate(me); | ||
map.once("moveend", function() { | ||
endUpdate(me); | ||
}); | ||
map.setView(view[0], view[1], { /* animate */ }); | ||
if(persist !== false) { | ||
me.qsa("#state-persist").execute(); | ||
} | ||
} | ||
["Container, Store", { | ||
@@ -130,6 +100,7 @@ css: styles, | ||
var me = this; | ||
var map = createMap(this._node.childNodes[0], { | ||
var map = LeafletUtil.createMap(this, this._node.childNodes[0], { | ||
crs: 28992, | ||
center: [52, 5.3], | ||
zoom: 2, maxZoom: 17 | ||
}, {}); | ||
zoom: 2 | ||
}, { emit: false }); | ||
@@ -144,32 +115,6 @@ // TODO layeradd, layerremove? | ||
var cluster = L.markerClusterGroup({ | ||
disableClusteringAtZoom: 13, | ||
// chunkedLoading: true, | ||
// chunkDelay: 100, | ||
// chunkProgress: function(processed, total, elapsed, layersArray) { | ||
// var progress = $$('.markers-progress', container)[0]; | ||
// var progressBar = $$('.markers-progress-bar', container)[0]; | ||
// if (elapsed > 100) { | ||
// // if it takes more than a second to load, display the progress bar: | ||
// progress.style.display = 'block'; | ||
// progressBar.style.width = Math.round(processed/total*100) + '%'; | ||
// } | ||
// if (processed === total) { | ||
// // all markers processed - hide the progress bar: | ||
// progress.style.display = ''; | ||
// } | ||
// } | ||
disableClusteringAtZoom: 13 | ||
}); | ||
cluster.addTo(map); | ||
// var markers = []; | ||
// function addToCluster(marker) { | ||
// markers.push(marker); | ||
// me.setTimeout(function() { | ||
// markers.forEach(marker => marker.remove()); | ||
// cluster.addLayers(markers); | ||
// markers = []; | ||
// }, 100); | ||
// } | ||
var addLayer = map.addLayer; | ||
@@ -235,3 +180,2 @@ map.addLayer = function(layer) { | ||
}, [ | ||
["Executable", "state-persist", { | ||
@@ -238,0 +182,0 @@ onExecute: function() { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
90926
2274