Merge branch 'main' into Additional-tests

Author: Beakerboy

README.md

@@ -6,25 +6,25 @@ OSM Building Viewer
 
 ### Visualize an OSM Building in 3D
 
-Visualize an OSM Building from the live OSM data.
 To visualize a building tagged with a way, use the URL:
-https://beakerboy.github.io/OSMBuilding/index.html?id=[id]
+https://beakerboy.github.io/OSMBuilding?id=[id]
 
 If the building is a multipolygon, or a relation, use:
-https://beakerboy.github.io/OSMBuilding/index.html?type=relation&id=[id]
+https://beakerboy.github.io/OSMBuilding?type=relation&id=[id]
 
 ...replacing [id] with the actual id of the way or relation.
 
-Additional details will be displayed if "&info" is appended to the URL.
+Additional details will be displayed if `&info` is appended to the URL.
 
-Console debug messages can be printed to the screen if "&errorBox" is appended to the url. Helpful since mobile browsers often lack any inspection capability.
+Console debug messages can be printed to the screen if `&errorBox` is appended to the url. Helpful since mobile browsers often lack any inspection capability.
 
+Use the left mouse button to rotate the camera. To move, use the right one.
 
 Supports:
  * Ways with a building tag
  * Ways with building parts inside.
  * Building relations with way and/or multipolygon parts
- * Mulipolygon buildings
+ * Multipolygon buildings
  * Multipolygon building with multiple open ways which combine to a closed way.
 
 Roof Types:
@@ -43,3 +43,7 @@ Examples:
  * Building Relation [Burj Khalifa](https://beakerboy.github.io/OSMBuilding/index.html?type=relation&id=7584462)
  * Multipolygon with no parts - [Freer Art Gallery](https://beakerboy.github.io/OSMBuilding/index.html?type=relation&id=1029355)
  * Relation with multipolygon parts - [Leaning Tower of Pisa](https://beakerboy.github.io/OSMBuilding/index.html?type=relation&id=12982338)
+
+Specify the `osmApiUrl` parameter to use other OSM APIs. Examples:
+ * [OpenHistoricalMap](https://beakerboy.github.io/OSMBuilding/?id=2826540&osmApiUrl=https://api.openhistoricalmap.org/api/0.6&type=relation)
+ * [OpenGeofiction](https://beakerboy.github.io/OSMBuilding/?id=461819&osmApiUrl=https://opengeofiction.net/api/0.6&type=relation)

src/extras/BuildingShapeUtils.js

@@ -402,10 +402,10 @@ class BuildingShapeUtils extends ShapeUtils {
       p1 = points[i];
       p2 = points[i + 1];
       let angle = Math.atan2((p2.y - p1.y), (p2.x - p1.x));
-      if (angle >= Math.PI / 2) {
-        angle -= Math.PI;
-      } else if (angle < -Math.PI / 2) {
-        angle += Math.PI;
+      if (angle >= Math.PI) {
+        angle -= 2 * Math.PI;
+      } else if (angle < -Math.PI) {
+        angle += 2* Math.PI;
       }
       angles.push(angle);
     }
@@ -455,14 +455,12 @@ class BuildingShapeUtils extends ShapeUtils {
   }
 
   /**
-   * Calculate the angle of the longest side of a shape with 90° vertices.
-   * is begining / end duplicated?
+   * Return the angle of the longest side of a shape with 90° vertices.
    *
    * @param {THREE.Shape} shape - the shape
    * @return {number}
    */
   static longestSideAngle(shape) {
-    const vecs = shape.extractPoints().shape;
     const lengths = BuildingShapeUtils.edgeLength(shape);
     const directions = BuildingShapeUtils.edgeDirection(shape);
     var index;

test/utils.test.js

@@ -52,6 +52,11 @@ rightTriangle.moveTo(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);
+
 test('Extents no Rotation', () => {
   expect(BuildingShapeUtils.extents(rightTriangle)).toStrictEqual([-1, -1, 1, 1]);
 });
@@ -67,13 +72,15 @@ test('Edge Lengths', () => {
 });
 
 test('Edge Direction', () => {
-  expect(BuildingShapeUtils.edgeDirection(rightTriangle)).toBeDeepCloseTo([-Math.PI / 2, -Math.PI / 4, 0]);
+  expect(BuildingShapeUtils.edgeDirection(rightTriangle)).toBeDeepCloseTo([-Math.PI / 2, 3 * Math.PI / 4, 0]);
+});
+
+test('Edge Direction2', () => {
+  expect(BuildingShapeUtils.edgeDirection(rightTriangle2)).toBeDeepCloseTo([-Math.PI, -Math.PI / 4, Math.PI / 2]);
 });
 
 test('Longest side angle', () => {
-  // A three.Shape object does not repeat the fist and last nodes.
-  expect(rightTriangle.extractPoints().shape.length).toBe(3);
-  expect(BuildingShapeUtils.longestSideAngle(rightTriangle)).toBe(-Math.PI / 4);
+  expect(BuildingShapeUtils.longestSideAngle(rightTriangle)).toBe(3 * Math.PI / 4);
 });
 
 describe.each([
@@ -101,10 +108,6 @@ test('Vertex Angles', () => {
   expect(BuildingShapeUtils.vertexAngle(rightTriangle)).toStrictEqual([Math.PI / 2, Math.PI / 4, Math.PI / 4]);
 });
 
-const rightTriangle2 = new Shape();
-rightTriangle2.moveTo(1, 1);
-rightTriangle2.lineTo(-1, 1);
-rightTriangle2.lineTo(1, -1);
 test('Vertex Angles counterclockwise', () => {
   expect(BuildingShapeUtils.vertexAngle(rightTriangle2)).toStrictEqual([-Math.PI / 2, -Math.PI / 4, -Math.PI / 4]);
 });