This repository has been archived by the owner on Dec 1, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 107
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #140 from Esri/eslint
replace jshint with eslint resolves #138
- Loading branch information
Showing
21 changed files
with
412 additions
and
416 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "rules": { | ||
| "indent": [ | ||
| 2, | ||
| 4 | ||
| ], | ||
| "quotes": [ | ||
| 2, | ||
| "single" | ||
| ], | ||
| "semi": [ | ||
| 2, | ||
| "always" | ||
| ] | ||
| }, | ||
| "env": { | ||
| "browser": true | ||
| }, | ||
| "globals": { | ||
| "angular": false | ||
| }, | ||
| "extends": "eslint:recommended" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "rules": { | ||
| "no-console": 0 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,124 +1,124 @@ | ||
| (function (angular) { | ||
| 'use strict'; | ||
|
|
||
| angular.module('esri.core').factory('esriLayerUtils', function (esriLoader) { | ||
|
|
||
| // parse array of visible layer ids from a string | ||
| function parseVisibleLayers(val) { | ||
| var visibleLayers; | ||
| if (typeof val === 'string') { | ||
| visibleLayers = []; | ||
| val.split(',').forEach(function(layerId) { | ||
| var n = parseInt(layerId); | ||
| if(!isNaN(n)) { | ||
| visibleLayers.push(n); | ||
| } | ||
| }); | ||
| (function(angular) { | ||
| 'use strict'; | ||
|
|
||
| angular.module('esri.core').factory('esriLayerUtils', function(esriLoader) { | ||
|
|
||
| // parse array of visible layer ids from a string | ||
| function parseVisibleLayers(val) { | ||
| var visibleLayers; | ||
| if (typeof val === 'string') { | ||
| visibleLayers = []; | ||
| val.split(',').forEach(function(layerId) { | ||
| var n = parseInt(layerId); | ||
| if (!isNaN(n)) { | ||
| visibleLayers.push(n); | ||
| } | ||
| }); | ||
| } | ||
| return visibleLayers; | ||
| } | ||
| return visibleLayers; | ||
| } | ||
|
|
||
| // layerOptions.infoTemplate expects one of the following: | ||
| // 1. [title <String | Function>, content <String | Function>] | ||
| // 2. {title: <String | Function>, content: <String | Function>} | ||
| // 3. a valid Esri JSAPI InfoTemplate | ||
| function objectToInfoTemplate(infoTemplate, InfoTemplate) { | ||
| // only attempt to construct if a valid InfoTemplate wasn't already passed in | ||
| if (infoTemplate.declaredClass === 'esri.InfoTemplate') { | ||
| return infoTemplate; | ||
| } else { | ||
| // construct infoTemplate from object, using 2 args style: | ||
| // https://developers.arcgis.com/javascript/jsapi/infotemplate-amd.html#infotemplate2 | ||
| if (angular.isArray(infoTemplate) && infoTemplate.length === 2) { | ||
| return new InfoTemplate(infoTemplate[0], infoTemplate[1]); | ||
|
|
||
| // layerOptions.infoTemplate expects one of the following: | ||
| // 1. [title <String | Function>, content <String | Function>] | ||
| // 2. {title: <String | Function>, content: <String | Function>} | ||
| // 3. a valid Esri JSAPI InfoTemplate | ||
| function objectToInfoTemplate(infoTemplate, InfoTemplate) { | ||
| // only attempt to construct if a valid InfoTemplate wasn't already passed in | ||
| if (infoTemplate.declaredClass === 'esri.InfoTemplate') { | ||
| return infoTemplate; | ||
| } else { | ||
| return new InfoTemplate(infoTemplate.title, infoTemplate.content); | ||
| // construct infoTemplate from object, using 2 args style: | ||
| // https://developers.arcgis.com/javascript/jsapi/infotemplate-amd.html#infotemplate2 | ||
| if (angular.isArray(infoTemplate) && infoTemplate.length === 2) { | ||
| return new InfoTemplate(infoTemplate[0], infoTemplate[1]); | ||
| } else { | ||
| return new InfoTemplate(infoTemplate.title, infoTemplate.content); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // stateless utility service | ||
| var service = {}; | ||
|
|
||
| // create a feature layer | ||
| service.createFeatureLayer = function(url, layerOptions) { | ||
| return esriLoader.require(['esri/layers/FeatureLayer', 'esri/InfoTemplate']).then(function(esriModules) { | ||
| var FeatureLayer = esriModules[0]; | ||
| var InfoTemplate = esriModules[1]; | ||
|
|
||
| // normalize info template defined in layerOptions.infoTemplate | ||
| // or nested esriLayerOption directive to be instance of esri/InfoTemplate | ||
| // and pass to layer constructor in layerOptions | ||
| if (layerOptions.infoTemplate) { | ||
| layerOptions.infoTemplate = objectToInfoTemplate(layerOptions.infoTemplate, InfoTemplate); | ||
| } | ||
|
|
||
| // layerOptions.mode expects a FeatureLayer constant name as a <String> | ||
| // https://developers.arcgis.com/javascript/jsapi/featurelayer-amd.html#constants | ||
| if (layerOptions.hasOwnProperty('mode')) { | ||
| // look up and convert to the appropriate <Number> value | ||
| layerOptions.mode = FeatureLayer[layerOptions.mode]; | ||
| } | ||
| // stateless utility service | ||
| var service = {}; | ||
|
|
||
| // create a feature layer | ||
| service.createFeatureLayer = function(url, layerOptions) { | ||
| return esriLoader.require(['esri/layers/FeatureLayer', 'esri/InfoTemplate']).then(function(esriModules) { | ||
| var FeatureLayer = esriModules[0]; | ||
| var InfoTemplate = esriModules[1]; | ||
|
|
||
| // normalize info template defined in layerOptions.infoTemplate | ||
| // or nested esriLayerOption directive to be instance of esri/InfoTemplate | ||
| // and pass to layer constructor in layerOptions | ||
| if (layerOptions.infoTemplate) { | ||
| layerOptions.infoTemplate = objectToInfoTemplate(layerOptions.infoTemplate, InfoTemplate); | ||
| } | ||
|
|
||
| return new FeatureLayer(url, layerOptions); | ||
| }); | ||
| }; | ||
|
|
||
| // create a dynamic service layer | ||
| service.createDynamicMapServiceLayer = function(url, layerOptions, visibleLayers) { | ||
| return esriLoader.require(['esri/layers/ArcGISDynamicMapServiceLayer', 'esri/InfoTemplate', 'esri/layers/ImageParameters']).then(function (esriModules) { | ||
| var ArcGISDynamicMapServiceLayer = esriModules[0]; | ||
| var InfoTemplate = esriModules[1]; | ||
| var ImageParameters = esriModules[2]; | ||
| var layer; | ||
|
|
||
| // normalize info templates defined in layerOptions.infoTemplates | ||
| // or nested esriLayerOption directives to be instances of esri/InfoTemplate | ||
| // and pass to layer constructor in layerOptions | ||
| if (layerOptions.infoTemplates) { | ||
| for (var layerId in layerOptions.infoTemplates) { | ||
| if (layerOptions.infoTemplates.hasOwnProperty(layerId)) { | ||
| layerOptions.infoTemplates[layerId].infoTemplate = objectToInfoTemplate(layerOptions.infoTemplates[layerId].infoTemplate, InfoTemplate); | ||
| // layerOptions.mode expects a FeatureLayer constant name as a <String> | ||
| // https://developers.arcgis.com/javascript/jsapi/featurelayer-amd.html#constants | ||
| if (layerOptions.hasOwnProperty('mode')) { | ||
| // look up and convert to the appropriate <Number> value | ||
| layerOptions.mode = FeatureLayer[layerOptions.mode]; | ||
| } | ||
|
|
||
| return new FeatureLayer(url, layerOptions); | ||
| }); | ||
| }; | ||
|
|
||
| // create a dynamic service layer | ||
| service.createDynamicMapServiceLayer = function(url, layerOptions, visibleLayers) { | ||
| return esriLoader.require(['esri/layers/ArcGISDynamicMapServiceLayer', 'esri/InfoTemplate', 'esri/layers/ImageParameters']).then(function(esriModules) { | ||
| var ArcGISDynamicMapServiceLayer = esriModules[0]; | ||
| var InfoTemplate = esriModules[1]; | ||
| var ImageParameters = esriModules[2]; | ||
| var layer; | ||
|
|
||
| // normalize info templates defined in layerOptions.infoTemplates | ||
| // or nested esriLayerOption directives to be instances of esri/InfoTemplate | ||
| // and pass to layer constructor in layerOptions | ||
| if (layerOptions.infoTemplates) { | ||
| for (var layerId in layerOptions.infoTemplates) { | ||
| if (layerOptions.infoTemplates.hasOwnProperty(layerId)) { | ||
| layerOptions.infoTemplates[layerId].infoTemplate = objectToInfoTemplate(layerOptions.infoTemplates[layerId].infoTemplate, InfoTemplate); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // check for imageParameters property and | ||
| // convert into ImageParameters() if needed | ||
| if (angular.isObject(layerOptions.imageParameters)) { | ||
| if (layerOptions.imageParameters.declaredClass !== 'esri.layers.ImageParameters') { | ||
| var imageParameters = new ImageParameters(); | ||
| for (var key in layerOptions.imageParameters) { | ||
| if (layerOptions.imageParameters.hasOwnProperty(key)) { | ||
| // TODO: may want to convert timeExent to new TimeExtent() | ||
| // also not handling conversion for bbox, imageSpatialReference, nor layerTimeOptions | ||
| imageParameters[key] = layerOptions.imageParameters[key]; | ||
| // check for imageParameters property and | ||
| // convert into ImageParameters() if needed | ||
| if (angular.isObject(layerOptions.imageParameters)) { | ||
| if (layerOptions.imageParameters.declaredClass !== 'esri.layers.ImageParameters') { | ||
| var imageParameters = new ImageParameters(); | ||
| for (var key in layerOptions.imageParameters) { | ||
| if (layerOptions.imageParameters.hasOwnProperty(key)) { | ||
| // TODO: may want to convert timeExent to new TimeExtent() | ||
| // also not handling conversion for bbox, imageSpatialReference, nor layerTimeOptions | ||
| imageParameters[key] = layerOptions.imageParameters[key]; | ||
| } | ||
| } | ||
| layerOptions.imageParameters = imageParameters; | ||
| } | ||
| layerOptions.imageParameters = imageParameters; | ||
| } | ||
| } | ||
|
|
||
| // create the layer object | ||
| layer = new ArcGISDynamicMapServiceLayer(url, layerOptions); | ||
| // create the layer object | ||
| layer = new ArcGISDynamicMapServiceLayer(url, layerOptions); | ||
|
|
||
| // set visible layers if passed as attribute | ||
| if (visibleLayers) { | ||
| layer.setVisibleLayers(parseVisibleLayers(visibleLayers)); | ||
| } | ||
| // set visible layers if passed as attribute | ||
| if (visibleLayers) { | ||
| layer.setVisibleLayers(parseVisibleLayers(visibleLayers)); | ||
| } | ||
|
|
||
| return layer; | ||
| }); | ||
| }; | ||
| return layer; | ||
| }); | ||
| }; | ||
|
|
||
| // create an InfoTemplate object from JSON | ||
| service.createInfoTemplate = function(infoTemplate) { | ||
| return esriLoader.require('esri/InfoTemplate').then(function(InfoTemplate) { | ||
| return objectToInfoTemplate(infoTemplate, InfoTemplate); | ||
| }); | ||
| }; | ||
| // create an InfoTemplate object from JSON | ||
| service.createInfoTemplate = function(infoTemplate) { | ||
| return esriLoader.require('esri/InfoTemplate').then(function(InfoTemplate) { | ||
| return objectToInfoTemplate(infoTemplate, InfoTemplate); | ||
| }); | ||
| }; | ||
|
|
||
| return service; | ||
| }); | ||
| return service; | ||
| }); | ||
|
|
||
| })(angular); |
Oops, something went wrong.