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

Merge pull request #767 from umap-project/tooltip-var

Browse source 
Allow variables in tooltips
This commit is contained in:
Yohan Boniface 2020-03-19 21:49:49 +01:00 committed by GitHub
commit fda5bc4283
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
umap/static/umap/js/umap.features.js
View file

@ -157,6 +157,9 @@ L.U.FeatureMixin = {
getDisplayName: function (fallback) { getDisplayName: function (fallback) {
if (fallback === undefined) fallback = this.datalayer.options.name; if (fallback === undefined) fallback = this.datalayer.options.name;
var key = this.getOption('labelKey') || 'name'; var key = this.getOption('labelKey') || 'name';
// Variables mode.
if (key.indexOf("{") != -1) return L.Util.greedyTemplate(key, this.extendedProperties());
// Simple mode.
return this.properties[key] || this.properties.title || fallback; return this.properties[key] || this.properties.title || fallback;
}, },

11
umap/static/umap/test/Feature.js
View file

@ -179,6 +179,17 @@ describe('L.U.FeatureMixin', function () {
}); });
describe('#tooltip', function () {
it('should have a tooltip when active and allow variables', function () {
this.map.options.showLabel = true;
this.map.options.labelKey = "Foo {name}";
this.datalayer.redraw();
assert.equal(qs('.leaflet-tooltip-pane .leaflet-tooltip').textContent, "Foo name poly");
});
});
describe('#properties()', function () { describe('#properties()', function () {
it('should rename property', function () { it('should rename property', function () {