Skip to content

Commit a5f542b

Browse files
liqian7liqian7
committed
【update/API】 ol & mbgl webmap 去除jsonsql依赖 review by songym
1 parent ea0a798 commit a5f542b

File tree

8 files changed

+469
-499
lines changed

8 files changed

+469
-499
lines changed

‎dist/mapboxgl/iclient9-mapboxgl-es6.js

Lines changed: 38 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
/******/
7575
/******/
7676
/******/ // Load entry module and return exports
77-
/******/ return __webpack_require__(__webpack_require__.s = 19);
77+
/******/ return __webpack_require__(__webpack_require__.s = 18);
7878
/******/ })
7979
/************************************************************************/
8080
/******/ ([
@@ -125,22 +125,16 @@ module.exports = g;
125125
/* 4 */
126126
/***/ (function(module, exports) {
127127

128-
module.exports = function(){try{return jsonsql}catch(e){return {}}}();
129-
130-
/***/ }),
131-
/* 5 */
132-
/***/ (function(module, exports) {
133-
134128
module.exports = function(){try{return convert}catch(e){return {}}}();
135129

136130
/***/ }),
137-
/* 6 */
131+
/* 5 */
138132
/***/ (function(module, exports) {
139133

140134
module.exports = function(){try{return XLSX}catch(e){return {}}}();
141135

142136
/***/ }),
143-
/* 7 */
137+
/* 6 */
144138
/***/ (function(module, exports, __webpack_require__) {
145139

146140
var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;(function (global, factory) {
@@ -248,19 +242,19 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
248242
});
249243

250244
/***/ }),
251-
/* 8 */
245+
/* 7 */
252246
/***/ (function(module, exports) {
253247

254248
module.exports = function(){try{return canvg}catch(e){return {}}}();
255249

256250
/***/ }),
257-
/* 9 */
251+
/* 8 */
258252
/***/ (function(module, exports) {
259253

260254
module.exports = function(){try{return echarts}catch(e){return {}}}();
261255

262256
/***/ }),
263-
/* 10 */
257+
/* 9 */
264258
/***/ (function(module, exports, __webpack_require__) {
265259

266260
/* WEBPACK VAR INJECTION */(function(global) {/**
@@ -976,13 +970,13 @@ module.exports = toPairs;
976970
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
977971

978972
/***/ }),
979-
/* 11 */
973+
/* 10 */
980974
/***/ (function(module, exports) {
981975

982976
module.exports = function(){try{return elasticsearch}catch(e){return {}}}();
983977

984978
/***/ }),
985-
/* 12 */
979+
/* 11 */
986980
/***/ (function(module, exports, __webpack_require__) {
987981

988982
/* WEBPACK VAR INJECTION */(function(setImmediate) {(function (root) {
@@ -1219,10 +1213,10 @@ module.exports = function(){try{return elasticsearch}catch(e){return {}}}();
12191213

12201214
})(this);
12211215

1222-
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(18).setImmediate))
1216+
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(17).setImmediate))
12231217

12241218
/***/ }),
1225-
/* 13 */
1219+
/* 12 */
12261220
/***/ (function(module, __webpack_exports__, __webpack_require__) {
12271221

12281222
"use strict";
@@ -11748,7 +11742,7 @@ SuperMap.TimeFlowControl = TimeFlowControl_TimeFlowControl;
1174811742

1174911743

1175011744
// EXTERNAL MODULE: ./node_modules/promise-polyfill/promise.js
11751-
var promise = __webpack_require__(12);
11745+
var promise = __webpack_require__(11);
1175211746
var promise_default = /*#__PURE__*/__webpack_require__.n(promise);
1175311747

1175411748
// CONCATENATED MODULE: ./src/common/util/PromisePolyfill.js
@@ -11759,10 +11753,10 @@ var promise_default = /*#__PURE__*/__webpack_require__.n(promise);
1175911753

1176011754
window.Promise = promise_default.a;
1176111755
// EXTERNAL MODULE: ./node_modules/fetch-ie8/fetch.js
11762-
var fetch_ie8_fetch = __webpack_require__(15);
11756+
var fetch_ie8_fetch = __webpack_require__(14);
1176311757

1176411758
// EXTERNAL MODULE: ./node_modules/fetch-jsonp/build/fetch-jsonp.js
11765-
var fetch_jsonp = __webpack_require__(7);
11759+
var fetch_jsonp = __webpack_require__(6);
1176611760
var fetch_jsonp_default = /*#__PURE__*/__webpack_require__.n(fetch_jsonp);
1176711761

1176811762
// CONCATENATED MODULE: ./src/common/util/FetchRequest.js
@@ -36582,7 +36576,7 @@ SuperMap.TokenServiceParameter = TokenServiceParameter_TokenServiceParameter;
3658236576

3658336577

3658436578
// EXTERNAL MODULE: external "function(){try{return elasticsearch}catch(e){return {}}}()"
36585-
var external_function_try_return_elasticsearch_catch_e_return_ = __webpack_require__(11);
36579+
var external_function_try_return_elasticsearch_catch_e_return_ = __webpack_require__(10);
3658636580
var external_function_try_return_elasticsearch_catch_e_return_default = /*#__PURE__*/__webpack_require__.n(external_function_try_return_elasticsearch_catch_e_return_);
3658736581

3658836582
// CONCATENATED MODULE: ./src/common/thirdparty/elasticsearch/ElasticSearch.js
@@ -39011,7 +39005,7 @@ SuperMap.ArrayStatistic = ArrayStatistic_ArrayStatistic;
3901139005

3901239006

3901339007
// EXTERNAL MODULE: ./node_modules/lodash.topairs/index.js
39014-
var lodash_topairs = __webpack_require__(10);
39008+
var lodash_topairs = __webpack_require__(9);
3901539009
var lodash_topairs_default = /*#__PURE__*/__webpack_require__.n(lodash_topairs);
3901639010

3901739011
// CONCATENATED MODULE: ./src/common/style/CartoCSS.js
@@ -61764,7 +61758,7 @@ class MessageBox_MessageBox {
6176461758

6176561759
SuperMap.Widgets.MessageBox = MessageBox_MessageBox;
6176661760
// EXTERNAL MODULE: external "function(){try{return echarts}catch(e){return {}}}()"
61767-
var external_function_try_return_echarts_catch_e_return_ = __webpack_require__(9);
61761+
var external_function_try_return_echarts_catch_e_return_ = __webpack_require__(8);
6176861762
var external_function_try_return_echarts_catch_e_return_default = /*#__PURE__*/__webpack_require__.n(external_function_try_return_echarts_catch_e_return_);
6176961763

6177061764
// CONCATENATED MODULE: ./src/common/lang/Lang.js
@@ -61874,7 +61868,7 @@ SuperMap.Lang = Lang_Lang;
6187461868
SuperMap.i18n = SuperMap.Lang.i18n;
6187561869

6187661870
// EXTERNAL MODULE: external "function(){try{return XLSX}catch(e){return {}}}()"
61877-
var external_function_try_return_XLSX_catch_e_return_ = __webpack_require__(6);
61871+
var external_function_try_return_XLSX_catch_e_return_ = __webpack_require__(5);
6187861872
var external_function_try_return_XLSX_catch_e_return_default = /*#__PURE__*/__webpack_require__.n(external_function_try_return_XLSX_catch_e_return_);
6187961873

6188061874
// CONCATENATED MODULE: ./src/common/widgets/util/FileReaderUtil.js
@@ -65535,7 +65529,6 @@ class core_Util_Util {
6553565529
}
6553665530

6553765531
/**
65538-
* @function ol.supermap.Util.isMatchAdministrativeName
6553965532
* @param {string} featureName 原始数据中的地名
6554065533
* @param {string} fieldName 需要匹配的地名
6554165534
* @returns {boolean} 是否匹配
@@ -76042,17 +76035,13 @@ external_mapboxgl_default.a.supermap.TrafficTransferAnalystService = TrafficTran
7604276035

7604376036

7604476037
// EXTERNAL MODULE: external "function(){try{return convert}catch(e){return {}}}()"
76045-
var external_function_try_return_convert_catch_e_return_ = __webpack_require__(5);
76038+
var external_function_try_return_convert_catch_e_return_ = __webpack_require__(4);
7604676039
var external_function_try_return_convert_catch_e_return_default = /*#__PURE__*/__webpack_require__.n(external_function_try_return_convert_catch_e_return_);
7604776040

7604876041
// EXTERNAL MODULE: external "function(){try{return canvg}catch(e){return {}}}()"
76049-
var external_function_try_return_canvg_catch_e_return_ = __webpack_require__(8);
76042+
var external_function_try_return_canvg_catch_e_return_ = __webpack_require__(7);
7605076043
var external_function_try_return_canvg_catch_e_return_default = /*#__PURE__*/__webpack_require__.n(external_function_try_return_canvg_catch_e_return_);
7605176044

76052-
// EXTERNAL MODULE: external "function(){try{return jsonsql}catch(e){return {}}}()"
76053-
var external_function_try_return_jsonsql_catch_e_return_ = __webpack_require__(4);
76054-
var external_function_try_return_jsonsql_catch_e_return_default = /*#__PURE__*/__webpack_require__.n(external_function_try_return_jsonsql_catch_e_return_);
76055-
7605676045
// CONCATENATED MODULE: ./src/mapboxgl/mapping/WebMap.js
7605776046
/* Copyright© 2000 - 2019 SuperMap Software Co.Ltd. All rights reserved.
7605876047
* This program are made available under the terms of the Apache License, Version 2.0
@@ -76063,7 +76052,6 @@ var external_function_try_return_jsonsql_catch_e_return_default = /*#__PURE__*/_
7606376052

7606476053

7606576054

76066-
7606776055
external_mapboxgl_default.a.supermap = external_mapboxgl_default.a.supermap || {};
7606876056

7606976057
const WebMap_MB_SCALEDENOMINATOR_3857 = [
@@ -76116,8 +76104,9 @@ const WebMap_DEFAULT_WELLKNOWNSCALESET = ['GoogleCRS84Quad', 'GoogleMapsCompatib
7611676104
* @classdesc 对接 iPortal/Online 地图类。目前支持地图坐标系包括：'EPSG:3857'，'EPSG:4326'，'EPSG:4490'，'EPSG:4214'，'EPSG:4610'。
7611776105
* <div style="padding: 20px;border: 1px solid #eee;border-left-width: 5px;border-radius: 3px;border-left-color: #ce4844;">
7611876106
* <p style="color: #ce4844">Notice</p>
76119-
* <p style="font-size: 13px">该功能依赖 <a href='http://iclient.supermap.io/web/libs/geostats/geostats.js'>geostats</a> 插件，请确认引入该插件。</p>
76120-
* `<script type="text/javascript" src="http://iclient.supermap.io/web/libs/geostats/geostats.js"></script>`
76107+
* <p style="font-size: 13px">该功能依赖 <a href='http://iclient.supermap.io/web/libs/geostats/geostats.js'>geostats</a> 和 <a href='http://iclient.supermap.io/web/libs/jsonsql/jsonsql.js'>JsonSql</a> 插件，请确认引入该插件。</p>
76108+
* `<script type="text/javascript" src="http://iclient.supermap.io/web/libs/geostats/geostats.js"></script>`</br>
76109+
* `<script type="text/javascript" src="http://iclient.supermap.io/web/libs/jsonsql/jsonsql.js"></script>`
7612176110
* </div>
7612276111
* @param {number} id - iPortal|Online 地图 ID。
7612376112
* @param {Object} options - 参数。
@@ -77480,15 +77469,14 @@ class WebMap_WebMap extends external_mapboxgl_default.a.Evented {
7748077469
if (!filterCondition) {
7748177470
return allFeatures;
7748277471
}
77483-
let jsonsqls = external_function_try_return_jsonsql_catch_e_return_default.a ? external_function_try_return_jsonsql_catch_e_return_default.a : window.jsonsql;
7748477472
let condition = this._replaceFilterCharacter(filterCondition);
7748577473
let sql = 'select * from json where (' + condition + ')';
7748677474
let filterFeatures = [];
7748777475
for (let i = 0; i < allFeatures.length; i++) {
7748877476
let feature = allFeatures[i];
7748977477
let filterResult = false;
7749077478
try {
77491-
filterResult = jsonsqls.query(sql, {
77479+
filterResult = window.jsonsql.query(sql, {
7749277480
properties: feature.properties
7749377481
});
7749477482
} catch (err) {
@@ -78395,20 +78383,20 @@ external_mapboxgl_default.a.supermap.WebMap = WebMap_WebMap;
7839578383

7839678384

7839778385
/***/ }),
78398-
/* 14 */
78386+
/* 13 */
7839978387
/***/ (function(module, __webpack_exports__, __webpack_require__) {
7840078388

7840178389
"use strict";
7840278390
__webpack_require__.r(__webpack_exports__);
78403-
/* harmony import */ var _supermap_iclient_common_css_webmapfont_iconfont_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(26);
78391+
/* harmony import */ var _supermap_iclient_common_css_webmapfont_iconfont_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(25);
7840478392
/* harmony import */ var _supermap_iclient_common_css_webmapfont_iconfont_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_supermap_iclient_common_css_webmapfont_iconfont_css__WEBPACK_IMPORTED_MODULE_0__);
78405-
/* harmony import */ var _supermap_iclient_common_widgets_css_MessageBox_css__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20);
78393+
/* harmony import */ var _supermap_iclient_common_widgets_css_MessageBox_css__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19);
7840678394
/* harmony import */ var _supermap_iclient_common_widgets_css_MessageBox_css__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_supermap_iclient_common_widgets_css_MessageBox_css__WEBPACK_IMPORTED_MODULE_1__);
7840778395

7840878396

7840978397

7841078398
/***/ }),
78411-
/* 15 */
78399+
/* 14 */
7841278400
/***/ (function(module, exports) {
7841378401

7841478402
(function(self) {
@@ -78832,7 +78820,7 @@ __webpack_require__.r(__webpack_exports__);
7883278820

7883378821

7883478822
/***/ }),
78835-
/* 16 */
78823+
/* 15 */
7883678824
/***/ (function(module, exports) {
7883778825

7883878826
// shim for using process in browser
@@ -79022,7 +79010,7 @@ process.umask = function() { return 0; };
7902279010

7902379011

7902479012
/***/ }),
79025-
/* 17 */
79013+
/* 16 */
7902679014
/***/ (function(module, exports, __webpack_require__) {
7902779015

7902879016
/* WEBPACK VAR INJECTION */(function(global, process) {(function (global, undefined) {
@@ -79212,10 +79200,10 @@ process.umask = function() { return 0; };
7921279200
attachTo.clearImmediate = clearImmediate;
7921379201
}(typeof self === "undefined" ? typeof global === "undefined" ? this : global : self));
7921479202

79215-
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3), __webpack_require__(16)))
79203+
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3), __webpack_require__(15)))
7921679204

7921779205
/***/ }),
79218-
/* 18 */
79206+
/* 17 */
7921979207
/***/ (function(module, exports, __webpack_require__) {
7922079208

7922179209
/* WEBPACK VAR INJECTION */(function(global) {var scope = (typeof global !== "undefined" && global) ||
@@ -79271,7 +79259,7 @@ exports._unrefActive = exports.active = function(item) {
7927179259
};
7927279260

7927379261
// setimmediate attaches itself to the global object
79274-
__webpack_require__(17);
79262+
__webpack_require__(16);
7927579263
// On some exotic environments, it's not clear which object `setimmediate` was
7927679264
// able to install onto. Search each possibility in the same order as the
7927779265
// `setimmediate` library.
@@ -79285,26 +79273,26 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) ||
7928579273
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
7928679274

7928779275
/***/ }),
79288-
/* 19 */
79276+
/* 18 */
7928979277
/***/ (function(module, exports, __webpack_require__) {
7929079278

79291-
__webpack_require__(13);
79292-
module.exports = __webpack_require__(14);
79279+
__webpack_require__(12);
79280+
module.exports = __webpack_require__(13);
7929379281

7929479282

7929579283
/***/ }),
79296-
/* 20 */
79284+
/* 19 */
7929779285
/***/ (function(module, exports) {
7929879286

7929979287
// removed by extract-text-webpack-plugin
7930079288

7930179289
/***/ }),
79290+
/* 20 */,
7930279291
/* 21 */,
7930379292
/* 22 */,
7930479293
/* 23 */,
7930579294
/* 24 */,
79306-
/* 25 */,
79307-
/* 26 */
79295+
/* 25 */
7930879296
/***/ (function(module, exports) {
7930979297

7931079298
// removed by extract-text-webpack-plugin

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