Skip to content

Commit 95477c2

Browse files
committed
【feature】 新增 fire layer 范例 review by songym
1 parent e5ec8c3 commit 95477c2

12 files changed

+1118
-532
lines changed

dist/mapboxgl/iclient9-mapboxgl-es6.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65063,7 +65063,7 @@ var MapExtend_MapExtend = function () {
6506365063
external_mapboxgl_default.a.Map.prototype.overlayLayersManager = {};
6506465064
external_mapboxgl_default.a.Map.prototype.addLayerBak = external_mapboxgl_default.a.Map.prototype.addLayer;
6506565065
external_mapboxgl_default.a.Map.prototype.addLayer = function (layer, before) {
65066-
if (layer.source) {
65066+
if (layer.source || layer.type === 'custom') {
6506765067
this.addLayerBak(layer, before);
6506865068
return this;
6506965069
}

dist/mapboxgl/iclient9-mapboxgl-es6.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/mapboxgl/iclient9-mapboxgl-vue.js

Lines changed: 1010 additions & 520 deletions
Large diffs are not rendered by default.

dist/mapboxgl/iclient9-mapboxgl-vue.min.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/mapboxgl/iclient9-mapboxgl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30018,7 +30018,7 @@ var MapExtend = exports.MapExtend = function () {
3001830018
_mapboxGl2.default.Map.prototype.overlayLayersManager = {};
3001930019
_mapboxGl2.default.Map.prototype.addLayerBak = _mapboxGl2.default.Map.prototype.addLayer;
3002030020
_mapboxGl2.default.Map.prototype.addLayer = function (layer, before) {
30021-
if (layer.source) {
30021+
if (layer.source || layer.type === 'custom') {
3002230022
this.addLayerBak(layer, before);
3002330023
return this;
3002430024
}

dist/mapboxgl/iclient9-mapboxgl.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/locales/en-US/resources.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,7 @@ window.examplesResources = {
558558
"title_componentsRankSymbolTheme_Vue": 'RankSymbolTheme Layer component(Vue)',
559559
"title_componentsLabelTheme_Vue": 'LabelTheme Layer component(Vue)',
560560
"title_componentsDataFlow_Vue": 'Data FLow Layer component(Vue)',
561+
'title_componentsFireLayer_Vue': 'Dynamic Fire Layer component(Vue)',
561562

562563
"text_code": "Forward Match",
563564
"text_decode": "Reverse Match",

examples/locales/zh-CN/resources.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ window.examplesResources = {
506506
"title_componentsRankSymbolTheme_Vue": '等级符号专题图图层组件',
507507
"title_componentsLabelTheme_Vue": '标签专题图图层组件',
508508
"title_componentsDataFlow_Vue": '数据流图层组件',
509+
'title_componentsFireLayer_Vue': '动态火焰图层',
509510

510511
"text_code": "正向匹配",
511512
"text_decode": "反向匹配",
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2019 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
4+
<!DOCTYPE html>
5+
<html>
6+
<head>
7+
<meta charset="UTF-8" />
8+
<title data-i18n="resources.title_componentsFireLayer_Vue"></title>
9+
<script type="text/javascript" include="vue,jquery" src="../js/include-web.js"></script>
10+
<script
11+
type="text/javascript"
12+
include="three,mapbox-gl-enhance,iclient9-mapboxgl-vue"
13+
src="../../dist/mapboxgl/include-mapboxgl.js"
14+
></script>
15+
<style>
16+
#main {
17+
margin: 0 auto;
18+
width: 100%;
19+
height: 100%;
20+
}
21+
</style>
22+
</head>
23+
24+
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
25+
<div id="main">
26+
<sm-web-map :map-options="mapOptions" style="background:black">
27+
<sm-fire-layer :features="features" :model-scale='5.41843220338983e-6'></sm-fire-layer>
28+
</sm-web-map>
29+
</div>
30+
<script>
31+
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
32+
var url = host + "/iserver/services/data-jingjin/rest/data";
33+
var sqlParam = new SuperMap.GetFeaturesBySQLParameters({
34+
queryParameter: {
35+
attributeFilter: "SmID>0"
36+
},
37+
datasetNames: ["Jingjin:Town_P"],
38+
fromIndex: 0,
39+
toIndex: 5
40+
});
41+
42+
new mapboxgl.supermap.FeatureService(url).getFeaturesBySQL(sqlParam, function(serviceResult) {
43+
var features = serviceResult.result.features;
44+
new Vue({
45+
el: "#main",
46+
data() {
47+
var mapUrl = host + "/iserver/services/map-china400/rest/maps/ChinaDark";
48+
var attribution =
49+
"<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
50+
" with <span>© <a href='http://iclient.supermap.io' target='_blank'>SuperMap iClient</a> | </span>" +
51+
" Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> ";
52+
return {
53+
mapOptions: {
54+
container: "map",
55+
style: {
56+
version: 8,
57+
sources: {
58+
"raster-tiles": {
59+
attribution: attribution,
60+
type: "raster",
61+
tiles: [mapUrl + "/zxyTileImage.png?z={z}&x={x}&y={y}"],
62+
tileSize: 256
63+
}
64+
},
65+
layers: [
66+
{
67+
id: "simple-tiles",
68+
type: "raster",
69+
source: "raster-tiles",
70+
minzoom: 0,
71+
maxzoom: 22
72+
}
73+
]
74+
},
75+
center: [116.3850255890805, 39.90519670197787],
76+
zoom: 13,
77+
bearing: 0.8568,
78+
pitch: 60
79+
},
80+
features: features
81+
};
82+
}
83+
});
84+
});
85+
</script>
86+
</body>
87+
</html>

examples/mapboxgl/config.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1328,7 +1328,14 @@ var exampleConfig = {
13281328
version: "10.0.0",
13291329
thumbnail: "components_dataflow_vue.gif",
13301330
fileName: "components_dataflow_vue"
1331-
}
1331+
},
1332+
{
1333+
name: "动态火焰图层",
1334+
name_en: "Dynamic Fire Layer",
1335+
version: "10.0.0",
1336+
thumbnail: "components_fire_layer_vue.gif",
1337+
fileName: "component_fire_layer_vue"
1338+
},
13321339
]
13331340
},
13341341
chart_vue: {
Loading

src/mapboxgl/core/MapExtend.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export var MapExtend = function () {
1414
mapboxgl.Map.prototype.overlayLayersManager = {};
1515
mapboxgl.Map.prototype.addLayerBak = mapboxgl.Map.prototype.addLayer;
1616
mapboxgl.Map.prototype.addLayer = function (layer, before) {
17-
if (layer.source) {
17+
if (layer.source || layer.type === 'custom') {
1818
this.addLayerBak(layer, before);
1919
return this;
2020
}

0 commit comments

Comments
 (0)