Use binary search in ol.geom.flat.lineStringCoordinateAtM

This commit is contained in:
Tom Payne
2014-02-25 19:13:38 +01:00
parent 1c21316d20
commit c0f9b1de19
+28 -18
View File
@@ -341,26 +341,36 @@ ol.geom.flat.lineStringCoordinateAtM =
} }
} }
// FIXME use O(1) search // FIXME use O(1) search
for (offset += stride; offset < end; offset += stride) { if (m == flatCoordinates[offset + stride - 1]) {
var m1 = flatCoordinates[offset + stride - 1]; return flatCoordinates.slice(offset, offset + stride);
if (m < m1) { }
var m0 = flatCoordinates[offset - 1]; var lo = offset / stride;
var t = (m - m0) / (m1 - m0); var hi = end / stride;
coordinate = []; while (lo < hi) {
var i; var mid = (lo + hi) >> 1;
for (i = 0; i < stride - 1; ++i) { if (m < flatCoordinates[(mid + 1) * stride - 1]) {
coordinate.push((1 - t) * flatCoordinates[offset - stride + i] + hi = mid;
t * flatCoordinates[offset + i]); } else {
} lo = mid + 1;
coordinate.push(m);
goog.asserts.assert(coordinate.length == stride);
return coordinate;
} else if (m == m1) {
return flatCoordinates.slice(offset, offset + stride);
} }
} }
goog.asserts.fail(); var m0 = flatCoordinates[lo * stride - 1];
return null; if (m == m0) {
return flatCoordinates.slice((lo - 1) * stride, (lo - 1) * stride + stride);
}
var m1 = flatCoordinates[(lo + 1) * stride - 1];
goog.asserts.assert(m0 < m);
goog.asserts.assert(m <= m1);
var t = (m - m0) / (m1 - m0);
coordinate = [];
var i;
for (i = 0; i < stride - 1; ++i) {
coordinate.push((1 - t) * flatCoordinates[(lo - 1) * stride + i] +
t * flatCoordinates[lo * stride + i]);
}
coordinate.push(m);
goog.asserts.assert(coordinate.length == stride);
return coordinate;
}; };