Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preserve popup options when applying to new features #348

Merged
merged 1 commit into from
Sep 30, 2014
Merged

Preserve popup options when applying to new features #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 47 additions & 1 deletion spec/Layers/FeatureLayer/FeatureLayerSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ describe('L.esri.Layers.FeatureLayer', function () {
}
}];

var multiPolygon = [({
type : 'Feature',
id: 1,
geometry: {
type: 'MultiPolygon',
coordinates: [[[[-95, 43], [-95, 50], [-90, 50], [-91, 42], [-95, 43]]], [[[-89, 42], [-89, 50], [-80, 50], [-80, 42]]]]
},
properties: {
time: new Date('Febuary 1 2014').valueOf()
}
})];

beforeEach(function(){
layer = L.esri.featureLayer('http://services.arcgis.com/mock/arcgis/rest/services/MockService/MockFeatureServer/0', {
timeField: 'time',
Expand Down Expand Up @@ -183,6 +195,28 @@ describe('L.esri.Layers.FeatureLayer', function () {
expect(layer.getFeature(3)._popup.getContent()).to.equal('ID: 3');
});

it('should preserve popup options when binding popup to new or existing features', function(){
layer.bindPopup(function(feature){
return 'ID: ' + feature.id;
}, {minWidth: 500});

layer.createLayers([{
type: 'Feature',
id: 3,
geometry: {
type: 'Point',
coordinates: [-123, 46]
},
properties: {
time: new Date('Febuary 24 2014').valueOf()
}
}]);

expect(layer.getFeature(1)._popup.options.minWidth).to.equal(500);
expect(layer.getFeature(2)._popup.options.minWidth).to.equal(500);
expect(layer.getFeature(3)._popup.options.minWidth).to.equal(500);
});

it('should unbind popups on features', function(){
layer.bindPopup(function(feature){
return 'ID: ' + feature.id;
Expand All @@ -192,6 +226,18 @@ describe('L.esri.Layers.FeatureLayer', function () {
expect(layer.getFeature(2)._popup).to.equal(null);
});

it('should unbind popups on multi polygon features', function(){
layer = L.esri.featureLayer('http://services.arcgis.com/mock/arcgis/rest/services/MockService/MockFeatureServer/0', { timeField: 'time' }).addTo(map);

layer.createLayers(multiPolygon);
layer.bindPopup(function(feature){
return 'ID: ' + feature.id;
});
layer.unbindPopup();
expect(layer.getFeature(1).getLayers()[0]._popup).to.equal(null);
expect(layer.getFeature(1).getLayers()[1]._popup).to.equal(null);
});

it('should iterate over each feature', function(){
var spy = sinon.spy();
layer.eachFeature(spy);
Expand Down Expand Up @@ -238,4 +284,4 @@ describe('L.esri.Layers.FeatureLayer', function () {
expect(spy.getCall(0).args[0].foo).to.equal('bar');
expect(spy.getCall(0).args[0].type).to.equal('click');
});
});
});
14 changes: 12 additions & 2 deletions src/Layers/FeatureLayer/FeatureLayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ L.esri.Layers.FeatureLayer = L.esri.Layers.FeatureManager.extend({

// bind a popup if we have one
if(this._popup && newLayer.bindPopup){
newLayer.bindPopup(this._popup(newLayer.feature, newLayer));
newLayer.bindPopup(this._popup(newLayer.feature, newLayer), this._popupOptions);
}

if(this.options.onEachFeature){
Expand Down Expand Up @@ -177,6 +177,7 @@ L.esri.Layers.FeatureLayer = L.esri.Layers.FeatureManager.extend({

bindPopup: function (fn, options) {
this._popup = fn;
this._popupOptions = options;
for (var i in this._layers) {
var layer = this._layers[i];
var popupContent = this._popup(layer.feature, layer);
Expand All @@ -188,7 +189,16 @@ L.esri.Layers.FeatureLayer = L.esri.Layers.FeatureManager.extend({
unbindPopup: function () {
this._popup = false;
for (var i in this._layers) {
this._layers[i].unbindPopup();
var layer = this._layers[i];
if (layer.unbindPopup) {
layer.unbindPopup();
} else if (layer.getLayers) {
var groupLayers = layer.getLayers();
for (var j in groupLayers) {
var gLayer = groupLayers[j];
gLayer.unbindPopup();
}
}
}
return this;
},
Expand Down