service 新增支持 promise,优化内部callback review by luox

Author: xilanhuaweidapao

examples/leaflet/01_layerService.html

@@ -27,7 +27,7 @@
     function layerService() {
         new L.supermap
             .LayerInfoService(url)
-            .getLayersInfo(function (serviceResult) {
+            .getLayersInfo().then((serviceResult) => {
                 var result = serviceResult.result;
                 var innerHTML = "";
                 result.subLayers.layers.map(function (layer) {

examples/leaflet/01_mapQueryByBounds.html

@@ -34,7 +34,7 @@
         });
         new L.supermap
             .QueryService(url)
-            .queryByBounds(param, function (serviceResult) {
+            .queryByBounds(param).then(function (serviceResult) {
                 var result = serviceResult.result;
                 resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
             });

examples/leaflet/01_mapQueryByDistance.html

@@ -35,7 +35,7 @@
         });
         new L.supermap
             .QueryService(url)
-            .queryByDistance(param, function (serviceResult) {
+            .queryByDistance(param).then(function (serviceResult) {
                 var result = serviceResult.result;
                 resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
             });

examples/leaflet/01_mapQueryByGeometry.html

@@ -34,7 +34,7 @@
         });
         new L.supermap
             .QueryService(url)
-            .queryByGeometry(param, function (serviceResult) {
+            .queryByGeometry(param).then(function (serviceResult) {
                 var result = serviceResult.result;
                 resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
             });

examples/leaflet/01_mapQueryByGeometry3857.html

@@ -38,7 +38,7 @@
         widgets.loader.showLoader();
         new L.supermap
             .QueryService(url)
-            .queryByGeometry(param, function (serviceResult) {
+            .queryByGeometry(param).then(function (serviceResult) {
                 //leaflet 绘制数据默认为 4326，服务器返回数据为 3857，因此在加载到地图前，先进行坐标系转换：
                 var result = L.supermap.Util.transform(serviceResult.result.recordsets[0].features, L.CRS.EPSG3857, L.CRS.EPSG4326);
                 widgets.loader.removeLoader();

examples/leaflet/01_mapQueryBySQL.html

@@ -34,9 +34,9 @@
         });
         new L.supermap
             .QueryService(url)
-            .queryBySQL(param, function (serviceResult) {
-                var result = serviceResult.result;
-                resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
+            .queryBySQL(param).then((serviceResult) => {
+              var result = serviceResult.result;
+              resultLayer = L.geoJSON(result.recordsets[0].features).addTo(map);
             });
     }
 </script>

examples/leaflet/01_mapQueryBySQL_FGB.html

@@ -34,11 +34,11 @@
           });
           new L.supermap
               .QueryService(url)
-              .queryBySQL(param, function (serviceResult) {
+              .queryBySQL(param, null, 'FGB').then(function (serviceResult) {
                 new L.supermap.FGBLayer(serviceResult.result.newResourceLocation, {
                   strategy: 'all'
               }).addTo(map);
-      }, 'FGB')};
+      })};
     </script>
   </body>
 </html>

examples/leaflet/01_mapService.html

@@ -25,7 +25,7 @@
     mapService();
 
     function mapService() {
-        new L.supermap.MapService(url).getMapInfo(function (serviceResult) {
+        new L.supermap.MapService(url).getMapInfo().then((serviceResult) => {
             var result = serviceResult.result;
             var innerHTML = "("+resources.text_mapInfoPrint+")" + "<br><br>";
             innerHTML += resources.text_mapName+"：" + JSON.stringify(result.name, null, 2) + "<br>";

examples/leaflet/01_measure_area.html

@@ -32,11 +32,10 @@
         var areaMeasureParam = new L.supermap.MeasureParameters(polygon);
         new L.supermap
             .MeasureService(url)
-            .measureArea(areaMeasureParam, function (serviceResult) {
+            .measureArea(areaMeasureParam).then(function (serviceResult) {
                 var content = resources.text_area + serviceResult.result.area + resources.msg_sqm;
                 polygon.bindPopup(content).openPopup(polygon.getCenter());
             });
-
     }
 </script>
 </body>

examples/leaflet/01_measure_distance.html

@@ -34,12 +34,10 @@
         var distanceMeasureParam = new L.supermap.MeasureParameters(polyLine);
         new L.supermap
             .MeasureService(url)
-            .measureDistance(distanceMeasureParam, function (serviceResult) {
+            .measureDistance(distanceMeasureParam).then(function (serviceResult) {
                 var content = resources.text_distance+"：" + serviceResult.result.distance + resources.msg_m;
                 marker1.bindPopup(content).openPopup(marker1.getLatLng());
             });
-
-
     }
 </script>
 </body>