Dev (#66)

* Remove Extra 'round' Roof Type * Remove extranious round roof from list; add cardinal directions to roofs; removing warning of direction=0 for skillion roofs * Update main.yml * Extraneous round roof (#64) * Remove Extra 'round' Roof Type * Remove extranious round roof from list; add cardinal directions to roofs; removing warning of direction=0 for skillion roofs * Update main.yml --------- Co-authored-by: Justin Ormont <[email protected]> * added lang to html tag
Beakerboy · Dec 4, 2024 · a00fe4e · a00fe4e
1 parent 228874c
commit a00fe4e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,5 +1,5 @@
 name: CI
-on: push
+on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 
-<head>
+<head lang="en">
     <title>OpenStreetMap Building 3D Render</title>
     <meta charset="UTF-8" />
     <link rel="stylesheet" href="style.css">

diff --git a/src/buildingpart.js b/src/buildingpart.js
@@ -147,7 +147,7 @@ class BuildingPart {
     // Should Skillion be included here?
     const directionalRoofs = ['gabled', 'round'];
     calculatedOptions.roof.direction = this.options.specified.roof.direction ?? this.options.inherited.roof.direction;
-    if (!calculatedOptions.roof.direction && directionalRoofs.includes(calculatedOptions.roof.shape)) {
+    if (calculatedOptions.roof.direction === undefined && directionalRoofs.includes(calculatedOptions.roof.shape)) {
       // Radians pi > x >= -pi
       let longestSide = BuildingShapeUtils.longestSideAngle(this.shape);
       if (longestSide < 0) {
@@ -176,7 +176,7 @@ class BuildingPart {
       window.printError('Way ' + this.id + ' is taller than building. (' + this.options.building.height + '>' + this.options.inherited.building.height + ')');
     }
     // Should skillion automatically calculate a direction perpendicular to the longest outside edge if unspecified?
-    if (this.options.roof.shape === 'skillion' && !this.options.roof.direction) {
+    if (this.options.roof.shape === 'skillion' && this.options.roof.direction === undefined) {
       window.printError('Part ' + this.id + ' requires a direction. (https://wiki.openstreetmap.org/wiki/Key:roof:direction)');
     }
     this.extrusionHeight = this.options.building.height - this.options.building.minHeight - this.options.roof.height;
@@ -388,10 +388,10 @@ class BuildingPart {
    * Direction. In degrees, 0-360
    */
   static normalizeDirection(direction) {
-    // if (cardinal) {
-    //   convert to degrees
-    //   return degrees;
-    // }
+    const degrees = this.cardinalToDegree(direction);
+    if (degrees !== undefined) {
+      return degrees;
+    }
     if (direction) {
       return parseFloat(direction);
     }
@@ -407,10 +407,22 @@ class BuildingPart {
   }
 
   /**
-   * Convert a cardinal direction (ESE) to degrees 112°.
-   * North is zero.
+   * Convert a cardinal direction to degrees.
+   * North is zero and values increase clockwise.
+   *
+   * @param {string} cardinal - the direction.
+   *
+   * @return {int} degrees
    */
   static cardinalToDegree(cardinal) {
+    const cardinalUpperCase = `${cardinal}`.toUpperCase();
+    const index = 'N NNE NE ENE E ESE SE SSE S SSW SW WSW W WNW NW NNW'.split(' ').indexOf(cardinalUpperCase);
+    if (index === -1) {
+      return undefined;
+    }
+    const degreesTimesTwo = index * 45;
+    // integer floor
+    return degreesTimesTwo % 2 === 0 ? degreesTimesTwo / 2 : (degreesTimesTwo - 1) / 2;
   }
 
   /**

diff --git a/src/index.js b/src/index.js
@@ -132,7 +132,7 @@ function createFolders(folder, options) {
       if (property === 'colour') {
         roofFolder.addColor(options.roof, property);
       } else if (property === 'shape') {
-        const roofTypesAvailable = ['dome', 'flat', 'gabled', 'onion', 'pyramidal', 'skillion', 'hipped', 'round', 'gambrel', 'round'];
+        const roofTypesAvailable = ['dome', 'flat', 'gabled', 'onion', 'pyramidal', 'skillion', 'hipped', 'round', 'gambrel'];
         // If this roof is not supported, add it to the list for sanity.
         if (!roofTypesAvailable.includes(options.roof.shape)) {
           roofTypesAvailable.push(options.roof.shape);

diff --git a/test/buildingpart.test.js b/test/buildingpart.test.js
@@ -0,0 +1,7 @@
+import { BuildingPart } from '../src/buildingpart.js';
+
+test('Test Cardinal to Degree', () => {
+  expect(BuildingPart.cardinalToDegree('N')).toBe(0);
+  expect(BuildingPart.cardinalToDegree('sSw')).toBe(202);
+  expect(BuildingPart.cardinalToDegree('Wse')).toBeUndefined();
+});