修改openlayers webmap对接

songyumeng · songyumeng · commit 30cb40ebf8a5 · 2017-09-11T17:26:07.000+08:00
diff --git a/dist/iclient9-openlayers.js b/dist/iclient9-openlayers.js
@@ -33970,9 +33970,9 @@ var WebMap = function (_ol$Observable) {
                         }
                         me.createLayer(type, layerInfo);
                     }
-                    me.dispatchEvent({ type: _olDebug2.default.supermap.WebMap.EventType.WEBMAPLOADEND, value: this.map });
+                    me.dispatchEvent({ type: _olDebug2.default.supermap.WebMap.EventType.WEBMAPLOADEND, value: this });
                 });
-                view.fit(options.extent);
+                view.fit(viewOptions.extent);
             }
         }
     }, {
@@ -33986,9 +33986,6 @@ var WebMap = function (_ol$Observable) {
          * @param options -{Object} 创建图层所需参数
          */
         value: function addLayer(layer, options) {
-            if (!this.map) {
-                this.createMap(options);
-            }
             return this.map.addLayer(layer);
         }
     }, {
@@ -34014,18 +34011,6 @@ var WebMap = function (_ol$Observable) {
             return 'EPSG:' + epsgCode;
         }
 
-        /**
-         * @function ol.supermap.WebMap.prototype.createMap
-         * @description 创建地图
-         * @param options - {Object} 创建地图所需参数
-         */
-
-    }, {
-        key: 'createMap',
-        value: function createMap(options) {
-            if (!this.map) {}
-        }
-
         /**
          * @function ol.supermap.WebMap.prototype.getResolutionsFromScales
          * @description 通过比例尺获取分辨率
diff --git a/dist/iclient9-openlayers.min.js b/dist/iclient9-openlayers.min.js
diff --git a/dist/include-leaflet.js b/dist/include-leaflet.js
@@ -52,7 +52,7 @@
             inputScript("http://cdn.bootcss.com/elasticsearch/13.0.1/elasticsearch.min.js");
         }
         if (!inArray(excludes, 'iclient9-leaflet')) {
-            inputScript("../../dist/iclient9-leaflet.js");
+            inputScript("../../dist/iclient9-leaflet.min.js");
         }
         if (inArray(includes, 'iclient9-leaflet-css')) {
             inputCSS("../../dist/iclient9-leaflet.min.css");
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -110,9 +110,9 @@ export default class WebMap extends ol.Observable {
                     }
                     me.createLayer(type, layerInfo);
                 }
-                me.dispatchEvent({type: ol.supermap.WebMap.EventType.WEBMAPLOADEND, value: this.map});
+                me.dispatchEvent({type: ol.supermap.WebMap.EventType.WEBMAPLOADEND, value: this});
             })
-            view.fit(options.extent);
+            view.fit(viewOptions.extent);
 
         }
 
@@ -126,9 +126,6 @@ export default class WebMap extends ol.Observable {
      * @param options -{Object} 创建图层所需参数
      */
     addLayer(layer, options) {
-        if (!this.map) {
-            this.createMap(options);
-        }
         return this.map.addLayer(layer);
     }
 
@@ -153,17 +150,6 @@ export default class WebMap extends ol.Observable {
         return 'EPSG:' + epsgCode;
     }
 
-    /**
-     * @function ol.supermap.WebMap.prototype.createMap
-     * @description 创建地图
-     * @param options - {Object} 创建地图所需参数
-     */
-    createMap(options) {
-        if (!this.map) {
-
-        }
-    }
-
     /**
      * @function ol.supermap.WebMap.prototype.getResolutionsFromScales
      * @description 通过比例尺获取分辨率

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`inputScript("http://cdn.bootcss.com/elasticsearch/13.0.1/elasticsearch.min.js");`
`53`	`53`	`}`
`54`	`54`	`if (!inArray(excludes, 'iclient9-leaflet')) {`
`55`		`- inputScript("../../dist/iclient9-leaflet.js");`
	`55`	`+ inputScript("../../dist/iclient9-leaflet.min.js");`
`56`	`56`	`}`
`57`	`57`	`if (inArray(includes, 'iclient9-leaflet-css')) {`
`58`	`58`	`inputCSS("../../dist/iclient9-leaflet.min.css");`