@thegraid/hexlib 1.1.0 → 1.1.4

package/dist/hex.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="easeljs" />
 /// <reference types="@thegraid/easeljs-lib/dist/createjs-functions" />
-import { XY } from '@thegraid/common-lib';
+import { XY, XYWH } from '@thegraid/common-lib';
 import { Constructor, RC } from "@thegraid/easeljs-lib";
 import { Container, DisplayObject, Point, Text } from "@thegraid/easeljs-module";
 import { EwDir, HexDir, NsDir } from "./hex-intfs";
@@ -103,20 +103,20 @@ export declare class Hex {
     rcspString(): string;
     /** convert LINKS object to Array of Hex */
     get linkHexes(): (this | undefined)[];
-    forEachLinkHex(func: (hex: Hex | undefined, dir: HexDir | undefined, hex0: Hex) => unknown, inclCenter?: boolean): void;
+    forEachLinkHex(func: (hex: this | undefined, dir: HexDir | undefined, hex0: this) => unknown, inclCenter?: boolean): void;
     /** return HexDir to the first linked hex that satisfies predicate. */
     findLinkHex(pred: (hex: this | undefined, dir: HexDir, hex0: this) => boolean): HexDir | undefined;
     /** continue in HexDir until pred is satisfied. */
-    findInDir(dir: HexDir, pred: (hex: Hex, dir: HexDir, hex0: Hex) => boolean): Hex | undefined;
+    findInDir(dir: HexDir, pred: (hex: this, dir: HexDir, hex0: this) => boolean): this | undefined;
     /** array of all hexes in line from dir. */
     hexesInDir(dir: HexDir, rv?: this[]): this[];
     /** for each Hex in each Dir: func(hex, dir, this) */
     forEachHexDir(func: (hex: this, dir: HexDir, hex0: this) => unknown): void;
-    /** from this Hex, follow links[ds], ns times. */
-    nextHex(dir: HexDir, ns?: number): Hex | undefined;
+    /** from this Hex, follow links[ds], ns times (or until !links[ds]). */
+    nextHex(dir: HexDir, ns?: number): this | undefined;
     /** return last Hex on axis in given direction */
-    lastHex(ds: HexDir): Hex;
-    /** distance between Hexes: adjacent = 1, based on row, col, sqrt3 */
+    lastHex(ds: HexDir): this;
+    /** distance between Hexes: adjacent = 1, based on row, col, unit = 1 / H.sqrt3 */
     radialDist(hex: Hex): number;
 }
 /**
@@ -143,6 +143,42 @@ export declare class Hex1 extends Hex {
  * class LibHex2extendsLocalHex1 extends Hex2Mixin(LocalHex1) { }
  *
  * class LocalHex2 extends LibHex2extendsLocalHex1 { ... }
+ *
+ * https://www.typescriptlang.org/docs/handbook/mixins.html
+ *
+ *
+ * Note: In the compiled hex.js and its hex.d.ts,
+ * the type 'this' in the Hex2Mixin versions of Hex methods
+ * is converted to type 'any'.
+ * (because Hex2Mixin and Hex2_base come from new(...) but are not a class,
+ * therefore have no instance or this/type)
+ *
+ * To get properly typed versions in your derived class extends Hex2Mixin,
+ * include the following overrides:
+ *
+ * @example
+  override forEachLinkHex(func: (hex: this | undefined, dir: HexDir | undefined, hex0: this) => unknown, inclCenter = false) {
+    super.forEachLinkHex(func)
+  }
+  override findLinkHex(pred: (hex: this | undefined, dir: HexDir, hex0: this) => boolean) {
+    return super.findLinkHex(pred)
+  }
+  override findInDir(dir: HexDir, pred: (hex: this, dir: HexDir, hex0: this) => boolean): this | undefined {
+    return super.findInDir(dir, pred)
+  }
+  override hexesInDir(dir: HexDir, rv: this[] = []): this[] {
+    return super.hexesInDir(dir, rv)
+  }
+  override forEachHexDir(func: (hex: this, dir: HexDir, hex0: this) => unknown) {
+    super.forEachHexDir(func);
+  }
+  override nextHex(dir: HexDir, ns: number = 1): this | undefined {
+    return super.nextHex(dir, ns) as this | undefined;
+  }
+  override lastHex(ds: HexDir): this {
+    return super.lastHex(ds)
+  }
+ *
  */
 export declare function Hex2Mixin<TBase extends Constructor<Hex1>>(Base: TBase): {
     new (...args: any[]): {
@@ -179,11 +215,13 @@ export declare function Hex2Mixin<TBase extends Constructor<Hex1>>(Base: TBase):
         setHexColor(color: string, district?: number | undefined): void;
         /** unit distance between Hexes: adjacent = 1; see also: radialDist */
         metricDist(hex: Hex): number;
-        /** location of corner between dir0 and dir1; in parent coordinates.
-         * @param dir0 an EwDir
-         * @param dir1 an EwDir
+        /** Location of corner between dir0 and dir1; in parent coordinates.
+         * @param dir0 a HexDir
+         * @param dir1 a HexDir
+         * @param point [new Point()] set location-x,y in point and return it.
+         * @param rad [this.radius]
          */
-        cornerPoint(dir0: HexDir, dir1: HexDir): Point;
+        cornerPoint(dir0: HexDir, dir1: HexDir, point?: Point, rad?: number): Point;
         /** Location of edge point in dir; in parent coordinates.
          * @param dir indicates direction to edge
          * @param rad [1] per-unit distance from center: 0 --> center, 1 --> exactly on edge, 1+ --> outside hex
@@ -246,20 +284,20 @@ export declare function Hex2Mixin<TBase extends Constructor<Hex1>>(Base: TBase):
         readonly linkDirs: HexDir[];
         /** convert LINKS object to Array of Hex */
         readonly linkHexes: (any | undefined)[];
-        forEachLinkHex(func: (hex: Hex | undefined, dir: HexDir | undefined, hex0: Hex) => unknown, inclCenter?: boolean): void;
+        forEachLinkHex(func: (hex: any | undefined, dir: HexDir | undefined, hex0: any) => unknown, inclCenter?: boolean): void;
         /** return HexDir to the first linked hex that satisfies predicate. */
         findLinkHex(pred: (hex: any | undefined, dir: HexDir, hex0: any) => boolean): HexDir | undefined;
         /** continue in HexDir until pred is satisfied. */
-        findInDir(dir: HexDir, pred: (hex: Hex, dir: HexDir, hex0: Hex) => boolean): Hex | undefined;
+        findInDir(dir: HexDir, pred: (hex: any, dir: HexDir, hex0: any) => boolean): any | undefined;
         /** array of all hexes in line from dir. */
         hexesInDir(dir: HexDir, rv?: any[]): any[];
         /** for each Hex in each Dir: func(hex, dir, this) */
         forEachHexDir(func: (hex: any, dir: HexDir, hex0: any) => unknown): void;
-        /** from this Hex, follow links[ds], ns times. */
-        nextHex(dir: HexDir, ns?: number): Hex | undefined;
+        /** from this Hex, follow links[ds], ns times (or until !links[ds]). */
+        nextHex(dir: HexDir, ns?: number): any | undefined;
         /** return last Hex on axis in given direction */
-        lastHex(ds: HexDir): Hex;
-        /** distance between Hexes: adjacent = 1, based on row, col, sqrt3 */
+        lastHex(ds: HexDir): any;
+        /** distance between Hexes: adjacent = 1, based on row, col, unit = 1 / H.sqrt3 */
         radialDist(hex: Hex): number;
     };
 } & TBase;
@@ -298,11 +336,13 @@ declare const Hex2_base: {
         setHexColor(color: string, district?: number | undefined): void;
         /** unit distance between Hexes: adjacent = 1; see also: radialDist */
         metricDist(hex: Hex): number;
-        /** location of corner between dir0 and dir1; in parent coordinates.
-         * @param dir0 an EwDir
-         * @param dir1 an EwDir
+        /** Location of corner between dir0 and dir1; in parent coordinates.
+         * @param dir0 a HexDir
+         * @param dir1 a HexDir
+         * @param point [new Point()] set location-x,y in point and return it.
+         * @param rad [this.radius]
          */
-        cornerPoint(dir0: HexDir, dir1: HexDir): Point;
+        cornerPoint(dir0: HexDir, dir1: HexDir, point?: Point, rad?: number): Point;
         /** Location of edge point in dir; in parent coordinates.
          * @param dir indicates direction to edge
          * @param rad [1] per-unit distance from center: 0 --> center, 1 --> exactly on edge, 1+ --> outside hex
@@ -365,20 +405,20 @@ declare const Hex2_base: {
         readonly linkDirs: HexDir[];
         /** convert LINKS object to Array of Hex */
         readonly linkHexes: (any | undefined)[];
-        forEachLinkHex(func: (hex: Hex | undefined, dir: HexDir | undefined, hex0: Hex) => unknown, inclCenter?: boolean): void;
+        forEachLinkHex(func: (hex: any | undefined, dir: HexDir | undefined, hex0: any) => unknown, inclCenter?: boolean): void;
         /** return HexDir to the first linked hex that satisfies predicate. */
         findLinkHex(pred: (hex: any | undefined, dir: HexDir, hex0: any) => boolean): HexDir | undefined;
         /** continue in HexDir until pred is satisfied. */
-        findInDir(dir: HexDir, pred: (hex: Hex, dir: HexDir, hex0: Hex) => boolean): Hex | undefined;
+        findInDir(dir: HexDir, pred: (hex: any, dir: HexDir, hex0: any) => boolean): any | undefined;
         /** array of all hexes in line from dir. */
         hexesInDir(dir: HexDir, rv?: any[]): any[];
         /** for each Hex in each Dir: func(hex, dir, this) */
         forEachHexDir(func: (hex: any, dir: HexDir, hex0: any) => unknown): void;
-        /** from this Hex, follow links[ds], ns times. */
-        nextHex(dir: HexDir, ns?: number): Hex | undefined;
+        /** from this Hex, follow links[ds], ns times (or until !links[ds]). */
+        nextHex(dir: HexDir, ns?: number): any | undefined;
         /** return last Hex on axis in given direction */
-        lastHex(ds: HexDir): Hex;
-        /** distance between Hexes: adjacent = 1, based on row, col, sqrt3 */
+        lastHex(ds: HexDir): any;
+        /** distance between Hexes: adjacent = 1, based on row, col, unit = 1 / H.sqrt3 */
         radialDist(hex: Hex): number;
     };
 } & typeof Hex1;
@@ -446,34 +486,49 @@ export interface HexM<T extends Hex> {
     readonly district: T[][];
     readonly mapCont: MapCont;
     rcLinear(row: number, col: number): number;
-    forEachHex<K extends T>(fn: (hex: K) => void): void;
+    forEachHex(fn: (hex: T) => void): void;
     update(): void;
     showMark(hex?: T): void;
+    radius: number;
+    centerHex: T;
+    xywh: XYWH & {
+        dxdc: number;
+        dydr: number;
+    };
+    hexC: Constructor<Hex>;
+    hexUnderObj(dragObj: DisplayObject, legalOnly?: boolean): T | undefined;
 }
 /**
- * Collection of Hex *and* Graphics-Containers for Hex2
- * districts: Hex[]
+ * 2-D Array[row][col]: Hex; plus a mapCont of Graphics-Containers for IHex2.
+ *
+ * hexAry[n]: all the Hex (or IHex2) elements.
  *
- * HexMap[row][col]: Hex or Hex2 elements.
- * If mapCont is set, then populate with Hex2
+ * district[i]: Hex[]; all the Hex in a given district.
  *
  * (TP.mh X TP.nh) hexes in districts;
  *
- * With a Mark and off-map: skipHex & resignHex
+ * Use addToMapCont(hexC), to populate with new hexC()
+ *
+ * mark: a HexMark to visually indicate a selected IHex2.
  *
  */
 export declare class HexMap<T extends Hex> extends Array<Array<T>> implements HexM<T> {
-    hexC: HexConstructor<Hex>;
+    hexC: Constructor<Hex>;
     Aname: string;
+    /** A color for each District: 'rgb(198,198,198)' */
     static readonly distColor: string[];
     /**
-     * HexMap: TP.nRows X TP.nCols hexes.
+     * HexMap: TP.nRows X TP.nCols of Hex [new hexC()]
      *
-     * Basic map is non-GUI, addToMapCont uses Hex2 elements to enable GUI interaction.
-     * @param addToMapCont use Hex2 for Hex, make Containers: hexCont, infCont, markCont, stoneCont
-     * @param hexC Constructor<T> for the Hex elements (typed as HexConstructor<Hex> for Typescript...)
+     * Basic map is non-GUI, addToMapCont(hexC) makes IHex2 elements to enable GUI interaction.
+     * Use hexC() to make Hex; mapCont has layers of Containers per HexMap.cNames;
+     *
+     * @param radius [TP.hexRad] typically 60
+     * @param addToMapCont [false] set true to include addToMapCont(hexC)
+     * @param hexC [Hex] HexConstructor\<Hex\> for each element
+     * @param Aname ['mainMap'] a name for debugger
      */
-    constructor(radius?: number, addToMapCont?: boolean, hexC?: HexConstructor<Hex>, Aname?: string);
+    constructor(radius?: number, addToMapCont?: boolean, hexC?: Constructor<Hex>, Aname?: string);
     /** may be obsolete when using IHex2 */
     get asIHex2Map(): HexMap<PublicInterface<Hex2>>;
     /** Each occupied Hex, with the associated district color */
@@ -500,7 +555,7 @@ export declare class HexMap<T extends Hex> extends Array<Array<T>> implements He
     };
     get centerHex(): T;
     get nRowCol(): number[];
-    getCornerHex(dn: HexDir): Hex;
+    getCornerHex(dn: HexDir): T;
     rcLinear(row: number, col: number): number;
     mark: HexMark | undefined;
     makeMark(): HexMark;
@@ -537,12 +592,15 @@ export declare class HexMap<T extends Hex> extends Array<Array<T>> implements He
     /** link hex to/from each extant neighor */
     link(hex: T, rc?: RC, map?: T[][], nt?: Topo, lf?: (hex: T) => LINKS<T>): void;
     /**
-     * The [Legal] Hex (LegalMark.hex2) under the given x,y coordinates.
-     * If on the line, then the top (last drawn) Hex.
+     * Return the Hex under the given x,y coordinates.
+     *
+     * Conceptually: (legal ? LegalMark : HexCont)?.hex2 as \<T extends IHex2\>;
+     *
+     * If multiple HexCont at x,y, return the top (last drawn) HexCont.
      * @param x in local coordinates of this HexMap.mapCont
      * @param y
-     * @param legal - returnn ONLY hex with LegalMark visible & mouseenabled.
-     * @returns the Hex2 under mouse or undefined, if not a Hex (background)
+     * @param legal - return ONLY a Hex with LegalMark visible & mouseenabled.
+     * @returns the IHex2 of the LegalMark or HexCont at the given point (or undefined if no such HexCont)
      */
     hexUnderPoint(x: number, y: number, legal?: boolean): T | undefined;
     private _nh;
@@ -566,7 +624,10 @@ export declare class HexMap<T extends Hex> extends Array<Array<T>> implements He
     /**
      * overridable action for makeAllDistricts;
      *
-     * Base implementation invokes makeMetaDistrict(nh, mh, rc0)
+     * Base implementation invokes makeMetaHexRings(nh, mh, rc0)
+     *
+     * Alterative: makeRect(nrow, ncol, ...)
+     *
      * @param nh
      * @param mh
      * @param rc0
@@ -575,6 +636,11 @@ export declare class HexMap<T extends Hex> extends Array<Array<T>> implements He
     makeAllHexes(nh: number | undefined, mh: number | undefined, rc0: RC): T[];
     /**
      * Make the center district, then make (mh-1) rings other meta-hex districts.
+     *
+     * Spiral clockwise from center, placing a line of meta-hex [using makeMetaHex()].
+     *
+     * MakeMetaHex likewise spirals from center, placing a line of Hex.
+     *
      * @param nh order [number of 'rings'] of meta-hexes (2 or 3 for this game) [TP.mHexes]
      * @param mh size ['rings' in each meta-hex] of meta-hex (1..6) [TP.nHexes]
      * @param rc0 location of initial, central Hex

package/dist/hex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hex.d.ts","sourceRoot":"","sources":["../src/hex.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hex.d.ts","sourceRoot":"","sources":["../src/hex.ts"],"names":[],"mappings":"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"}

package/dist/hex.js

@@ -1,5 +1,6 @@
 import { C, CenterText, F } from "@thegraid/easeljs-lib";
 import { Container, Point } from "@thegraid/easeljs-module";
+import { NamedContainer } from "./game-play";
 import { H } from "./hex-intfs";
 import { HexShape, LegalMark } from "./shapes";
 import { TP } from "./table-params";
@@ -141,10 +142,10 @@ export class Hex {
     forEachHexDir(func) {
         this.linkDirs.forEach((dir) => this.hexesInDir(dir).filter(hex => !!hex).map(hex => func(hex, dir, this)));
     }
-    /** from this Hex, follow links[ds], ns times. */
+    /** from this Hex, follow links[ds], ns times (or until !links[ds]). */
     nextHex(dir, ns = 1) {
         let hex = this;
-        while (!!(hex = hex.links[dir]) && --ns > 0) { }
+        while (ns-- > 0 && !!(hex = hex.links[dir])) { }
         return hex;
     }
     /** return last Hex on axis in given direction */
@@ -155,7 +156,7 @@ export class Hex {
         }
         return hex;
     }
-    /** distance between Hexes: adjacent = 1, based on row, col, sqrt3 */
+    /** distance between Hexes: adjacent = 1, based on row, col, unit = 1 / H.sqrt3 */
     radialDist(hex) {
         let unit = 1 / H.sqrt3; // so w = delta(col) = 1
         let { x: tx, y: ty } = this.xywh(unit), { x: hx, y: hy } = hex.xywh(unit);
@@ -192,6 +193,42 @@ export class Hex1 extends Hex {
  * class LibHex2extendsLocalHex1 extends Hex2Mixin(LocalHex1) { }
  *
  * class LocalHex2 extends LibHex2extendsLocalHex1 { ... }
+ *
+ * https://www.typescriptlang.org/docs/handbook/mixins.html
+ *
+ *
+ * Note: In the compiled hex.js and its hex.d.ts,
+ * the type 'this' in the Hex2Mixin versions of Hex methods
+ * is converted to type 'any'.
+ * (because Hex2Mixin and Hex2_base come from new(...) but are not a class,
+ * therefore have no instance or this/type)
+ *
+ * To get properly typed versions in your derived class extends Hex2Mixin,
+ * include the following overrides:
+ *
+ * @example
+  override forEachLinkHex(func: (hex: this | undefined, dir: HexDir | undefined, hex0: this) => unknown, inclCenter = false) {
+    super.forEachLinkHex(func)
+  }
+  override findLinkHex(pred: (hex: this | undefined, dir: HexDir, hex0: this) => boolean) {
+    return super.findLinkHex(pred)
+  }
+  override findInDir(dir: HexDir, pred: (hex: this, dir: HexDir, hex0: this) => boolean): this | undefined {
+    return super.findInDir(dir, pred)
+  }
+  override hexesInDir(dir: HexDir, rv: this[] = []): this[] {
+    return super.hexesInDir(dir, rv)
+  }
+  override forEachHexDir(func: (hex: this, dir: HexDir, hex0: this) => unknown) {
+    super.forEachHexDir(func);
+  }
+  override nextHex(dir: HexDir, ns: number = 1): this | undefined {
+    return super.nextHex(dir, ns) as this | undefined;
+  }
+  override lastHex(ds: HexDir): this {
+    return super.lastHex(ds)
+  }
+ *
  */
 export function Hex2Mixin(Base) {
     return class Hex2Impl extends Base {
@@ -324,18 +361,21 @@ export function Hex2Mixin(Base) {
             let dx = tx - hx, dy = ty - hy;
             return Math.sqrt(dx * dx + dy * dy); // tw == H.sqrt3
         }
-        /** location of corner between dir0 and dir1; in parent coordinates.
-         * @param dir0 an EwDir
-         * @param dir1 an EwDir
+        /** Location of corner between dir0 and dir1; in parent coordinates.
+         * @param dir0 a HexDir
+         * @param dir1 a HexDir
+         * @param point [new Point()] set location-x,y in point and return it.
+         * @param rad [this.radius]
          */
-        // hexmarket uses to find ewDir corner between two nsDir edges.
-        cornerPoint(dir0, dir1) {
-            const d0 = H.ewDirRot[dir0], d1 = H.ewDirRot[dir1];
-            let a2 = (d0 + d1) / 2, h = this.radius;
+        cornerPoint(dir0, dir1, point = new Point(), rad = this.radius) {
+            const d0 = H.dirRot[dir0], d1 = H.dirRot[dir1];
+            let a2 = (d0 + d1) / 2;
             if (Math.abs(d0 - d1) > 180)
                 a2 += 180;
-            let a = a2 * H.degToRadians;
-            return new Point(this.x + Math.sin(a) * h, this.y - Math.cos(a) * h);
+            const a = a2 * H.degToRadians;
+            point.x = this.x + Math.sin(a) * rad;
+            point.y = this.y - Math.cos(a) * rad;
+            return point;
         }
         /** Location of edge point in dir; in parent coordinates.
          * @param dir indicates direction to edge
@@ -343,9 +383,9 @@ export function Hex2Mixin(Base) {
          * @param point [new Point()] set location-x,y in point and return it.
          */
         edgePoint(dir, rad = 1, point = new Point()) {
-            const a = H.nsDirRot[dir] * H.degToRadians, h = rad * this.radius * H.sqrt3_2;
-            point.x = this.hexShape.x + Math.sin(a) * h;
-            point.y = this.hexShape.y - Math.cos(a) * h;
+            const a = H.dirRot[dir] * H.degToRadians, h = rad * this.radius * H.sqrt3_2;
+            point.x = this.x + Math.sin(a) * h;
+            point.y = this.y - Math.cos(a) * h;
             return point;
         }
     };
@@ -372,7 +412,7 @@ export class HexMark extends HexShape {
         this.graphics.f(cm).dp(0, 0, this.radius, 6, 0, this.tilt);
         this.cache(-radius, -radius, 2 * radius, 2 * radius);
         this.graphics.c().f(C.BLACK).dc(0, 0, radius0);
-        this.updateCache("destination-out");
+        this.updateCache('destination-out');
         this.setHexBounds(); // bounds are based on readonly, should be const
         this.mouseEnabled = false;
     }
@@ -429,10 +469,9 @@ export class MapCont extends Container {
     /** add all the layers of Containers. update this.cNames */
     addContainers(cNames = this.cNames) {
         this._cNames = cNames.concat();
-        this.removeAllChildren();
+        this.removeAllChildren(); // TODO: remove all the field references also
         this.cNames.forEach(cname => {
-            const cont = new Container();
-            cont.Aname = cont.name = cname;
+            const cont = new NamedContainer(cname);
             this[cname] = cont;
             this.addChild(cont);
         });
@@ -457,28 +496,34 @@ export class MapCont extends Container {
     }
 }
 /**
- * Collection of Hex *and* Graphics-Containers for Hex2
- * districts: Hex[]
+ * 2-D Array[row][col]: Hex; plus a mapCont of Graphics-Containers for IHex2.
+ *
+ * hexAry[n]: all the Hex (or IHex2) elements.
  *
- * HexMap[row][col]: Hex or Hex2 elements.
- * If mapCont is set, then populate with Hex2
+ * district[i]: Hex[]; all the Hex in a given district.
  *
  * (TP.mh X TP.nh) hexes in districts;
  *
- * With a Mark and off-map: skipHex & resignHex
+ * Use addToMapCont(hexC), to populate with new hexC()
+ *
+ * mark: a HexMark to visually indicate a selected IHex2.
  *
  */
 export class HexMap extends Array {
     hexC;
     Aname;
-    // A color for each District: 'rgb(198,198,198)'
-    static distColor = ['lightgrey', "limegreen", "deepskyblue", "rgb(255,165,0)", "violet", "rgb(250,80,80)", "yellow"];
+    /** A color for each District: 'rgb(198,198,198)' */
+    static distColor = ['lightgrey', 'limegreen', 'deepskyblue', 'rgb(255,165,0)', 'violet', 'rgb(250,80,80)', 'yellow'];
     /**
-     * HexMap: TP.nRows X TP.nCols hexes.
+     * HexMap: TP.nRows X TP.nCols of Hex [new hexC()]
+     *
+     * Basic map is non-GUI, addToMapCont(hexC) makes IHex2 elements to enable GUI interaction.
+     * Use hexC() to make Hex; mapCont has layers of Containers per HexMap.cNames;
      *
-     * Basic map is non-GUI, addToMapCont uses Hex2 elements to enable GUI interaction.
-     * @param addToMapCont use Hex2 for Hex, make Containers: hexCont, infCont, markCont, stoneCont
-     * @param hexC Constructor<T> for the Hex elements (typed as HexConstructor<Hex> for Typescript...)
+     * @param radius [TP.hexRad] typically 60
+     * @param addToMapCont [false] set true to include addToMapCont(hexC)
+     * @param hexC [Hex] HexConstructor\<Hex\> for each element
+     * @param Aname ['mainMap'] a name for debugger
      */
     constructor(radius = TP.hexRad, addToMapCont = false, hexC = Hex, Aname = 'mainMap') {
         super(); // Array<Array<Hex>>()
@@ -664,16 +709,19 @@ export class HexMap extends Array {
         });
     }
     /**
-     * The [Legal] Hex (LegalMark.hex2) under the given x,y coordinates.
-     * If on the line, then the top (last drawn) Hex.
+     * Return the Hex under the given x,y coordinates.
+     *
+     * Conceptually: (legal ? LegalMark : HexCont)?.hex2 as \<T extends IHex2\>;
+     *
+     * If multiple HexCont at x,y, return the top (last drawn) HexCont.
      * @param x in local coordinates of this HexMap.mapCont
      * @param y
-     * @param legal - returnn ONLY hex with LegalMark visible & mouseenabled.
-     * @returns the Hex2 under mouse or undefined, if not a Hex (background)
+     * @param legal - return ONLY a Hex with LegalMark visible & mouseenabled.
+     * @returns the IHex2 of the LegalMark or HexCont at the given point (or undefined if no such HexCont)
      */
     hexUnderPoint(x, y, legal = true) {
         const mark = this.mapCont.markCont.getObjectUnderPoint(x, y, 1);
-        // Note: in theory, mark could be on a Hex2 that is NOT in hexCont!
+        // Note: in theory, mark could be on a IHex2 that is NOT in hexCont!
         if (mark instanceof LegalMark)
             return mark.hex2;
         if (legal)
@@ -712,13 +760,15 @@ export class HexMap extends Array {
         this.setSize(nh, mh);
         const rc0 = this.calculateRC0();
         const hexAry = this.hexAry = this.makeAllHexes(nh, mh, rc0); // nh hexes on outer ring; single meta-hex
-        this.mapCont.hexCont && this.mapCont.centerContainers();
         return hexAry;
     }
     /**
      * overridable action for makeAllDistricts;
      *
-     * Base implementation invokes makeMetaDistrict(nh, mh, rc0)
+     * Base implementation invokes makeMetaHexRings(nh, mh, rc0)
+     *
+     * Alterative: makeRect(nrow, ncol, ...)
+     *
      * @param nh
      * @param mh
      * @param rc0
@@ -729,6 +779,11 @@ export class HexMap extends Array {
     }
     /**
      * Make the center district, then make (mh-1) rings other meta-hex districts.
+     *
+     * Spiral clockwise from center, placing a line of meta-hex [using makeMetaHex()].
+     *
+     * MakeMetaHex likewise spirals from center, placing a line of Hex.
+     *
      * @param nh order [number of 'rings'] of meta-hexes (2 or 3 for this game) [TP.mHexes]
      * @param mh size ['rings' in each meta-hex] of meta-hex (1..6) [TP.nHexes]
      * @param rc0 location of initial, central Hex