egovamap 0.12.6 → 0.13.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/egovamap/egovagis.js +17 -1
- package/egovamap/egovagisviewer.js +5 -2
- package/egovamap/egovamap.js +35 -3
- package/package.json +1 -1
package/egovamap/egovagis.js
CHANGED
|
@@ -510,7 +510,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
|
|
|
510
510
|
}
|
|
511
511
|
}
|
|
512
512
|
/* 显示多个自定义图标 */
|
|
513
|
-
that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clusterOption,hasHover, clickCallback,mouseOverCallBack) {
|
|
513
|
+
that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clusterOption, hasHover, layerID, clickCallback, mouseOverCallBack) {
|
|
514
514
|
if (scene == null)
|
|
515
515
|
return;
|
|
516
516
|
// 移除监听
|
|
@@ -1204,6 +1204,22 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
|
|
|
1204
1204
|
var config=scene.layerUsageConfig;
|
|
1205
1205
|
scene.fire(msgPrefix + ":change3dlayerUsageConfig", {args: [config]}, parentScene);
|
|
1206
1206
|
}
|
|
1207
|
+
/*显示多轨迹*/
|
|
1208
|
+
that.showTraceMultiHisLayer = function(objectIDs, symbolType, beginDate, endDate, clear, zoom, hStyle) {
|
|
1209
|
+
scene.fire((msgPrefix + ":showTraceMultiHisLayer"), {args: [objectIDs, symbolType, beginDate, endDate, clear, zoom, hStyle]}, parentScene);
|
|
1210
|
+
}
|
|
1211
|
+
/*清除多轨迹*/
|
|
1212
|
+
that.claerTraceMultiHisLayer = function() {
|
|
1213
|
+
scene.fire((msgPrefix + ":claerTraceMultiHisLayer"), {args: []}, parentScene);
|
|
1214
|
+
}
|
|
1215
|
+
/*多人员图标通过id高亮*/
|
|
1216
|
+
that.multiPointsSelectbyID = function(id) {
|
|
1217
|
+
scene.fire((msgPrefix + ":multiPointsSelectbyID"), {args: [id]}, parentScene);
|
|
1218
|
+
}
|
|
1219
|
+
/*多轨迹通过id高亮*/
|
|
1220
|
+
that.traceMultiSelectbyID = function(id) {
|
|
1221
|
+
scene.fire((msgPrefix + ":traceMultiSelectbyID"), {args: [id]}, parentScene);
|
|
1222
|
+
}
|
|
1207
1223
|
|
|
1208
1224
|
that.init();
|
|
1209
1225
|
}
|
|
@@ -1355,13 +1355,16 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
|
|
|
1355
1355
|
}
|
|
1356
1356
|
|
|
1357
1357
|
/* 圆饼图 */
|
|
1358
|
-
that.addCircleChart = function (name, data, color, param, id, minZoom, maxZoom) {
|
|
1358
|
+
that.addCircleChart = function (name, data, color, param, id, minZoom, maxZoom, clickCallback) {
|
|
1359
1359
|
color = color || "#1B5771";
|
|
1360
1360
|
param = param || {
|
|
1361
1361
|
minRadius: 20,
|
|
1362
1362
|
rangeRadius: 20
|
|
1363
1363
|
};
|
|
1364
|
-
|
|
1364
|
+
var callback = function(type,info){
|
|
1365
|
+
if(type === "clickCallback" && clickCallback) clickCallback(info);
|
|
1366
|
+
}
|
|
1367
|
+
that.callMap('addCircleChart', name, data, color, param, id, minZoom, maxZoom, callback);
|
|
1365
1368
|
}
|
|
1366
1369
|
|
|
1367
1370
|
/* 饼图 */
|
package/egovamap/egovamap.js
CHANGED
|
@@ -48,7 +48,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
|
|
|
48
48
|
|
|
49
49
|
//hth 调用三维接口时,是否同步调用二维gis接口,默认false
|
|
50
50
|
if(context.synchroSetting === undefined) {
|
|
51
|
-
this.synchroSetting =
|
|
51
|
+
this.synchroSetting = true
|
|
52
52
|
} else {
|
|
53
53
|
this.synchroSetting = context.synchroSetting
|
|
54
54
|
}
|
|
@@ -1664,7 +1664,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
|
|
|
1664
1664
|
};
|
|
1665
1665
|
|
|
1666
1666
|
/* 显示多个自定义图标 */
|
|
1667
|
-
that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clickCallback, mouseOverCallBack, clusterOption,hasHover) {
|
|
1667
|
+
that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clickCallback, mouseOverCallBack, clusterOption, hasHover, layerID) {
|
|
1668
1668
|
if (scene == null)
|
|
1669
1669
|
return;
|
|
1670
1670
|
if (gisMap != null && that.synchroSetting === true) {
|
|
@@ -2099,7 +2099,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
|
|
|
2099
2099
|
}
|
|
2100
2100
|
|
|
2101
2101
|
/* 区域饼图 */
|
|
2102
|
-
that.addCircleChart = function (name, data, color, param) {
|
|
2102
|
+
that.addCircleChart = function (name, data, color, param, minZoom, maxZoom, clickCallback) {
|
|
2103
2103
|
if (scene == null)
|
|
2104
2104
|
return;
|
|
2105
2105
|
if (gisMap != null) {
|
|
@@ -3622,6 +3622,38 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
|
|
|
3622
3622
|
gisMap.removeRecCurrentV2Layer();
|
|
3623
3623
|
}
|
|
3624
3624
|
}
|
|
3625
|
+
/*加载多轨迹*/
|
|
3626
|
+
that.showTraceMultiHisLayer = function(objectIDs, symbolType, beginDate, endDate, clear, zoom, hStyle){
|
|
3627
|
+
if (scene == null)
|
|
3628
|
+
return;
|
|
3629
|
+
if (gisMap != null) {
|
|
3630
|
+
gisMap.showTraceMultiHisLayer.apply(this, arguments);
|
|
3631
|
+
}
|
|
3632
|
+
}
|
|
3633
|
+
/*清除多轨迹*/
|
|
3634
|
+
that.claerTraceMultiHisLayer = function(){
|
|
3635
|
+
if (scene == null)
|
|
3636
|
+
return;
|
|
3637
|
+
if (gisMap != null) {
|
|
3638
|
+
gisMap.claerTraceMultiHisLayer.apply(this, arguments);
|
|
3639
|
+
}
|
|
3640
|
+
}
|
|
3641
|
+
/*多人员图标通过id高亮*/
|
|
3642
|
+
that.multiPointsSelectbyID = function(id){
|
|
3643
|
+
if (scene == null)
|
|
3644
|
+
return;
|
|
3645
|
+
if (gisMap != null) {
|
|
3646
|
+
gisMap.multiPointsSelectbyID.apply(this, arguments);
|
|
3647
|
+
}
|
|
3648
|
+
}
|
|
3649
|
+
/*多轨迹通过id高亮*/
|
|
3650
|
+
that.traceMultiSelectbyID = function(id){
|
|
3651
|
+
if (scene == null)
|
|
3652
|
+
return;
|
|
3653
|
+
if (gisMap != null) {
|
|
3654
|
+
gisMap.traceMultiSelectbyID.apply(this, arguments);
|
|
3655
|
+
}
|
|
3656
|
+
}
|
|
3625
3657
|
|
|
3626
3658
|
|
|
3627
3659
|
that.initMap(containerID, callback, mapType, mapConfig);
|