From 6ef0b98edd9915b321566801a17376a45ef145c4 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期二, 28 九月 2021 17:59:46 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai
---
js/function.js | 88 +++++++++++---------------------------------
1 files changed, 22 insertions(+), 66 deletions(-)
diff --git a/js/function.js b/js/function.js
index 440288f..b2d5b02 100644
--- a/js/function.js
+++ b/js/function.js
@@ -45,6 +45,9 @@
mars3d.global_variables.queryDataTStart = getDefaultDateTime();
mars3d.global_variables.queryDataTStartGeo = getDefaultDateTimeGeo();
mars3d.global_variables.queryDataTEnd = getDefaultDateTimeEnd();
+// for tmp hight light graphic and
+//mars3d.global_variables.tmpHighlightGraphic;
+//mars3d.global_variables.tmpHighlightGraphicLayer;
@@ -52,6 +55,8 @@
//addMaskShanghai();
addTDTAnnoLayer();
+ addHighlightLayerClearButton();
+ addTmpHighlightGraphicLayer();
//TODO
$.getJSON("data/getLayerListByUserid.json", { userid: mars3d.global_variables.userid }, (result) => {
@@ -71,71 +76,7 @@
}
-function addWMSLayer(item) {
- var wmsLyer = new mars3d.layer.WmsLayer({
- id: item.id,
- pid: item.pid,
- name: item.name,
- type: "wms",
- url: mars3d.global_variables.geoserver_url_predix + "/geoserver/konglu_58/wms",
- layers: "konglu_58:" + item.geoname_prefix + mars3d.global_variables.queryDataType,
- crs: "EPSG:4326",
- parameters: {
- "styles": item.style_prefix + item.style_selected,
- "transparent": "true",
- "format": "image/png",
- "viewparams": "userid:" + mars3d.global_variables.userid + ";datatime:" + mars3d.global_variables.queryDataTStartGeo
- },
- center: { "lat": 30.487351, "lng": 121.613269, "alt": 54033, "heading": 359, "pitch": -40 },
- noCenter: true,
- maxLength: 35000,
- getFeatureInfoParameters: {
- feature_count: 10
- },
- //鍗曞嚮楂樹寒鍙婂叾鏍峰紡
- highlight: {
- type: "wallP",
- diffHeight: 300,
- material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
- image: "img/textures/fence.png",
- color: "#ffff00",
- speed: 10, //閫熷害锛屽缓璁彇鍊艰寖鍥�1-100
- axisY: true,
- }),
- },
- popup: "all",
- show: item.show,
- geoname_prefix: item.geoname_prefix,
- style_prefix: item.style_prefix,
- style_selected:item.style_selected,
- style_options: item.styleoptions,
- flyTo: false
- });
-
- //鍗曞嚮浜嬩欢
- wmsLyer.on(mars3d.EventType.click, function (event) {
- console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
- console.log(event.layer.options.style_selected);
-
-
- console.log(event.graphic);
- /*
- event.graphic.style.diffHeight =
-
- diffHeight: 300,
- material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
- image: "img/textures/fence.png",
- color: "#ffff00",
- speed: 10, //閫熷害锛屽缓璁彇鍊艰寖鍥�1-100
- axisY: true,
- }),
- */
- });
-
- map.addLayer(wmsLyer);
-
-}
function reLoadLayers() {
var layers = map.getLayers({ layers: true });
@@ -156,8 +97,8 @@
var tmpTaxi = map.getLayerById(1004);
tmpTaxi.clear(true);
setTaxiLayerMapClock();
- for (var i = 0, len = taxi_data_list.length; i < len; i++) {
- addTaxiPathToLayer(taxi_data_list[i], tmpTaxi);
+ for (var i = 0, len = data_list_1004.length; i < len; i++) {
+ getTaxiPathFromServerbySN(data_list_1004[i], tmpTaxi);
}
}
@@ -168,7 +109,22 @@
function refreshWidgets() {
}
+function addGraphictoHighlightLayer() {
+ mars3d.global_variables.tmpHighlightGraphicLayer.addGraphic(mars3d.global_variables.tmpHighlightGraphic);
+
+}
+function addHighlightLayerClearButton() {
+ let clearButton = new mars3d.control.ToolButton({
+ title: "clearHighlightLayer",
+ icon: "fa fa-crop",
+ insertIndex: 1, //鎻掑叆鐨勪綅缃『搴�, 1鏄痟ome鎸夐挳鍚庨潰
+ click: (event) => {
+ mars3d.global_variables.tmpHighlightGraphicLayer.clear(true);
+ },
+ });
+ map.addControl(clearButton);
+}
function showDetail(layerid, itemCode) {
haoutil.msg('鍗曞嚮浜嗭細' + layerid + ',' + itemCode);
--
Gitblit v1.9.1