Rename ol.geom.VertexArray to ol.CoordinateArray

src/ol/geom/base.js

@@ -1,14 +1,6 @@
-goog.provide('ol.geom.VertexArray');
-
 goog.require('ol.coordinate');
 
 
-/**
- * @typedef {Array.<ol.geom.Vertex>}
- */
-ol.geom.VertexArray;
-
-
 /**
  * Calculate the squared distance from a point to a line segment.
  *

src/ol/geom/linearring.js

@@ -1,16 +1,16 @@
 goog.provide('ol.geom.LinearRing');
 
+goog.require('ol.CoordinateArray');
 goog.require('ol.geom.GeometryType');
 goog.require('ol.geom.LineString');
 goog.require('ol.geom.SharedVertices');
-goog.require('ol.geom.VertexArray');
 
 
 
 /**
  * @constructor
  * @extends {ol.geom.LineString}
- * @param {ol.geom.VertexArray} coordinates Vertex array (e.g.
+ * @param {ol.CoordinateArray} coordinates Vertex array (e.g.
  *    [[x0, y0], [x1, y1]]).
  * @param {ol.geom.SharedVertices=} opt_shared Shared vertices.
  */
@@ -39,7 +39,7 @@ goog.inherits(ol.geom.LinearRing, ol.geom.LineString);
  * implementation for an example of this.
  * https://github.com/OSGeo/gdal/blob/trunk/gdal/ogr/ogrlinearring.cpp
  *
- * @param {ol.geom.VertexArray} coordinates Linear ring coordinates.
+ * @param {ol.CoordinateArray} coordinates Linear ring coordinates.
  * @return {boolean} The coordinates are in clockwise order.
  */
 ol.geom.LinearRing.isClockwise = function(coordinates) {

src/ol/geom/linestring.js

@@ -1,17 +1,17 @@
 goog.provide('ol.geom.LineString');
 
 goog.require('goog.asserts');
+goog.require('ol.CoordinateArray');
 goog.require('ol.geom.Geometry');
 goog.require('ol.geom.GeometryType');
 goog.require('ol.geom.SharedVertices');
-goog.require('ol.geom.VertexArray');
 
 
 
 /**
  * @constructor
  * @extends {ol.geom.Geometry}
- * @param {ol.geom.VertexArray} coordinates Vertex array (e.g.
+ * @param {ol.CoordinateArray} coordinates Vertex array (e.g.
  *    [[x0, y0], [x1, y1]]).
  * @param {ol.geom.SharedVertices=} opt_shared Shared vertices.
  */
@@ -67,7 +67,7 @@ ol.geom.LineString.prototype.get = function(index, dim) {
 
 /**
  * @inheritDoc
- * @return {ol.geom.VertexArray} Coordinates array.
+ * @return {ol.CoordinateArray} Coordinates array.
  */
 ol.geom.LineString.prototype.getCoordinates = function() {
   var count = this.getCount();

src/ol/geom/multilinestring.js

@@ -1,18 +1,18 @@
 goog.provide('ol.geom.MultiLineString');
 
 goog.require('goog.asserts');
+goog.require('ol.CoordinateArray');
 goog.require('ol.geom.AbstractCollection');
 goog.require('ol.geom.GeometryType');
 goog.require('ol.geom.LineString');
 goog.require('ol.geom.SharedVertices');
-goog.require('ol.geom.VertexArray');
 
 
 
 /**
  * @constructor
  * @extends {ol.geom.AbstractCollection}
- * @param {Array.<ol.geom.VertexArray>} coordinates Coordinates array.
+ * @param {Array.<ol.CoordinateArray>} coordinates Coordinates array.
  * @param {ol.geom.SharedVertices=} opt_shared Shared vertices.
  */
 ol.geom.MultiLineString = function(coordinates, opt_shared) {

src/ol/geom/multipoint.js

@@ -1,18 +1,18 @@
 goog.provide('ol.geom.MultiPoint');
 
 goog.require('goog.asserts');
+goog.require('ol.CoordinateArray');
 goog.require('ol.geom.AbstractCollection');
 goog.require('ol.geom.GeometryType');
 goog.require('ol.geom.Point');
 goog.require('ol.geom.SharedVertices');
-goog.require('ol.geom.VertexArray');
 
 
 
 /**
  * @constructor
  * @extends {ol.geom.AbstractCollection}
- * @param {ol.geom.VertexArray} coordinates Coordinates array.
+ * @param {ol.CoordinateArray} coordinates Coordinates array.
  * @param {ol.geom.SharedVertices=} opt_shared Shared vertices.
  */
 ol.geom.MultiPoint = function(coordinates, opt_shared) {

src/ol/geom/multipolygon.js

@@ -1,18 +1,18 @@
 goog.provide('ol.geom.MultiPolygon');
 
 goog.require('goog.asserts');
+goog.require('ol.CoordinateArray');
 goog.require('ol.geom.AbstractCollection');
 goog.require('ol.geom.GeometryType');
 goog.require('ol.geom.Polygon');
 goog.require('ol.geom.SharedVertices');
-goog.require('ol.geom.VertexArray');
 
 
 
 /**
  * @constructor
  * @extends {ol.geom.AbstractCollection}
- * @param {Array.<Array.<ol.geom.VertexArray>>} coordinates Coordinates
+ * @param {Array.<Array.<ol.CoordinateArray>>} coordinates Coordinates
  *    array.
  * @param {ol.geom.SharedVertices=} opt_shared Shared vertices.
  */

src/ol/geom/polygon.js

@@ -1,12 +1,12 @@
 goog.provide('ol.geom.Polygon');
 
 goog.require('goog.asserts');
+goog.require('ol.CoordinateArray');
 goog.require('ol.extent');
 goog.require('ol.geom.Geometry');
 goog.require('ol.geom.GeometryType');
 goog.require('ol.geom.LinearRing');
 goog.require('ol.geom.SharedVertices');
-goog.require('ol.geom.VertexArray');
 
 
 
@@ -19,7 +19,7 @@ goog.require('ol.geom.VertexArray');
  *
  * @constructor
  * @extends {ol.geom.Geometry}
- * @param {Array.<ol.geom.VertexArray>} coordinates Array of rings.  First
+ * @param {Array.<ol.CoordinateArray>} coordinates Array of rings.  First
  *    is outer, any remaining are inner.
  * @param {ol.geom.SharedVertices=} opt_shared Shared vertices.
  */
@@ -89,7 +89,7 @@ ol.geom.Polygon.prototype.getBounds = function() {
 
 
 /**
- * @return {Array.<ol.geom.VertexArray>} Coordinates array.
+ * @return {Array.<ol.CoordinateArray>} Coordinates array.
  */
 ol.geom.Polygon.prototype.getCoordinates = function() {
   var count = this.rings.length;

src/ol/geom/sharedvertices.js

@@ -2,7 +2,7 @@ goog.provide('ol.geom.SharedVertices');
 
 goog.require('goog.asserts');
 goog.require('ol.Coordinate');
-goog.require('ol.geom.VertexArray');
+goog.require('ol.CoordinateArray');
 
 
 /**
@@ -60,7 +60,7 @@ ol.geom.SharedVertices = function(opt_options) {
 
 /**
  * Adds a vertex array to the shared coordinate array.
- * @param {ol.geom.VertexArray} vertices Array of vertices.
+ * @param {ol.CoordinateArray} vertices Array of vertices.
  * @return {number} Index used to reference the added vertex array.
  */
 ol.geom.SharedVertices.prototype.add = function(vertices) {