Update combine_ways.js

Author: Beakerboy

test/combine_ways.js

@@ -24,7 +24,8 @@ test('Test no combining necessary. one open way', () => {
 test('Test combining 2 ways 1->2', () => {
   var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/></way>';
   var way2 = '<way id="2"><nd ref="3"/><nd ref="4"/><nd ref="1"/></way>';
-  var way3 = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="4"/><nd ref="1"/></way>';
+  var way3 = '<way id="2"><nd ref="3"/><nd ref="4"/><nd ref="1"/></way>';
+  var way4 = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="4"/><nd ref="1"/></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];
@@ -42,30 +43,33 @@ test('Test combining 3 ways 2->1->3', () => {
   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 result = BuildingShapeUtils.combineWays([xml1, xml2]);
+  let xml3 = parser.parseFromString(way2, 'text/xml').getElementsByTagName('way')[0];
+  let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3]);
   expect(result.length).toBe(1);
-  let expected = parser.parseFromString(way3, 'text/xml');
-  expect(result[0].outerHTML).toBe(way3);
+  let expected = parser.parseFromString(way4, 'text/xml');
+  expect(result[0].outerHTML).toBe(way4);
 });
 
 test('Test combining 2 unaligned ways', () => {
-  var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/></way>';
-  var way2 = '<way id="2"><nd ref="1"/><nd ref="4"/><nd ref="3"/></way>';
-  var way3 = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="4"/><nd ref="1"/></way>';
+  var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/></way>';
+  var way2 = '<way id="2"><nd ref="3"/><nd ref="2"/></way>';
+  var way2 = '<way id="3"><nd ref="3"/><nd ref="1"/></way>';
+  var way4 = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="1"/></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 result = BuildingShapeUtils.combineWays([xml1, xml2]);
+  let xml3 = parser.parseFromString(way2, 'text/xml').getElementsByTagName('way')[0];
+  let result = BuildingShapeUtils.combineWays([xml1, xml2, xml3]);
   expect(result.length).toBe(1);
-  let expected = parser.parseFromString(way3, 'text/xml');
-  expect(result[0].outerHTML).toBe(way3);
+  let expected = parser.parseFromString(way4, 'text/xml');
+  expect(result[0].outerHTML).toBe(way4);
 });
 
 test('Test combining 3 ways 1->2->3', () => {
-  var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/></way>';
-  var way2 = '<way id="2"><nd ref="3"/><nd ref="4"/><nd ref="5"/></way>';
-  var way3 = '<way id="3"><nd ref="5"/><nd ref="6"/><nd ref="1"/></way>';
-  var way4 = '<way id="1"><nd ref="1"/><nd ref="2"/><nd ref="3"/><nd ref="4"/><nd ref="5"/><nd ref="6"/><nd ref="1"/></way>';
+  var way1 = '<way id="1"><nd ref="1"/><nd ref="2"/></way>';
+  var way2 = '<way id="2"><nd ref="1"/><nd ref="3"/></way>';
+  var way3 = '<way id="3"><nd ref="2"/><nd ref="3"/><nd ref="1"/></way>';
+  var way4 = '<way id="2"><nd ref="3"/><nd ref="1"/><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];