geojs 1.6.3 → 1.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",
@@ -54,7 +54,6 @@
     "glob": "^7.2.0",
     "glslang-validator-prebuilt": "0.0.6",
     "imports-loader": "^3.1.1",
-    "istanbul-combine": "^0.3.0",
     "jaguarjs-jsdoc": "^1.0.2",
     "jasmine-core": "^4.0.0",
     "js-yaml": "^4.1.0",
@@ -62,7 +61,7 @@
     "jsdoc-autoprivate": "0.0.1",
     "jsonlint-mod": "^1.7.6",
     "jstransformer-markdown-it": "^2.0.0",
-    "karma": "^6.3.11",
+    "karma": "^6.3.13",
     "karma-chrome-launcher": "^3.1.0",
     "karma-coverage": "^2.1.0",
     "karma-firefox-launcher": "^2.1.2",
@@ -82,15 +81,15 @@
     "semantic-release": "^19.0.2",
     "serve-index": "^1.9.1",
     "shader-loader": "^1.3.1",
-    "sinon": "^12.0.1",
+    "sinon": "^13.0.1",
     "string-replace-webpack-plugin": "^0.1.3",
     "style-loader": "^3.3.1",
     "stylus": "^0.56.0",
     "stylus-loader": "^6.2.0",
-    "terser-webpack-plugin": "^5.3.0",
+    "terser-webpack-plugin": "^5.3.1",
     "touch-emulator": "^1.0.0",
     "typeface-lato": "^1.1.13",
-    "webpack": "^5.66.0",
+    "webpack": "^5.68.0",
     "webpack-cli": "^4.9.1",
     "webpack-merge": "^5.8.0"
   },
@@ -147,10 +146,9 @@
     "ci": "npm run ci-build && npm run ci-test",
     "ci-build": "bash -c '(webpack --config webpack.config.js & webpack --config webpack-lean.config.js & npm run docs & npm run get-data-files & npm run lint & npm run puglint & npm run glsllint & npm run build-examples & npm run build-tutorials & wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n)'",
     "ci-build-wait": "bash -c '(webpack --config webpack.config.js & webpack --config webpack-lean.config.js & npm run docs & npm run get-data-files & npm run lint & npm run puglint & npm run glsllint & npm run build-examples & npm run build-tutorials & wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && wait -n && FAIL=0 || FAIL=1; wait; [ \"$FAIL\" == \"0\" ])'",
-    "ci-test": "npm run test-headless && npm run test-webglheadless && npm run test-headed && npm run test-tutorials && npm run combine-coverage",
+    "ci-test": "npm run test-headless && npm run test-webglheadless && npm run test-headed && npm run test-tutorials",
     "ci-xvfb": "npm run ci-clean && npm run ci-build && TEST_SAVE_IMAGE='all' xvfb-run -s '-ac -screen 0 1280x1024x24' npm run ci-test",
     "start": "karma start karma.conf.js",
-    "combine-coverage": "istanbul-combine -d dist/cobertura -r cobertura 'dist/coverage/json/**/coverage-final.json'",
     "examples": "node examples/build.js && webpack --config webpack-examples.config.js && node tutorials/build.js && webpack --config webpack-tutorials.config.js && node ./tests/runners/server.js --host \"${HOST-}\" --port ${PORT-8082} --dist",
     "docs": "jsdoc --pedantic -d dist/apidocs -r src package.json -c jsdoc.conf.json",
     "website": "cd website && npx hexo server",

package/src/annotation.js

@@ -145,7 +145,7 @@ var annotation = function (type, args) {
   /**
    * Get or set the name of this annotation.
    *
-   * @param {string|undefined} arg If `undefined`, return the name, otherwise
+   * @param {string|undefined} [arg] If `undefined`, return the name, otherwise
    *    change it.  When setting the name, the value is trimmed of
    *    whitespace.  The name will not be changed to an empty string.
    * @returns {this|string} The current name or this annotation.
@@ -293,7 +293,7 @@ var annotation = function (type, args) {
   /**
    * Get or set the state of this annotation.
    *
-   * @param {string|undefined} arg If `undefined`, return the state,
+   * @param {string|undefined} [arg] If `undefined`, return the state,
    *    otherwise change it.  This should be one of the
    *    {@link geo.annotation.state} values.
    * @returns {this|string} The current state or this annotation.
@@ -352,7 +352,7 @@ var annotation = function (type, args) {
    *    `'remove'` if the annotation should be removed, falsy to not update
    *    anything.
    */
-  this.processAction = function () {
+  this.processAction = function (evt) {
     return undefined;
   };
 
@@ -1081,8 +1081,8 @@ var annotation = function (type, args) {
  *
  * @param {object} m_this The current annotation instance.
  * @param {function} s_actions The parent actions method.
- * @param {string} [state] The state to return actions for.  Defaults to
- *    the current state.
+ * @param {string|undefined} state The state to return actions for.  Defaults
+ *    to the current state.
  * @param {string} name The name of this annotation.
  * @param {Array} originalArgs arguments to original call
  * @returns {geo.actionRecord[]} A list of actions.
@@ -1183,6 +1183,10 @@ function continuousVerticesProcessAction(m_this, evt, name) {
  * @property {geo.polygonFeature.styleSpec} [editStyle] The style to apply to a
  *    rectangle in edit mode.
  */
+/*
+ * @typedef {object} geo.rectangleAnnotation.subspec
+ * @typedef {geo.annotation.spec | geo.rectangleAnnotation.subspec} geo.rectangleAnnotation.spec
+ */
 
 /**
  * Rectangle annotation class.

package/src/annotationLayer.js

@@ -399,7 +399,7 @@ var annotationLayer = function (arg) {
    * @param {geo.annotation} annotation The annotation to add.
    * @param {string|geo.transform|null} [gcs] `undefined` to use the interface
    *    gcs, `null` to use the map gcs, or any other transform.
-   * @param {boolean} update If `false`, don't update the layer after adding
+   * @param {boolean} [update] If `false`, don't update the layer after adding
    *    the annotation.
    * @returns {this} The current layer.
    * @fires geo.event.annotation.add_before
@@ -435,7 +435,7 @@ var annotationLayer = function (arg) {
    * Remove an annotation from the layer.
    *
    * @param {geo.annotation} annotation The annotation to remove.
-   * @param {boolean} update If `false`, don't update the layer after removing
+   * @param {boolean} [update] If `false`, don't update the layer after removing
    *    the annotation.
    * @returns {boolean} `true` if an annotation was removed.
    * @fires geo.event.annotation.remove
@@ -607,7 +607,7 @@ var annotationLayer = function (arg) {
    * Return the current set of annotations as a geojson object.  Alternately,
    * add a set of annotations from a geojson object.
    *
-   * @param {string|objectFile} [geojson] If present, add annotations based on
+   * @param {string|object|File} [geojson] If present, add annotations based on
    *    the given geojson object.  If `undefined`, return the current
    *    annotations as geojson.  This may be a JSON string, a javascript
    *    object, or a File object.

package/src/camera.js

@@ -502,7 +502,7 @@ var camera = function (spec) {
    * Project a vector from world space into viewport (display) space.  The
    * resulting vector always has the last component (`w`) equal to 1.
    *
-   * @param {vec2|vec3|vec4} point The point in world coordinates.
+   * @param {vec3|vec4} point The point in world coordinates.
    * @returns {vec4} The point in display coordinates.
    */
   this.worldToDisplay4 = function (point) {
@@ -518,7 +518,7 @@ var camera = function (spec) {
    * Project a vector from viewport (display) space into world space.  The
    * resulting vector always has the last component (`w`) equal to 1.
    *
-   * @param {vec2|vec3|vec4} point The point in display coordinates.
+   * @param {vec3|vec4} point The point in display coordinates.
    * @returns {vec4} The point in world space coordinates.
    */
   this.displayToWorld4 = function (point) {
@@ -788,7 +788,7 @@ var camera = function (spec) {
   /**
    * Represent a glmatrix as a pretty-printed string.
    * @param {mat4} mat A 4 x 4 matrix.
-   * @param {number} prec The number of decimal places.
+   * @param {number} [prec] The number of decimal places.
    * @returns {string}
    */
   this.ppMatrix = function (mat, prec) {
@@ -862,7 +862,7 @@ var camera = function (spec) {
 
 /**
  * Supported projection types.
- * @enum
+ * @enum {boolean}
  */
 camera.projection = {
   perspective: true,
@@ -872,7 +872,7 @@ camera.projection = {
 /**
  * Default camera clipping bounds.  Some features and renderers may rely on the
  * far clip value being more positive than the near clip value.
- * @enum
+ * @enum {number}
  */
 camera.clipbounds = {
   perspective: {

package/src/choroplethFeature.js

@@ -185,7 +185,7 @@ var choroplethFeature = function (arg) {
   /**
    * Add a geojson polygon feature to the current layer.
    *
-   * @param {geojsonFeature} feature A geojson parsed feature.
+   * @param {geo.geojsonFeature} feature A geojson parsed feature.
    * @param {geo.geoColor} fillColor The fill color for the feature.
    * @returns {geo.polygonFeature}
    */

package/src/domRenderer.js

@@ -38,9 +38,10 @@ var domRenderer = function (arg) {
   /**
    * Initialize.
    *
+   * @param {object} [arg] Optional arguments.
    * @returns {this}
    */
-  this._init = function () {
+  this._init = function (arg) {
     var layer = m_this.layer().node();
 
     if (!m_this.canvas() && layer && layer.length) {

package/src/featureLayer.js

@@ -109,7 +109,7 @@ var featureLayer = function (arg) {
   /**
    * Get/Set drawables.
    *
-   * @param {geo.feature[]} val A list of features, or unspecified to return
+   * @param {geo.feature[]} [val] A list of features, or unspecified to return
    *    the current feature list.  If a list is provided, features are added or
    *    removed as needed.
    * @returns {geo.feature[]|this} The current features associated with the

package/src/fileReader.js

@@ -6,7 +6,7 @@ var object = require('./object');
  * Object specification for a fileReader.
  *
  * @typedef {object} geo.fileReader.spec
- * @property {geo.featureLayer} layer The target feature layer.
+ * @property {geo.featureLayer} [layer] The target feature layer.
  */
 
 /**
@@ -15,7 +15,7 @@ var object = require('./object');
  * @class
  * @alias geo.fileReader
  * @extends geo.object
- * @param {geo.fileReader.spec} arg
+ * @param {geo.fileReader.spec} [arg]
  * @returns {geo.fileReader}
  */
 var fileReader = function (arg) {

package/src/imageTile.js

@@ -11,7 +11,8 @@ var tile = require('./tile');
  * @property {object} [size] The size of each tile.
  * @property {number} [size.x=256] Width in pixels.
  * @property {number} [size.y=256] Height in pixels.
- * @property {string} [crossDomain='anonymous'] Image CORS attribute.
+ * @property {string} [crossDomain='anonymous'] Image CORS attribute.  This is
+ *   used for the `crossorigin` property when loading images.
  */
 
 /**

package/src/isolineFeature.js

@@ -657,7 +657,7 @@ var isolineFeature = function (arg) {
    * the generated labels.  The viewport calculation is conservative, as the
    * map could be rotated, changed size, or have other modifications.
    *
-   * @returns {exit}
+   * @returns {this}
    */
   this._updateLabelPositions = function () {
     var last = m_lastLabelPositions;

package/src/layer.js

@@ -291,7 +291,7 @@ var layer = function (arg) {
   /**
    * Get root node of the layer.
    *
-   * @returns {div}
+   * @returns {HTMLDivElement}
    */
   this.node = function () {
     return m_node;
@@ -579,9 +579,11 @@ var layer = function (arg) {
    * Update layer.
    *
    * This is a stub that should be subclassed.
+   *
+   * @param {object} [arg] An object, possibly with an ``event`` key and value.
    * @returns {this}
    */
-  this._update = function () {
+  this._update = function (arg) {
     return m_this;
   };
 

package/src/map.js

@@ -517,7 +517,7 @@ var map = function (arg) {
    * view center.  Rotation mostly ignores `clampBoundsX`, as the behavior
    * feels peculiar otherwise.
    *
-   * @param {number} rotation Absolute angle in radians (positive is
+   * @param {number} [rotation] Absolute angle in radians (positive is
    *    clockwise).
    * @param {object} [origin] If specified, rotate about this origin.
    * @param {geo.geoPosition} origin.geo The gcs coordinates of the
@@ -830,7 +830,7 @@ var map = function (arg) {
    *    coordinate to convert.
    * @param {string|geo.transform|null} [gcs] Output gcs.  `undefined` to use
    *    the interface gcs, `null` to use the map gcs, or any other transform.
-   * @returns {geo.geoPosition|geoPosition[]} GCS space coordinates.
+   * @returns {geo.geoPosition|geo.geoPosition[]} GCS space coordinates.
    */
   this.displayToGcs = function (c, gcs) {
     c = m_this.displayToWorld(c); // done via camera
@@ -954,9 +954,10 @@ var map = function (arg) {
   /**
    * Initialize the map.
    *
+   * @param {object} [arg] Optional arguments.
    * @returns {this} The map object.
    */
-  this._init = function () {
+  this._init = function (arg) {
 
     if (m_node === undefined || m_node === null) {
       throw new Error('Map require DIV node');
@@ -1296,7 +1297,7 @@ var map = function (arg) {
           y: p[1]
         }, null, true, true);
       } else {
-        m_center = m_this.gcsToWorld({x: p[0], y: p[1]}, null, true, true);
+        m_center = m_this.gcsToWorld({x: p[0], y: p[1]}, null);
         m_this.zoom(p[2], m_transition.zoomOrigin, true);
       }
       m_this.rotation(p[3], undefined, true);
@@ -1494,7 +1495,7 @@ var map = function (arg) {
    * @param {number} rotation The requested rotation in clockwise radians.
    * @param {string|geo.transform|null} [gcs] `undefined` to use the interface
    *    gcs, `null` to use the map gcs, or any other transform.
-   * @param {boolean} ignoreDiscreteZoom If `true`, ignore the `discreteZoom`
+   * @param {boolean} [ignoreDiscreteZoom] If `true`, ignore the `discreteZoom`
    *    option when determining the new view.
    * @param {boolean} [ignoreClampBounds] If `true` and `clampBoundsX` or
    *    `clampBoundsY` is set, allow the bounds to be less clamped.
@@ -1728,11 +1729,11 @@ var map = function (arg) {
    * @param {boolean|null} [opts.attribution=null] 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 {HTMLObject[]|string[]} [opts.html] A list of additional HTML
+   * @param {HTMLElement[]|string[]} [opts.html] A list of additional HTML
    *    elements, selectors, or jQuery elements to render on top of the map.
    *    These are rendered in order, with the last one topmost.
-   * @returns {deferred} A jQuery Deferred object.  The done function receives
-   *    either a data URL or an `HTMLCanvasElement` with the result.
+   * @returns {jQueryDeferred} A jQuery Deferred object.  The done function
+   *    receives either a data URL or an `HTMLCanvasElement` with the result.
    * @fires geo.event.screenshot.ready
    */
   this.screenshot = function (layers, type, encoderOptions, opts) {
@@ -1916,7 +1917,7 @@ var map = function (arg) {
   /**
    * Return the nearest valid zoom level to the requested zoom.
    * @param {number} zoom A zoom level to adjust to current settings
-   * @param {boolean} ignoreDiscreteZoom If `true`, ignore the `discreteZoom`
+   * @param {boolean} [ignoreDiscreteZoom] If `true`, ignore the `discreteZoom`
    *    option when determining the new view.
    * @returns {number} The zoom level clamped to the allowed zoom range and
    *    with other settings applied.
@@ -1960,10 +1961,11 @@ var map = function (arg) {
    * Draw a layer image to a canvas context.  The layer's opacity and transform
    * are applied.  This is used as part of making a screenshot.
    *
-   * @param {context} context The 2d canvas context to draw into.
+   * @param {CanvasRenderingContext2D} context The 2d canvas context to draw
+   *    into.
    * @param {number} opacity The opacity in the range [0, 1].
    * @param {object} elem A jQuery element that might have a transform.
-   * @param {HTMLImageObject} img The image or canvas to draw to the canvas.
+   * @param {HTMLImageElement} img The image or canvas to draw to the canvas.
    * @param {string} [mixBlendMode] the mix-blend-mode used to add this layer.
    * @private
    */
@@ -2155,12 +2157,12 @@ var map = function (arg) {
    * Return a valid rotation angle.
    *
    * @param {number} rotation Proposed rotation.
-   * @param {boolean} ignoreRotationFunc If truthy and rotations are allowed,
+   * @param {boolean} [ignoreRotationFunc] If truthy and rotations are allowed,
    *    allow any rotation.  Otherwise, the rotation is passed through the
    *    `allowRotation` function.
-   * @param {boolean} noRangeLimit If falsy, ensure that the rotation is in the
-   *    range [0, 2*PI).  If it is very close to zero, it is snapped to zero.
-   *    If true, the rotation can have any value.
+   * @param {boolean} [noRangeLimit] If falsy, ensure that the rotation is in
+   *    the range [0, 2*PI).  If it is very close to zero, it is snapped to
+   *    zero.  If true, the rotation can have any value.
    * @returns {number} the validated rotation
    * @private
    */

package/src/mapInteractor.js

@@ -2037,26 +2037,26 @@ var mapInteractor = function (args) {
    *    map in pixels relative to the map's div.
    * @param {geo.screenPosition} [options.center] The position of a touch
    *    event center relative to the window.
-   * @param {string} [button] One of `left`, `middle`, or `right` for mouse
-   *    events.
-   * @param {string} [modifiers] A space-separated list of metakeys that are
-   *    down on mouse events.
-   * @param {geo.screenPosition} [wheelDelta] The amount the wheel moved in
-   *    both directions for wheel events.  One step is often 20 units of
-   *    vement.
-   * @param {number} [wheelMode] The wheel delta mode.  See
+   * @param {string} [options.button] One of `left`, `middle`, or `right` for
+   *    mouse events.
+   * @param {string} [options.modifiers] A space-separated list of metakeys
+   *    that are down on mouse events.
+   * @param {geo.screenPosition} [options.wheelDelta] The amount the wheel
+   *    moved in both directions for wheel events.  One step is often 20 units
+   *    of movement.
+   * @param {number} [options.wheelMode] The wheel delta mode.  See
    *    https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent .
-   * @param {boolean} [touch] `truthy` if this is a touch event.
-   * @param {number} [rotation] Touch event rotation in degrees.
-   * @param {number} [scale] Touch event scale.  Initial events should have a
-   *    scale of 1; subsequent events should increase or decrease this to
-   *    simulate spread and pinch actions.
-   * @param {number[]} [pointers] A list of pointer numbers involved in a
-   *    touch event.  Pointers are number from one up, so `[1]` is the first
+   * @param {boolean} [options.touch] `truthy` if this is a touch event.
+   * @param {number} [options.rotation] Touch event rotation in degrees.
+   * @param {number} [options.scale] Touch event scale.  Initial events should
+   *    have a scale of 1; subsequent events should increase or decrease this
+   *    to simulate spread and pinch actions.
+   * @param {number[]} [options.pointers] A list of pointer numbers involved in
+   *    a touch event.  Pointers are number from one up, so `[1]` is the first
    *    touch point, `[1, 2]` are two touch points, and `[2]` is when the first
    *    point was released but the second is still touching.
-   * @param {string} [pointerType] `mouse` if this is a mouse action rather
-   *    than a touch action.
+   * @param {string} [options.pointerType] `mouse` if this is a mouse action
+   *    rather than a touch action.
    * @returns {mapInteractor}
    */
   this.simulateEvent = function (type, options) {

package/src/markerFeature.js

@@ -442,7 +442,7 @@ markerFeature.primitiveShapes = pointFeature.primitiveShapes;
 
 /**
  * Marker symbols
- * @enum
+ * @enum {number}
  */
 markerFeature.symbols = {
   // for circle (alias ellipse), the symbolValue is the ratio of the minor to
@@ -499,7 +499,7 @@ markerFeature.symbols = {
 
 /**
  * Marker scale modes
- * @enum
+ * @enum {number}
  */
 markerFeature.scaleMode = {
   none: 0,

package/src/meshFeature.js

@@ -21,7 +21,7 @@ var feature = require('./feature');
  * of these properties can be functions, which get passed `data`.
  *
  * @typedef {object} geo.meshFeature.meshSpec
- * @property {number[]|array.<number[]>} [elements] If specified, a list of
+ * @property {number[]|Array.<number[]>} [elements] If specified, a list of
  *      indices into the data array that form elements.  If this is an array of
  *      arrays, each subarray must have at least either 3 values for triangular
  *      elements or 4 values for square elements.  If this is a single array,

package/src/osmLayer.js

@@ -13,6 +13,8 @@ var quadFeature = require('./quadFeature');
  *   specified, use this as the layer opacity.
  * @property {string} [source] If specified, use the predefined tile source
  *   (see {@link geo.osmLayer.tileSources}).
+ * @property {string} [crossDomain='anonymous'] Image CORS attribute.  This is
+ *   used for the `crossorigin` property when loading images.
  */
 
 /**

package/src/pointFeature.js

@@ -554,7 +554,7 @@ pointFeature.capabilities = {
 
 /**
  * Support primitive shapes
- * @enum
+ * @enum {string}
  */
 pointFeature.primitiveShapes = {
   auto: 'auto',

package/src/registry.js

@@ -60,7 +60,7 @@ util.registerRenderer = function (name, func) {
  * @param {geo.layer} layer The layer associated with the renderer.
  * @param {HTMLCanvasElement} [canvas] A canvas object to share between
  *      renderers.
- * @param {object} options Options for the new renderer.
+ * @param {object} [options] Options for the new renderer.
  * @returns {geo.renderer|null} The new renderer or null if no such name is
  *      registered.
  */
@@ -83,7 +83,7 @@ util.createRenderer = function (name, layer, canvas, options) {
  *
  * @alias geo.checkRenderer
  * @param {string|null} name Name of the desired renderer.
- * @param {boolean} noFallback If truthy, don't recommend a fallback.
+ * @param {boolean} [noFallback] If truthy, don't recommend a fallback.
  * @returns {string|null|false} The name of the renderer that should be used
  *      or false if no valid renderer can be determined.
  */

package/src/svg/svgRenderer.js

@@ -484,10 +484,10 @@ var svgRenderer = function (arg) {
    * Create a new feature element from an object that describes the feature
    * attributes.  To be called from feature classes only.
    *
-   * @param {object} arg Options for the features.
+   * @param {object} arg
    * @param {string} arg.id A unique string identifying the feature.
    * @param {array} arg.data Array of data objects used in a d3 data method.
-   * @param {function} [aeg.dataIndex] A function that returns a unique id for
+   * @param {function} [arg.dataIndex] A function that returns a unique id for
    *    each data element.  This is passed to the data access function.
    * @param {object} arg.style An object with style values or functions.
    * @param {object} arg.attributes An object containing element attributes.
@@ -500,7 +500,7 @@ var svgRenderer = function (arg) {
    *    attributes and styles set when new.  If falsy, features always have
    *    attributes and styles updated.
    * @param {boolean} [arg.sortByZ] If truthy, sort features by the `d.zIndex`.
-   * @param {string} [parentId] If set, the group ID of the parent element.
+   * @param {string} [arg.parentId] If set, the group ID of the parent element.
    * @returns {this}
    */
   this._drawFeatures = function (arg) {

package/src/tileCache.js

@@ -55,7 +55,7 @@ var tileCache = function (options) {
    * Remove a tile from the cache.
    *
    * @param {string|geo.tile} tile The tile or its hash.
-   * @returns {booliean} `true` if a tile was removed.
+   * @returns {boolean} `true` if a tile was removed.
    */
   this.remove = function (tile) {
     var hash = typeof tile === 'string' ? tile : tile.toString();

package/src/tileLayer.js

@@ -525,7 +525,7 @@ var tileLayer = function (arg) {
   /**
    * Returns a tile's bounds in a gcs.
    *
-   * @param {object|tile} indexOrTile Either a tile or an object with
+   * @param {object|geo.tile} indexOrTile Either a tile or an object with
    *    {x, y, level}` specifying a tile.
    * @param {string|geo.transform|null} [gcs] `undefined` to use the
    *    interface gcs, `null` to use the map gcs, or any other transform.
@@ -668,7 +668,7 @@ var tileLayer = function (arg) {
    * @param {number} maxLevel The zoom level
    * @param {geo.geoBounds} bounds The map bounds
    * @param {boolean} sorted Return a sorted list
-   * @param {boolean} onlyIfChanged If the set of tiles have not changed
+   * @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
@@ -1134,7 +1134,7 @@ var tileLayer = function (arg) {
    * origin.
    *
    * @param {object} pt A point in world space coordinates with `x` and `y`.
-   * @param {number|undefined} zoom If unspecified, use the map zoom.
+   * @param {number} [zoom] If unspecified, use the map zoom.
    * @returns {object} Local coordinates with `x` and `y`.
    */
   this.toLocal = function (pt, zoom) {
@@ -1180,7 +1180,7 @@ 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 {DOM} The layer's DOM element.
+   * @returns {HTMLElement} The layer's DOM element.
    */
   this._getSubLayer = function (level) {
     if (!m_this.canvas()) {
@@ -1512,8 +1512,8 @@ var tileLayer = function (arg) {
    * @param {geo.geoBounds} [bounds] The view bounds (if unspecified, assume
    *      global bounds)
    * @param {number} bounds.level The zoom level the bounds are given as.
-   * @param {number} zoom Keep in bound tile at this zoom level.
-   * @param {boolean} doneLoading If true, allow purging additional tiles.
+   * @param {number} [zoom] Keep in bound tile at this zoom level.
+   * @param {boolean} [doneLoading] If true, allow purging additional tiles.
    * @returns {boolean}
    */
   this._canPurge = function (tile, bounds, zoom, doneLoading) {
@@ -1604,9 +1604,9 @@ var tileLayer = function (arg) {
   /**
    * Get or set the subdomains used for templating.
    *
-   * @param {string|list} [subdomains] A comma-separated list, a string of
+   * @param {string|string[]} [subdomains] A comma-separated list, a string of
    *      single character subdomains, or a list.
-   * @returns {string|list|this}
+   * @returns {string|string[]|this}
    */
   this.subdomains = function (subdomains) {
     if (subdomains === undefined) {
@@ -1644,8 +1644,8 @@ var tileLayer = function (arg) {
   /**
    * Get/Set visibility of the layer.
    *
-   * @param {boolean|undefined} val If unspecified, return the visibility,
-   *    otherwise set it.
+   * @param {boolean} [val] If unspecified, return the visibility, otherwise
+   *    set it.
    * @returns {boolean|this} Either the visibility (if getting) or the layer
    *    (if setting).
    */