geojs 1.14.4 → 1.14.6

package/src/feature.js

@@ -45,6 +45,7 @@ var geo_event = require('./event');
  * Style specification for a feature.
  *
  * @typedef {object} geo.feature.styleSpec
+ * @property {object} The styyle.
  */
 
 /**
@@ -205,7 +206,7 @@ var feature = function (arg) {
    * @param {geo.geoPosition} lowerLeft Lower-left corner.
    * @param {geo.geoPosition} upperRight Upper-right corner.
    * @param {object} [opts] Additional search options.
-   * @param {boolean} [opts.partial=false] If truthy, include features that are
+   * @param {boolean} [opts.partial] If truthy, include features that are
    *    partially in the box, otherwise only include features that are fully
    *    within the region.
    * @param {string|geo.transform|null} [gcs] Input gcs.  `undefined` to use
@@ -226,7 +227,7 @@ var feature = function (arg) {
    * @param {geo.polygonObject} poly A polygon as an array of coordinates or an
    *    object with `outer` and optionally `inner` parameters.
    * @param {object} [opts] Additional search options.
-   * @param {boolean} [opts.partial=false] If truthy, include features that are
+   * @param {boolean} [opts.partial] If truthy, include features that are
    *    partially in the polygon, otherwise only include features that are
    *    fully within the region.
    * @param {string|geo.transform|null} [gcs] Input gcs.  `undefined` to use
@@ -608,7 +609,7 @@ var feature = function (arg) {
    *    each arrays.
    * @param {array} styleArray If keyOrObject is a string, an array of values
    *    for the style.  If keyOrObject is an object, this parameter is ignored.
-   * @param {boolean} [refresh=false] `true` to redraw the feature when it has
+   * @param {boolean} [refresh] `true` to redraw the feature when it has
    *    been updated.  If an object with styles is passed, the redraw is only
    *    done once.
    * @returns {this} The feature instance.

package/src/heatmapFeature.js

@@ -29,6 +29,7 @@ var util = require('./util');
  *   datapoint stands on its own.  If `'auto'`, bin data if there are more data
  *   points than there would be bins.  Using `true` or `auto` uses bins that
  *   are `max(Math.floor((radius + blurRadius) / 8), 3)`.
+ * @property {object} [style] A style for the heatmap.
  * @property {object} [style.color] An object where the keys are numbers from
  *   [0-1] and the values are {@link geo.geoColor}.  This is used to transform
  *   normalized intensity.

package/src/isolineFeature.js

@@ -860,7 +860,7 @@ var isolineFeature = function (arg) {
  * The results of this are intended to be used as the value of the `rotation`
  * style.
  *
- * @param {string} [mode='higher'] The rotation mode.  `higher` orients the top
+ * @param {string} [mode] The rotation mode.  `higher` orients the top
  *   of the text to high values.  `lower` orients the top of the text to lower
  *   values.  `map` orients the top of the text so it is aligned to the isoline
  *   and biased toward the top of the map.  `screen` orients the top of the

package/src/layer.js

@@ -185,7 +185,7 @@ var layer = function (arg) {
    * Bring the layer above the given number of layers.  This will rotate the
    * current z-indices for this and the next `n` layers.
    *
-   * @param {number} [n=1] The number of positions to move.
+   * @param {number} [n] The number of positions to move.
    * @returns {this}
    */
   this.moveUp = function (n) {
@@ -232,7 +232,7 @@ var layer = function (arg) {
    * Bring the layer below the given number of layers.  This will rotate the
    * current z-indices for this and the previous `n` layers.
    *
-   * @param {number} [n=1] The number of positions to move.
+   * @param {number} [n] The number of positions to move.
    * @returns {this}
    */
   this.moveDown = function (n) {

package/src/lineFeature.js

@@ -289,7 +289,7 @@ var lineFeature = function (arg) {
    * @param {geo.polygonObject} poly A polygon as an array of coordinates or an
    *    object with `outer` and optionally `inner` parameters.
    * @param {object} [opts] Additional search options.
-   * @param {boolean} [opts.partial=false] If truthy, include lines that are
+   * @param {boolean} [opts.partial] If truthy, include lines that are
    *    partially in the polygon, otherwise only include lines that are fully
    *    within the region.
    * @param {string|geo.transform|null} [gcs] Input gcs.  `undefined` to use
@@ -418,9 +418,9 @@ var lineFeature = function (arg) {
    *    units.  A value of zero will only remove perfectly collinear points.
    *    If not specified, this is set to a half display pixel at the map's
    *    current zoom level.
-   * @param {function} [posFunc=this.style.get('position')] The function to
+   * @param {function} [posFunc] The function to
    *    get the position of each vertex.
-   * @param {function} [lineFunc=this.style.get('line')] The function to get
+   * @param {function} [lineFunc] The function to get
    *    each line.
    * @returns {this}
    */

package/src/map.js

@@ -28,8 +28,8 @@ var sceneObject = require('./sceneObject');
  *   bounds.
  * @property {number} [zoom=4] Initial zoom.
  * @property {object} [center] Initial map center.
- * @property {number} center.x=0
- * @property {number} center.y=0
+ * @property {number} [center.x=0] Initial map center.
+ * @property {number} [center.y=0] Initial map center.
  * @property {number} [rotation=0] Initial clockwise rotation in radians.
  * @property {number} [width] The map width (default node width).
  * @property {number} [height] The map height (default node height).
@@ -176,7 +176,7 @@ var map = function (arg) {
    * Get/set the number of world space units per display pixel at the given
    * zoom level.
    *
-   * @param {number} [zoom=0] The target zoom level.
+   * @param {number} [zoom] The target zoom level.
    * @param {number?} [unit] If present, set the `unitsPerPixel` at the
    *   specified zoom level.  Otherwise return the current value.
    * @returns {number|this}
@@ -214,7 +214,7 @@ var map = function (arg) {
          * existing requestAnimationFrame.  By using a property of window,
          * tests can override this if needed. */
         if (queue.length && queue[0] !== m_animationQueue[0]) {
-          window['cancelAnimationFrame'](m_animationQueue[0]); // eslint-disable-line dot-notation
+          window['cancelAnimationFrame'](m_animationQueue[0]);
         }
         for (var i = queue.length ? 1 : 0; i < m_animationQueue.length; i += 1) {
           queue.push(m_animationQueue[i]);
@@ -1127,7 +1127,7 @@ var map = function (arg) {
    * @param {geo.geoPosition} [opts.zoomOrigin] An origin to use when zooming
    *    to a new zoom level.
    * @param {number} [opts.rotation] A new map rotation.
-   * @param {number} [opts.duration=1000] Transition duration in milliseconds.
+   * @param {number} [opts.duration] Transition duration in milliseconds.
    * @param {function} [opts.ease] Easing function for the transition.  This is
    *    in the style of a d3 easing function.
    * @param {function} [opts.interp] Function to use when interpolating
@@ -1143,7 +1143,7 @@ var map = function (arg) {
    *    a value based on what canceled a transition, `transition`: the current
    *    transition that just completed, `next`: a boolean if another transition
    *    follows immediately.
-   * @param {boolean} [opts.endClamp=true] If `false`, the last center change
+   * @param {boolean} [opts.endClamp] If `false`, the last center change
    *    will not clamp to the bounds and zoom values.
    * @param {string|geo.transform|null} [gcs] Input gcs.  `undefined` to use
    *    the interface gcs, `null` to use the map gcs, or any other transform.
@@ -1726,8 +1726,8 @@ var map = function (arg) {
    * attribution notices into a single element.  By default, this method
    * is called on each of the following events:
    *
-   *   * {@link geo.event.layerAdd}
-   *   * {@link geo.event.layerRemove}
+   *   {@link geo.event.layerAdd}
+   *   {@link geo.event.layerRemove}
    *
    * In addition, layers should call this method when their own attribution
    * notices have changed.  Users, in general, should not need to call this.
@@ -1776,23 +1776,23 @@ var map = function (arg) {
    *    optional values of `layers`, `type`, `encoderOptions`, and additional
    *    values listed in the `opts` parameter (this last form allows a single
    *    argument for the function).
-   * @param {string} [type='image/png'] See {@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toDataURL
+   * @param {string} [type] See {@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toDataURL
    *    canvas.toDataURL}.  Use `'canvas'` to return the canvas element (this
    *    can be used to get the results as a blob, which can be faster for some
    *    operations but is not supported as widely).
    * @param {number} [encoderOptions] See {@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toDataURL
    *    canvas.toDataURL}.
    * @param {object} [opts] Additional screenshot options.
-   * @param {false|string|CanvasRenderingContext2D.fillStyle}
-   *    [opts.background='white'] If `false` or `null`, don't prefill the
-   *    background.  Otherwise, a css color or
-   *    `CanvasRenderingContext2D.fillStyle` to fill the initial canvas.  This
-   *    could match the background of the browser page, for instance.
-   * @param {boolean|'idle'} [opts.wait=false] If `'idle'`, wait for the map to
+   * @param {false|string|CanvasRenderingContext2D.fillStyle} [opts.background]
+   *    If `false` or `null`, don't prefill the background.  Otherwise, a css
+   *    color or `CanvasRenderingContext2D.fillStyle` to fill the initial
+   *    canvas.  This could match the background of the browser page, for
+   *    instance.  Default is 'white'.
+   * @param {boolean|'idle'} [opts.wait] If `'idle'`, wait for the map to
    *    be idle and one additional animation frame to occur.  If truthy, wait
    *    for an animation frame to occur.  Otherwise, take the screenshot as
    *    soon as possible.
-   * @param {boolean|null} [opts.attribution=null] If `null` or unspecified,
+   * @param {boolean|null} [opts.attribution] If `null` or unspecified,
    *    include the attribution only if all layers are used.  If false, never
    *    include the attribution.  If `true`, always include it.
    * @param {HTMLElement[]|string[]} [opts.html] A list of additional HTML
@@ -1951,11 +1951,11 @@ var map = function (arg) {
    * @param {function} callback Function to call during the animation frame.
    *    It is called with an animation epoch, exactly as
    *    `requestAnimationFrame`.
-   * @param {boolean|'remove'} [action=false] Falsy to only add the callback if
+   * @param {boolean|'remove'} [action] Falsy to only add the callback if
    *    it is not already scheduled.  `'remove'` to remove the callback (use
    *    this instead of `cancelAnimationFrame`).  Any other truthy value moves
    *    the callback to the end of the list.
-   * @returns {number} An integer as returned by
+   * @returns {number?} An integer as returned by
    *    `window.requestAnimationFrame`.
    */
   this.scheduleAnimationFrame = function (callback, action) {
@@ -1964,16 +1964,16 @@ var map = function (arg) {
        * explicitly using window.requestAnimationFrame, we prevent the
        * stripping of 'window' off of the reference and allow our tests to
        * override this if needed. */
-      m_animationQueue.push(window['requestAnimationFrame'](processAnimationFrame)); // eslint-disable-line dot-notation
+      m_animationQueue.push(window['requestAnimationFrame'](processAnimationFrame));
     }
     var pos = m_animationQueue.indexOf(callback, 1);
     if (pos >= 0) {
       if (!action) {
-        return;
+        return undefined;
       }
       m_animationQueue.splice(pos, 1);
       if (action === 'remove') {
-        return;
+        return undefined;
       }
     }
     m_animationQueue.push(callback);

package/src/mapInteractor.js

@@ -40,7 +40,7 @@ var Mousetrap = require('mousetrap');
  *      up for that scale action to trigger.  If the value of the meta key is
  *      truthy, it must be down.  If `false`, it must be up.
  * @property {string[]} [keyboard.metakeyMouseEvents] A list of meta keys
- * *    that, when typed singly, trigger a repeat of the last mousemove or
+ * that, when typed singly, trigger a repeat of the last mousemove or
  *      actionmove event so that listeners can  update metakey information.
  * @property {boolean} [keyboard.focusHighlight=true] If truthy, when the map
  *      gains focus, a highlight style is shown around it.  This gives an
@@ -2176,7 +2176,7 @@ var mapInteractor = function (args) {
         simulated: true
       };
       m_keyHandler.trigger(keys, options.event);
-      return;
+      return m_this;
     }
 
     page = options.page || {};
@@ -2236,6 +2236,7 @@ var mapInteractor = function (args) {
     if (type.indexOf('.geojs') >= 0) {
       $(document).trigger(evt);
     }
+    return m_this;
   };
   this._connectEvents();
   return this;

package/src/markerFeature.js

@@ -280,7 +280,7 @@ var markerFeature = function (arg) {
    * @param {geo.polygonObject} poly A polygon as an array of coordinates or an
    *    object with `outer` and optionally `inner` parameters.
    * @param {object} [opts] Additional search options.
-   * @param {boolean} [opts.partial=false] If truthy, include markers that are
+   * @param {boolean} [opts.partial] If truthy, include markers that are
    *    partially in the polygon, otherwise only include markers that are fully
    *    within the region.  If 'center', only markers whose centers are inside
    *    the polygon are returned.

package/src/pixelmapFeature.js

@@ -172,7 +172,7 @@ var pixelmapFeature = function (arg) {
    * Get the maximum index value from the pixelmap.  This is a value present in
    * the pixelmap.
    *
-   * @returns {number} The maximum index value.
+   * @returns {number?} The maximum index value.
    */
   this.maxIndex = function () {
     if (m_this.m_info) {
@@ -188,6 +188,7 @@ var pixelmapFeature = function (arg) {
       }
       return m_this.m_info.maxIndex;
     }
+    return undefined;
   };
 
   /**

package/src/pointFeature.js

@@ -185,23 +185,26 @@ var pointFeature = function (arg) {
     // store the current zoom level privately
     m_lastZoom = z;
 
-    // get the raw data elements for the points at the current level
-    var data = m_clusterTree.points(z).map(function (d) {
-      return m_allData[d.index];
-    });
+    const points = m_clusterTree.points(z);
+    const clusters = m_clusterTree.clusters(z);
+    const data = new Array(points.length + clusters.length);
+    for (let pidx = 0; pidx < points.length; pidx += 1) {
+      data[pidx] = m_allData[points[pidx].index];
+    }
 
     // append the clusters at the current level
-    m_clusterTree.clusters(z).forEach(function (d) {
+    for (let cidx = 0, didx = points.length; cidx < clusters.length; cidx += 1, didx += 1) {
+      const d = clusters[cidx];
       // mark the datum as a cluster for accessor methods
       d.__cluster = true;
 
       // store all of the data objects for each point in the cluster as __data
-      d.__data = [];
-      d.obj.each(function (e) {
-        d.__data.push(m_allData[e.index]);
-      });
-      data.push(d);
-    });
+      d.__data = new Array(d.obj.length);
+      for (let idx = 0; idx < d.obj.length; idx += 1) {
+        d.__data[idx] = m_allData[d.obj[idx].index];
+      }
+      data[didx] = d;
+    }
 
     // prevent recomputing the clustering and set the new data array
     m_ignoreData = true;
@@ -366,7 +369,7 @@ var pointFeature = function (arg) {
    * @param {geo.polygonObject} poly A polygon as an array of coordinates or an
    *    object with `outer` and optionally `inner` parameters.
    * @param {object} [opts] Additional search options.
-   * @param {boolean} [opts.partial=false] If truthy, include points that are
+   * @param {boolean} [opts.partial] If truthy, include points that are
    *    partially in the polygon, otherwise only include points that are fully
    *    within the region.  If 'center', only points whose centers are inside
    *    the polygon are returned.

package/src/polygonFeature.js

@@ -103,10 +103,10 @@ var polygonFeature = function (arg) {
    * in the polygon.
    *
    * @private
-   * @param {object[]} [data=this.data()] The data to process.
-   * @param {function} [posFunc=this.style.get('position')] The function to
+   * @param {object[]} [data] The data to process.
+   * @param {function} [posFunc] The function to
    *    get the position of each vertex.
-   * @param {function} [polyFunc=this.style.get('polygon')] The function to
+   * @param {function} [polyFunc] The function to
    *    get each polygon.
    * @returns {geo.polygonObject[]} An array of polygon positions.  Each has
    *    `outer` and `inner` if it has any coordinates, or is `undefined`.
@@ -302,7 +302,7 @@ var polygonFeature = function (arg) {
    * @param {geo.polygonObject} poly A polygon as an array of coordinates or an
    *    object with `outer` and optionally `inner` parameters.
    * @param {object} [opts] Additional search options.
-   * @param {boolean} [opts.partial=false] If truthy, include polygons that are
+   * @param {boolean} [opts.partial] If truthy, include polygons that are
    *    partially in the polygon, otherwise only include polygons that are fully
    *    within the region.
    * @param {string|geo.transform|null} [gcs] Input gcs.  `undefined` to use
@@ -434,9 +434,9 @@ var polygonFeature = function (arg) {
    * Get an outer or inner loop of a polygon and return the necessary data to
    * use it for a closed polyline.
    *
-   * @param {object} item: the polygon.
-   * @param {number} itemIndex: the index of the polygon
-   * @param {Array} loop: the inner or outer loop.
+   * @param {object} item the polygon.
+   * @param {number} itemIndex the index of the polygon
+   * @param {Array} loop the inner or outer loop.
    * @returns {Array} the loop with the data necessary to send to the position
    *    function for each vertex.
    */
@@ -568,11 +568,11 @@ var polygonFeature = function (arg) {
    *    units.  A value of zero will only remove perfectly collinear points.
    *    If not specified, this is set to a half display pixel at the map's
    *    current zoom level.
-   * @param {function} [posFunc=this.style.get('position')] The function to
+   * @param {function} [posFunc] The function to
    *    get the position of each vertex.
-   * @param {function} [polyFunc=this.style.get('polygon')] The function to
+   * @param {function} [polyFunc] The function to
    *    get each polygon.
-   * @param {boolean} [returnData=false] If truthy, return the new data array
+   * @param {boolean} [returnData] If truthy, return the new data array
    *    rather than modifying the feature.
    * @returns {this|array}
    */

package/src/registry.js

@@ -410,12 +410,12 @@ registry.registerAnnotation = function (name, func, features) {
  * @alias geo.createAnnotation
  * @param {string} name The annotation name
  * @param {object} options The options for the annotation.
- * @returns {object} the new annotation.
+ * @returns {object?} the new annotation.
  */
 registry.createAnnotation = function (name, options) {
   if (!annotations[name]) {
     console.warn('The ' + name + ' annotation is not registered');
-    return;
+    return undefined;
   }
   var annotation = annotations[name].func(options);
   return annotation;

package/src/svg/svgRenderer.js

@@ -12,7 +12,7 @@ var renderer = require('../renderer');
  * @param {geo.layer} [arg.layer] Layer associated with the renderer.
  * @param {HTMLElement} [arg.canvas] Canvas element associated with the
  *   renderer.
- * @param {boolean} [arg.widget=false] Set to `true` if this is a stand-alone
+ * @param {boolean} [arg.widget] Set to `true` if this is a stand-alone
  *   widget.  If it is not a widget, svg elements are wrapped in a parent
  *   group.
  * @param {HTMLElement} [arg.d3Parent] If specified, the parent for any
@@ -324,7 +324,7 @@ var svgRenderer = function (arg) {
    * Initialize.
    *
    * @param {object} arg The options used to create the renderer.
-   * @param {boolean} [arg.widget=false] Set to `true` if this is a stand-alone
+   * @param {boolean} [arg.widget] Set to `true` if this is a stand-alone
    *   widget.  If it is not a widget, svg elements are wrapped in a parent
    *   group.
    * @param {HTMLElement} [arg.d3Parent] If specified, the parent for any

package/src/tile.js

@@ -11,8 +11,8 @@ var $ = require('jquery');
  * @property {number} size.y Height (usually in pixels).
  * @property {object|string} url A url or jQuery ajax config object.
  * @property {object} [overlap] The size of overlap with neighboring tiles.
- * @property {number} overlap.x=0
- * @property {number} overlap.y=0
+ * @property {number} [overlap.x=0] Overlap in the x direction.
+ * @property {number} [overlap.y=0] Overlap in the y direction.
  */
 
 /**

package/src/tileCache.js

@@ -8,7 +8,7 @@
  * @alias geo.tileCache
  *
  * @param {object} [options] A configuration object for the cache.
- * @param {number} [options.size=64] The maximum number of tiles to store.
+ * @param {number} [options.size] The maximum number of tiles to store.
  */
 var tileCache = function (options) {
   if (!(this instanceof tileCache)) {

package/src/tileLayer.js

@@ -415,12 +415,12 @@ var tileLayer = function (arg) {
    * Returns undefined if the tile should not be cropped.
    *
    * @param {object} tile The tile to compute crop values for.
-   * @returns {object} Either `undefined` or an object with `x` and `y` values
+   * @returns {object?} Either `undefined` or an object with `x` and `y` values
    *      which is the size in pixels for the tile.
    */
   this.tileCropFromBounds = function (tile) {
     if (!m_this._options.tilesMaxBounds) {
-      return;
+      return undefined;
     }
     var level = tile.index.level,
         bounds = m_this._tileBounds(tile);
@@ -434,6 +434,7 @@ var tileLayer = function (arg) {
         y: Math.max(0, Math.min(m_maxBounds[level].y, bounds.bottom) - bounds.top)
       };
     }
+    return undefined;
   };
 
   /**
@@ -692,7 +693,7 @@ var tileLayer = function (arg) {
    * @param {boolean} [onlyIfChanged] If the set of tiles have not changed
    *     (even if their desired order has), return undefined instead of an
    *     array of tiles.
-   * @returns {geo.tile[]} An array of tile objects
+   * @returns {geo.tile[]?} An array of tile objects
    */
   this._getTiles = function (maxLevel, bounds, sorted, onlyIfChanged) {
     var i, j, tiles = [], index, nTilesLevel,
@@ -767,7 +768,7 @@ var tileLayer = function (arg) {
 
     if (onlyIfChanged) {
       if (!changed && tiles.length === m_lastTileSet.length) {
-        return;
+        return undefined;
       }
       m_lastTileSet.splice(0, m_lastTileSet.length);
       $.each(tiles, function (idx, tile) {
@@ -1204,11 +1205,11 @@ var tileLayer = function (arg) {
    * create the element if it doesn't already exist.
    *
    * @param {number} level The zoom level of the layer to fetch.
-   * @returns {HTMLElement} The layer's DOM element.
+   * @returns {HTMLElement?} The layer's DOM element.
    */
   this._getSubLayer = function (level) {
     if (!m_this.canvas()) {
-      return;
+      return undefined;
     }
     var node = m_this.canvas()
       .find('div[data-tile-layer=' + level.toFixed() + ']').get(0);

package/src/trackFeature.js

@@ -460,7 +460,7 @@ var trackFeature = function (arg) {
    *    set the named style to the specified value.  Otherwise, extend the
    *    current style with the values in the specified object.
    * @param {*} [arg2] If `arg1` is a string, the new value for that style.
-   * @param {string} [styleType='style'] The name of the style type, such as
+   * @param {string} [styleType] The name of the style type, such as
    *    `markerStyle`, `textStyle`, `pastStyle`, `currentStyle`, or
    *    `futureStyle`.
    * @returns {object|this} Either the entire style object, the value of a
@@ -746,7 +746,7 @@ var trackFeature = function (arg) {
    *    object with `outer` and optionally `inner` parameters.  All coordinates
    *    are in map interface gcs.
    * @param {object} [opts] Additional search options.
-   * @param {boolean} [opts.partial=false] If truthy, include tracks that are
+   * @param {boolean} [opts.partial] If truthy, include tracks that are
    *    partially in the polygon, otherwise only include tracks that are fully
    *    within the region.
    * @returns {object} An object with `index`: a list of track indices,

package/src/transform.js

@@ -650,9 +650,9 @@ transform.affineInverse = function (def, coords) {
  * @param {geo.geoPosition} pt2 The second point.
  * @param {string|geo.transform} [gcs] `undefined` to use the same gcs as the
  *    ellipsoid, otherwise the gcs of the points.
- * @param {string|geo.transform} [baseGcs='EPSG:4326'] the gcs of the
+ * @param {string|geo.transform} [baseGcs] the gcs of the
  *    ellipsoid.
- * @param {object} [ellipsoid=proj4.WGS84] An object with at least `a` and one
+ * @param {object} [ellipsoid] An object with at least `a` and one
  *    of `b`, `f`, or `rf` (1 / `f`) -- this works with  proj4 ellipsoid
  *    definitions.
  * @returns {number} The distance in meters (or whatever units the ellipsoid
@@ -690,12 +690,12 @@ transform.sphericalDistance = function (pt1, pt2, gcs, baseGcs, ellipsoid) {
  * @param {geo.geoPosition} pt2 The second point.
  * @param {string|geo.transform} [gcs] `undefined` to use the same gcs as the
  *    ellipsoid, otherwise the gcs of the points.
- * @param {string|geo.transform} [baseGcs='EPSG:4326'] the gcs of the
+ * @param {string|geo.transform} [baseGcs] the gcs of the
  *    ellipsoid.
- * @param {object} [ellipsoid=proj4.WGS84] An object with at least `a` and one
+ * @param {object} [ellipsoid] An object with at least `a` and one
  *    of `b`, `f`, or `rf` (1 / `f`) -- this works with  proj4 ellipsoid
  *    definitions.
- * @param {number} [maxIterations=100] Maximum number of iterations to use
+ * @param {number} [maxIterations] Maximum number of iterations to use
  *    to test convergence.
  * @returns {object} An object with `distance` in meters (or whatever units the
  *    ellipsoid was specified in), `alpha1` and `alpha2`, the azimuths at the

package/src/ui/colorLegendWidget.js

@@ -44,8 +44,8 @@ require('./colorLegendWidget.styl');
  * container.
  * @param {geo.gui.colorLegendWidget.category[]} [arg.categories] An array
  * of category definitions for the initial color legends
- * @param {number} [arg.width=300] The width of the widget in pixels.
- * @param {number} [arg.ticks=6] The maximum number of ticks on the axis of a legend, default is 6.
+ * @param {number} [arg.width] The width of the widget in pixels.
+ * @param {number} [arg.ticks] The maximum number of ticks on the axis of a legend, default is 6.
  * @returns {geo.gui.colorLegendWidget}
  */
 var colorLegendWidget = function (arg) {

package/src/ui/domWidget.js

@@ -10,7 +10,7 @@ var registerWidget = require('../registry').registerWidget;
  * @extends geo.gui.widget
  * @param {object} arg
  * @param {geo.widget} [parent] A parent widget for this widget.
- * @param {string} [el='div'] The type of DOM element to create.
+ * @param {string} [el] The type of DOM element to create.
  * @returns {geo.domWidget}
  */
 var domWidget = function (arg) {

package/src/ui/scaleWidget.js

@@ -326,9 +326,9 @@ inherit(scaleWidget, svgWidget);
  * entry is an array that must be in ascending order.  Use unicode in strings,
  * not html entities.  It makes it more reusable.
  * @name unitsTable
- * @property unitsTable {object} The key names are the names of unit systems,
+ * @property {object} unitsTable The key names are the names of unit systems,
  *    such as `si`.
- * @property unitsTable.unit {geo.gui.scaleWidget.unitTableRecord[]} A list of
+ * @property {geo.gui.scaleWidget.unitTableRecord[]} unitsTable.unit A list of
  *    units within the unit system from smallest to largest.
  * @memberof geo.gui.scaleWidget
  */
@@ -373,9 +373,9 @@ scaleWidget.unitsTable = {
  * meter.  Each entry is an array that must be in ascending order.  This table
  * can be passed to formatUnit.
  * @name areaUnitsTable
- * @property areaUnitsTable {object} The key names are the names of unit
+ * @property {object} areaUnitsTable The key names are the names of unit
  *    systems, such as `si`.
- * @property areaUnitsTable.unit {geo.gui.scaleWidget.unitTableRecord[]} A list
+ * @property {geo.gui.scaleWidget.unitTableRecord[]} areaUnitsTable.unit A list
  *    of units within the unit system from smallest to largest.
  * @memberof geo.gui.scaleWidget
  */
@@ -413,21 +413,21 @@ scaleWidget.areaUnitsTable = {
  * @param {number} val The value.  A length or area in base units.  With the
  *    default unit table, this is in meters.  With the `areaUnitsTable`, this
  *    is square meters.
- * @param {string|object[]} [unit='si'] The name of the unit system or a unit
+ * @param {string|object[]} [unit] The name of the unit system or a unit
  *    table.
- * @param {object} [table=unitTable] The table of the unit system.  Ignored if
+ * @param {object} [table] The table of the unit system.  Ignored if
  *    `unit` is a unit table.
- * @param {number} [digits=3] The minimum number of significant figures.
- * @returns {string} A formatted string or `undefined`.
+ * @param {number} [digits] The minimum number of significant figures.
+ * @returns {string?} A formatted string or `undefined`.
  */
 scaleWidget.formatUnit = function (val, unit, table, digits) {
   if (val === undefined || val === null) {
-    return;
+    return undefined;
   }
   if (!Array.isArray(unit)) {
     table = table || scaleWidget.unitsTable;
     if (!table || !table[unit || 'si']) {
-      return;
+      return undefined;
     }
     unit = table[unit || 'si'];
   }
@@ -441,7 +441,7 @@ scaleWidget.formatUnit = function (val, unit, table, digits) {
   val /= unit.scale;
   digits = Math.max(0, -Math.ceil(Math.log10(val)) + (digits === undefined || digits < 0 ? 3 : digits));
   if (digits > 10) {
-    return;
+    return undefined;
   }
   let result = val.toFixed(digits);
   if (digits) {

package/src/ui/widget.js

@@ -10,8 +10,7 @@ var sceneObject = require('../sceneObject');
  * @property {string|number} [bottom] The position to the bottom of the
  *   container.  A string css position or a number in pixels.
  * @property {string|number} [left] The position to the left of the container.
- * @property {string|number} [top] The position to the top of the container.
- * @property {*} [...] Additional css properties that affect position are
+ * @property {*} [any] Additional css properties that affect position are
  *   allowed.  See the css specification for details.
  */
 

package/src/util/color.js

@@ -175,9 +175,9 @@ var colorUtils = {
    *
    * @param {geo.geoColor} [color] Any valid color input.  If an invalid value
    *    or no value is supplied, the `defaultColor` is used.
-   * @param {number} [opacity=1] A value from [0-1].  This is multiplied with
+   * @param {number} [opacity] A value from [0-1].  This is multiplied with
    *    the opacity from `color`.
-   * @param {geo.geoColorObject} [defaultColor={r: 0, g: 0, b: 0}] The color
+   * @param {geo.geoColorObject} [defaultColor] The color
    *    to use if an invalid color is supplied.
    * @returns {geo.geoColorObject} An rgba color object.
    * @memberof geo.util
@@ -269,7 +269,8 @@ var colorUtils = {
  * standard, `rgb` and `rgba` are aliases of each other, as are `hsl` and
  * `hsla`.
  * @name cssColorConversions
- * @property cssColorConversions {geo.util.cssColorConversionRecord[]}
+ * @property {geo.util.cssColorConversionRecord[]} cssColorConversions A list
+ *   of conversion records.
  * @memberof geo.util
  */
 colorUtils.cssColorConversions = [{