Add support for Cesium IonImageryProvider type

Relates to #1789
NCEAS · Oct 5, 2021 · 703c0c4 · 703c0c4
1 parent 54bed90
commit 703c0c4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/src/js/collections/maps/MapAssets.js b/src/js/collections/maps/MapAssets.js
@@ -55,7 +55,7 @@ define(
                 model: Cesium3DTileset
               },
               {
-                types: ['BingMapsImageryProvider'],
+                types: ['BingMapsImageryProvider', 'IonImageryProvider'],
                 model: CesiumImagery
               },
               {

diff --git a/src/js/models/maps/Map.js b/src/js/models/maps/Map.js
@@ -101,7 +101,10 @@ define(
 
               // For now, filter out types that are not supported before initializing any
               // MapAssets collections. TODO: Make this a configurable list somewhere. 
-              var supportedTypes = ['Cesium3DTileset', 'BingMapsImageryProvider', 'CesiumTerrainProvider']
+              var supportedTypes = [
+                'Cesium3DTileset', 'BingMapsImageryProvider', 'IonImageryProvider',
+                'CesiumTerrainProvider'
+              ]
 
               if (attrs.layers && attrs.layers.length && Array.isArray(attrs.layers)) {
                 var supportedLayers = _.filter(attrs.layers, function (layer) {

diff --git a/src/js/models/maps/assets/CesiumImagery.js b/src/js/models/maps/assets/CesiumImagery.js
@@ -104,6 +104,7 @@ define(
           var cesiumOptions = this.get('cesiumOptions');
           var type = this.get('type')
           var providerFunction = Cesium[type]
+
           var initialAppearance = {
             alpha: this.get('opacity'),
             show: this.get('visible')
@@ -117,6 +118,11 @@ define(
 
           if (type === 'BingMapsImageryProvider') {
             cesiumOptions.key = cesiumOptions.key || MetacatUI.AppConfig.bingMapsKey
+          } else if (type === 'IonImageryProvider') {
+            cesiumOptions.assetId = Number(cesiumOptions.ionAssetId)
+            delete cesiumOptions.ionAssetId
+            cesiumOptions.accessToken =
+                cesiumOptions.cesiumToken || MetacatUI.appModel.get('cesiumToken');
           }
 
           if (providerFunction && typeof providerFunction === 'function') {

diff --git a/src/js/views/maps/CesiumWidgetView.js b/src/js/views/maps/CesiumWidgetView.js
@@ -81,7 +81,7 @@ define(
             renderFunction: 'add3DTileset'
           },
           {
-            types: ['BingMapsImageryProvider'],
+            types: ['BingMapsImageryProvider', 'IonImageryProvider'],
             renderFunction: 'addImagery'
           },
           {
@@ -371,7 +371,7 @@ define(
          * the Feature model that is set on the Map's `selectedFeature` attribute. NOTE:
          * This currently only works with 3D tile features.
          * @param {Cesium3DTileFeature} feature
-              */
+        */
         updateSelectedFeatureModel: function (feature) {
           try {
             var view = this