【update】 优化 openlayers include-ol.js review by songym

liqian7 · liqian7 · commit 472dcaf1ba5d · 2019-12-23T20:52:39.000+08:00
diff --git a/dist/ol/include-ol.js b/dist/ol/include-ol.js
@@ -107,15 +107,15 @@
         }
         
         // dist
-        if (!inArray(excludes, 'iclient-openlayers')) {
+        if (!inArray(excludes, 'iclient-ol')) {
           if (supportES6()) {
-              inputScript("../../dist/openlayers/iclient-openlayers-es6.min.js");
+              inputScript("../../dist/ol/iclient-ol-es6.min.js");
           } else {
-              inputScript("../../dist/openlayers/iclient-openlayers.min.js");
+              inputScript("../../dist/ol/iclient-ol.min.js");
           }
         }
-        if (!inArray(excludes, 'iclient-openlayers-css')) {
-            inputCSS("../../dist/openlayers/iclient-openlayers.min.css");
+        if (!inArray(excludes, 'iclient-ol-css')) {
+            inputCSS("../../dist/ol/iclient-ol.min.css");
         }
     }
 
diff --git a/examples/openlayers/changeTileVersion.html b/examples/openlayers/changeTileVersion.html
@@ -7,7 +7,7 @@
     <meta charset="UTF-8">
     <title data-i18n="resources.title_changeTileVersion"></title>
     <script type="text/javascript" src="../js/include-web.js"></script>
-    <script type="text/javascript" include="iclient-openlayers-css" src="../../dist/ol/include-ol.js"></script>
+    <script type="text/javascript" include="iclient-ol-css" src="../../dist/ol/include-ol.js"></script>
 </head>
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
diff --git a/examples/openlayers/mvtvectorlayer_mbstyle_beijing.html b/examples/openlayers/mvtvectorlayer_mbstyle_beijing.html
@@ -117,8 +117,8 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.1.1/css/ol.css">
     <script type="text/javascript" src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.1.1/build/ol.js"></script>
     <script type="text/javascript" src="https://iclient.supermap.io/web/libs/openlayers/plugins/ol-mapbox-style/2.11.2/olms.js"></script>
-    <script type="text/javascript" src="../../dist/openlayers/iclient-openlayers-es6.min.js"></script>
-    <link rel="stylesheet" href="../../dist/openlayers/iclient-openlayers.min.css">
+    <script type="text/javascript" src="../../dist/ol/iclient-ol-es6.min.js"></script>
+    <link rel="stylesheet" href="../../dist/ol/iclient-ol.min.css">
     <script type="text/javascript">
         var url = (window.isLocal ? window.server : "https://iserver.supermap.io") +
             "/iserver/services/map-beijing/rest/maps/beijingMap";

Original file line number	Diff line number	Diff line change
`@@ -107,15 +107,15 @@`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`// dist`
`110`		`- if (!inArray(excludes, 'iclient-openlayers')) {`
	`110`	`+ if (!inArray(excludes, 'iclient-ol')) {`
`111`	`111`	`if (supportES6()) {`
`112`		`- inputScript("../../dist/openlayers/iclient-openlayers-es6.min.js");`
	`112`	`+ inputScript("../../dist/ol/iclient-ol-es6.min.js");`
`113`	`113`	`} else {`
`114`		`- inputScript("../../dist/openlayers/iclient-openlayers.min.js");`
	`114`	`+ inputScript("../../dist/ol/iclient-ol.min.js");`
`115`	`115`	`}`
`116`	`116`	`}`
`117`		`- if (!inArray(excludes, 'iclient-openlayers-css')) {`
`118`		`- inputCSS("../../dist/openlayers/iclient-openlayers.min.css");`
	`117`	`+ if (!inArray(excludes, 'iclient-ol-css')) {`
	`118`	`+ inputCSS("../../dist/ol/iclient-ol.min.css");`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`