Skip to content

Commit d45aeba

Browse files
liqian7liqian7
committed
【update/UT】 fix openlayer webmap 出图错误问题，fix UT review by songym
1 parent f54379a commit d45aeba

12 files changed

Lines changed: 119 additions & 108 deletions

File tree

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

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,12 @@ module.exports = ol.util;
288288

289289
/***/ }),
290290
/* 29 */
291+
/***/ (function(module, exports) {
292+
293+
module.exports = ol.proj.proj4;
294+
295+
/***/ }),
296+
/* 30 */
291297
/***/ (function(module, exports, __webpack_require__) {
292298

293299
var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;(function (global, factory) {
@@ -394,41 +400,35 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
394400
module.exports = fetchJsonp;
395401
});
396402

397-
/***/ }),
398-
/* 30 */
399-
/***/ (function(module, exports) {
400-
401-
module.exports = function(){try{return XLSX}catch(e){return {}}}();
402-
403403
/***/ }),
404404
/* 31 */
405405
/***/ (function(module, exports) {
406406

407-
module.exports = ol.extent;
407+
module.exports = function(){try{return XLSX}catch(e){return {}}}();
408408

409409
/***/ }),
410410
/* 32 */
411411
/***/ (function(module, exports) {
412412

413-
module.exports = function(){try{return mapv}catch(e){return {}}}();
413+
module.exports = ol.extent;
414414

415415
/***/ }),
416416
/* 33 */
417417
/***/ (function(module, exports) {
418418

419-
module.exports = function(){try{return turf}catch(e){return {}}}();
419+
module.exports = function(){try{return mapv}catch(e){return {}}}();
420420

421421
/***/ }),
422422
/* 34 */
423423
/***/ (function(module, exports) {
424424

425-
module.exports = ol.View;
425+
module.exports = function(){try{return turf}catch(e){return {}}}();
426426

427427
/***/ }),
428428
/* 35 */
429429
/***/ (function(module, exports) {
430430

431-
module.exports = ol.proj.proj4;
431+
module.exports = ol.View;
432432

433433
/***/ }),
434434
/* 36 */
@@ -15391,7 +15391,7 @@ window.Promise = promise_default.a;
1539115391
var fetch = __webpack_require__(66);
1539215392

1539315393
// EXTERNAL MODULE: ./node_modules/fetch-jsonp/build/fetch-jsonp.js
15394-
var fetch_jsonp = __webpack_require__(29);
15394+
var fetch_jsonp = __webpack_require__(30);
1539515395
var fetch_jsonp_default = /*#__PURE__*/__webpack_require__.n(fetch_jsonp);
1539615396

1539715397
// CONCATENATED MODULE: ./src/common/util/FetchRequest.js
@@ -66819,7 +66819,7 @@ SuperMap.Lang = Lang;
6681966819
SuperMap.i18n = SuperMap.Lang.i18n;
6682066820

6682166821
// EXTERNAL MODULE: external "function(){try{return XLSX}catch(e){return {}}}()"
66822-
var external_function_try_return_XLSX_catch_e_return_ = __webpack_require__(30);
66822+
var external_function_try_return_XLSX_catch_e_return_ = __webpack_require__(31);
6682366823
var external_function_try_return_XLSX_catch_e_return_default = /*#__PURE__*/__webpack_require__.n(external_function_try_return_XLSX_catch_e_return_);
6682466824

6682566825
// CONCATENATED MODULE: ./src/common/components/util/FileReaderUtil.js
@@ -83145,7 +83145,7 @@ class Graphic_Graphic extends external_ol_Object_default.a {
8314583145
}
8314683146

8314783147
// EXTERNAL MODULE: external "ol.extent"
83148-
var external_ol_extent_ = __webpack_require__(31);
83148+
var external_ol_extent_ = __webpack_require__(32);
8314983149

8315083150
// EXTERNAL MODULE: external "ol.geom.Polygon"
8315183151
var external_ol_geom_Polygon_ = __webpack_require__(52);
@@ -84986,7 +84986,6 @@ class MapvCanvasLayer {
8498684986
* @description 调整地图大小。
8498784987
*/
8498884988
resize(mapWidth, mapHeight) {
84989-
console.log("resize");
8499084989
var global$2 = typeof window === 'undefined' ? {} : window;
8499184990
var devicePixelRatio = this.devicePixelRatio = global$2.devicePixelRatio || 1;
8499284991
this.canvas.width = mapWidth * devicePixelRatio;
@@ -85028,7 +85027,7 @@ class MapvCanvasLayer {
8502885027
}
8502985028
}
8503085029
// EXTERNAL MODULE: external "function(){try{return mapv}catch(e){return {}}}()"
85031-
var external_function_try_return_mapv_catch_e_return_ = __webpack_require__(32);
85030+
var external_function_try_return_mapv_catch_e_return_ = __webpack_require__(33);
8503285031

8503385032
// EXTERNAL MODULE: external "ol.interaction.Pointer"
8503485033
var external_ol_interaction_Pointer_ = __webpack_require__(54);
@@ -85800,7 +85799,7 @@ class overlay_RankSymbol_RankSymbol extends overlay_Graph_Graph {
8580085799
}
8580185800
}
8580285801
// EXTERNAL MODULE: external "function(){try{return turf}catch(e){return {}}}()"
85803-
var external_function_try_return_turf_catch_e_return_ = __webpack_require__(33);
85802+
var external_function_try_return_turf_catch_e_return_ = __webpack_require__(34);
8580485803

8580585804
// CONCATENATED MODULE: ./src/openlayers/overlay/Turf.js
8580685805
/* Copyright© 2000 - 2019 SuperMap Software Co.Ltd. All rights reserved.
@@ -87629,13 +87628,13 @@ var external_ol_geom_LineString_default = /*#__PURE__*/__webpack_require__.n(ext
8762987628

8763087629
var olExtends = function(targetMap) {
8763187630
//解决olms.js插件，在使用ol.js时沿线标注不显示的问题，因为ol.geom.LineString.getFlatMidpoint未非公开方法
87632-
if (!external_ol_geom_LineString_default.a.getFlatMidpoint) {
87631+
if (!external_ol_geom_LineString_default.a.prototype.getFlatMidpoint) {
8763387632
external_ol_geom_LineString_default.a.prototype.getFlatMidpoint = function() {
8763487633
return this.getCoordinateAt(0.5);
8763587634
};
8763687635
}
87637-
//applyStyleFunction 调用了ol.geom.LineString.getFlatMidpoint但是该方法在ol-debug.js里才有
87638-
if (core_Util_Util.getOlVersion() === '4' && window && window.ol && window.ol.geom.LineString.getFlatMidpoint) {
87636+
87637+
if (core_Util_Util.getOlVersion() === '4' && window && window.ol && window.ol.geom.flat) {
8763987638
// for ol4-debug
8764087639
window.targetMapCache = targetMap;
8764187640
let ol = window.ol;
@@ -91349,11 +91348,11 @@ var ProvinceCenter = __webpack_require__(58);
9134991348
var MunicipalCenter = __webpack_require__(59);
9135091349

9135191350
// EXTERNAL MODULE: external "ol.View"
91352-
var external_ol_View_ = __webpack_require__(34);
91351+
var external_ol_View_ = __webpack_require__(35);
9135391352
var external_ol_View_default = /*#__PURE__*/__webpack_require__.n(external_ol_View_);
9135491353

9135591354
// EXTERNAL MODULE: external "ol.proj.proj4"
91356-
var external_ol_proj_proj4_ = __webpack_require__(35);
91355+
var external_ol_proj_proj4_ = __webpack_require__(29);
9135791356

9135891357
// EXTERNAL MODULE: external "ol.proj.Units"
9135991358
var external_ol_proj_Units_ = __webpack_require__(60);
@@ -91554,7 +91553,7 @@ class WebMap_WebMap extends external_ol_Observable_default.a {
9155491553

9155591554
// 多坐标系支持
9155691555
if(lib){
91557-
external_ol_proj_proj4_["register"] ? external_ol_proj_proj4_["register"](lib) : window.ol.proj.setProj4(lib) ;
91556+
(external_ol_proj_proj4_ && external_ol_proj_proj4_["register"]) ? external_ol_proj_proj4_["register"](lib) : window.ol.proj.setProj4(lib) ;
9155891557
}
9155991558
// 目前iServer服务中可能出现的EPSG 0，-1，-1000
9156091559
if(mapInfo.projection.indexOf("EPSG") === 0 && mapInfo.projection.split(":")[1] <= 0){

‎dist/openlayers/iclient-openlayers-es6.min.js‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/openlayers/iclient-openlayers.js‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,12 @@ module.exports = ol.util;
287287

288288
/***/ }),
289289
/* 29 */
290+
/***/ (function(module, exports) {
291+
292+
module.exports = ol.proj.proj4;
293+
294+
/***/ }),
295+
/* 30 */
290296
/***/ (function(module, exports, __webpack_require__) {
291297

292298
var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;(function (global, factory) {
@@ -384,41 +390,35 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
384390
module.exports = fetchJsonp;
385391
});
386392

387-
/***/ }),
388-
/* 30 */
389-
/***/ (function(module, exports) {
390-
391-
module.exports = function(){try{return XLSX}catch(e){return {}}}();
392-
393393
/***/ }),
394394
/* 31 */
395395
/***/ (function(module, exports) {
396396

397-
module.exports = ol.extent;
397+
module.exports = function(){try{return XLSX}catch(e){return {}}}();
398398

399399
/***/ }),
400400
/* 32 */
401401
/***/ (function(module, exports) {
402402

403-
module.exports = function(){try{return mapv}catch(e){return {}}}();
403+
module.exports = ol.extent;
404404

405405
/***/ }),
406406
/* 33 */
407407
/***/ (function(module, exports) {
408408

409-
module.exports = function(){try{return turf}catch(e){return {}}}();
409+
module.exports = function(){try{return mapv}catch(e){return {}}}();
410410

411411
/***/ }),
412412
/* 34 */
413413
/***/ (function(module, exports) {
414414

415-
module.exports = ol.View;
415+
module.exports = function(){try{return turf}catch(e){return {}}}();
416416

417417
/***/ }),
418418
/* 35 */
419419
/***/ (function(module, exports) {
420420

421-
module.exports = ol.proj.proj4;
421+
module.exports = ol.View;
422422

423423
/***/ }),
424424
/* 36 */
@@ -17219,7 +17219,7 @@ window.Promise = promise_default.a;
1721917219
var fetch = __webpack_require__(66);
1722017220

1722117221
// EXTERNAL MODULE: ./node_modules/fetch-jsonp/build/fetch-jsonp.js
17222-
var fetch_jsonp = __webpack_require__(29);
17222+
var fetch_jsonp = __webpack_require__(30);
1722317223
var fetch_jsonp_default = /*#__PURE__*/__webpack_require__.n(fetch_jsonp);
1722417224

1722517225
// CONCATENATED MODULE: ./src/common/util/FetchRequest.js
@@ -77952,7 +77952,7 @@ var Lang = {
7795277952
SuperMap.Lang = Lang;
7795377953
SuperMap.i18n = SuperMap.Lang.i18n;
7795477954
// EXTERNAL MODULE: external "function(){try{return XLSX}catch(e){return {}}}()"
77955-
var external_function_try_return_XLSX_catch_e_return_ = __webpack_require__(30);
77955+
var external_function_try_return_XLSX_catch_e_return_ = __webpack_require__(31);
7795677956
var external_function_try_return_XLSX_catch_e_return_default = /*#__PURE__*/__webpack_require__.n(external_function_try_return_XLSX_catch_e_return_);
7795777957

7795877958
// CONCATENATED MODULE: ./src/common/components/util/FileReaderUtil.js
@@ -96233,7 +96233,7 @@ function (_BaseObject) {
9623396233
return Graphic;
9623496234
}(external_ol_Object_default.a);
9623596235
// EXTERNAL MODULE: external "ol.extent"
96236-
var external_ol_extent_ = __webpack_require__(31);
96236+
var external_ol_extent_ = __webpack_require__(32);
9623796237

9623896238
// EXTERNAL MODULE: external "ol.geom.Polygon"
9623996239
var external_ol_geom_Polygon_ = __webpack_require__(52);
@@ -98339,7 +98339,6 @@ function () {
9833998339
}, {
9834098340
key: "resize",
9834198341
value: function resize(mapWidth, mapHeight) {
98342-
console.log("resize");
9834398342
var global$2 = typeof window === 'undefined' ? {} : window;
9834498343
var devicePixelRatio = this.devicePixelRatio = global$2.devicePixelRatio || 1;
9834598344
this.canvas.width = mapWidth * devicePixelRatio;
@@ -98393,7 +98392,7 @@ function () {
9839398392
return MapvCanvasLayer;
9839498393
}();
9839598394
// EXTERNAL MODULE: external "function(){try{return mapv}catch(e){return {}}}()"
98396-
var external_function_try_return_mapv_catch_e_return_ = __webpack_require__(32);
98395+
var external_function_try_return_mapv_catch_e_return_ = __webpack_require__(33);
9839798396

9839898397
// EXTERNAL MODULE: external "ol.interaction.Pointer"
9839998398
var external_ol_interaction_Pointer_ = __webpack_require__(54);
@@ -99393,7 +99392,7 @@ function (_Graph) {
9939399392
return RankSymbol;
9939499393
}(overlay_Graph_Graph);
9939599394
// EXTERNAL MODULE: external "function(){try{return turf}catch(e){return {}}}()"
99396-
var external_function_try_return_turf_catch_e_return_ = __webpack_require__(33);
99395+
var external_function_try_return_turf_catch_e_return_ = __webpack_require__(34);
9939799396

9939899397
// CONCATENATED MODULE: ./src/openlayers/overlay/Turf.js
9939999398
function Turf_typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { Turf_typeof = function _typeof(obj) { return typeof obj; }; } else { Turf_typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return Turf_typeof(obj); }
@@ -101791,14 +101790,13 @@ var external_ol_geom_LineString_default = /*#__PURE__*/__webpack_require__.n(ext
101791101790

101792101791
var olExtends_olExtends = function olExtends(targetMap) {
101793101792
//解决olms.js插件，在使用ol.js时沿线标注不显示的问题，因为ol.geom.LineString.getFlatMidpoint未非公开方法
101794-
if (!external_ol_geom_LineString_default.a.getFlatMidpoint) {
101793+
if (!external_ol_geom_LineString_default.a.prototype.getFlatMidpoint) {
101795101794
external_ol_geom_LineString_default.a.prototype.getFlatMidpoint = function () {
101796101795
return this.getCoordinateAt(0.5);
101797101796
};
101798-
} //applyStyleFunction 调用了ol.geom.LineString.getFlatMidpoint但是该方法在ol-debug.js里才有
101799-
101797+
}
101800101798

101801-
if (core_Util_Util.getOlVersion() === '4' && window && window.ol && window.ol.geom.LineString.getFlatMidpoint) {
101799+
if (core_Util_Util.getOlVersion() === '4' && window && window.ol && window.ol.geom.flat) {
101802101800
// for ol4-debug
101803101801
window.targetMapCache = targetMap;
101804101802
var ol = window.ol; //解决 new ol.format.MVT({featureClass: ol.Feature})时，非3857显示异常的问题。ol即将发布的5.0版本已解决。
@@ -106282,11 +106280,11 @@ var ProvinceCenter = __webpack_require__(58);
106282106280
var MunicipalCenter = __webpack_require__(59);
106283106281

106284106282
// EXTERNAL MODULE: external "ol.View"
106285-
var external_ol_View_ = __webpack_require__(34);
106283+
var external_ol_View_ = __webpack_require__(35);
106286106284
var external_ol_View_default = /*#__PURE__*/__webpack_require__.n(external_ol_View_);
106287106285

106288106286
// EXTERNAL MODULE: external "ol.proj.proj4"
106289-
var external_ol_proj_proj4_ = __webpack_require__(35);
106287+
var external_ol_proj_proj4_ = __webpack_require__(29);
106290106288

106291106289
// EXTERNAL MODULE: external "ol.proj.Units"
106292106290
var external_ol_proj_Units_ = __webpack_require__(60);
@@ -106546,7 +106544,7 @@ function (_Observable) {
106546106544
// 多坐标系支持
106547106545

106548106546
if (lib) {
106549-
external_ol_proj_proj4_["register"] ? external_ol_proj_proj4_["register"](lib) : window.ol.proj.setProj4(lib);
106547+
external_ol_proj_proj4_ && external_ol_proj_proj4_["register"] ? external_ol_proj_proj4_["register"](lib) : window.ol.proj.setProj4(lib);
106550106548
} // 目前iServer服务中可能出现的EPSG 0，-1，-1000
106551106549

106552106550

‎dist/openlayers/iclient-openlayers.min.js‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/openlayers/07_AnimationFeature.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444

4545
function animate(event) {
4646
var duration = 3000;
47+
// ol6 废除了 event.vectorContext 接口，通过 ol.render.getVectorContext 来获取 vectorContext
4748
var vectorContext = new ol.render.getVectorContext(event);
4849
var frameState = event.frameState;
4950
var flashGeom = feature.getGeometry().clone();

‎examples/openlayers/controler_layerswitch.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
});
4545

4646
var swipe = document.getElementById('swipe');
47+
// ol6 废除了 precompose，由 prerender 事件替换
4748
worldNight.on('prerender', function (event) {
4849
var ctx = event.context;
4950
var width = ctx.canvas.width * (swipe.value / 100);
@@ -53,7 +54,7 @@
5354
ctx.rect(width, 0, ctx.canvas.width - width, ctx.canvas.height);
5455
ctx.clip();
5556
});
56-
57+
// ol6 废除了 postcompose，由 postrender 事件替换
5758
worldNight.on('postrender', function (event) {
5859
var ctx = event.context;
5960
ctx.restore();

‎examples/openlayers/echartsLianjia.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
position: absolute;
2424
width: 100%;
2525
height: 100%;
26-
border: 1px solid #3473b7;
2726
}
2827

2928
#titleContainer {

0 commit comments

Comments
 (0)