Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: zhurc

test/leaflet/overlay/GraphicLayerSpec.js

@@ -1,3 +1,4 @@
+import '../../libs/deck.gl/5.1.3/deck.gl';
 import {graphicLayer} from '../../../src/leaflet/overlay/GraphicLayer';
 import {tiledMapLayer} from '../../../src/leaflet/mapping/TiledMapLayer';
 import {circleStyle} from '../../../src/leaflet/overlay/graphic/CircleStyle';

test/leaflet/overlay/graphic/GraphicSpec.js

@@ -31,4 +31,9 @@ describe('leaflet_Graphic', () => {
         expect(graphic.getAttributes().type).toBe("point");
         graphic = null;
     });
+    it("getCanvas", () => {
+        graphic = graphicObj(option);
+        expect(graphic.getCanvas()).toBeUndefined();
+        graphic = null;
+    });
 });

test/mapboxgl/overlay/DeckglLayerSpec.js

@@ -1,8 +1,8 @@
 import mapboxgl from 'mapbox-gl';
 import '../../libs/deck.gl/5.1.3/deck.gl';
-import { Point } from '../../../src/common/commontypes/geometry/Point';
-import { LineString } from '../../../src/common/commontypes/geometry/LineString';
-import { DeckglLayer } from '../../../src/mapboxgl/overlay/DeckglLayer';
+import {Point} from '../../../src/common/commontypes/geometry/Point';
+import {LineString} from '../../../src/common/commontypes/geometry/LineString';
+import {DeckglLayer} from '../../../src/mapboxgl/overlay/DeckglLayer';
 
 mapboxgl.accessToken = 'pk.eyJ1IjoibW9ua2VyIiwiYSI6ImNpd2Z6aTE5YTAwdHEyb2tpOWs2ZzRydmoifQ.LwQMRArUP8Q9P7QApuOIHg';
 describe('mapboxgl_DeckglLayer', () => {
@@ -140,7 +140,7 @@ describe('mapboxgl_DeckglLayer', () => {
         var p2 = new Point(18.80757663534, 38.606951847395);
         var p3 = new Point(17.43207212138, 38.530259419285);
         deckglLayer = new DeckglLayer("scatter-plot", {
-            data: {p1,p2,p3},
+            data: {p1, p2, p3},
             props: {
                 radiusScale: 300,
                 radiusMaxPixels: 500,
@@ -158,11 +158,11 @@ describe('mapboxgl_DeckglLayer', () => {
                 getColor: function (feature) {
                     if (feature.Magnitude >= 2.5 && feature.Magnitude <= 3.31) {
                         return [118, 42, 131];
-                    } 
+                    }
                     return [0, 0, 0, 0]
                 },
                 getRadius: function (feature) {
-               
+
                     return Math.pow(Number(feature.Magnitude), 2.5);
                 }
             }
@@ -182,8 +182,8 @@ describe('mapboxgl_DeckglLayer', () => {
 
     it('setData,removeFromMap', (done) => {
         var data = [
-            { "ADDRESS": "939 ELLIS ST", "RACKS": 2, "SPACES": 4, "COORDINATES": [-122.42177834, 37.78346622] },
-            { "ADDRESS": "1380 HOWARD ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.414411, 37.774458] }
+            {"ADDRESS": "939 ELLIS ST", "RACKS": 2, "SPACES": 4, "COORDINATES": [-122.42177834, 37.78346622]},
+            {"ADDRESS": "1380 HOWARD ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.414411, 37.774458]}
         ];
         deckglLayer = new DeckglLayer("hexagon-layer", {
             data: features,
@@ -211,15 +211,15 @@ describe('mapboxgl_DeckglLayer', () => {
             expect(deckglLayer.data.length).toEqual(0);
             done();
         }, 3000)
-     
+
 
     });
 
     it('addData,removeData', (done) => {
         var data = [
-            { "ADDRESS": "939 ELLIS ST", "RACKS": 2, "SPACES": 4, "COORDINATES": [-122.42177834, 37.78346622] },
-            { "ADDRESS": "1380 HOWARD ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.414411, 37.774458] },
-            { "ADDRESS": "685 CHENERY ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.433618, 37.73435] }
+            {"ADDRESS": "939 ELLIS ST", "RACKS": 2, "SPACES": 4, "COORDINATES": [-122.42177834, 37.78346622]},
+            {"ADDRESS": "1380 HOWARD ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.414411, 37.774458]},
+            {"ADDRESS": "685 CHENERY ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.433618, 37.73435]}
         ];
         deckglLayer = new DeckglLayer("arc-layer", {
             data: features,
@@ -248,118 +248,4 @@ describe('mapboxgl_DeckglLayer', () => {
             done();
         }, 3000)
     });
-
-    it("getGraphicBy add getGraphicById", (done) => {
-        let graphics = [];
-        map = new ol.Map({
-            target: 'map',
-            view: new ol.View({
-                center: [0, 0],
-                zoom: 2,
-                projection: 'EPSG:4326'
-            }),
-            renderer: ['canvas']
-        });
-        for (let j = 0; j < coors.length; ++j) {
-            graphics[j] = new ol.Graphic(new ol.geom.Point(coors[j]));
-            graphics[j].setId(j);
-            graphics[j].setAttributes({name: "graphic_" + j});
-        }
-        const graphicLayer = new ol.layer.Image({
-            source: new Graphic({
-                graphics: graphics,
-                map: map
-            })
-        });
-        map.addLayer(graphicLayer);
-
-        setTimeout(() => {
-            const graphic = graphicLayer.getSource().getGraphicBy("id", 1);
-            expect(graphic).not.toBeNull();
-            expect(graphic.getId()).toEqual(1);
-
-            const graphic1 = graphicLayer.getSource().getGraphicById(1);
-            expect(graphic1.getId()).toEqual(1);
-
-            map.removeLayer(graphicLayer);
-            done();
-        }, 4000)
-
-
-    });
-    it("getGraphicsByAttribute", (done) => {
-        let graphics = [];
-        map = new ol.Map({
-            target: 'map',
-            view: new ol.View({
-                center: [0, 0],
-                zoom: 2,
-                projection: 'EPSG:4326'
-            }),
-            renderer: ['canvas']
-        });
-        for (let j = 0; j < coors.length; ++j) {
-            graphics[j] = new ol.Graphic(new ol.geom.Point(coors[j]));
-            graphics[j].setId(j);
-            graphics[j].setAttributes({name: "graphic_" + j});
-        }
-        const graphicLayer = new ol.layer.Image({
-            source: new Graphic({
-                graphics: graphics,
-                map: map
-            })
-        });
-        map.addLayer(graphicLayer);
-
-        setTimeout(() => {
-            const graphic = graphicLayer.getSource().getGraphicsByAttribute("name", "graphic_1");
-            expect(graphic).not.toBeNull();
-            expect(graphic[0].getAttributes().name).toBe("graphic_1");
-            map.removeLayer(graphicLayer);
-            done();
-        }, 4000);
-    });
-    it("removeGraphics", () => {
-        let graphics = [];
-        map = new ol.Map({
-            target: 'map',
-            view: new ol.View({
-                center: [0, 0],
-                zoom: 2,
-                projection: 'EPSG:4326'
-            }),
-            renderer: ['canvas']
-        });
-        for (let j = 0; j < coors.length; ++j) {
-            graphics[j] = new ol.Graphic(new ol.geom.Point(coors[j]));
-            graphics[j].setId(j);
-            graphics[j].setAttributes({name: "graphic_" + j});
-        }
-        const graphicLayer = new ol.layer.Image({
-            source: new Graphic({
-                graphics: graphics,
-                map: map
-            })
-        });
-        map.addLayer(graphicLayer);
-
-        setTimeout(() => {
-            const graphicSource = graphicLayer.getSource();
-            //删除单个
-            let deleteGraphic = graphic[0];
-            expect(graphicSource.graphics.length).toEqual(5);
-            graphicSource.removeGraphics(deleteGraphic);
-            expect(graphicSource.graphics.length).toEqual(4);
-
-            //多个
-            deleteGraphic = [graphic[1], graphic[2]];
-            graphicSource.removeGraphics(deleteGraphic);
-            expect(graphicSource.graphics.length).toEqual(2);
-
-            //默认
-            graphicSource.removeGraphics();
-            expect(graphicSource.graphics.length).toEqual(0);
-        }, 4000);
-
-    });
 });

test/mapboxgl/overlay/MapvLayerSpec.js

@@ -6,7 +6,19 @@ var url = GlobeParameter.ChinaURL + '/zxyTileImage.png?z={z}&x={x}&y={y}';
 
 describe('mapboxgl_MapVLayer', () => {
     var originalTimeout;
+    let data = [], dataSet;
     var testDiv, map, mapvLayer;
+    var options = {
+        gradient: {
+            0: 'blue',
+            0.5: 'yellow',
+            1: 'red'
+        },
+        lineWidth: 0.5,
+        max: 30,
+        draw: 'intensity',
+        layerID: "mapv"
+    };
     beforeAll(() => {
         testDiv = window.document.createElement("div");
         testDiv.setAttribute("id", "map");
@@ -38,49 +50,46 @@ describe('mapboxgl_MapVLayer', () => {
             center: [112, 37.94],
             zoom: 3
         });
-        map.on('load', () => {
-            var randomCount = 1000;
-            var data = [];
-            var citys = ["北京", "天津", "上海", "重庆", "石家庄", "太原", "呼和浩特", "哈尔滨", "长春", "沈阳", "济南", "南京", "合肥", "杭州", "南昌", "福州", "郑州", "武汉", "长沙", "广州", "南宁", "西安", "银川", "兰州", "西宁", "乌鲁木齐", "成都", "贵阳", "昆明", "拉萨", "海口"];
-            // 构造数据
-            while (randomCount--) {
-                var cityCenter1 = utilCityCenter.getCenterByCityName(citys[parseInt(Math.random() * citys.length)]);
-                var cityCenter2 = utilCityCenter.getCenterByCityName(citys[parseInt(Math.random() * citys.length)]);
-                data.push({
-                    geometry: {
-                        type: 'LineString',
-                        coordinates: [[cityCenter1.lng - 1 + Math.random() * 1, cityCenter1.lat - 1 + Math.random() * 1],
-                            [cityCenter2.lng - 1 + Math.random() * 1, cityCenter2.lat - 1 + Math.random() * 1]
-                        ]
-                    },
-                    count: 30 * Math.random()
-                });
-            }
-            var dataSet = new DataSet(data);
-            var options = {
-                gradient: {
-                    0: 'blue',
-                    0.5: 'yellow',
-                    1: 'red'
-                },
-                lineWidth: 0.5,
-                max: 30,
-                draw: 'intensity'
-            };
-            mapvLayer = new MapvLayer(map, dataSet, options);
-        });
 
     });
     beforeEach(() => {
         originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
         jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
+        var randomCount = 1000;
+        var citys = ["北京", "天津", "上海", "重庆", "石家庄", "太原", "呼和浩特", "哈尔滨", "长春", "沈阳", "济南", "南京", "合肥", "杭州", "南昌", "福州", "郑州", "武汉", "长沙", "广州", "南宁", "西安", "银川", "兰州", "西宁", "乌鲁木齐", "成都", "贵阳", "昆明", "拉萨", "海口"];
+        // 构造数据
+        while (randomCount--) {
+            var cityCenter1 = utilCityCenter.getCenterByCityName(citys[parseInt(Math.random() * citys.length)]);
+            var cityCenter2 = utilCityCenter.getCenterByCityName(citys[parseInt(Math.random() * citys.length)]);
+            data.push({
+                geometry: {
+                    type: 'LineString',
+                    coordinates: [[cityCenter1.lng - 1 + Math.random() * 1, cityCenter1.lat - 1 + Math.random() * 1],
+                        [cityCenter2.lng - 1 + Math.random() * 1, cityCenter2.lat - 1 + Math.random() * 1]
+                    ]
+                },
+                count: 30 * Math.random()
+            });
+        }
+        dataSet = new DataSet(data);
+
+        if (!map.getLayer("mapv")) {
+            mapvLayer = new MapvLayer(map, dataSet, options);
+        }
     });
     afterEach(() => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
+
+        if (map.getLayer("mapv")) {
+            map.removeLayer("mapv");
+        }
+        dataSet = null;
+        data = [];
     });
     afterAll(() => {
         document.body.removeChild(testDiv);
-        map=null;    });
+        map = null;
+    });
 
     it('initialize', (done) => {
         setTimeout(() => {
@@ -112,8 +121,6 @@ describe('mapboxgl_MapVLayer', () => {
         expect(thisMapvlayer.renderer.canvasLayer.canvas.style.display).toBe('none');
     });
 
-
-
     it('addData', () => {
         var data = [{
             geometry: {
@@ -180,30 +187,9 @@ describe('mapboxgl_MapVLayer', () => {
         expect(mapvLayer.dataSet._data.length).toEqual(0);
     });
 
-    it('draw, redraw', () => {
-        mapvLayer.draw();
-        expect(mapvLayer.canvas.width).toEqual(500);
-        expect(mapvLayer.canvas.style.width).toBe('500px');
-        mapvLayer.redraw();
-        expect(mapvLayer.canvas.width).toEqual(500);
-        expect(mapvLayer.canvas.style.width).toBe('500px');
-    });
-
     it('setZIndex', () => {
         mapvLayer.setZIndex(2);
         expect(mapvLayer.canvas.style.zIndex).toEqual('2');
     });
 
-    it('getCanvas', () => {
-        var canvas = mapvLayer.getCanvas();
-        expect(canvas).not.toBeNull();
-        expect(mapvLayer.canvas.width).toEqual(500);
-        expect(mapvLayer.canvas.height).toEqual(500);
-    });
-
-    it('getContainer', () => {
-        var container = mapvLayer.getContainer();
-        expect(container).not.toBeNull();
-    });
-
 });