From 25ce610f6ecca7325e7a743dc032c4a76559c63d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 02 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

---
 jimu.js/MapManager.js |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/jimu.js/MapManager.js b/jimu.js/MapManager.js
index a2535e8..03284a5 100644
--- a/jimu.js/MapManager.js
+++ b/jimu.js/MapManager.js
@@ -14,8 +14,8 @@
     './utils',
     'jimu/dijit/Message'
 ], function (declare, lang, array, html, query, topic, on, aspect, keys, i18n, dojoConfig,
-             require, jimuUtils,
-             Message) {
+    require, jimuUtils,
+    Message) {
     var instance = null,
         clazz = declare(null, {
             appConfig: null,
@@ -71,7 +71,7 @@
 
             },
 
-            _createMap: function (mode, appConfig) {//创建地图js
+            _createMap: function (mode, appConfig) { //创建地图js
 
                 Cesium.Ion.defaultAccessToken = appConfig.cesiumToken;
 
@@ -90,7 +90,7 @@
                 imageryLayers.removeAll();
 
                 this.map.baseLayerPicker.viewModel.selectedImagery = this.map.baseLayerPicker.viewModel.imageryProviderViewModels[1];
-                this.map.baseLayerPicker.viewModel.selectedTerrain = this.map.baseLayerPicker.viewModel.terrainProviderViewModels[0];
+                this.map.baseLayerPicker.viewModel.selectedTerrain = this.map.baseLayerPicker.viewModel.terrainProviderViewModels[1];
                 $(".cesium-baseLayerPicker-sectionTitle").eq(0).html("底图");
                 $(".cesium-baseLayerPicker-sectionTitle").eq(1).html("地形");
 
@@ -136,7 +136,13 @@
                             layer = new Cesium.WebMapTileServiceImageryProvider(layerConfig);
                         } else if (layerConfig.type == "SuperMap") {
                             layer = new Cesium.SuperMapImageryProvider(layerConfig);
+                        } else if (layerConfig.type == "arcgis") {
+                            layer = new Cesium.ArcGisMapServerImageryProvider(layerConfig);
                         }
+
+
+
+
                         layerArr.push(layer);
                     }
 
@@ -163,6 +169,18 @@
                     creationFunction: function () {
                         return new Cesium.EllipsoidTerrainProvider({
                             ellipsoid: Cesium.Ellipsoid.WGS84
+                        })
+                    }
+                }), new Cesium.ProviderViewModel({
+                    name: "鄱阳湖地形",
+                    tooltip: "由 普适科技 提供的鄱阳湖地区地形",
+                    iconUrl: "images/basemaps/TerrainSTK.png",
+                    creationFunction: function () {
+                        return new Cesium.CesiumTerrainProvider({
+                            url: "./dx/",
+                            requestWaterMask: !0,
+                            requestVertexNormals: !0,
+                            // isSct: true,//因坡度坡向添加
                         })
                     }
                 })];
@@ -266,7 +284,9 @@
                     var roll = mapOptions.positionInfo.roll;
 
                     setTimeout(lang.hitch(this, function () {
-                        this.map.camera.setView({destination: Cesium.Rectangle.fromDegrees(west, south, east, north)});
+                        this.map.camera.setView({
+                            destination: Cesium.Rectangle.fromDegrees(west, south, east, north)
+                        });
                     }), 100);
 
 

--
Gitblit v1.9.3