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

Pass offset and end to ol.extent.extendFlatCoordinates

Browse Source
This commit is contained in:
Tom Payne
2014-01-23 14:14:21 +01:00
parent 60f104c895
commit 3c16e03ae2
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ol/extent.js
View File

@@ -216,14 +216,17 @@ ol.extent.createOrUpdateFromCoordinates = function(coordinates, opt_extent) {
/** /**
* @param {Array.<number>} flatCoordinates Flat coordinates. * @param {Array.<number>} flatCoordinates Flat coordinates.
* @param {number} offset Offset.
* @param {number} end End.
* @param {number} stride Stride. * @param {number} stride Stride.
* @param {ol.Extent=} opt_extent Extent. * @param {ol.Extent=} opt_extent Extent.
* @return {ol.Extent} Extent. * @return {ol.Extent} Extent.
*/ */
ol.extent.createOrUpdateFromFlatCoordinates = ol.extent.createOrUpdateFromFlatCoordinates =
function(flatCoordinates, stride, opt_extent) { function(flatCoordinates, offset, end, stride, opt_extent) {
var extent = ol.extent.createOrUpdateEmpty(opt_extent); var extent = ol.extent.createOrUpdateEmpty(opt_extent);
return ol.extent.extendFlatCoordinates(extent, flatCoordinates, stride); return ol.extent.extendFlatCoordinates(
extent, flatCoordinates, offset, end, stride);
}; };
@@ -324,13 +327,16 @@ ol.extent.extendCoordinates = function(extent, coordinates) {
/** /**
* @param {ol.Extent} extent Extent. * @param {ol.Extent} extent Extent.
* @param {Array.<number>} flatCoordinates Flat coordinates. * @param {Array.<number>} flatCoordinates Flat coordinates.
* @param {number} offset Offset.
* @param {number} end End.
* @param {number} stride Stride. * @param {number} stride Stride.
* @return {ol.Extent} Extent. * @return {ol.Extent} Extent.
*/ */
ol.extent.extendFlatCoordinates = function(extent, flatCoordinates, stride) { ol.extent.extendFlatCoordinates =
var i, ii; function(extent, flatCoordinates, offset, end, stride) {
for (i = 0, ii = flatCoordinates.length; i < ii; i += stride) { for (; offset < end; offset += stride) {
ol.extent.extendXY(extent, flatCoordinates[i], flatCoordinates[i + 1]); ol.extent.extendXY(
extent, flatCoordinates[offset], flatCoordinates[offset + 1]);
} }
return extent; return extent;
}; };

3
src/ol/geom/simplegeometry.js
View File

@@ -90,7 +90,8 @@ ol.geom.SimpleGeometry.prototype.containsXY = goog.functions.FALSE;
ol.geom.SimpleGeometry.prototype.getExtent = function(opt_extent) { ol.geom.SimpleGeometry.prototype.getExtent = function(opt_extent) {
if (this.extentRevision != this.getRevision()) { if (this.extentRevision != this.getRevision()) {
this.extent = ol.extent.createOrUpdateFromFlatCoordinates( this.extent = ol.extent.createOrUpdateFromFlatCoordinates(
this.flatCoordinates, this.stride, this.extent); this.flatCoordinates, 0, this.flatCoordinates.length, this.stride,
this.extent);
this.extentRevision = this.getRevision(); this.extentRevision = this.getRevision();
} }
goog.asserts.assert(goog.isDef(this.extent)); goog.asserts.assert(goog.isDef(this.extent));