Merge pull request #2729 from icholy/master

Fix type annotations
CesiumGS · May 19, 2015 · d880e17 · d880e17
2 parents 0af79be + 9fed54c
commit d880e17
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/Source/Core/GeographicTilingScheme.js b/Source/Core/GeographicTilingScheme.js
@@ -75,7 +75,7 @@ define([
         /**
          * Gets the map projection used by this tiling scheme.
          * @memberof GeographicTilingScheme.prototype
-         * @type {Projection}
+         * @type {MapProjection}
          */
         projection : {
             get : function() {
@@ -200,7 +200,7 @@ define([
      *
      * @param {Cartographic} position The position.
      * @param {Number} level The tile level-of-detail.  Zero is the least detailed.
-     * @param {Cartesian} [result] The instance to which to copy the result, or undefined if a new instance
+     * @param {Cartesian2} [result] The instance to which to copy the result, or undefined if a new instance
      *        should be created.
      * @returns {Cartesian2} The specified 'result', or a new object containing the tile x, y coordinates
      *          if 'result' is undefined.
@@ -243,4 +243,4 @@ define([
     };
 
     return GeographicTilingScheme;
-});
+});
diff --git a/Source/Core/IndexDatatype.js b/Source/Core/IndexDatatype.js
@@ -121,8 +121,8 @@ define([
      *
      * @param {Number} numberOfVertices Number of vertices that the indices will reference.
      * @param {ArrayBuffer} sourceArray Passed through to the typed array constructor.
-     * @param {byteOffset} byteOffset Passed through to the typed array constructor.
-     * @param {length} length Passed through to the typed array constructor.
+     * @param {Number} byteOffset Passed through to the typed array constructor.
+     * @param {Number} length Passed through to the typed array constructor.
      * @returns {Uint16Array|Uint32Array} A <code>Uint16Array</code> or <code>Uint32Array</code> constructed with <code>sourceArray</code>, <code>byteOffset</code>, and <code>length</code>.
      *
      */

diff --git a/Source/Core/IntersectionTests.js b/Source/Core/IntersectionTests.js
@@ -579,7 +579,7 @@ define([
      *
      * @param {Ray} ray The ray.
      * @param {Ellipsoid} ellipsoid The ellipsoid.
-     * @returns {Cartesian} The nearest planetodetic point on the ray.
+     * @returns {Cartesian3} The nearest planetodetic point on the ray.
      */
     IntersectionTests.grazingAltitudeLocation = function(ray, ellipsoid) {
         //>>includeStart('debug', pragmas.debug);

diff --git a/Source/Core/TileProviderError.js b/Source/Core/TileProviderError.js
@@ -29,7 +29,7 @@ define([
     var TileProviderError = function TileProviderError(provider, message, x, y, level, timesRetried, error) {
         /**
          * The {@link ImageryProvider} or {@link TerrainProvider} that experienced the error.
-         * @type {ImageryProvider|TerainProvider}
+         * @type {ImageryProvider|TerrainProvider}
          */
         this.provider = provider;
 

diff --git a/Source/Core/TilingScheme.js b/Source/Core/TilingScheme.js
@@ -47,7 +47,7 @@ define([
         /**
          * Gets the map projection used by the tiling scheme.
          * @memberof TilingScheme.prototype
-         * @type {Projection}
+         * @type {MapProjection}
          */
         projection : {
             get : DeveloperError.throwInstantiationError
@@ -121,12 +121,12 @@ define([
      *
      * @param {Cartographic} position The position.
      * @param {Number} level The tile level-of-detail.  Zero is the least detailed.
-     * @param {Cartesian} [result] The instance to which to copy the result, or undefined if a new instance
+     * @param {Cartesian2} [result] The instance to which to copy the result, or undefined if a new instance
      *        should be created.
      * @returns {Cartesian2} The specified 'result', or a new object containing the tile x, y coordinates
      *          if 'result' is undefined.
      */
     TilingScheme.prototype.positionToTileXY = DeveloperError.throwInstantiationError;
 
     return TilingScheme;
-});
+});
diff --git a/Source/Core/WebMercatorTilingScheme.js b/Source/Core/WebMercatorTilingScheme.js
@@ -91,7 +91,7 @@ define([
         /**
          * Gets the map projection used by this tiling scheme.
          * @memberof WebMercatorTilingScheme.prototype
-         * @type {Projection}
+         * @type {MapProjection}
          */
         projection : {
             get : function() {
@@ -212,7 +212,7 @@ define([
      *
      * @param {Cartographic} position The position.
      * @param {Number} level The tile level-of-detail.  Zero is the least detailed.
-     * @param {Cartesian} [result] The instance to which to copy the result, or undefined if a new instance
+     * @param {Cartesian2} [result] The instance to which to copy the result, or undefined if a new instance
      *        should be created.
      * @returns {Cartesian2} The specified 'result', or a new object containing the tile x, y coordinates
      *          if 'result' is undefined.
@@ -257,4 +257,4 @@ define([
     };
 
     return WebMercatorTilingScheme;
-});
+});