Skip to content

Commit 838e275

Browse files
tangqinGisertangqinGiser
committed
fix ut,fix ol 客户端专题图 addFeatures 方法当传入 ol.Feature 类型数组时 未支持完所有 ol.geom.Geometry 类型的问题。review by songyumeng.
1 parent 9893ce4 commit 838e275

File tree

9 files changed

+96
-186
lines changed

9 files changed

+96
-186
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@
8484

8585
- 废弃 ` L.supermap.ThemeLayer.toFeature` 方法，由 ` L.supermap.ThemeLayer.toiClientFeature` 方法代替
8686

87+
- `L.supermap.ThemeLayer.addFeatures` 方法，支持传入 `L.supermap.ThemeFeature` 类型和 `GeoJOSN` 规范数据类型的 `feature` 数组
88+
8789

8890
### for OpenLayers
8991

@@ -110,8 +112,6 @@
110112
- 新增热力图资源：
111113

112114
- `ol.supermap.HeatMapSource`
113-
114-
- 废弃 `ol.source.Theme` 类的 `toiClientFeature` 接口，改用 `toFeature`接口
115115

116116
- 增加 `ol.style.CloverShape` `ol.style.HitCloverShape` 类，`ol.source.Graphic` 支持三叶草要素风格
117117

@@ -155,6 +155,8 @@
155155

156156
- 废弃 `ol.source.Theme.toFeature` 方法，由 ` ol.source.Theme.toiClientFeature` 方法代替
157157

158+
- `ol.source.Theme.addFeatures` 方法，支持传入 `ol.supermap.ThemeFeature` 类型、`GeoJOSN` 规范数据类型，以及`ol.Feature`类型的 `feature` 数组
159+
158160
### for MapboxGL
159161

160162
- 废弃 `SuperMap.ElasticSearch` 的 `options.change` 参数,直接使用 `SuperMap.ElasticSearch.msearch` `SuperMap.ElasticSearch.msearch` 的 `callback` 参数
@@ -204,6 +206,9 @@
204206

205207
- `mapboxgl.supermap.GraphicLayer` 类新增 `setVisibility` , `moveTo` 接口，支持设置图层的显示、隐藏和移动
206208

209+
- `mapboxgl.supermap.ThemeLayer.addFeatures` 方法，支持传入 `mapboxgl.supermap.ThemeFeature` 类型和 `GeoJOSN` 规范数据类型的 `feature` 数组
210+
211+
207212
### Classic
208213

209214
- 废弃 `SuperMap.ElasticSearch` 的 `options.change` 参数,直接使用 `SuperMap.ElasticSearch.msearch` `SuperMap.ElasticSearch.msearch` 的 `callback` 参数
@@ -232,6 +237,7 @@
232237
- 修复 `ol.source.TileSuperMapRest` 的 `redirect` 参数默认为 `false` 但运行为 `true` 的问题
233238
- 修复请求无法携带cookie问题
234239
- 修复缓冲区分析SRID参数不可用问题
240+
- 修复 `ol.source.Theme.addFeatures` 在传入 `ol.Feature` 数据格式数组时，未支持完所有的 `ol.geom.Geometry` 格式类型的问题
235241

236242
### for MapboxGL
237243

‎dist/iclient9-leaflet.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21584,7 +21584,7 @@ var ThemeLayer = exports.ThemeLayer = _leaflet2["default"].Layer.extend({
2158421584
/**
2158521585
* @function L.supermap.ThemeLayer.prototype.toiClientFeature
2158621586
* @description 转为 iClient 要素
21587-
* @param {L.supermap.themeFeature|Object} features - 待转要素包括 mapboxgl.supermap.ThemeFeature 类型和 GeoJOSN 规范数据类型
21587+
* @param {L.supermap.themeFeature|Object} features - 待转要素包括 L.supermap.ThemeFeature 类型和 GeoJOSN 规范数据类型
2158821588
* @return {SuperMap.Feature.Vector} 转换后的iClient要素
2158921589
*/
2159021590
toiClientFeature: function toiClientFeature(features) {
@@ -71902,7 +71902,7 @@ module.exports = function (proj4) {
7190271902
/* 386 */
7190371903
/***/ (function(module) {
7190471904

71905-
module.exports = {"_args":[["proj4@2.3.15","F:\\map_study\\iClient-JavaScript"]],"_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":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_spec":"2.3.15","_where":"F:\\map_study\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"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"},"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"};
71905+
module.exports = {"_args":[["proj4@2.3.15","G:\\iClient9"]],"_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","_spec":"2.3.15","_where":"G:\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"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"},"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"};
7190671906

7190771907
/***/ }),
7190871908
/* 387 */
@@ -96068,15 +96068,16 @@ process.umask = function () {
9606896068
"use strict";
9606996069
/* WEBPACK VAR INJECTION */(function(global) {
9607096070

96071+
var scope = typeof global !== "undefined" && global || typeof self !== "undefined" && self || window;
9607196072
var apply = Function.prototype.apply;
9607296073

9607396074
// DOM APIs, for completeness
9607496075

9607596076
exports.setTimeout = function () {
96076-
return new Timeout(apply.call(setTimeout, window, arguments), clearTimeout);
96077+
return new Timeout(apply.call(setTimeout, scope, arguments), clearTimeout);
9607796078
};
9607896079
exports.setInterval = function () {
96079-
return new Timeout(apply.call(setInterval, window, arguments), clearInterval);
96080+
return new Timeout(apply.call(setInterval, scope, arguments), clearInterval);
9608096081
};
9608196082
exports.clearTimeout = exports.clearInterval = function (timeout) {
9608296083
if (timeout) {
@@ -96090,7 +96091,7 @@ function Timeout(id, clearFn) {
9609096091
}
9609196092
Timeout.prototype.unref = Timeout.prototype.ref = function () {};
9609296093
Timeout.prototype.close = function () {
96093-
this._clearFn.call(window, this._id);
96094+
this._clearFn.call(scope, this._id);
9609496095
};
9609596096

9609696097
// Does not start the time, just sets up the members needed.
@@ -96117,7 +96118,7 @@ exports._unrefActive = exports.active = function (item) {
9611796118

9611896119
// setimmediate attaches itself to the global object
9611996120
__webpack_require__(516);
96120-
// On some exotic environments, it's not clear which object `setimmeidate` was
96121+
// On some exotic environments, it's not clear which object `setimmediate` was
9612196122
// able to install onto. Search each possibility in the same order as the
9612296123
// `setimmediate` library.
9612396124
exports.setImmediate = typeof self !== "undefined" && self.setImmediate || typeof global !== "undefined" && global.setImmediate || undefined && undefined.setImmediate;

‎dist/iclient9-leaflet.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.

0 commit comments

Comments
 (0)