Make jshint warn on unused variables.

Also remove a whole ton of them.

.jshintrc

@@ -15,7 +15,7 @@
   "quotmark": false,
   "regexp": false,
   "undef": true,
-  "unused": false,
+  "unused": "vars",
   "strict": true,
   "trailing": true,
   "asi": false,

spec/Map/unionRectanglesSpec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-/*global require,describe,it,expect,beforeEach*/
+/*global require,describe,it,expect*/
 
 var Rectangle = require('../../third_party/cesium/Source/Core/Rectangle');
 

spec/ViewModels/CsvItemViewModelSpec.js

@@ -3,7 +3,6 @@
 /*global require,describe,it,expect,beforeEach*/
 
 var ApplicationViewModel = require('../../src/ViewModels/ApplicationViewModel');
-var ImageryLayerItemViewModel = require('../../src/ViewModels/ImageryLayerItemViewModel');
 var CatalogItemViewModel = require('../../src/ViewModels/CatalogItemViewModel');
 var CsvItemViewModel = require('../../src/ViewModels/CsvItemViewModel');
 
@@ -25,7 +24,7 @@ describe('CsvDataItemViewModel', function() {
 
     it('throws if constructed without an application', function() {
         expect(function() {
-            var viewModel = new CsvItemViewModel();
+            var viewModel = new CsvItemViewModel(); // jshint ignore:line
         }).toThrow();
     });
 

spec/ViewModels/WebMapServiceDataItemViewModelSpec.js

@@ -25,7 +25,7 @@ describe('WebMapServiceDataItemViewModel', function() {
 
     it('throws if constructed without an application', function() {
         expect(function() {
-            var viewModel = new WebMapServiceItemViewModel();
+            var viewModel = new WebMapServiceItemViewModel(); // jshint ignore:line
         }).toThrow();
     });
 

src/Core/inherit.js

@@ -1,7 +1,5 @@
 'use strict';
 
-/*global require*/
-
 var inherit = function(base, derived) {
     function F() {}
     F.prototype = base.prototype;

src/Map/Dataset.js

@@ -182,7 +182,6 @@ Dataset.prototype._processVariables = function () {
 */
 Dataset.prototype.loadJson = function (jsonTable) {
 
-    var dataObject = { positions: [], dataValues: [] };
     this.dataShape = undefined;
 
     //create the variable set

src/Map/LeafletVisualizer.js

@@ -1,18 +1,16 @@
 
 "use strict";
 
-/*global require,L,URI,$,Document,alert,console*/
+/*global require,L*/
 var AssociativeArray = require('../../third_party/cesium/Source/Core/AssociativeArray');
 var Cartesian2 = require('../../third_party/cesium/Source/Core/Cartesian2');
-var Cartesian3 = require('../../third_party/cesium/Source/Core/Cartesian3');
 var Color = require('../../third_party/cesium/Source/Core/Color');
 var defined = require('../../third_party/cesium/Source/Core/defined');
 var destroyObject = require('../../third_party/cesium/Source/Core/destroyObject');
 var DeveloperError = require('../../third_party/cesium/Source/Core/DeveloperError');
 var Property = require('../../third_party/cesium/Source/DataSources/Property');
 var Ellipsoid = require('../../third_party/cesium/Source/Core/Ellipsoid');
 var CesiumMath = require('../../third_party/cesium/Source/Core/Math');
-var loadImage = require('../../third_party/cesium/Source/Core/loadImage');
 var writeTextToCanvas = require('../../third_party/cesium/Source/Core/writeTextToCanvas');
 
 

src/Map/TableDataSource.js

@@ -1,4 +1,4 @@
-/*global require,$*/
+/*global require*/
 "use strict";
 
 var Dataset = require('./Dataset');
@@ -11,7 +11,6 @@ And writes a czml file for it to display
 
 //TODO: DOCUMENT using model in GeoJsonDataSource
 
-var defaultValue = require('../../third_party/cesium/Source/Core/defaultValue');
 var defined = require('../../third_party/cesium/Source/Core/defined');
 var CzmlDataSource = require('../../third_party/cesium/Source/DataSources/CzmlDataSource');
 var Color = require('../../third_party/cesium/Source/Core/Color');

src/Map/VarType.js

@@ -1,14 +1,5 @@
-/*global require*/
-"use strict";
-
-/*!
- * Copyright(c) 2012-2013 National ICT Australia Limited (NICTA).  All rights reserved.
- */
+'use strict';
 
 var VarType = {LON: 0, LAT: 1, ALT: 2, TIME: 3, SCALAR: 4, ENUM: 5 };
 
-
 module.exports = VarType;
-
-
-

src/Map/gmlToGeoJson.js

@@ -1,6 +1,6 @@
 'use strict';
 
-/*global require,$*/
+/*global $*/
 
 function gmlToGeoJson(xml) {
     var json = $.xml2json(xml);

src/ViewModels/ArcGisMapServerItemViewModel.js

@@ -1,28 +1,16 @@
 'use strict';
 
-/*global require,L,URI,$*/
+/*global require,L,URI*/
 
 var ArcGisMapServerImageryProvider = require('../../third_party/cesium/Source/Scene/ArcGisMapServerImageryProvider');
-var CesiumMath = require('../../third_party/cesium/Source/Core/Math');
-var clone = require('../../third_party/cesium/Source/Core/clone');
-var combine = require('../../third_party/cesium/Source/Core/combine');
-var defaultValue = require('../../third_party/cesium/Source/Core/defaultValue');
 var defined = require('../../third_party/cesium/Source/Core/defined');
 var defineProperties = require('../../third_party/cesium/Source/Core/defineProperties');
 var DeveloperError = require('../../third_party/cesium/Source/Core/DeveloperError');
-var freezeObject = require('../../third_party/cesium/Source/Core/freezeObject');
 var ImageryLayer = require('../../third_party/cesium/Source/Scene/ImageryLayer');
 var knockout = require('../../third_party/cesium/Source/ThirdParty/knockout');
-var loadXML = require('../../third_party/cesium/Source/Core/loadXML');
-var Rectangle = require('../../third_party/cesium/Source/Core/Rectangle');
 
-var corsProxy = require('../Core/corsProxy');
-var MetadataViewModel = require('./MetadataViewModel');
-var MetadataItemViewModel = require('./MetadataItemViewModel');
-var CatalogItemViewModel = require('./CatalogItemViewModel');
 var ImageryLayerItemViewModel = require('./ImageryLayerItemViewModel');
 var inherit = require('../Core/inherit');
-var rectangleToLatLngBounds = require('../Map/rectangleToLatLngBounds');
 
 /**
  * A {@link ImageryLayerItemViewModel} representing a layer from an Esri ArcGIS MapServer.
@@ -111,8 +99,6 @@ ArcGisMapServerItemViewModel.prototype._enableInLeaflet = function() {
         throw new DeveloperError('This data source is already enabled.');
     }
 
-    var map = this.application.leaflet.map;
-
     var options = {
         opacity : this.opacity
         // Ideally we'd specify "bounds : rectangleToLatLngBounds(this.rectangle)" here.

src/ViewModels/CatalogItemViewModel.js

@@ -5,25 +5,21 @@
 var CameraFlightPath = require('../../third_party/cesium/Source/Scene/CameraFlightPath');
 var CesiumMath = require('../../third_party/cesium/Source/Core/Math');
 var clone = require('../../third_party/cesium/Source/Core/clone');
-var defaultValue = require('../../third_party/cesium/Source/Core/defaultValue');
 var defined = require('../../third_party/cesium/Source/Core/defined');
 var defineProperties = require('../../third_party/cesium/Source/Core/defineProperties');
 var DeveloperError = require('../../third_party/cesium/Source/Core/DeveloperError');
 var freezeObject = require('../../third_party/cesium/Source/Core/freezeObject');
 var knockout = require('../../third_party/cesium/Source/ThirdParty/knockout');
 var Rectangle = require('../../third_party/cesium/Source/Core/Rectangle');
-var Scene = require('../../third_party/cesium/Source/Scene/Scene');
 var when = require('../../third_party/cesium/Source/ThirdParty/when');
 
 var arraysAreEqual = require('../Core/arraysAreEqual');
 var MetadataViewModel = require('./MetadataViewModel');
 var CatalogMemberViewModel = require('./CatalogMemberViewModel');
 var inherit = require('../Core/inherit');
-var NowViewingViewModel = require('./NowViewingViewModel');
 var raiseErrorOnRejectedPromise = require('./raiseErrorOnRejectedPromise');
 var rectangleToLatLngBounds = require('../Map/rectangleToLatLngBounds');
 var runLater = require('../Core/runLater');
-var runWhenDoneLoading = require('./runWhenDoneLoading');
 
 /**
  * A data item in a {@link CatalogGroupViewModel}.
@@ -755,8 +751,6 @@ function isEnabledChanged(viewModel) {
 }
 
 function isShownChanged(viewModel) {
-    var application = viewModel.application;
-
     if (viewModel.isShown) {
         // If the item is not enabled, do that first.  This way things will work even if isShown is
         // deserialized before isEnabled.

src/ViewModels/CesiumViewModel.js

@@ -1,7 +1,5 @@
 'use strict';
 
-/*global require*/
-
 var CesiumViewModel = function(application, viewer) {
     /**
      * Gets or sets the Cesium {@link Viewer} instance.

src/ViewModels/CkanGroupViewModel.js

@@ -2,28 +2,20 @@
 
 /*global require,URI,$*/
 
-var CesiumMath = require('../../third_party/cesium/Source/Core/Math');
 var clone = require('../../third_party/cesium/Source/Core/clone');
-var combine = require('../../third_party/cesium/Source/Core/combine');
-var defaultValue = require('../../third_party/cesium/Source/Core/defaultValue');
 var defined = require('../../third_party/cesium/Source/Core/defined');
 var defineProperties = require('../../third_party/cesium/Source/Core/defineProperties');
-var DeveloperError = require('../../third_party/cesium/Source/Core/DeveloperError');
 var freezeObject = require('../../third_party/cesium/Source/Core/freezeObject');
-var ImageryLayer = require('../../third_party/cesium/Source/Scene/ImageryLayer');
 var knockout = require('../../third_party/cesium/Source/ThirdParty/knockout');
 var loadJson = require('../../third_party/cesium/Source/Core/loadJson');
 var loadText = require('../../third_party/cesium/Source/Core/loadText');
 var Rectangle = require('../../third_party/cesium/Source/Core/Rectangle');
-var WebMapServiceImageryProvider = require('../../third_party/cesium/Source/Scene/WebMapServiceImageryProvider');
 var when = require('../../third_party/cesium/Source/ThirdParty/when');
 
 var corsProxy = require('../Core/corsProxy');
 var ViewModelError = require('./ViewModelError');
 var CatalogGroupViewModel = require('./CatalogGroupViewModel');
 var inherit = require('../Core/inherit');
-var PopupMessage = require('../viewer/PopupMessage');
-var rectangleToLatLngBounds = require('../Map/rectangleToLatLngBounds');
 var WebMapServiceItemViewModel = require('./WebMapServiceItemViewModel');
 
 /**

src/ViewModels/CsvItemViewModel.js

@@ -1,33 +1,23 @@
 'use strict';
 
-/*global require,L,URI,Document,$*/
+/*global require,L,$*/
 
-var CesiumMath = require('../../third_party/cesium/Source/Core/Math');
-var clone = require('../../third_party/cesium/Source/Core/clone');
-var Color = require('../../third_party/cesium/Source/Core/Color');
-var ColorMaterialProperty = require('../../third_party/cesium/Source/DataSources/ColorMaterialProperty');
 var combine = require('../../third_party/cesium/Source/Core/combine');
-var ConstantProperty = require('../../third_party/cesium/Source/DataSources/ConstantProperty');
 var defaultValue = require('../../third_party/cesium/Source/Core/defaultValue');
 var defined = require('../../third_party/cesium/Source/Core/defined');
 var defineProperties = require('../../third_party/cesium/Source/Core/defineProperties');
 var DeveloperError = require('../../third_party/cesium/Source/Core/DeveloperError');
-var freezeObject = require('../../third_party/cesium/Source/Core/freezeObject');
 var knockout = require('../../third_party/cesium/Source/ThirdParty/knockout');
 var loadText = require('../../third_party/cesium/Source/Core/loadText');
-var Rectangle = require('../../third_party/cesium/Source/Core/Rectangle');
 var when = require('../../third_party/cesium/Source/ThirdParty/when');
 
 var TableDataSource = require('../Map/TableDataSource');
 var VarType = require('../Map/VarType');
 
-var corsProxy = require('../Core/corsProxy');
 var MetadataViewModel = require('./MetadataViewModel');
-var MetadataItemViewModel = require('./MetadataItemViewModel');
 var ViewModelError = require('./ViewModelError');
 var CatalogItemViewModel = require('./CatalogItemViewModel');
 var inherit = require('../Core/inherit');
-var rectangleToLatLngBounds = require('../Map/rectangleToLatLngBounds');
 var readText = require('../Core/readText');
 
 var WebMapServiceImageryProvider = require('../../third_party/cesium/Source/Scene/WebMapServiceImageryProvider');
@@ -501,7 +491,6 @@ function createRegionLookupFunc(viewModel) {
     }
     var dataSource = viewModel._tableDataSource;
     var dataset = dataSource.dataset;
-    var vars = dataset.getVarList();
     var description = regionWmsMap[viewModel.regionType];
 
     var codes = dataset.getDataValues(viewModel.regionVar);
@@ -565,35 +554,6 @@ function setRegionVariable(viewModel, regionVar, regionType) {
     }
 }
 
-function setRegionDataVariable(viewModel, newVar) {
-    if (!(viewModel._tableDataSource instanceof TableDataSource)) {
-        return;
-    }
-
-    var dataSource = viewModel._tableDataSource;
-    var dataset = dataSource.dataset;
-    if (dataset.getCurrentVariable() === newVar) {
-        return;
-    }
-    dataset.setCurrentVariable({ variable: newVar}); 
-    createRegionLookupFunc(viewModel);
-
-    console.log('Var set to:', newVar);
-
-    viewModel._rebuild();
-}
-
-function setRegionColorMap(viewModel, dataColorMap) {
-     if (!(viewModel._tableDataSource instanceof TableDataSource)) {
-        return;
-    }
-
-    viewModel._tableDataSource.setColorGradient(dataColorMap);
-    createRegionLookupFunc(viewModel);
-
-    viewModel._rebuild();
-}
-
 function addRegionMap(viewModel) {
     if (!(viewModel._tableDataSource instanceof TableDataSource)) {
         return;

src/ViewModels/CzmlItemViewModel.js

@@ -2,25 +2,14 @@
 
 /*global require*/
 
-var CesiumMath = require('../../third_party/cesium/Source/Core/Math');
-var clone = require('../../third_party/cesium/Source/Core/clone');
-var Color = require('../../third_party/cesium/Source/Core/Color');
-var ColorMaterialProperty = require('../../third_party/cesium/Source/DataSources/ColorMaterialProperty');
-var combine = require('../../third_party/cesium/Source/Core/combine');
-var ConstantProperty = require('../../third_party/cesium/Source/DataSources/ConstantProperty');
 var CzmlDataSource = require('../../third_party/cesium/Source/DataSources/CzmlDataSource');
-var defaultValue = require('../../third_party/cesium/Source/Core/defaultValue');
 var defined = require('../../third_party/cesium/Source/Core/defined');
 var defineProperties = require('../../third_party/cesium/Source/Core/defineProperties');
 var DeveloperError = require('../../third_party/cesium/Source/Core/DeveloperError');
 var knockout = require('../../third_party/cesium/Source/ThirdParty/knockout');
-var loadJson = require('../../third_party/cesium/Source/Core/loadJson');
-var Rectangle = require('../../third_party/cesium/Source/Core/Rectangle');
 var when = require('../../third_party/cesium/Source/ThirdParty/when');
 
-var corsProxy = require('../Core/corsProxy');
 var MetadataViewModel = require('./MetadataViewModel');
-var MetadataItemViewModel = require('./MetadataItemViewModel');
 var ViewModelError = require('./ViewModelError');
 var CatalogItemViewModel = require('./CatalogItemViewModel');
 var inherit = require('../Core/inherit');

src/ViewModels/GeoJsonItemViewModel.js

@@ -1,33 +1,25 @@
 'use strict';
 
-/*global require,L,URI,$,proj4,proj4_epsg*/
+/*global require,proj4,proj4_epsg*/
 
 var CesiumMath = require('../../third_party/cesium/Source/Core/Math');
-var clone = require('../../third_party/cesium/Source/Core/clone');
 var Color = require('../../third_party/cesium/Source/Core/Color');
 var ColorMaterialProperty = require('../../third_party/cesium/Source/DataSources/ColorMaterialProperty');
-var combine = require('../../third_party/cesium/Source/Core/combine');
 var ConstantProperty = require('../../third_party/cesium/Source/DataSources/ConstantProperty');
-var defaultValue = require('../../third_party/cesium/Source/Core/defaultValue');
 var defined = require('../../third_party/cesium/Source/Core/defined');
 var defineProperties = require('../../third_party/cesium/Source/Core/defineProperties');
 var DeveloperError = require('../../third_party/cesium/Source/Core/DeveloperError');
 var GeoJsonDataSource = require('../../third_party/cesium/Source/DataSources/GeoJsonDataSource');
 var knockout = require('../../third_party/cesium/Source/ThirdParty/knockout');
 var loadJson = require('../../third_party/cesium/Source/Core/loadJson');
-var loadXML = require('../../third_party/cesium/Source/Core/loadXML');
 var loadText = require('../../third_party/cesium/Source/Core/loadText');
 var Rectangle = require('../../third_party/cesium/Source/Core/Rectangle');
 var when = require('../../third_party/cesium/Source/ThirdParty/when');
 
-var corsProxy = require('../Core/corsProxy');
 var MetadataViewModel = require('./MetadataViewModel');
-var MetadataItemViewModel = require('./MetadataItemViewModel');
 var ViewModelError = require('./ViewModelError');
 var CatalogItemViewModel = require('./CatalogItemViewModel');
-var ImageryLayerItemViewModel = require('./ImageryLayerItemViewModel');
 var inherit = require('../Core/inherit');
-var rectangleToLatLngBounds = require('../Map/rectangleToLatLngBounds');
 var readJson = require('../Core/readJson');
 
 var lineAndFillPalette = {
@@ -156,7 +148,7 @@ GeoJsonItemViewModel.prototype._load = function() {
             });
         });
     } else {
-        return loadJson(that.url).then(function(json) {
+        return loadJson(proxyUrl(that.application, that.url)).then(function(json) {
             return updateViewModelFromData(that, json);
         }).otherwise(function(e) {
             throw new ViewModelError({