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

Fixing a wrong calculation in LinearRing::containsPoint

Browse Source
This commit is contained in:
Pierre GIRAUD
2012-01-13 17:36:23 +01:00
parent 78714f6de4
commit 7a0336a9ef
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers/Geometry/LinearRing.js
View File

@@ -294,7 +294,7 @@ OpenLayers.Geometry.LinearRing = OpenLayers.Class(
var px = approx(point.x, digs);
var py = approx(point.y, digs);
function getX(y, x1, y1, x2, y2) {
return (((x1 - x2) * y) + ((x2 * y1) - (x1 * y2))) / (y1 - y2);
return (y-y2)*((x2-x1)/(y2-y1)) + x2;
}
var numSeg = this.components.length - 1;
var start, end, x1, y1, x2, y2, cx, cy;

16
tests/Geometry/LinearRing.html
View File

@@ -250,6 +250,22 @@
"resize correctly adjusts y of component 4");
}
function test_LinearRing_containsPoint(t) {
t.plan(1);
var components = [
new OpenLayers.Geometry.Point(-10812863.417266,3923827.912779),
new OpenLayers.Geometry.Point(-10812863.417264,3923951.5257855),
new OpenLayers.Geometry.Point(-10812309.24881,3923990.9386282),
new OpenLayers.Geometry.Point(-10812751.15038,3923798.0545649)
];
var ring = new OpenLayers.Geometry.LinearRing(components);
var point = new OpenLayers.Geometry.Point(-10812964.078829, 3923856.9524225);
t.ok(!ring.containsPoint(point),
"containsPoint correctly returns false for point outside");
}
</script>
</head>