zhousheep
diff --git a/‎dist/leaflet/include-leaflet.js
Lines changed: 2 additions & 2 deletions b/‎dist/leaflet/include-leaflet.js
Lines changed: 2 additions & 2 deletions
diff --git a/‎dist/openlayers/iclient9-openlayers-es6.js
Lines changed: 2556 additions & 2404 deletions b/‎dist/openlayers/iclient9-openlayers-es6.js
Lines changed: 2556 additions & 2404 deletions
diff --git a/‎dist/openlayers/iclient9-openlayers-es6.min.js
Lines changed: 1 addition & 1 deletion b/‎dist/openlayers/iclient9-openlayers-es6.min.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/openlayers/iclient9-openlayers.js
Lines changed: 2506 additions & 2373 deletions b/‎dist/openlayers/iclient9-openlayers.js
Lines changed: 2506 additions & 2373 deletions
diff --git a/‎dist/openlayers/iclient9-openlayers.min.js
Lines changed: 1 addition & 1 deletion b/‎dist/openlayers/iclient9-openlayers.min.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/leaflet/mapping/WebMap.js
Lines changed: 22 additions & 33 deletions b/‎src/leaflet/mapping/WebMap.js
Lines changed: 22 additions & 33 deletions
diff --git a/‎src/openlayers/mapping/ImageSuperMapRest.js
Lines changed: 1 addition & 1 deletion b/‎src/openlayers/mapping/ImageSuperMapRest.js
Lines changed: 1 addition & 1 deletion
@@ -78,9 +78,9 @@
         }
         if (!inArray(excludes, 'iclient9-leaflet')) {
             if (supportES6()) {
-                inputScript("../../dist/leaflet/iclient9-leaflet-es6.min.js");
+                inputScript("../../dist/leaflet/iclient9-leaflet-es6.js");
             } else {
-                inputScript("../../dist/leaflet/iclient9-leaflet.min.js");
+                inputScript("../../dist/leaflet/iclient9-leaflet.js");
             }
         }
         if (inArray(includes, 'iclient9-leaflet-css')) {
 
@@ -800,8 +800,7 @@ export var WebMap = L.LayerGroup.extend({
                     } else {
                         addFeatures(sFeaturesArr);
                     }
-                }, function () {
-                });
+                }, function () {});
             } else {
                 var newFeautures = [],
                     features = layerInfo.features;
@@ -1106,41 +1105,31 @@ export var WebMap = L.LayerGroup.extend({
             "convertType": convertType,
             "points": epsgArray
         };
-        var url = this.url + "coordconvert.json";
+        var url = this.server + "/apps/viewer/coordconvert.json";
         postData = JSON.stringify(postData);
-        var options = {
-            url: url,
-            isInTheSameDomain: true,
-            data: postData,
-            method: "POST",
-            success: function (success) {
-                return function (res) {
-                    if (success) {
-                        var newCoors = JSON.parse(res.responseText);
-                        if (!point && point.length !== undefined) {
-                            newCoors = newCoors[0];
-                        }
-                        me.fire('coordconvertsuccess', {
-                            newCoors: newCoors
-                        });
-                        success.call(me, newCoors);
-                    }
-                }
-            }(success),
-            failure: function (err) {
-                if (!me.actived) {
-                    return;
-                }
-                me.fire('coordconvertfailed', {
-                    err: err
-                });
-            },
-            scope: this
-        };
+        var options = {};
         if (!Util.isInTheSameDomain(url) && this.proxy) {
             options.proxy = this.proxy;
         }
-        Util.committer(options);
+        Request.post(url, postData, options).then((response) => {
+            return response.json()
+        }).then((jsonObj) => {
+            var newCoors = jsonObj;
+            if (!point && point.length !== undefined) {
+                newCoors = newCoors[0];
+            }
+            this.fire('coordconvertsuccess', {
+                newCoors: newCoors
+            });
+            success.call(this, newCoors);
+        }).catch((err) => {
+            if (!this.actived) {
+                return;
+            }
+            this.fire('coordconvertfailed', {
+                err: err
+            });
+        })
     },
     getSQLFromFilter: function (filter) {
 
 
@@ -88,7 +88,7 @@ export class ImageSuperMapRest extends ol.source.TileImage {
         layerUrl += "&transparent=" + transparent;
 
         //是否使用缓存吗，默认为true
-        var cacheEnabled = options.cacheEnabled !== undefined ? options.cacheEnabled : true;;
+        var cacheEnabled = options.cacheEnabled !== undefined ? options.cacheEnabled : true;
         layerUrl += "&cacheEnabled=" + cacheEnabled;
 
         //如果有layersID，则是在使用专题图
Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,9 @@`
`78`	`78`	`}`
`79`	`79`	`if (!inArray(excludes, 'iclient9-leaflet')) {`
`80`	`80`	`if (supportES6()) {`
`81`		`- inputScript("../../dist/leaflet/iclient9-leaflet-es6.min.js");`
	`81`	`+ inputScript("../../dist/leaflet/iclient9-leaflet-es6.js");`
`82`	`82`	`} else {`
`83`		`- inputScript("../../dist/leaflet/iclient9-leaflet.min.js");`
	`83`	`+ inputScript("../../dist/leaflet/iclient9-leaflet.js");`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`if (inArray(includes, 'iclient9-leaflet-css')) {`