Fix #3134 Temporary disabling the terrain (#3165)

baloola · offtherailz · commit 0c46a1e0ff64 · 2018-08-29T10:44:15.000+02:00
diff --git a/web/client/components/map/cesium/Map.jsx b/web/client/components/map/cesium/Map.jsx
@@ -172,12 +172,16 @@ class CesiumMap extends React.Component {
         if (rawOptions.terrainProvider) {
             let {type, ...tpOptions} = rawOptions.terrainProvider;
             switch (type) {
-            case "cesium": {
-                overrides.terrainProvider = new Cesium.CesiumTerrainProvider(tpOptions);
-                break;
-            }
-            default:
-                break;
+                case "cesium": {
+                    overrides.terrainProvider = new Cesium.CesiumTerrainProvider(tpOptions);
+                    break;
+                }
+                case "ellipsoid": {
+                    overrides.terrainProvider = new Cesium.EllipsoidTerrainProvider();
+                    break;
+                }
+                default:
+                    break;
             }
         }
         return assign({}, rawOptions, overrides);
diff --git a/web/client/examples/3dviewer/containers/Viewer.jsx b/web/client/examples/3dviewer/containers/Viewer.jsx
@@ -45,9 +45,7 @@ class Viewer extends React.Component {
     static defaultProps = {
         mapOptions: {
             terrainProvider: {
-                type: "cesium",
-                url: "https://assets.agi.com/stk-terrain/world",
-                requestVertexNormals: true
+                type: "ellipsoid"
             }
         }
     };
diff --git a/web/client/localConfig.json b/web/client/localConfig.json
@@ -16,9 +16,7 @@
           "flyTo": true,
           "navigationTools": true,
           "terrainProvider": {
-              "type": "cesium",
-              "url": "https://assets.agi.com/stk-terrain/world",
-              "requestVertexNormals": true
+              "type": "ellipsoid"
           }
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,7 @@ class Viewer extends React.Component {`
`45`	`45`	`static defaultProps = {`
`46`	`46`	`mapOptions: {`
`47`	`47`	`terrainProvider: {`
`48`		`- type: "cesium",`
`49`		`- url: "https://assets.agi.com/stk-terrain/world",`
`50`		`- requestVertexNormals: true`
	`48`	`+ type: "ellipsoid"`
`51`	`49`	`}`
`52`	`50`	`}`
`53`	`51`	`};`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,7 @@`
`16`	`16`	`"flyTo": true,`
`17`	`17`	`"navigationTools": true,`
`18`	`18`	`"terrainProvider": {`
`19`		`- "type": "cesium",`
`20`		`- "url": "https://assets.agi.com/stk-terrain/world",`
`21`		`- "requestVertexNormals": true`
	`19`	`+ "type": "ellipsoid"`
`22`	`20`	`}`
`23`	`21`	`}`
`24`	`22`	`},`