diff --git a/src/component/map/Map.vue b/src/component/map/Map.vue index aa773cb..cc9ef5d 100644 --- a/src/component/map/Map.vue +++ b/src/component/map/Map.vue @@ -12,6 +12,7 @@ import { CesiumUtilsSingleton } from '@/utils/cesium/CesiumUtils'; import AdministrativeDivision from './AdministrativeDivision.vue'; import { useViewerStore } from '@/stores/useViewerStore'; import { useLoadingInformationStore } from '@/stores/useLoadingInformation'; +import Xian from '@/assets/json/XiAn.json' onBeforeMount(() => { // 初始化为false diff --git a/src/config/config.json b/src/config/config.json index 2625359..311d90d 100644 --- a/src/config/config.json +++ b/src/config/config.json @@ -13,7 +13,6 @@ "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJiNjczZTVlMy1kNDEwLTRhZWItYWM0NS1mNjYxMzJjODMwYTQiLCJpZCI6MzIxMzI2LCJpYXQiOjE3NzU2NDU1OTd9._MPcZQsxK1dGPl8IMVhKHV3PIPu4-TaOUgzsUUOP6WE" ], "defaultPosition": [108.948024, 34.263161, 300000], - "prefix": { "hiddenDangerPointId": "hidden-danger-point-", "riskPointId": "risk-point-" diff --git a/src/utils/cesium/CesiumUtils.ts b/src/utils/cesium/CesiumUtils.ts index 5e1bd5a..3a5dd36 100644 --- a/src/utils/cesium/CesiumUtils.ts +++ b/src/utils/cesium/CesiumUtils.ts @@ -33,11 +33,11 @@ export class CesiumUtils { /** * 初始化 Cesium Viewer * @param options - Viewer 初始化选项 - * @param tdMapToken - 天地图 Token 数组(可选) * @param type - 底图类型:0=影像图,1=矢量图(默认 0) + * @param tdMapToken - 天地图 Token 数组(可选) */ - initCesiumViewer(options: CesiumInitOptions, tdMapToken?: string[], type: number = 0): void { - this.#viewerManager.initCesiumViewer(options, tdMapToken, type) + initCesiumViewer(options: CesiumInitOptions, type: number = 0, tdMapToken?: string[]): void { + this.#viewerManager.initCesiumViewer(options, type, tdMapToken) const viewer = this.#viewerManager.getViewer() if (viewer) { diff --git a/src/utils/cesium/CesiumViewerManager.ts b/src/utils/cesium/CesiumViewerManager.ts index 33326e1..d96f10c 100644 --- a/src/utils/cesium/CesiumViewerManager.ts +++ b/src/utils/cesium/CesiumViewerManager.ts @@ -4,7 +4,6 @@ import { Ion, WebMapTileServiceImageryProvider, ImageryProvider, - createWorldTerrain, } from 'cesium' import type { CesiumInitOptions } from '@/types/cesium/CesiumInitOptions' import config from '@/config/config.json' @@ -62,10 +61,11 @@ export class CesiumViewerManager { /** * 初始化 Cesium Viewer * @param options - Viewer 初始化选项 - * @param tdMapToken - 天地图 Token 数组(可选) + * @param geoJson - GeoJSON 数据,如果要突出显示某一区域,就传递改值 * @param type - 底图类型:0=影像图,1=矢量图(默认 0) + * @param tdMapToken - 天地图 Token 数组(可选) */ - initCesiumViewer(options: CesiumInitOptions, tdMapToken?: string[], type: number = 0): void { + initCesiumViewer(options: CesiumInitOptions, type: number = 0, tdMapToken?: string[]): void { const defaultOptions: CesiumInitOptions = { containerId: options.containerId, shouldAnimate: true, @@ -91,10 +91,8 @@ export class CesiumViewerManager { const viewer = new Viewer(container, { ...finalOptions, - terrainProvider: createWorldTerrain({ - requestVertexNormals: false, - requestWaterMask: false, - }), + // 不加载默认地形 + terrainProvider: undefined, selectionIndicator: false, baseLayerPicker: false, contextOptions: { @@ -160,7 +158,7 @@ export class CesiumViewerManager { minimumLevel: 0, maximumLevel: 18, credit: 'Tianditu', - subdomains: ['t0', 't1', 't2', 't3', 't4', 't5', 't6', 't7'], + subdomains: ['t0', 't1', 't2', 't3', 't4', 't5', 't6', 't7'] } const token = tdMapToken[Math.floor(Math.random() * tdMapToken.length)]