Skip to content

feat: Circle/Ellipse/Rectangle draw adapt to SnapTo #2664

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 1 commit into from
Oct 20, 2025
Merged

feat: Circle/Ellipse/Rectangle draw adapt to SnapTo #2664

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
37 changes: 27 additions & 10 deletions packages/maptalks/src/map/tool/DrawTool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ class DrawTool extends MapTool {
if (Array.isArray(action)) {
for (let i = 0; i < action.length; i++) {
//@internal
_events[action[i]] = this._events[action[i]];
_events[action[i]] = this._events[action[i]];
}
return _events;
}
Expand All @@ -455,7 +455,7 @@ class DrawTool extends MapTool {
*/
//@internal
_mouseDownHandler(event: any) {
if(!event?.coordinate) {
if (!event?.coordinate) {
return
}
this._createGeometry(event);
Expand All @@ -471,12 +471,21 @@ class DrawTool extends MapTool {
*/
//@internal
_mouseUpHandler(event: any) {
if(!event?.coordinate) {
if (!event?.coordinate) {
return
}
this.endDraw(event);
}

_copyMapEventOnSnapTo(mapEvent, prjCoord) {
const map = this.getMap();
if (!map) {
return mapEvent;
}
return Object.assign({}, mapEvent, { containerPoint: map.prjToContainerPoint(prjCoord) })
}


/**
* 监听mouse first click点击事件
*
Expand All @@ -487,7 +496,7 @@ class DrawTool extends MapTool {
*/
//@internal
_clickHandler(event: any) {
if(!event?.coordinate) {
if (!event?.coordinate) {
return
}
if (!this.options.interactive) {
Expand All @@ -514,9 +523,11 @@ class DrawTool extends MapTool {
}
//for snap effect
const snapTo = this._geometry.snapTo;
let copyEvent;
if (snapTo && isFunction(snapTo)) {
const snapResult = this._getSnapResult(snapTo, event.containerPoint);
prjCoord = snapResult.prjCoord;
copyEvent = this._copyMapEventOnSnapTo(event, prjCoord);
this._clickCoords = this._clickCoords.concat(snapResult.effectedVertex);
// ensure snap won't trigger again when dblclick
if (this._clickCoords[this._clickCoords.length - 1].equals(prjCoord)) {
Expand All @@ -526,7 +537,7 @@ class DrawTool extends MapTool {
this._clickCoords.push(prjCoord);
this._historyPointer = this._clickCoords.length;
event.drawTool = this;
registerMode['update'](map.getProjection(), this._clickCoords, this._geometry, event);
registerMode['update'](map.getProjection(), this._clickCoords, this._geometry, copyEvent || event);
if (this.getMode() === 'point') {
this.endDraw(event);
return;
Expand Down Expand Up @@ -624,7 +635,11 @@ class DrawTool extends MapTool {
if (map && snapResult) {
const prjCoord = snapResult.prjCoord;
this._clickCoords = [prjCoord];
registerMode['update'](map.getProjection(), this._clickCoords, this._geometry, event);
if (this._geometry._firstClick) {
this._geometry._firstClick = prjCoord;
}
const copyEvent = this._copyMapEventOnSnapTo(event, prjCoord);
registerMode['update'](map.getProjection(), this._clickCoords, this._geometry, copyEvent);
}
}
}
Expand All @@ -644,7 +659,7 @@ class DrawTool extends MapTool {
*/
//@internal
_mouseMoveHandler(event) {
if(!event?.coordinate) {
if (!event?.coordinate) {
return
}
if (!this.options.interactive) {
Expand All @@ -670,10 +685,12 @@ class DrawTool extends MapTool {
// for snap effect
let snapAdditionVertex = [];
const snapTo = this._geometry.snapTo;
let copyEvent;
if (snapTo && isFunction(snapTo)) {
const snapResult = this._getSnapResult(snapTo, containerPoint);
prjCoord = snapResult.prjCoord;
snapAdditionVertex = snapResult.effectedVertex;
copyEvent = this._copyMapEventOnSnapTo(event, prjCoord);
}
const projection = map.getProjection();
event.drawTool = this;
Expand All @@ -683,10 +700,10 @@ class DrawTool extends MapTool {
if (path && path.length > 0 && prjCoord.equals(path[path.length - 1])) {
return;
}
registerMode['update'](projection, path.concat(snapAdditionVertex, [prjCoord]), this._geometry, event);
registerMode['update'](projection, path.concat(snapAdditionVertex, [prjCoord]), this._geometry, copyEvent || event);
} else {
//free hand mode
registerMode['update'](projection, prjCoord, this._geometry, event);
registerMode['update'](projection, prjCoord, this._geometry, copyEvent || event);
}
/**
* mousemove事件
Expand Down Expand Up @@ -717,7 +734,7 @@ class DrawTool extends MapTool {
*/
//@internal
_doubleClickHandler(event) {
if(!event?.coordinate) {
if (!event?.coordinate) {
return
}
if (!this.options.interactive) {
Expand Down
7 changes: 6 additions & 1 deletion packages/maptalks/src/map/tool/DrawToolRegister.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,20 @@ const circleHooks: modeActionType = {
// const center = projection.unproject(prjCoord[0]);
const center = queryTerrainCoordinates(projection, prjCoord[0], mapEvent);
const circle: Circle = new Circle(center as Coordinate, 0);
(circle as any)._firstClick = prjCoord[0];
// circle._setPrjCoordinates(prjCoord[0]);
return circle;
},
'update': function (projection, prjPath, geometry, mapEvent) {
let center = geometry.getCenter();
if (geometry._firstClick) {
center = queryTerrainCoordinates(projection, geometry._firstClick, mapEvent);
}
const map = geometry.getMap();
const prjCoord = Array.isArray(prjPath) ? prjPath[prjPath.length - 1] : prjPath;
// const nextCoord = projection.unproject(prjCoord);
const nextCoord = queryTerrainCoordinates(projection, prjCoord, mapEvent);
const radius = map.computeLength(geometry.getCenter(), nextCoord);
const radius = map.computeLength(center, nextCoord);
geometry.setRadius(radius);
},
'generate': function (geometry) {
Expand Down