(#53) Refactored Location class into functions

Author: s1hofmann

lib/location.class.spec.ts renamed to lib/location.function.spec.ts

@@ -1,4 +1,4 @@
-import { Location } from "./location.class";
+import { centerOf, randomPointIn } from "./location.function";
 import { Point } from "./point.class";
 import { Region } from "./region.class";
 
@@ -7,12 +7,12 @@ describe("Location", () => {
     const expected = new Point(2, 2);
     const testRegion = new Region(0, 0, 4, 4);
 
-    expect(Location.centerOf(testRegion)).toEqual(expected);
+    expect(centerOf(testRegion)).resolves.toEqual(expected);
   });
 
-  it("should return a random point inside of an area.", () => {
+  it("should return a random point inside of an area.", async () => {
     const testRegion = new Region(100, 20, 50, 35);
-    const result = Location.randomPointIn(testRegion);
+    const result = await randomPointIn(testRegion);
     expect(result.x).toBeGreaterThanOrEqual(testRegion.left);
     expect(result.x).toBeLessThanOrEqual(testRegion.left + testRegion.width);
     expect(result.y).toBeGreaterThanOrEqual(testRegion.top);

lib/location.function.ts

@@ -0,0 +1,18 @@
+import { Point } from "./point.class";
+import { Region } from "./region.class";
+
+export const centerOf = async (target: Region | Promise<Region>): Promise<Point> => {
+  const targetRegion = await target;
+  const x = Math.floor(targetRegion.left + targetRegion.width / 2);
+  const y = Math.floor(targetRegion.top + targetRegion.height / 2);
+
+  return new Point(x, y);
+};
+
+export const randomPointIn = async (target: Region | Promise<Region>): Promise<Point> => {
+  const targetRegion = await target;
+  const x = Math.floor(targetRegion.left + Math.random() * targetRegion.width);
+  const y = Math.floor(targetRegion.top + Math.random() * targetRegion.height);
+
+  return new Point(x, y);
+};