Skip to content

Commit 9784420

Browse files
author
caoxinke@supermap.com
committed
各npm包下添加README;修改OpenLayers下ol的引用，并修改相应测试案例；修改其他不恰当的写法;fix ICL-978.
1 parent c7d7357 commit 9784420

File tree

103 files changed

+754
-431
lines changed

Some content is hidden

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

103 files changed

+754
-431
lines changed

‎build/webpack.config.openlayers.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = {
2222
extensions: ['.js', '.json', '.css']
2323
},
2424
externals: {
25-
'openlayers/dist/ol-debug': 'ol',
25+
'openlayers': 'ol',
2626
'echarts': 'function(){try{return echarts}catch(e){return {}}}()',
2727
'mapv': "function(){try{return mapv}catch(e){return {}}}()",
2828
'elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()',

‎dist/iclient9-leaflet.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51102,10 +51102,11 @@ var Painter = exports.Painter = function () {
5110251102
return false;
5110351103
}
5110451104

51105+
/* eslint-disable */
5110551106
// 什么都不干的空方法
51106-
function doNothing() {// eslint-disable-line no-unused-vars
51107-
//NOSONAR
51108-
}
51107+
function doNothing() {} //NOSONAR
51108+
51109+
/* eslint-enable */
5110951110
}
5111051111

5111151112
/**
@@ -59933,7 +59934,7 @@ LeafletMapCoordSys.prototype.getBMap = function () {
5993359934
return this._LeafletMap;
5993459935
};
5993559936

59936-
LeafletMapCoordSys.prototype.prepareCustoms = function (data) {
59937+
LeafletMapCoordSys.prototype.prepareCustoms = function () {
5993759938
var zrUtil = _echarts2["default"].util;
5993859939

5993959940
var rect = this.getViewRect();
@@ -81072,7 +81073,7 @@ var ServerInfo = exports.ServerInfo = function ServerInfo(type, options) {
8107281073
* @member SuperMap.ServerInfo.prototype.type -{ServerType}
8107381074
* @description 服务器类型
8107481075
*/
81075-
this.type = null;
81076+
this.type = type;
8107681077

8107781078
/**
8107881079
* @member SuperMap.ServerInfo.prototype.server -{string}
@@ -91022,7 +91023,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
9102291023
}
9102391024

9102491025
function Promise(fn) {
91025-
if (_typeof(this) !== 'object') throw new TypeError('Promises must be constructed via new');
91026+
if (!(this instanceof Promise)) throw new TypeError('Promises must be constructed via new');
9102691027
if (typeof fn !== 'function') throw new TypeError('not a function');
9102791028
this._state = 0;
9102891029
this._handled = false;
@@ -91146,9 +91147,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
9114691147
};
9114791148

9114891149
Promise.all = function (arr) {
91149-
var args = Array.prototype.slice.call(arr);
91150-
9115191150
return new Promise(function (resolve, reject) {
91151+
if (!arr || typeof arr.length === 'undefined') throw new TypeError('Promise.all accepts an array');
91152+
var args = Array.prototype.slice.call(arr);
9115291153
if (args.length === 0) return resolve([]);
9115391154
var remaining = args.length;
9115491155

@@ -95955,7 +95956,7 @@ exports.names = ["Van_der_Grinten_I", "VanDerGrinten", "vandg"];
9595595956
/* 545 */
9595695957
/***/ (function(module, exports) {
9595795958

95958-
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":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"G:\\iClient9","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"}
95959+
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":"F:\\codes\\iClient9","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"}
9595995960

9596095961
/***/ }),
9596195962
/* 546 */

‎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.

‎dist/iclient9-mapboxgl.css‎

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/iclient9-mapboxgl.js‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47610,10 +47610,11 @@ var Painter = exports.Painter = function () {
4761047610
return false;
4761147611
}
4761247612

47613+
/* eslint-disable */
4761347614
// 什么都不干的空方法
47614-
function doNothing() {// eslint-disable-line no-unused-vars
47615-
//NOSONAR
47616-
}
47615+
function doNothing() {} //NOSONAR
47616+
47617+
/* eslint-enable */
4761747618
}
4761847619

4761947620
/**
@@ -74988,7 +74989,7 @@ var ServerInfo = exports.ServerInfo = function ServerInfo(type, options) {
7498874989
* @member SuperMap.ServerInfo.prototype.type -{ServerType}
7498974990
* @description 服务器类型
7499074991
*/
74991-
this.type = null;
74992+
this.type = type;
7499274993

7499374994
/**
7499474995
* @member SuperMap.ServerInfo.prototype.server -{string}
@@ -80033,6 +80034,12 @@ var _get = function get(object, property, receiver) { if (object === null) objec
8003380034

8003480035
var _mapv = __webpack_require__(253);
8003580036

80037+
var _mapboxGl = __webpack_require__(3);
80038+
80039+
var _mapboxGl2 = _interopRequireDefault(_mapboxGl);
80040+
80041+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
80042+
8003680043
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
8003780044

8003880045
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
@@ -80311,7 +80318,7 @@ var MapvRenderer = exports.MapvRenderer = function (_BaseLayer) {
8031180318

8031280319
var dataGetOptions = {
8031380320
transferCoordinate: function transferCoordinate(coordinate) {
80314-
var worldPoint = map.transform.locationPoint(new window.mapboxgl.LngLat(coordinate[0], coordinate[1]));
80321+
var worldPoint = map.transform.locationPoint(new _mapboxGl2.default.LngLat(coordinate[0], coordinate[1]));
8031580322
return [worldPoint.x, worldPoint.y];
8031680323
}
8031780324
};
@@ -80329,7 +80336,7 @@ var MapvRenderer = exports.MapvRenderer = function (_BaseLayer) {
8032980336

8033080337
self.options._size = self.options.size;
8033180338

80332-
var worldPoint = map.project(new window.mapboxgl.LngLat(0, 0));
80339+
var worldPoint = map.project(new _mapboxGl2.default.LngLat(0, 0));
8033380340
this.drawContext(context, new _mapv.DataSet(data), self.options, worldPoint);
8033480341

8033580342
self.options.updateCallback && self.options.updateCallback(time);

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

‎dist/iclient9-openlayers.css‎

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)