fix UT;review by qiw

Author: hechangqun

src/maplibregl/overlay/GraphicLayer.js

@@ -45,7 +45,7 @@
  * @returns this
  */
  addTo(map) {
- map.addLayer(this);
+ this.onAdd(map);
  return this;
  }
 

test/maplibregl/overlay/FGBLayerSpec.js

@@ -39,7 +39,7 @@ describe('maplibregl_FGBLayer', () => {
  center: [0, 0],
  zoom: 3
  });
- map.on('load', function() {
+ map.on('load', function () {
  done();
  });
  });
@@ -110,7 +110,6 @@ describe('maplibregl_FGBLayer', () => {
 
  it('render moveLayer onRemove setVisibility', (done) => {
  var fgblayer = new FGBLayer({
- id: 'FGBLayer_1',
  url: fgbUrl,
  extent: [0, 0, 21, 21],
  featureLoader: function (feature) {

test/maplibregl/overlay/GraphicLayerSpec.js

@@ -43,7 +43,7 @@ describe('maplibregl_GraphicLayer', () => {
  graphicLayer = new GraphicLayer("graphicLayer", {
  graphics: graphics
  });
- graphicLayer.onAdd(map);
+ graphicLayer.addTo(map);
  return graphicLayer
  }
  beforeEach(() => {
@@ -196,32 +196,14 @@ describe('maplibregl_GraphicLayer', () => {
  }, 0);
  });
 
- it("addTo moveTo onRemove render", (done) => {
- let graphics = [];
- for (let i = 0; i < coors.length; i++) {
- let lngLat = {
- lng: parseFloat(coors[i][0]),
- lat: parseFloat(coors[i][1])
- };
- graphics.push(new Graphic(lngLat));
- graphics[i].setId(i);
- graphics[i].setAttributes({ name: "graphic_" + i });
- }
- let graphicLayer1 = new GraphicLayer("graphicLayer1", {
- graphics: graphics
- });
- let map = new maplibregl.Map({
- container: 'map',
- style: 'mapbox://styles/mapbox/streets-v9',
- center: [13.413952, 52.531913],
- zoom: 16.000000000000004,
- pitch: 33.2
- });
- graphicLayer1.addTo(map);
- graphicLayer1.render();
- graphicLayer1.moveTo('test', true);
- graphicLayer1.onRemove();
- expect(graphicLayer1.renderer.graphics.length).toEqual(0);
- done();
+ it("moveTo onRemove render", (done) => {
+ let graphicLayer = creatGraphicLayer();
+ setTimeout(() => {
+ graphicLayer.render();
+ graphicLayer.moveTo('test', true);
+ graphicLayer.onRemove();
+ expect(graphicLayer.renderer.graphics.length).toEqual(0);
+ done();
+ }, 0);
  });
 });

test/maplibregl/overlay/ThreeLayerSpec.js

@@ -23,8 +23,6 @@ describe('maplibregl_ThreeLayer', () => {
  zoom: 16.000000000000004,
  pitch: 33.2
  });
-
-
  });
  beforeEach(() => {
  originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
@@ -57,16 +55,6 @@ describe('maplibregl_ThreeLayer', () => {
  [13.413977, 52.532063]
  ];
  threeLayer = new ThreeLayer('three');
- threeLayer.draw = (gl, scene, camera) => {
- var light = new PointLight(0xffffff);
- camera.add(light);
- var height = 10;
- var color = 0xff2200;
- var material = new MeshPhongMaterial({color: color});
- var mesh = threeLayer.toThreeMesh(coordinates, height, material, true);
- scene.add(mesh);
- };
-
  threeLayer.onAdd(map);
 
  setTimeout(() => {
@@ -176,8 +164,9 @@ describe('maplibregl_ThreeLayer', () => {
  });
 
  it('render _update draw', () => {
- expect(threeLayer.render()).not.toBeNull();
- const _this = threeLayer._update();
- expect(_this.draw()).not.toBeNull();
+ var threeLayer1 = new ThreeLayer('three1');
+ threeLayer1.onAdd(map);
+ threeLayer1.render();
+ expect(threeLayer1.draw()).not.toBeNull();
  });
 });