From f7462de5fcbea711f60fd4ed2ecd2bf7acdc34c6 Mon Sep 17 00:00:00 2001
From: lc <lc@qq.com>
Date: 星期二, 05 七月 2022 11:53:10 +0800
Subject: [PATCH] pull agin
---
gltf/80.gltf | 0
js/function.js | 4 +-
mobile/road_show.html | 10 ++--
js/changable_params.js | 5 +-
data/liaocheng.geojson | 1
js/function_1001.js | 47 ++++++++++++++++++++++-
js/function_1004.js | 5 ++
gltf/800dd4f7.gltf | 0
widgetsTS/taxi_layer/widget.js | 2
config/config.json | 2
gltf/www.gltf | 0
11 files changed, 62 insertions(+), 14 deletions(-)
diff --git a/config/config.json b/config/config.json
index f603240..48bcb25 100644
--- a/config/config.json
+++ b/config/config.json
@@ -5,7 +5,7 @@
"gltfServerUrl": "//data.mars3d.cn/gltf"
},
"scene": {
- "center": {"lat":30.688954,"lng":121.481242,"alt":49845,"heading":359,"pitch":-40},
+ "center": {"lat":36.341364,"lng":115.99886,"alt":20419,"heading":2,"pitch":-57},
"scene3DOnly": false,
"shadows": false,
"removeDblClick": true,
diff --git a/data/liaocheng.geojson b/data/liaocheng.geojson
new file mode 100644
index 0000000..a5dafea
--- /dev/null
+++ b/data/liaocheng.geojson
@@ -0,0 +1 @@
+{"type": "FeatureCollection","features": [{ "type": "Feature", "properties": { "NAME": "鑱婂煄甯�" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 116.32506199981151, 36.969410000271353 ], [ 116.371552999771211, 36.965256000264276 ], [ 116.389993000276831, 36.974895999650698 ], [ 116.421746999624361, 36.97536999992559 ], [ 116.460959000257731, 36.943157000095539 ], [ 116.436708999820553, 36.922848999781593 ], [ 116.446725000358583, 36.893459999779225 ], [ 116.427553000270791, 36.905383000125425 ], [ 116.414283999906729, 36.900267999868333 ], [ 116.412234999845396, 36.88226000039873 ], [ 116.421554999763543, 36.864800000119942 ], [ 116.408044999976823, 36.854479999952105 ], [ 116.381089999803748, 36.79456499967506 ], [ 116.39952700017102, 36.750304000029644 ], [ 116.379615000132162, 36.725230000264332 ], [ 116.401406999633423, 36.706164999715043 ], [ 116.40525399987223, 36.656081000437894 ], [ 116.397864999969784, 36.623765000354524 ], [ 116.406567000167001, 36.601206999703322 ], [ 116.395699999955127, 36.572822000135261 ], [ 116.392356000429118, 36.527723999662896 ], [ 116.45561000000157, 36.479863000377236 ], [ 116.449808999585684, 36.453621999855443 ], [ 116.498309999606818, 36.444133000237798 ], [ 116.50787900021578, 36.425283999756857 ], [ 116.538654000281895, 36.417364999695053 ], [ 116.54008999995358, 36.408480000052009 ], [ 116.497193000256857, 36.374670000320293 ], [ 116.477875999777666, 36.340020999669434 ], [ 116.44576600020082, 36.342043000284264 ], [ 116.432187999976236, 36.320806000296727 ], [ 116.400360999960185, 36.321620000062978 ], [ 116.321885999939013, 36.29248099989826 ], [ 116.275327999587603, 36.227578999871014 ], [ 116.218596000405114, 36.171516000063377 ], [ 116.160924000142586, 36.171546999694328 ], [ 116.157717999785973, 36.142929000173297 ], [ 116.120307000367802, 36.137627000285875 ], [ 116.093739000054825, 36.111831999647109 ], [ 116.051767999893286, 36.104807000342817 ], [ 116.018760000273801, 36.067964000138545 ], [ 115.987160999980233, 36.045983000015497 ], [ 115.944715000396968, 36.037286000048937 ], [ 115.913217000264467, 36.018705000235627 ], [ 115.885051000003727, 36.024235999891516 ], [ 115.853598000147599, 36.003296000110367 ], [ 115.830831999797056, 36.01139999971025 ], [ 115.803676000247265, 36.008563000182392 ], [ 115.786888000380941, 35.986165999761113 ], [ 115.772614999582629, 35.98467999958234 ], [ 115.778792000250633, 35.976853000165875 ], [ 115.762683000220363, 35.959398000117687 ], [ 115.726523000036536, 35.947157000395293 ], [ 115.695283000110408, 35.947619000116788 ], [ 115.686322999706704, 35.932816000058381 ], [ 115.648277999829929, 35.928253000075927 ], [ 115.637112000218735, 35.918954000226961 ], [ 115.588733999574515, 35.922584000351378 ], [ 115.535494000447784, 35.891786000123886 ], [ 115.497657000270351, 35.882304999975815 ], [ 115.500099999615372, 35.918258999653176 ], [ 115.489360999910332, 35.915635000055261 ], [ 115.478842999604808, 35.906009000415111 ], [ 115.488057000030608, 35.878242999714701 ], [ 115.446062999707692, 35.860643000174377 ], [ 115.401473000178839, 35.809145000441447 ], [ 115.35718600023381, 35.779125000118711 ], [ 115.329103000203304, 35.796710999912762 ], [ 115.338192000260619, 35.837238000033722 ], [ 115.334569999605833, 35.866964000288419 ], [ 115.358971999857999, 35.896583000105409 ], [ 115.360993000426674, 35.923179999957085 ], [ 115.347386999810283, 35.939099000218732 ], [ 115.356481000098142, 35.970669000074338 ], [ 115.381246000002989, 35.974351999944872 ], [ 115.387555999609731, 35.989604000024656 ], [ 115.404072000422502, 35.99999099968494 ], [ 115.440966000280696, 36.010934999850406 ], [ 115.443836999577911, 36.058880000311831 ], [ 115.474897000196506, 36.110451999859947 ], [ 115.479236999787759, 36.139567999863345 ], [ 115.464518000005796, 36.258984000211512 ], [ 115.42178199963962, 36.283643999770845 ], [ 115.413484000086555, 36.322801999712567 ], [ 115.397147000333916, 36.324958000211609 ], [ 115.372335000060275, 36.318805999797121 ], [ 115.364170000345325, 36.308194999699538 ], [ 115.350655000328061, 36.30925800015666 ], [ 115.351064000303381, 36.318822999681743 ], [ 115.366877000173531, 36.329416999894704 ], [ 115.339385000417451, 36.36094999984266 ], [ 115.336421999575691, 36.398358000021744 ], [ 115.288609999851701, 36.411892000015825 ], [ 115.304197000091563, 36.438826000119889 ], [ 115.30047900040563, 36.461439999756237 ], [ 115.287163999718928, 36.459621000408902 ], [ 115.277301999987344, 36.48700299958881 ], [ 115.290024000307426, 36.506696000320233 ], [ 115.289604999870903, 36.520872000242662 ], [ 115.320669999820666, 36.546788000166146 ], [ 115.329476000317186, 36.581253000425704 ], [ 115.342814000266003, 36.58420299976865 ], [ 115.344471000236581, 36.594608000259029 ], [ 115.334769999835657, 36.599541000217016 ], [ 115.371049000111384, 36.631689999793707 ], [ 115.38243900015982, 36.655536999632886 ], [ 115.401156999995578, 36.664176999668825 ], [ 115.410456999890698, 36.683641999778501 ], [ 115.43853999992109, 36.694106000291754 ], [ 115.472470999836787, 36.757107999934306 ], [ 115.499030999780871, 36.769067000142002 ], [ 115.520371000021669, 36.762762999912582 ], [ 115.522029000038401, 36.773428999848534 ], [ 115.570568000013282, 36.775036000211287 ], [ 115.653799999970033, 36.810491000259503 ], [ 115.67725799985692, 36.813601999832485 ], [ 115.683915000177194, 36.845964000238496 ], [ 115.704876000027411, 36.880879999712249 ], [ 115.752800999566489, 36.916133000337766 ], [ 115.842139999661299, 36.911773999870263 ], [ 115.852757000035581, 36.903517999556072 ], [ 115.880086000368692, 36.907842000208177 ], [ 115.910592999767232, 36.891311999649133 ], [ 115.938282999660714, 36.892141000107131 ], [ 115.948542999759638, 36.88462999997455 ], [ 116.020105000245621, 36.893176000172332 ], [ 116.085736999762844, 36.883348000210106 ], [ 116.105239999826154, 36.894040999592505 ], [ 116.120048000115162, 36.892129999599831 ], [ 116.16420999969182, 36.920700999651444 ], [ 116.167034999565658, 36.947137000172461 ], [ 116.178836999727764, 36.961801000116111 ], [ 116.202035000215119, 36.965413000309752 ], [ 116.221435000025281, 36.996834999635553 ], [ 116.219721000124082, 37.022608000159153 ], [ 116.291621000009172, 36.997322999656774 ], [ 116.32506199981151, 36.969410000271353 ] ] ] ] } }]}
diff --git a/gltf/benchi.gltf b/gltf/80.gltf
similarity index 100%
rename from gltf/benchi.gltf
rename to gltf/80.gltf
diff --git a/gltf/TX23fe9f.gltf b/gltf/800dd4f7.gltf
similarity index 100%
rename from gltf/TX23fe9f.gltf
rename to gltf/800dd4f7.gltf
diff --git a/gltf/BS.gltf b/gltf/www.gltf
similarity index 100%
rename from gltf/BS.gltf
rename to gltf/www.gltf
diff --git a/js/changable_params.js b/js/changable_params.js
index 06642a8..64c57fe 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -56,9 +56,8 @@
// var default_system_params = { geoserver_url_predix: 'http://58.246.27.194:7011/', nodejs_url_predix: 'http://58.246.27.194:7012/', userid: 13, 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,timetype:"min"};
-var default_system_params = { geoserver_url_predix: 'http://202.110.241.134:20212', nodejs_url_predix: 'http://202.110.241.134:20213', userid: 13, 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:0,timetype:"min"};
-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}};
-
+var default_system_params = { geoserver_url_predix: 'http://202.110.241.134:20212/', nodejs_url_predix: 'http://202.110.241.134:20213/', 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:0,timetype:"min"};
+var default_grid_camerview = {grid5000:{"lat":36.341364,"lng":115.99886,"alt":20419,"heading":2,"pitch":-57},grid3000:{"lat":36.40102,"lng":116.001437,"alt":10206,"heading":2,"pitch":-57},grid1000:{"lat":36.430852,"lng":116.002726,"alt":5102,"heading":2,"pitch":-57},grid500:{"lat":36.445786,"lng":116.003372,"alt":2551,"heading":2,"pitch":-57}};
function bindPopupFunction(event) {
let layerid = event.layer.options.id;
diff --git a/js/function.js b/js/function.js
index 22f4b4e..c09940d 100644
--- a/js/function.js
+++ b/js/function.js
@@ -135,7 +135,7 @@
// console.log(layer.name + ":" + layer.type);
if ([layer.type] == 'wms') {
- layer.options.layers = "konglu_58:" + layer.options.geoname_prefix + mars3d.global_variables.queryDataType;
+ layer.options.layers = "konglu_demo:" + layer.options.geoname_prefix + mars3d.global_variables.queryDataType;
layer.options.parameters.viewparams = "userid:" + mars3d.global_variables.userid + ";regiontype:" + layer.options.regiontype + ";datetime:" + mars3d.global_variables.queryDataTStartGeo
layer.options.getFeatureInfoParameters.viewparams = "userid:" + mars3d.global_variables.userid + ";regiontype:" + layer.options.regiontype + ";datetime:" + mars3d.global_variables.queryDataTStartGeo
layer.reload();
@@ -236,7 +236,7 @@
}
//geojson 鍚勮鏀垮尯杈圭晫绾�
geoJsonLayer = new mars3d.layer.GeoJsonLayer({
- url: "./data/"+regionCode+".geojson",
+ url: "./data/liaocheng.geojson",
mask: true, //鏍囪瘑涓洪伄缃╁眰銆愰噸鐐瑰弬鏁般��
symbol: {
styleOptions: {
diff --git a/js/function_1001.js b/js/function_1001.js
index 967c708..54f3705 100644
--- a/js/function_1001.js
+++ b/js/function_1001.js
@@ -5,6 +5,48 @@
// for change color locally.
var data_list_1001;
+const graphicLayer = new this.mars3d.layer.GraphicLayer()
+ map.addLayer(graphicLayer)
+
+
+// 鑱婂煄杈圭晫
+const maskLayer = new this.mars3d.layer.GeoJsonLayer({
+ id: 300,
+ url: "/data/liaocheng.geojson",
+ mask: true,
+ symbol: {
+ styleOptions: {
+ fill: true,
+ color: "#111111",
+ opacity: 0.9,
+ outline: false,
+ outlineColor: "#39E09B",
+ outlineWidth: 8,
+ outlineOpacity: 0.8,
+ arcType: Cesium.ArcType.GEODESIC,
+ clampToGround: true,
+ },
+ },
+ show: true,
+ flyTo: false
+});
+// 杈圭晫澧�
+const graphic = new this.mars3d.graphic.WallEntity({
+ positions: this.liaocheng_boundary,
+ style: {
+ diffHeight: 1500,
+ material: this.mars3d.MaterialUtil.createMaterialProperty(this.mars3d.MaterialType.LineFlow, {
+ image: "img/textures/fence.png",
+ color: "#bdf700",
+ repeat: new Cesium.Cartesian2(5, 1),
+ axisY: true, // 鏂瑰悜锛宼rue鏃朵笂涓嬶紝false宸﹀彸
+ speed: 15
+ })
+ }
+})
+graphicLayer.addGraphic(graphic)
+
+map.addLayer(maskLayer);
function addWMSLayer(item) {
@@ -13,8 +55,8 @@
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,
+ url: mars3d.global_variables.geoserver_url_predix + "geoserver/konglu_demo/wms",
+ layers: "konglu_demo:" + item.geoname_prefix + mars3d.global_variables.queryDataType,
crs: "EPSG:4326",
parameters: {
"styles": item.style_prefix + item.style_selected,
@@ -85,6 +127,7 @@
map.addLayer(wmsLyer);
+
}
function addGuokongLayerDIV(item) {
diff --git a/js/function_1004.js b/js/function_1004.js
index f448def..cde355a 100644
--- a/js/function_1004.js
+++ b/js/function_1004.js
@@ -6,6 +6,11 @@
var taxi_layer;
+
+
+
+
+
function addTaxiLayer(item) {
taxi_layer = new mars3d.layer.GraphicLayer({
diff --git a/mobile/road_show.html b/mobile/road_show.html
index 9d1967b..ea8e2d1 100644
--- a/mobile/road_show.html
+++ b/mobile/road_show.html
@@ -442,12 +442,12 @@
var untiled = new ol.layer.Image({
source: new ol.source.ImageWMS({
ratio: 1,
- url: default_system_params.geoserver_url_predix + 'geoserver/konglu_58/wms',
+ url: default_system_params.geoserver_url_predix + 'geoserver/konglu_demo/wms',
params: {
'FORMAT': 'image/png',
'VERSION': '1.1.1',
"STYLES": 'polyline_road_pm25',
- "LAYERS": 'konglu_58:vis_roadsection_' + getFormParams().querytype_,
+ "LAYERS": 'konglu_demo:vis_roadsection_' + getFormParams().querytype_,
"exceptions": 'application/vnd.ogc.se_inimage',
"BBOX": '120.84686279296875,30.25909423828125,121.98394775390625,32.00592041015625'
}
@@ -458,13 +458,13 @@
var tiled = new ol.layer.Tile({
visible: false,
source: new ol.source.TileWMS({
- url: default_system_params.geoserver_url_predix + 'geoserver/konglu_58/wms',
+ url: default_system_params.geoserver_url_predix + 'geoserver/konglu_demo/wms',
params: {
'FORMAT': 'image/png',
'VERSION': '1.1.1',
tiled: true,
"STYLES": 'polyline_road_pm25',
- "LAYERS": 'konglu_58:vis_roadsection_' + getFormParams().querytype_,
+ "LAYERS": 'konglu_demo:vis_roadsection_' + getFormParams().querytype_,
"exceptions": 'application/vnd.ogc.se_inimage',
"BBOX": '120.84686279296875,30.25909423828125,121.98394775390625,32.00592041015625',
tilesOrigin: 120 + "," + 30
@@ -604,7 +604,7 @@
'FILTER': null,
'CQL_FILTER': null,
'FEATUREID': null,
- "LAYERS": 'konglu_58:vis_roadsection_' + formPrams.querytype_,
+ "LAYERS": 'konglu_demo:vis_roadsection_' + formPrams.querytype_,
"viewparams": 'userid:'+userid+';regiontype:1005;datetime:' + formPrams.datatime_+';querytype:'+formPrams.querytype_,
};
if (filter.replace(/^\s\s*/, '').replace(/\s\s*$/, '') != "") {
diff --git a/widgetsTS/taxi_layer/widget.js b/widgetsTS/taxi_layer/widget.js
index f05b98e..29af49d 100644
--- a/widgetsTS/taxi_layer/widget.js
+++ b/widgetsTS/taxi_layer/widget.js
@@ -20,7 +20,7 @@
attr: result.data.result[0],
style: {
url: "gltf/" + (item["code"]).substring(0, 2) + ".gltf",
- scale: 0.5,
+ scale: 100,
minimumPixelSize: 20,
highlight: {
type: mars3d.EventType.click,
--
Gitblit v1.9.1