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]>
Beakerboy · Jul 16, 2024 · 3fd6a38 · 3fd6a38
1 parent 228874c
commit 3fd6a38
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 8 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/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);
     }
@@ -411,6 +411,56 @@ class BuildingPart {
    * North is zero.
    */
   static cardinalToDegree(cardinal) {
+    const cardinalUpperCase = `${cardinal}`.toUpperCase();
+    if (cardinalUpperCase === 'N') {
+      return 0;
+    }
+    if (cardinalUpperCase === 'NE') {
+      return 45;
+    }
+    if (cardinalUpperCase === 'E') {
+      return 90;
+    }
+    if (cardinalUpperCase === 'SE') {
+      return 135;
+    }
+    if (cardinalUpperCase === 'S') {
+      return 180;
+    }
+    if (cardinalUpperCase === 'SW') {
+      return 225;
+    }
+    if (cardinalUpperCase === 'W') {
+      return 270;
+    }
+    if (cardinalUpperCase === 'NW') {
+      return 315;
+    }
+    if (cardinalUpperCase === 'NNE') {
+      return 22;
+    }
+    if (cardinalUpperCase === 'ENE') {
+      return 67;
+    }
+    if (cardinalUpperCase === 'ESE') {
+      return 112;
+    }
+    if (cardinalUpperCase === 'SSE') {
+      return 157;
+    }
+    if (cardinalUpperCase === 'SSW') {
+      return 202;
+    }
+    if (cardinalUpperCase === 'WSW') {
+      return 247;
+    }
+    if (cardinalUpperCase === 'WNW') {
+      return 292;
+    }
+    if (cardinalUpperCase === 'NNW') {
+      return 337;
+    }
+    return undefined;
   }
 
   /**

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);