From 8dc63fb2f82aefc329addd61781ce74a0f8edca3 Mon Sep 17 00:00:00 2001
From: fuchengshen <men883234@gmail.com>
Date: 星期三, 19 十月 2022 16:57:38 +0800
Subject: [PATCH] 上海遮罩层
---
js/function.js | 20 +++++++++
js/changable_params.js | 2
widgets/manageLayers_style/view.js | 2
widgetsTS/taxiRouteReplay/widget.js | 25 ++++++++----
js/index.js | 19 ---------
5 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/js/changable_params.js b/js/changable_params.js
index de2fdc8..d8c9164 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -53,7 +53,7 @@
}
var tiandituArr = ['51915011aa0997aa2ddd7e38504fa8bc', '51915011aa0997aa2ddd7e38504fa8bc']
// http://112.74.77.127:8090/ http://223.167.111.168:7002/
-var default_system_params = { geoserver_url_predix: 'http://223.167.111.168:7001/', nodejs_url_predix: 'http://223.167.111.168:7002/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50, un_authorization_url: 'http://223.167.111.168:8016/PollutionData/loginpage.aspx?returnurl=http://223.167.111.168:8004/shanghai/index.html',regionCode:2};
+var default_system_params = { geoserver_url_predix: 'http://223.167.111.168:7001/', nodejs_url_predix: 'http://223.167.111.168:7002/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50, un_authorization_url: 'http://223.167.111.168:8016/PollutionData/loginpage.aspx?returnurl=http://223.167.111.168:8004/shanghai/index.html',regionCode:3};
var default_grid_camerview = {grid5000:{"lat":30.367931,"lng":121.518409,"alt":128482,"heading":2,"pitch":-57},grid3000:{"lat":30.902475,"lng":121.487751,"alt":38716,"heading":2,"pitch":-57},grid1000:{"lat":31.066346,"lng":121.462529,"alt":10026,"heading":2,"pitch":-57},grid500:{"lat":31.112561,"lng":121.458433,"alt":2483,"heading":2,"pitch":-57}};
function bindPopupFunction(event) {
diff --git a/js/function.js b/js/function.js
index 57f8544..ac40d8e 100644
--- a/js/function.js
+++ b/js/function.js
@@ -232,7 +232,25 @@
function mask_selection(regionCode){
if(regionCode == 0){
- return
+ geoJsonLayer = new mars3d.layer.GeoJsonLayer({
+ url: "data/shanghai.json",
+ mask: true, //鏍囪瘑涓洪伄缃╁眰銆愰噸鐐瑰弬鏁般��
+ symbol: {
+ styleOptions: {
+ fill: true,
+ color: "rgb(2,26,79)",
+ outline: true,
+ outlineColor: "#39E09B",
+ outlineWidth: 8,
+ outlineOpacity: 0.8,
+ arcType: Cesium.ArcType.GEODESIC,
+ clampToGround: true,
+ },
+ },
+ zIndex: 99999999999,
+ });
+ map.addLayer(geoJsonLayer);
+ // return
}
//geojson 鍚勮鏀垮尯杈圭晫绾�
geoJsonLayer = new mars3d.layer.GeoJsonLayer({
diff --git a/js/index.js b/js/index.js
index 06d83d9..9a9c7e8 100644
--- a/js/index.js
+++ b/js/index.js
@@ -104,24 +104,7 @@
map = new mars3d.Map("mars3dContainer", mapOptions);
//涓婃捣杈圭晫閬僵
- geoJsonLayer = new mars3d.layer.GeoJsonLayer({
- url: "data/shanghai.json",
- mask: true, //鏍囪瘑涓洪伄缃╁眰銆愰噸鐐瑰弬鏁般��
- symbol: {
- styleOptions: {
- fill: true,
- color: "rgb(2,26,79)",
- outline: true,
- outlineColor: "#39E09B",
- outlineWidth: 8,
- outlineOpacity: 0.8,
- arcType: Cesium.ArcType.GEODESIC,
- clampToGround: true,
- },
- },
- zIndex: 99999999999,
- });
- map.addLayer(geoJsonLayer);
+
//鏋勯�爓idget
initWidget(map);
diff --git a/widgets/manageLayers_style/view.js b/widgets/manageLayers_style/view.js
index 3421312..862ef55 100644
--- a/widgets/manageLayers_style/view.js
+++ b/widgets/manageLayers_style/view.js
@@ -1,4 +1,4 @@
-锘�"use script"; //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
+"use script"; //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
//瀵瑰簲widget.js涓璏yWidget瀹炰緥鍖栧悗鐨勫璞�
var thisWidget;
diff --git a/widgetsTS/taxiRouteReplay/widget.js b/widgetsTS/taxiRouteReplay/widget.js
index 0b9bebb..300d329 100644
--- a/widgetsTS/taxiRouteReplay/widget.js
+++ b/widgetsTS/taxiRouteReplay/widget.js
@@ -13,7 +13,7 @@
}
reloadData(new_taxi_sn) {
- // this.viewWindow.resetStartQueryTaxiDataText(new_taxi_sn);
+ this.viewWindow.resetStartQueryTaxiDataText(new_taxi_sn);
this.taxi_sn = new_taxi_sn;
if (this.startGraphic) {
@@ -86,20 +86,27 @@
addTaxiPointInfoGraphic() {
var Pointsdata = mars3d.global_variables.singleTaxiReplayData;
- var points = [];
for (var i = 0, len = Pointsdata.length; i < len; i++) {
var item = Pointsdata[i];
- var lng = Number(item["lon"]); //缁忓害
- var lat = Number(item["lat"]); //绾害
+ // var lng = Number(item["lon"]); //缁忓害
+ // var lat = Number(item["lat"]); //绾害
// var position = null;
// if (lng && lat) {
- // //position = Cesium.Cartesian3.fromDegrees(lng, lat);
+ // position = Cesium.Cartesian3.fromDegrees(lng, lat);
// }
- points[Pointsdata.length] = [lng, lat];
-
+ let keys = ["lon","lat"]
+ let array = []
+ Pointsdata.map(item => {
+ array.push(keys.reduce((result, key) => ({ ...result, [key]: item[key] }), {}))
+ })
+ let points = []
+ array.map(item => {
+ points.push(Object.values(item))
+ })
item = changeNullAndundefinedToEmpty(item)
+ //points[Pointsdata.length] = [lon,lat]
var CorridorPrimitive = new mars3d.graphic.CorridorPrimitive({
- position: points,
+ positions: points,
style: {
with: 50,
height: 0,
@@ -173,7 +180,7 @@
this.appDateHourEnd = mars3d.global_variables.queryDataTEnd;
this.nodejs_url_predix = mars3d.global_variables.nodejs_url_predix;
this.taxi_sn = this.config.params;
- // this.viewWindow.resetStartQueryTaxiDataText(this.taxi_sn);
+ this.viewWindow.resetStartQueryTaxiDataText(this.taxi_sn);
}
//鎵撳紑婵�娲�
--
Gitblit v1.9.1