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

Move layout test in ol.geom.LineString

Browse Source
This commit is contained in:
Tom Payne
2014-03-02 11:35:15 +01:00
parent c3cad6b6fa
commit 2d9091856c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/geom/flatgeom.js
+2 -5
View File
@@ -310,16 +310,13 @@ ol.geom.flat.lineStringInterpolate =
* @param {number} offset Offset. * @param {number} offset Offset.
* @param {number} end End. * @param {number} end End.
* @param {number} stride Stride. * @param {number} stride Stride.
* @param {ol.geom.GeometryLayout} layout Layout.
* @param {number} m M. * @param {number} m M.
* @param {boolean} extrapolate Extrapolate. * @param {boolean} extrapolate Extrapolate.
* @return {ol.Coordinate} Coordinate. * @return {ol.Coordinate} Coordinate.
*/ */
ol.geom.flat.lineStringCoordinateAtM = ol.geom.flat.lineStringCoordinateAtM =
function(flatCoordinates, offset, end, stride, layout, m, extrapolate) { function(flatCoordinates, offset, end, stride, m, extrapolate) {
if ((layout != ol.geom.GeometryLayout.XYM && if (end == offset) {
layout != ol.geom.GeometryLayout.XYZM) ||
end == offset) {
return null; return null;
} }
var coordinate; var coordinate;
src/ol/geom/linestring.js
+5 -1
View File
@@ -86,9 +86,13 @@ ol.geom.LineString.prototype.closestPointXY =
* @return {ol.Coordinate} Coordinate. * @return {ol.Coordinate} Coordinate.
*/ */
ol.geom.LineString.prototype.getCoordinateAtM = function(m, opt_extrapolate) { ol.geom.LineString.prototype.getCoordinateAtM = function(m, opt_extrapolate) {
if (this.layout != ol.geom.GeometryLayout.XYM &&
this.layout != ol.geom.GeometryLayout.XYZM) {
return null;
}
var extrapolate = goog.isDef(opt_extrapolate) ? opt_extrapolate : false; var extrapolate = goog.isDef(opt_extrapolate) ? opt_extrapolate : false;
return ol.geom.flat.lineStringCoordinateAtM(this.flatCoordinates, 0, return ol.geom.flat.lineStringCoordinateAtM(this.flatCoordinates, 0,
this.flatCoordinates.length, this.stride, this.layout, m, extrapolate); this.flatCoordinates.length, this.stride, m, extrapolate);
}; };