Skip to content

Commit c6ccab1

Browse files
committed
2 parents 9fbefa7 + 578bf5e commit c6ccab1

Some content is hidden

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

44 files changed

+4838
-1758
lines changed

CHANGELOG.md

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
# 10.0.0 beta #
2+
3+
## 新特性
4+
5+
## API changes
6+
7+
### for MapboxGL
8+
9+
- `SuperMap.GetFeaturesByGeometryParameters``geometry` 参数支持传入 `mapboxgl.LngLatBounds`
10+
11+
- `SuperMap.QueryByGeometryParameters``geometry` 参数支持传入 `mapboxgl.LngLatBounds`
12+
13+
## Fixed
14+
15+
### for Leaflet
16+
17+
- 修复客户端专题图鼠标滑过要素时可能出现的闪动问题
18+
19+
- 修复 `L.supermap.echartsLayer``options` 传入 `pane` 参数无效的问题
20+
21+
### for OpenLayers
22+
23+
- `ol.supermap.WebMap`
24+
25+
- 修复在跨域情况下访问地图失败的问题
26+
27+
- 修正内置的互联网底图最大缩放级别
28+
29+
- 修复访问坐标系为 epsg:0/epsg:-1000/epsg:-1 地图失败的问题
30+
31+
132
# 10.0.0 alpha #
233

334
## 新特性
@@ -15,11 +46,10 @@
1546

1647
### for OpenLayers
1748

18-
- iPortal
1949

20-
- `ol.supermap.WebMap` 新增支持迁徙图、MVT矢量瓦片图层。
50+
- `ol.supermap.WebMap` 新增支持迁徙图、MVT矢量瓦片图层。
2151

22-
- `ol.supermap.MapboxStyles` 新增 `setSelectedObjects` `addSelectedObjects` `removeSelectedObjects` `clearSelectedObjects` 接口,只是设置、增加、移除、清除多个高亮要素。
52+
- `ol.supermap.MapboxStyles` 新增 `setSelectedObjects` `addSelectedObjects` `removeSelectedObjects` `clearSelectedObjects` 接口,支持设置、增加、移除、清除多个高亮要素。
2353

2454
- `ol.supermap.ServiceBase` 及其子类
2555

dist/leaflet/iclient9-leaflet-es6.js

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17942,7 +17942,7 @@ SuperMap.DatasourceConnectionInfo = DatasourceConnectionInfo_DatasourceConnectio
1794217942
* // 设置关联的外部数据库信息,alias表示数据库别名
1794317943
* var dc = new SuperMap.DatasourceConnectionInfo({
1794417944
* dataBase: "RelQuery",
17945-
* server: "192.168.168.39",
17945+
* server: "{ip}:{port}",
1794617946
* user: "sa",
1794717947
* password: "map",
1794817948
* driver: "SQL Server",
@@ -19670,7 +19670,7 @@ SuperMap.QueryParameters = QueryParameters_QueryParameters;
1967019670
* 1.通过 AsyncResponder 类获取(推荐使用);
1967119671
* 2.通过监听 QueryEvent.PROCESS_COMPLETE 事件获取。
1967219672
* @extends {SuperMap.CommonServiceBase}
19673-
* @param {string} url - 地图查询服务访问地址。如:"http://192.168.168.35:8090/iserver/services/map-ChartW/rest/maps/海图"。
19673+
* @param {string} url - 地图查询服务访问地址。如:"http://localhost:8090/iserver/services/map-ChartW/rest/maps/海图"。
1967419674
* @param {Object} options - 参数。
1967519675
* @param {Object} options.eventListeners - 事件监听器对象。有processCompleted属性可传入处理完成后的回调函数。processFailed属性传入处理失败后的回调函数。
1967619676
* @param {SuperMap.ServerType} [options.serverType=SuperMap.ServerType.ISERVER] - 服务器类型,iServer|iPortal|Online。
@@ -68622,7 +68622,18 @@ external_L_default.a.Control.Attribution.include({
6862268622
prefix: core_Attributions.Prefix
6862368623
}
6862468624
});
68625-
68625+
external_L_default.a.Map.include({
68626+
/*
68627+
* 获取精确的像素坐标.
68628+
* 当需要绘制比较平滑的曲线的时候可调用此方法代替latLngToContainerPoint
68629+
* @param latlng
68630+
*/
68631+
latLngToAccurateContainerPoint: function (latlng) {
68632+
var projectedPoint = this.project(external_L_default.a.latLng(latlng));
68633+
var layerPoint = projectedPoint._subtract(this.getPixelOrigin());
68634+
return external_L_default.a.point(layerPoint).add(this._getMapPanePos());
68635+
}
68636+
});
6862668637
Base_wrapToGeoJSON([external_L_default.a.Polyline, external_L_default.a.Polygon, external_L_default.a.Marker, external_L_default.a.CircleMarker, external_L_default.a.Circle, external_L_default.a.LayerGroup]);
6862768638

6862868639
function Base_wrapToGeoJSON(objClassArray) {
@@ -72139,7 +72150,7 @@ var ThemeLayer_ThemeLayer = external_L_default.a.Layer.extend({
7213972150
}
7214072151

7214172152
}
72142-
var point = this._map.latLngToContainerPoint(!this.options.alwaysMapCRS ? external_L_default.a.latLng(coor.y, coor.x) : this._map.options.crs.unproject(coor));
72153+
var point = this._map.latLngToAccurateContainerPoint(!this.options.alwaysMapCRS ? external_L_default.a.latLng(coor.y, coor.x) : this._map.options.crs.unproject(coor));
7214372154
return [point.x, point.y];
7214472155
},
7214572156

@@ -76302,19 +76313,6 @@ var MapVLayer_mapVLayer = function (dataSet, mapVOptions, options) {
7630276313
return new MapVLayer_MapVLayer(dataSet, mapVOptions, options);
7630376314
};
7630476315

76305-
external_L_default.a.Map.include({
76306-
/*
76307-
* 获取精确的像素坐标.
76308-
* 当需要绘制比较平滑的曲线的时候可调用此方法代替latLngToContainerPoint
76309-
* @param latlng
76310-
*/
76311-
latLngToAccurateContainerPoint: function (latlng) {
76312-
var projectedPoint = this.project(external_L_default.a.latLng(latlng));
76313-
var layerPoint = projectedPoint._subtract(this.getPixelOrigin());
76314-
return external_L_default.a.point(layerPoint).add(this._getMapPanePos());
76315-
}
76316-
});
76317-
7631876316
external_L_default.a.supermap.mapVLayer = MapVLayer_mapVLayer;
7631976317
// CONCATENATED MODULE: ./src/leaflet/overlay/dataflow/MapvRenderer.js
7632076318
/* Copyright© 2000 - 2019 SuperMap Software Co.Ltd. All rights reserved.
@@ -90047,7 +90045,7 @@ function readTile(tag, layers, pbf) {
9004790045

9004890046
exports.read = function (buffer, offset, isLE, mLen, nBytes) {
9004990047
var e, m
90050-
var eLen = nBytes * 8 - mLen - 1
90048+
var eLen = (nBytes * 8) - mLen - 1
9005190049
var eMax = (1 << eLen) - 1
9005290050
var eBias = eMax >> 1
9005390051
var nBits = -7
@@ -90060,12 +90058,12 @@ exports.read = function (buffer, offset, isLE, mLen, nBytes) {
9006090058
e = s & ((1 << (-nBits)) - 1)
9006190059
s >>= (-nBits)
9006290060
nBits += eLen
90063-
for (; nBits > 0; e = e * 256 + buffer[offset + i], i += d, nBits -= 8) {}
90061+
for (; nBits > 0; e = (e * 256) + buffer[offset + i], i += d, nBits -= 8) {}
9006490062

9006590063
m = e & ((1 << (-nBits)) - 1)
9006690064
e >>= (-nBits)
9006790065
nBits += mLen
90068-
for (; nBits > 0; m = m * 256 + buffer[offset + i], i += d, nBits -= 8) {}
90066+
for (; nBits > 0; m = (m * 256) + buffer[offset + i], i += d, nBits -= 8) {}
9006990067

9007090068
if (e === 0) {
9007190069
e = 1 - eBias
@@ -90080,7 +90078,7 @@ exports.read = function (buffer, offset, isLE, mLen, nBytes) {
9008090078

9008190079
exports.write = function (buffer, value, offset, isLE, mLen, nBytes) {
9008290080
var e, m, c
90083-
var eLen = nBytes * 8 - mLen - 1
90081+
var eLen = (nBytes * 8) - mLen - 1
9008490082
var eMax = (1 << eLen) - 1
9008590083
var eBias = eMax >> 1
9008690084
var rt = (mLen === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0)
@@ -90113,7 +90111,7 @@ exports.write = function (buffer, value, offset, isLE, mLen, nBytes) {
9011390111
m = 0
9011490112
e = eMax
9011590113
} else if (e + eBias >= 1) {
90116-
m = (value * c - 1) * Math.pow(2, mLen)
90114+
m = ((value * c) - 1) * Math.pow(2, mLen)
9011790115
e = e + eBias
9011890116
} else {
9011990117
m = value * Math.pow(2, eBias - 1) * Math.pow(2, mLen)
@@ -92910,7 +92908,7 @@ module.exports = function(proj4){
9291092908
/* 74 */
9291192909
/***/ (function(module) {
9291292910

92913-
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"E:\\git\\SuperMap\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
92911+
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://localhost:4873/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"E:\\2018\\git\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
9291492912

9291592913
/***/ }),
9291692914
/* 75 */

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy