Beakerboy patch 1 (#115)

Author: Beakerboy

src/building.js

@@ -151,6 +151,10 @@ class Building {
     return mesh;
   }
 
+  /**
+   * Inspect XML data for building parts and add them to the array.
+   *
+   */
   addParts() {
     if (this.type === 'relation') {
       let parts = this.fullXmlData.getElementById(this.id).querySelectorAll('member[role="part"]');

src/buildingpart.js

@@ -230,18 +230,7 @@ class BuildingPart {
     var way = this.way;
     var material;
     var roof;
-    if (this.options.roof.shape === 'flat') {
-      let extrusionHeight = this.options.roof.height ?? 0;
-      let extrudeSettings = {
-        bevelEnabled: false,
-        depth: extrusionHeight,
-      };
-      var geometry = new ExtrudeGeometry(this.shape, extrudeSettings);
-      // Create the mesh.
-      roof = new Mesh(geometry, [BuildingPart.getRoofMaterial(this.way), BuildingPart.getMaterial(this.way)]);
-      roof.rotation.x = -Math.PI / 2;
-      roof.position.set(0, this.options.building.height - this.options.roof.height, 0);
-    } else if (this.options.roof.shape === 'dome' || this.options.roof.shape === 'onion') {
+    if (this.options.roof.shape === 'dome' || this.options.roof.shape === 'onion') {
     //   find largest circle within the way
     //   R, x, y
       var thetaStart = Math.PI / 2;
@@ -303,7 +292,19 @@ class BuildingPart {
       roof.rotation.x = -Math.PI / 2;
       roof.position.set( 0, this.options.building.height - this.options.roof.height, 0);
     } else {
-      return;
+      let extrusionHeight = this.options.roof.height ?? 0;
+      let extrudeSettings = {
+        bevelEnabled: false,
+        depth: extrusionHeight,
+      };
+      var geometry = new ExtrudeGeometry(this.shape, extrudeSettings);
+      // Create the mesh.
+      roof = new Mesh(geometry, [BuildingPart.getRoofMaterial(this.way), BuildingPart.getMaterial(this.way)]);
+      roof.rotation.x = -Math.PI / 2;
+      roof.position.set(0, this.options.building.height - this.options.roof.height, 0);
+      if (this.options.roof.shape !== 'flat') {
+        window.printError('Unknown roof shape on '+ this.id + ': '+ this.options.roof.shape);
+      }
     }
     roof.name = 'r' + this.id;
     this.roof = roof;

src/extras/BuildingShapeUtils.js

@@ -280,6 +280,7 @@ class BuildingShapeUtils extends ShapeUtils {
    */
   static combineCoordinates(shape) {
     const points = shape.extractPoints().shape;
+    points.pop();
     var x = [];
     var y = [];
     var vec;
@@ -329,6 +330,7 @@ class BuildingShapeUtils extends ShapeUtils {
    */
   static edgeLength(shape) {
     const points = shape.extractPoints().shape;
+    points.pop();
     const lengths = [];
     var p1;
     var p2;
@@ -350,6 +352,7 @@ class BuildingShapeUtils extends ShapeUtils {
    */
   static vertexAngle(shape) {
     const points = shape.extractPoints().shape;
+    points.pop();
     const angles = [];
     var p0;
     var p1;
@@ -384,18 +387,14 @@ class BuildingShapeUtils extends ShapeUtils {
    */
   static edgeDirection(shape) {
     const points = shape.extractPoints().shape;
+    points.pop();
     const angles = [];
     var p1;
     var p2;
-    for (const i in points) {
+    for (let i = 0; i < points.length; i++) {
       p1 = points[i];
       p2 = points[(i + 1) % points.length];
       let angle = Math.atan2((p2.y - p1.y), (p2.x - p1.x));
-      if (angle >= Math.PI) {
-        angle -= 2 * Math.PI;
-      } else if (angle < -Math.PI) {
-        angle += 2* Math.PI;
-      }
       angles.push(angle);
     }
     return angles;
@@ -412,21 +411,36 @@ class BuildingShapeUtils extends ShapeUtils {
   static surrounds(shape, point) {
     var count = 0;
     const vecs = shape.extractPoints().shape;
+    vecs.pop();
     var vec;
     var nextvec;
-    for (let i = 0; i < vecs.length - 1; i++) {
+    for (let i = 0; i < vecs.length; i++) {
       vec = vecs[i];
-      nextvec = vecs[i+1];
+      nextvec = vecs[(i + 1) % vecs.length];
       if (vec.x === point[0] && vec.y === point[1]) {
         return true;
       }
-      const slope = (nextvec.y - vec.y) / (nextvec.x - vec.x);
-      const intercept = vec.y / slope / vec.x;
-      const intersection = (point[1] - intercept) / slope;
-      if (intersection > point[0]) {
-        count++;
-      } else if (intersection === point[0]) {
-        return true;
+      if (nextvec.x === vec.x) {
+        // vertical line
+        if (vec.x === point[0]) {
+          return true;
+        }
+        if (vec.x > point[0] && (vec.y > point[1] || nextvec.y > point[1]) && !(vec.y > point[1] && nextvec.y > point[1])){
+          count++;
+        }
+      } else if (nextvec.y === vec.y) {
+        if (vec.y === point[1] && (vec.x > point[0] || nextvec.x > point[0]) && !(vec.x > point[0] && nextvec.x > point[0])){
+          return true;
+        }
+      } else {
+        const slope = (nextvec.y - vec.y) / (nextvec.x - vec.x);
+        const intercept = vec.y - slope * vec.x;
+        const intersection = (point[1] - intercept) / slope;
+        if (intersection > point[0] && intersection < Math.max(nextvec.x, vec.x) && intersection > Math.min(nextvec.x, vec.x)) {
+          count++;
+        } else if (intersection === point[0]) {
+          return true;
+        }
       }
     }
     return count % 2 === 1;

test/building.test.js

@@ -31,26 +31,27 @@ import fetchMock from 'jest-fetch-mock';
 fetchMock.enableMocks();
 
 const data = `
-<osm>
-  <node id="3" lat="4" lon="4"/>
-  <node id="5" lat="4" lon="4.001"/>
-  <node id="6" lat="4.001" lon="4.001"/>
-  <node id="7" lat="4.001" lon="4"/>
-  <relation id="4">
-    <member ref="1" role="outer"/>
-    <tag k="type" v="multipolygon"/>
-    <tag k="building" v="yes"/>
-    <tag k="roof:shape" v="skillion"/>
-    <tag k="roof:direction" v="0"/>
-    <tag k="roof:angle" v="45"/>
-  </relation>
-  <way id="1">
-    <nd ref="3"/>
-    <nd ref="5"/>
-    <nd ref="6"/>
-    <nd ref="7"/>
-    <nd ref="3"/>
-  </way>
+<osm version="0.6" generator="openstreetmap-cgimap 2.0.1 (3529586 spike-06.openstreetmap.org)" copyright="OpenStreetMap and contributors" attribution="http://www.openstreetmap.org/copyright" license="http://opendatacommons.org/licenses/odbl/1-0/">
+<node id="349300285" visible="true" version="2" changeset="16924847" timestamp="2013-07-12T11:32:52Z" user="Oberaffe" uid="56597" lat="49.5833130" lon="11.0155721"/>
+<node id="349300289" visible="true" version="2" changeset="16924847" timestamp="2013-07-12T11:32:52Z" user="Oberaffe" uid="56597" lat="49.5834188" lon="11.0154519"/>
+<node id="349300292" visible="true" version="2" changeset="16924847" timestamp="2013-07-12T11:32:52Z" user="Oberaffe" uid="56597" lat="49.5833130" lon="11.0154519"/>
+<node id="349300295" visible="true" version="2" changeset="16924847" timestamp="2013-07-12T11:32:52Z" user="Oberaffe" uid="56597" lat="49.5834188" lon="11.0155721"/>
+<way id="31361386" visible="true" version="7" changeset="103461964" timestamp="2021-04-23T08:01:35Z" user="hans007" uid="376477">
+<nd ref="349300292"/>
+<nd ref="349300289"/>
+<nd ref="349300295"/>
+<nd ref="349300285"/>
+<nd ref="349300292"/>
+<tag k="addr:city" v="Erlangen"/>
+<tag k="addr:country" v="DE"/>
+<tag k="addr:housenumber" v="30"/>
+<tag k="addr:postcode" v="91052"/>
+<tag k="addr:street" v="Badstraße"/>
+<tag k="building" v="detached"/>
+<tag k="building:levels" v="1"/>
+<tag k="roof:levels" v="2"/>
+<tag k="roof:shape" v="gabled"/>
+</way>
 </osm>`;
 
 beforeEach(() => {
@@ -59,17 +60,20 @@ beforeEach(() => {
 });
 
 test('Test Constructor', async() => {
-  const bldg = new Building('4', data);
-  expect(bldg.home).toBeDeepCloseTo([4.0005, 4.0005], 10);
+  const bldg = new Building('31361386', data);
+  expect(bldg.home).toBeDeepCloseTo([11.015512, 49.5833659], 10);
   expect(bldg.parts.length).toBe(0);
+  expect(bldg.nodelist['349300285']).toStrictEqual([4.332747472106493, -5.882209888874915]);
+  expect(bldg.nodelist['349300289']).toStrictEqual([-4.332738077015795, 5.88221335051411]);
   expect(errors.length).toBe(0);
 });
 
 test('Create Nodelist', () => {
   let xmlData = new window.DOMParser().parseFromString(data, 'text/xml');
   const list = Building.buildNodeList(xmlData);
   expect(Object.keys(list).length).toBe(4);
-  expect(list['3']).toStrictEqual(['4', '4']);
+  // Long / Lat
+  expect(list['349300285']).toStrictEqual(['11.0155721', '49.5833130']);
   expect(errors.length).toBe(0);
 });
 

test/buildingpart.test.js

@@ -1,4 +1,37 @@
+/**
+ * @jest-environment jsdom
+ */
 import { BuildingPart } from '../src/buildingpart.js';
+import { BuildingShapeUtils } from '../src/extras/BuildingShapeUtils.js';
+import { TextEncoder } from 'node:util';
+
+const data = `
+<osm version="0.6" generator="openstreetmap-cgimap 2.0.1 (3529586 spike-06.openstreetmap.org)" copyright="OpenStreetMap and contributors" attribution="http://www.openstreetmap.org/copyright" license="http://opendatacommons.org/licenses/odbl/1-0/">
+<node id="349300285" visible="true" version="2" changeset="16924847" timestamp="2013-07-12T11:32:52Z" user="Oberaffe" uid="56597" lat="49.5833130" lon="11.0155721"/>
+<node id="349300289" visible="true" version="2" changeset="16924847" timestamp="2013-07-12T11:32:52Z" user="Oberaffe" uid="56597" lat="49.5834188" lon="11.0154519"/>
+<node id="349300292" visible="true" version="2" changeset="16924847" timestamp="2013-07-12T11:32:52Z" user="Oberaffe" uid="56597" lat="49.5833130" lon="11.0154519"/>
+<node id="349300295" visible="true" version="2" changeset="16924847" timestamp="2013-07-12T11:32:52Z" user="Oberaffe" uid="56597" lat="49.5834188" lon="11.0155721"/>
+<way id="31361386" visible="true" version="7" changeset="103461964" timestamp="2021-04-23T08:01:35Z" user="hans007" uid="376477">
+<nd ref="349300292"/>
+<nd ref="349300289"/>
+<nd ref="349300295"/>
+<nd ref="349300285"/>
+<nd ref="349300292"/>
+<tag k="addr:city" v="Erlangen"/>
+<tag k="addr:country" v="DE"/>
+<tag k="addr:housenumber" v="30"/>
+<tag k="addr:postcode" v="91052"/>
+<tag k="addr:street" v="Badstraße"/>
+<tag k="building" v="detached"/>
+<tag k="building:levels" v="1"/>
+<tag k="roof:levels" v="2"/>
+<tag k="roof:shape" v="gabled"/>
+</way>
+</osm>`;
+
+beforeEach(() => {
+  errors = [];
+});
 
 test('Test Cardinal to Degree', () => {
   expect(BuildingPart.cardinalToDegree('N')).toBe(0);
@@ -10,3 +43,41 @@ test('radToDeg', () => {
   expect (BuildingPart.atanRadToCompassDeg(0)).toBe(90);
   expect (BuildingPart.atanRadToCompassDeg(Math.PI / 2)).toBe(0);
 });
+
+test('Constructor', () => {
+  let xmlData = new window.DOMParser().parseFromString(data, 'text/xml');
+  const nodes = {
+    '349300285': [4.332747472106493, -5.882209888874915],
+    '349300289': [-4.332738077015795, 5.88221335051411],
+    '349300292': [-4.332738077015795, -5.882209888874915],
+    '349300295': [4.332747472106493, 5.88221335051411],
+  };
+  const part = new BuildingPart('31361386', xmlData, nodes);
+  expect(part.options.building.levels).toBe(1);
+  expect(part.options.roof.levels).toBe(2);
+  expect(part.options.roof.shape).toBe('gabled');
+
+  // Gabled with unspecified orientation shal be 'along'
+  expect(part.options.roof.orientation).toBe('along');
+
+  // Troubleshoot Bug
+  const shape = part.shape.extractPoints().shape;
+  let value = [shape[0].x, shape[0].y];
+  expect(value).toStrictEqual([-4.332738077015795, -5.882209888874915]);
+  value = [shape[1].x, shape[1].y];
+  expect(value).toStrictEqual([-4.332738077015795, 5.88221335051411]);
+  value = [shape[2].x, shape[2].y];
+  expect(value).toStrictEqual([4.332747472106493, 5.88221335051411]);
+  expect(BuildingShapeUtils.edgeDirection(part.shape)).toStrictEqual([Math.PI / 2, 0, -Math.PI / 2, Math.PI]);
+  expect(BuildingShapeUtils.longestSideAngle(part.shape)).toBe(Math.PI / 2);
+  expect(part.options.roof.direction).toBe(0);
+  expect(errors.length).toBe(0);
+});
+
+window.printError = printError;
+
+var errors = [];
+
+function printError(txt) {
+  errors.push[txt];
+}

test/utils.test.js

@@ -116,11 +116,13 @@ const rightTriangle = new Shape();
 rightTriangle.moveTo(1, 1);
 rightTriangle.lineTo(1, -1);
 rightTriangle.lineTo(-1, 1);
+rightTriangle.lineTo(1, 1);
 
 const rightTriangle2 = new Shape();
 rightTriangle2.moveTo(1, 1);
 rightTriangle2.lineTo(-1, 1);
 rightTriangle2.lineTo(1, -1);
+rightTriangle2.lineTo(1, 1);
 
 test('Extents no Rotation', () => {
   expect(BuildingShapeUtils.extents(rightTriangle)).toStrictEqual([-1, -1, 1, 1]);
@@ -149,7 +151,7 @@ test('Vertex Angles counterclockwise', () => {
 /** Test edgeDirection */
 describe.each([
   [rightTriangle, [-Math.PI / 2, 3 * Math.PI / 4, 0], 'CW'],
-  [rightTriangle2, [-Math.PI, -Math.PI / 4, Math.PI / 2], 'CCW'],
+  [rightTriangle2, [Math.PI, -Math.PI / 4, Math.PI / 2], 'CCW'],
 ])('Edge Direction', (shape, expected, description) =>{
   test(`${description}`, () => {
     expect(BuildingShapeUtils.edgeDirection(shape)).toBeDeepCloseTo(expected);
@@ -158,7 +160,8 @@ describe.each([
 
 /** Test surrounds */
 describe.each([
-  [[-1, -1], false, 'Outside'],
+  [[-.5, -.5], false, 'Outside but crossing'],
+  [[-1.5, -1.5], false, 'Outside no crossings'],
   [[1, 1], true, 'Share Node'],
   [[.5, .5], true, 'Inside'],
   [[0, 0], true, 'Border'],
@@ -180,8 +183,8 @@ test('Longest side angle', () => {
 
 /** Test repositionPoint */
 test('Reposition Point', () => {
-  const point = [11.0155721, 49.583313];
+  const point = [11.0154519, 49.5834188];
   const home = [11.015512, 49.5833659];
-  const expected = [4.332747472234555, -5.882209888874915];
+  const expected = [-4.3327380768877335, 5.88221335051411];
   expect(BuildingShapeUtils.repositionPoint(point, home)).toStrictEqual(expected);
 });