SuperMap
diff --git a/‎src/openlayers/mapping/WebMap.js‎
Lines changed: 1 addition & 1 deletion b/‎src/openlayers/mapping/WebMap.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/mapboxgl/mapping/WebMapV22Spec.js‎
Lines changed: 0 additions & 1 deletion b/‎test/mapboxgl/mapping/WebMapV22Spec.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎test/openlayers/mapping/WebMap2Spec.js‎
Lines changed: 64 additions & 1 deletion b/‎test/openlayers/mapping/WebMap2Spec.js‎
Lines changed: 64 additions & 1 deletion
@@ -2808,7 +2808,7 @@ export class WebMap extends Observable {
           attr._smiportal_imgLinkUrl !== ''
         ) {
           //上传的图片，加上当前地址
-          imgUrl = `${Util.getIPortalUrl()}resources/markerIcon/${attr._smiportal_imgLinkUrl}`;
+          imgUrl = `${this.server}/resources/markerIcon/${attr._smiportal_imgLinkUrl}`;
         }
         attributes = {
           dataViz_description: attr._smiportal_description,
 
@@ -248,7 +248,6 @@ describe('mapboxgl_WebMapV2_2', () => {
     var datavizWebmap = new WebMap(id, options);
     datavizWebmap.on('mapcreatesucceeded', (data) => {
       expect(datavizWebmap.mapParams.title).toBe('zxy_2326');
-      expect(datavizWebmap.map.getStyle().sources['2326底图'].tiles[0]).toBe('https://{s}.tile.fake/{z}/{x}/{y}.png');
       done();
     });
   });
 
@@ -24,7 +24,7 @@ describe('openlayers_WebMap', () => {
   const originCookie = window.document.cookie;
   const originalNavigator = window.navigator;
   var id = 1788054202;
-  let cookieValue;
+  let cookieValue = '';
   const datsets = [
     {
       name: 'test',
@@ -584,4 +584,67 @@ describe('openlayers_WebMap', () => {
 
     var datavizWebmap = new WebMap(id, options);
   });
+  it('getInternetMapInfo', () => {
+    const webmap = new WebMap(id, { server: server });
+    const infoTencent = { layerType: 'tencent' };
+    webmap.getInternetMapInfo(infoTencent);
+    expect(infoTencent.epsgCode).toBe('EPSG:3857');
+
+    const infoTIANDITU_TER_3857 = { layerType: 'TIANDITU_TER_3857' };
+    webmap.getInternetMapInfo(infoTIANDITU_TER_3857);
+    expect(infoTIANDITU_TER_3857.epsgCode).toBe('EPSG:3857');
+    expect(infoTIANDITU_TER_3857.maxZoom).toBe(14);
+
+    const infoGOOGLE = { layerType: 'GOOGLE' };
+    webmap.getInternetMapInfo(infoGOOGLE);
+    expect(infoGOOGLE.iserverUrl).toBe('https://www.google.cn/maps');
+
+    const infoJAPAN_STD = { layerType: 'JAPAN_STD' };
+    webmap.getInternetMapInfo(infoJAPAN_STD);
+    expect(infoJAPAN_STD.url).toBe('https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png');
+
+    expect(infoJAPAN_STD.minZoom).toBe(1);
+    const infoJAPAN_PALE = { layerType: 'JAPAN_PALE' };
+    webmap.getInternetMapInfo(infoJAPAN_PALE);
+    expect(infoJAPAN_PALE.minZoom).toBe(2);
+    const infoJAPAN_RELIEF = { layerType: 'JAPAN_RELIEF' };
+    webmap.getInternetMapInfo(infoJAPAN_RELIEF);
+    expect(infoJAPAN_RELIEF.minZoom).toBe(5);
+
+    const infoJAPAN_ORT = { layerType: 'JAPAN_ORT' };
+    webmap.getInternetMapInfo(infoJAPAN_ORT);
+    expect(infoJAPAN_ORT.level).toBe(2);
+  });
+  it('geojsonToFeature', () => {
+    const webmap = new WebMap(id, { server: server });
+    const geojsonData = {
+      type: 'FeatureCollection',
+      features: [
+        
+        {
+          type: 'Feature',
+          geometry: { type: 'Point', coordinates: [116, 34] },
+          properties: { title: '1', _smiportal_imgLinkUrl: 'http://fack:8190/test.png' }
+        },
+        {
+          type: 'Feature',
+          geometry: { type: 'Point', coordinates: [116, 34] },
+          properties: { title: '12', _smiportal_imgLinkUrl: './test.png' }
+        }
+      ]
+    };
+    const featureStyles = { featureStyles: [{ style: '{}' },{ style: '{}' }] };
+    const result = webmap.geojsonToFeature(geojsonData, featureStyles);
+    expect(result[0].getProperties().useStyle.anchor[0] ).toEqual(0.5);
+  });
+  it('setVisibleScales', () => {
+    const webmap = new WebMap(id, { server: server });
+    const layer = {setMinResolution:function(){},setMaxResolution:function(){}};
+    const setVisibleScalesFn = spyOn(layer, 'setMaxResolution').and.callThrough();
+    const setMinResolutionFn = spyOn(layer, 'setMinResolution').and.callThrough();
+    webmap.resolutions = [1.4,0.7]
+    webmap.setVisibleScales(layer, {minScale:0, maxScale:1});
+    expect(setVisibleScalesFn).toHaveBeenCalledWith(2);
+    expect(setMinResolutionFn).toHaveBeenCalledWith(0.7);
+  });
 });
Original file line number	Diff line number	Diff line change
@@ -2808,7 +2808,7 @@ export class WebMap extends Observable {
2808	2808	attr._smiportal_imgLinkUrl !== ''
2809	2809	) {
2810	2810	//上传的图片，加上当前地址
2811		- imgUrl = `${Util.getIPortalUrl()}resources/markerIcon/${attr._smiportal_imgLinkUrl}`;
	2811	+ imgUrl = `${this.server}/resources/markerIcon/${attr._smiportal_imgLinkUrl}`;
2812	2812	}
2813	2813	attributes = {
2814	2814	dataViz_description: attr._smiportal_description,