Update combine_ways.test.js

Author: Beakerboy

test/combine_ways.test.js

@@ -32,9 +32,9 @@ test('Test combining 2 ways 1->2', () => {
   let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3]);
   // Expect one closed way with 3 unique nodes.
   expect(result.length).toBe(1);
-  expect(BuildingShapeUtils.isClosed(result[0]));
+  expect(BuildingShapeUtils.isClosed(result[0])).toBe(true);
   expect(result[0].getElementsByTagName('nd').length).toBe(4);
-  // expect result to contain nodes 1, 2 and 3.
+  expect(BuildingShapeUtils.isSelfIntersecting(result[0])).toBe(false);
 });
 
 test('Test combining 3 ways 2->1->3', () => {
@@ -47,9 +47,9 @@ test('Test combining 3 ways 2->1->3', () => {
   let xml3 = parser.parseFromString(way3, 'text/xml').getElementsByTagName('way')[0];
   let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3]);
   expect(result.length).toBe(1);
-  expect(BuildingShapeUtils.isClosed(result[0]));
-  // expect 4 nodes
-  // expect result to contain nodes 1, 2 and 3.
+  expect(BuildingShapeUtils.isClosed(result[0])).toBe(true);
+  expect(BuildingShapeUtils.isSelfIntersecting(result[0])).toBe(false);
+  expect(result[0].getElementsByTagName('nd').length).toBe(4);
 });
 
 test('Test combining 2 unaligned ways', () => {
@@ -62,9 +62,9 @@ test('Test combining 2 unaligned ways', () => {
   let xml3 = parser.parseFromString(way3, 'text/xml').getElementsByTagName('way')[0];
   let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3]);
   expect(result.length).toBe(1);
-  expect(BuildingShapeUtils.isClosed(result[0]));
-  // expect 4 nodes
-  // expect result to contain nodes 1, 2 and 3.
+  expect(BuildingShapeUtils.isClosed(result[0])).toBe(true);
+  expect(BuildingShapeUtils.isSelfIntersecting(result[0])).toBe(false);
+  expect(result[0].getElementsByTagName('nd').length).toBe(4);
 });
 
 test('Test combining 3 ways 1->2->3', () => {
@@ -78,9 +78,9 @@ test('Test combining 3 ways 1->2->3', () => {
   let xml3 = parser.parseFromString(way3, 'text/xml').getElementsByTagName('way')[0];
   let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3]);
   expect(result.length).toBe(1);
-  expect(BuildingShapeUtils.isClosed(result[0]));
-  // expect 4 nodes
-  // expect result to contain nodes 1, 2 and 3.
+  expect(BuildingShapeUtils.isClosed(result[0])).toBe(true);
+  expect(BuildingShapeUtils.isSelfIntersecting(result[0])).toBe(false);
+  expect(result[0].getElementsByTagName('nd').length).toBe(4);
 });
 
 test('Test combining 4 ways', () => {
@@ -96,24 +96,6 @@ test('Test combining 4 ways', () => {
   let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3, xml4]);
   expect(result.length).toBe(1);
   expect(BuildingShapeUtils.isClosed(result[0]));
-  // expect 5 nodes
-  // expect result to contain nodes 1, 2 3, and 4.
-});
-
-/**test('Test combining 4 ways, one not part of loop', () => {
-  var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/></way>';
-  var way2 = '<way id="2"><nd ref="3"/><nd ref="4"/></way>';
-  var way3 = '<way id="3"><nd ref="3"/><nd ref="1"/></way>';
-  var way4 = '<way id="4"><nd ref="2"/><nd ref="3"/></way>';
-  let parser = new window.DOMParser();
-  let xml1 = parser.parseFromString(way1, 'text/xml').getElementsByTagName('way')[0];
-  let xml2 = parser.parseFromString(way2, 'text/xml').getElementsByTagName('way')[0];
-  let xml3 = parser.parseFromString(way3, 'text/xml').getElementsByTagName('way')[0];
-  let xml4 = parser.parseFromString(way4, 'text/xml').getElementsByTagName('way')[0];
-  let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3, xml4]);
-  expect(result.length).toBe(1);
-  expect(BuildingShapeUtils.isClosed(result[1]));
-  // expect 4 nodes
-  // expect result to contain nodes 1, 2 and 3.
+  expect(BuildingShapeUtils.isSelfIntersecting(result[0])).toBe(false);
+  expect(result[0].getElementsByTagName('nd').length).toBe(5);
 });
-*/