Skip to content

Marker drag check #594

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

Merged
merged 8 commits into from
Jun 20, 2020
Merged

Marker drag check #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d08c1b
Update README.md
Falke-Design Feb 18, 2020
5d5abd5
Merge pull request #10 from geoman-io/master
Falke-Design Apr 5, 2020
392a529
Merge pull request #11 from geoman-io/develop
Falke-Design May 12, 2020
5eb057a
Check if marker has dragging property before enable / disable dragging
Falke-Design May 18, 2020
23e178a
Add test
Falke-Design May 20, 2020
a9e3894
Remove conflict
Falke-Design May 20, 2020
175bf1d
add this._map if it is not already set
Falke-Design May 23, 2020
32beae1
Added comment to the test
Falke-Design May 29, 2020
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
18 changes: 18 additions & 0 deletions cypress/integration/marker.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,22 @@ describe('Draw Marker', () => {
expect($p).to.have.length(4);
});
});


it('add interactive:false marker to the map and enable edit', () => {
// Adds a interactive Marker to the map and enable / disable the edit mode to check if a error is thrown because it is not draggable
cy.window().then(({ map, L }) => {
return L.marker([51.505, -0.09], { interactive: false }).addTo(map);
}).as('marker');

cy.toolbarButton('edit').click();

cy.wait(100);

cy.toolbarButton('edit').click();

cy.get('@marker').then( marker => {
marker.removeFrom(marker._map);
});
});
});
2 changes: 1 addition & 1 deletion src/js/Edit/L.PM.Edit.Marker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Edit.Marker = Edit.extend({
this._disableSnapping();
}

if (this.options.draggable) {
if (this.options.draggable && this._layer.dragging) {
this._layer.dragging.enable();
}

Expand Down
9 changes: 8 additions & 1 deletion src/js/Mixins/Dragging.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@ const DragMixin = {
// before enabling layer drag, disable layer editing
this.disable();

// if layer never enabled and _map is not set (for snapping)
if(!this._map){
this._map = this._layer._map;
}

if (this._layer instanceof L.Marker) {
if(this.options.snappable) {
this._initSnappableMarkers();
}else{
this._disableSnapping();
}
this._layer.dragging.enable();
if(this._layer.dragging){
this._layer.dragging.enable();
}
return;
}

Expand Down