fix icl-4542 创建临时图层报错 review by luox

Author: xilanhuaweidapao

src/common/iServer/GetGridCellInfosService.js

@@ -92,12 +92,15 @@ export class GetGridCellInfosService extends CommonServiceBase {
           method: "GET",
           data: null,
           scope: me,
-          success({result}) {
-            callback && me.getDatasetInfoCompleted(result, callback);
+          success(result) {
+            if (callback || !result.result) {
+              result = result.result ? result.result : result;
+              me.getDatasetInfoCompleted(result, callback);
+            }
           },
           failure: callback
         }).then(({result}) => {
-          return me.getDatasetInfoCompleted(result);
+          return result && me.getDatasetInfoCompleted(result);
         });
     }
 

src/common/iServer/SetLayerStatusService.js

@@ -106,9 +106,10 @@ export class SetLayerStatusService extends CommonServiceBase {
      */
     createTempLayerComplete(callback, result) {
         var me = this;
-        result.result = Util.transformResult(result.result);
-        if (result.result.succeed) {
-            me.lastparams.resourceID = result.result.newResourceID;
+        result = result.result ? result.result : result;
+        result = Util.transformResult(result);
+        if (result.succeed) {
+            me.lastparams.resourceID = result.newResourceID;
         }
 
         return me.processAsync(me.lastparams, callback);

test/common/iServer/GetGridCellInfosServiceSpec.js

@@ -94,6 +94,60 @@ describe('GetGridCellInfosService', () => {
         myService.processAsync(queryParam, queryCompleted);
     });
 
+    it('success:processAsync eventListeners', done => {
+      var queryParam = new GetGridCellInfosParameters({
+          datasetName: 'LandCover',
+          dataSourceName: 'World',
+          X: '110',
+          Y: '50'
+      });
+      var queryCompleted = event => {
+          eventCompleted = event;
+          try {
+              expect(myService.url).toEqual(
+                  dataServiceURL + '/datasources/World/datasets/LandCover'
+              );
+              myService.destroy();
+              queryParam.destroy();
+              done();
+          } catch (exception) {
+              expect(false).toBeTruthy();
+              console.log('GetGridCellInfosService_' + exception.name + ':' + exception.message);
+              myService.destroy();
+              queryParam.destroy();
+              done();
+          }
+      };
+      var queryError = event => {
+          eventFailed = event;
+      };
+      var myService = new GetGridCellInfosService(dataServiceURL, {
+          eventListeners: {
+              processCompleted: queryCompleted,
+              processFailed: queryError
+          }
+      });
+      spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
+          expect(method).toBe('GET');
+          expect(options).not.toBeNull();
+          if (testUrl.indexOf('/datasources/World/datasets/LandCover') > 0) {
+              return Promise.resolve(
+                  new Response(
+                      `{"childUriList":["http://localhost:8090/iserver/services/data-world/rest/data/datasources/World/datasets/LandCover/fields","http://localhost:8090/iserver/services/data-world/rest/data/datasources/World/datasets/LandCover/features","http://localhost:8090/iserver/services/data-world/rest/data/datasources/World/datasets/LandCover/domain"],"supportAttachments":false,"supportFeatureMetadatas":false,"datasetInfo":{"pixelFormat":"BIT32","maxValue":13,"description":"","type":"GRID","blockSize":256,"dataSourceName":"World","tableName":"LandCover","noValue":-9999,"minValue":0,"isReadOnly":false,"encodeType":"SGL","width":5760,"bounds":{"top":90,"left":-180,"bottom":-90,"leftBottom":{"x":-180,"y":-90},"right":180,"rightTop":{"x":180,"y":90}},"name":"LandCover","prjCoordSys":{"distanceUnit":"METER","projectionParam":null,"epsgCode":4326,"coordUnit":"DEGREE","name":"Longitude / Latitude Coordinate System---GCS_WGS_1984","projection":null,"type":"PCS_EARTH_LONGITUDE_LATITUDE","coordSystem":{"datum":{"name":"D_WGS_1984","type":"DATUM_WGS_1984","spheroid":{"flatten":0.00335281066474748,"name":"WGS_1984","axis":6378137,"type":"SPHEROID_WGS_1984"}},"unit":"DEGREE","spatialRefType":"SPATIALREF_EARTH_LONGITUDE_LATITUDE","name":"GCS_WGS_1984","type":"GCS_WGS_1984","primeMeridian":{"longitudeValue":0,"name":"Greenwich","type":"PRIMEMERIDIAN_GREENWICH"}}},"datasourceConnectionInfo":null,"height":2880}}`
+                  )
+              );
+          } else {
+              if (testUrl.indexOf('/datasources/World/datasets/LandCover/gridValue?x=110&y=50') > 0) {
+                  return Promise.resolve(
+                      new Response(`{"column":4640,"row":640,"value":1,"centerPoint":{"x":110,"y":50}}`)
+                  );
+              }
+          }
+          return null;
+      });
+      myService.processAsync(queryParam);
+  });
+
     it('fail:processAsync', done => {
         var url = dataServiceURL + '/datasources/World/datasets';
         var queryCompleted = event => {

test/common/iServer/SetLayerStatusServiceSpec.js

@@ -150,6 +150,51 @@ describe('SetLayerStatusService_processAsync', () => {
       });
       setLayerStatusService.processAsync(setLayerStatusParams).then(setLayerStatusCompleted);
   })
+
+  it('processAsync_resourceID_null eventListeners', (done) => {
+    var url = GlobeParameter.WorldURL;
+    var setLayersStatusEvtArgs = null;
+    var setLayerStatusParams = new SetLayerStatusParameters();
+    var layerStatus = new LayerStatus();
+    layerStatus.layerName = "super";
+    layerStatus.isVisible = true;
+    setLayerStatusParams.layerStatusList.push(layerStatus);
+    var setLayerStatusCompleted = (result) => {
+        setLayersStatusEvtArgs = result;
+        try {
+            expect(setLayersStatusEvtArgs.result).not.toBeNull();
+            expect(setLayerStatusService.lastparams).not.toBeNull();
+            setLayerStatusParams.destroy();
+            setLayerStatusService.destroy();
+            done();
+        } catch (exception) {
+            expect(false).toBeTruthy();
+            console.log("SetLayerStatusService_" + exception.name + ":" + exception.message);
+            setLayerStatusParams.destroy();
+            setLayerStatusService.destroy();
+            done();
+        }
+    };
+    var setLayerStatusService = new SetLayerStatusService(url, {
+      eventListeners: {
+          processCompleted: setLayerStatusCompleted
+      }
+    });
+    spyOn(FetchRequest, 'post').and.callFake((testUrl) => {
+        expect(testUrl).toBe(url+"/tempLayersSet");
+        return Promise.resolve(new Response(`{"postResultType":"CreateChild","newResourceID":"f701028a2b7144b19b582f55c1902b18_e0d63a4c61b840d1b33852fae49bad11","succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/map-world/rest/maps/World/tempLayersSet/f701028a2b7144b19b582f55c1902b18_e0d63a4c61b840d1b33852fae49bad11.json"}`));
+    });
+    spyOn(FetchRequest, 'put').and.callFake((testUrl,params) => {
+        expect(testUrl).toBe(url+"/tempLayersSet/f701028a2b7144b19b582f55c1902b18_e0d63a4c61b840d1b33852fae49bad11?elementRemain=true&reference=f701028a2b7144b19b582f55c1902b18_e0d63a4c61b840d1b33852fae49bad11&holdTime=15");
+        expect(params).not.toBeNull();
+        var paramsObj = JSON.parse(params.replace(/'/g, "\""));
+        expect(paramsObj[0].name).toContain("World");
+        expect(paramsObj[0].subLayers.layers[0].name).toBe("super");
+        expect(paramsObj[0].subLayers.layers[0].type).toBe("UGC");
+        return Promise.resolve(new Response(`{"succeed":true}`));
+    });
+    setLayerStatusService.processAsync(setLayerStatusParams);
+  })
 });