jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reflect data browser filter in displayed features

Browse source 
fix #550
This commit is contained in:
Yohan Boniface 2018-06-27 22:12:45 +02:00
parent b804b5bc41
commit e20eeba89a
4 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
umap/static/umap/js/umap.controls.js
View file

@ -648,9 +648,10 @@ L.U.Map.include({
filter = L.DomUtil.create('input', '', browserContainer),
filterValue = '',
featuresContainer = L.DomUtil.create('div', 'umap-browse-features', browserContainer),
filterKeys = (this.options.filterKey || this.options.sortKey || 'name').split(',');
filterKeys = this.getFilterKeys();
filter.type = 'text';
filter.placeholder = L._('Filter…');
filter.value = this.options.filter || '';
var addFeature = function (feature) {
var feature_li = L.DomUtil.create('li', feature.getClassName() + ' feature'),
@ -709,14 +710,20 @@ L.U.Map.include({
};
var appendAll = function () {
this.options.filter = filterValue = filter.value;
featuresContainer.innerHTML = '';
filterValue = filter.value;
this.eachBrowsableDataLayer(function (datalayer) {
append(datalayer);
});
};
var resetLayers = function () {
this.eachBrowsableDataLayer(function (datalayer) {
datalayer.resetLayer(true);
});
}
L.bind(appendAll, this)();
L.DomEvent.on(filter, 'input', appendAll, this);
L.DomEvent.on(filter, 'input', resetLayers, this);
var link = L.DomUtil.create('li', '');
L.DomUtil.create('i', 'umap-icon-16 umap-caption', link);
var label = L.DomUtil.create('span', '', link);

4
umap/static/umap/js/umap.js
View file

@ -1637,6 +1637,10 @@ L.U.Map.include({
search: function () {
if (this._controls.search) this._controls.search.openPanel(this);
},
getFilterKeys: function () {
return (this.options.filterKey || this.options.sortKey || 'name').split(',');
}
});

4
umap/static/umap/js/umap.layer.js
View file

@ -228,10 +228,14 @@ L.U.DataLayer = L.Class.extend({
if (this.layer && this.options.type === this.layer._type && !force) return;
var visible = this.isVisible();
if (this.layer) this.layer.clearLayers();
// delete this.layer?
if (visible) this.map.removeLayer(this.layer);
var Class = L.U.Layer[this.options.type] || L.U.Layer.Default;
this.layer = new Class(this);
var filterKeys = this.map.getFilterKeys(),
filter = this.map.options.filter;
this.eachLayer(function (layer) {
if (filter && !layer.matchFilter(filter, filterKeys)) return;
this.layer.addLayer(layer);
});
if (visible) this.map.addLayer(this.layer);

3
umap/static/umap/map.css
View file

@ -855,6 +855,7 @@ a.add-datalayer:hover,
background-image: url('./img/16.png');
display: inline;
padding: 0 10px;
vertical-align: middle;
}
.umap-add {
background-position: -12px -49px;
@ -866,7 +867,7 @@ a.add-datalayer:hover,
background-position: -92px -168px;
}
.umap-caption {
background-position: -170px -49px;
background-position: -170px -52px;
}
/* ********************************* */