Use ol.Coordinate instead of ol.geom.Vertex

This commit is contained in:
Tim Schaub
2013-08-30 13:30:25 -06:00
parent 29317c3316
commit 7165d414c7
4 changed files with 7 additions and 14 deletions

View File

@@ -1,15 +1,8 @@
goog.provide('ol.geom.Vertex');
goog.provide('ol.geom.VertexArray'); goog.provide('ol.geom.VertexArray');
goog.require('ol.coordinate'); goog.require('ol.coordinate');
/**
* @typedef {Array.<number>}
*/
ol.geom.Vertex;
/** /**
* @typedef {Array.<ol.geom.Vertex>} * @typedef {Array.<ol.geom.Vertex>}
*/ */

View File

@@ -1,17 +1,17 @@
goog.provide('ol.geom.Point'); goog.provide('ol.geom.Point');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('ol.Coordinate');
goog.require('ol.geom.Geometry'); goog.require('ol.geom.Geometry');
goog.require('ol.geom.GeometryType'); goog.require('ol.geom.GeometryType');
goog.require('ol.geom.SharedVertices'); goog.require('ol.geom.SharedVertices');
goog.require('ol.geom.Vertex');
/** /**
* @constructor * @constructor
* @extends {ol.geom.Geometry} * @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. * @param {ol.geom.SharedVertices=} opt_shared Shared vertices.
*/ */
ol.geom.Point = function(coordinates, opt_shared) { ol.geom.Point = function(coordinates, opt_shared) {
@@ -76,7 +76,7 @@ ol.geom.Point.prototype.getBounds = function() {
/** /**
* @inheritDoc * @inheritDoc
* @return {ol.geom.Vertex} Coordinates array. * @return {ol.Coordinate} Coordinates array.
*/ */
ol.geom.Point.prototype.getCoordinates = function() { ol.geom.Point.prototype.getCoordinates = function() {
var coordinates = new Array(this.dimension); var coordinates = new Array(this.dimension);

View File

@@ -1,13 +1,13 @@
goog.provide('ol.geom.SharedVertices'); goog.provide('ol.geom.SharedVertices');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('ol.geom.Vertex'); goog.require('ol.Coordinate');
goog.require('ol.geom.VertexArray'); goog.require('ol.geom.VertexArray');
/** /**
* @typedef {{dimension: (number), * @typedef {{dimension: (number),
* offset: (ol.geom.Vertex|undefined)}} * offset: (ol.Coordinate|undefined)}}
*/ */
ol.geom.SharedVerticesOptions; ol.geom.SharedVerticesOptions;

View File

@@ -1,5 +1,6 @@
goog.provide('ol.parser.TopoJSON'); goog.provide('ol.parser.TopoJSON');
goog.require('ol.Coordinate');
goog.require('ol.Feature'); goog.require('ol.Feature');
goog.require('ol.geom.GeometryType'); goog.require('ol.geom.GeometryType');
goog.require('ol.geom.LineString'); goog.require('ol.geom.LineString');
@@ -8,7 +9,6 @@ goog.require('ol.geom.MultiPoint');
goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.MultiPolygon');
goog.require('ol.geom.Point'); goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon'); goog.require('ol.geom.Polygon');
goog.require('ol.geom.Vertex');
goog.require('ol.geom.VertexArray'); goog.require('ol.geom.VertexArray');
goog.require('ol.parser.Parser'); goog.require('ol.parser.Parser');
goog.require('ol.parser.ReadFeaturesOptions'); 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 * Apply a linear transform to a vertex. The provided vertex is modified in
* place. * place.
* *
* @param {ol.geom.Vertex} vertex Vertex. * @param {ol.Coordinate} vertex Vertex.
* @param {Array.<number>} scale Scale for each dimension. * @param {Array.<number>} scale Scale for each dimension.
* @param {Array.<number>} translate Translation for each dimension. * @param {Array.<number>} translate Translation for each dimension.
* @private * @private