From 7165d414c7d91ef256e5bc347eb44c004db4ff30 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 30 Aug 2013 13:30:25 -0600 Subject: [PATCH] Use ol.Coordinate instead of ol.geom.Vertex --- src/ol/geom/base.js | 7 ------- src/ol/geom/point.js | 6 +++--- src/ol/geom/sharedvertices.js | 4 ++-- src/ol/parser/topojson.js | 4 ++-- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/ol/geom/base.js b/src/ol/geom/base.js index c2a9686ccb..a2bd01e309 100644 --- a/src/ol/geom/base.js +++ b/src/ol/geom/base.js @@ -1,15 +1,8 @@ -goog.provide('ol.geom.Vertex'); goog.provide('ol.geom.VertexArray'); goog.require('ol.coordinate'); -/** - * @typedef {Array.} - */ -ol.geom.Vertex; - - /** * @typedef {Array.} */ diff --git a/src/ol/geom/point.js b/src/ol/geom/point.js index 97d3ed7a34..f598aec16a 100644 --- a/src/ol/geom/point.js +++ b/src/ol/geom/point.js @@ -1,17 +1,17 @@ goog.provide('ol.geom.Point'); goog.require('goog.asserts'); +goog.require('ol.Coordinate'); goog.require('ol.geom.Geometry'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.SharedVertices'); -goog.require('ol.geom.Vertex'); /** * @constructor * @extends {ol.geom.Geometry} - * @param {ol.geom.Vertex} coordinates Coordinates array (e.g. [x, y]). + * @param {ol.Coordinate} coordinates Coordinates array (e.g. [x, y]). * @param {ol.geom.SharedVertices=} opt_shared Shared vertices. */ ol.geom.Point = function(coordinates, opt_shared) { @@ -76,7 +76,7 @@ ol.geom.Point.prototype.getBounds = function() { /** * @inheritDoc - * @return {ol.geom.Vertex} Coordinates array. + * @return {ol.Coordinate} Coordinates array. */ ol.geom.Point.prototype.getCoordinates = function() { var coordinates = new Array(this.dimension); diff --git a/src/ol/geom/sharedvertices.js b/src/ol/geom/sharedvertices.js index 9d2df539ad..0a2decfdd5 100644 --- a/src/ol/geom/sharedvertices.js +++ b/src/ol/geom/sharedvertices.js @@ -1,13 +1,13 @@ goog.provide('ol.geom.SharedVertices'); goog.require('goog.asserts'); -goog.require('ol.geom.Vertex'); +goog.require('ol.Coordinate'); goog.require('ol.geom.VertexArray'); /** * @typedef {{dimension: (number), - * offset: (ol.geom.Vertex|undefined)}} + * offset: (ol.Coordinate|undefined)}} */ ol.geom.SharedVerticesOptions; diff --git a/src/ol/parser/topojson.js b/src/ol/parser/topojson.js index a6221782ca..02c9419b8b 100644 --- a/src/ol/parser/topojson.js +++ b/src/ol/parser/topojson.js @@ -1,5 +1,6 @@ goog.provide('ol.parser.TopoJSON'); +goog.require('ol.Coordinate'); goog.require('ol.Feature'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.LineString'); @@ -8,7 +9,6 @@ goog.require('ol.geom.MultiPoint'); goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); -goog.require('ol.geom.Vertex'); goog.require('ol.geom.VertexArray'); goog.require('ol.parser.Parser'); goog.require('ol.parser.ReadFeaturesOptions'); @@ -419,7 +419,7 @@ ol.parser.TopoJSON.prototype.transformArc_ = function(arc, scale, translate) { * Apply a linear transform to a vertex. The provided vertex is modified in * place. * - * @param {ol.geom.Vertex} vertex Vertex. + * @param {ol.Coordinate} vertex Vertex. * @param {Array.} scale Scale for each dimension. * @param {Array.} translate Translation for each dimension. * @private