refactor!: change internal edge representation

4 files changed, 97 insertions, 123 deletions

diff --git a/src/Tile/Tile.test.ts b/src/Tile/Tile.test.ts
new file mode 100644
index 0000000..33bb16f
--- /dev/null
+++ b/src/Tile/Tile.test.ts
@@ -0,0 +1,47 @@
+import assert from 'assert';
+import Tile from './Tile';
+import { Direction } from './Tile';
+
+const { North, East, South, West } = Direction;
+
+describe('Tile', () => {
+  describe('getEdge', () => {
+    it('Should get North, East, South and West edges correctly', () => {
+      const tile = new Tile('F', 'RCFR');
+
+      assert.strictEqual(tile.edges[North], 'R');
+      assert.strictEqual(tile.edges[East], 'C');
+      assert.strictEqual(tile.edges[South], 'F');
+      assert.strictEqual(tile.edges[West], 'R');
+    });
+
+    it('Should respect tile orientation', () => {
+      const tile = new Tile('F', 'RCFR');
+      tile.orientation = 5;
+
+      assert.strictEqual(tile.edges, 'RRCF')
+    });
+
+    it('Should work with negative orientation', () => {
+      const tile = new Tile('F', 'RCFR');
+      tile.orientation = -7
+
+      assert.strictEqual(tile.edges, 'RRCF')
+    });
+  });
+
+  describe('getAttachments', () => {
+    it('Should correclty list legal attachments', () => {
+      const attachTo = new Tile('C', 'RCCR')
+      const tile = new Tile('R', 'FRRF')
+
+      const attachments = attachTo.getAttachments(tile);
+      assert.strictEqual(attachments.length, 4);
+      assert.deepStrictEqual(attachments[0], { edge: 0, orientation: 1, tile, attachTo });
+      assert.deepStrictEqual(attachments[1], { edge: 0, orientation: 0, tile, attachTo });
+      assert.deepStrictEqual(attachments[2], { edge: 3, orientation: 0, tile, attachTo });
+      assert.deepStrictEqual(attachments[3], { edge: 3, orientation: 3, tile, attachTo });
+    });
+  });
+});
+
diff --git a/src/Tile/Tile.ts b/src/Tile/Tile.ts
index 5bc6a7a..2e6f2ba 100644
--- a/src/Tile/Tile.ts
+++ b/src/Tile/Tile.ts
@@ -1,40 +1,72 @@
+import _ from 'lodash';
+
 export enum Direction {
   North,
   East,
   South,
   West
 }
-
-export enum Feature {
-  Grass = 'G',
-  Road = 'R',
-  Town = 'T',
-  River = 'I',
-  Church = 'C',
+export interface Attachment {
+  attachTo: Tile;
+  edge: Direction;
+  tile: Tile;
+  orientation: number;
 }
 
-
-// Abstract Tile data
 export default class Tile {
-  center: Feature;
-  sides: [Feature, Feature, Feature, Feature];
+  center: string;
+  private _edges: string;
   shield?: boolean;
 
+  private _orientation: number; // Clockwise rotation of a tile
+  position: {
+    x: number;
+    y: number;
+  }
+
   public constructor(
-    center: Feature,
-    sides: [Feature, Feature, Feature, Feature],
-    shield = false
+    center: string,
+    edges: string,
+    shield = false,
+    position = { x: 0, y: 0 },
+    orientation = 0
   ) {
     this.center = center;
-    this.sides = sides;
+    this._edges = edges;
     this.shield = shield;
+    this.position = position;
+    this.orientation = orientation;
+  }
+
+  public set orientation(orientation) {
+    this._orientation = ((orientation % 4) + 4) % 4;
+  }
+
+  public get orientation() {
+    return this._orientation;
   }
 
-  getSide(direction: Direction) {
-    return this.sides[((direction % 4) + 4) % 4];
+  public get edges() {
+    return _.repeat(this._edges, 2).slice(4 - this.orientation, 8 - this.orientation);
   }
 
   print() {
-    console.log( ` ${this.getSide(Direction.North)} \n${this.getSide(Direction.West)}${this.center}${this.getSide(Direction.East)}\n ${this.getSide(Direction.South)} `);
+    console.log( ` ${this.edges[Direction.North]} \n${this.edges[Direction.West]}${this.center}${this.edges[Direction.East]}\n ${this.edges[Direction.South]} `);
+  }
+
+  getAttachments(tile: Tile): Attachment[] {
+    return _.flatten(_.map(this.edges, (feature, edge) => {
+      const oppositeEdge = (edge + 2) % 4;
+
+      return _
+        .map(tile.edges, (candidate, index) => candidate === feature ? index : -1)
+        .filter(index => index !== -1)
+        .map(index => ({
+          edge,
+          orientation: (((oppositeEdge - index) % 4) + 4) % 4,
+          attachTo: this,
+          tile,
+        }));
+    }));
   }
 }
diff --git a/src/Tile/TileOnBoard.test.ts b/src/Tile/TileOnBoard.test.ts
deleted file mode 100644
index de2685d..0000000
--- a/src/Tile/TileOnBoard.test.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import assert from 'assert';
-import TileOnBoard from './TileOnBoard';
-import { Direction, Feature } from './Tile';
-
-const { North, East, South, West } = Direction;
-const { Road, Town, Grass, River } = Feature;
-
-describe('TileOnBoard', () => {
-  describe('getSide', () => {
-    it('Should get North, East, South and West sides correctly', () => {
-      const tile = new TileOnBoard(Grass, [Road, Town, Grass, River]);
-
-      assert.strictEqual(tile.getSide(North), Road);
-      assert.strictEqual(tile.getSide(East), Town);
-      assert.strictEqual(tile.getSide(South), Grass);
-      assert.strictEqual(tile.getSide(West), River);
-    });
-
-    it('Should respect tile orientation', () => {
-      const tile = new TileOnBoard(Grass, [Road, Town, Grass, River]);
-      tile.rotate(5);
-
-      assert.strictEqual(tile.getSide(North), River);
-      assert.strictEqual(tile.getSide(East), Road);
-      assert.strictEqual(tile.getSide(South), Town);
-      assert.strictEqual(tile.getSide(West), Grass);
-    });
-
-    it('Should work with negative orientation', () => {
-      const tile = new TileOnBoard(Grass, [Road, Town, Grass, River]);
-      tile.rotate(-7);
-
-      assert.strictEqual(tile.getSide(North), River);
-      assert.strictEqual(tile.getSide(East), Road);
-      assert.strictEqual(tile.getSide(South), Town);
-      assert.strictEqual(tile.getSide(West), Grass);
-    });
-  });
-
-  describe('getAttachments', () => {
-    it('Should correclty list legal attachments', () => {
-      const attachTo = new TileOnBoard(Town, [Road, Town, Town, Road])
-      const tile = new TileOnBoard(Road, [Grass, Road, Road, Grass])
-
-      const attachments = attachTo.getAttachments(tile);
-      assert.strictEqual(attachments.length, 4);
-      assert.deepStrictEqual(attachments[0], { side: 0, orientation: 0, tile, attachTo });
-      assert.deepStrictEqual(attachments[1], { side: 0, orientation: 1, tile, attachTo });
-      assert.deepStrictEqual(attachments[2], { side: 3, orientation: 0, tile, attachTo });
-      assert.deepStrictEqual(attachments[3], { side: 3, orientation: 3, tile, attachTo });
-    });
-  });
-});
-
diff --git a/src/Tile/TileOnBoard.ts b/src/Tile/TileOnBoard.ts
deleted file mode 100644
index 0fa8005..0000000
--- a/src/Tile/TileOnBoard.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import _ from 'lodash';
-import Tile, { Feature, Direction } from './Tile';
-
-export interface Attachment {
-  attachTo: TileOnBoard;
-  side: Direction;
-  tile: Tile;
-  orientation: number; // Clockwise rotation of a tile
-}
-
-export default class TileOnBoard extends Tile {
-  orientation: number; // amount of 90-degree clockwise rotations from original orientation
-  position: {
-    x: number;
-    y: number;
-  }
-
-  constructor(
-    center: Feature,
-    sides: [Feature, Feature, Feature, Feature],
-    shield = false,
-    position = { x: 0, y: 0 },
-    orientation = 0
-  ) {
-    super(center, sides, shield);
-    this.position = position;
-    this.orientation = orientation;
-  }
-
-  getSide(direction: Direction) {
-    return super.getSide(direction - this.orientation);
-  }
-
-  rotate(rotation = 1) {
-    this.orientation += rotation;
-  }
-
-  getAttachments(tile: Tile): Attachment[] {
-    return _.flatten([0, 1, 2, 3].map(side => {
-      const item = this.getSide(side);
-      return [0, 1, 2, 3]
-        .filter(orientation => tile.getSide(side - orientation + 2) === item)
-        .map(orientation => ({
-          tile,
-          orientation,
-          side,
-          attachTo: this as Tile
-        }))
-    }));
-  }
-}