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 | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/jimu.js/MapManager.js b/jimu.js/MapManager.js
index f3d348f..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) {
+ _createMap: function (mode, appConfig) { //创建地图js
Cesium.Ion.defaultAccessToken = appConfig.cesiumToken;
@@ -81,11 +81,10 @@
this.map.scene.highDynamicRange = false;
this.map._cesiumWidget._creditContainer.style.display = "none";
-
-
+ // console.log(this.map.scene)
this.map.scene.globe.depthTestAgainstTerrain = true;
this.map.scene.logarithmicDepthBuffer = false;
- this.map.scene.globe.baseColor = Cesium.Color.WHITESMOKE;
+ this.map.scene.globe.baseColor = Cesium.Color.BLACK;
window.viewer = this.map;
var imageryLayers = this.map.imageryLayers;
imageryLayers.removeAll();
@@ -99,7 +98,8 @@
topic.subscribe("gis/map/flyTo", lang.hitch(this, this.flyTo));
this._processMapOptions(appConfig.map.mapOptions);
this._publishMapEvent(this.map);
- window.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 180000;
+
+ // window.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 180000;
this.setMapHeight(this.map);
},
@@ -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);
}
@@ -166,19 +172,42 @@
})
}
}), new Cesium.ProviderViewModel({
- name: "湾里地形",
- tooltip: "30M地形",
+ name: "鄱阳湖地形",
+ tooltip: "由 普适科技 提供的鄱阳湖地区地形",
iconUrl: "images/basemaps/TerrainSTK.png",
creationFunction: function () {
return new Cesium.CesiumTerrainProvider({
- url: "/mt3D/data/dx",
+ url: "./dx/",
requestWaterMask: !0,
- requestVertexNormals: !0
+ requestVertexNormals: !0,
+ // isSct: true,//因坡度坡向添加
})
}
})];
+ // var terrainProviderViewModels = mapconfig.map.terrainProviderViewModels;
+ // for (var i = 0; i < terrainProviderViewModels.length; i++) {
+ // var tp = null;
+ // if(terrainProviderViewModels[i].url==""){
+ // tp = new Cesium.EllipsoidTerrainProvider({
+ // ellipsoid: Cesium.Ellipsoid.WGS84
+ // })
+ // }
+ // else{
+ // tp = new Cesium.CesiumTerrainProvider({url:terrainProviderViewModels[i].url,requestVertexNormals:true});
+ // }
+ // var pvm = new Cesium.ProviderViewModel({
+ // name: terrainProviderViewModels[i].name,
+ // tooltip: terrainProviderViewModels[i].tooltip,
+ // iconUrl: terrainProviderViewModels[i].iconUrl,
+ // creationFunction: function() {
+ // return tp;
+ // }
+ // });
+ // terrainProviderViewModelsArr.push(pvm);
+ // }
return terrainProviderViewModelsArr;
+
},
flyTo: function (item) {
@@ -255,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