From 4e510c397902f7fe79e5beb2912c5e62da1bbe72 Mon Sep 17 00:00:00 2001 From: travis Date: Fri, 22 Jun 2018 08:31:15 -0700 Subject: [PATCH 1/2] Bumping jshint --- package-lock.json | 266 ++++++++++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 237 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index e004ec8a..cb5b36e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,6 +68,18 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", @@ -374,6 +386,27 @@ "lazy-cache": "1.0.4" } }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + }, + "dependencies": { + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } + }, "chokidar": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", @@ -392,12 +425,38 @@ } }, "cli": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/cli/-/cli-0.4.5.tgz", - "integrity": "sha1-ePlIXNFhtWbppsctcXDEJw6B22E=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", + "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=", "dev": true, "requires": { - "glob": "3.1.21" + "exit": "0.1.2", + "glob": "7.1.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "1.1.11" + } + } } }, "cliui": { @@ -631,6 +690,15 @@ "integrity": "sha1-gBV9E3HJ83zBQDmrGJWXDRGdw7w=", "dev": true }, + "console-browserify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", + "dev": true, + "requires": { + "date-now": "0.1.4" + } + }, "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", @@ -699,6 +767,12 @@ "assert-plus": "1.0.0" } }, + "date-now": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", + "dev": true + }, "dateformat": { "version": "1.0.2-1.2.3", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz", @@ -762,6 +836,55 @@ "void-elements": "2.0.1" } }, + "dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "dev": true, + "requires": { + "domelementtype": "1.1.3", + "entities": "1.1.1" + }, + "dependencies": { + "domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", + "dev": true + }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", + "dev": true + } + } + }, + "domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", + "dev": true + }, + "domhandler": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", + "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", + "dev": true, + "requires": { + "domelementtype": "1.3.0" + } + }, + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "dev": true, + "requires": { + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" + } + }, "ecc-jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", @@ -894,6 +1017,12 @@ "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", "dev": true }, + "entities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", + "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=", + "dev": true + }, "error-ex": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", @@ -915,6 +1044,12 @@ "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", "dev": true }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, "escodegen": { "version": "0.0.28", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz", @@ -2363,12 +2498,14 @@ "dev": true }, "grunt-contrib-jshint": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.4.3.tgz", - "integrity": "sha1-79bO/oT8rBQ+QlE82uc2eMUiB5M=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.1.0.tgz", + "integrity": "sha1-Np2QmyWTxA6L55lAshNAhQx5Oaw=", "dev": true, "requires": { - "jshint": "1.1.0" + "chalk": "1.1.3", + "hooker": "0.2.3", + "jshint": "2.9.5" } }, "grunt-contrib-uglify": { @@ -2670,6 +2807,15 @@ "har-schema": "2.0.0" } }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, "has-binary": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz", @@ -2739,6 +2885,45 @@ "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", "dev": true }, + "htmlparser2": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", + "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", + "dev": true, + "requires": { + "domelementtype": "1.3.0", + "domhandler": "2.3.0", + "domutils": "1.5.1", + "entities": "1.0.0", + "readable-stream": "1.1.14" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, "http-errors": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", @@ -3174,28 +3359,40 @@ "optional": true }, "jshint": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-1.1.0.tgz", - "integrity": "sha1-mYe5C4YFVsvH84DVdVoj1QQhNRM=", + "version": "2.9.5", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz", + "integrity": "sha1-HnJSkVzmgbQIJ+4UJIxG006apiw=", "dev": true, "requires": { - "cli": "0.4.5", - "esprima": "https://github.com/ariya/esprima/tarball/master", - "minimatch": "0.2.14", - "peakle": "0.0.1", - "shelljs": "0.1.4", - "underscore": "1.4.4" + "cli": "1.0.1", + "console-browserify": "1.1.0", + "exit": "0.1.2", + "htmlparser2": "3.8.3", + "lodash": "3.7.0", + "minimatch": "3.0.4", + "shelljs": "0.3.0", + "strip-json-comments": "1.0.4" }, "dependencies": { - "esprima": { - "version": "https://github.com/ariya/esprima/tarball/master", - "integrity": "sha512-W5+ntA5gmzYpBFDpLLw7yAJPohkq5yKF8JnP9UOaXSfnKcibZQcIM9anoxztmB2NwRWLLidEseBbuCdwgQsnig==", + "lodash": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz", + "integrity": "sha1-Nni9irmVBXwHreg27S7wh9qBHUU=", "dev": true }, - "underscore": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz", - "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ=", + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "1.1.11" + } + }, + "shelljs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", + "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=", "dev": true } } @@ -4060,12 +4257,6 @@ } } }, - "peakle": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/peakle/-/peakle-0.0.1.tgz", - "integrity": "sha1-KGRF1qdzPxfcJzUB4uA5n0G4kOA=", - "dev": true - }, "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -4843,6 +5034,15 @@ "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", "dev": true }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, "strip-bom": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", @@ -4861,6 +5061,12 @@ "get-stdin": "4.0.1" } }, + "strip-json-comments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", + "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=", + "dev": true + }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", diff --git a/package.json b/package.json index eef28817..245f341a 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "grunt-contrib-concat": "~0.3.0", "grunt-contrib-connect": "^1.0.2", "grunt-contrib-copy": "~0.4.1", - "grunt-contrib-jshint": "~0.4.3", + "grunt-contrib-jshint": "~1.1.0", "grunt-contrib-uglify": "~0.2.0", "grunt-contrib-watch": "~0.4.0", "grunt-conventional-changelog": "~0.1.1", From 11b5297d08772dc03e23c05a08056c659d5225cf Mon Sep 17 00:00:00 2001 From: Travis Brundage Date: Sun, 24 Jun 2018 23:04:11 -0700 Subject: [PATCH 2/2] Fix new jshint linting issues --- src/common/map/MapService.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/common/map/MapService.js b/src/common/map/MapService.js index 4bfed00b..b3c128e2 100644 --- a/src/common/map/MapService.js +++ b/src/common/map/MapService.js @@ -788,11 +788,11 @@ return wms_url; }; } - + var mapproxyMostSpecificUrl = serverService_.getMostSpecificUrl(server); layer = new ol.layer.Tile({ metadata: { name: minimalConfig.name, - url: goog.isDefAndNotNull(mostSpecificUrl) ? mostSpecificUrl : undefined, + url: goog.isDefAndNotNull(mapproxyMostSpecificUrl) ? mapproxyMostSpecificUrl : undefined, title: fullConfig.title, extent: fullConfig['extent'], abstract: fullConfig.abstract, @@ -881,12 +881,12 @@ } // This arc service does not support tiled maps, so this will // use the arc image service instead... - serviceSource = new ol.source.TileArcGISRest({ + var tilemapServiceSource = new ol.source.TileArcGISRest({ url: rest_url }); // patch the web mercator projection. - serviceSource.tileUrlFunction = function(tileCoord, pixelRatio, projection) { + tilemapServiceSource.tileUrlFunction = function(tileCoord, pixelRatio, projection) { var rest_proj = projection; if (rest_proj.getCode() === 'EPSG:900913') { rest_proj = ol.proj.get('EPSG:3857'); @@ -916,7 +916,7 @@ title: fullConfig.title }, visible: minimalConfig.visibility, - source: serviceSource + source: tilemapServiceSource }); } else if (server.ptype === 'gxp_arcrestsource') { if (fullConfig.bbox_left) { @@ -949,11 +949,11 @@ url += '/'; } var serviceUrl = url + 'tile/{z}/{y}/{x}'; - var serviceSource = null; + var arcrestServiceSource = null; if (server.proj === 'EPSG:4326') { var projection = ol.proj.get('EPSG:4326'); var tileSize = 512; - serviceSource = new ol.source.XYZ({ + arcrestServiceSource = new ol.source.XYZ({ attributions: [attribution], maxZoom: 16, projection: projection, @@ -967,7 +967,7 @@ wrapX: true }); } else { - serviceSource = new ol.source.XYZ({ + arcrestServiceSource = new ol.source.XYZ({ attributions: [attribution], maxZoom: 19, metadata: metadata, @@ -978,7 +978,7 @@ layer = new ol.layer.Tile({ metadata: metadata, visible: minimalConfig.visibility, - source: serviceSource + source: arcrestServiceSource }); } else if (server.ptype === 'gxp_tilejsonsource') { //currently we assume only one layer per 'server' @@ -1020,7 +1020,7 @@ nameSplit = (fullConfig.Name || fullConfig.name).split(':'); // favor virtual service url when available - var mostSpecificUrl = server.url; + var wmscsourceMostSpecificUrl = server.url; var mostSpecificUrlWms = server.url; if (goog.isDefAndNotNull(server.isVirtualService) && server.isVirtualService === true) { mostSpecificUrlWms = server.virtualServiceUrl; @@ -1030,7 +1030,7 @@ if (goog.isDefAndNotNull(mostSpecificUrlWms)) { var urlIndex = mostSpecificUrlWms.lastIndexOf('/'); if (urlIndex !== -1) { - mostSpecificUrl = mostSpecificUrlWms.slice(0, urlIndex); + wmscsourceMostSpecificUrl = mostSpecificUrlWms.slice(0, urlIndex); } } @@ -1097,7 +1097,7 @@ metadata: { serverId: server.id, name: minimalConfig.name, - url: goog.isDefAndNotNull(mostSpecificUrl) ? mostSpecificUrl : undefined, + url: goog.isDefAndNotNull(wmscsourceMostSpecificUrl) ? wmscsourceMostSpecificUrl : undefined, title: fullConfig.Title, abstract: fullConfig.Abstract, keywords: fullConfig.KeywordList, @@ -1115,7 +1115,7 @@ }); // Test if layer is read-only - if (goog.isDefAndNotNull(mostSpecificUrl)) { + if (goog.isDefAndNotNull(wmscsourceMostSpecificUrl)) { layer.get('metadata').readOnly = true; var testReadOnly = function() { var wfsRequestData = ' ' +