ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10259 from fredj/abortDrawing

Browse Source 
Remove all the sketch features in abortDrawing
This commit is contained in:
Frédéric Junod
2019-11-08 09:35:33 +01:00
committed by GitHub
parent 6f6551ad75 51c9b56254
commit 6fe5c88614
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ol/interaction/Draw.js
View File

@@ -881,12 +881,10 @@ class Draw extends PointerInteraction {
abortDrawing_() {
this.finishCoordinate_ = null;
const sketchFeature = this.sketchFeature_;
if (sketchFeature) {
this.sketchFeature_ = null;
this.sketchPoint_ = null;
this.sketchLine_ = null;
this.overlay_.getSource().clear(true);
}
this.sketchFeature_ = null;
this.sketchPoint_ = null;
this.sketchLine_ = null;
this.overlay_.getSource().clear(true);
return sketchFeature;
}

18
test/spec/ol/interaction/draw.test.js
View File

@@ -1080,6 +1080,24 @@ describe('ol.interaction.Draw', function() {
});
});
describe('#setMap(null) when no drawing is in progress', function() {
beforeEach(function() {
map.addInteraction(interaction);
simulateEvent('pointermove', 10, 20);
expect(interaction.sketchFeature_).to.be(null);
expect(interaction.sketchPoint_).not.to.be(null);
});
afterEach(function() {
map.removeInteraction(interaction);
});
it('clears the sketch features', function() {
interaction.setMap(null);
expect(interaction.sketchFeature_).to.be(null);
expect(interaction.sketchPoint_).to.be(null);
expect(interaction.sketchLine_).to.be(null);
});
});
describe('#setMap(map)', function() {
describe('#setMap(map) when interaction is active', function() {
it('sets the map into the feature overlay', function() {