FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge pull request #143 from MapGIS/10.6.0.10_prerelease · MapGIS/WebClient-JavaScript@293f0a7 · GitHub

Merge pull request #143 from MapGIS/10.6.0.10_prerelease · MapGIS/WebClient-JavaScript@293f0a7 · GitHub
Skip to content

Navigation Menu

Sign in
Sign in
Sign up

Commit 293f0a7

Browse files
mayuanye2008
authored
Merge pull request #143 from MapGIS/10.6.0.10_prerelease
10.6.0.10 prerelease
2 parents 3478419 + e9435c3 commit 293f0a7

240 files changed

Lines changed: 52607 additions & 539 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/jsdoc-config/leaflet/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
1. `移动设备`的支持-内部代码框架设计的时候考虑到移动设备的支持.针对移动设备天然支持.
1717

1818

19-
* 官网(website)：[http://client.snanyun.com:8899/ui/index.html](http://client.snanyun.com:8899/ui/index.html)
19+
* 官网(website)：[http://develop.smaryun.com/#/index](http://develop.smaryun.com/#/index)
2020

2121
* 源码(source code)：[https://github.com/ParnDeedlit/WebClient-Leaflet](https://github.com/ParnDeedlit/WebClient-Leaflet)
2222

‎docs/jsdoc-config/mapboxgl/index.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
77
#### MapboxGL 优点
88

9-
> leaflet是常规的的最适合常规gis开发的地图，因此核心功能就是`传统GIS`功能.
9+
> MapboxGL是最适合常规gis开发的地图，因此核心功能就是`传统GIS`功能.
1010
1111
1. `高效矢量瓦片`-真正高效实用的矢量瓦片
1212
1. 顶级可视化-真正`顶级的可视化渲染`，mapboxGL,echartGL，KeplerGl等。
1313
1. `高清矢量图形`- 真正顶级的高清矢量图形绘制SVG，Canvas.
1414
1. Top级互联网技术加持 - 国内Baidu，国外Uber，Mapbox等顶级可视化巨头技术加持.
1515

16-
17-
18-
* 官网(website)：[http://client.snanyun.com:8899/ui/index.html](http://client.snanyun.com:8899/ui/index.html)
16+
* 官网(website)：[http://develop.smaryun.com/#/index](http://develop.smaryun.com/#/index)
1917

2018
* 源码(source code)：[https://github.com/ParnDeedlit/WebClient-MapboxGL](https://github.com/ParnDeedlit/WebClient-mapboxgl)
2119

‎docs/jsdoc-config/openlayers/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
1. 兼容性 - 兼容老的ie6789等疑难浏览器问题.
1515

1616

17-
* 官网(website)：[http://client.snanyun.com:8899/ui/index.html](http://client.snanyun.com:8899/ui/index.html)
17+
* 官网(website)：[http://develop.smaryun.com/#/index](http://develop.smaryun.com/#/index)
1818

1919
* 源码(source code)：[https://github.com/ParnDeedlit/WebClient-openlayers](https://github.com/ParnDeedlit/WebClient-openlayers)
2020

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
"proj4": "2.3.15",
9999
"promise-polyfill": "^8.2.3",
100100
"qs": "^6.9.4",
101-
"webfont-matcher": "^1.1.0"
101+
"webfont-matcher": "^1.1.0",
102+
"svg-pathdata": "^6.0.0"
102103
}
103104
}

‎src/cesiumjs/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,4 +453,4 @@ export {
453453
WMTSCapabilities,
454454
OGCWMTSInfo,
455455
OGCWMSInfo
456-
};
456+
};

‎src/cesiumjs/layer/ThirdPartyLayer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export default class ThirdPartyLayer extends BaseLayer {
140140
* let tilelayer = thirdLayer.appendBaiduMap({ptype:'sate'});
141141
*/
142142
appendBaiduMap(optionsParam) {
143-
const baiduProvider = this.viewer.imageryLayers.addImageryProvider(new Cesium.BaiduMapProvider(optionsParam));
143+
const baiduProvider = this.viewer.imageryLayers.addImageryProvider(new Cesium.BaiduMapImagerProvider(optionsParam));
144144
return baiduProvider;
145145
}
146146

‎src/leaflet/layer/MapLayer.js‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {newGuid} from '../../service/common/Util';
1+
import { newGuid } from '../../service/common/Util';
22
import { L } from '../core/Base.js';
33

44
/**
@@ -39,7 +39,7 @@ var MapLayer = L.TileLayer.extend({
3939
imageFormat: null,
4040
imageHeight: 512,
4141
imageWidth: 512,
42-
guid:null,
42+
guid: null,
4343
imageTransparent: null,
4444
filters: null,
4545
styles: null,
@@ -69,6 +69,10 @@ var MapLayer = L.TileLayer.extend({
6969
*/
7070
initialize: function (url, options) {
7171
this.url = encodeURI(url + '/image');
72+
var imageHeight = options.imageHeight || 512;
73+
var imageWidth = options.imageWidth || 512;
74+
options.tileSize = window.L.point(imageWidth, imageHeight);
75+
// console.log('maplayer_initialize', options);
7276
L.TileLayer.prototype.initialize.apply(this, arguments);
7377
L.setOptions(this, options);
7478
L.stamp(this);
@@ -93,19 +97,21 @@ var MapLayer = L.TileLayer.extend({
9397
var layerUrl = vm.url + '?';
9498
layerUrl += encodeURI(vm._initAllRequestParams().join('&'));
9599
this._layerUrl = layerUrl;
100+
// console.log('maplayer__initLayerUrl', layerUrl);
96101
},
97102

98103
_initAllRequestParams: function () {
99104
var vm = this,
100105
options = vm.options || {},
101106
params = [];
102107

103-
var imageHeight = this.options.imageHeight;
104-
var imageWidth = this.options.imageWidth;
108+
// console.log('maplayer_initAllRequestParams', options);
109+
var imageHeight = options.imageHeight || 512;
110+
var imageWidth = options.imageWidth || 512;
105111
params.push('size=' + imageWidth + ',' + imageHeight);
106112

107113
var guid = options.guid || newGuid();
108-
params.push("clientId=" + guid);
114+
params.push('clientId=' + guid);
109115

110116
if (options.imageFormat) {
111117
params.push('format=' + options.imageFormat);

‎src/leaflet/overlay/stream/MapvStreamLayer.js‎

Lines changed: 58 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import L from "leaflet";
2-
import { MapvLayer } from "../MapvLayer";
1+
import L from 'leaflet';
2+
import { MapvLayer } from '../MapvLayer';
33

44
/**
55
* @class MapvStreamLayer
@@ -12,70 +12,69 @@ import { MapvLayer } from "../MapvLayer";
1212
* @param {Object} options.field - geojson的唯一标识字段，请确保该字段的唯一性。
1313
*/
1414
export var MapvStreamLayer = MapvLayer.extend({
15-
initialize: function(map, url, options) {
16-
options = options || {};
15+
initialize: function (map, url, options) {
16+
options = options || {};
1717

18-
L.Util.setOptions(this, options);
19-
20-
this.mapvOption = options.mapvOption || {};
21-
this.data = [];
22-
this.lastDate = new Date();
23-
this.url = url;
24-
this.fieldHash = {};
18+
L.Util.setOptions(this, options);
2519

26-
this.fieldDeg = options.fieldDeg;
27-
this.iconUrl = options.iconUrl;
28-
this.timeSpeed = options.timeSpeed || 100;
29-
this.createIcon();
30-
31-
MapvLayer.prototype.initialize.call(this, map, new window.mapv.DataSet([]), this.mapvOption, options)
32-
},
20+
this.mapvOption = options.mapvOption || {};
21+
this.data = [];
22+
this.lastDate = new Date();
23+
this.url = url;
24+
this.fieldHash = {};
3325

34-
onMessage: function(msg) {
35-
const feature = msg.feature;
36-
const field = msg.feature.properties[this.options.field];
26+
this.fieldDeg = options.fieldDeg;
27+
this.iconUrl = options.iconUrl;
28+
this.timeSpeed = options.timeSpeed || 100;
29+
this.createIcon();
3730

38-
let layer = this.parasIcon(feature);
31+
MapvLayer.prototype.initialize.call(this, map, new window.mapv.DataSet([]), this.mapvOption, options);
32+
},
3933

40-
if (field !== undefined && this.fieldHash[field]) {
41-
this.data[this.fieldHash[field]] = layer;
42-
} else {
43-
if (field !== undefined) {
44-
this.data.push(layer);
45-
this.fieldHash[field] = this.data.length - 1;
46-
}
47-
}
34+
onMessage: function (msg) {
35+
const feature = msg.feature;
36+
const field = msg.feature.properties[this.options.field];
37+
38+
let layer = this.parasIcon(feature);
4839

49-
this.updateLayer();
50-
},
40+
if (field !== undefined && this.fieldHash[field]) {
41+
this.data[this.fieldHash[field]] = layer;
42+
} else {
43+
if (field !== undefined) {
44+
this.data.push(layer);
45+
this.fieldHash[field] = this.data.length - 1;
46+
}
47+
}
5148

52-
createIcon: function() {
53-
var iconUrl =
54-
this.iconUrl || "http://client.snanyun.com:8899/img/leaflet/marker/bike.png";
55-
this.icon = new Image();
56-
this.icon.src = iconUrl;
57-
},
49+
this.updateLayer();
50+
},
5851

59-
parasIcon: function(feature) {
60-
this.mapvOption = {
61-
draw: "icon"
62-
};
63-
var deg = feature.properties[this.fieldDeg] || 0;
64-
var icon = {
65-
geometry: {
66-
type: "Point",
67-
coordinates: feature.geometry.coordinates
68-
},
69-
deg: deg,
70-
icon: this.icon
71-
};
72-
return icon;
73-
},
52+
createIcon: function () {
53+
var iconUrl = this.iconUrl || 'http://client.snanyun.com:8899/img/leaflet/marker/bike.png';
54+
this.icon = new Image();
55+
this.icon.src = iconUrl;
56+
},
7457

75-
updateLayer: function() {
76-
var currentDate = new Date();
77-
if (currentDate - this.lastDate < this.timeSpeed) return;
78-
this.updateData(this.data, this.mapvOption);
79-
this.lastDate = currentDate;
80-
}
58+
parasIcon: function (feature) {
59+
this.mapvOption = {
60+
draw: 'icon'
61+
};
62+
var deg = feature.properties[this.fieldDeg] || 0;
63+
var icon = {
64+
geometry: {
65+
type: 'Point',
66+
coordinates: feature.geometry.coordinates
67+
},
68+
deg: deg,
69+
icon: this.icon
70+
};
71+
return icon;
72+
},
73+
74+
updateLayer: function () {
75+
var currentDate = new Date();
76+
if (currentDate - this.lastDate < this.timeSpeed) return;
77+
this.updateData(this.data, this.mapvOption);
78+
this.lastDate = currentDate;
79+
}
8180
});

‎src/mapboxgl/index.js‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,44 @@ export { Common, BaseServer, Extend, MRFS, MRGS, MRFWS , MRMS, MRCS, Info, PostG
77
import { mapboxgl, MapDocLayer, MapTileLayer, MapWmsLayer, MapWMTSLayer, MapVectorLayer, ArcGISLayer, TDTLayer } from './layer';
88
export { mapboxgl, MapDocLayer, MapTileLayer, MapWmsLayer, MapWMTSLayer, MapVectorLayer, ArcGISLayer, TDTLayer };
99

10-
// import {
11-
// GeoFeatureThemeLayer,
12-
// ThemeLayer,
13-
// RangeThemeLayer,
14-
// UniqueThemeLayer,
15-
// GraphThemeLayer,
16-
// graphThemeLayer,
17-
// RandomThemeLayer,
18-
// SimpleThemeLayer,
19-
// RankSymbolThemeLayer,
20-
// ThemeStyle
21-
// } from './theme';
10+
import {
11+
GeoFeatureThemeLayer,
12+
ThemeLayer,
13+
RangeThemeLayer,
14+
UniqueThemeLayer,
15+
GraphThemeLayer,
16+
graphThemeLayer,
17+
RandomThemeLayer,
18+
SimpleThemeLayer,
19+
RankSymbolThemeLayer,
20+
ThemeStyle
21+
} from './theme';
2222

23-
// export {
24-
// GeoFeatureThemeLayer,
25-
// ThemeLayer,
26-
// RangeThemeLayer,
27-
// UniqueThemeLayer,
28-
// GraphThemeLayer,
29-
// graphThemeLayer,
30-
// RandomThemeLayer,
31-
// SimpleThemeLayer,
32-
// RankSymbolThemeLayer,
33-
// ThemeStyle
34-
// };
23+
export {
24+
GeoFeatureThemeLayer,
25+
ThemeLayer,
26+
RangeThemeLayer,
27+
UniqueThemeLayer,
28+
GraphThemeLayer,
29+
graphThemeLayer,
30+
RandomThemeLayer,
31+
SimpleThemeLayer,
32+
RankSymbolThemeLayer,
33+
ThemeStyle
34+
};
3535

3636
import {
3737
EchartsLayer,
3838
MapvLayer,
39-
DeckglLayer
39+
DeckglLayer,
40+
FabricLayer
4041
/* StreamLayer */
4142
} from './overlay/index.js';
4243

4344
export {
4445
EchartsLayer,
4546
MapvLayer,
46-
DeckglLayer
47+
DeckglLayer,
48+
FabricLayer
4749
/* StreamLayer */
4850
};

‎src/mapboxgl/layer/ArcGISLayer.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import {Zondy} from './mapboxBase';
22
//import {Zondy} from '../../service/common/Base';
3-
import {
4-
newGuid,
5-
extend
6-
} from '../../service/common/Util';
3+
import { newGuid, extend } from '../util/Util';
74

85
/**
96
* @author 基础平台/产品2部 龚跃健

0 commit comments

Comments
 (0)

Footer

© 2026 GitHub, Inc.
Back | FazBrowse Home | New Git URL