diff --git a/docs/developers.rst b/docs/developers.rst index 78650d73ac..e6fe214bcc 100644 --- a/docs/developers.rst +++ b/docs/developers.rst @@ -21,7 +21,7 @@ All javascript source files included in the library for deployment are checked against `ESLint `_ for uniform styling and strict for common errors patterns. The style rules for geojs are located in the ``.eslintrc`` file in the root of the repository. These -tests are preformed automatically for every file added to the build; no +tests are performed automatically for every file added to the build; no additional configuration is required. You can check the code style by running ``npm run lint``. diff --git a/examples/annotations/main.js b/examples/annotations/main.js index 43683409a1..1f3c65d565 100644 --- a/examples/annotations/main.js +++ b/examples/annotations/main.js @@ -17,7 +17,7 @@ $(function () { $('.annotationtype button').removeClass('lastused'); $('.annotationtype button#' + query.lastannotation).addClass('lastused'); } - // You can set the intiial annotations via a query parameter. If the query + // You can set the initial annotations via a query parameter. If the query // parameter 'save=true' is specified, the query will be updated with the // geojson. This can become too long for some browsers. var initialGeoJSON = query.geojson; diff --git a/examples/blog-lines/main.js b/examples/blog-lines/main.js index 620cfe022c..2ca05875a5 100644 --- a/examples/blog-lines/main.js +++ b/examples/blog-lines/main.js @@ -451,7 +451,7 @@ function leafletLinesTest(opts) { } // There is no direct support for miterlimit, but if the map is using SVG, - // we can manully set it. + // we can manually set it. $('svg path', node).attr('stroke-miterlimit', parseFloat(opts.miterLimit || 10)); // return references to the various objects @@ -495,7 +495,7 @@ function mapboxglLinesTest(opts) { var map = new mapboxgl.Map({ container: opts.node[0], center: [opts.x || MapStart.x, opts.y || MapStart.y], - // mapboxgl uses a zoom levle that is 1 off from other libraries + // mapboxgl uses a zoom level that is 1 off from other libraries zoom: (opts.zoom || MapStart.zoom) - 1 - (opts.scale || 0), style: {version: 8, sources: {}, layers: []}, bearingSnap: 0, diff --git a/examples/color-legend/example.json b/examples/color-legend/example.json index f37425c453..22a9935ebf 100644 --- a/examples/color-legend/example.json +++ b/examples/color-legend/example.json @@ -2,7 +2,7 @@ "title": "Color legends", "exampleJs": ["main.js"], "about": { - "text": "This example shows how to create a discrete or continous color legends." + "text": "This example shows how to create a discrete or continuous color legends." }, "disabled": false } diff --git a/examples/heatmap/index.pug b/examples/heatmap/index.pug index 471825b98d..64e3cdbed3 100644 --- a/examples/heatmap/index.pug +++ b/examples/heatmap/index.pug @@ -43,7 +43,7 @@ block append mainContent .form-group(title="Radius of blur around points in pixels.") label(for="blurRadius") Blur Radius input#blurRadius(type="number", placeholder="15", min=0) - .form-group(title="Use either a Gaussian distribution or a solid circle with a blurred edge for each point. If a Guassian is used, the total radius is the sume of the radius and blur radius values.") + .form-group(title="Use either a Gaussian distribution or a solid circle with a blurred edge for each point. If a Gaussian is used, the total radius is the sume of the radius and blur radius values.") label(for="gaussian") Gaussian Points input#gaussian(type="checkbox", placeholder="true", checked="checked") .form-group(title="Color Gradient. Entries with intensities of 0 and 1 are needed to form a valid color gradient.") diff --git a/examples/lines/main.js b/examples/lines/main.js index dbb8bc0b0a..3d1dbe7752 100644 --- a/examples/lines/main.js +++ b/examples/lines/main.js @@ -452,12 +452,12 @@ $(function () { var tooltip = uiLayer.createWidget('dom', {position: {x: 0, y: 0}}); var tooltipElem = $(tooltip.canvas()).attr('id', 'tooltip').addClass( 'hidden'); - // Ceate a line feature + // Create a line feature lineFeature = layer.createFeature('line', lineOptions) .line(lineAccessor) .position(positionAccessor) // add hover events -- use mouseon and mouseoff, since we only show one - // tootip. If we showed one tooltip per item we were over, use mouseover + // tooltip. If we showed one tooltip per item we were over, use mouseover // and mouseout. .geoOn(geo.event.feature.mouseon, function (evt) { var text = (evt.data.name ? evt.data.name : '') + diff --git a/examples/measure/main.js b/examples/measure/main.js index 7399bbd3cc..69c30da3db 100644 --- a/examples/measure/main.js +++ b/examples/measure/main.js @@ -68,7 +68,7 @@ if (query.lastannotation) { if (query.hide) { $('#controls').addClass('reduced'); } -// You can set the intiial annotations via a query parameter. If the query +// You can set the initial annotations via a query parameter. If the query // parameter 'save=true' is specified, the query will be updated with the // geojson. This can become too long for some browsers. var initialGeoJSON = query.geojson; diff --git a/examples/pixelmap/main.js b/examples/pixelmap/main.js index 3610cb0c54..925de6953b 100644 --- a/examples/pixelmap/main.js +++ b/examples/pixelmap/main.js @@ -36,7 +36,7 @@ $(function () { url: pixelmapUrl, position: {ul: {x: -180, y: 71.471178}, lr: {x: -60, y: 13.759032}}, color: function (d, idx) { - // Always set index 0 to transparent. Other indicies are set based on + // Always set index 0 to transparent. Other indices are set based on // the data value var color = {r: 0, g: 0, b: 0, a: 0}; if (idx && d && d.value) { diff --git a/examples/rainfall/main.js b/examples/rainfall/main.js index b3ce0147cd..23c94efb5a 100644 --- a/examples/rainfall/main.js +++ b/examples/rainfall/main.js @@ -182,7 +182,7 @@ point = layer.createFeature('point', { style: { stroke: false, radius: function (d, i) { - // If this point doesn't have any data for the current year, dont' give + // If this point doesn't have any data for the current year, don't give // it a radius, either. This prevents the tooltip from interacting with // it. return d === null || d === undefined ? 0 : 5; diff --git a/src/annotationLayer.js b/src/annotationLayer.js index b50c709aed..1e24a2de62 100644 --- a/src/annotationLayer.js +++ b/src/annotationLayer.js @@ -369,7 +369,7 @@ var annotationLayer = function (arg) { * @param {string|geo.transform|null} [gcs2] `undefined` to use the interface * gcs, `null` to use the map gcs, `'display'` if the coordinates are * already in display coordinates, or any other transform. - * @returns {number} the Euclidian distance between the two coordinates. + * @returns {number} the Euclidean distance between the two coordinates. */ this.displayDistance = function (coord1, gcs1, coord2, gcs2) { var map = m_this.map(); @@ -391,7 +391,7 @@ var annotationLayer = function (arg) { /** * Add an annotation to the layer. The annotation could be in any state. * - * @param {geo.annotation} annotation Te annotation to add. + * @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. * @returns {this} The current layer. @@ -425,7 +425,7 @@ var annotationLayer = function (arg) { /** * Remove an annotation from the layer. * - * @param {geo.annoation} annotation The annotation to remove. + * @param {geo.annotation} annotation The annotation to remove. * @param {boolean} update If `false`, don't update the layer after removing * the annotation. * @returns {boolean} `true` if an annotation was removed. @@ -480,7 +480,7 @@ var annotationLayer = function (arg) { /** * Get the list of annotations on the layer. * - * @returns {geo.annoation[]} An array of annotations. + * @returns {geo.annotation[]} An array of annotations. */ this.annotations = function () { return m_annotations.slice(); @@ -605,7 +605,8 @@ var annotationLayer = function (arg) { * @param {boolean|string} [clear] If `true`, when adding annotations, first * remove all existing objects. If `'update'`, update existing * annotations and remove annotations that no longer exist. If falsy, - * update existing annotations and leave annotations that have not chaged. + * update existing annotations and leave annotations that have not + * changed. * @param {string|geo.transform|null} [gcs] `undefined` to use the interface * gcs, `null` to use the map gcs, or any other transform. * @param {boolean} [includeCrs] If truthy, include the coordinate system in @@ -917,7 +918,7 @@ var annotationLayer = function (arg) { if (m_this.timestamp() > m_buildTime.timestamp()) { var labels = m_this.options('showLabels') ? [] : null, editable = m_this.options('clickToEdit') || m_this.mode() === m_this.modes.edit; - /* Interally, we have a set of feature levels (to provide z-index + /* Internally, we have a set of feature levels (to provide z-index * support), each of which can have data from multiple annotations. We * clear the data on each of these features, then build it up from each * annotation. Eventually, it may be necessary to optimize this and diff --git a/src/camera.js b/src/camera.js index 3a2b560bdf..4bc504a604 100644 --- a/src/camera.js +++ b/src/camera.js @@ -188,7 +188,7 @@ var camera = function (spec) { /** * Getter/setter for the render clipbounds. Opposite bounds must have - * different values. There are independant clipbounds for each projection + * different values. There are independent clipbounds for each projection * (parallel and perspective); switching the projection will switch to the * clipbounds. Individual values of the clipbounds can be set either via a * command like `camera.clipbounds = {near: 3, far: 1}` or diff --git a/src/canvas/heatmapFeature.js b/src/canvas/heatmapFeature.js index bed5fcffbc..e10888f6d1 100644 --- a/src/canvas/heatmapFeature.js +++ b/src/canvas/heatmapFeature.js @@ -106,7 +106,7 @@ var canvas_heatmapFeature = function (arg) { * from scipy.stats import norm * for r in [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1]: * opacity = norm.pdf(r, scale=0.3) / norm.pdf(0, scale=0.3) - * Usng a 10-interval approximation is accurate to within 0.5% of the + * Using a 10-interval approximation is accurate to within 0.5% of the * actual Gaussian magnitude. Switching to a 20-interval approximation * would get within 0.1%, at which point there is more error from using * a Gaussian truncated at the radius than from the approximation. @@ -432,7 +432,7 @@ var canvas_heatmapFeature = function (arg) { window.clearTimeout(m_heatMapPosition.timeout); m_heatMapPosition.timeout = undefined; } - /* This conditional can change if we compute the heatmap beyond the visable + /* This conditional can change if we compute the heatmap beyond the visible * viewport so that we don't have to update on pans as often. If we are * close to where the heatmap was originally computed, don't bother * updating it. */ diff --git a/src/graphFeature.js b/src/graphFeature.js index 21e9a1ce6b..43ed02be9a 100644 --- a/src/graphFeature.js +++ b/src/graphFeature.js @@ -160,7 +160,7 @@ var graphFeature = function (arg) { * @param {function|array} [arg] If specified, the list of links or a * function that returns the list of links. If unspecified, return the * existing value. - * @returns {fuction|this} Either a function that returns the list of links, + * @returns {function|this} Either a function that returns the list of links, * or the feature. */ this.links = function (arg) { diff --git a/src/heatmapFeature.js b/src/heatmapFeature.js index 59a689cf34..786f45a07b 100644 --- a/src/heatmapFeature.js +++ b/src/heatmapFeature.js @@ -32,9 +32,9 @@ var transform = require('./transform'); * @property {number} [style.radius=10] Radius of a point in pixels. * @property {number} [style.blurRadius=10] Blur radius for each point in * pixels. - * @property {boolean} [style.gaussian=true] If truthy, appoximate a gaussian + * @property {boolean} [style.gaussian=true] If truthy, approximate a gaussian * distribution for each point using a multi-segment linear radial - * appoximation. The total weight of the gaussian area is approximately the + * approximation. The total weight of the gaussian area is approximately the * `9/16 r^2`. The sum of `radius + blurRadius` is used as the radius for * the gaussian distribution. */ @@ -246,7 +246,7 @@ var heatmapFeature = function (arg) { }; /** - * Build the fetaure. + * Build the feature. * * @returns {this} */ diff --git a/src/isolineFeature.js b/src/isolineFeature.js index af9a5b8035..b20513b2e3 100644 --- a/src/isolineFeature.js +++ b/src/isolineFeature.js @@ -86,8 +86,8 @@ var util = require('./util'); * with `(geo.isolineFeature.valueEntry, index)`. * @property {number|function} [labelOffset=0] Offset for labels along an * isoline relative to where they would be placed by default on a scale of - * [-0.5, 0.5]. +/- 1 would move the text to the next repeated occurance of - * the label. If a function, this is called with + * [-0.5, 0.5]. +/- 1 would move the text to the next repeated occurrence + * of the label. If a function, this is called with * `(geo.isolineFeature.valueEntry, index)`. * @property {number|function} [labelViewport=10000] If the main position of a * label would be further than this many pixels from the current viewport, @@ -312,7 +312,7 @@ var isolineFeature = function (arg) { } } else { if (!spacing) { - /* If no spacing is specfied, then this has a count with autofit. + /* If no spacing is specified, then this has a count with autofit. * Generate at least 2/3rds as many lines as the count, but it could be * 5/2 of that when adjusted to "nice values" (so between 2/3 and 5/3 * of the specified count). */ @@ -364,7 +364,7 @@ var isolineFeature = function (arg) { * Add a new segment to a list of chains. Each chain is a list of vertices, * each of which is an array of two values with the low/high mesh vertices * for that chain vertex. There are then three possibilities: (a) The - * segment forms a new chain that doesn't attch to an existing chain. (b) + * segment forms a new chain that doesn't attach to an existing chain. (b) * One endpoint of the segment matches the endpoint of an existing chain, and * it gets added to that chain. (c) Both endpoints of the segment match * endpoints of two different chains, and those two chains are combined via diff --git a/src/lineFeature.js b/src/lineFeature.js index 206b04f23c..ec32ad86e8 100644 --- a/src/lineFeature.js +++ b/src/lineFeature.js @@ -205,7 +205,7 @@ var lineFeature = function (arg) { * Returns an array of datum indices that contain the given point. This is a * slow implementation with runtime order of the number of vertices. A point * is considered on a line segment if it is close to the line or either end - * point. Closeness is based on the maximum width of the line segement, and + * point. Closeness is based on the maximum width of the line segment, and * is `ceil(maxwidth / 2) + 2` pixels. This means that corner extensions * due to mitering may be outside of the selection area and that variable- * width lines will have a greater selection region than their visual size at @@ -217,7 +217,7 @@ var lineFeature = function (arg) { * @returns {object} An object with `index`: a list of line indices, `found`: * a list of lines that contain the specified coordinate, and `extra`: an * object with keys that are line indices and values that are the first - * segement index for which the line was matched. + * segment index for which the line was matched. */ this.pointSearch = function (p, gcs) { var data = m_this.data(), indices = [], found = [], extra = {}; diff --git a/src/map.js b/src/map.js index 9d35a28dd2..1ca840a564 100644 --- a/src/map.js +++ b/src/map.js @@ -228,7 +228,7 @@ var map = function (arg) { /** * Get/set the autoResize flag. * - * @param {boolean} [autoResize] Truthy to automaticaly resize the map when + * @param {boolean} [autoResize] Truthy to automatically resize the map when * the size of the browser window changes. * @returns {boolean|this} The current state of autoResize or the current map. */ @@ -1893,7 +1893,7 @@ var map = function (arg) { */ this.scheduleAnimationFrame = function (callback, action) { if (!m_animationQueue.length) { - /* By refering to requestAnimationFrame as a property of window, versus + /* By referring to requestAnimationFrame as a property of window, versus * explicitly using window.requestAnimationFrame, we prevent the * stripping of 'window' off of the reference and allow our tests to * override this if needed. */ @@ -1984,7 +1984,7 @@ var map = function (arg) { } /** - * Sevice the callback during an animation frame. This uses splice to modify + * Service the callback during an animation frame. This uses splice to modify * the `animationQueue` to allow multiple map instances to share the queue. * @private */ diff --git a/src/meshFeature.js b/src/meshFeature.js index c3141be84b..93c19dc2f6 100644 --- a/src/meshFeature.js +++ b/src/meshFeature.js @@ -15,7 +15,7 @@ var feature = require('./feature'); /** * A mesh formed by a set of triangular or square elements or a - * squarely-connected grid that is of rectangular extent. The gird can be + * squarely-connected grid that is of rectangular extent. The grid can be * regularly spaced or have arbitrary position coordinates for each node. All * of these properties can be functions, which get passed `data`. * @@ -92,7 +92,7 @@ var feature = require('./feature'); /** * Create a new instance of class meshFeature. This should be the parent of a - * more useable feature class. + * more usable feature class. * * @class * @alias geo.meshFeature diff --git a/src/pixelmapFeature.js b/src/pixelmapFeature.js index 7182aa64ad..c59960f84a 100644 --- a/src/pixelmapFeature.js +++ b/src/pixelmapFeature.js @@ -10,7 +10,7 @@ var util = require('./util'); * @typedef {geo.feature.spec} geo.pixelmapFeature.spec * @extends geo.feature.spec * @property {string|function|HTMLImageElement} [url] URL of a pixel map or an - * HTML Image element. The rgb data is interpretted as an index of the form + * HTML Image element. The rgb data is interpreted as an index of the form * 0xbbggrr. The alpha channel is ignored. * @property {geo.geoColor|function} [color] The color that should be used * for each data element. Data elements correspond to the indices in the @@ -194,7 +194,7 @@ var pixelmapFeature = function (arg) { }; /** - * Build. Fetches the image if necesary. + * Build. Fetches the image if necessary. * * @returns {this} */ @@ -302,7 +302,7 @@ var pixelmapFeature = function (arg) { /** * Given the loaded pixelmap image, create a canvas the size of the image. * Compute a color for each distinct index and recolor the canvas based on - * thise colors, then draw the resultant image as a quad. + * these colors, then draw the resultant image as a quad. * * @fires geo.event.pixelmap.prepared */ diff --git a/src/tileLayer.js b/src/tileLayer.js index 16ecc94900..0bb161f735 100644 --- a/src/tileLayer.js +++ b/src/tileLayer.js @@ -100,9 +100,9 @@ function m_getTileSubdomain(x, y, z, subdomains) { * Returns an OSM tile server formatting function from a standard format * string. Replaces `{s}`, `{z}`, `{x}`, and `{y}`. These may be any case * and may be prefixed with `$` (e.g., `${X}` is the same as `{x}`). The - * subdomain can be specifed by a string of characters, listed as a range, + * subdomain can be specified by a string of characters, listed as a range, * or as a comma-separated list (e.g., `{s:abc}`, `{a-c}`, `{a,b,c}` are - * all equivalent. The comma-separated list can have subdimains that are of + * all equivalent. The comma-separated list can have subdomains that are of * any length; the string and range both use one-character subdomains. * * @param {string} base The tile format string @@ -188,7 +188,7 @@ var tileLayer = function (arg) { arg.subdomains = arg.subdomains.split(''); } /* We used to call the url option baseUrl. If a baseUrl is specified, use - * it instead of url, interpretting it as before. */ + * it instead of url, interpreting it as before. */ if (arg.baseUrl) { var url = arg.baseUrl; if (url && url.charAt(url.length - 1) !== '/') { diff --git a/src/trackFeature.js b/src/trackFeature.js index 9eb3f3addf..fccd560070 100644 --- a/src/trackFeature.js +++ b/src/trackFeature.js @@ -595,7 +595,7 @@ var trackFeature = function (arg) { * * @param {object} [val] An object with any of `startTime`, `endTime`, and * `duration`. A value of `undefined` won't change that field. A value - * of `null` uses the default. If `val` is `undefined`, the existsing + * of `null` uses the default. If `val` is `undefined`, the existing * settings are returned. * @returns {object|this} Either the instance or the current settings. If * the current settings, `start` and `end` are included with the @@ -722,10 +722,10 @@ var trackFeature = function (arg) { * @returns {object} An object with `index`: a list of track indices, `found`: * a list of tracks that contain the specified coordinate, `extra`: an * object with keys that are track indices and values that are the first - * segement index for which the track was matched, and `where`: an - * object with keys that are track indices and values that are `past`, - * `future`, or `marker` if the point was found in that part of the track, - * or unset if the point was found in the current part of the track. + * segment index for which the track was matched, and `where`: an object + * with keys that are track indices and values that are `past`, `future`, + * or `marker` if the point was found in that part of the track, or unset + * if the point was found in the current part of the track. */ this.pointSearch = function (p) { let result = m_lineFeatures.current.pointSearch(p), diff --git a/src/ui/colorLegendWidget.js b/src/ui/colorLegendWidget.js index ff3d29e7d7..34ed0911e4 100644 --- a/src/ui/colorLegendWidget.js +++ b/src/ui/colorLegendWidget.js @@ -299,7 +299,7 @@ var colorLegendWidget = function (arg) { }; /** - * Draw an individual continous type legend. + * Draw an individual continuous type legend. * @param {Element} svg svg element that the legend will be drawn * @param {number} width width of the svg element in pixel * @param {geo.gui.colorLegendWidget.category} category The continuous type legend category diff --git a/src/ui/sliderWidget.js b/src/ui/sliderWidget.js index a0c3627989..38a2fddb67 100644 --- a/src/ui/sliderWidget.js +++ b/src/ui/sliderWidget.js @@ -322,7 +322,7 @@ var sliderWidget = function (arg) { }; /** - * Update the slider widget state in reponse to map changes. I.e. zoom + * Update the slider widget state in response to map changes. I.e., zoom * range changes. * * @param {object} [obj] An object that can specify a zoom value. diff --git a/src/util/clustering.js b/src/util/clustering.js index 7bef8b9b9d..0eb8876154 100644 --- a/src/util/clustering.js +++ b/src/util/clustering.js @@ -136,7 +136,7 @@ ClusterTree.prototype.coords = function () { * @class * @alias geo.util.ClusterGroup * @param {object} opts An options object - * @param {number} maxZoom The maximimum zoom level to calculate. + * @param {number} maxZoom The maximum zoom level to calculate. * @param {number} radius Size of clustering at zoom 0 in point gcs. */ function C(opts) { diff --git a/src/util/color.js b/src/util/color.js index ba9c2789c3..16d85e3601 100644 --- a/src/util/color.js +++ b/src/util/color.js @@ -7,13 +7,13 @@ var colorName = require('color-name'); * A color value. Although opacity can be specified, it is not always used. * When a string is specified, any of the following forms can be used: * - CSS color name - * - `#rrggbb` The color specified in hexadecmial with each channel on a + * - `#rrggbb` The color specified in hexadecimal with each channel on a * scale between 0 and 255 (`ff`). Case insensitive. - * - `#rrggbbaa` The color and opacity specified in hexadecmial with each + * - `#rrggbbaa` The color and opacity specified in hexadecimal with each * channel on a scale between 0 and 255 (`ff`). Case insensitive. - * - `#rgb` The color specified in hexadecmial with each channel on a scale + * - `#rgb` The color specified in hexadecimal with each channel on a scale * between 0 and 15 (`f`). Case insensitive. - * - `#rgba` The color and opacity specified in hexadecmial with each channel + * - `#rgba` The color and opacity specified in hexadecimal with each channel * on a scale between 0 and 15 (`f`). Case insensitive. * - `rgb(R, G, B)`, `rgb(R, G, B, A)`, `rgba(R, G, B)`, `rgba(R, G, B, A)` * The color with the values of each color channel specified as numeric @@ -27,7 +27,7 @@ var colorName = require('color-name'); * exponents. * - `hsl(H, S, L)`, `hsl(H, S, L, A)`, `hsla(H, S, L)`, `hsla(H, S, L, A)` * Hue, saturation, and lightness with optional alpha (opacity). Hue is a - * number between 0 and 360 and is interpretted as degrees unless an angle + * number between 0 and 360 and is interpreted as degrees unless an angle * unit is specified. CSS units of `deg`, `grad`, `rad`, and `turn` are * supported. Saturation and lightness are percentages between 0 and 100 * and *must* be followed by a percent `%` symbol. The alpha (opacity) @@ -75,7 +75,7 @@ var m_memoizeConvertColor = {maxCount: 1000, count: 0, memo: {}}; * be returned quickly. If the memoization table gets over a certain size, * just reset it. * - * @param {geo.geoColor} origColor The origial color specification. + * @param {geo.geoColor} origColor The original color specification. * @param {geo.geoColorObject} resultColor The result of the conversion. * @returns {geo.geoColorObject} The `resultColor`. */ @@ -173,7 +173,7 @@ 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 multipled with + * @param {number} [opacity=1] 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 * to use if an invalid color is supplied. diff --git a/src/util/common.js b/src/util/common.js index 84f51071b3..de42304008 100644 --- a/src/util/common.js +++ b/src/util/common.js @@ -516,7 +516,7 @@ var util = { /** * Return recommended defaults for map parameters and osm or tile layer - * paramaters where the expected intent is to use the map in pixel + * parameters where the expected intent is to use the map in pixel * coordinates (upper left is (0, 0), lower right is (`width`, `height`). * * @example The returned objects can be modified or @@ -1376,7 +1376,7 @@ var util = { var track = m_timingData.requestAnimationFrame, recent; /* Some environments have unsynchronized performance and time * counters. The nowDelta factor compensates for this. For - * instance, our test enviornment has performance.now() values on + * instance, our test environment has performance.now() values on * the order of ~3000 and timestamps approximating epoch. */ if (track.timestamp !== timestamp) { track.nowDelta = window.performance.now() - timestamp; diff --git a/src/vectorFeature.js b/src/vectorFeature.js index 7d080adb56..c110cc49ce 100644 --- a/src/vectorFeature.js +++ b/src/vectorFeature.js @@ -30,7 +30,7 @@ var feature = require('./feature'); * @property {geo.geoPosition|function} [origin={x: 0, y: 0, z: 0}] The origin * of the vector. One end of the vector will be at this point. * @property {geo.geoPosition|function} [delta] The direction that the vector - * points in. The length of the vector is dependant on this and the `scale`. + * points in. The length of the vector is dependent on this and the `scale`. * @property {number|function} [scale] The size of the vector relative to the * delta. If `null`, `undefined`, or `0`, this is `75 / `. diff --git a/src/webgl/contourFeature.js b/src/webgl/contourFeature.js index 30e80c9838..237035b729 100644 --- a/src/webgl/contourFeature.js +++ b/src/webgl/contourFeature.js @@ -62,7 +62,7 @@ var webgl_contourFeature = function (arg) { } /* Create the contours. This calls the base class to generate the geometry, - * color map, and other parameters. The generated geoemtry is then loaded + * color map, and other parameters. The generated geometry is then loaded * into the various gl uniforms and buffers. */ function createGLContours() { diff --git a/src/webgl/layer.js b/src/webgl/layer.js index f14146d839..8eca4f8593 100644 --- a/src/webgl/layer.js +++ b/src/webgl/layer.js @@ -129,7 +129,7 @@ var webgl_layer = function () { if (!map._updateAutoshareRenderers) { /** * Update all webgl autoshareRenderer layers so that appropriate groups - * of layers share renderers. Each group must (a) be continguous in + * of layers share renderers. Each group must (a) be contiguous in * z-space (not separated by a non-autoshare layer or a non-webgl layer), * and (b) have the same opacity. The lowest layer in each group will * contain the actual canvas and context. This rerenders as needed. diff --git a/src/webgl/lineFeature.frag b/src/webgl/lineFeature.frag index dc97c7a1a6..09eb13b910 100644 --- a/src/webgl/lineFeature.frag +++ b/src/webgl/lineFeature.frag @@ -26,7 +26,7 @@ void main () { float sinBCD = angles.w; // never render on the opposite side of a miter. This uses a bit of // slop, via pow(smoothstep()) instead of step(), since there are - // precision issues in this calculation. This doesn't wholy solve + // precision issues in this calculation. This doesn't wholly solve // the precision issue; sometimes pixels are missed or double // rendered along the inside seam of a miter. if (nearMode >= 4) { diff --git a/src/webgl/lineFeature.js b/src/webgl/lineFeature.js index 76d0a6d7ba..bb0708eac9 100644 --- a/src/webgl/lineFeature.js +++ b/src/webgl/lineFeature.js @@ -120,7 +120,7 @@ var webgl_lineFeature = function (arg) { /** * Create and style the data needed to render the lines. * - * @param {boolean} onlyStyle if true, use the existing geoemtry and just + * @param {boolean} onlyStyle if true, use the existing geometry and just * recalculate the style. */ function createGLLines(onlyStyle) { diff --git a/src/webgl/lineFeatureDebug.frag b/src/webgl/lineFeatureDebug.frag index 780a1bcc2a..1a61c81c5e 100644 --- a/src/webgl/lineFeatureDebug.frag +++ b/src/webgl/lineFeatureDebug.frag @@ -27,7 +27,7 @@ void main () { float sinBCD = angles.w; // never render on the opposite side of a miter. This uses a bit of // slop, via pow(smoothstep()) instead of step(), since there are - // precision issues in this calculation. This doesn't wholy solve + // precision issues in this calculation. This doesn't wholly solve // the precision issue; sometimes pixels are missed or double // rendered along the inside seam of a miter. if (nearMode >= 4) { diff --git a/src/webgl/markerFeature.js b/src/webgl/markerFeature.js index 1cc0358702..ad9aeab8e8 100644 --- a/src/webgl/markerFeature.js +++ b/src/webgl/markerFeature.js @@ -98,7 +98,7 @@ var webgl_markerFeature = function (arg) { /** * Create and style the data needed to render the markers. * - * @param {boolean} onlyStyle if true, use the existing geoemtry and just + @param {boolean} onlyStyle if true, use the existing geometry and just * recalculate the style. */ function createGLMarkers(onlyStyle) { @@ -359,7 +359,7 @@ var webgl_markerFeature = function (arg) { }; /** - * Handle zoom events for automatic primive shape adjustment. + * Handle zoom events for automatic primitive shape adjustment. * * @param {number} zoom The new zoom level. */ diff --git a/src/webgl/pointFeature.js b/src/webgl/pointFeature.js index 37d85db1f3..94800c88b1 100644 --- a/src/webgl/pointFeature.js +++ b/src/webgl/pointFeature.js @@ -78,7 +78,7 @@ var webgl_pointFeature = function (arg) { /** * Create and style the data needed to render the points. * - * @param {boolean} onlyStyle if true, use the existing geoemtry and just + * @param {boolean} onlyStyle if true, use the existing geometry and just * recalculate the style. */ function createGLPoints(onlyStyle) { @@ -160,7 +160,7 @@ var webgl_pointFeature = function (arg) { } } } - /* We can ignore the indicies (they will all be zero) */ + /* We can ignore the indices (they will all be zero) */ radiusVal = radFunc(item, i); strokeVal = strokeFunc(item, i) ? 1.0 : 0.0; strokeWidthVal = strokeWidthFunc(item, i); diff --git a/src/webgl/pointUtil.js b/src/webgl/pointUtil.js index 92dcd687db..5490dad426 100644 --- a/src/webgl/pointUtil.js +++ b/src/webgl/pointUtil.js @@ -4,7 +4,7 @@ var pointFeature = require('../pointFeature'); * Extend a point-like feature with additional functions. * * @param {this} m_this The point-like feature. - * @param {object} [arg] Feature defintion object that might specify the + * @param {object} [arg] Feature definition object that might specify the * primitive shape. */ function pointUtil(m_this, arg) { diff --git a/src/webgl/polygonFeature.js b/src/webgl/polygonFeature.js index cc1cc92169..a916a948f4 100644 --- a/src/webgl/polygonFeature.js +++ b/src/webgl/polygonFeature.js @@ -69,7 +69,7 @@ var webgl_polygonFeature = function (arg) { * Array.map is slower in Chrome that using a loop, so loops are used in * places that would be conceptually served by maps. * - * @param {boolean} onlyStyle if true, use the existing geoemtry and just + * @param {boolean} onlyStyle if true, use the existing geometry and just * recalculate the style. */ function createGLPolygons(onlyStyle) { diff --git a/tests/cases/camera.js b/tests/cases/camera.js index 55a6a78bc1..f92dacdfd3 100644 --- a/tests/cases/camera.js +++ b/tests/cases/camera.js @@ -696,7 +696,7 @@ describe('geo.camera', function () { expect(c.valueOf()).toBe(c.transform); }); - it('Camera string repesentation is its transform', function () { + it('Camera string representation is its transform', function () { var c = geo.camera(); c.pan({x: 100, y: 5}); c.zoom(5); diff --git a/tests/cases/fetchQueue.js b/tests/cases/fetchQueue.js index 3bfa3bccbe..b4472ec353 100644 --- a/tests/cases/fetchQueue.js +++ b/tests/cases/fetchQueue.js @@ -103,7 +103,7 @@ describe('geo.core.fetchQueue', function () { expect(q.length).toBe(2); expect(q.processing).toBe(3); - // but decresing it won't stop one + // but decreasing it won't stop one q.size = 1; expect(q.size).toBe(1); expect(q.length).toBe(2); diff --git a/tests/cases/fileReader.js b/tests/cases/fileReader.js index c5df192ca0..dd9299a657 100644 --- a/tests/cases/fileReader.js +++ b/tests/cases/fileReader.js @@ -56,7 +56,7 @@ describe('geo.fileReader', function () { map = createMap(); layer = map.createLayer('feature'); reader = geo.fileReader({'layer': layer}); - // The PhantomJS browser does't support `new File`, so use `new Blob` + // The PhantomJS browser doesn't support `new File`, so use `new Blob` file = new Blob(['This is ', 'a test'], {type: 'text/plain'}); file.lastModifiedDate = new Date(); file.name = 'test.txt'; diff --git a/tests/cases/layer.js b/tests/cases/layer.js index e74d9e9b08..fde126b634 100644 --- a/tests/cases/layer.js +++ b/tests/cases/layer.js @@ -77,7 +77,7 @@ describe('geo.layer', function () { map.pan({x: 0, y: 1}); map.rotation(1); map.zoom(1); - expect(count).toBe(7); // sie, rotation, zoom also trigger pan + expect(count).toBe(7); // size, rotation, zoom also trigger pan map.removeChild(layer); }); it('_init without events', function () { diff --git a/tests/cases/layerReorder.js b/tests/cases/layerReorder.js index 107bd5898d..2805da1d4a 100644 --- a/tests/cases/layerReorder.js +++ b/tests/cases/layerReorder.js @@ -120,12 +120,11 @@ describe('Test reordering layers', function () { } /** - * Make a test that runs a sequence of actions - * and validates that the zIndices are as expectd. + * Make a test that runs a sequence of actions and validates that the + * zIndices are as expected. * - * Also generates a test that asserts that the negative - * actions performed backwards results in the inverse - * operation. + * Also generates a test that asserts that the negative actions performed + * backwards results in the inverse operation. */ function makeTests(actions, result) { return function () { diff --git a/tests/cases/tileLayer.js b/tests/cases/tileLayer.js index e45ffa03e2..55c5ae88cc 100644 --- a/tests/cases/tileLayer.js +++ b/tests/cases/tileLayer.js @@ -9,7 +9,7 @@ describe('geo.tileLayer', function () { var _tileLayer = geo.tileLayer; /* - * Use html rendering for all of these tests. That is what is occuring + * Use html rendering for all of these tests. That is what is occurring * in phantomjs in any case. This also reduces the console pollution. * Renderer specific tests currently are handled in osmLayer.js. */ diff --git a/tests/test-gl.js b/tests/test-gl.js index 82fc9cd8ff..ffd2892537 100644 --- a/tests/test-gl.js +++ b/tests/test-gl.js @@ -1,6 +1,6 @@ /** * Entry point for all tests in ./gl-cases/* - * This is here to prevent webpack from creating a seperate bundle for each + * This is here to prevent webpack from creating a separate bundle for each * test case. See: https://github.com/webpack/karma-webpack/issues/23 */ diff --git a/tests/test-headed.js b/tests/test-headed.js index f2fdc476e5..fac7b2247b 100644 --- a/tests/test-headed.js +++ b/tests/test-headed.js @@ -1,6 +1,6 @@ /** * Entry point for all tests in ./headed-cases/* - * This is here to prevent webpack from creating a seperate bundle for each + * This is here to prevent webpack from creating a separate bundle for each * test case. See: https://github.com/webpack/karma-webpack/issues/23 */ diff --git a/tests/test-unit.js b/tests/test-unit.js index 25257e9099..b0f79200dc 100644 --- a/tests/test-unit.js +++ b/tests/test-unit.js @@ -1,6 +1,6 @@ /** * Entry point for all tests in ./cases/* - * This is here to prevent webpack from create a seperate bundle for each + * This is here to prevent webpack from create a separate bundle for each * test case. See: https://github.com/webpack/karma-webpack/issues/23 */ var tests = require.context('./cases', true, /.*\.js$/); diff --git a/tests/test-utils.js b/tests/test-utils.js index 0d1935848f..34a251085b 100644 --- a/tests/test-utils.js +++ b/tests/test-utils.js @@ -156,7 +156,7 @@ module.exports.stepAnimationFrame = function (time) { /** * Allow stepping through animation frames. Call unmockAnimationFrame to - * retore the original animation frame behavior. + * restore the original animation frame behavior. */ module.exports.mockAnimationFrame = function (mockDate) {