From 920dfde35d71af04207b9b30fd0c84a7c307faaa Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期日, 26 九月 2021 10:30:27 +0800
Subject: [PATCH] add again
---
lib/mars3d/mars3d.d.ts | 509 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 432 insertions(+), 77 deletions(-)
diff --git a/lib/mars3d/mars3d.d.ts b/lib/mars3d/mars3d.d.ts
index c72b49b..562c20d 100644
--- a/lib/mars3d/mars3d.d.ts
+++ b/lib/mars3d/mars3d.d.ts
@@ -519,7 +519,7 @@
arcgis_wfs,
arcgis_wfs_single,
model,
- // 3dtiles,
+ tileset鎴�3dtiles,
czmGeojson,
kml,
czml,
@@ -1027,7 +1027,7 @@
* @param [options.rotation = true] - 鏄惁鍚敤璋冩暣淇话瑙掞紙鎸変腑闂村尯鍩熷線鍥涘懆鎷栨嫿锛�
* @param [options.className = 'mars3d-compass'] - 鏍峰紡鍚嶇О锛屽彲浠ュ閮ㄨ嚜瀹氫箟鏍峰紡銆�
* @param [options.top] - css瀹氫綅top浣嶇疆, 濡� top: '10px'
- * @param [options.bottom] - css瀹氫綅bottom浣嶇疆
+ * @param [options.bottom] - css瀹氫綅bottom浣嶇疆锛屾敮鎸侀厤缃�'toolbar'鑷姩璺熼殢cesium-viewer-toolbar
* @param [options.left] - css瀹氫綅left浣嶇疆
* @param [options.right] - css瀹氫綅right浣嶇疆
* @param [options.outerSvg] - 澶栭儴鍦嗙幆鍖哄煙鐨凷VG鍥剧墖
@@ -1166,7 +1166,7 @@
* @param [options.id = uuid()] - 瀵硅薄鐨刬d鏍囪瘑
* @param [options.enabled = true] - 瀵硅薄鐨勫惎鐢ㄧ姸鎬�
* @param [options.fps = false] - 鏄惁鏄剧ず瀹炴椂FPS甯х巼
- * @param [options.latDecimal = 6] - 淇濈暀鐨剓lat}鍜寋lng}鐨勫皬鏁颁綅
+ * @param [options.latDecimal = LatLngPoint.FormatLength] - 淇濈暀鐨剓lat}鍜寋lng}鐨勫皬鏁颁綅
* @param [options.template] - 灞曠ず鐨勫唴瀹规牸寮忓寲瀛楃涓�, 涓烘暟缁勬椂鎸夊璇█椤哄簭瀹氫箟锛屽[涓枃銆佺箒浣撱�佽嫳鏂嘳
* 鏀寔浠ヤ笅妯＄増閰嶇疆锛�
* 銆愰紶鏍囨墍鍦ㄤ綅缃�� 缁忓害:{lng}锛� 绾害:{lat}锛� 娴锋嫈锛歿alt}绫筹紝
@@ -1689,6 +1689,14 @@
* @returns 杞崲杩斿洖鐨凩atLngPoint瀵硅薄
*/
static fromCartographic(cartographic: Cesium.Cartographic): LatLngPoint;
+ /**
+ * 缁忓害绾害鐨勬牸寮忓寲鏃剁殑闀垮害锛岄粯璁や负6
+ */
+ static FormatLength: number;
+ /**
+ * 楂樺害鐨勬牸寮忓寲鏃剁殑闀垮害锛岄粯璁や负1
+ */
+ static FormatAltLength: number;
}
/**
@@ -1922,21 +1930,116 @@
});
}
+declare namespace OutlineEffect {
+ /**
+ * 閫変腑瀵硅薄鐨� 杞粨绾挎弿杈规晥鏋� 鏀寔鐨勫弬鏁颁俊鎭�
+ * @property [width = 6] - 绾垮锛屽崟浣嶏細鍍忕礌px
+ * @property [color = Cesium.Color.WHITE] - 杞粨绾� 棰滆壊
+ * @property [colorHidden = color] - 琚伄鎸＄殑杞粨绾� 棰滆壊
+ * @property [showPlane = false] - 鏄惁鏄剧ず杈圭紭鍚屼竴涓钩闈紙鎸塼hresholdAngle灞炴�у畾涔夛級
+ * @property [planeAngle = 10] - 濡傛灉涓や釜涓夎闈㈢殑娉曠嚎闂村す瑙掑皬浜庤鍊� 鍒欐爣璁颁负鍚屼竴涓钩闈€�傝鍊肩殑鍗曚綅锛氳搴�
+ * @property [glow = false] - 鏄惁鏄剧ず鍙戝厜
+ * @property [glowPower = 1] - 鍙戝厜寮哄害
+ * @property [glowStrength = 3] - 鍙戝厜鐨勫閲�
+ * @property [onlySelected = false] - 鍙樉绀洪�変腑鏋勪欢
+ */
+ type Options = {
+ width?: number;
+ color?: string | Cesium.Color;
+ colorHidden?: string | Cesium.Color;
+ showPlane?: boolean;
+ planeAngle?: number;
+ glow?: boolean;
+ glowPower?: number;
+ glowStrength?: number;
+ onlySelected?: boolean;
+ };
+}
+
+/**
+ * 閫変腑瀵硅薄鐨� 杞粨绾挎弿杈规晥鏋溿��
+ * @param options - 鍙傛暟瀵硅薄
+ * @param [options.enabled = true] - 瀵硅薄鐨勫惎鐢ㄧ姸鎬�
+ */
+declare class OutlineEffect extends BaseEffect {
+ constructor(options: {
+ enabled?: boolean;
+ });
+ /**
+ * 閫変腑瀵硅薄
+ */
+ selected: any | object[] | undefined;
+ /**
+ * 杞粨绾� 棰滆壊
+ */
+ color: string | Cesium.Color;
+ /**
+ * 琚伄鎸＄殑杞粨绾� 棰滆壊
+ */
+ colorHidden: string | Cesium.Color;
+ /**
+ * 濡傛灉涓や釜涓夎闈㈢殑娉曠嚎闂村す瑙掑皬浜庤鍊� 鍒欐爣璁颁负鍚屼竴涓钩闈€�傝鍊肩殑鍗曚綅锛氳搴�
+ */
+ planeAngle: number;
+ /**
+ * 閲嶆柊璧嬪�煎弬鏁帮紝鍚屾瀯閫犳柟娉曞弬鏁颁竴鑷淬��
+ * @param options - 鍙傛暟,涓庣被鐨勬瀯閫犳柟娉曞弬鏁扮浉鍚�
+ * @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
+ */
+ setOptions(options: any): this;
+ /**
+ * 杞粨绾� 瀹藉害锛屽崟浣嶏細鍍忕礌px
+ */
+ width: number;
+ /**
+ * 鏄惁鏄剧ず杈圭紭鍚屼竴涓钩闈紙鎸塼hresholdAngle灞炴�у畾涔夛級
+ */
+ showPlane: boolean;
+ /**
+ * 鏄惁鏄剧ず鍙戝厜
+ */
+ glow: boolean;
+ /**
+ * 鍙戝厜寮哄害
+ */
+ glowPower: number;
+ /**
+ * 鍙戝厜鐨勫閲�
+ */
+ glowStrength: number;
+ /**
+ * 鍙樉绀洪�変腑鏋勪欢
+ */
+ onlySelected: boolean;
+}
+
/**
* 涓嬮洦鏁堟灉
* @param options - 鍙傛暟瀵硅薄锛屽寘鎷互涓嬶細
* @param [options.enabled = true] - 瀵硅薄鐨勫惎鐢ㄧ姸鎬�
* @param [options.speed = 10] - 閫熷害
+ * @param [options.size = 20] - 闆ㄧ矑瀛愬ぇ灏�
+ * @param [options.direction = -30] - 闆ㄧ殑鏂瑰悜锛堝害锛夛紝0搴﹀瀭鐩村悜涓�
*/
declare class RainEffect extends BaseEffect {
constructor(options: {
enabled?: boolean;
speed?: number;
+ size?: number;
+ direction?: number;
});
/**
* 閫熷害
*/
speed: number;
+ /**
+ * 闆ㄧ矑瀛愬ぇ灏�
+ */
+ size: number;
+ /**
+ * 闆ㄧ殑鏂瑰悜锛堝害锛夛紝0搴﹀瀭鐩村悜涓�
+ */
+ direction: number;
}
/**
@@ -2009,7 +2112,7 @@
popup?: any;
popupOptions?: Popup.StyleOptions;
tooltip?: any;
- tooltipOptions?: Popup.StyleOptions;
+ tooltipOptions?: Tooltip.StyleOptions;
contextmenuItems?: any;
stopPropagation?: boolean;
};
@@ -2240,9 +2343,10 @@
/**
* 鎵撳紑缁戝畾鐨勫脊绐�
* @param [position = this.center] - 鐭㈤噺瀵硅薄 鎴� 鏄剧ず鐨勪綅缃�
+ * @param [event] - 鐢ㄤ簬鎶涘嚭浜嬩欢鏃剁殑鐩稿叧棰濆灞炴��
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
*/
- openPopup(position?: LatLngPoint | Cesium.Cartesian3): this;
+ openPopup(position?: LatLngPoint | Cesium.Cartesian3, event?: any): this;
/**
* 鍏抽棴寮圭獥
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
@@ -2259,7 +2363,7 @@
* @param options - 鎺у埗鍙傛暟
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
*/
- bindTooltip(content: string | ((...params: any[]) => any), options: Popup.StyleOptions): this;
+ bindTooltip(content: string | ((...params: any[]) => any), options: Tooltip.StyleOptions): this;
/**
* 瑙ｉ櫎缁戝畾鐨勯紶鏍囩Щ鍏ュ璞″悗鐨勫脊绐椼��
* @param [stopPropagation = false] - 鍗曞嚮浜嬩欢涓槸鍚︾户缁啋娉℃煡鎵�
@@ -2269,9 +2373,10 @@
/**
* 鎵撳紑缁戝畾鐨則ooltip寮圭獥
* @param [position = this.center] - 鏄剧ず鐨勪綅缃�,榛樿涓虹煝閲忓璞℃墍鍦ㄧ偣鎴栦腑蹇冪偣浣嶇疆
+ * @param [event] - 鐢ㄤ簬鎶涘嚭浜嬩欢鏃剁殑鐩稿叧棰濆灞炴��
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
*/
- openTooltip(position?: LatLngPoint | Cesium.Cartesian3): this;
+ openTooltip(position?: LatLngPoint | Cesium.Cartesian3, event?: any): this;
/**
* 鍏抽棴寮圭獥
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
@@ -2308,7 +2413,9 @@
* @param [content.show] - 鑿滃崟椤规槸鍚︽樉绀虹殑鍥炶皟鏂规硶
* @param [content.callback] - 鑿滃崟椤瑰崟鍑诲悗鐨勫洖璋冩柟娉�
* @param [content.children] - 褰撴湁浜岀骇瀛愯彍鍗曟椂锛岄厤缃暟缁勩��
- * @param [options = {}] - 鍙傛暟瀵硅薄(棰勭暀锛岀洰鍓嶆湭鐢�)
+ * @param [options = {}] - 鎺у埗鍙傛暟
+ * @param [options.offsetX] - 鐢ㄤ簬闈炶鍒欏璞℃椂锛屾í鍚戝亸绉荤殑px鍍忕礌鍊�
+ * @param [options.offsetY] - 鐢ㄤ簬闈炶鍒欏璞℃椂锛屽瀭鐩存柟鍚戝亸绉荤殑px鍍忕礌鍊�
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
*/
bindContextMenu(content: {
@@ -2317,7 +2424,10 @@
show?: ((...params: any[]) => any) | boolean;
callback?: (...params: any[]) => any;
children?: object[];
- }[], options?: any): this;
+ }[], options?: {
+ offsetX?: number;
+ offsetY?: number;
+ }): this;
/**
* 瑙ｉ櫎缁戝畾鐨勫彸閿彍鍗�
* @param [stopPropagation = false] - 鍗曞嚮浜嬩欢涓槸鍚︾户缁啋娉℃煡鎵�
@@ -2369,6 +2479,18 @@
* @returns 瀵瑰簲缁戝畾鐨勬暟鎹璞�
*/
getPickedObject(pickId: string): any;
+ /**
+ * 鏇存柊棰滆壊
+ * @param style - 鏍峰紡淇℃伅
+ * @param [style.color = "#3388ff"] - 棰滆壊
+ * @param [style.opacity = 1.0] - 閫忔槑搴︼紝鍙栧�艰寖鍥达細0.0-1.0
+ * @param [index] - 鏇存柊鐨刬nstances瀵硅薄index鍊硷紝涓虹┖鏃舵洿鏂版墍鏈夊璞°��
+ * @returns 绌�
+ */
+ setColorStyle(style: {
+ color?: string | Cesium.Color;
+ opacity?: number;
+ }, index?: number | undefined): void;
}
declare namespace FlatBillboard {
@@ -2518,7 +2640,8 @@
* @param [options.instances.style] - 鏍峰紡淇℃伅
* @param [options.instances.attr] - 鐭㈤噺鏁版嵁鐨� 灞炴�т俊鎭紝鍙互浠绘剰闄勫姞灞炴�с��
* @param [options.style] - 鎵�鏈夐潰鐨勫叕鍏辨牱寮忎俊鎭�
- * @param [options.highlight] - 榧犳爣绉诲叆鎴栧崟鍑�(type:'click')鍚庣殑瀵瑰簲楂樹寒鐨勯儴鍒嗘牱寮�
+ * @param [options.highlight] - 榧犳爣绉诲叆鎴栧崟鍑诲悗鐨勫搴旈珮浜殑閮ㄥ垎鏍峰紡
+ * @param [options.highlight.type] - 瑙﹀彂楂樹寒鐨勬柟寮忥紝榛樿榧犳爣绉诲叆锛屽彲浠ユ寚瀹氫负type:'click'涓哄崟鍑诲悗楂樹寒
*/
declare class PolygonCombine extends BaseCombine {
constructor(options: {
@@ -2530,7 +2653,9 @@
attr?: any;
}[];
style?: PolygonPrimitive.StyleOptions;
- highlight?: PolygonPrimitive.StyleOptions;
+ highlight?: {
+ type?: string;
+ };
});
/**
* 鏍峰紡淇℃伅
@@ -3107,7 +3232,7 @@
* @property template - 鍏叡閮ㄥ垎澶栨閮ㄥ垎html鍐呭锛岄渶瑕佸姞2澶勶細
* (1)鐢ㄤ簬濉厖html鐨勫湴鏂瑰啓涓妠content}鏍囪瘑锛�
* (2)鍏抽棴鎸夐挳鍔燾lass鏍峰紡锛歝loseButton銆�
- * 浼犵┖瀛楃涓叉椂锛屼笉鐢ㄥ唴缃ā鐗堛��
+ * 浼犵┖瀛楃涓叉垨false鏃讹紝涓嶇敤鍐呯疆妯＄増銆�
* @property [horizontalOrigin] - 妯悜鏂瑰悜鐨勫畾浣�
* @property [verticalOrigin] - 鍨傜洿鏂瑰悜鐨勫畾浣�
* @property [offsetX] - 鐢ㄤ簬闈炶鍒檇iv鏃讹紝妯悜鍋忕Щ鐨刾x鍍忕礌鍊�
@@ -3185,6 +3310,48 @@
static fromDraw(layer: DivLayer, options: any): DivGraphic;
}
+declare namespace Tooltip {
+ /**
+ * Tooltip瀵硅薄 鏀寔鐨勯厤缃俊鎭�
+ * @property html - Html鏂囨湰({content}閮ㄥ垎锛屾暣浣撳睍绀虹殑DOM鐢眛emplate鍜宧tml灞炴�у叡鍚岀粍鎴�)
+ * @property template - 鍏叡閮ㄥ垎澶栨閮ㄥ垎html鍐呭锛岄渶瑕佸姞锛氱敤浜庡～鍏卙tml鐨勫湴鏂瑰啓涓妠content}鏍囪瘑銆� 浼犵┖瀛楃涓叉垨false鏃讹紝涓嶇敤鍐呯疆妯＄増銆�
+ * @property [direction = "top"] - 鏄剧ず鐨勬柟鍚戯紝鍙�夊�硷細 top銆乥ottom銆乧enter銆乺ight銆乴eft
+ * @property [horizontalOrigin] - 妯悜鏂瑰悜鐨勫畾浣�
+ * @property [verticalOrigin] - 鍨傜洿鏂瑰悜鐨勫畾浣�
+ * @property [offsetX] - 鐢ㄤ簬闈炶鍒檇iv鏃讹紝妯悜鍋忕Щ鐨刾x鍍忕礌鍊�
+ * @property [offsetY] - 鐢ㄤ簬闈炶鍒檇iv鏃讹紝鍨傜洿鏂瑰悜鍋忕Щ鐨刾x鍍忕礌鍊�
+ * @property [scaleByDistance = false] - 鏄惁鎸夎璺濈缉鏀�
+ * @property [scaleByDistance_far = 1000000] - 涓婇檺
+ * @property [scaleByDistance_farValue = 0.1] - 姣斾緥鍊�
+ * @property [scaleByDistance_near = 1000] - 涓嬮檺
+ * @property [scaleByDistance_nearValue = 1] - 姣斾緥鍊�
+ * @property [distanceDisplayCondition = false] - 鏄惁鎸夎璺濇樉绀�
+ * @property [distanceDisplayCondition_far = 10000] - 鏈�澶ц窛绂�
+ * @property [distanceDisplayCondition_near = 0] - 鏈�灏忚窛绂�
+ * @property [clampToGround = false] - 鏄惁璐村湴
+ * @property [css_transform_origin = 'left bottom 0'] - DIV鐨� transform-origin css鍊�
+ */
+ type StyleOptions = {
+ html: string;
+ template: string | boolean;
+ direction?: string;
+ horizontalOrigin?: Cesium.HorizontalOrigin;
+ verticalOrigin?: Cesium.VerticalOrigin;
+ offsetX?: number;
+ offsetY?: number;
+ scaleByDistance?: boolean;
+ scaleByDistance_far?: number;
+ scaleByDistance_farValue?: number;
+ scaleByDistance_near?: number;
+ scaleByDistance_nearValue?: number;
+ distanceDisplayCondition?: boolean;
+ distanceDisplayCondition_far?: number;
+ distanceDisplayCondition_near?: number;
+ clampToGround?: boolean;
+ css_transform_origin?: string;
+ };
+}
+
/**
* Tooltip瀵硅薄div鐐�
* @param options - 鍙傛暟瀵硅薄锛屽寘鎷互涓嬶細
@@ -3204,7 +3371,7 @@
constructor(options: {
閫氱敤鍙傛暟?: BaseGraphic.ConstructorOptions;
position: LatLngPoint | Cesium.Cartesian3;
- style: Popup.StyleOptions;
+ style: Tooltip.StyleOptions;
attr?: any;
depthTest?: boolean;
hasCache?: boolean;
@@ -3220,7 +3387,7 @@
* @param options - DivGraphic鐨勬瀯閫犲弬鏁�
* @returns DIV鐐瑰璞�
*/
- static fromDraw(layer: DivLayer, options: any): Popup;
+ static fromDraw(layer: DivLayer, options: any): Tooltip;
}
declare namespace Video3D {
@@ -5258,6 +5425,19 @@
*/
rectangle: Cesium.Rectangle;
/**
+ * 灏嗙煝閲忔暟鎹鍑轰负GeoJSON鏍煎紡瑙勮寖瀵硅薄銆�
+ * @param [options] - 鍙傛暟瀵硅薄:
+ * @param [options.outline] - 鏄惁瀵煎嚭杈圭嚎鐨勫潗鏍�
+ * @param [options.closure] - 瀵煎嚭outline鏃讹紝鏄惁闂悎锛宼rue鏃朵細娣诲姞绗�0涓偣杩涜闂悎銆�
+ * @param [options.noAlt] - 涓嶅鍑洪珮搴﹀��
+ * @returns GeoJSON鏍煎紡瑙勮寖瀵硅薄
+ */
+ toGeoJSON(options?: {
+ outline?: boolean;
+ closure?: boolean;
+ noAlt?: boolean;
+ }): any;
+ /**
* 鑾峰彇鐭╁舰鐨�4涓竟绾垮潗鏍囬泦鍚堬紙绗涘崱灏斿潗鏍囷級
* @param [closure = true] - 鏄惁闂悎锛宼rue鏃朵細娣诲姞绗�0涓偣杩涜闂悎銆�
* @returns 杈圭嚎鍧愭爣鏁扮粍
@@ -5266,9 +5446,10 @@
/**
* 鑾峰彇鐭╁舰鐨�4涓竟绾垮潗鏍囬泦鍚堬紙缁忕含搴︿簩缁存暟缁勶級
* @param [closure = true] - 鏄惁闂悎锛宼rue鏃朵細娣诲姞绗�0涓偣杩涜闂悎銆�
+ * @param noAlt - 鏄惁鍖呭惈楂樺害鍊�
* @returns 杈圭嚎鍧愭爣鏁扮粍锛堢粡绾害浜岀淮鏁扮粍锛�
*/
- getOutlineCoordinates(closure?: boolean): any[][];
+ getOutlineCoordinates(closure?: boolean, noAlt: boolean): any[][];
/**
* 鍒ゆ柇鐐规槸鍚﹀湪鐭╁舰鍐�
* @param position - 闇�瑕佸垽鏂殑鐐�
@@ -6241,6 +6422,13 @@
*/
roll: number;
/**
+ * 璁剧疆骞舵坊鍔犲姩鐢昏建杩逛綅缃紝鎸夆�滄寚瀹氭椂闂粹�濊繍鍔ㄥ埌杈锯�滄寚瀹氫綅缃�濄��
+ * @param point - 鎸囧畾浣嶇疆鍧愭爣
+ * @param [currTime = Cesium.JulianDate.now()] - 鎸囧畾鏃堕棿, 榛樿涓哄綋鍓嶆椂闂�5绉掑悗銆傚綋涓篠tring鏃讹紝鍙互浼犲叆'2021-01-01 12:13:00'; 褰撲负Number鏃讹紝鍙互浼犲叆褰撳墠鏃堕棿寤惰繜鐨勭鏁般��
+ * @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
+ */
+ addDynamicPosition(point: LatLngPoint | Cesium.Cartesian3, currTime?: Cesium.JulianDate | string | number): this;
+ /**
* 寮傛璁＄畻鏇存柊鍧愭爣杩涜璐村湴(鎴栬创妯″瀷)
* @param [options = {}] - 鍙傛暟瀵硅薄:
* @param [options.has3dtiles = auto] - 鏄惁鍦�3dtiles妯″瀷涓婂垎鏋愶紙妯″瀷鍒嗘瀽杈冩參锛屾寜闇�寮�鍚級,榛樿鍐呴儴鏍规嵁鐐圭殑浣嶇疆鑷姩鍒ゆ柇锛堜絾鍙兘涓嶅噯锛�
@@ -6426,6 +6614,17 @@
* attributes.show = Cesium.ShowGeometryInstanceAttribute.toValue(true);
*/
readonly geometryInstanceAttributes: any;
+ /**
+ * 瀵瑰簲鏉愯川鐨剈niforms
+ * 涓�涓璞★紝瀹冪殑灞炴�ц鐢ㄦ潵璁剧疆鐗囨鐫�鑹插櫒shader銆�
+ * <p>
+ * 瀵硅薄灞炴�у�煎彲浠ユ槸甯搁噺鎴栧嚱鏁般�傝繖涓嚱鏁板皢鍦ㄦ瘡涓�甯у悗澶勭悊闃舵鎵ц涔嬪墠琚皟鐢ㄣ��
+ * </p>
+ * <p>
+ * 甯搁噺鍊间篃鍙互鏄浘鍍忕殑URI銆佹暟鎹甎RI锛屾垨鑰呭彲浠ョ敤浣滅汗鐞嗙殑HTML鍏冪礌锛屽HTMLImageElement鎴朒TMLCanvasElement銆�
+ * </p>
+ */
+ readonly uniforms: any | undefined;
/**
* 闄勫姞鐨刲abel鏂囨湰瀵硅薄
*/
@@ -7299,7 +7498,7 @@
* @param options.position - 鍧愭爣浣嶇疆
* @param options.style - 鏍峰紡淇℃伅
* @param [options.attr] - 闄勪欢鐨勫睘鎬т俊鎭紝鍙互浠绘剰闄勫姞灞炴�э紝瀵煎嚭geojson鎴杍son鏃朵細鑷姩澶勭悊瀵煎嚭銆�
- * @param [options.frameRate = 30] - 褰損ostion涓篊allbackProperty鏃讹紝澶氬皯甯ц幏鍙栦竴娆℃暟鎹�傜敤浜庢帶鍒舵晥鐜囷紝濡傛灉鍗￠】灏辨妸璇ユ暟鍊艰皟澶т竴浜涖��
+ * @param [options.frameRate = 1] - 褰損ostion涓篊allbackProperty鏃讹紝澶氬皯甯ц幏鍙栦竴娆℃暟鎹�傜敤浜庢帶鍒舵晥鐜囷紝濡傛灉鍗￠】灏辨妸璇ユ暟鍊艰皟澶т竴浜涖��
*/
declare class PointPrimitive extends BasePointPrimitive {
constructor(options: {
@@ -7313,10 +7512,6 @@
* 褰撳姞杞絧rimitive鏁版嵁鐨勫唴閮–esium瀹瑰櫒
*/
readonly primitiveCollection: Cesium.PointPrimitiveCollection;
- /**
- * 浣嶇疆鍧愭爣 锛堢瑳鍗″皵鍧愭爣锛�, 璧嬪�兼椂鍙互浼犲叆LatLngPoint瀵硅薄
- */
- position: Cesium.Cartesian3;
}
declare namespace PolygonPrimitive {
@@ -7447,7 +7642,6 @@
* @property [distanceDisplayCondition = false] - 鏄惁鎸夎璺濇樉绀� 鎴� 鎸囧畾姝ゆ灏嗘樉绀哄湪涓庢憚鍍忔満鐨勫澶ц窛绂汇��
* @property [distanceDisplayCondition_far = 100000] - 鏈�澶ц窛绂�
* @property [distanceDisplayCondition_near = 0] - 鏈�灏忚窛绂�
- * x
* @property [hasShadows = false] - 鏄惁闃村奖
* @property [shadows = Cesium.ShadowMode.DISABLED] - 鎸囧畾瀵硅薄鏄姇灏勮繕鏄帴鏀舵潵鑷厜婧愮殑闃村奖銆�
* @property [clampToGround = false] - 鏄惁璐村湴
@@ -7634,6 +7828,37 @@
});
}
+declare namespace Water {
+ /**
+ * 姘撮潰 Primitive鍥惧厓 鏀寔鐨勬牱寮忎俊鎭�
+ * @property [baseWaterColor = "#123e59"] - 鍩虹棰滆壊
+ * @property [blendColor = "#123e59"] - 浠庢按涓贩鍚堝埌闈炴按鍩熸椂浣跨敤鐨剅gba棰滆壊瀵硅薄銆�
+ * @property [specularMap] - 鍗曚竴閫氶亾绾圭悊鐢ㄦ潵鎸囩ず姘村煙鐨勯潰绉��
+ * @property [normalMap] - 姘存甯告壈鍔ㄧ殑娉曠嚎鍥俱��
+ * @property [frequency = 8000] - 鎺у埗娉㈡暟鐨勬暟瀛椼��
+ * @property [animationSpeed = 0.03] - 鎺у埗姘寸殑鍔ㄧ敾閫熷害鐨勬暟瀛椼��
+ * @property [amplitude = 5.0] - 鎺у埗姘存尝鎸箙鐨勬暟瀛椼��
+ * @property [specularIntensity = 0.8] - 鎺у埗闀滈潰鍙嶅皠寮哄害鐨勬暟瀛椼��
+ * @property [fadeFactor = 1.0] - fadeFactor
+ * @property [opacity = 0.8] - 閫忔槑搴︼紝鍙栧�艰寖鍥达細0.0-1.0
+ * @property [clampToGround = false] - 鏄惁璐村湴
+ * @property [options.鐖剁被鍙傛暟] - 鏀寔鐖剁被鐨勫弬鏁�
+ */
+ type StyleOptions = {
+ baseWaterColor?: string;
+ blendColor?: string;
+ specularMap?: string;
+ normalMap?: string;
+ frequency?: number;
+ animationSpeed?: number;
+ amplitude?: number;
+ specularIntensity?: number;
+ fadeFactor?: number;
+ opacity?: number;
+ clampToGround?: boolean;
+ };
+}
+
/**
* 姘村煙闈� Primitive鍥惧厓 鐭㈤噺瀵硅薄
* @param options - 鍙傛暟瀵硅薄锛屽寘鎷互涓嬶細
@@ -7648,7 +7873,7 @@
閫氱敤鍙傛暟?: BaseGraphic.ConstructorOptions;
閫氱敤鍙傛暟P?: BasePrimitive.ConstructorOptions;
positions: LatLngPoint[] | Cesium.Cartesian3[];
- style: PolygonPrimitive.StyleOptions;
+ style: Water.StyleOptions;
attr?: any;
});
}
@@ -8175,7 +8400,7 @@
* @param [options.camera.offsetZ = 0] - 'dy'閿佸畾绗竴瑙嗚鏃讹紝閿佸畾鐐圭殑鏈韩鐨刏杞存柟鍚戯紙楂樺害锛夊亸绉诲��
* @param [options.clockRange] - 鎸囧畾鎾斁鐨勬ā寮�
* @param [options.clockLoop = false] - 鏄惁寰幆鎾斁锛岀瓑浠蜂簬clockRange:Cesium.ClockRange.LOOP_STOP
- * @param [options.autoStop = false] - 鏄惁鑷姩鍋滄锛岀瓑浠蜂簬clockRange:Cesium.ClockRange.UNBOUNDED
+ * @param [options.autoStop = false] - 鏄惁鑷姩鍋滄
*
* //浠ヤ笅鏄� clampToGround涓娇鐢ㄧ殑
* @param [options.splitNum = 100] - 褰揷lampToGround璁＄畻鏃讹紝鎻掑�兼暟锛岀瓑姣斿垎鍓茬殑涓暟
@@ -8344,7 +8569,7 @@
};
popupOptions?: Popup.StyleOptions;
tooltip?: string | any[] | ((...params: any[]) => any);
- tooltipOptions?: Popup.StyleOptions;
+ tooltipOptions?: Tooltip.StyleOptions;
contextmenuItems?: any;
opacity?: number;
zIndex?: number;
@@ -8445,7 +8670,7 @@
* @param options - 鎺у埗鍙傛暟
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
*/
- bindTooltip(content: string | ((...params: any[]) => any), options: Popup.StyleOptions): this;
+ bindTooltip(content: string | ((...params: any[]) => any), options: Tooltip.StyleOptions): this;
/**
* 瑙ｉ櫎缁戝畾鐨勯紶鏍囩Щ鍏ュ璞″悗鐨勫脊绐椼��
* @param [stopPropagation = false] - 鍗曞嚮浜嬩欢涓槸鍚︾户缁啋娉℃煡鎵�
@@ -8508,7 +8733,9 @@
* @param [content.show] - 鑿滃崟椤规槸鍚︽樉绀虹殑鍥炶皟鏂规硶
* @param [content.callback] - 鑿滃崟椤瑰崟鍑诲悗鐨勫洖璋冩柟娉�
* @param [content.children] - 褰撴湁浜岀骇瀛愯彍鍗曟椂锛岄厤缃暟缁勩��
- * @param [options = {}] - 鍙傛暟瀵硅薄(棰勭暀锛岀洰鍓嶆湭鐢�)
+ * @param [options = {}] - 鎺у埗鍙傛暟
+ * @param [options.offsetX] - 鐢ㄤ簬闈炶鍒欏璞℃椂锛屾í鍚戝亸绉荤殑px鍍忕礌鍊�
+ * @param [options.offsetY] - 鐢ㄤ簬闈炶鍒欏璞℃椂锛屽瀭鐩存柟鍚戝亸绉荤殑px鍍忕礌鍊�
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
*/
bindContextMenu(content: {
@@ -8517,7 +8744,10 @@
show?: ((...params: any[]) => any) | boolean;
callback?: (...params: any[]) => any;
children?: object[];
- }[], options?: any): this;
+ }[], options?: {
+ offsetX?: number;
+ offsetY?: number;
+ }): this;
/**
* 瑙ｉ櫎缁戝畾鐨勫彸閿彍鍗�
* @param [stopPropagation = false] - 鍗曞嚮浜嬩欢涓槸鍚︾户缁啋娉℃煡鎵�
@@ -8559,9 +8789,15 @@
* @param [options.opacity = 1] - 閫忔槑搴︼紝鍙栧�艰寖鍥达細0.0-1.0
* @param [options.center] - 鍥惧眰鑷畾涔夊畾浣嶈瑙�
* @param [options.popup] - 褰撳浘灞傛敮鎸乸opup寮圭獥鏃讹紝缁戝畾鐨勫��
- * @param [options.popupOptions] - popup寮圭獥鏃剁殑閰嶇疆鍙傛暟
+ * @param [options.popupOptions] - popup寮圭獥鏃剁殑閰嶇疆鍙傛暟,杩樺寘鎷細
+ * @param [options.popupOptions.titleField] - 鍥哄畾鐨勬爣棰樺悕绉�
+ * @param [options.popupOptions.titleField] - 鏍囬瀵瑰簲鐨勫睘鎬у瓧娈靛悕绉�
+ * @param [options.popupOptions.noTitle] - 涓嶆樉绀烘爣棰�
* @param [options.tooltip] - 褰撳浘灞傛敮鎸乼ooltip寮圭獥鏃讹紝缁戝畾鐨勫��
- * @param [options.tooltipOptions] - tooltip寮圭獥鏃剁殑閰嶇疆鍙傛暟
+ * @param [options.tooltipOptions] - tooltip寮圭獥鏃剁殑閰嶇疆鍙傛暟,杩樺寘鎷細
+ * @param [options.tooltipOptions.titleField] - 鍥哄畾鐨勬爣棰樺悕绉�
+ * @param [options.tooltipOptions.titleField] - 鏍囬瀵瑰簲鐨勫睘鎬у瓧娈靛悕绉�
+ * @param [options.tooltipOptions.noTitle] - 涓嶆樉绀烘爣棰�
* @param [options.contextmenuItems] - 褰撳浘灞傛敮鎸佸彸閿彍鍗曟椂锛岀粦瀹氱殑鍊�
* @param [options.stopPropagation = false] - 褰撳墠绫讳腑浜嬩欢鏄惁鍋滄鍐掓场, false鏃讹細浜嬩欢鍐掓场鍒癿ap涓��
*/
@@ -8574,9 +8810,17 @@
opacity?: number;
center?: any;
popup?: string | any[] | ((...params: any[]) => any) | any;
- popupOptions?: Popup.StyleOptions;
+ popupOptions?: {
+ titleField?: string;
+ titleField?: string;
+ noTitle?: string;
+ };
tooltip?: string | any[] | ((...params: any[]) => any) | any;
- tooltipOptions?: Popup.StyleOptions;
+ tooltipOptions?: {
+ titleField?: string;
+ titleField?: string;
+ noTitle?: string;
+ };
contextmenuItems?: any;
stopPropagation?: boolean;
});
@@ -9677,11 +9921,13 @@
* @param options - Graphic鏋勯�犲弬鏁�,鍖呭惈锛�
* @param options.type - 绫诲瀷
* @param [options.鍏朵粬] - 鎸塼ype鏀寔 {@link GraphicType} 绫荤殑鏋勯�犳柟娉曞弬鏁�
+ * @param [options.success] - 缁樺埗鍒涘缓瀹屾垚鐨勫洖璋冩柟娉曪紝鍚宒rawCreated浜嬩欢锛屼緥濡傦細 success: function (graphic){ }
* @returns 鍒涘缓瀹屾垚鐨勭煝閲忔暟鎹璞�
*/
startDraw(options: {
type: GraphicType;
鍏朵粬?: any;
+ success?: (...params: any[]) => any;
}): BaseGraphic;
/**
* 鍋滄缁樺埗锛屽鏈夋湭瀹屾垚鐨勭粯鍒朵細鑷姩鍒犻櫎
@@ -10076,10 +10322,12 @@
* @param [options.chinaCRS] - 鏍囪瘑妯″瀷鐨勫浗鍐呭潗鏍囩郴锛堢敤浜庤嚜鍔ㄧ籂鍋忔垨鍔犲亸锛�
* @param [options.style] - 妯″瀷鏍峰紡锛� 浣跨敤{@link https://github.com/CesiumGS/3d-tiles/tree/master/specification/Styling|3D Tiles Styling language}.
* @param [options.marsJzwStyle = false] - 寮�鍚垨璁剧疆寤虹瓚鐗╃壒鏁堟牱寮忋��
- * @param [options.highlight] - 榧犳爣绉诲叆鎴栧崟鍑�(type:'click')鍚庣殑瀵瑰簲楂樹寒鐨勯儴鍒嗘牱寮�
+ * @param [options.highlight] - 楂樹寒鍙婂叾鏍峰紡閰嶇疆
* @param [options.highlight.type] - 榧犳爣绉诲叆楂樹寒 鎴� 鍗曞嚮楂樹寒(type:'click')
* @param [options.highlight.color = '#FFFF00'] - 棰滆壊锛屾敮鎸乺gba瀛楃涓�
* @param [options.highlight.opacity = 1.0] - 閫忔槑搴�
+ * @param [options.highlight.outlineEffect = false] - 榛樿涓轰慨鏀圭煝閲忓璞℃湰韬殑style楂樹寒锛宼rue鏃堕噰鐢▄@link OutlineEffect}鏂瑰紡楂樹寒銆�
+ * @param [options.highlight.鍏朵粬] - outlineEffect:true鏃跺搴旂殑鍙傛暟淇℃伅
* @param [options.clampToGround] - 鏄惁璐村湴,true鏃惰嚜鍔ㄨ皟鐢ㄨ创鍦拌绠楋紝浣嗘灞炴�у彧閫傚悎鏍囧噯鐨勪笌鍦板舰鏁版嵁鍖归厤鐨勬ā鍨嬶紝骞朵笉绮剧‘锛屽缓璁�氳繃妯″瀷缂栬緫椤甸潰璋冭瘯缁欏叿浣撻珮搴﹀�笺��
*/
declare class TilesetLayer extends BaseGraphicLayer {
@@ -10143,6 +10391,8 @@
type?: string;
color?: string;
opacity?: number;
+ outlineEffect?: boolean;
+ 鍏朵粬?: OutlineEffect.Options;
};
clampToGround?: boolean;
});
@@ -10571,12 +10821,13 @@
* @param [options.閫氱敤鍙傛暟] - 鍖呭惈鐖剁被鏀寔鐨勬墍鏈夊弬鏁�
* @param options.url - ArcGIS MapServer鏈嶅姟鐨勭綉鍧�銆�
* @param [options.layers] - 瑕佹樉绀虹殑鍥惧眰鐨勯�楀彿鍒嗛殧鍒楄〃锛屽鏋滃簲鏄剧ず鎵�鏈夊浘灞傦紝鍒欐湭瀹氫箟銆�
- * @param [options.layerDefs] - 鍙互瀵瑰姩鎬佹湇鍔″姞鏉′欢绛涢�夋暟鎹紝绀轰緥锛�"{\"0\":\"鐢ㄥ湴缂栧彿 = 'R'\"}"
+ * @param [options.layerDefs] - 鍙互瀵瑰姩鎬佹湇鍔″姞鏉′欢绛涢�夋暟鎹紝绀轰緥锛�"{\"0\":\"鐢ㄥ湴缂栧彿 = 'R'\"}"锛屽叿浣撳彲浠ュ弬闃卆rcgis瀹樻柟甯姪鏂囨。鐞嗚ВlayerDefs鍙傛暟銆�
* @param [options.maxTileLevel] - 鎸囧畾鍦ㄥ皬浜庢灞傜骇鏃剁敤鐡︾墖鍔犺浇锛屽ぇ浜庤灞傜骇鐢ㄥ姩鎬佹湇鍔�.鍙互鍦ㄧ摝鐗囨湇鍔＄被鍨嬫椂锛屽悓鏃朵娇鐢ㄧ摝鐗囧拰鍔ㄦ�佹湇鍔°��
* @param [options.wkid] - 褰撻潪鏍囧噯EPSG鏍囧彿鏃讹紝鍙互鎸囧畾wkid鍊笺��
* @param [options.token] - 鐢ㄤ簬閫氳繃ArcGIS MapServer鏈嶅姟杩涜韬唤楠岃瘉鐨凙rcGIS浠ょ墝銆�
* @param [options.tileDiscardPolicy] - 浜庣‘瀹氬浘鍧楁槸鍚︿负 鏃犳晥锛屽簲灏嗗叾涓㈠純銆傚鏋滄湭鎸囧畾姝ゅ�硷紝鍒欎负榛樿 {@link DiscardMissingTileImagePolicy} 鐢ㄤ簬骞抽摵鐨勫湴鍥炬湇鍔″櫒锛屽苟涓攞@link NeverTileDiscardPolicy} 鐢ㄤ簬闈炲钩閾哄湴鍥炬湇鍔″櫒銆傚湪鍓嶄竴绉嶆儏鍐典笅锛� 鎴戜滑瑕佹眰鏈�澶у浘鍧楃骇鍒殑鍥惧潡0,0骞舵鏌ュ儚绱狅紙0,0锛夛紝锛�200,20锛夛紝锛�20,200锛夛紝 锛�80,110锛夊拰锛�160锛�130锛夈�傚鏋滄墍鏈夎繖浜涘儚绱犻兘鏄�忔槑鐨勶紝鍒欎涪寮冩鏌ヤ负 绂佺敤锛屽苟涓斾笉浼氫涪寮冧换浣曞浘鍧椼�傚鏋滃畠浠腑鐨勪换浣曚竴绉嶅叿鏈変笉閫忔槑鐨勯鑹诧紝 鍦ㄨ繖浜涘儚绱犱綅缃叿鏈夌浉鍚屽�肩殑鍥惧潡灏嗚涓㈠純銆傜殑鏈�缁堢粨鏋� 瀵逛簬鏍囧噯ArcGIS Server锛岃繖浜涢粯璁ゅ�煎簲璇ユ槸姝ｇ‘鐨勫浘鍧椾涪寮冦�傜‘淇� 涓嶄細涓㈠純浠讳綍鍥惧潡锛屼负姝ゆ瀯閫犲苟浼犻�� {@link NeverTileDiscardPolicy} 鍙傛暟銆�
- * @param [options.usePreCachedTilesIfAvailable = true] - 濡傛灉涓簍rue锛屽垯琛ㄧず鏈嶅姟鍣ㄥ凡棰勫厛缂撳瓨 濡傛灉鍙敤锛屽垯浣跨敤鍥惧潡銆傚鏋滀负false锛屽垯灏嗗拷鐣ユ墍鏈夐缂撳瓨鐨勫浘鍧楋紝骞朵笖 浣跨敤浜�'瀵煎嚭'鏈嶅姟銆�
+ * @param [options.usePreCachedTilesIfAvailable = true] - 濡傛灉涓簍rue锛屽垯琛ㄧず浼樺厛浣跨敤鏈嶅姟鐨勭摝鐗囧浘鐗囷紝娌℃湁鐡︾墖鏃跺啀浣跨敤鍔ㄦ�佹湇鍔°�傚鏋滀负false锛屽垯灏嗗拷鐣ユ墍鏈夌摝鐗囷紝鐩存帴浣跨敤鍔ㄦ�佹湇鍔°��
+ * @param [options.maxLength = 5000] - 鍗曞嚮鑾峰彇鍒扮殑鏁版嵁锛屾渶澶ф暟鎹暱搴︺�傚ぇ鏁版嵁瑙ｆ瀽寰堝崱锛屽彲浠ヨ瀹氶榾鍊煎睆钄藉ぇ鏁版嵁锛岄伩鍏嶅崱椤裤��
* @param [options.highlight] - 榧犳爣鍗曞嚮楂樹寒鏄剧ず瀵瑰簲鐨勭煝閲忔暟鎹� 鍙婂叾鏍峰紡
* @param [options.highlight.type] - 鏋勯�犳垚鐨勭煝閲忔暟鎹被鍨嬨��
* @param [options.highlight.鍏朵粬] - style鏍峰紡锛屾瘡绉嶄笉鍚岀被鍨嬫暟鎹兘鏈変笉鍚岀殑鏍峰紡锛屽叿浣撹鍚剓@link GraphicType}鐭㈤噺鏁版嵁鐨剆tyle鍙傛暟銆�
@@ -10592,6 +10843,7 @@
token?: string;
tileDiscardPolicy?: TileDiscardPolicy;
usePreCachedTilesIfAvailable?: boolean;
+ maxLength?: number;
highlight?: {
type?: GraphicType;
鍏朵粬?: any;
@@ -11401,6 +11653,7 @@
* @param [options.srs] - SRS瑙勮寖锛屼笌WMS瑙勮寖1.1.0鎴�1.1.1涓�璧蜂娇鐢�
* @param [options.clock] - 涓�涓椂閽熷疄渚嬶紝鐢ㄤ簬纭畾鏃堕棿缁村害鐨勫�笺�傛寚瀹�' times '鏃堕渶瑕併��
* @param [options.times] - TimeIntervalCollection 鐨勬暟鎹睘鎬ф槸涓�涓寘鍚椂闂村姩鎬佺淮搴﹀強鍏跺�肩殑瀵硅薄銆�
+ * @param [options.maxLength = 5000] - 鍗曞嚮鑾峰彇鍒扮殑鏁版嵁锛屾渶澶ф暟鎹暱搴︺�傚ぇ鏁版嵁瑙ｆ瀽寰堝崱锛屽彲浠ヨ瀹氶榾鍊煎睆钄藉ぇ鏁版嵁锛岄伩鍏嶅崱椤裤��
* @param [options.highlight] - 榧犳爣鍗曞嚮楂樹寒鏄剧ず瀵瑰簲鐨勭煝閲忔暟鎹� 鍙婂叾鏍峰紡
* @param [options.highlight.type] - 鏋勯�犳垚鐨勭煝閲忔暟鎹被鍨嬨��
* @param [options.highlight.鍏朵粬] - style鏍峰紡锛屾瘡绉嶄笉鍚岀被鍨嬫暟鎹兘鏈変笉鍚岀殑鏍峰紡锛屽叿浣撹鍚剓@link GraphicType}鐭㈤噺鏁版嵁鐨剆tyle鍙傛暟銆�
@@ -11416,6 +11669,7 @@
srs?: string;
clock?: Cesium.Clock;
times?: Cesium.TimeIntervalCollection;
+ maxLength?: number;
highlight?: {
type?: GraphicType;
鍏朵粬?: any;
@@ -11693,6 +11947,12 @@
* 鏄惁涓嶆嬀鍙栨暟鎹�
*/
noPickEntity: boolean;
+ /**
+ * 鑾峰彇鎷惧彇鍒扮殑Cesium閫変腑瀵硅薄
+ * @param pickedObject - scene.pick杩斿洖鐨勫璞�
+ * @returns 鑾峰彇鎷惧彇鍒扮殑Cesium閫変腑瀵硅薄
+ */
+ getPicked(pickedObject: any): any | undefined;
}
declare namespace Map {
@@ -11755,8 +12015,8 @@
* @property cameraController - 鐩告満鎿嶄綔鐩稿叧鍙傛暟
* @property [cameraController.zoomFactor = 3.0] - 榧犳爣婊氳疆鏀惧ぇ鐨勬闀垮弬鏁�
* @property [cameraController.constrainedAxis = true] - 涓篺alse鏃� 瑙ｉ櫎鍦ㄥ崡鍖楁瀬鍖哄煙榧犳爣鎿嶄綔闄愬埗
- * @property [cameraController.minimumZoomDistance = 1.0] - 鍙樼劍鏃剁浉鏈轰綅缃殑鏈�灏忛噺绾э紙浠ョ背涓哄崟浣嶏級銆傞粯璁や负1
- * @property [cameraController.maximumZoomDistance = 50000000.0] - 鍙樼劍鏃剁浉鏈轰綅缃殑鏈�澶у�硷紙浠ョ背涓哄崟浣嶏級
+ * @property [cameraController.minimumZoomDistance = 1.0] - 鍙樼劍鏃剁浉鏈轰綅缃殑鏈�灏忛噺绾э紙浠ョ背涓哄崟浣嶏級锛岄粯璁や负1銆傝鍊兼槸鐩告満涓庡湴琛�(鍚湴褰�)鐨勭浉瀵硅窛绂汇��
+ * @property [cameraController.maximumZoomDistance = 50000000.0] - 鍙樼劍鏃剁浉鏈轰綅缃殑鏈�澶у�硷紙浠ョ背涓哄崟浣嶏級銆傝鍊兼槸鐩告満涓庡湴琛�(鍚湴褰�)鐨勭浉瀵硅窛绂汇��
* @property [cameraController.minimumCollisionTerrainHeight = 80000] - 浣庝簬姝ら珮搴︽椂缁曢紶鏍囬敭缁曞湀锛屽ぇ浜庢椂缁曡鍥句腑蹇冪偣缁曞湀銆�
* @property [cameraController.enableRotate = true] - 2D鍜�3D瑙嗗浘涓嬶紝鏄惁鍏佽鐢ㄦ埛鏃嬭浆鐩告満
* @property [cameraController.enableTranslate = true] - 2D鍜屽摜浼﹀竷瑙嗗浘涓嬶紝鏄惁鍏佽鐢ㄦ埛骞崇Щ鍦板浘
@@ -11940,7 +12200,7 @@
popup?: any;
popupOptions?: Popup.StyleOptions;
tooltip?: any;
- tooltipOptions?: Popup.StyleOptions;
+ tooltipOptions?: Tooltip.StyleOptions;
鍏朵粬鍙傛暟?: any;
};
/**
@@ -11962,6 +12222,7 @@
* @property morphStart - 鍦烘櫙妯″紡(2D/3D/鍝ヤ鸡甯�)鍙樻崲鍓� 鍦烘櫙浜嬩欢
* @property morphComplete - 瀹屾垚鍦烘櫙妯″紡(2D/3D/鍝ヤ鸡甯�)鍙樻崲 鍦烘櫙浜嬩欢
* @property clockTick - 鏃堕挓璺冲姩 鍦烘櫙浜嬩欢
+ * @property renderError - 鍦烘櫙娓叉煋澶辫触锛堥渶瑕佸埛鏂伴〉闈級
* @property click - 宸﹂敭鍗曞嚮 榧犳爣浜嬩欢
* @property clickGraphic - 宸﹂敭鍗曞嚮鍒扮煝閲忔垨妯″瀷鏁版嵁鏃� 榧犳爣浜嬩欢
* @property clickTileGraphic - 宸﹂敭鍗曞嚮鍒皐ms鎴朼rcgis鐡︾墖鏈嶅姟鐨勫搴旂煝閲忔暟鎹椂
@@ -12005,6 +12266,7 @@
morphStart: string;
morphComplete: string;
clockTick: string;
+ renderError: string;
click: string;
clickGraphic: string;
clickTileGraphic: string;
@@ -12522,7 +12784,16 @@
* @param [arr.stop = 1] - 璇ユ楠ら琛岀粨鏉熺殑鍋滅暀鏃堕棿锛堝崟浣嶏細绉掞級銆�
* @param [arr.onStart] - 璇ユ楠ら琛屽紑濮嬪墠鐨勫洖璋冩柟娉�
* @param [arr.onEnd] - 璇ユ楠ら琛屽紑濮嬬粨鏉熷悗鐨勫洖璋冩柟娉�
- * @param enfun - 鎵ц瀹屾垚鐨勫洖璋冩柟娉�
+ * @param [options = {}] - 鍙傛暟瀵硅薄:
+ * @param [options.complete] - 鍏ㄩ儴椋炶瀹屾垚鍚庤鎵ц鐨勫嚱鏁般��
+ * @param [options.cancel] - 椋炶鍙栨秷鏃惰鎵ц鐨勫嚱鏁般��
+ * @param [options.endTransform] - 鍙樻崲鐭╅樀琛ㄧず椋炶缁撴潫鏃剁浉鏈烘墍澶勭殑鍙傜収绯汇��
+ * @param [options.maximumHeight] - 椋炶楂樺嘲鏃剁殑鏈�澶ч珮搴︺��
+ * @param [options.pitchAdjustHeight] - 濡傛灉鐩告満椋炲緱姣旇繖涓�奸珮锛屽湪椋炶杩囩▼涓皟鏁翠刊浠颁互鍚戜笅鐪嬶紝骞朵繚鎸佸湴鐞冨湪瑙嗗彛銆�
+ * @param [options.flyOverLongitude] - 鍦扮悆涓婄殑涓ょ偣涔嬮棿鎬绘湁涓ゆ潯璺�傝繖涓�夐」杩娇鐩告満閫夋嫨鎴樻枟鏂瑰悜椋炶繃閭ｄ釜缁忓害銆�
+ * @param [options.flyOverLongitudeWeight] - 浠呭湪閫氳繃flyOverLongitude鎸囧畾鐨刲on涓婄┖椋炶锛屽彧瑕佽鏂瑰紡鐨勬椂闂翠笉瓒呰繃flyOverLongitudeWeight鐨勭煭閫旀椂闂淬��
+ * @param [options.convert = true] - 鏄惁灏嗙洰鐨勫湴浠庝笘鐣屽潗鏍囪浆鎹负鍦烘櫙鍧愭爣锛堜粎鍦ㄤ笉浣跨敤3D鏃剁浉鍏筹級銆�
+ * @param [options.easingFunction = Cesium.EasingFunction.LINEAR_NONE] - 鎺у埗鍦ㄩ琛岃繃绋嬩腑濡備綍鎻掑�兼椂闂淬��
* @returns 鏃�
*/
setCameraViewList(arr: {
@@ -12536,7 +12807,17 @@
stop?: number;
onStart?: (...params: any[]) => any;
onEnd?: (...params: any[]) => any;
- }[], enfun: (...params: any[]) => any): void;
+ }[], options?: {
+ complete?: Cesium.Camera.FlightCompleteCallback;
+ cancel?: Cesium.Camera.FlightCancelledCallback;
+ endTransform?: Matrix4;
+ maximumHeight?: number;
+ pitchAdjustHeight?: number;
+ flyOverLongitude?: number;
+ flyOverLongitudeWeight?: number;
+ convert?: boolean;
+ easingFunction?: Cesium.EasingFunction.Callback;
+ }): void;
/**
* 椋炶鑷矯esium鐩稿叧鐭㈤噺瀵硅薄澶勶紝鏄疌esium鏈韩鐨刦lyTo鏂规硶銆�
*
@@ -12763,11 +13044,12 @@
closeHighlight(): void;
/**
* 楂樹寒鐭㈤噺瀵硅薄
- * @param [graphic] - 鐭㈤噺瀵硅薄
- * @param [highlightStyle] - 楂樹寒鐨勬牱寮忥紝鍏蜂綋瑙佸悇{@link GraphicType}鐭㈤噺鏁版嵁鐨剆tyle鍙傛暟銆�
+ * @param graphic - 鐭㈤噺瀵硅薄
+ * @param highlightStyle - 楂樹寒鐨勬牱寮忥紝鍏蜂綋瑙佸悇{@link GraphicType}鐭㈤噺鏁版嵁鐨剆tyle鍙傛暟銆�
+ * @param [event] - 榧犳爣浜嬩欢瀵硅薄
* @returns 鏃�
*/
- openHighlight(graphic?: BaseGraphic, highlightStyle?: any): void;
+ openHighlight(graphic: BaseGraphic, highlightStyle: any, event?: any): void;
/**
* 鎵撳紑Popup寮圭獥
* @param position - 鐭㈤噺瀵硅薄 鎴� 鏄剧ず鐨勪綅缃�
@@ -12788,7 +13070,7 @@
* @param options - 閰嶇疆鍙傛暟
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
*/
- openTooltip(position?: LatLngPoint | Cesium.Cartesian3, content: string | ((...params: any[]) => any), options: Popup.StyleOptions): this;
+ openTooltip(position?: LatLngPoint | Cesium.Cartesian3, content: string | ((...params: any[]) => any), options: Tooltip.StyleOptions): this;
/**
* 鍏抽棴Tooltip寮圭獥
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
@@ -12811,7 +13093,9 @@
* @param [content.show] - 鑿滃崟椤规槸鍚︽樉绀虹殑鍥炶皟鏂规硶
* @param [content.callback] - 鑿滃崟椤瑰崟鍑诲悗鐨勫洖璋冩柟娉�
* @param [content.children] - 褰撴湁浜岀骇瀛愯彍鍗曟椂锛岄厤缃暟缁勩��
- * @param [options = {}] - 鍙傛暟瀵硅薄(棰勭暀锛岀洰鍓嶆湭鐢�)
+ * @param [options = {}] - 鎺у埗鍙傛暟
+ * @param [options.offsetX] - 鐢ㄤ簬闈炶鍒欏璞℃椂锛屾í鍚戝亸绉荤殑px鍍忕礌鍊�
+ * @param [options.offsetY] - 鐢ㄤ簬闈炶鍒欏璞℃椂锛屽瀭鐩存柟鍚戝亸绉荤殑px鍍忕礌鍊�
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
*/
bindContextMenu(content: {
@@ -12820,7 +13104,10 @@
show?: ((...params: any[]) => any) | boolean;
callback?: (...params: any[]) => any;
children?: object[];
- }[], options?: any): this;
+ }[], options?: {
+ offsetX?: number;
+ offsetY?: number;
+ }): this;
/**
* 瑙ｉ櫎缁戝畾鐨勫彸閿彍鍗�
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
@@ -12828,12 +13115,10 @@
unbindContextMenu(): this;
/**
* 鎵撳紑鍙抽敭鑿滃崟
- * @param [position] - 鐭㈤噺瀵硅薄 鎴� 鏄剧ず鐨勪綅缃�
- * @param [content = getContextMenu()] - 鍙抽敭鑿滃崟閰嶇疆鏁扮粍
- * @param [options = {}] - 鍙互瑕嗙洊bindContextMenu缁戝畾鐨勫弬鏁帮紝鍏蜂綋鍙傝�僢indContextMenu鏂规硶鍙傛暟璇存槑
+ * @param [position] - 鏄剧ず鐨勪綅缃�
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
*/
- openContextMenu(position?: Cesium.Cartesian3, content?: object[], options?: any): this;
+ openContextMenu(position?: Cesium.Cartesian3): this;
/**
* 鍏抽棴鍙抽敭鑿滃崟
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
@@ -14759,7 +15044,7 @@
* @param [options.path.closure = false] - 鏄惁闂悎杞ㄩ亾鍦�
* @param [options.shadingLine] - 璁剧疆鏄惁鏄剧ず 鏄熶笅杞ㄨ抗 鍜屽搴旂殑鏍峰紡
* @param [options.fixedFrameTransform] - 鍙傝�冪郴
- * @param [options.frameRate = 30] - 澶氬皯甯у埛鏂�1娆★紝鎺у埗鏁堢巼锛屽鏋滃崱椤垮氨鎶婅鏁板�艰皟澶т竴浜涖��
+ * @param [options.frameRate = 50] - 澶氬皯甯у埛鏂�1娆★紝鎺у埗鏁堢巼锛屽鏋滃崱椤垮氨鎶婅鏁板�艰皟澶т竴浜涖��
*/
declare class Satellite extends BaseGraphic {
constructor(options: {
@@ -15145,7 +15430,7 @@
* @param [options.transparent = true] - 璁剧疆璇锋眰鐨勫湴鍥炬湇鍔＄殑鍙傛暟鏄惁涓簍ransparent銆�
* @param [options.tileFormat] - 褰卞儚鍥剧墖鏍煎紡锛岄粯璁や负png銆�
* @param [options.cacheKey] - 褰卞儚鐨勪笁缁寸紦瀛樺瘑閽ャ��
- * @param } - [options.transparentBackColor] 璁剧疆褰卞儚閫忔槑鑹层��
+ * @param [options.transparentBackColor] - 璁剧疆褰卞儚閫忔槑鑹层��
* @param [options.transparentBackColorTolerance] - 鍘婚粦杈�,璁剧疆褰卞儚閫忔槑鑹插闄愶紝鍙栧�艰寖鍥翠负0.0~1.0銆�0.0琛ㄧず瀹屽叏閫忔槑锛�1.0琛ㄧず瀹屽叏涓嶉�忔槑銆�
*/
declare class SmImgLayer extends BaseTileLayer {
@@ -15154,8 +15439,9 @@
transparent?: boolean;
tileFormat?: string;
cacheKey?: string;
+ transparentBackColor?: string | Cesium.Color;
transparentBackColorTolerance?: number;
- });
+ });
/**
* 鍒涘缓鐢ㄤ簬鍥惧眰鐨� ImageryProvider瀵硅薄
* @param options - Provider鍙傛暟锛屽悓鍥惧眰鏋勯�犲弬鏁般��
@@ -15268,11 +15554,17 @@
key?: string;
});
/**
- * 瀵硅薄娣诲姞鍒板湴鍥惧墠鍒涘缓涓�浜涘璞＄殑閽╁瓙鏂规硶锛�
- * 鍙細璋冪敤涓�娆�
+ * 瀵硅薄娣诲姞鍒板湴鍥句笂鐨勫垱寤洪挬瀛愭柟娉曪紝
+ * 姣忔add鏃堕兘浼氳皟鐢�
* @returns 鏃�
*/
- _mountedHook(): void;
+ _addedHook(): void;
+ /**
+ * 瀵硅薄浠庡湴鍥句笂绉婚櫎鐨勫垱寤洪挬瀛愭柟娉曪紝
+ * 姣忔remove鏃堕兘浼氳皟鐢�
+ * @returns 鏃�
+ */
+ _removedHook(): void;
}
/**
@@ -16053,7 +16345,7 @@
/**
* 鐧惧害 POI鏌ヨ 宸ュ叿绫� 锛�
- * 鍙傝�冩枃妗ｏ細 http://lbsyun.baidu.com/index.php?title=webapi/guide/webservice-placeapi
+ * 鍙傝�冩枃妗ｏ細 https://lbsyun.baidu.com/index.php?title=webapi/guide/webservice-placeapi
* @param options - 鍙傛暟瀵硅薄锛屽寘鎷互涓嬶細
* @param [options.key = mars3d.Token.baiduArr] - 鐧惧害KEY,瀹為檯椤圭洰涓浣跨敤鑷繁鐢宠鐨勭櫨搴EY锛屽洜涓烘垜浠殑key涓嶄繚璇侀暱鏈熸湁鏁堛��
* @param [options.city = '鍏ㄥ浗'] - 闄愬畾鏌ヨ鐨勫尯鍩燂紝鏀寔鍩庡競鍙婂搴旂櫨搴︾紪鐮侊紙Citycode锛夛紙鎸囧畾鐨勫尯鍩熺殑杩斿洖缁撴灉鍔犳潈锛屽彲鑳借繑鍥炲叾浠栧煄甯傞珮鏉冮噸缁撴灉銆傝嫢瑕佸杩斿洖缁撴灉鍖哄煙涓ユ牸闄愬埗锛岃浣跨敤city_limit鍙傛暟锛�
@@ -16138,6 +16430,31 @@
citylimit?: boolean;
page?: number;
count?: number;
+ success?: (...params: any[]) => any;
+ error?: (...params: any[]) => any;
+ }): this;
+ /**
+ * 鍛ㄨ竟鎼滅储(鍦嗗舰鎼滅储)
+ * @param queryOptions - 鏌ヨ鍙傛暟
+ * @param queryOptions.text - 妫�绱㈠叧閿瓧銆傛敮鎸佸涓叧閿瓧骞堕泦妫�绱紝涓嶅悓鍏抽敭瀛楅棿浠ョ┖鏍肩鍙峰垎闅旓紝鏈�澶氭敮鎸�10涓叧閿瓧妫�绱€��
+ * @param [queryOptions.types = ''] - 妫�绱㈠垎绫诲亸濂斤紝涓巘ext缁勫悎杩涜妫�绱紝澶氫釜鍒嗙被浠�","鍒嗛殧锛圥OI鍒嗙被锛夛紝濡傛灉闇�瑕佷弗鏍兼寜鍒嗙被妫�绱紝璇烽�氳繃text鍙傛暟璁剧疆
+ * @param [queryOptions.location = null] - 鍦嗗舰鍖哄煙妫�绱腑蹇冪偣锛屽彇鍊艰寖鍥�:0-50000銆傝鍒欙細澶т簬50000鎸夐粯璁ゅ�硷紝鍗曚綅锛氱背
+ * @param [queryOptions.radius = 3000] - 鍦嗗舰鍖哄煙妫�绱㈠崐寰勶紝鍗曚綅涓虹背銆傦紙澧炲姞鍖哄煙鍐呮暟鎹彫鍥炴潈閲嶏紝濡傞渶涓ユ牸闄愬埗鍙洖鏁版嵁鍦ㄥ尯鍩熷唴锛岃鎼厤浣跨敤radiuslimit鍙傛暟锛夛紝褰撳崐寰勮繃澶э紝瓒呰繃涓績鐐规墍鍦ㄥ煄甯傝竟鐣屾椂锛屼細鍙樹负鍩庡競鑼冨洿妫�绱紝妫�绱㈣寖鍥翠负涓績鐐规墍鍦ㄥ煄甯�
+ * @param [queryOptions.limit = false] - 鏄惁涓ユ牸闄愬畾鍙洖缁撴灉鍦ㄨ缃绱㈠崐寰勮寖鍥村唴銆倀rue锛堟槸锛夛紝false锛堝惁锛夈�傝缃负true鏃朵細褰卞搷杩斿洖缁撴灉涓璽otal鍑嗙‘鎬у強姣忛〉鍙洖poi鏁伴噺锛� 璁剧疆涓篺alse鏃跺彲鑳戒細鍙洖妫�绱㈠崐寰勫鐨刾oi銆�
+ * @param [queryOptions.count = 20] - 鍗曟鍙洖POI鏁伴噺锛屾渶澶ц繑鍥�25鏉°�傚鍏抽敭瀛楁绱㈡椂锛岃繑鍥炵殑璁板綍鏁颁负鍏抽敭瀛椾釜鏁�*count銆傚鍏抽敭璇嶆绱㈡椂锛屽崟椤佃繑鍥炴�绘暟=鍏抽敭璇嶆暟閲�*count
+ * @param [queryOptions.page = 0] - 鍒嗛〉椤电爜锛岄粯璁や负0, 0浠ｈ〃绗竴椤碉紝1浠ｈ〃绗簩椤碉紝浠ユ绫绘帹銆傚父涓� count 鎼厤浣跨敤锛屼粎褰撹繑鍥炵粨鏋滀负poi鏃跺彲浠ョ炕椤点��
+ * @param [queryOptions.success] - 鏌ヨ瀹屾垚鐨勫洖璋冩柟娉�
+ * @param [queryOptions.error] - 鏌ヨ澶辫触鐨勫洖璋冩柟娉�
+ * @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
+ */
+ queryCircle(queryOptions: {
+ text: string;
+ types?: string;
+ location?: LatLngPoint;
+ radius?: number;
+ limit?: boolean;
+ count?: number;
+ page?: number;
success?: (...params: any[]) => any;
error?: (...params: any[]) => any;
}): this;
@@ -16319,7 +16636,7 @@
* 鎸夋寚瀹氱被鍒嚜鍔ㄦ煡璇�
* @param queryOptions - 鏌ヨ鍙傛暟
* @param queryOptions.type - 绫诲瀷
- * @param queryOptions.points - 鎸夎捣鐐广�侀�旂粡鐐广�佺粓鐐� 椤哄簭鐨勫潗鏍囨暟缁�,濡俒[117.500244, 40.417801],[117.500244, 40.417801]]
+ * @param queryOptions.points - 鎸夎捣鐐广�佺粓鐐� 椤哄簭鐨勫潗鏍囨暟缁�,濡俒[117.500244, 40.417801],[117.500244, 40.417801]]
* @param [queryOptions.success] - 鏌ヨ瀹屾垚鐨勫洖璋冩柟娉�
* @param [queryOptions.error] - 鏌ヨ澶辫触鐨勫洖璋冩柟娉�
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
@@ -16384,6 +16701,7 @@
* 椹捐溅璺緞瑙勫垝鏌ヨ
* @param queryOptions - 鏌ヨ鍙傛暟
* @param queryOptions.points - 鎸夎捣鐐广�侀�旂粡鐐广�佺粓鐐� 椤哄簭鐨勫潗鏍囨暟缁�,濡俒[117.500244, 40.417801],[117.500244, 40.417801]]
+ * @param queryOptions.avoidpolygons - 鍖哄煙閬胯鏁扮粍(鏀寔澶氫釜)锛屾敮鎸�32涓伩璁╁尯鍩燂紝姣忎釜鍖哄煙鏈�澶氬彲鏈�16涓《鐐广�傞伩璁╁尯鍩熶笉鑳借秴杩�81骞虫柟鍏噷锛屽惁鍒欓伩璁╁尯鍩熶細澶辨晥銆�
* @param [queryOptions.extensions = 'base'] - 杩斿洖缁撴灉鎺у埗,鍙�夊�硷細core/all base:杩斿洖鍩烘湰淇℃伅锛沘ll锛氳繑鍥炲叏閮ㄤ俊鎭�
* @param [queryOptions.strategy = 0] - 椹捐溅閫夋嫨绛栫暐锛屽弬鑰冮珮寰峰畼缃戣鏄庯紝榛樿涓�0锛氶�熷害浼樺厛锛屼笉鑰冭檻褰撴椂璺喌锛屾璺嚎涓嶄竴瀹氳窛绂绘渶鐭�
* @param [queryOptions.success] - 鏌ヨ瀹屾垚鐨勫洖璋冩柟娉�
@@ -16392,6 +16710,7 @@
*/
queryDriving(queryOptions: {
points: any[][];
+ avoidpolygons: any[][];
extensions?: string;
strategy?: string;
success?: (...params: any[]) => any;
@@ -16430,10 +16749,11 @@
/**
* ArcGIS WFS鐭㈤噺鏈嶅姟鏌ヨ绫�
* @param options - 鍙傛暟瀵硅薄锛屽寘鎷互涓嬶細
- * @param options.url - ArcGIS鏈嶅姟鍦板潃, 绀轰緥锛�'http://server.mars3d.cn/arcgis/rest/services/mars/hefei/MapServer/37',
- * @param [options.pageSize = 10] - 姣忛〉鏉℃暟
+ * @param options.url - ArcGIS鏈嶅姟鍦板潃, 绀轰緥锛�'http://server.mars3d.cn/arcgis/rest/services/mars/hefei/MapServer/37', *
+ * @param [options.pageSize = 10] - 姣忛〉鏉℃暟 *
* @param [options.headers = {}] - 灏嗚娣诲姞鍒癏TTP璇锋眰澶淬��
* @param [options.proxy] - 鍔犺浇璧勬簮鏃朵娇鐢ㄧ殑浠ｇ悊銆�
+ * @param [options.鍥惧眰鍙傛暟] - layer灞炴�ц幏鍙栫殑鍥惧眰瀵瑰簲鐨勬瀯閫犲弬鏁帮紝鍙傝�儃@link GeoJsonLayer}
*/
declare class QueryArcServer extends BaseClass {
constructor(options: {
@@ -16441,6 +16761,7 @@
pageSize?: number;
headers?: any;
proxy?: Cesium.Proxy;
+ 鍥惧眰鍙傛暟?: any;
});
/**
* ArcGIS鏈嶅姟鍦板潃
@@ -16465,7 +16786,7 @@
/**
* 鐢ㄤ簬鏄剧ず鏌ヨ缁撴灉鐨凣eoJsonLayer鍥惧眰锛屽浘灞傚弬鏁板湪褰撳墠绫绘瀯閫犳柟娉曚腑浼犲叆
*/
- readonly layer: GraphicLayer;
+ readonly layer: GeoJsonLayer;
/**
* 棣栭〉锛屾煡鐪嬬1椤垫暟鎹�
* @returns 鏃�
@@ -16491,8 +16812,8 @@
* 鎸夋寚瀹氱被鍒嚜鍔ㄦ煡璇�
* @param queryOptions - 鏌ヨ鍙傛暟
* @param [queryOptions.text] - 妫�绱㈠叧閿瓧銆�
- * @param [queryOptions.like = true] - 妫�绱㈠叧閿瓧鏃讹紝鏄惁妯＄硦鍖归厤锛宖alse鏃剁簿纭煡璇€��
* @param [queryOptions.column] - 妫�绱㈠叧閿瓧鐨勫瓧娈靛悕绉般��
+ * @param [queryOptions.like = true] - 妫�绱㈠叧閿瓧鏃讹紝鏄惁妯＄硦鍖归厤锛宖alse鏃剁簿纭煡璇€��
* @param [queryOptions.where] - 鑷畾涔夌殑妫�绱㈡潯浠讹紝涓巘ext浜岄�変竴
* @param [queryOptions.graphic] - 闄愬畾鐨勬悳绱㈠尯鍩�
* @param [queryOptions.page = true] - 鏄惁鍒嗛〉鏌ヨ,false鏃朵笉鍒嗛〉锛屼竴娆℃�ф煡璇㈣繑鍥�
@@ -16502,8 +16823,8 @@
*/
query(queryOptions: {
text?: string;
- like?: boolean;
column?: string;
+ like?: boolean;
where?: string;
graphic?: BaseGraphic;
page?: boolean;
@@ -16523,22 +16844,28 @@
* @param options.layer - 鍥惧眰鍚嶇О锛堝懡鍚嶇┖闂�:鍥惧眰鍚嶇О锛夛紝澶氫釜鍥惧眰鍚嶇О鐢ㄩ�楀彿闅斿紑
* @param [options.headers = {}] - 灏嗚娣诲姞鍒癏TTP璇锋眰澶淬��
* @param [options.proxy] - 鍔犺浇璧勬簮鏃朵娇鐢ㄧ殑浠ｇ悊銆�
+ * @param [options.鍥惧眰鍙傛暟] - layer灞炴�ц幏鍙栫殑鍥惧眰瀵瑰簲鐨勬瀯閫犲弬鏁帮紝鍙傝�儃@link GeoJsonLayer}
*/
-declare class QueryGeoServer {
+declare class QueryGeoServer extends BaseClass {
constructor(options: {
layer: string;
headers?: any;
proxy?: Cesium.Proxy;
+ 鍥惧眰鍙傛暟?: any;
});
+ /**
+ * 鐢ㄤ簬鏄剧ず鏌ヨ缁撴灉鐨凣eoJsonLayer鍥惧眰锛屽浘灞傚弬鏁板湪褰撳墠绫绘瀯閫犳柟娉曚腑浼犲叆
+ */
+ readonly layer: GeoJsonLayer;
/**
* 鎸夋寚瀹氱被鍒嚜鍔ㄦ煡璇�
* @param queryOptions - 鏌ヨ鍙傛暟
* @param [queryOptions.text] - 妫�绱㈠叧閿瓧銆�
- * @param [queryOptions.column] - 妫�绱㈠叧閿瓧鐨勫瓧娈靛悕绉般��
+ * @param [queryOptions.column] - 妫�绱㈠叧閿瓧鐨勫睘鎬у悕绉�(PropertyName)銆�
+ * @param [queryOptions.like = true] - 妫�绱㈠叧閿瓧鏃讹紝鏄惁妯＄硦鍖归厤锛宖alse鏃剁簿纭煡璇€��
* @param [queryOptions.graphic] - 闄愬畾鐨勬悳绱㈠尯鍩�
- * @param [queryOptions.bbox] - 闄愬畾鐨勭煩褰㈣寖鍥达紙宸︿笅瑙扻鍧愭爣,宸︿笅瑙扽鍧愭爣,鍙充笂瑙扻鍧愭爣,鍙充笂瑙扽鍧愭爣,EPSG锛�4326锛�
- * @param [queryOptions.sortby] - 鎺掑簭瀛楁
- * @param [options.maxFeatures = 1000] - 鏈�澶氳繑鍥炵粨鏋滀釜鏁�
+ * @param [queryOptions.geoColumn = 'the_geom'] - 鎼滅储鍖哄煙鐨勫睘鎬у悕绉�(PropertyName)銆�
+ * @param [queryOptions.maxFeatures = 1000] - 鏈�澶氳繑鍥炵粨鏋滀釜鏁�
* @param [queryOptions.success] - 鏌ヨ瀹屾垚鐨勫洖璋冩柟娉�
* @param [queryOptions.error] - 鏌ヨ澶辫触鐨勫洖璋冩柟娉�
* @returns 褰撳墠瀵硅薄鏈韩锛屽彲浠ラ摼寮忚皟鐢�
@@ -16546,12 +16873,18 @@
query(queryOptions: {
text?: string;
column?: string;
+ like?: boolean;
graphic?: BaseGraphic;
- bbox?: string;
- sortby?: string;
+ geoColumn?: string;
+ maxFeatures?: number;
success?: (...params: any[]) => any;
error?: (...params: any[]) => any;
}): this;
+ /**
+ * 娓呴櫎
+ * @returns 鏃�
+ */
+ clear(): void;
}
declare namespace Measure {
@@ -17355,15 +17688,15 @@
* {
* elevation: {
* step: [0.0, 0.045, 0.1, 0.15, 0.37, 0.54, 1.0],
- * color: ['#000000', '#2747E0', '#D33B7D', '#D33038', '#FF9742', '#FF9742', '#ffd700', '#ffffff'],
+ * color: ['#000000', '#2747E0', '#D33B7D', '#D33038', '#FF9742', '#FF9742', '#ffd700'],
* },
* slope: {
* step: [0.0, 0.29, 0.5, Math.sqrt(2) / 2, 0.87, 0.91, 1.0],
- * color: ['#000000', '#2747E0', '#D33B7D', '#D33038', '#FF9742', '#FF9742', '#ffd700', '#ffffff'],
+ * color: ['#000000', '#2747E0', '#D33B7D', '#D33038', '#FF9742', '#FF9742', '#ffd700'],
* },
* aspect: {
* step: [0.0, 0.2, 0.4, 0.6, 0.8, 0.9, 1.0],
- * color: ['#000000', '#2747E0', '#D33B7D', '#D33038', '#FF9742', '#FF9742', '#ffd700', '#ffffff'],
+ * color: ['#000000', '#2747E0', '#D33B7D', '#D33038', '#FF9742', '#FF9742', '#ffd700'],
* },
* }
* @param [options.showElseArea = true] - 鏄惁鏄剧ず鍖哄煙澶栫殑鍦板浘
@@ -17631,7 +17964,7 @@
color?: Cesium.Color;
};
tooltip?: (...params: any[]) => any;
- tooltipOptions?: Popup.StyleOptions;
+ tooltipOptions?: Tooltip.StyleOptions;
popup?: (...params: any[]) => any;
popupOptions?: Popup.StyleOptions;
});
@@ -18442,6 +18775,13 @@
*/
function getNoTerrainProvider(): Cesium.EllipsoidTerrainProvider;
/**
+ * 娉ㄥ唽TerrainProvider绫�
+ * @param type - Provider绫诲瀷
+ * @param layerClass - TerrainProvider绫�
+ * @returns 鏃�
+ */
+ function registerTerrainProvider(type: string, layerClass: any): void;
+ /**
* 鍒涘缓鍦板舰瀵硅薄鐨勫伐鍘傛柟娉�
* @param options - 鍦板舰鍙傛暟
* @param options.type - 鍦板舰绫诲瀷
@@ -18789,16 +19129,18 @@
* Cesium绗涘崱灏旂┖闂村潗鏍� 杞� 缁忕含搴﹀潗鏍�
* 甯哥敤浜庤浆鎹eojson
* @param cartesian - Cesium绗涘崱灏旂┖闂磝yz鍧愭爣
+ * @param noAlt - 鏄惁鍖呭惈楂樺害鍊�
* @returns 缁忕含搴﹀潗鏍�,绀轰緥锛歔123.123456,32.654321,198.7]
*/
- function cartesian2lonlat(cartesian: Cesium.Cartesian3): Number[];
+ function cartesian2lonlat(cartesian: Cesium.Cartesian3, noAlt: boolean): Number[];
/**
* Cesium绗涘崱灏旂┖闂村潗鏍囨暟缁� 杞� 缁忕含搴﹀潗鏍囨暟缁�
* 甯哥敤浜庤浆鎹eojson
* @param positions - Cesium绗涘崱灏旂┖闂磝yz鍧愭爣鏁扮粍
+ * @param noAlt - 鏄惁鍖呭惈楂樺害鍊�
* @returns 缁忕含搴﹀潗鏍囨暟缁�,绀轰緥锛歔 [123.123456,32.654321,198.7], [111.123456,22.654321,50.7] ]
*/
- function cartesians2lonlats(positions: Cesium.Cartesian3[]): any[][];
+ function cartesians2lonlats(positions: Cesium.Cartesian3[], noAlt: boolean): any[][];
/**
* Cesium绗涘崱灏旂┖闂村潗鏍� 杞� WebMercator鎶曞奖骞抽潰鍧愭爣
* @param position - Cesium绗涘崱灏旂┖闂磝yz鍧愭爣
@@ -19206,16 +19548,18 @@
* 缂撳啿鍒嗘瀽锛屾眰鎸囧畾 鐐圭嚎闈eojson瀵硅薄 鎸墂idth鍗婂緞鐨� 缂撳啿闈㈠璞�
* @param geojson - geojson鏍煎紡瀵硅薄
* @param width - 缂撳啿鍗婂緞,鍗曚綅锛氱背
+ * @param [steps = 8] - 缂撳啿姝ュ箙
* @returns 缂撳啿闈㈠璞★紝geojson鏍煎紡
*/
- function buffer(geojson: any, width: number): any;
+ function buffer(geojson: any, width: number, steps?: number): any;
/**
* 缂撳啿鍒嗘瀽锛屽潗鏍囨暟缁勫洿鍚堥潰锛屾寜width鍗婂緞鐨� 缂撳啿鏂扮殑鍧愭爣
* @param points - 鍧愭爣鏁扮粍
* @param width - 缂撳啿鍗婂緞,鍗曚綅锛氱背
+ * @param [steps = 8] - 缂撳啿姝ュ箙
* @returns 缂撳啿鍚庣殑鏂板潗鏍囨暟缁�
*/
- function bufferPoints(points: LatLngPoint[], width: number): LatLngPoint[];
+ function bufferPoints(points: LatLngPoint[], width: number, steps?: number): LatLngPoint[];
/**
* 姹傚潗鏍囨暟缁勭殑鐭╁舰鑼冨洿鍐� 鎸� splitNum缃戞牸鏁版彃鍊肩殑 granularity鍊�
* @param positions - 鍧愭爣鏁扮粍
@@ -19996,6 +20340,17 @@
*/
function msg(msg: string): void;
/**
+ * 灏� 鏃堕棿 杞寲涓烘寚瀹氭牸寮忕殑瀛楃涓�
+ * @example
+ * mars3d.Util.formatDate(date,"yyyy-MM-dd HH:mm:ss") ==> 2017-08-25 08:08:00
+ * mars3d.Util.formatDate(date,"yyyy-MM-dd HH:mm:ss.S") ==> 2017-08-25 08:08:00.423
+ * mars3d.Util.formatDate(date,"yyyy-M-d HH:mm:ss") ==> 2017-8-5 08:08:00
+ * @param date - 鏃堕棿
+ * @param fmt - 鏍煎紡妯＄増锛屾湀(M)銆佹棩(d)銆�12灏忔椂(h)銆�24灏忔椂(H)銆佸垎(m)銆佺(s)銆佸懆(E)銆佸搴�(q) 鍙互鐢� 1-2 涓崰浣嶇; 骞�(y)鍙互鐢� 1-4 涓崰浣嶇锛屾绉�(S)鍙兘鐢� 1 涓崰浣嶇(鏄� 1-3 浣嶇殑鏁板瓧).
+ * @returns 鎸囧畾鏍煎紡鐨勫瓧绗︿覆
+ */
+ function formatDate(date: Date, fmt: string): string;
+ /**
* 鏍规嵁璁剧疆鐨刲ang鍙傛暟锛岃幏鍙栧綋鍓峩ey瀵瑰簲璇█鐨勬枃鏈唴瀹广��
* @param key - 鏂囨湰key
* @param langType - 浣跨敤鐨勮瑷�
--
Gitblit v1.9.1