Skip to content

Commit bd351f9

Browse files
songyumengsongyumeng
committed
【fix】矢量瓦片使用ol最新版本 review by luoxiao
1 parent 1db103f commit bd351f9

9 files changed

+113
-98
lines changed

‎dist/leaflet/iclient-leaflet-vue.js‎

Lines changed: 50 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,23 @@ var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_
758758

759759
/* harmony default export */ __webpack_exports__["default"] = (component.exports);
760760

761+
/***/ }),
762+
763+
/***/ "0b11":
764+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
765+
766+
"use strict";
767+
768+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/common/chart/ChartMixin.vue?vue&type=template&id=1f1efe10&
769+
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('sm-card',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"}],staticClass:"sm-component-chart",attrs:{"icon-class":_vm.iconClass,"icon-position":_vm.position,"header-name":_vm.headerName,"auto-rotate":_vm.autoRotate,"collapsed":_vm.collapsed}},[_c('v-chart',{ref:_vm.chartId,style:(_vm._chartStyle),attrs:{"id":_vm.chartId,"options":_vm._chartOptions,"initOptions":_vm.initOptions,"group":_vm.group,"manual-update":_vm.manualUpdate,"theme":_vm.theme || _vm.chartTheme},on:{"datazoom":_vm.dataZoomHandler}}),_vm._v(" "),_c('TablePopup',_vm._b({directives:[{name:"show",rawName:"v-show",value:(false),expression:"false"}],ref:"chartTablePopup",attrs:{"text-color":_vm.textColor,"background":_vm.background}},'TablePopup',_vm.tablePopupProps,false))],1)}
770+
var staticRenderFns = []
771+
772+
773+
// CONCATENATED MODULE: ./src/common/chart/ChartMixin.vue?vue&type=template&id=1f1efe10&
774+
/* concated harmony reexport render */__webpack_require__.d(__webpack_exports__, "a", function() { return render; });
775+
/* concated harmony reexport staticRenderFns */__webpack_require__.d(__webpack_exports__, "b", function() { return staticRenderFns; });
776+
777+
761778
/***/ }),
762779

763780
/***/ "0e27":
@@ -888,9 +905,7 @@ var _default2 = {
888905
options: {
889906
type: Object,
890907
default: function _default() {
891-
return {
892-
series: []
893-
};
908+
return {};
894909
}
895910
},
896911
autoresize: {
@@ -964,6 +979,10 @@ var _default2 = {
964979
parseOptions: function parseOptions() {
965980
var _this2 = this;
966981

982+
if (!this.options.series) {
983+
return this.options;
984+
}
985+
967986
if (this.options.series.find(function (item) {
968987
return item.type === '2.5Bar';
969988
})) {
@@ -1271,7 +1290,7 @@ var _default2 = {
12711290
return item.color || color;
12721291
}
12731292
});
1274-
var serieColor = _this5.options.series[seriesIndex] && _this5.options.series[seriesIndex].itemStyle && _this5.options.series[seriesIndex].itemStyle.color;
1293+
var serieColor = _this5.options.series && _this5.options.series[seriesIndex] && _this5.options.series[seriesIndex].itemStyle && _this5.options.series[seriesIndex].itemStyle.color;
12751294
serie.itemStyle = serie.itemStyle || {
12761295
color: ''
12771296
};
@@ -1689,22 +1708,25 @@ var _default2 = {
16891708
_createRingShineSeries: function _createRingShineSeries(series, optionsSeries) {
16901709
var _this10 = this;
16911710

1692-
this.datasetOptions.forEach(function (datasetOption, index) {
1693-
var _ref4 = optionsSeries[index] || {},
1694-
type = _ref4.type,
1695-
outerGap = _ref4.outerGap,
1696-
isShine = _ref4.isShine;
1711+
if (optionsSeries) {
1712+
this.datasetOptions.forEach(function (datasetOption, index) {
1713+
var _ref4 = optionsSeries[index] || {},
1714+
type = _ref4.type,
1715+
outerGap = _ref4.outerGap,
1716+
isShine = _ref4.isShine;
1717+
1718+
if (type === 'pie' && outerGap >= 0) {
1719+
var data = series[index].data.map(function (val) {
1720+
return val.value;
1721+
});
1722+
outerGap = outerGap || Math.min.apply(null, data) / 5;
1723+
series[index].data = _this10._createRingShineDataOption(series[index].data, outerGap, isShine);
1724+
delete optionsSeries[index].outerGap;
1725+
delete optionsSeries[index].isShine;
1726+
}
1727+
});
1728+
}
16971729

1698-
if (type === 'pie' && outerGap >= 0) {
1699-
var data = series[index].data.map(function (val) {
1700-
return val.value;
1701-
});
1702-
outerGap = outerGap || Math.min.apply(null, data) / 5;
1703-
series[index].data = _this10._createRingShineDataOption(series[index].data, outerGap, isShine);
1704-
delete optionsSeries[index].outerGap;
1705-
delete optionsSeries[index].isShine;
1706-
}
1707-
});
17081730
return series;
17091731
},
17101732
_createRingShineDataOption: function _createRingShineDataOption(data, outerGap, isShine) {
@@ -2013,7 +2035,7 @@ var _default2 = {
20132035
mapNotLoadedTip: function mapNotLoadedTip() {},
20142036
_dataZoomChanged: function _dataZoomChanged() {
20152037
var flag = false;
2016-
this.options.series.forEach(function (serie, index) {
2038+
this.options.series && this.options.series.forEach(function (serie, index) {
20172039
var labelConfig = serie.label && serie.label.normal;
20182040
flag = labelConfig.show && labelConfig.smart;
20192041
});
@@ -2025,7 +2047,7 @@ var _default2 = {
20252047
registerShape: function registerShape() {
20262048
var _this12 = this;
20272049

2028-
this.datasetOptions && this.datasetOptions.forEach(function (item, index) {
2050+
this.datasetOptions && this.options.series && this.datasetOptions.forEach(function (item, index) {
20292051
var graphicIntance = _this12.$options.graphic;
20302052

20312053
if (item.seriesType === '2.5Bar') {
@@ -2237,6 +2259,10 @@ var _default2 = {
22372259

22382260
var angle = 0;
22392261
this.startSpin = setInterval(function () {
2262+
if (!_this14.options.series) {
2263+
return;
2264+
}
2265+
22402266
if (_this14.options.series[0].customType === 'customRingsSeries') {
22412267
_this14.customSeries = [];
22422268
angle += 3;
@@ -9720,7 +9746,7 @@ module.exports = _iterableToArrayLimit;
97209746

97219747
"use strict";
97229748
__webpack_require__.r(__webpack_exports__);
9723-
/* harmony import */ var _ChartMixin_vue_vue_type_template_id_69d61d68___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("4762");
9749+
/* harmony import */ var _ChartMixin_vue_vue_type_template_id_1f1efe10___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("0b11");
97249750
/* harmony import */ var _ChartMixin_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("d83d");
97259751
/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _ChartMixin_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _ChartMixin_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
97269752
/* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("b429");
@@ -9733,8 +9759,8 @@ __webpack_require__.r(__webpack_exports__);
97339759

97349760
var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])(
97359761
_ChartMixin_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
9736-
_ChartMixin_vue_vue_type_template_id_69d61d68___WEBPACK_IMPORTED_MODULE_0__[/* render */ "a"],
9737-
_ChartMixin_vue_vue_type_template_id_69d61d68___WEBPACK_IMPORTED_MODULE_0__[/* staticRenderFns */ "b"],
9762+
_ChartMixin_vue_vue_type_template_id_1f1efe10___WEBPACK_IMPORTED_MODULE_0__[/* render */ "a"],
9763+
_ChartMixin_vue_vue_type_template_id_1f1efe10___WEBPACK_IMPORTED_MODULE_0__[/* staticRenderFns */ "b"],
97389764
false,
97399765
null,
97409766
null,
@@ -14484,23 +14510,6 @@ global.colorcolor = module.exports;
1448414510
/* ew */
1448514511
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("698d")))
1448614512

14487-
/***/ }),
14488-
14489-
/***/ "4762":
14490-
/***/ (function(module, __webpack_exports__, __webpack_require__) {
14491-
14492-
"use strict";
14493-
14494-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/common/chart/ChartMixin.vue?vue&type=template&id=69d61d68&
14495-
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('sm-card',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"}],staticClass:"sm-component-chart",attrs:{"icon-class":_vm.iconClass,"icon-position":_vm.position,"header-name":_vm.headerName,"auto-rotate":_vm.autoRotate,"collapsed":_vm.collapsed}},[_c('v-chart',{ref:_vm.chartId,style:(_vm._chartStyle),attrs:{"id":_vm.chartId,"options":_vm._chartOptions,"initOptions":_vm.initOptions,"group":_vm.group,"manual-update":_vm.manualUpdate,"theme":_vm.theme || _vm.chartTheme},on:{"datazoom":_vm.dataZoomHandler}}),_vm._v(" "),_c('TablePopup',_vm._b({directives:[{name:"show",rawName:"v-show",value:(false),expression:"false"}],ref:"chartTablePopup",attrs:{"text-color":_vm.textColor,"background":_vm.background}},'TablePopup',_vm.tablePopupProps,false))],1)}
14496-
var staticRenderFns = []
14497-
14498-
14499-
// CONCATENATED MODULE: ./src/common/chart/ChartMixin.vue?vue&type=template&id=69d61d68&
14500-
/* concated harmony reexport render */__webpack_require__.d(__webpack_exports__, "a", function() { return render; });
14501-
/* concated harmony reexport staticRenderFns */__webpack_require__.d(__webpack_exports__, "b", function() { return staticRenderFns; });
14502-
14503-
1450414513
/***/ }),
1450514514

1450614515
/***/ "4849":

‎dist/leaflet/iclient-leaflet-vue.min.js‎

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

‎dist/mapboxgl/iclient-mapboxgl-vue.js‎

Lines changed: 50 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2103,6 +2103,23 @@ var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_
21032103

21042104
/* harmony default export */ __webpack_exports__["default"] = (component.exports);
21052105

2106+
/***/ }),
2107+
2108+
/***/ "0b11":
2109+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
2110+
2111+
"use strict";
2112+
2113+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/common/chart/ChartMixin.vue?vue&type=template&id=1f1efe10&
2114+
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('sm-card',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"}],staticClass:"sm-component-chart",attrs:{"icon-class":_vm.iconClass,"icon-position":_vm.position,"header-name":_vm.headerName,"auto-rotate":_vm.autoRotate,"collapsed":_vm.collapsed}},[_c('v-chart',{ref:_vm.chartId,style:(_vm._chartStyle),attrs:{"id":_vm.chartId,"options":_vm._chartOptions,"initOptions":_vm.initOptions,"group":_vm.group,"manual-update":_vm.manualUpdate,"theme":_vm.theme || _vm.chartTheme},on:{"datazoom":_vm.dataZoomHandler}}),_vm._v(" "),_c('TablePopup',_vm._b({directives:[{name:"show",rawName:"v-show",value:(false),expression:"false"}],ref:"chartTablePopup",attrs:{"text-color":_vm.textColor,"background":_vm.background}},'TablePopup',_vm.tablePopupProps,false))],1)}
2115+
var staticRenderFns = []
2116+
2117+
2118+
// CONCATENATED MODULE: ./src/common/chart/ChartMixin.vue?vue&type=template&id=1f1efe10&
2119+
/* concated harmony reexport render */__webpack_require__.d(__webpack_exports__, "a", function() { return render; });
2120+
/* concated harmony reexport staticRenderFns */__webpack_require__.d(__webpack_exports__, "b", function() { return staticRenderFns; });
2121+
2122+
21062123
/***/ }),
21072124

21082125
/***/ "0c08":
@@ -5515,9 +5532,7 @@ var _default2 = {
55155532
options: {
55165533
type: Object,
55175534
default: function _default() {
5518-
return {
5519-
series: []
5520-
};
5535+
return {};
55215536
}
55225537
},
55235538
autoresize: {
@@ -5591,6 +5606,10 @@ var _default2 = {
55915606
parseOptions: function parseOptions() {
55925607
var _this2 = this;
55935608

5609+
if (!this.options.series) {
5610+
return this.options;
5611+
}
5612+
55945613
if (this.options.series.find(function (item) {
55955614
return item.type === '2.5Bar';
55965615
})) {
@@ -5898,7 +5917,7 @@ var _default2 = {
58985917
return item.color || color;
58995918
}
59005919
});
5901-
var serieColor = _this5.options.series[seriesIndex] && _this5.options.series[seriesIndex].itemStyle && _this5.options.series[seriesIndex].itemStyle.color;
5920+
var serieColor = _this5.options.series && _this5.options.series[seriesIndex] && _this5.options.series[seriesIndex].itemStyle && _this5.options.series[seriesIndex].itemStyle.color;
59025921
serie.itemStyle = serie.itemStyle || {
59035922
color: ''
59045923
};
@@ -6316,22 +6335,25 @@ var _default2 = {
63166335
_createRingShineSeries: function _createRingShineSeries(series, optionsSeries) {
63176336
var _this10 = this;
63186337

6319-
this.datasetOptions.forEach(function (datasetOption, index) {
6320-
var _ref4 = optionsSeries[index] || {},
6321-
type = _ref4.type,
6322-
outerGap = _ref4.outerGap,
6323-
isShine = _ref4.isShine;
6338+
if (optionsSeries) {
6339+
this.datasetOptions.forEach(function (datasetOption, index) {
6340+
var _ref4 = optionsSeries[index] || {},
6341+
type = _ref4.type,
6342+
outerGap = _ref4.outerGap,
6343+
isShine = _ref4.isShine;
6344+
6345+
if (type === 'pie' && outerGap >= 0) {
6346+
var data = series[index].data.map(function (val) {
6347+
return val.value;
6348+
});
6349+
outerGap = outerGap || Math.min.apply(null, data) / 5;
6350+
series[index].data = _this10._createRingShineDataOption(series[index].data, outerGap, isShine);
6351+
delete optionsSeries[index].outerGap;
6352+
delete optionsSeries[index].isShine;
6353+
}
6354+
});
6355+
}
63246356

6325-
if (type === 'pie' && outerGap >= 0) {
6326-
var data = series[index].data.map(function (val) {
6327-
return val.value;
6328-
});
6329-
outerGap = outerGap || Math.min.apply(null, data) / 5;
6330-
series[index].data = _this10._createRingShineDataOption(series[index].data, outerGap, isShine);
6331-
delete optionsSeries[index].outerGap;
6332-
delete optionsSeries[index].isShine;
6333-
}
6334-
});
63356357
return series;
63366358
},
63376359
_createRingShineDataOption: function _createRingShineDataOption(data, outerGap, isShine) {
@@ -6640,7 +6662,7 @@ var _default2 = {
66406662
mapNotLoadedTip: function mapNotLoadedTip() {},
66416663
_dataZoomChanged: function _dataZoomChanged() {
66426664
var flag = false;
6643-
this.options.series.forEach(function (serie, index) {
6665+
this.options.series && this.options.series.forEach(function (serie, index) {
66446666
var labelConfig = serie.label && serie.label.normal;
66456667
flag = labelConfig.show && labelConfig.smart;
66466668
});
@@ -6652,7 +6674,7 @@ var _default2 = {
66526674
registerShape: function registerShape() {
66536675
var _this12 = this;
66546676

6655-
this.datasetOptions && this.datasetOptions.forEach(function (item, index) {
6677+
this.datasetOptions && this.options.series && this.datasetOptions.forEach(function (item, index) {
66566678
var graphicIntance = _this12.$options.graphic;
66576679

66586680
if (item.seriesType === '2.5Bar') {
@@ -6864,6 +6886,10 @@ var _default2 = {
68646886

68656887
var angle = 0;
68666888
this.startSpin = setInterval(function () {
6889+
if (!_this14.options.series) {
6890+
return;
6891+
}
6892+
68676893
if (_this14.options.series[0].customType === 'customRingsSeries') {
68686894
_this14.customSeries = [];
68696895
angle += 3;
@@ -17170,7 +17196,7 @@ exports.default = WebSceneViewModel;
1717017196

1717117197
"use strict";
1717217198
__webpack_require__.r(__webpack_exports__);
17173-
/* harmony import */ var _ChartMixin_vue_vue_type_template_id_69d61d68___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("4762");
17199+
/* harmony import */ var _ChartMixin_vue_vue_type_template_id_1f1efe10___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("0b11");
1717417200
/* harmony import */ var _ChartMixin_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("d83d");
1717517201
/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _ChartMixin_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _ChartMixin_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
1717617202
/* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("b429");
@@ -17183,8 +17209,8 @@ __webpack_require__.r(__webpack_exports__);
1718317209

1718417210
var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])(
1718517211
_ChartMixin_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
17186-
_ChartMixin_vue_vue_type_template_id_69d61d68___WEBPACK_IMPORTED_MODULE_0__[/* render */ "a"],
17187-
_ChartMixin_vue_vue_type_template_id_69d61d68___WEBPACK_IMPORTED_MODULE_0__[/* staticRenderFns */ "b"],
17212+
_ChartMixin_vue_vue_type_template_id_1f1efe10___WEBPACK_IMPORTED_MODULE_0__[/* render */ "a"],
17213+
_ChartMixin_vue_vue_type_template_id_1f1efe10___WEBPACK_IMPORTED_MODULE_0__[/* staticRenderFns */ "b"],
1718817214
false,
1718917215
null,
1719017216
null,
@@ -24400,23 +24426,6 @@ var staticRenderFns = []
2440024426
/* concated harmony reexport staticRenderFns */__webpack_require__.d(__webpack_exports__, "b", function() { return staticRenderFns; });
2440124427

2440224428

24403-
/***/ }),
24404-
24405-
/***/ "4762":
24406-
/***/ (function(module, __webpack_exports__, __webpack_require__) {
24407-
24408-
"use strict";
24409-
24410-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/common/chart/ChartMixin.vue?vue&type=template&id=69d61d68&
24411-
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('sm-card',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"}],staticClass:"sm-component-chart",attrs:{"icon-class":_vm.iconClass,"icon-position":_vm.position,"header-name":_vm.headerName,"auto-rotate":_vm.autoRotate,"collapsed":_vm.collapsed}},[_c('v-chart',{ref:_vm.chartId,style:(_vm._chartStyle),attrs:{"id":_vm.chartId,"options":_vm._chartOptions,"initOptions":_vm.initOptions,"group":_vm.group,"manual-update":_vm.manualUpdate,"theme":_vm.theme || _vm.chartTheme},on:{"datazoom":_vm.dataZoomHandler}}),_vm._v(" "),_c('TablePopup',_vm._b({directives:[{name:"show",rawName:"v-show",value:(false),expression:"false"}],ref:"chartTablePopup",attrs:{"text-color":_vm.textColor,"background":_vm.background}},'TablePopup',_vm.tablePopupProps,false))],1)}
24412-
var staticRenderFns = []
24413-
24414-
24415-
// CONCATENATED MODULE: ./src/common/chart/ChartMixin.vue?vue&type=template&id=69d61d68&
24416-
/* concated harmony reexport render */__webpack_require__.d(__webpack_exports__, "a", function() { return render; });
24417-
/* concated harmony reexport staticRenderFns */__webpack_require__.d(__webpack_exports__, "b", function() { return staticRenderFns; });
24418-
24419-
2442024429
/***/ }),
2442124430

2442224431
/***/ "477a":

‎dist/mapboxgl/iclient-mapboxgl-vue.min.js‎

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

‎examples/openlayers/mvtvectorlayer_mbstyle_4326.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<meta charset="UTF-8">
99
<title data-i18n="resources.title_mvtVectorLayer"></title>
1010
<script type="text/javascript" src="../js/include-web.js"></script>
11-
<script type="text/javascript" include='ol-debug,ol-mapbox-style' src="../../dist/ol/include-ol.js"></script>
11+
<script type="text/javascript" include='ol-mapbox-style' src="../../dist/ol/include-ol.js"></script>
1212
<style>
1313
.ol-popup {
1414
position: absolute;

‎examples/openlayers/mvtvectorlayer_mbstyle_beijing.html‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,13 @@
114114
});
115115
</script>
116116
<link rel="stylesheet" href="https://cdn.bootcss.com/twitter-bootstrap/3.3.7/css/bootstrap.min.css">
117-
<link rel="stylesheet" href="https://cdn.bootcss.com/openlayers/4.6.5/ol-debug.css">
118-
<script type="text/javascript" src="https://cdn.bootcss.com/openlayers/4.6.5/ol-debug.js"></script>
119-
<script type="text/javascript" src="https://iclient.supermap.io/web/libs/openlayers/plugins/ol-mapbox-style/2.11.2/olms.js"></script>
120-
<script type="text/javascript" src="../../dist/ol/iclient-ol-es6.min.js"></script>
121-
<link rel="stylesheet" href="../../dist/ol/iclient-ol.min.css">
117+
<script type="text/javascript" include='ol-mapbox-style' src="../../dist/ol/include-ol.js"></script>
122118
<script type="text/javascript">
123119
var url = (window.isLocal ? window.server : "https://iserver.supermap.io") +
124120
"/iserver/services/map-beijing/rest/maps/beijingMap";
125121
/**
126122
* Elements that make up the popup.
127-
*/
123+
*/
128124
var container = document.getElementById('popup');
129125
var content = document.getElementById('popup-content');
130126
var closer = document.getElementById('popup-closer');

0 commit comments

Comments
 (0)