Skip to content

fix Sector _containsPoint by graphical method #2617

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 2 commits into from
Sep 4, 2025
Merged

fix Sector _containsPoint by graphical method #2617

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33aae5d
fix Sector _containsPoint by graphical method
deyihu Aug 28, 2025
9c3728f
updates
deyihu Aug 28, 2025
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
58 changes: 32 additions & 26 deletions packages/maptalks/src/geometry/Sector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Geometry } from './Geometry';
import { extend, isNil } from '../core/util';
import Coordinate from '../geo/Coordinate';
import Extent from '../geo/Extent';
Expand Down Expand Up @@ -166,33 +167,38 @@ export class Sector extends Circle {
return Circle.prototype._computePrjExtent.apply(this, arguments);
}

//@internal
// //@internal
// _containsPoint(point: Point, tolerance?: number) {
// const map = this.getMap();
// if (map.isTransforming()) {
// return super._containsPoint(point, tolerance);
// }
// const center = map._pointToContainerPoint(this._getCenter2DPoint()),
// t = this._hitTestTolerance() + (tolerance || 0),
// size = this.getSize(),
// pc = center,
// pp = point,
// x = pp.x - pc.x,
// y = pc.y - pp.y,
// atan2 = Math.atan2(y, x),
// // [0.0, 360.0)
// angle = atan2 < 0 ? (atan2 + 2 * Math.PI) * 360 / (2 * Math.PI) :
// atan2 * 360 / (2 * Math.PI);
// const [startAngle, endAngle] = this._correctAngles();
// const sAngle = startAngle % 360,
// eAngle = endAngle % 360;
// let between = false;
// if (sAngle > eAngle) {
// between = !(angle > eAngle && angle < sAngle);
// } else {
// between = (angle >= sAngle && angle <= eAngle);
// }
// return pp.distanceTo(pc) <= (size.width / 2 + t) && between;
// }

// @internal
_containsPoint(point: Point, tolerance?: number) {
const map = this.getMap();
if (map.isTransforming()) {
return super._containsPoint(point, tolerance);
}
const center = map._pointToContainerPoint(this._getCenter2DPoint()),
t = this._hitTestTolerance() + (tolerance || 0),
size = this.getSize(),
pc = center,
pp = point,
x = pp.x - pc.x,
y = pc.y - pp.y,
atan2 = Math.atan2(y, x),
// [0.0, 360.0)
angle = atan2 < 0 ? (atan2 + 2 * Math.PI) * 360 / (2 * Math.PI) :
atan2 * 360 / (2 * Math.PI);
const [startAngle, endAngle] = this._correctAngles();
const sAngle = startAngle % 360,
eAngle = endAngle % 360;
let between = false;
if (sAngle > eAngle) {
between = !(angle > eAngle && angle < sAngle);
} else {
between = (angle >= sAngle && angle <= eAngle);
}
return pp.distanceTo(pc) <= (size.width / 2 + t) && between;
return Geometry.prototype._containsPoint.call(this, point, tolerance);
}

//@internal
Expand Down