From 90941b05dc0b965d7f0821430bd83eab21886509 Mon Sep 17 00:00:00 2001
From: raitis <raitisbe@gmail.com>
Date: Fri, 11 Jan 2019 14:45:33 +0200
Subject: [PATCH] Access token usage fixed for cesium terrain layers. Wrong
 access token was used, if terrain providers are defined in app.js, because
 token is set inside hscesium.js module, which is used later. Now the
 createWorldTerrain function will be called,  when the layer is turned on and
 thus the correct token will be used.

fixes #147
---
 components/hscesium/hs_cesium_layers.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/components/hscesium/hs_cesium_layers.js b/components/hscesium/hs_cesium_layers.js
index 01b9a324af..9ddd1d52e5 100644
--- a/components/hscesium/hs_cesium_layers.js
+++ b/components/hscesium/hs_cesium_layers.js
@@ -34,9 +34,15 @@ define(['ol', 'moment', 'proj4'],
             setupEvents() {
                 me.$rootScope.$on('layermanager.base_layer_visible_changed', function(event, data, b) {
                     if (angular.isDefined(data) && angular.isDefined(data.type) && data.type == 'terrain') {
-                        me.viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
-                            url: data.url
-                        });
+                        if(data.url == 'https://assets.agi.com/stk-terrain/v1/tilesets/world/tiles') {
+                            var terrain_provider = Cesium.createWorldTerrain(me.config.createWorldTerrainOptions);
+                            if (me.config.newTerrainProviderOptions) terrain_provider = new Cesium.CesiumTerrainProvider(me.config.newTerrainProviderOptions);
+                            me.viewer.terrainProvider = terrain_provider;
+                        } else {
+                            me.viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
+                                url: data.url
+                            });
+                        }
                     }
                 });