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

Fix WebGL PolygonReplay#getPointsInTriangle_

Browse Source
This commit is contained in:
GaborFarkas
2016-10-10 13:18:39 +02:00
parent 0c3d5eca5c
commit 004c0f7e27
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/render/webgl/polygonreplay/index.js
+7 -5
View File
@@ -580,11 +580,13 @@ ol.render.webgl.PolygonReplay.prototype.insertItem_ = function(p0, p1, list, opt
* @param {ol.structs.RBush} rtree R-Tree of the polygon. * @param {ol.structs.RBush} rtree R-Tree of the polygon.
*/ */
ol.render.webgl.PolygonReplay.prototype.removeItem_ = function(s0, s1, list, rtree) { ol.render.webgl.PolygonReplay.prototype.removeItem_ = function(s0, s1, list, rtree) {
list.removeItem(); if (list.getCurrItem() === s1) {
s0.p1 = s1.p1; list.removeItem();
rtree.remove(s1); s0.p1 = s1.p1;
rtree.update([Math.min(s0.p0.x, s0.p1.x), Math.min(s0.p0.y, s0.p1.y), rtree.remove(s1);
rtree.update([Math.min(s0.p0.x, s0.p1.x), Math.min(s0.p0.y, s0.p1.y),
Math.max(s0.p0.x, s0.p1.x), Math.max(s0.p0.y, s0.p1.y)], s0); Math.max(s0.p0.x, s0.p1.x), Math.max(s0.p0.y, s0.p1.y)], s0);
}
}; };
@@ -607,7 +609,7 @@ ol.render.webgl.PolygonReplay.prototype.getPointsInTriangle_ = function(p0, p1,
for (i = 0, ii = segmentsInExtent.length; i < ii; ++i) { for (i = 0, ii = segmentsInExtent.length; i < ii; ++i) {
for (j in segmentsInExtent[i]) { for (j in segmentsInExtent[i]) {
p = segmentsInExtent[i][j]; p = segmentsInExtent[i][j];
if (p.x && p.y && (!opt_reflex || p.reflex)) { if (typeof p === 'object' && (!opt_reflex || p.reflex)) {
if ((p.x !== p0.x || p.y !== p0.y) && (p.x !== p1.x || p.y !== p1.y) && if ((p.x !== p0.x || p.y !== p0.y) && (p.x !== p1.x || p.y !== p1.y) &&
(p.x !== p2.x || p.y !== p2.y) && result.indexOf(p) === -1 && (p.x !== p2.x || p.y !== p2.y) && result.indexOf(p) === -1 &&
ol.geom.flat.contains.linearRingContainsXY([p0.x, p0.y, p1.x, p1.y, ol.geom.flat.contains.linearRingContainsXY([p0.x, p0.y, p1.x, p1.y,