add ut

Author: xilanhuaweidapao

src/openlayers/overlay/VectorTileSuperMapRest.js

@@ -352,7 +352,7 @@ export class VectorTileSuperMapRest extends VectorTile {
                 const sourceInfo = await response.json();
                 let tileUrl = sourceInfo.tiles[0];
                 if (!CommonUtil.isAbsoluteURL(tileUrl)) {
-                    tileUrl = CommonUtil.relative2absolute(tileUrl, style.sources[source].url);
+                    tileUrl = CommonUtil.relative2absolute(tileUrl, tiles);
                 }
                 newUrl = SecurityManager.appendCredential(tileUrl);
             }

test/openlayers/overlay/VectorTileSuperMapRestSpec.js

@@ -98,7 +98,6 @@ describe('openlayers_VectorTileSuperMapRest', () => {
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
 
-    spyGet = spyOn(FetchRequest, 'get').and.callFake((url) => mockCallback(url, 'GET'));
     spyPost = spyOn(FetchRequest, 'post').and.callFake((url) => mockCallback(url, 'POST'));
     spyCommit = spyOn(FetchRequest, 'commit').and.callFake((method, url) => mockCallback(url, method));
   });
@@ -116,6 +115,7 @@ describe('openlayers_VectorTileSuperMapRest', () => {
   });
 
   it('initialize', (done) => {
+    spyGet = spyOn(FetchRequest, 'get').and.callFake((url) => mockCallback(url, 'GET'));
     new MapService(url).getMapInfo((serviceResult) => {
       map = new Map({
         target: 'map',
@@ -144,6 +144,7 @@ describe('openlayers_VectorTileSuperMapRest', () => {
     });
   });
   it('custom_tileLoadFunction', (done) => {
+    spyGet = spyOn(FetchRequest, 'get').and.callFake((url) => mockCallback(url, 'GET'));
     var spy = jasmine.createSpy('test');
     var tileLoadFunction = (tile) => {
       tile.setLoader(() => {
@@ -174,7 +175,75 @@ describe('openlayers_VectorTileSuperMapRest', () => {
     });
   });
 
+  it('handle relative url', (done) => {
+    spyOn(FetchRequest, 'get').and.callFake((url) => {
+                if (url.indexOf('fake') > -1) {
+                  return Promise.resolve(new Response(JSON.stringify({
+                    tiles: ['tile/{z}/{y}/{x}.pbf']
+                  })));
+                } 
+                return Promise.resolve();
+    });
+    new MapService(url).getMapInfo((serviceResult) => {
+      map = new Map({
+        target: 'map',
+        view: new View({
+          center: [12957388, 4853991],
+          zoom: 11
+        })
+      });
+      vectorTileOptions = VectorTileSuperMapRest.optionsFromMapJSON(url, serviceResult.result);
+      vectorTileOptions.tileLoadFunction = (tile) => {
+        tile.setLoader(() => {
+          tile.setFeatures([]);
+        });
+      };
+      vectorTileOptions.format = new MVT();
+      vectorTileOptions.baseUrl = 'http://fake/iportal/services';
+      vectorTileOptions.style =  {
+        "version" : 8,
+        "sprite" : "../sprites/sprite",
+        "glyphs" : "../fonts/{fontstack}/{range}.pbf",
+        "sources": {
+            "esri": {
+                "type": "vector",
+                "url": "../../"
+            }
+        },
+        "layers" : [{
+                "id" : "Contour_11_main/0",
+                "type" : "line",
+                "source" : "esri",
+                "source-layer" : "Contour",
+                "filter" : ["all", ["==", "Index3", 1], ["==", "Index5", 1]],
+                "minzoom" : 11,
+                "maxzoom" : 12,
+                "paint" : {
+                    "line-color" : "#61674a",
+                    "line-opacity" : 0.5,
+                    "line-width" : {
+                        "base" : 1.2,
+                        "stops" : [[11, 0.7], [16, 1.1]]
+                    }
+                }	
+        }]
+    }
+      vectorTileSource = new VectorTileSuperMapRest(vectorTileOptions);
+      vectorTileSource.once('tileloadend', () => {
+        expect(vectorTileOptions).not.toBeNull();
+        expect(vectorTileOptions.crossOrigin).toBe('anonymous');
+        expect(vectorTileSource).not.toBeNull();
+        done();
+      });
+      vectorLayer = new VectorTileLayer({
+        source: vectorTileSource
+      });
+      map.addLayer(vectorLayer);
+    });
+  });
+
   it('mvt_decrypt ', (done) => {
+    spyGet = spyOn(FetchRequest, 'get').and.callFake((url) => mockCallback(url, 'GET'));
     const spy = jasmine.createSpy('test');
     const serviceKey = 'l3nQtAUM4li87qMfO68exInHVFQ5gS3a6pb8ySIbib8=';
     const spyEncrypt = spyOn(EncryptRequest.prototype, 'request').and.callFake(() => ({ json: () => Promise.resolve(serviceKey)}));

test/openlayers/overlay/vectortile/MapboxStylesSpec.js

@@ -279,4 +279,59 @@ describe("openlayers_MapboxStyles", () => {
             }
         });
     });
+
+    it("handle relative url", done => {
+      spyOn(XMLHttpRequest.prototype, 'send').and.callThrough();
+      spyOn(XMLHttpRequest.prototype, 'setRequestHeader').and.callThrough();
+      var style = {
+          "version" : 8,
+          "sprite" : "../sprites/sprite",
+          "glyphs" : "../fonts/{fontstack}/{range}.pbf",
+          "sources": {
+              "esri": {
+                  "type": "vector",
+                  "url": "../../"
+              }
+          },
+          "layers" : [{
+                  "id" : "Contour_11_main/0",
+                  "type" : "line",
+                  "source" : "esri",
+                  "source-layer" : "Contour",
+                  "filter" : ["all", ["==", "Index3", 1], ["==", "Index5", 1]],
+                  "minzoom" : 11,
+                  "maxzoom" : 12,
+                  "paint" : {
+                      "line-color" : "#61674a",
+                      "line-opacity" : 0.5,
+                      "line-width" : {
+                          "base" : 1.2,
+                          "stops" : [[11, 0.7], [16, 1.1]]
+                      }
+                  }	
+          }]
+      }
+      mapboxStyles = new MapboxStyles({
+          style: style,
+          baseUrl: 'http://localhost:9876',
+          map: map,
+          source: "California",
+          headers:{'appToken':'test'}
+      });
+      mapboxStyles.on("styleloaded", () => {
+          try {
+              style = mapboxStyles.getStyleFunction();
+              expect(style).not.toBeNull();
+              console.log('mapboxStyles', mapboxStyles);
+              expect(mapboxStyles._mbStyle.glyphs).toBe('http://localhost:9876/fonts/{fontstack}/{range}.pbf');
+              expect(mapboxStyles._mbStyle.sprite).toBe('http://localhost:9876/sprites/sprite');
+              expect(mapboxStyles._mbStyle.sources['esri']['url']).toBe('http://localhost:9876/');
+              done();
+          } catch (e) {
+              console.log("'init_Style_headers'案例失败" + e.name + ":" + e.message);
+              expect(false).toBeTruthy();
+              done();
+          }
+      });
+  });
 });

test/resources/MapboxStyles.js

@@ -8,7 +8,7 @@ var  vectorstylesEscapedJson={
         }
     },
     "name": "California",
-    "sprite": "../../base/resources/img/sprite@2x",
+    "sprite": "http://localhost:9876/base/resources/img/sprite@2x",
     "layers": [
         {
             "paint": {