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

Return Uint16Array from ol.geom2.LineStringCollection#getIndices

Browse Source
This commit is contained in:
Tom Payne
2013-05-31 17:47:25 +02:00
parent 38c0e24bcd
commit e260255ce8
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/geom2/linestringcollection.js
+2 -3
View File
@@ -136,11 +136,10 @@ ol.geom2.LineStringCollection.prototype.getExtent = function() {
/** /**
* @return {Array} Indices. * @return {Uint16Array} Indices.
*/ */
ol.geom2.LineStringCollection.prototype.getIndices = function() { ol.geom2.LineStringCollection.prototype.getIndices = function() {
// FIXME cache and track dirty / track output length // FIXME cache and track dirty / track output length
// FIXME return UInt16Array?
var dim = this.dim; var dim = this.dim;
var offsets = goog.array.map(goog.object.getKeys(this.ranges), Number); var offsets = goog.array.map(goog.object.getKeys(this.ranges), Number);
goog.array.sort(offsets); goog.array.sort(offsets);
@@ -154,7 +153,7 @@ ol.geom2.LineStringCollection.prototype.getIndices = function() {
indices.push(j, j + 1); indices.push(j, j + 1);
} }
} }
return indices; return new Uint16Array(indices);
}; };
test/spec/ol/geom2/linecollection.test.js
+5 -5
View File
@@ -197,7 +197,7 @@ describe('ol.geom2.LineStringCollection', function() {
describe('getIndices', function() { describe('getIndices', function() {
it('returns the expected value', function() { it('returns the expected value', function() {
expect(lsc.getIndices()).to.eql([0, 1]); expect(lsc.getIndices()).to.arreql([0, 1]);
}); });
}); });
@@ -276,7 +276,7 @@ describe('ol.geom2.LineStringCollection', function() {
describe('getIndices', function() { describe('getIndices', function() {
it('returns the expected value', function() { it('returns the expected value', function() {
expect(lsc.getIndices()).to.eql([0, 1, 2, 3, 3, 4]); expect(lsc.getIndices()).to.arreql([0, 1, 2, 3, 3, 4]);
}); });
}); });
@@ -287,14 +287,14 @@ describe('ol.geom2.LineStringCollection', function() {
lsc.remove(0); lsc.remove(0);
expect(lsc.getCount()).to.be(1); expect(lsc.getCount()).to.be(1);
expect(lsc.get(4)).to.eql([[4, 5], [6, 7], [8, 9]]); expect(lsc.get(4)).to.eql([[4, 5], [6, 7], [8, 9]]);
expect(lsc.getIndices()).to.eql([2, 3, 3, 4]); expect(lsc.getIndices()).to.arreql([2, 3, 3, 4]);
}); });
it('can remove the second line string', function() { it('can remove the second line string', function() {
lsc.remove(4); lsc.remove(4);
expect(lsc.getCount()).to.be(1); expect(lsc.getCount()).to.be(1);
expect(lsc.get(0)).to.eql([[0, 1], [2, 3]]); expect(lsc.get(0)).to.eql([[0, 1], [2, 3]]);
expect(lsc.getIndices()).to.eql([0, 1]); expect(lsc.getIndices()).to.arreql([0, 1]);
}); });
}); });
@@ -315,7 +315,7 @@ describe('ol.geom2.LineStringCollection', function() {
expect(lsc.add([[10, 11], [12, 13], [14, 15]])).to.be(10); expect(lsc.add([[10, 11], [12, 13], [14, 15]])).to.be(10);
expect(lsc.getCount()).to.be(2); expect(lsc.getCount()).to.be(2);
expect(lsc.get(10)).to.eql([[10, 11], [12, 13], [14, 15]]); expect(lsc.get(10)).to.eql([[10, 11], [12, 13], [14, 15]]);
expect(lsc.getIndices()).to.eql([2, 3, 3, 4, 5, 6, 6, 7]); expect(lsc.getIndices()).to.arreql([2, 3, 3, 4, 5, 6, 6, 7]);
}); });
}); });