Add tests for "two data points on the same spot"

Author: amotl

src/worldmap.test.ts

@@ -345,6 +345,49 @@ describe('Worldmap', () => {
     });
   });
 
+  describe('when the data has two points at the same spot', () => {
+    beforeEach(() => {
+      ctrl.data = new DataBuilder()
+        .withCountryAndValue('SE', 1)
+        .withCountryAndValue('SE', 2)
+        .build();
+      worldMap.drawCircles();
+    });
+
+    it('should draw just one circle on the map', () => {
+      expect(worldMap.circles.length).toBe(1);
+    });
+
+    it('should create a single circle popup with both data point values', () => {
+      expect(worldMap.circles[0]._popup._content).toBe('Sweden: 1\nSweden: 2');
+    });
+  });
+
+  describe('when the data is updated with two points at the same spot', () => {
+    beforeEach(() => {
+      ctrl.data = new DataBuilder()
+        .withCountryAndValue('SE', 1)
+        .withCountryAndValue('IE', 1)
+        .build();
+      worldMap.drawCircles();
+
+      ctrl.data = new DataBuilder()
+        .withCountryAndValue('SE', 1)
+        .withCountryAndValue('IE', 1)
+        .withCountryAndValue('SE', 2)
+        .build();
+      worldMap.drawCircles();
+    });
+
+    it('should draw just one circle on the map', () => {
+      expect(worldMap.circles.length).toBe(2);
+    });
+
+    it('should create a single circle popup with both data point values', () => {
+      expect(worldMap.circles[0]._popup._content).toBe('Sweden: 1\nSweden: 2');
+    });
+  });
+
   afterEach(() => {
     const fixture: HTMLElement = document.getElementById('fixture')!;
     document.body.removeChild(fixture);

src/worldmap.ts

@@ -193,14 +193,14 @@ export default class WorldMap {
       // Create circle.
       if (circles_by_key[dataPoint.key] == undefined) {
         circle = this.createCircle(dataPoint);
+        circles.push(circle);
         circles_by_key[dataPoint.key] = circle;
 
         // Amend popup content if circle has been created already.
       } else {
         circle = circles_by_key[dataPoint.key];
         this.extendPopupContent(circle, dataPoint);
       }
-      circles.push(circle);
     });
     this.circlesLayer = this.addCircles(circles);
     this.circles = circles;

test/data_builder.ts

@@ -35,6 +35,8 @@ export default class DataBuilder {
         value: value,
         valueRounded: value,
       };
+    } else {
+      throw new Error(`Unable to create fixture for country code ${countryCode}`);
     }
     this.data.push(dataPoint);