@packtrack/layout 1.1.0 → 1.3.0

package/.built/district.d.ts

@@ -1,4 +1,5 @@
 import { Layout } from "./layout";
+import { Monitor } from "./monitor";
 import { PowerDistrict } from "./power-district";
 import { Router } from "./router";
 import { Section } from "./section";
@@ -9,6 +10,7 @@ export declare class District {
     powerDistricts: PowerDistrict[];
     sections: Section[];
     routers: Router[];
+    monitors: Monitor[];
     constructor(name: string, parent: District | Layout);
     get domainName(): string;
     dump(): void;

package/.built/district.js

@@ -6,6 +6,7 @@ export class District {
     powerDistricts = [];
     sections = [];
     routers = [];
+    monitors = [];
     constructor(name, parent) {
         this.name = name;
         this.parent = parent;
@@ -48,10 +49,10 @@ export class District {
         return `
 			subgraph ${this.toDotReference()} {
 				label = ${JSON.stringify(this.name)}
-				
+
 				${this.sections.map(section => section.toDotDefinition()).join('')}
 				${this.routers.map(router => router.toDotDefinition()).join('')}
-				
+
 				${this.children.map(child => child.toDotDefinition()).join('')}
 			}
 		`;
@@ -60,7 +61,7 @@ export class District {
         return `
 			${this.sections.map(section => section.toDotConnection()).join('')}
 			${this.routers.map(router => router.toDotConnection()).join('')}
-				
+
 			${this.children.map(child => child.toDotConnection()).join('')}
 		`;
     }

package/.built/index.d.ts

@@ -1,17 +1,20 @@
-export * from './district';
-export * from './layout';
-export * from './position';
-export * from './route';
-export * from './router';
-export * from './section';
-export * from './tile';
-export * from './track';
-export * from './power-district/index';
-export * from './power-district/activator';
-export * from './power-district/monitor';
-export * from './power-district/reverser';
-export * from './positioner/index';
-export * from './positioner/point';
-export * from './positioner/responder-type';
-export * from './device/index';
-export * from './device/channel';
+export * from './source/district';
+export * from './source/layout';
+export * from './source/position';
+export * from './source/route';
+export * from './source/router';
+export * from './source/section';
+export * from './source/span';
+export * from './source/tile';
+export * from './source/track';
+export * from './source/monitor';
+export * from './source/throttle';
+export * from './source/power-district/index';
+export * from './source/power-district/activator';
+export * from './source/power-district/monitor';
+export * from './source/power-district/reverser';
+export * from './source/positioner/index';
+export * from './source/positioner/point';
+export * from './source/positioner/responder-type';
+export * from './source/device/index';
+export * from './source/device/channel';

package/.built/index.js

@@ -1,17 +1,20 @@
-export * from './district';
-export * from './layout';
-export * from './position';
-export * from './route';
-export * from './router';
-export * from './section';
-export * from './tile';
-export * from './track';
-export * from './power-district/index';
-export * from './power-district/activator';
-export * from './power-district/monitor';
-export * from './power-district/reverser';
-export * from './positioner/index';
-export * from './positioner/point';
-export * from './positioner/responder-type';
-export * from './device/index';
-export * from './device/channel';
+export * from './source/district';
+export * from './source/layout';
+export * from './source/position';
+export * from './source/route';
+export * from './source/router';
+export * from './source/section';
+export * from './source/span';
+export * from './source/tile';
+export * from './source/track';
+export * from './source/monitor';
+export * from './source/throttle';
+export * from './source/power-district/index';
+export * from './source/power-district/activator';
+export * from './source/power-district/monitor';
+export * from './source/power-district/reverser';
+export * from './source/positioner/index';
+export * from './source/positioner/point';
+export * from './source/positioner/responder-type';
+export * from './source/device/index';
+export * from './source/device/channel';

package/.built/layout.d.ts

@@ -5,13 +5,19 @@ import { Section } from "./section";
 import { Device } from "./device/index";
 import { ResponderType } from "./positioner/responder-type";
 import { Channel } from "./device/channel";
+import { Monitor } from "./monitor";
+import { Throttle } from "./throttle";
 export declare class Layout {
     name: string;
     districts: District[];
     devices: Device[];
     responderType: ResponderType[];
+    monitors: Monitor[];
+    throttles: Throttle[];
     get allDistricts(): District[];
     static from(document: any): Layout;
+    loadMonitor(source: any, parent: District | Layout): Monitor;
+    loadThrottle(source: any, parent: District | Layout): Throttle;
     loadDistrict(source: any, parent: District | Layout): District;
     linkDistrict(source: any, district: District): void;
     loadSection(source: any, district: District): void;

package/.built/layout.js

@@ -12,11 +12,15 @@ import { PointPositioner } from "./positioner/point";
 import { PowerDistrictActivator } from "./power-district/activator";
 import { PowerDistrictReverser } from "./power-district/reverser";
 import { PowerDistrictMonitor } from "./power-district/monitor";
+import { Monitor } from "./monitor";
+import { Throttle } from "./throttle";
 export class Layout {
     name;
     districts = [];
     devices = [];
     responderType = [];
+    monitors = [];
+    throttles = [];
     get allDistricts() {
         const districts = [];
         function walkDistrict(district) {
@@ -36,28 +40,42 @@ export class Layout {
         layout.name = railway.getAttribute('name');
         const version = railway.getAttribute('version');
         if (version == '1') {
-            let district = railway.firstChild;
-            while (district) {
-                if (district.tagName == 'district') {
-                    layout.districts.push(layout.loadDistrict(district, layout));
+            let child = railway.firstChild;
+            while (child) {
+                if (child.tagName == 'district') {
+                    layout.districts.push(layout.loadDistrict(child, layout));
                 }
-                district = district.nextSibling;
+                if (child.tagName == 'monitor') {
+                    layout.monitors.push(layout.loadMonitor(child, layout));
+                }
+                if (child.tagName == 'throttle') {
+                    layout.throttles.push(layout.loadThrottle(child, layout));
+                }
+                child = child.nextSibling;
             }
-            district = railway.firstChild;
+            child = railway.firstChild;
             let index = 0;
-            while (district) {
-                if (district.tagName == 'district') {
-                    layout.linkDistrict(district, layout.districts[index]);
+            while (child) {
+                if (child.tagName == 'district') {
+                    layout.linkDistrict(child, layout.districts[index]);
                     index++;
                 }
-                district = district.nextSibling;
+                child = child.nextSibling;
             }
         }
         else {
-            throw new Error(`unsupported railway definition file version '${version}'`);
+            throw new Error(`Unsupported railway definition file version '${version}'`);
         }
         return layout;
     }
+    loadMonitor(source, parent) {
+        const montior = new Monitor(this.findDevice(source.getAttribute('device')), parent);
+        return montior;
+    }
+    loadThrottle(source, parent) {
+        const throttle = new Throttle(this.findDevice(source.getAttribute('device')), parent);
+        return throttle;
+    }
     loadDistrict(source, parent) {
         const district = new District(source.getAttribute('name'), parent);
         let child = source.firstChild;
@@ -80,6 +98,9 @@ export class Layout {
             if (child.tagName == 'district') {
                 district.children.push(this.loadDistrict(child, district));
             }
+            if (child.tagName == 'monitor') {
+                district.monitors.push(this.loadMonitor(child, district));
+            }
             child = child.nextSibling;
         }
         return district;
@@ -220,6 +241,7 @@ export class Layout {
     }
     linkRouter(source, router) {
         let child = source.firstChild;
+        let active;
         while (child) {
             if (child.tagName == 'route') {
                 const route = new Route(child.getAttribute('name'), router);
@@ -227,10 +249,17 @@ export class Layout {
                 route.in.out = router;
                 route.out = this.findSection(child.getAttribute('out'), router.district);
                 route.out.in = router;
+                if (child.hasAttribute('active')) {
+                    if (active) {
+                        throw new Error(`Router '${router.domainName}' has multiple active routes (${active.name}, ${route.name}).`);
+                    }
+                    active = route;
+                }
                 router.routes.push(route);
             }
             child = child.nextSibling;
         }
+        router.activeRoute = active;
     }
     loadPowerDistrict(source, district) {
         const powerDistrict = new PowerDistrict(source.getAttribute('name'), district);

package/.built/monitor.d.ts

@@ -0,0 +1,9 @@
+import { Device } from "./device";
+import { District } from "./district";
+import { Layout } from "./layout";
+export declare class Monitor {
+    device: Device;
+    scope: District | Layout;
+    constructor(device: Device, scope: District | Layout);
+    dump(): void;
+}

package/.built/monitor.js

@@ -0,0 +1,15 @@
+import { Layout } from "./layout";
+export class Monitor {
+    device;
+    scope;
+    constructor(device, scope) {
+        this.device = device;
+        this.scope = scope;
+    }
+    dump() {
+        console.group('Monitor');
+        console.log('scope:', this.scope instanceof Layout ? '*' : this.scope.domainName);
+        this.device.dump();
+        console.groupEnd();
+    }
+}

package/.built/position.d.ts

@@ -5,6 +5,8 @@ export declare class SectionPosition {
     reversed: boolean;
     constructor(section: Section, offset: number, reversed: boolean);
     get absolutePosition(): number;
-    advance(distance: number): any;
+    advance(distance: number): SectionPosition;
+    private invert;
     toString(): string;
+    toPackTrackValue(): string;
 }

package/.built/position.js

@@ -6,14 +6,23 @@ export class SectionPosition {
         this.section = section;
         this.offset = offset;
         this.reversed = reversed;
+        if (offset > section.length || offset < 0) {
+            throw new Error(`Offset ${offset} out of range for section '${section.domainName}' (0 - ${section.length})`);
+        }
     }
+    // returns the absolute position of the point inside the section
+    // regardless of direction
     get absolutePosition() {
         if (this.reversed) {
             return this.section.length - this.offset;
         }
         return this.offset;
     }
+    // TODO verify reverse
     advance(distance) {
+        if (distance < 0) {
+            return this.invert().advance(-distance).invert();
+        }
         if (this.offset + distance > this.section.length) {
             const next = this.section.next(this.reversed);
             if (!next) {
@@ -23,7 +32,14 @@ export class SectionPosition {
         }
         return new SectionPosition(this.section, this.offset + distance, this.reversed);
     }
+    // reverse direction
+    invert() {
+        return new SectionPosition(this.section, this.section.length - this.offset, !this.reversed);
+    }
     toString() {
         return `${this.section.name} @ ${this.offset.toFixed(1)} ${this.reversed ? 'backward' : 'forward'}`;
     }
+    toPackTrackValue() {
+        return `${this.section.domainName}@${this.offset}${this.reversed ? 'R' : 'F'}`;
+    }
 }

package/.built/positioner/point.d.ts

@@ -8,6 +8,6 @@ export declare class PointPositioner extends Positioner {
     channel: Channel;
     responder: ResponderType;
     constructor(track: Track, offset: number, channel: Channel, responder: ResponderType);
-    get position(): any;
+    get position(): import("..").SectionPosition;
     dump(): void;
 }

package/.built/source/device/channel.d.ts

@@ -1,8 +1,8 @@
-import { Device } from "./device";
+import { Device } from "./index";
 export declare class Channel {
     device: Device;
     name: string;
     constructor(device: Device, name: string);
-    dump(): void;
     publish(data: any): void;
+    toString(): string;
 }

package/.built/source/device/channel.js

@@ -1,16 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Channel = void 0;
-class Channel {
+export class Channel {
     device;
     name;
     constructor(device, name) {
         this.device = device;
         this.name = name;
     }
-    dump() {
-        console.log(`Channel '${this.name}' on ${this.device.identifier}`);
-    }
     publish(data) { }
+    toString() {
+        return `${this.device.identifier}/${this.name}`;
+    }
 }
-exports.Channel = Channel;

package/.built/source/device/index.d.ts

@@ -0,0 +1,10 @@
+import { Channel } from "./channel";
+export declare class Device {
+    identifier: string;
+    channels: Channel[];
+    lastDiscovery: {
+        date: Date;
+        address: string;
+    };
+    constructor(identifier: string);
+}

package/.built/source/device/index.js

@@ -0,0 +1,8 @@
+export class Device {
+    identifier;
+    channels = [];
+    lastDiscovery;
+    constructor(identifier) {
+        this.identifier = identifier;
+    }
+}

package/.built/source/district.d.ts

@@ -1,5 +1,6 @@
 import { Layout } from "./layout";
-import { PowerDistrict } from "./power-district";
+import { Monitor } from "./monitor";
+import { PowerDistrict } from "./power-district/index";
 import { Router } from "./router";
 import { Section } from "./section";
 export declare class District {
@@ -9,12 +10,7 @@ export declare class District {
     powerDistricts: PowerDistrict[];
     sections: Section[];
     routers: Router[];
+    monitors: Monitor[];
     constructor(name: string, parent: District | Layout);
     get domainName(): string;
-    dump(): void;
-    toDotReference(): any;
-    toDotDefinition(): any;
-    toDotConnection(): any;
-    toSVG(): any;
-    findSVGPositions(): any;
 }

package/.built/source/district.js

@@ -1,86 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.District = void 0;
-const layout_1 = require("./layout");
-class District {
+import { Layout } from "./layout";
+export class District {
     name;
     parent;
     children = [];
     powerDistricts = [];
     sections = [];
     routers = [];
+    monitors = [];
     constructor(name, parent) {
         this.name = name;
         this.parent = parent;
     }
     get domainName() {
-        if (this.parent instanceof layout_1.Layout) {
+        if (this.parent instanceof Layout) {
             return `${this.name}.${this.parent.name}`;
         }
         return `${this.name}.${this.parent.domainName}`;
     }
-    dump() {
-        console.group(`District ${this.domainName}`);
-        if (this.powerDistricts.length) {
-            console.group('power districts');
-            for (let district of this.powerDistricts) {
-                district.dump();
-            }
-            console.groupEnd();
-        }
-        if (this.sections.length) {
-            console.group('sections');
-            for (let section of this.sections) {
-                section.dump();
-            }
-            console.groupEnd();
-        }
-        if (this.children.length) {
-            console.group('children');
-            for (let district of this.children) {
-                district.dump();
-            }
-            console.groupEnd();
-        }
-        console.groupEnd();
-    }
-    toDotReference() {
-        return `cluster_${this.name.replace(/-/g, '_')}${this.parent instanceof District ? this.parent.toDotReference() : ''}`;
-    }
-    toDotDefinition() {
-        return `
-			subgraph ${this.toDotReference()} {
-				label = ${JSON.stringify(this.name)}
-				
-				${this.sections.map(section => section.toDotDefinition()).join('')}
-				${this.routers.map(router => router.toDotDefinition()).join('')}
-				
-				${this.children.map(child => child.toDotDefinition()).join('')}
-			}
-		`;
-    }
-    toDotConnection() {
-        return `
-			${this.sections.map(section => section.toDotConnection()).join('')}
-			${this.routers.map(router => router.toDotConnection()).join('')}
-				
-			${this.children.map(child => child.toDotConnection()).join('')}
-		`;
-    }
-    toSVG() {
-        return `
-			<g id=${JSON.stringify(this.domainName)}>
-				${this.sections.map(section => section.toSVG()).join('')}
-
-				${this.children.map(child => child.toSVG()).join('')}
-			</g>
-		`;
-    }
-    findSVGPositions() {
-        return [
-            ...this.sections.map(section => section.findSVGPositions()),
-            ...this.children.map(child => child.findSVGPositions())
-        ];
-    }
 }
-exports.District = District;

package/.built/source/layout.d.ts

@@ -1,17 +1,23 @@
 import { District } from "./district";
-import { PowerDistrict } from "./power-district";
+import { PowerDistrict } from "./power-district/index";
 import { Router } from "./router";
 import { Section } from "./section";
-import { Device } from "./device/device";
-import { ResponderType } from "../positioner/responder-type";
+import { Device } from "./device/index";
+import { ResponderType } from "./positioner/responder-type";
 import { Channel } from "./device/channel";
+import { Monitor } from "./monitor";
+import { Throttle } from "./throttle";
 export declare class Layout {
     name: string;
     districts: District[];
     devices: Device[];
     responderType: ResponderType[];
+    monitors: Monitor[];
+    throttles: Throttle[];
     get allDistricts(): District[];
     static from(document: any): Layout;
+    loadMonitor(source: any, parent: District | Layout): Monitor;
+    loadThrottle(source: any, parent: District | Layout): Throttle;
     loadDistrict(source: any, parent: District | Layout): District;
     linkDistrict(source: any, district: District): void;
     loadSection(source: any, district: District): void;
@@ -23,7 +29,4 @@ export declare class Layout {
     loadRouter(source: any, district: District): Router;
     linkRouter(source: any, router: Router): void;
     loadPowerDistrict(source: any, district: District): PowerDistrict;
-    toDot(): string;
-    toSVG(inject?: string): string;
-    dump(): void;
 }