Skip to content

Commit d069cd4

Browse files
songyumengsongyumeng
committed
【fix/API】优化for ol/mapboxgl 打包，修复ol矢量瓦片功能图标可能显示一部分的bug，修复ol矢量瓦片切换例子切换错乱问题， 优化ol dataflow显示可能出现的一闪一闪问题 ，晚上leaflet dataflow API
1 parent a723f63 commit d069cd4

26 files changed

+206410
-301665
lines changed

‎build/webpack.config.mapboxgl.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ module.exports = {
2323
'three': 'function(){try{return THREE}catch(e){return {}}}()',
2424
'deck.gl': '(function(){try{return DeckGL}catch(e){return {}}})()',
2525
'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
26-
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()'
26+
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
27+
'xlsx': "function(){try{return XLSX}catch(e){return {}}}()"
2728
}),
2829

2930
module: {

‎build/webpack.config.openlayers.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ module.exports = {
2323
'ol-mapbox-style/stylefunction': "function(){try{return olms.stylefunction}catch(e){return {}}}()",
2424
'deck.gl': '(function(){try{return DeckGL}catch(e){return {}}})()',
2525
'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
26-
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()'
26+
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
27+
'xlsx': "function(){try{return XLSX}catch(e){return {}}}()"
2728
}),
2829

2930
module: {

‎dist/classic/iclient-classic-es6.js‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,34 @@
4444
/******/ // define getter function for harmony exports
4545
/******/ __webpack_require__.d = function(exports, name, getter) {
4646
/******/ if(!__webpack_require__.o(exports, name)) {
47-
/******/ Object.defineProperty(exports, name, {
48-
/******/ configurable: false,
49-
/******/ enumerable: true,
50-
/******/ get: getter
51-
/******/ });
47+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
5248
/******/ }
5349
/******/ };
5450
/******/
5551
/******/ // define __esModule on exports
5652
/******/ __webpack_require__.r = function(exports) {
53+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
54+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
55+
/******/ }
5756
/******/ Object.defineProperty(exports, '__esModule', { value: true });
5857
/******/ };
5958
/******/
59+
/******/ // create a fake namespace object
60+
/******/ // mode & 1: value is a module id, require it
61+
/******/ // mode & 2: merge all properties of value into the ns
62+
/******/ // mode & 4: return value when already ns object
63+
/******/ // mode & 8|1: behave like require
64+
/******/ __webpack_require__.t = function(value, mode) {
65+
/******/ if(mode & 1) value = __webpack_require__(value);
66+
/******/ if(mode & 8) return value;
67+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
68+
/******/ var ns = Object.create(null);
69+
/******/ __webpack_require__.r(ns);
70+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
71+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
72+
/******/ return ns;
73+
/******/ };
74+
/******/
6075
/******/ // getDefaultExport function for compatibility with non-harmony modules
6176
/******/ __webpack_require__.n = function(module) {
6277
/******/ var getter = module && module.__esModule ?

‎dist/classic/iclient-classic-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/classic/iclient-classic.js‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,34 @@
4444
/******/ // define getter function for harmony exports
4545
/******/ __webpack_require__.d = function(exports, name, getter) {
4646
/******/ if(!__webpack_require__.o(exports, name)) {
47-
/******/ Object.defineProperty(exports, name, {
48-
/******/ configurable: false,
49-
/******/ enumerable: true,
50-
/******/ get: getter
51-
/******/ });
47+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
5248
/******/ }
5349
/******/ };
5450
/******/
5551
/******/ // define __esModule on exports
5652
/******/ __webpack_require__.r = function(exports) {
53+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
54+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
55+
/******/ }
5756
/******/ Object.defineProperty(exports, '__esModule', { value: true });
5857
/******/ };
5958
/******/
59+
/******/ // create a fake namespace object
60+
/******/ // mode & 1: value is a module id, require it
61+
/******/ // mode & 2: merge all properties of value into the ns
62+
/******/ // mode & 4: return value when already ns object
63+
/******/ // mode & 8|1: behave like require
64+
/******/ __webpack_require__.t = function(value, mode) {
65+
/******/ if(mode & 1) value = __webpack_require__(value);
66+
/******/ if(mode & 8) return value;
67+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
68+
/******/ var ns = Object.create(null);
69+
/******/ __webpack_require__.r(ns);
70+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
71+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
72+
/******/ return ns;
73+
/******/ };
74+
/******/
6075
/******/ // getDefaultExport function for compatibility with non-harmony modules
6176
/******/ __webpack_require__.n = function(module) {
6277
/******/ var getter = module && module.__esModule ?

‎dist/classic/iclient-classic.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/leaflet/iclient9-leaflet-es6.js‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,34 @@
4444
/******/ // define getter function for harmony exports
4545
/******/ __webpack_require__.d = function(exports, name, getter) {
4646
/******/ if(!__webpack_require__.o(exports, name)) {
47-
/******/ Object.defineProperty(exports, name, {
48-
/******/ configurable: false,
49-
/******/ enumerable: true,
50-
/******/ get: getter
51-
/******/ });
47+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
5248
/******/ }
5349
/******/ };
5450
/******/
5551
/******/ // define __esModule on exports
5652
/******/ __webpack_require__.r = function(exports) {
53+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
54+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
55+
/******/ }
5756
/******/ Object.defineProperty(exports, '__esModule', { value: true });
5857
/******/ };
5958
/******/
59+
/******/ // create a fake namespace object
60+
/******/ // mode & 1: value is a module id, require it
61+
/******/ // mode & 2: merge all properties of value into the ns
62+
/******/ // mode & 4: return value when already ns object
63+
/******/ // mode & 8|1: behave like require
64+
/******/ __webpack_require__.t = function(value, mode) {
65+
/******/ if(mode & 1) value = __webpack_require__(value);
66+
/******/ if(mode & 8) return value;
67+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
68+
/******/ var ns = Object.create(null);
69+
/******/ __webpack_require__.r(ns);
70+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
71+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
72+
/******/ return ns;
73+
/******/ };
74+
/******/
6075
/******/ // getDefaultExport function for compatibility with non-harmony modules
6176
/******/ __webpack_require__.n = function(module) {
6277
/******/ var getter = module && module.__esModule ?
@@ -63420,7 +63435,7 @@ var CRS = external_L_default.a.Class.extend({
6342063435
external_L_default.a.Util.setOptions(this, options);
6342163436
this.code = code;
6342263437
this.transformation = this.options.transformation;
63423-
63438+
this.options.dpi=this.options.dpi||96;
6342463439
if (this.options.bounds) {
6342563440
this.options.bounds = external_L_default.a.bounds(this.options.bounds);
6342663441
}
@@ -71077,7 +71092,10 @@ var MapvRenderer = MapVLayer.extend({
7107771092
if (this.options.deg) {
7107871093
item.deg = this.options.deg
7107971094
if (typeof item.deg === 'function') {
71080-
item.deg = item.deg(msg.featureResult, external_L_default.a.latLng(geometry.coordinates[1], geometry.coordinates[0]));
71095+
if(this.idCache[geoID]&&this.data[this.idCache[geoID]]){
71096+
item.deg = item.deg(msg.featureResult, external_L_default.a.latLng(geometry.coordinates[1], geometry.coordinates[0]),this.data[this.idCache[geoID]]);
71097+
}
71098+
7108171099
}
7108271100
}
7108371101
}
@@ -71238,7 +71256,11 @@ var NormalRenderer = external_L_default.a.GeoJSON.extend({
7123871256
radius: 6,
7123971257
weight: 0
7124071258
};
71241-
}`
71259+
}`
71260+
* @param {function|number} [options.deg] - 定义图标的旋转角度。`options.render` 为 `mapv` 时有效。</br>
71261+
`function (feature,latlng) {
71262+
return feature.properties['rotate'];
71263+
}`
7124271264
* @fires L.supermap.dataFlowLayer#subscribesuccessed
7124371265
* @fires L.supermap.dataFlowLayer#setfilterparamsuccessed
7124471266
* @fires L.supermap.dataFlowLayer#dataupdated
@@ -83092,7 +83114,7 @@ module.exports = function(proj4){
8309283114
/* 74 */
8309383115
/***/ (function(module) {
8309483116

83095-
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":"G:\\iClient\\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"};
83117+
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"};
8309683118

8309783119
/***/ }),
8309883120
/* 75 */

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

0 commit comments

Comments
 (0)