From 62bd5f0f8b1d80cbb60a9fe341be008158a24e97 Mon Sep 17 00:00:00 2001 From: Christian Benjamin Ries Date: Wed, 21 Jun 2023 17:13:31 +0200 Subject: [PATCH] improve path handling, update workspace --- Utilities/StringUtilities.cs | 40 + Workspaces/Basement/fbevents.json | 60 +- Workspaces/Basement/locomotives.json | 4 +- Workspaces/Basement/metamodel.json | 8909 +++++++++++++------------- Workspaces/Basement/routes.json | 6630 +++++++++++-------- Workspaces/Basement/statistics.json | 15 + ecoslibNet48/Entities/Locomotive.cs | 6 +- railessentials/WebServer.cs | 8 +- railessentials/railessentials.json | 4 +- 9 files changed, 8494 insertions(+), 7182 deletions(-) diff --git a/Utilities/StringUtilities.cs b/Utilities/StringUtilities.cs index 6e000985..f1f80368 100644 --- a/Utilities/StringUtilities.cs +++ b/Utilities/StringUtilities.cs @@ -3,7 +3,9 @@ // File: StringUtilities.cs using System; +using System.Collections.Generic; using System.IO; +using System.Linq; using System.Text; namespace Utilities @@ -40,5 +42,43 @@ public static bool WriteAllTextNoBom(string path, string content, out string err return false; } } + + public static string RemoveInvalidFileNameChars(this string filename) + { + if (string.IsNullOrEmpty(filename)) return filename; + var parts = filename.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries); + if (parts.Length == 0) return filename; + + var fname = parts.Last(); + var p = filename; + p = p.Replace(fname, string.Empty); + p = p.TrimEnd(new[] {'/'}); + + fname = string.Join("_", fname.Split(Path.GetInvalidFileNameChars())); + return Path.Combine(p, fname); + } + + private static readonly List ImageExtensions = new() + { + ".jpg", + ".jpeg", + ".png", + ".gif", + ".bmp", + ".tif", + ".tiff", + ".ico", + ".svg" + }; + + public static bool IsImageFileExtension(this string filename) + { + if (string.IsNullOrEmpty(filename)) return false; + foreach(var it in ImageExtensions) + if (filename.EndsWith(it, StringComparison.OrdinalIgnoreCase)) + return true; + + return false; + } } } \ No newline at end of file diff --git a/Workspaces/Basement/fbevents.json b/Workspaces/Basement/fbevents.json index 7e00a74d..4a7af31f 100644 --- a/Workspaces/Basement/fbevents.json +++ b/Workspaces/Basement/fbevents.json @@ -659,58 +659,6 @@ "AdditionalBlockLocks": [], "LockedByBlock": "" }, - { - "BlockId": "B25[+]", - "FbEnter": "FB27", - "FbIn": "FB26", - "OnStart": [], - "OnStop": [], - "DeniedLocomotives": [], - "Settings": { - "BlockEnabled": true, - "OptionWait": true, - "OptionDirection": false, - "OptionMainline": true, - "OptionBbt": false, - "TypeOthers": true, - "TypeLocal": true, - "TypeIntercity": false, - "TypeFreight": true, - "TypeShunting": true, - "TypeBranchLine": true, - "TypeBranchLineFreight": false, - "TypeRegional": true - }, - "AdditionalBlockLocks": [ - "B09" - ], - "LockedByBlock": "" - }, - { - "BlockId": "B25[-]", - "FbEnter": "FB26", - "FbIn": "FB27", - "OnStart": [], - "OnStop": [], - "DeniedLocomotives": [], - "Settings": { - "BlockEnabled": true, - "OptionWait": true, - "OptionDirection": false, - "OptionMainline": true, - "OptionBbt": false, - "TypeOthers": true, - "TypeLocal": true, - "TypeIntercity": false, - "TypeFreight": true, - "TypeShunting": true, - "TypeBranchLine": true, - "TypeBranchLineFreight": false, - "TypeRegional": true - }, - "AdditionalBlockLocks": [], - "LockedByBlock": "" - }, { "BlockId": "B15[+]", "FbEnter": "", @@ -863,7 +811,7 @@ "OnStop": [], "DeniedLocomotives": [], "Settings": { - "BlockEnabled": true, + "BlockEnabled": false, "OptionWait": true, "OptionDirection": false, "OptionMainline": true, @@ -887,7 +835,7 @@ "OnStop": [], "DeniedLocomotives": [], "Settings": { - "BlockEnabled": true, + "BlockEnabled": false, "OptionWait": true, "OptionDirection": false, "OptionMainline": true, @@ -911,7 +859,7 @@ "OnStop": [], "DeniedLocomotives": [], "Settings": { - "BlockEnabled": true, + "BlockEnabled": false, "OptionWait": true, "OptionDirection": false, "OptionMainline": true, @@ -935,7 +883,7 @@ "OnStop": [], "DeniedLocomotives": [], "Settings": { - "BlockEnabled": true, + "BlockEnabled": false, "OptionWait": true, "OptionDirection": false, "OptionMainline": true, diff --git a/Workspaces/Basement/locomotives.json b/Workspaces/Basement/locomotives.json index f726e469..070e7a21 100644 --- a/Workspaces/Basement/locomotives.json +++ b/Workspaces/Basement/locomotives.json @@ -1,6 +1,6 @@ { "1004": { - "IsCleaner": true, + "IsCleaner": false, "IsStopped": true, "IsLocked": false, "Settings": { @@ -605,7 +605,7 @@ "1003": { "IsCleaner": false, "IsStopped": true, - "IsLocked": true, + "IsLocked": false, "Settings": { "OptionDirection": false, "OptionMainline": false, diff --git a/Workspaces/Basement/metamodel.json b/Workspaces/Basement/metamodel.json index 7675b0c8..ca3deafa 100644 --- a/Workspaces/Basement/metamodel.json +++ b/Workspaces/Basement/metamodel.json @@ -588,27 +588,6 @@ "themeDimIdx": 0 } }, - "2x1": { - "identifier": "tk20171218185818172", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 2, - "y": 1 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, "3x1": { "identifier": "tk20171218185818436", "name": "Straigth", @@ -630,29 +609,6 @@ "themeDimIdx": 0 } }, - "1x1": { - "identifier": "tk20171218185827860", - "name": "Curve", - "basename": "curve", - "clickable": false, - "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" - ], - "states": {}, - "coord": { - "x": 1, - "y": 1 - }, - "editor": { - "themeId": 11, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 3 - } - }, "3x5": { "identifier": "tk20171218185955335", "name": "Straigth", @@ -758,48 +714,6 @@ "themeDimIdx": 0 } }, - "2x4": { - "identifier": "tk20171218190005200", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 2, - "y": 4 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "2x3": { - "identifier": "tk20171218190005576", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 2, - "y": 3 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, "3x3": { "identifier": "tk20171218190005903", "name": "Straigth", @@ -842,113 +756,6 @@ "themeDimIdx": 0 } }, - "2x2": { - "identifier": "tk20171218190006544", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 2, - "y": 2 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "2x8": { - "identifier": "tk20171218190008087", - "name": "Curve", - "basename": "curve", - "clickable": false, - "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" - ], - "states": {}, - "coord": { - "x": 2, - "y": 8 - }, - "editor": { - "themeId": 11, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 2 - } - }, - "1x6": { - "identifier": "tk20171218190013551", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 1, - "y": 6 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 1 - } - }, - "1x7": { - "identifier": "tk20171218190015752", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 1, - "y": 7 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 1 - } - }, - "1x8": { - "identifier": "tk20171218190016000", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 1, - "y": 8 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 1 - } - }, "14x1": { "identifier": "tk20171218190031208", "name": "Straigth", @@ -1843,8 +1650,8 @@ "themeDimIdx": 2 } }, - "0x11": { - "identifier": "tk1017395988", + "0x15": { + "identifier": "tk1017395999", "name": "Straigth", "basename": "straight", "clickable": false, @@ -1855,7 +1662,7 @@ "states": {}, "coord": { "x": 0, - "y": 11 + "y": 15 }, "editor": { "themeId": 10, @@ -1864,306 +1671,57 @@ "themeDimIdx": 1 } }, - "5x13": { - "identifier": "tk1017395994", - "name": "Curve", - "basename": "curve", + "0x14": { + "identifier": "tk1017396000", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" + "AC", + "BD" ], "states": {}, "coord": { - "x": 5, - "y": 13 + "x": 0, + "y": 14 }, "editor": { - "themeId": 11, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 1 } }, - "1x10": { - "identifier": "tk1017395995", - "name": "Curve", - "basename": "curve", - "clickable": false, + "4x9": { + "identifier": "sg01", + "name": "Main Semaphore A", + "basename": "semaphoremain-r", + "clickable": true, "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" + "AC", + "BD", + "AC", + "BD" ], "states": {}, "coord": { - "x": 1, - "y": 10 + "x": 4, + "y": 9 + }, + "addresses": { + "Addr": 0, + "Addr1": 17, + "Port1": 1, + "Inverse1": true, + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, "editor": { - "themeId": 11, + "themeId": 106, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 1 - } - }, - "0x10": { - "identifier": "tk1017395996", - "name": "Curve", - "basename": "curve", - "clickable": false, - "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" - ], - "states": {}, - "coord": { - "x": 0, - "y": 10 - }, - "editor": { - "themeId": 11, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 3 - } - }, - "0x15": { - "identifier": "tk1017395999", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 0, - "y": 15 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 1 - } - }, - "0x14": { - "identifier": "tk1017396000", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 0, - "y": 14 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 1 - } - }, - "5x12": { - "identifier": "tk1017396017", - "name": "Direction", - "basename": "dir", - "clickable": false, - "routes": [ - "CA!", - "DB!", - "AC!", - "BD!" - ], - "states": {}, - "coord": { - "x": 5, - "y": 12 - }, - "editor": { - "themeId": 14, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 1 - } - }, - "2x13": { - "identifier": "tk1017396018", - "name": "Direction", - "basename": "dir", - "clickable": false, - "routes": [ - "CA!", - "DB!", - "AC!", - "BD!" - ], - "states": {}, - "coord": { - "x": 2, - "y": 13 - }, - "editor": { - "themeId": 14, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 2 - } - }, - "1x12": { - "identifier": "tk1017396019", - "name": "Curve", - "basename": "curve", - "clickable": false, - "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" - ], - "states": {}, - "coord": { - "x": 1, - "y": 12 - }, - "editor": { - "themeId": 11, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "1x13": { - "identifier": "tk1017396020", - "name": "Curve", - "basename": "curve", - "clickable": false, - "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" - ], - "states": {}, - "coord": { - "x": 1, - "y": 13 - }, - "editor": { - "themeId": 11, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 2 - } - }, - "5x11": { - "identifier": "tk1017396021", - "name": "Curve", - "basename": "curve", - "clickable": false, - "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" - ], - "states": {}, - "coord": { - "x": 5, - "y": 11 - }, - "editor": { - "themeId": 11, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "3x11": { - "identifier": "tk1017396022", - "name": "Curve", - "basename": "curve", - "clickable": false, - "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" - ], - "states": {}, - "coord": { - "x": 3, - "y": 11 - }, - "editor": { - "themeId": 11, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 2 - } - }, - "4x11": { - "identifier": "tk1017396023", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 4, - "y": 11 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "4x9": { - "identifier": "sg01", - "name": "Main Semaphore A", - "basename": "semaphoremain-r", - "clickable": true, - "routes": [ - "AC", - "BD", - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 4, - "y": 9 - }, - "addresses": { - "Addr": 0, - "Addr1": 17, - "Port1": 1, - "Inverse1": true, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, - "editor": { - "themeId": 106, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 0 } }, "20x8": { @@ -2390,8 +1948,8 @@ "themeDimIdx": 2 } }, - "4x1": { - "identifier": "FB5.1", + "11x1": { + "identifier": "FB6.1", "name": "Sensor", "basename": "sensor-off", "clickable": true, @@ -2401,11 +1959,11 @@ ], "states": {}, "coord": { - "x": 4, + "x": 11, "y": 1 }, "addresses": { - "Addr": 17, + "Addr": 2, "Addr1": 0, "Port1": 0, "Inverse1": false, @@ -2420,8 +1978,8 @@ "themeDimIdx": 0 } }, - "4x2": { - "identifier": "FB5.2", + "11x2": { + "identifier": "FB6.2", "name": "Sensor", "basename": "sensor-off", "clickable": true, @@ -2431,16 +1989,16 @@ ], "states": {}, "coord": { - "x": 4, + "x": 11, "y": 2 }, "addresses": { - "Addr": 18, - "Addr1": 5, - "Port1": 2, + "Addr": 10, + "Addr1": 0, + "Port1": 0, "Inverse1": false, - "Addr2": -1, - "Port2": -1, + "Addr2": 0, + "Port2": 0, "Inverse2": false }, "editor": { @@ -2450,8 +2008,8 @@ "themeDimIdx": 0 } }, - "4x3": { - "identifier": "FB5.3", + "11x3": { + "identifier": "FB6.3", "name": "Sensor", "basename": "sensor-off", "clickable": true, @@ -2461,251 +2019,11 @@ ], "states": {}, "coord": { - "x": 4, + "x": 11, "y": 3 }, "addresses": { - "Addr": 19, - "Addr1": 0, - "Port1": 0, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, - "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "4x4": { - "identifier": "FB5.4", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 4, - "y": 4 - }, - "addresses": { - "Addr": 20, - "Addr1": 0, - "Port1": 0, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, - "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "4x5": { - "identifier": "FB5.5", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 4, - "y": 5 - }, - "addresses": { - "Addr": 21, - "Addr1": 6, - "Port1": 1, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false - }, - "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "4x6": { - "identifier": "FB5.6", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 4, - "y": 6 - }, - "addresses": { - "Addr": 22, - "Addr1": 6, - "Port1": 2, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false - }, - "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "4x7": { - "identifier": "FB5.7", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 4, - "y": 7 - }, - "addresses": { - "Addr": 23, - "Addr1": 6, - "Port1": 3, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false - }, - "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "4x8": { - "identifier": "FB5.8", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 4, - "y": 8 - }, - "addresses": { - "Addr": 24, - "Addr1": 6, - "Port1": 4, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false - }, - "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "11x1": { - "identifier": "FB6.1", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 11, - "y": 1 - }, - "addresses": { - "Addr": 2, - "Addr1": 0, - "Port1": 0, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, - "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "11x2": { - "identifier": "FB6.2", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 11, - "y": 2 - }, - "addresses": { - "Addr": 10, - "Addr1": 0, - "Port1": 0, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, - "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "11x3": { - "identifier": "FB6.3", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 11, - "y": 3 - }, - "addresses": { - "Addr": 11, + "Addr": 11, "Addr1": 0, "Port1": 0, "Inverse1": false, @@ -3620,8 +2938,8 @@ "themeDimIdx": 0 } }, - "1x9": { - "identifier": "s08", + "15x3": { + "identifier": "s15", "name": "Turnout Right", "basename": "turnoutright", "clickable": true, @@ -3722,13 +3040,13 @@ ] }, "coord": { - "x": 1, - "y": 9 + "x": 15, + "y": 3 }, "addresses": { "Addr": 0, - "Addr1": 25, - "Port1": 4, + "Addr1": 1, + "Port1": 1, "Inverse1": false, "Addr2": 0, "Port2": 0, @@ -3738,11 +3056,11 @@ "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 3 + "themeDimIdx": 1 } }, - "1x5": { - "identifier": "s07", + "15x2": { + "identifier": "s14", "name": "Turnout Right", "basename": "turnoutright", "clickable": true, @@ -3843,13 +3161,13 @@ ] }, "coord": { - "x": 1, - "y": 5 + "x": 15, + "y": 2 }, "addresses": { "Addr": 0, - "Addr1": 17, - "Port1": 4, + "Addr1": 1, + "Port1": 2, "Inverse1": false, "Addr2": 0, "Port2": 0, @@ -3859,59 +3177,60 @@ "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 3 - } + "themeDimIdx": 1 + }, + "isMaintenance": false }, - "1x4": { - "identifier": "s03", - "name": "Turnout Right", - "basename": "turnoutright", + "15x1": { + "identifier": "s16", + "name": "Turnout Left", + "basename": "turnoutleft", "clickable": true, "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" + "AC,CA,CD,DC", + "BD,DB,DA,AD", + "AC,CA,AB,BA", + "BD,DB,BC,CB" ], "states": { "deg0": [ { "source": "left", - "to": "bottom", - "state": "turnright" + "to": "right", + "state": "straight" }, { - "source": "left", - "to": "right", + "source": "right", + "to": "left", "state": "straight" }, { "source": "bottom", - "to": "left", - "state": "turnright" + "to": "right", + "state": "turnleft" }, { "source": "right", - "to": "left", - "state": "straight" + "to": "bottom", + "state": "turnleft" } ], "deg90": [ { - "source": "top", + "source": "left", + "to": "bottom", + "state": "turnleft" + }, + { + "source": "bottom", "to": "left", - "state": "turnright" + "state": "turnleft" }, { "source": "top", "to": "bottom", "state": "straight" }, - { - "source": "left", - "to": "top", - "state": "turnright" - }, { "source": "bottom", "to": "top", @@ -3921,13 +3240,13 @@ "deg180": [ { "source": "top", - "to": "right", - "state": "turnright" + "to": "left", + "state": "turnleft" }, { - "source": "right", + "source": "left", "to": "top", - "state": "turnright" + "state": "turnleft" }, { "source": "left", @@ -3953,23 +3272,23 @@ }, { "source": "right", - "to": "bottom", - "state": "turnright" + "to": "top", + "state": "turnleft" }, { - "source": "bottom", + "source": "top", "to": "right", - "state": "turnright" + "state": "turnleft" } ] }, "coord": { - "x": 1, - "y": 4 + "x": 15, + "y": 1 }, "addresses": { "Addr": 0, - "Addr1": 2, + "Addr1": 1, "Port1": 3, "Inverse1": false, "Addr2": 0, @@ -3977,62 +3296,62 @@ "Inverse2": false }, "editor": { - "themeId": 51, + "themeId": 50, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 3 + "themeDimIdx": 0 } }, - "1x3": { - "identifier": "s02", - "name": "Turnout Right", - "basename": "turnoutright", + "16x9": { + "identifier": "s09", + "name": "Turnout Left", + "basename": "turnoutleft", "clickable": true, "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" + "AC,CA,CD,DC", + "BD,DB,DA,AD", + "AC,CA,AB,BA", + "BD,DB,BC,CB" ], "states": { "deg0": [ { "source": "left", - "to": "bottom", - "state": "turnright" + "to": "right", + "state": "straight" }, { - "source": "left", - "to": "right", + "source": "right", + "to": "left", "state": "straight" }, { "source": "bottom", - "to": "left", - "state": "turnright" + "to": "right", + "state": "turnleft" }, { "source": "right", - "to": "left", - "state": "straight" + "to": "bottom", + "state": "turnleft" } ], "deg90": [ { - "source": "top", + "source": "left", + "to": "bottom", + "state": "turnleft" + }, + { + "source": "bottom", "to": "left", - "state": "turnright" + "state": "turnleft" }, { "source": "top", "to": "bottom", "state": "straight" }, - { - "source": "left", - "to": "top", - "state": "turnright" - }, { "source": "bottom", "to": "top", @@ -4042,13 +3361,13 @@ "deg180": [ { "source": "top", - "to": "right", - "state": "turnright" + "to": "left", + "state": "turnleft" }, { - "source": "right", + "source": "left", "to": "top", - "state": "turnright" + "state": "turnleft" }, { "source": "left", @@ -4074,86 +3393,86 @@ }, { "source": "right", - "to": "bottom", - "state": "turnright" + "to": "top", + "state": "turnleft" }, { - "source": "bottom", + "source": "top", "to": "right", - "state": "turnright" + "state": "turnleft" } ] }, "coord": { - "x": 1, - "y": 3 + "x": 16, + "y": 9 }, "addresses": { "Addr": 0, - "Addr1": 2, - "Port1": 4, + "Addr1": 9, + "Port1": 1, "Inverse1": false, "Addr2": 0, "Port2": 0, "Inverse2": false }, "editor": { - "themeId": 51, + "themeId": 50, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 3 + "themeDimIdx": 1 } }, - "1x2": { - "identifier": "s01", - "name": "Turnout Right", - "basename": "turnoutright", + "16x8": { + "identifier": "s10", + "name": "Turnout Left", + "basename": "turnoutleft", "clickable": true, "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" + "AC,CA,CD,DC", + "BD,DB,DA,AD", + "AC,CA,AB,BA", + "BD,DB,BC,CB" ], "states": { "deg0": [ { "source": "left", - "to": "bottom", - "state": "turnright" + "to": "right", + "state": "straight" }, { - "source": "left", - "to": "right", + "source": "right", + "to": "left", "state": "straight" }, { "source": "bottom", - "to": "left", - "state": "turnright" + "to": "right", + "state": "turnleft" }, { "source": "right", - "to": "left", - "state": "straight" + "to": "bottom", + "state": "turnleft" } ], "deg90": [ { - "source": "top", + "source": "left", + "to": "bottom", + "state": "turnleft" + }, + { + "source": "bottom", "to": "left", - "state": "turnright" + "state": "turnleft" }, { "source": "top", "to": "bottom", "state": "straight" }, - { - "source": "left", - "to": "top", - "state": "turnright" - }, { "source": "bottom", "to": "top", @@ -4163,13 +3482,13 @@ "deg180": [ { "source": "top", - "to": "right", - "state": "turnright" + "to": "left", + "state": "turnleft" }, { - "source": "right", + "source": "left", "to": "top", - "state": "turnright" + "state": "turnleft" }, { "source": "left", @@ -4195,38 +3514,38 @@ }, { "source": "right", - "to": "bottom", - "state": "turnright" + "to": "top", + "state": "turnleft" }, { - "source": "bottom", + "source": "top", "to": "right", - "state": "turnright" + "state": "turnleft" } ] }, "coord": { - "x": 1, - "y": 2 + "x": 16, + "y": 8 }, "addresses": { "Addr": 0, - "Addr1": 3, - "Port1": 1, + "Addr1": 8, + "Port1": 4, "Inverse1": false, "Addr2": 0, "Port2": 0, "Inverse2": false }, "editor": { - "themeId": 51, + "themeId": 50, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 3 + "themeDimIdx": 1 } }, - "2x5": { - "identifier": "s04", + "15x8": { + "identifier": "s11", "name": "Turnout Right", "basename": "turnoutright", "clickable": true, @@ -4327,14 +3646,14 @@ ] }, "coord": { - "x": 2, - "y": 5 + "x": 15, + "y": 8 }, "addresses": { "Addr": 0, - "Addr1": 3, + "Addr1": 2, "Port1": 2, - "Inverse1": false, + "Inverse1": true, "Addr2": 0, "Port2": 0, "Inverse2": false @@ -4343,11 +3662,11 @@ "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 2 } }, - "2x6": { - "identifier": "s05", + "15x7": { + "identifier": "s12", "name": "Turnout Left", "basename": "turnoutleft", "clickable": true, @@ -4448,13 +3767,13 @@ ] }, "coord": { - "x": 2, - "y": 6 + "x": 15, + "y": 7 }, "addresses": { "Addr": 0, - "Addr1": 3, - "Port1": 3, + "Addr1": 2, + "Port1": 1, "Inverse1": false, "Addr2": 0, "Port2": 0, @@ -4464,12 +3783,11 @@ "themeId": 50, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 3 - }, - "isMaintenance": false + "themeDimIdx": 1 + } }, - "2x7": { - "identifier": "s06", + "15x6": { + "identifier": "s13", "name": "Turnout Left", "basename": "turnoutleft", "clickable": true, @@ -4570,12 +3888,12 @@ ] }, "coord": { - "x": 2, - "y": 7 + "x": 15, + "y": 6 }, "addresses": { "Addr": 0, - "Addr1": 3, + "Addr1": 1, "Port1": 4, "Inverse1": false, "Addr2": 0, @@ -4586,11 +3904,11 @@ "themeId": 50, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 3 + "themeDimIdx": 1 } }, - "15x3": { - "identifier": "s15", + "21x1": { + "identifier": "s24", "name": "Turnout Right", "basename": "turnoutright", "clickable": true, @@ -4691,12 +4009,12 @@ ] }, "coord": { - "x": 15, - "y": 3 + "x": 21, + "y": 1 }, "addresses": { "Addr": 0, - "Addr1": 1, + "Addr1": 16, "Port1": 1, "Inverse1": false, "Addr2": 0, @@ -4707,11 +4025,11 @@ "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 1 + "themeDimIdx": 0 } }, - "15x2": { - "identifier": "s14", + "28x2": { + "identifier": "s25", "name": "Turnout Right", "basename": "turnoutright", "clickable": true, @@ -4812,13 +4130,13 @@ ] }, "coord": { - "x": 15, + "x": 28, "y": 2 }, "addresses": { "Addr": 0, - "Addr1": 1, - "Port1": 2, + "Addr1": 9, + "Port1": 4, "Inverse1": false, "Addr2": 0, "Port2": 0, @@ -4828,12 +4146,11 @@ "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 1 - }, - "isMaintenance": false + "themeDimIdx": 2 + } }, - "15x1": { - "identifier": "s16", + "29x5": { + "identifier": "s26", "name": "Turnout Left", "basename": "turnoutleft", "clickable": true, @@ -4934,12 +4251,12 @@ ] }, "coord": { - "x": 15, - "y": 1 + "x": 29, + "y": 5 }, "addresses": { "Addr": 0, - "Addr1": 1, + "Addr1": 11, "Port1": 3, "Inverse1": false, "Addr2": 0, @@ -4953,56 +4270,56 @@ "themeDimIdx": 0 } }, - "16x9": { - "identifier": "s09", - "name": "Turnout Left", - "basename": "turnoutleft", + "31x7": { + "identifier": "s29", + "name": "Turnout Right", + "basename": "turnoutright", "clickable": true, "routes": [ - "AC,CA,CD,DC", - "BD,DB,DA,AD", - "AC,CA,AB,BA", - "BD,DB,BC,CB" + "AC,CA,AD,DA", + "BD,DB,BA,AB", + "CA,AC,CB,BC", + "DB,BD,DC,CD" ], "states": { "deg0": [ { "source": "left", - "to": "right", - "state": "straight" + "to": "bottom", + "state": "turnright" }, { - "source": "right", - "to": "left", + "source": "left", + "to": "right", "state": "straight" }, { "source": "bottom", - "to": "right", - "state": "turnleft" + "to": "left", + "state": "turnright" }, { "source": "right", - "to": "bottom", - "state": "turnleft" + "to": "left", + "state": "straight" } ], "deg90": [ { - "source": "left", - "to": "bottom", - "state": "turnleft" - }, - { - "source": "bottom", + "source": "top", "to": "left", - "state": "turnleft" + "state": "turnright" }, { "source": "top", "to": "bottom", "state": "straight" }, + { + "source": "left", + "to": "top", + "state": "turnright" + }, { "source": "bottom", "to": "top", @@ -5012,13 +4329,13 @@ "deg180": [ { "source": "top", - "to": "left", - "state": "turnleft" + "to": "right", + "state": "turnright" }, { - "source": "left", + "source": "right", "to": "top", - "state": "turnleft" + "state": "turnright" }, { "source": "left", @@ -5044,23 +4361,23 @@ }, { "source": "right", - "to": "top", - "state": "turnleft" + "to": "bottom", + "state": "turnright" }, { - "source": "top", + "source": "bottom", "to": "right", - "state": "turnleft" + "state": "turnright" } ] }, "coord": { - "x": 16, - "y": 9 + "x": 31, + "y": 7 }, "addresses": { "Addr": 0, - "Addr1": 9, + "Addr1": 11, "Port1": 1, "Inverse1": false, "Addr2": 0, @@ -5068,14 +4385,14 @@ "Inverse2": false }, "editor": { - "themeId": 50, + "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 1 + "themeDimIdx": 2 } }, - "16x8": { - "identifier": "s10", + "29x7": { + "identifier": "s28", "name": "Turnout Left", "basename": "turnoutleft", "clickable": true, @@ -5176,13 +4493,13 @@ ] }, "coord": { - "x": 16, - "y": 8 + "x": 29, + "y": 7 }, "addresses": { "Addr": 0, - "Addr1": 8, - "Port1": 4, + "Addr1": 11, + "Port1": 2, "Inverse1": false, "Addr2": 0, "Port2": 0, @@ -5192,59 +4509,60 @@ "themeId": 50, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 1 - } + "themeDimIdx": 0 + }, + "isMaintenance": false }, - "15x8": { - "identifier": "s11", - "name": "Turnout Right", - "basename": "turnoutright", + "29x8": { + "identifier": "s27", + "name": "Turnout Left", + "basename": "turnoutleft", "clickable": true, "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" + "AC,CA,CD,DC", + "BD,DB,DA,AD", + "AC,CA,AB,BA", + "BD,DB,BC,CB" ], "states": { "deg0": [ { "source": "left", - "to": "bottom", - "state": "turnright" + "to": "right", + "state": "straight" }, { - "source": "left", - "to": "right", + "source": "right", + "to": "left", "state": "straight" }, { "source": "bottom", - "to": "left", - "state": "turnright" + "to": "right", + "state": "turnleft" }, { "source": "right", - "to": "left", - "state": "straight" + "to": "bottom", + "state": "turnleft" } ], "deg90": [ { - "source": "top", + "source": "left", + "to": "bottom", + "state": "turnleft" + }, + { + "source": "bottom", "to": "left", - "state": "turnright" + "state": "turnleft" }, { "source": "top", "to": "bottom", "state": "straight" }, - { - "source": "left", - "to": "top", - "state": "turnright" - }, { "source": "bottom", "to": "top", @@ -5254,13 +4572,13 @@ "deg180": [ { "source": "top", - "to": "right", - "state": "turnright" + "to": "left", + "state": "turnleft" }, { - "source": "right", + "source": "left", "to": "top", - "state": "turnright" + "state": "turnleft" }, { "source": "left", @@ -5286,159 +4604,129 @@ }, { "source": "right", - "to": "bottom", - "state": "turnright" + "to": "top", + "state": "turnleft" }, { - "source": "bottom", + "source": "top", "to": "right", - "state": "turnright" + "state": "turnleft" } ] }, "coord": { - "x": 15, + "x": 29, "y": 8 }, "addresses": { "Addr": 0, - "Addr1": 2, - "Port1": 2, - "Inverse1": true, + "Addr1": 11, + "Port1": 4, + "Inverse1": false, "Addr2": 0, "Port2": 0, "Inverse2": false }, "editor": { - "themeId": 51, + "themeId": 50, "offsetX": 0, "offsetY": 0, "themeDimIdx": 2 - } + }, + "isMaintenance": false }, - "15x7": { - "identifier": "s12", - "name": "Turnout Left", - "basename": "turnoutleft", + "22x6": { + "identifier": "Entkuppler1", + "name": "Decoupler", + "basename": "decoupler", "clickable": true, "routes": [ - "AC,CA,CD,DC", - "BD,DB,DA,AD", - "AC,CA,AB,BA", - "BD,DB,BC,CB" + "AC", + "BD" ], - "states": { - "deg0": [ - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "right", - "to": "left", - "state": "straight" - }, - { - "source": "bottom", - "to": "right", - "state": "turnleft" - }, - { - "source": "right", - "to": "bottom", - "state": "turnleft" - } - ], - "deg90": [ - { - "source": "left", - "to": "bottom", - "state": "turnleft" - }, - { - "source": "bottom", - "to": "left", - "state": "turnleft" - }, - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - } - ], - "deg180": [ - { - "source": "top", - "to": "left", - "state": "turnleft" - }, - { - "source": "left", - "to": "top", - "state": "turnleft" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg270": [ - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - }, - { - "source": "right", - "to": "top", - "state": "turnleft" - }, - { - "source": "top", - "to": "right", - "state": "turnleft" - } - ] + "states": {}, + "coord": { + "x": 22, + "y": 6 + }, + "addresses": { + "Addr": 0, + "Addr1": 18, + "Port1": 1, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, + "editor": { + "themeId": 70, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "22x7": { + "identifier": "Entkuppler2", + "name": "Decoupler", + "basename": "decoupler", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, "coord": { - "x": 15, + "x": 22, "y": 7 }, "addresses": { "Addr": 0, - "Addr1": 2, - "Port1": 1, + "Addr1": 18, + "Port1": 3, "Inverse1": false, "Addr2": 0, "Port2": 0, "Inverse2": false }, "editor": { - "themeId": 50, + "themeId": 70, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 1 + "themeDimIdx": 0 } }, - "15x6": { - "identifier": "s13", + "22x8": { + "identifier": "Entkuppler3", + "name": "Decoupler", + "basename": "decoupler", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 22, + "y": 8 + }, + "addresses": { + "Addr": 0, + "Addr1": 18, + "Port1": 4, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false + }, + "editor": { + "themeId": 70, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "3x9": { + "identifier": "sw11", "name": "Turnout Left", "basename": "turnoutleft", "clickable": true, @@ -5539,13 +4827,13 @@ ] }, "coord": { - "x": 15, - "y": 6 + "x": 3, + "y": 9 }, "addresses": { "Addr": 0, - "Addr1": 1, - "Port1": 4, + "Addr1": 17, + "Port1": 3, "Inverse1": false, "Addr2": 0, "Port2": 0, @@ -5555,543 +4843,696 @@ "themeId": 50, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 1 + "themeDimIdx": 0 } }, - "21x1": { - "identifier": "s24", - "name": "Turnout Right", - "basename": "turnoutright", - "clickable": true, + "7x1": { + "identifier": "B01", + "name": "Block", + "basename": "block", + "clickable": false, "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } ], - "states": { - "deg0": [ - { - "source": "left", - "to": "bottom", - "state": "turnright" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "bottom", - "to": "left", - "state": "turnright" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg90": [ - { - "source": "top", - "to": "left", - "state": "turnright" - }, - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "left", - "to": "top", - "state": "turnright" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - } - ], - "deg180": [ - { - "source": "top", - "to": "right", - "state": "turnright" - }, - { - "source": "right", - "to": "top", - "state": "turnright" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg270": [ - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - }, - { - "source": "right", - "to": "bottom", - "state": "turnright" - }, - { - "source": "bottom", - "to": "right", - "state": "turnright" - } - ] - }, "coord": { - "x": 21, + "x": 7, "y": 1 }, - "addresses": { - "Addr": 0, - "Addr1": 16, - "Port1": 1, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, "editor": { - "themeId": 51, + "themeId": 150, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "28x2": { - "identifier": "s25", - "name": "Turnout Right", - "basename": "turnoutright", - "clickable": true, + "7x2": { + "identifier": "B02", + "name": "Block", + "basename": "block", + "clickable": false, "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } ], - "states": { - "deg0": [ - { - "source": "left", - "to": "bottom", - "state": "turnright" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "bottom", - "to": "left", - "state": "turnright" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg90": [ - { - "source": "top", - "to": "left", - "state": "turnright" - }, - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "left", - "to": "top", - "state": "turnright" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - } - ], - "deg180": [ - { - "source": "top", - "to": "right", - "state": "turnright" - }, - { - "source": "right", - "to": "top", - "state": "turnright" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg270": [ - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - }, - { - "source": "right", - "to": "bottom", - "state": "turnright" - }, - { - "source": "bottom", - "to": "right", - "state": "turnright" - } - ] - }, "coord": { - "x": 28, + "x": 7, "y": 2 }, - "addresses": { - "Addr": 0, - "Addr1": 9, - "Port1": 4, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false + "editor": { + "themeId": 150, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "7x3": { + "identifier": "B03", + "name": "Block", + "basename": "block", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], + "coord": { + "x": 7, + "y": 3 }, "editor": { - "themeId": 51, + "themeId": 150, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 2 + "themeDimIdx": 0 } }, - "29x5": { - "identifier": "s26", - "name": "Turnout Left", - "basename": "turnoutleft", - "clickable": true, + "7x4": { + "identifier": "B04", + "name": "Block", + "basename": "block", + "clickable": false, "routes": [ - "AC,CA,CD,DC", - "BD,DB,DA,AD", - "AC,CA,AB,BA", - "BD,DB,BC,CB" + "A0|C0,C0|A0", + "B0|D0,D0|B0" ], - "states": { - "deg0": [ - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "right", - "to": "left", - "state": "straight" - }, - { - "source": "bottom", - "to": "right", - "state": "turnleft" - }, - { - "source": "right", - "to": "bottom", - "state": "turnleft" - } - ], - "deg90": [ - { - "source": "left", - "to": "bottom", - "state": "turnleft" - }, - { - "source": "bottom", - "to": "left", - "state": "turnleft" - }, - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - } - ], - "deg180": [ - { - "source": "top", - "to": "left", - "state": "turnleft" - }, - { - "source": "left", - "to": "top", - "state": "turnleft" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg270": [ - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - }, - { - "source": "right", - "to": "top", - "state": "turnleft" - }, - { - "source": "top", - "to": "right", - "state": "turnleft" - } - ] + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], + "coord": { + "x": 7, + "y": 4 + }, + "editor": { + "themeId": 150, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "7x5": { + "identifier": "B05", + "name": "Block", + "basename": "block", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], + "coord": { + "x": 7, + "y": 5 + }, + "editor": { + "themeId": 150, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "7x6": { + "identifier": "B06", + "name": "Block", + "basename": "block", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], + "coord": { + "x": 7, + "y": 6 + }, + "editor": { + "themeId": 150, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "7x7": { + "identifier": "B07", + "name": "Block", + "basename": "block", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], + "coord": { + "x": 7, + "y": 7 + }, + "editor": { + "themeId": 150, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "7x8": { + "identifier": "B08", + "name": "Block", + "basename": "block", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], + "coord": { + "x": 7, + "y": 8 + }, + "editor": { + "themeId": 150, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "24x1": { + "identifier": "B18", + "name": "Short Block", + "basename": "block-s", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 2, + "h": 1 + }, + { + "w": 1, + "h": 2 + } + ], + "coord": { + "x": 24, + "y": 1 + }, + "editor": { + "themeId": 151, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "24x2": { + "identifier": "B19", + "name": "Short Block", + "basename": "block-s", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 2, + "h": 1 + }, + { + "w": 1, + "h": 2 + } + ], + "coord": { + "x": 24, + "y": 2 + }, + "editor": { + "themeId": 151, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "24x6": { + "identifier": "B20", + "name": "", + "basename": "block-s", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 2, + "h": 1 + }, + { + "w": 1, + "h": 2 + } + ], + "coord": { + "x": 24, + "y": 6 + }, + "editor": { + "themeId": 151, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "24x7": { + "identifier": "B21", + "name": "Short Block", + "basename": "block-s", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 2, + "h": 1 + }, + { + "w": 1, + "h": 2 + } + ], + "coord": { + "x": 24, + "y": 7 + }, + "editor": { + "themeId": 151, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "24x8": { + "identifier": "B22", + "name": "Short Block", + "basename": "block-s", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 2, + "h": 1 + }, + { + "w": 1, + "h": 2 + } + ], + "coord": { + "x": 24, + "y": 8 + }, + "editor": { + "themeId": 151, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "1x0": { + "identifier": "LblSchattenbahnhof1", + "name": "Text", + "basename": "textelement", + "clickable": false, + "routes": [], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], + "coord": { + "x": 1, + "y": 0 + }, + "editor": { + "themeId": 1010, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0, + "innerHtml": "SCHATTENBAHNHOF#1", + "outerHtml": "
" + } + }, + "20x0": { + "identifier": "LblSchattenbahnhof2", + "name": "Text", + "basename": "textelement", + "clickable": false, + "routes": [], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], + "coord": { + "x": 20, + "y": 0 }, + "editor": { + "themeId": 1010, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0, + "innerHtml": "SCHATTENBAHNHOF#2", + "outerHtml": "
" + } + }, + "19x5": { + "identifier": "LblNebenbahnhof", + "name": "Text", + "basename": "textelement", + "clickable": false, + "routes": [], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], "coord": { - "x": 29, + "x": 19, "y": 5 }, + "editor": { + "themeId": 1010, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0, + "innerHtml": "NEBENBAHNHOF", + "outerHtml": "
" + } + }, + "37x2": { + "identifier": "tx007", + "name": "Text", + "basename": "textelement", + "clickable": false, + "routes": [], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], + "coord": { + "x": 37, + "y": 2 + }, + "editor": { + "themeId": 1010, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0, + "innerHtml": "", + "outerHtml": "
" + } + }, + "19x6": { + "identifier": "Seg3", + "name": "Output A", + "basename": "button-0-on", + "clickable": true, + "routes": [], + "states": {}, + "coord": { + "x": 19, + "y": 6 + }, + "editor": { + "themeId": 71, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + }, "addresses": { "Addr": 0, - "Addr1": 11, - "Port1": 3, + "Addr1": 257, + "Port1": 2, "Inverse1": false, - "Addr2": 0, - "Port2": 0, + "Addr2": -1, + "Port2": -1, "Inverse2": false }, + "groupName": "Segment" + }, + "19x7": { + "identifier": "Seg2", + "name": "Output A", + "basename": "button-0-on", + "clickable": true, + "routes": [], + "states": {}, + "coord": { + "x": 19, + "y": 7 + }, "editor": { - "themeId": 50, + "themeId": 71, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 - } + }, + "addresses": { + "Addr": 0, + "Addr1": 257, + "Port1": 1, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false + }, + "groupName": "Segment" }, - "31x7": { - "identifier": "s29", - "name": "Turnout Right", - "basename": "turnoutright", + "19x8": { + "identifier": "Seg1", + "name": "Output A", + "basename": "button-0-on", "clickable": true, - "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" - ], - "states": { - "deg0": [ - { - "source": "left", - "to": "bottom", - "state": "turnright" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "bottom", - "to": "left", - "state": "turnright" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg90": [ - { - "source": "top", - "to": "left", - "state": "turnright" - }, - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "left", - "to": "top", - "state": "turnright" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - } - ], - "deg180": [ - { - "source": "top", - "to": "right", - "state": "turnright" - }, - { - "source": "right", - "to": "top", - "state": "turnright" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg270": [ - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - }, - { - "source": "right", - "to": "bottom", - "state": "turnright" - }, - { - "source": "bottom", - "to": "right", - "state": "turnright" - } - ] + "routes": [], + "states": {}, + "coord": { + "x": 19, + "y": 8 + }, + "editor": { + "themeId": 71, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + }, + "addresses": { + "Addr": 0, + "Addr1": 256, + "Port1": 4, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false }, + "groupName": "Segment" + }, + "17x10": { + "identifier": "FBR4", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, "coord": { - "x": 31, - "y": 7 + "x": 17, + "y": 10 }, "addresses": { - "Addr": 0, - "Addr1": 11, - "Port1": 1, + "Addr": 49, + "Addr1": 0, + "Port1": 0, "Inverse1": false, "Addr2": 0, "Port2": 0, "Inverse2": false }, "editor": { - "themeId": 51, + "themeId": 200, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 2 + "themeDimIdx": 0 } }, - "29x7": { - "identifier": "s28", - "name": "Turnout Left", - "basename": "turnoutleft", + "15x9": { + "id": 51, + "name": "Turnout Right", + "basename": "turnoutright", "clickable": true, "routes": [ - "AC,CA,CD,DC", - "BD,DB,DA,AD", - "AC,CA,AB,BA", - "BD,DB,BC,CB" + "AC,CA,AD,DA", + "BD,DB,BA,AB", + "CA,AC,CB,BC", + "DB,BD,DC,CD" ], "states": { "deg0": [ { "source": "left", - "to": "right", - "state": "straight" + "to": "bottom", + "state": "turnright" }, { - "source": "right", - "to": "left", + "source": "left", + "to": "right", "state": "straight" }, { "source": "bottom", - "to": "right", - "state": "turnleft" + "to": "left", + "state": "turnright" }, { "source": "right", - "to": "bottom", - "state": "turnleft" + "to": "left", + "state": "straight" } ], "deg90": [ { - "source": "left", - "to": "bottom", - "state": "turnleft" - }, - { - "source": "bottom", + "source": "top", "to": "left", - "state": "turnleft" + "state": "turnright" }, { "source": "top", "to": "bottom", "state": "straight" }, + { + "source": "left", + "to": "top", + "state": "turnright" + }, { "source": "bottom", "to": "top", @@ -6101,13 +5542,13 @@ "deg180": [ { "source": "top", - "to": "left", - "state": "turnleft" + "to": "right", + "state": "turnright" }, { - "source": "left", + "source": "right", "to": "top", - "state": "turnleft" + "state": "turnright" }, { "source": "left", @@ -6133,87 +5574,201 @@ }, { "source": "right", - "to": "top", - "state": "turnleft" + "to": "bottom", + "state": "turnright" }, { - "source": "top", + "source": "bottom", "to": "right", - "state": "turnleft" + "state": "turnright" } ] }, + "editor": { + "themeId": 51, + "themeDimIdx": 0, + "offsetX": 10, + "offsetY": 8 + }, + "identifier": "SW_3", "coord": { - "x": 29, - "y": 7 + "x": 15, + "y": 9 }, "addresses": { "Addr": 0, - "Addr1": 11, - "Port1": 2, + "Addr1": 29, + "Port1": 1, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false + } + }, + "18x10": { + "identifier": "tk1017396005", + "name": "Straigth", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 18, + "y": 10 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "19x10": { + "identifier": "tk1017396009", + "name": "Straigth", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 19, + "y": 10 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "20x10": { + "identifier": "tk1017396007", + "name": "Straigth", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 20, + "y": 10 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "2x17": { + "identifier": "tk20171218191116471", + "name": "Straigth", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 2, + "y": 17 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "3x17": { + "identifier": "FBL1", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 3, + "y": 17 + }, + "addresses": { + "Addr": 32, + "Addr1": 0, + "Port1": 0, "Inverse1": false, "Addr2": 0, "Port2": 0, "Inverse2": false }, "editor": { - "themeId": 50, + "themeId": 200, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 - }, - "isMaintenance": false + } }, - "29x8": { - "identifier": "s27", - "name": "Turnout Left", - "basename": "turnoutleft", + "4x17": { + "identifier": "s17", + "name": "Turnout Right", + "basename": "turnoutright", "clickable": true, "routes": [ - "AC,CA,CD,DC", - "BD,DB,DA,AD", - "AC,CA,AB,BA", - "BD,DB,BC,CB" + "AC,CA,AD,DA", + "BD,DB,BA,AB", + "CA,AC,CB,BC", + "DB,BD,DC,CD" ], "states": { "deg0": [ { "source": "left", - "to": "right", - "state": "straight" + "to": "bottom", + "state": "turnright" }, { - "source": "right", - "to": "left", + "source": "left", + "to": "right", "state": "straight" }, { "source": "bottom", - "to": "right", - "state": "turnleft" + "to": "left", + "state": "turnright" }, { "source": "right", - "to": "bottom", - "state": "turnleft" + "to": "left", + "state": "straight" } ], "deg90": [ { - "source": "left", - "to": "bottom", - "state": "turnleft" - }, - { - "source": "bottom", + "source": "top", "to": "left", - "state": "turnleft" + "state": "turnright" }, { "source": "top", "to": "bottom", "state": "straight" }, + { + "source": "left", + "to": "top", + "state": "turnright" + }, { "source": "bottom", "to": "top", @@ -6223,13 +5778,13 @@ "deg180": [ { "source": "top", - "to": "left", - "state": "turnleft" + "to": "right", + "state": "turnright" }, { - "source": "left", + "source": "right", "to": "top", - "state": "turnleft" + "state": "turnright" }, { "source": "left", @@ -6255,23 +5810,23 @@ }, { "source": "right", - "to": "top", - "state": "turnleft" + "to": "bottom", + "state": "turnright" }, { - "source": "top", + "source": "bottom", "to": "right", - "state": "turnleft" + "state": "turnright" } ] }, "coord": { - "x": 29, - "y": 8 + "x": 4, + "y": 17 }, "addresses": { "Addr": 0, - "Addr1": 11, + "Addr1": 5, "Port1": 4, "Inverse1": false, "Addr2": 0, @@ -6279,153 +5834,85 @@ "Inverse2": false }, "editor": { - "themeId": 50, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 2 - }, - "isMaintenance": false - }, - "22x6": { - "identifier": "Entkuppler1", - "name": "Decoupler", - "basename": "decoupler", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 22, - "y": 6 - }, - "addresses": { - "Addr": 0, - "Addr1": 18, - "Port1": 1, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, - "editor": { - "themeId": 70, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "22x7": { - "identifier": "Entkuppler2", - "name": "Decoupler", - "basename": "decoupler", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 22, - "y": 7 - }, - "addresses": { - "Addr": 0, - "Addr1": 18, - "Port1": 3, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, - "editor": { - "themeId": 70, + "themeId": 51, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "22x8": { - "identifier": "Entkuppler3", - "name": "Decoupler", - "basename": "decoupler", - "clickable": true, + "4x18": { + "identifier": "tk20171218191247601", + "name": "Curve", + "basename": "curve", + "clickable": false, "routes": [ - "AC", - "BD" + "AD,DA", + "AB,BA", + "BC,CB", + "CD,DC" ], "states": {}, "coord": { - "x": 22, - "y": 8 - }, - "addresses": { - "Addr": 0, - "Addr1": 18, - "Port1": 4, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false + "x": 4, + "y": 18 }, "editor": { - "themeId": 70, + "themeId": 11, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 2 } }, - "0x12": { - "identifier": "sw10", - "name": "Turnout Left", - "basename": "turnoutleft", + "5x18": { + "identifier": "s20", + "name": "Turnout Right", + "basename": "turnoutright", "clickable": true, "routes": [ - "AC,CA,CD,DC", - "BD,DB,DA,AD", - "AC,CA,AB,BA", - "BD,DB,BC,CB" + "AC,CA,AD,DA", + "BD,DB,BA,AB", + "CA,AC,CB,BC", + "DB,BD,DC,CD" ], "states": { "deg0": [ { "source": "left", - "to": "right", - "state": "straight" + "to": "bottom", + "state": "turnright" }, { - "source": "right", - "to": "left", + "source": "left", + "to": "right", "state": "straight" }, { "source": "bottom", - "to": "right", - "state": "turnleft" + "to": "left", + "state": "turnright" }, { "source": "right", - "to": "bottom", - "state": "turnleft" + "to": "left", + "state": "straight" } ], "deg90": [ { - "source": "left", - "to": "bottom", - "state": "turnleft" - }, - { - "source": "bottom", + "source": "top", "to": "left", - "state": "turnleft" + "state": "turnright" }, { "source": "top", "to": "bottom", "state": "straight" }, + { + "source": "left", + "to": "top", + "state": "turnright" + }, { "source": "bottom", "to": "top", @@ -6435,13 +5922,13 @@ "deg180": [ { "source": "top", - "to": "left", - "state": "turnleft" + "to": "right", + "state": "turnright" }, { - "source": "left", + "source": "right", "to": "top", - "state": "turnleft" + "state": "turnright" }, { "source": "left", @@ -6467,23 +5954,23 @@ }, { "source": "right", - "to": "top", - "state": "turnleft" + "to": "bottom", + "state": "turnright" }, { - "source": "top", + "source": "bottom", "to": "right", - "state": "turnleft" + "state": "turnright" } ] }, "coord": { - "x": 0, - "y": 12 + "x": 5, + "y": 18 }, "addresses": { "Addr": 0, - "Addr1": 17, + "Addr1": 6, "Port1": 2, "Inverse1": false, "Addr2": 0, @@ -6491,14 +5978,35 @@ "Inverse2": false }, "editor": { - "themeId": 50, + "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 3 + "themeDimIdx": 0 } }, - "3x9": { - "identifier": "sw11", + "7x18": { + "identifier": "tk20171218190854504", + "name": "Straigth", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 7, + "y": 18 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "5x19": { + "identifier": "s18", "name": "Turnout Left", "basename": "turnoutleft", "clickable": true, @@ -6599,399 +6107,287 @@ ] }, "coord": { - "x": 3, - "y": 9 + "x": 5, + "y": 19 }, "addresses": { "Addr": 0, - "Addr1": 17, + "Addr1": 6, "Port1": 3, "Inverse1": false, "Addr2": 0, "Port2": 0, - "Inverse2": false - }, - "editor": { - "themeId": 50, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "7x1": { - "identifier": "B01", - "name": "Block", - "basename": "block", - "clickable": false, - "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" - ], - "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } - ], - "coord": { - "x": 7, - "y": 1 + "Inverse2": false }, "editor": { - "themeId": 150, + "themeId": 50, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 3 } }, - "7x2": { - "identifier": "B02", - "name": "Block", - "basename": "block", + "5x20": { + "identifier": "tk20171218191527270", + "name": "Curve", + "basename": "curve", "clickable": false, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AD,DA", + "AB,BA", + "BC,CB", + "CD,DC" ], "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } - ], "coord": { - "x": 7, - "y": 2 + "x": 5, + "y": 20 }, "editor": { - "themeId": 150, + "themeId": 11, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 2 } }, - "7x3": { - "identifier": "B03", - "name": "Block", - "basename": "block", + "7x20": { + "identifier": "tk20171218191525246", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } - ], "coord": { "x": 7, - "y": 3 + "y": 20 }, "editor": { - "themeId": 150, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "7x4": { - "identifier": "B04", - "name": "Block", - "basename": "block", + "7x19": { + "identifier": "tk20171218191524919", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } - ], "coord": { "x": 7, - "y": 4 + "y": 19 }, "editor": { - "themeId": 150, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "7x5": { - "identifier": "B05", - "name": "Block", - "basename": "block", - "clickable": false, + "8x19": { + "identifier": "FB24.1", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } - ], "coord": { - "x": 7, - "y": 5 + "x": 8, + "y": 19 + }, + "addresses": { + "Addr": 42, + "Addr1": 0, + "Port1": 0, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, "editor": { - "themeId": 150, + "themeId": 200, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "7x6": { - "identifier": "B06", - "name": "Block", - "basename": "block", - "clickable": false, + "8x18": { + "identifier": "FB23.1", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } - ], "coord": { - "x": 7, - "y": 6 + "x": 8, + "y": 18 + }, + "addresses": { + "Addr": 40, + "Addr1": 0, + "Port1": 0, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, "editor": { - "themeId": 150, + "themeId": 200, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "7x7": { - "identifier": "B07", - "name": "Block", - "basename": "block", - "clickable": false, + "8x20": { + "identifier": "FB25.1", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } - ], "coord": { - "x": 7, - "y": 7 + "x": 8, + "y": 20 + }, + "addresses": { + "Addr": 44, + "Addr1": 11, + "Port1": 4, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false }, "editor": { - "themeId": 150, + "themeId": 200, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "7x8": { - "identifier": "B08", - "name": "Block", - "basename": "block", + "9x20": { + "identifier": "tk20171218190848104", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } - ], "coord": { - "x": 7, - "y": 8 + "x": 9, + "y": 20 }, "editor": { - "themeId": 150, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "24x1": { - "identifier": "B18", - "name": "Short Block", - "basename": "block-s", + "9x19": { + "identifier": "tk20171218190847256", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" - ], - "states": {}, - "dimensions": [ - { - "w": 2, - "h": 1 - }, - { - "w": 1, - "h": 2 - } + "AC", + "BD" ], + "states": {}, "coord": { - "x": 24, - "y": 1 + "x": 9, + "y": 19 }, "editor": { - "themeId": 151, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "24x2": { - "identifier": "B19", - "name": "Short Block", - "basename": "block-s", + "9x18": { + "identifier": "tk20171218190844880", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 2, - "h": 1 - }, - { - "w": 1, - "h": 2 - } - ], "coord": { - "x": 24, - "y": 2 + "x": 9, + "y": 18 }, "editor": { - "themeId": 151, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "24x6": { - "identifier": "B20", - "name": "", - "basename": "block-s", + "10x19": { + "identifier": "tk20171218190847576", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 2, - "h": 1 - }, - { - "w": 1, - "h": 2 - } - ], "coord": { - "x": 24, - "y": 6 + "x": 10, + "y": 19 }, "editor": { - "themeId": 151, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "24x7": { - "identifier": "B21", - "name": "Short Block", - "basename": "block-s", + "10x20": { + "identifier": "tk20171218190847848", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 2, - "h": 1 - }, - { - "w": 1, - "h": 2 - } - ], "coord": { - "x": 24, - "y": 7 + "x": 10, + "y": 20 }, "editor": { - "themeId": 151, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "24x8": { - "identifier": "B22", + "11x20": { + "identifier": "B15", "name": "Short Block", "basename": "block-s", "clickable": false, @@ -7011,8 +6407,8 @@ } ], "coord": { - "x": 24, - "y": 8 + "x": 11, + "y": 20 }, "editor": { "themeId": 151, @@ -7021,8 +6417,8 @@ "themeDimIdx": 0 } }, - "3x13": { - "identifier": "B25", + "11x19": { + "identifier": "B14", "name": "Short Block", "basename": "block-s", "clickable": false, @@ -7042,8 +6438,8 @@ } ], "coord": { - "x": 3, - "y": 13 + "x": 11, + "y": 19 }, "editor": { "themeId": 151, @@ -7052,42 +6448,15 @@ "themeDimIdx": 0 } }, - "1x0": { - "identifier": "LblSchattenbahnhof1", - "name": "Text", - "basename": "textelement", + "10x18": { + "identifier": "B13", + "name": "Block", + "basename": "block", "clickable": false, - "routes": [], - "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" ], - "coord": { - "x": 1, - "y": 0 - }, - "editor": { - "themeId": 1010, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0, - "innerHtml": "SCHATTENBAHNHOF#1", - "outerHtml": "
" - } - }, - "20x0": { - "identifier": "LblSchattenbahnhof2", - "name": "Text", - "basename": "textelement", - "clickable": false, - "routes": [], "states": {}, "dimensions": [ { @@ -7100,164 +6469,102 @@ } ], "coord": { - "x": 20, - "y": 0 + "x": 10, + "y": 18 }, "editor": { - "themeId": 1010, + "themeId": 150, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0, - "innerHtml": "SCHATTENBAHNHOF#2", - "outerHtml": "
" + "themeDimIdx": 0 } }, - "19x5": { - "identifier": "LblNebenbahnhof", - "name": "Text", - "basename": "textelement", + "13x20": { + "identifier": "tk20171218190850008", + "name": "Straigth", + "basename": "straight", "clickable": false, - "routes": [], - "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } + "routes": [ + "AC", + "BD" ], + "states": {}, "coord": { - "x": 19, - "y": 5 + "x": 13, + "y": 20 }, "editor": { - "themeId": 1010, + "themeId": 10, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0, - "innerHtml": "NEBENBAHNHOF", - "outerHtml": "
" + "themeDimIdx": 0 } }, - "37x2": { - "identifier": "tx007", - "name": "Text", - "basename": "textelement", + "13x19": { + "identifier": "tk20171218190848632", + "name": "Straigth", + "basename": "straight", "clickable": false, - "routes": [], - "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } + "routes": [ + "AC", + "BD" ], - "coord": { - "x": 37, - "y": 2 - }, - "editor": { - "themeId": 1010, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0, - "innerHtml": "", - "outerHtml": "
" - } - }, - "19x6": { - "identifier": "Seg3", - "name": "Output A", - "basename": "button-0-on", - "clickable": true, - "routes": [], "states": {}, "coord": { - "x": 19, - "y": 6 + "x": 13, + "y": 19 }, "editor": { - "themeId": 71, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 - }, - "addresses": { - "Addr": 0, - "Addr1": 257, - "Port1": 2, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false - }, - "groupName": "Segment" - }, - "19x7": { - "identifier": "Seg2", - "name": "Output A", - "basename": "button-0-on", - "clickable": true, - "routes": [], + } + }, + "14x19": { + "identifier": "tk20171218190849664", + "name": "Straigth", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], "states": {}, "coord": { - "x": 19, - "y": 7 + "x": 14, + "y": 19 }, "editor": { - "themeId": 71, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 - }, - "addresses": { - "Addr": 0, - "Addr1": 257, - "Port1": 1, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false - }, - "groupName": "Segment" + } }, - "19x8": { - "identifier": "Seg1", - "name": "Output A", - "basename": "button-0-on", - "clickable": true, - "routes": [], + "14x20": { + "identifier": "tk20171218190849392", + "name": "Straigth", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], "states": {}, "coord": { - "x": 19, - "y": 8 + "x": 14, + "y": 20 }, "editor": { - "themeId": 71, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 - }, - "addresses": { - "Addr": 0, - "Addr1": 256, - "Port1": 4, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false - }, - "groupName": "Segment" + } }, - "17x10": { - "identifier": "FBR4", + "15x19": { + "identifier": "FB24.2", "name": "Sensor", "basename": "sensor-off", "clickable": true, @@ -7267,11 +6574,11 @@ ], "states": {}, "coord": { - "x": 17, - "y": 10 + "x": 15, + "y": 19 }, "addresses": { - "Addr": 49, + "Addr": 41, "Addr1": 0, "Port1": 0, "Inverse1": false, @@ -7286,151 +6593,38 @@ "themeDimIdx": 0 } }, - "15x9": { - "id": 51, - "name": "Turnout Right", - "basename": "turnoutright", + "15x20": { + "identifier": "FB25.2", + "name": "Sensor", + "basename": "sensor-off", "clickable": true, "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" + "AC", + "BD" ], - "states": { - "deg0": [ - { - "source": "left", - "to": "bottom", - "state": "turnright" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "bottom", - "to": "left", - "state": "turnright" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg90": [ - { - "source": "top", - "to": "left", - "state": "turnright" - }, - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "left", - "to": "top", - "state": "turnright" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - } - ], - "deg180": [ - { - "source": "top", - "to": "right", - "state": "turnright" - }, - { - "source": "right", - "to": "top", - "state": "turnright" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg270": [ - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - }, - { - "source": "right", - "to": "bottom", - "state": "turnright" - }, - { - "source": "bottom", - "to": "right", - "state": "turnright" - } - ] - }, - "editor": { - "themeId": 51, - "themeDimIdx": 0, - "offsetX": 10, - "offsetY": 8 - }, - "identifier": "SW_3", + "states": {}, "coord": { "x": 15, - "y": 9 + "y": 20 }, "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, + "Addr": 43, + "Addr1": 11, + "Port1": 3, "Inverse1": false, "Addr2": -1, "Port2": -1, "Inverse2": false - } - }, - "18x10": { - "identifier": "tk1017396005", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 18, - "y": 10 }, "editor": { - "themeId": 10, + "themeId": 200, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "19x10": { - "identifier": "tk1017396009", + "16x19": { + "identifier": "tk20171218191552597", "name": "Straigth", "basename": "straight", "clickable": false, @@ -7440,8 +6634,8 @@ ], "states": {}, "coord": { - "x": 19, - "y": 10 + "x": 16, + "y": 19 }, "editor": { "themeId": 10, @@ -7450,8 +6644,8 @@ "themeDimIdx": 0 } }, - "20x10": { - "identifier": "tk1017396007", + "16x20": { + "identifier": "tk20171218191552868", "name": "Straigth", "basename": "straight", "clickable": false, @@ -7461,8 +6655,8 @@ ], "states": {}, "coord": { - "x": 20, - "y": 10 + "x": 16, + "y": 20 }, "editor": { "themeId": 10, @@ -7471,251 +6665,248 @@ "themeDimIdx": 0 } }, - "2x17": { - "identifier": "tk20171218191116471", - "name": "Straigth", - "basename": "straight", + "18x20": { + "identifier": "tk20171218191538958", + "name": "Curve", + "basename": "curve", "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 2, - "y": 17 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "3x17": { - "identifier": "FBL1", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" + "routes": [ + "AD,DA", + "AB,BA", + "BC,CB", + "CD,DC" ], "states": {}, "coord": { - "x": 3, - "y": 17 - }, - "addresses": { - "Addr": 32, - "Addr1": 0, - "Port1": 0, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false + "x": 18, + "y": 20 }, "editor": { - "themeId": 200, + "themeId": 11, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 1 } }, - "4x17": { - "identifier": "s17", - "name": "Turnout Right", - "basename": "turnoutright", + "18x19": { + "identifier": "SK2", + "name": "Crossing Left sr", + "basename": "dcrossingright-sr", "clickable": true, "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" + "A0|C0,A0|B1,B1|D0,D0|C0", + "A0|C1,A0|D0,B0|D0,B0|C1" ], "states": { "deg0": [ { "source": "left", - "to": "bottom", - "state": "turnright" + "to": "top", + "state": "turnleft|straight" }, { - "source": "left", - "to": "right", - "state": "straight" + "source": "top", + "to": "left", + "state": "turnleft|straight" }, { - "source": "bottom", - "to": "left", - "state": "turnright" + "source": "left", + "to": "right", + "state": "straight|straight" }, { "source": "right", "to": "left", - "state": "straight" - } - ], - "deg90": [ + "state": "straight|straight" + }, { - "source": "top", - "to": "left", - "state": "turnright" + "source": "bottom", + "to": "right", + "state": "straight|turnleft" }, { - "source": "top", + "source": "right", "to": "bottom", - "state": "straight" + "state": "straight|turnleft" }, { - "source": "left", + "source": "bottom", "to": "top", - "state": "turnright" + "state": "turnleft|turnleft" }, { - "source": "bottom", - "to": "top", - "state": "straight" + "source": "top", + "to": "bottom", + "state": "turnleft|turnleft" } ], - "deg180": [ + "deg90": [ { - "source": "top", - "to": "right", - "state": "turnright" + "source": "left", + "to": "bottom", + "state": "turnleft|straight" }, { - "source": "right", - "to": "top", - "state": "turnright" + "source": "bottom", + "to": "left", + "state": "turnleft|straight" }, { "source": "left", "to": "right", - "state": "straight" + "state": "straight|straight" }, { "source": "right", "to": "left", - "state": "straight" - } - ], - "deg270": [ - { - "source": "top", - "to": "bottom", - "state": "straight" + "state": "straight|straight" }, { "source": "bottom", - "to": "top", - "state": "straight" + "to": "left", + "state": "straight|turnleft" }, { - "source": "right", + "source": "left", "to": "bottom", - "state": "turnright" + "state": "straight|turnleft" }, { "source": "bottom", - "to": "right", - "state": "turnright" + "to": "top", + "state": "turnleft|turnleft" + }, + { + "source": "top", + "to": "bottom", + "state": "turnleft|turnleft" } ] }, + "dimensions": [ + { + "w": 2, + "h": 1 + }, + { + "w": 1, + "h": 2 + } + ], "coord": { - "x": 4, - "y": 17 + "x": 18, + "y": 19 }, "addresses": { "Addr": 0, - "Addr1": 5, - "Port1": 4, + "Addr1": 7, + "Port1": 3, "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false + "Addr2": 7, + "Port2": 2, + "Inverse2": true }, "editor": { - "themeId": 51, + "themeId": 58, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "4x18": { - "identifier": "tk20171218191247601", - "name": "Curve", - "basename": "curve", + "20x19": { + "identifier": "tk20171218191818875", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" + "AC", + "BD" ], "states": {}, "coord": { - "x": 4, - "y": 18 + "x": 20, + "y": 19 }, "editor": { - "themeId": 11, + "themeId": 10, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 2 + "themeDimIdx": 0 } }, - "5x18": { - "identifier": "s20", - "name": "Turnout Right", - "basename": "turnoutright", + "21x19": { + "identifier": "tk20171218191820875", + "name": "Buffer", + "basename": "buffer", + "clickable": false, + "routes": [ + "A", + "B", + "C", + "D" + ], + "states": {}, + "coord": { + "x": 21, + "y": 19 + }, + "editor": { + "themeId": 13, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "5x17": { + "id": 50, + "name": "Turnout Left", + "basename": "turnoutleft", "clickable": true, "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" + "AC,CA,CD,DC", + "BD,DB,DA,AD", + "AC,CA,AB,BA", + "BD,DB,BC,CB" ], "states": { "deg0": [ { "source": "left", - "to": "bottom", - "state": "turnright" + "to": "right", + "state": "straight" }, { - "source": "left", - "to": "right", + "source": "right", + "to": "left", "state": "straight" }, { "source": "bottom", - "to": "left", - "state": "turnright" + "to": "right", + "state": "turnleft" }, { "source": "right", - "to": "left", - "state": "straight" + "to": "bottom", + "state": "turnleft" } ], "deg90": [ { - "source": "top", + "source": "left", + "to": "bottom", + "state": "turnleft" + }, + { + "source": "bottom", "to": "left", - "state": "turnright" + "state": "turnleft" }, { "source": "top", "to": "bottom", "state": "straight" }, - { - "source": "left", - "to": "top", - "state": "turnright" - }, { "source": "bottom", "to": "top", @@ -7725,13 +6916,13 @@ "deg180": [ { "source": "top", - "to": "right", - "state": "turnright" + "to": "left", + "state": "turnleft" }, { - "source": "right", + "source": "left", "to": "top", - "state": "turnright" + "state": "turnleft" }, { "source": "left", @@ -7757,38 +6948,84 @@ }, { "source": "right", - "to": "bottom", - "state": "turnright" + "to": "top", + "state": "turnleft" }, { - "source": "bottom", + "source": "top", "to": "right", - "state": "turnright" + "state": "turnleft" } ] }, + "editor": { + "themeId": 50, + "offsetX": 23, + "offsetY": 18, + "themeDimIdx": 2 + }, + "identifier": "SW_1", "coord": { "x": 5, - "y": 18 + "y": 17 }, "addresses": { "Addr": 0, "Addr1": 6, - "Port1": 2, + "Port1": 1, "Inverse1": false, - "Addr2": 0, - "Port2": 0, + "Addr2": -1, + "Port2": -1, "Inverse2": false }, + "isMaintenance": false + }, + "7x17": { + "identifier": "tk20171218191334342", + "name": "Straigth", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 7, + "y": 17 + }, "editor": { - "themeId": 51, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "7x18": { - "identifier": "tk20171218190854504", + "3x16": { + "identifier": "tk20171218191420723", + "name": "Buffer", + "basename": "buffer", + "clickable": false, + "routes": [ + "A", + "B", + "C", + "D" + ], + "states": {}, + "coord": { + "x": 3, + "y": 16 + }, + "editor": { + "themeId": 13, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 2 + } + }, + "4x16": { + "identifier": "tk20171218191428562", "name": "Straigth", "basename": "straight", "clickable": false, @@ -7798,8 +7035,8 @@ ], "states": {}, "coord": { - "x": 7, - "y": 18 + "x": 4, + "y": 16 }, "editor": { "themeId": 10, @@ -7808,129 +7045,133 @@ "themeDimIdx": 0 } }, - "5x19": { - "identifier": "s18", - "name": "Turnout Left", - "basename": "turnoutleft", + "5x16": { + "identifier": "SK1", + "name": "Crossing Left sr", + "basename": "dcrossingright-sr", "clickable": true, "routes": [ - "AC,CA,CD,DC", - "BD,DB,DA,AD", - "AC,CA,AB,BA", - "BD,DB,BC,CB" + "A0|C0,A0|B1,B1|D0,D0|C0", + "A0|C1,A0|D0,B0|D0,B0|C1" ], "states": { "deg0": [ + { + "source": "left", + "to": "top", + "state": "turnleft|straight" + }, + { + "source": "top", + "to": "left", + "state": "turnleft|straight" + }, { "source": "left", "to": "right", - "state": "straight" + "state": "straight|straight" }, { "source": "right", "to": "left", - "state": "straight" + "state": "straight|straight" }, { "source": "bottom", "to": "right", - "state": "turnleft" + "state": "straight|turnleft" }, { "source": "right", "to": "bottom", - "state": "turnleft" - } - ], - "deg90": [ - { - "source": "left", - "to": "bottom", - "state": "turnleft" + "state": "straight|turnleft" }, { "source": "bottom", - "to": "left", - "state": "turnleft" + "to": "top", + "state": "turnleft|turnleft" }, { "source": "top", "to": "bottom", - "state": "straight" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" + "state": "turnleft|turnleft" } ], - "deg180": [ + "deg90": [ { - "source": "top", - "to": "left", - "state": "turnleft" + "source": "left", + "to": "bottom", + "state": "turnleft|straight" }, { - "source": "left", - "to": "top", - "state": "turnleft" + "source": "bottom", + "to": "left", + "state": "turnleft|straight" }, { "source": "left", "to": "right", - "state": "straight" + "state": "straight|straight" }, { "source": "right", "to": "left", - "state": "straight" - } - ], - "deg270": [ - { - "source": "top", - "to": "bottom", - "state": "straight" + "state": "straight|straight" }, { "source": "bottom", - "to": "top", - "state": "straight" + "to": "left", + "state": "straight|turnleft" }, { - "source": "right", + "source": "left", + "to": "bottom", + "state": "straight|turnleft" + }, + { + "source": "bottom", "to": "top", - "state": "turnleft" + "state": "turnleft|turnleft" }, { "source": "top", - "to": "right", - "state": "turnleft" + "to": "bottom", + "state": "turnleft|turnleft" } ] }, + "dimensions": [ + { + "w": 2, + "h": 1 + }, + { + "w": 1, + "h": 2 + } + ], "coord": { "x": 5, - "y": 19 + "y": 16 }, "addresses": { "Addr": 0, - "Addr1": 6, - "Port1": 3, + "Addr1": 7, + "Port1": 1, "Inverse1": false, - "Addr2": 0, - "Port2": 0, + "Addr2": 6, + "Port2": 4, "Inverse2": false }, "editor": { - "themeId": 50, + "themeId": 58, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 3 + "themeDimIdx": 0 } }, - "5x20": { - "identifier": "tk20171218191527270", + "6x15": { + "identifier": "tk20171218191431074", "name": "Curve", "basename": "curve", "clickable": false, @@ -7942,18 +7183,18 @@ ], "states": {}, "coord": { - "x": 5, - "y": 20 + "x": 6, + "y": 15 }, "editor": { "themeId": 11, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 2 + "themeDimIdx": 3 } }, - "7x20": { - "identifier": "tk20171218191525246", + "7x15": { + "identifier": "tk20171218191429618", "name": "Straigth", "basename": "straight", "clickable": false, @@ -7964,17 +7205,81 @@ "states": {}, "coord": { "x": 7, - "y": 20 + "y": 15 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "7x14": { + "identifier": "LblHauptbahnhof", + "name": "Text", + "basename": "textelement", + "clickable": false, + "routes": [], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], + "coord": { + "x": 7, + "y": 14 + }, + "editor": { + "themeId": 1010, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0, + "innerHtml": "HAUPTBAHNHOF", + "outerHtml": "\n
HAUPTBAHNHOF
\n
", + "size": { + "width": "132px", + "height": "32px" + } + } + }, + "8x15": { + "identifier": "FB20.1", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 8, + "y": 15 + }, + "addresses": { + "Addr": 34, + "Addr1": 9, + "Port1": 2, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false }, "editor": { - "themeId": 10, + "themeId": 200, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "7x19": { - "identifier": "tk20171218191524919", + "7x16": { + "identifier": "tk20171218191429042", "name": "Straigth", "basename": "straight", "clickable": false, @@ -7985,7 +7290,7 @@ "states": {}, "coord": { "x": 7, - "y": 19 + "y": 16 }, "editor": { "themeId": 10, @@ -7994,8 +7299,8 @@ "themeDimIdx": 0 } }, - "8x19": { - "identifier": "FB24.1", + "8x16": { + "identifier": "FB21.1", "name": "Sensor", "basename": "sensor-off", "clickable": true, @@ -8006,15 +7311,15 @@ "states": {}, "coord": { "x": 8, - "y": 19 + "y": 16 }, "addresses": { - "Addr": 42, - "Addr1": 0, - "Port1": 0, + "Addr": 36, + "Addr1": 9, + "Port1": 4, "Inverse1": false, - "Addr2": 0, - "Port2": 0, + "Addr2": -1, + "Port2": -1, "Inverse2": false }, "editor": { @@ -8024,8 +7329,8 @@ "themeDimIdx": 0 } }, - "8x18": { - "identifier": "FB23.1", + "8x17": { + "identifier": "FB22.1", "name": "Sensor", "basename": "sensor-off", "clickable": true, @@ -8036,10 +7341,10 @@ "states": {}, "coord": { "x": 8, - "y": 18 + "y": 17 }, "addresses": { - "Addr": 40, + "Addr": 38, "Addr1": 0, "Port1": 0, "Inverse1": false, @@ -8054,38 +7359,29 @@ "themeDimIdx": 0 } }, - "8x20": { - "identifier": "FB25.1", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, + "9x17": { + "identifier": "tk20171218190844456", + "name": "Straigth", + "basename": "straight", + "clickable": false, "routes": [ "AC", "BD" ], "states": {}, "coord": { - "x": 8, - "y": 20 - }, - "addresses": { - "Addr": 44, - "Addr1": 11, - "Port1": 4, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false + "x": 9, + "y": 17 }, "editor": { - "themeId": 200, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "9x20": { - "identifier": "tk20171218190848104", + "9x16": { + "identifier": "tk20171218190835089", "name": "Straigth", "basename": "straight", "clickable": false, @@ -8096,7 +7392,7 @@ "states": {}, "coord": { "x": 9, - "y": 20 + "y": 16 }, "editor": { "themeId": 10, @@ -8105,8 +7401,8 @@ "themeDimIdx": 0 } }, - "9x19": { - "identifier": "tk20171218190847256", + "10x16": { + "identifier": "tk20171218190834257", "name": "Straigth", "basename": "straight", "clickable": false, @@ -8116,8 +7412,8 @@ ], "states": {}, "coord": { - "x": 9, - "y": 19 + "x": 10, + "y": 16 }, "editor": { "themeId": 10, @@ -8126,164 +7422,308 @@ "themeDimIdx": 0 } }, - "9x18": { - "identifier": "tk20171218190844880", - "name": "Straigth", + "9x15": { + "id": 10, + "name": "Straight", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], - "states": {}, + "editor": { + "themeId": 10, + "themeDimIdx": 0, + "offsetX": 16, + "offsetY": 13 + }, + "identifier": "TK_1", "coord": { "x": 9, - "y": 18 - }, + "y": 15 + } + }, + "10x15": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], "editor": { "themeId": 10, + "offsetX": 16, + "offsetY": 13, + "themeDimIdx": 0 + }, + "identifier": "TK_0", + "coord": { + "x": 10, + "y": 15 + } + }, + "11x15": { + "identifier": "B10", + "name": "Short Block", + "basename": "block-s", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 2, + "h": 1 + }, + { + "w": 1, + "h": 2 + } + ], + "coord": { + "x": 11, + "y": 15 + }, + "editor": { + "themeId": 151, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "10x19": { - "identifier": "tk20171218190847576", - "name": "Straigth", - "basename": "straight", + "11x16": { + "identifier": "B11", + "name": "Short Block", + "basename": "block-s", "clickable": false, "routes": [ - "AC", - "BD" + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 2, + "h": 1 + }, + { + "w": 1, + "h": 2 + } + ], + "coord": { + "x": 11, + "y": 16 + }, + "editor": { + "themeId": 151, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "10x17": { + "identifier": "B12", + "name": "Block", + "basename": "block", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" ], "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], "coord": { "x": 10, - "y": 19 + "y": 17 }, "editor": { - "themeId": 10, + "themeId": 150, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "10x20": { - "identifier": "tk20171218190847848", - "name": "Straigth", + "13x15": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "editor": { + "themeId": 10, + "themeDimIdx": 0, + "offsetX": 16, + "offsetY": 13 + }, + "identifier": "TK_2", + "coord": { + "x": 13, + "y": 15 + } + }, + "13x16": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "editor": { + "themeId": 10, + "themeDimIdx": 0, + "offsetX": 16, + "offsetY": 13 + }, + "identifier": "TK_3", + "coord": { + "x": 13, + "y": 16 + } + }, + "14x15": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "editor": { + "themeId": 10, + "themeDimIdx": 0, + "offsetX": 16, + "offsetY": 13 + }, + "identifier": "TK_4", + "coord": { + "x": 14, + "y": 15 + } + }, + "14x16": { + "id": 10, + "name": "Straight", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], - "states": {}, - "coord": { - "x": 10, - "y": 20 - }, "editor": { "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 0, + "offsetX": 16, + "offsetY": 13 + }, + "identifier": "TK_5", + "coord": { + "x": 14, + "y": 16 } }, - "11x20": { - "identifier": "B15", - "name": "Short Block", - "basename": "block-s", - "clickable": false, + "15x15": { + "identifier": "FB20.2", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 2, - "h": 1 - }, - { - "w": 1, - "h": 2 - } - ], "coord": { - "x": 11, - "y": 20 + "x": 15, + "y": 15 + }, + "addresses": { + "Addr": 33, + "Addr1": 9, + "Port1": 1, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false }, "editor": { - "themeId": 151, + "themeId": 200, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "11x19": { - "identifier": "B14", - "name": "Short Block", - "basename": "block-s", - "clickable": false, + "15x16": { + "identifier": "FB21.2", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 2, - "h": 1 - }, - { - "w": 1, - "h": 2 - } - ], "coord": { - "x": 11, - "y": 19 + "x": 15, + "y": 16 + }, + "addresses": { + "Addr": 35, + "Addr1": 9, + "Port1": 3, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false }, "editor": { - "themeId": 151, + "themeId": 200, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "10x18": { - "identifier": "B13", - "name": "Block", - "basename": "block", + "16x16": { + "identifier": "tk20171218190835937", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" + "AC", + "BD" ], "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } - ], "coord": { - "x": 10, - "y": 18 + "x": 16, + "y": 16 }, "editor": { - "themeId": 150, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "13x20": { - "identifier": "tk20171218190850008", + "16x15": { + "identifier": "tk20171218190841280", "name": "Straigth", "basename": "straight", "clickable": false, @@ -8293,8 +7733,8 @@ ], "states": {}, "coord": { - "x": 13, - "y": 20 + "x": 16, + "y": 15 }, "editor": { "themeId": 10, @@ -8303,50 +7743,152 @@ "themeDimIdx": 0 } }, - "13x19": { - "identifier": "tk20171218190848632", - "name": "Straigth", - "basename": "straight", + "18x15": { + "identifier": "tk20171218191454673", + "name": "Curve", + "basename": "curve", "clickable": false, "routes": [ - "AC", - "BD" + "AD,DA", + "AB,BA", + "BC,CB", + "CD,DC" ], "states": {}, "coord": { - "x": 13, - "y": 19 + "x": 18, + "y": 15 + }, + "editor": { + "themeId": 11, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "18x16": { + "identifier": "s21", + "name": "Turnout Right", + "basename": "turnoutright", + "clickable": true, + "routes": [ + "AC,CA,AD,DA", + "BD,DB,BA,AB", + "CA,AC,CB,BC", + "DB,BD,DC,CD" + ], + "states": { + "deg0": [ + { + "source": "left", + "to": "bottom", + "state": "turnright" + }, + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "bottom", + "to": "left", + "state": "turnright" + }, + { + "source": "right", + "to": "left", + "state": "straight" + } + ], + "deg90": [ + { + "source": "top", + "to": "left", + "state": "turnright" + }, + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "left", + "to": "top", + "state": "turnright" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + } + ], + "deg180": [ + { + "source": "top", + "to": "right", + "state": "turnright" + }, + { + "source": "right", + "to": "top", + "state": "turnright" + }, + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "right", + "to": "left", + "state": "straight" + } + ], + "deg270": [ + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + }, + { + "source": "right", + "to": "bottom", + "state": "turnright" + }, + { + "source": "bottom", + "to": "right", + "state": "turnright" + } + ] }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "14x19": { - "identifier": "tk20171218190849664", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, "coord": { - "x": 14, - "y": 19 + "x": 18, + "y": 16 + }, + "addresses": { + "Addr": 0, + "Addr1": 8, + "Port1": 2, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, "editor": { - "themeId": 10, + "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 2 } }, - "14x20": { - "identifier": "tk20171218190849392", + "19x16": { + "identifier": "tk20171218191457185", "name": "Straigth", "basename": "straight", "clickable": false, @@ -8356,8 +7898,8 @@ ], "states": {}, "coord": { - "x": 14, - "y": 20 + "x": 19, + "y": 16 }, "editor": { "themeId": 10, @@ -8366,10 +7908,10 @@ "themeDimIdx": 0 } }, - "15x19": { - "identifier": "FB24.2", - "name": "Sensor", - "basename": "sensor-off", + "20x16": { + "identifier": "Bahnuebergang", + "name": "Level Crossing C", + "basename": "accessory-12", "clickable": true, "routes": [ "AC", @@ -8377,57 +7919,51 @@ ], "states": {}, "coord": { - "x": 15, - "y": 19 + "x": 20, + "y": 16 }, "addresses": { - "Addr": 41, - "Addr1": 0, - "Port1": 0, + "Addr": 0, + "Addr1": 18, + "Port1": 2, "Inverse1": false, "Addr2": 0, "Port2": 0, "Inverse2": false }, "editor": { - "themeId": 200, + "themeId": 255, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "15x20": { - "identifier": "FB25.2", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, + "21x16": { + "identifier": "tk20171218191504632", + "name": "Connector", + "basename": "connector", + "clickable": false, "routes": [ - "AC", - "BD" + "A+", + "B+", + "C+", + "D+" ], "states": {}, "coord": { - "x": 15, - "y": 20 - }, - "addresses": { - "Addr": 43, - "Addr1": 11, - "Port1": 3, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false + "x": 21, + "y": 16 }, "editor": { - "themeId": 200, + "themeId": 17, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 0, + "connectorId": 13 } }, - "16x19": { - "identifier": "tk20171218191552597", + "14x17": { + "identifier": "tk20171218190845416", "name": "Straigth", "basename": "straight", "clickable": false, @@ -8437,8 +7973,8 @@ ], "states": {}, "coord": { - "x": 16, - "y": 19 + "x": 14, + "y": 17 }, "editor": { "themeId": 10, @@ -8447,8 +7983,8 @@ "themeDimIdx": 0 } }, - "16x20": { - "identifier": "tk20171218191552868", + "14x18": { + "identifier": "tk20171218190845704", "name": "Straigth", "basename": "straight", "clickable": false, @@ -8458,8 +7994,8 @@ ], "states": {}, "coord": { - "x": 16, - "y": 20 + "x": 14, + "y": 18 }, "editor": { "themeId": 10, @@ -8468,156 +8004,68 @@ "themeDimIdx": 0 } }, - "18x20": { - "identifier": "tk20171218191538958", - "name": "Curve", - "basename": "curve", - "clickable": false, + "15x18": { + "identifier": "FB23.2", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" + "AC", + "BD" ], "states": {}, "coord": { - "x": 18, - "y": 20 + "x": 15, + "y": 18 }, - "editor": { - "themeId": 11, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 1 - } - }, - "18x19": { - "identifier": "SK2", - "name": "Crossing Left sr", - "basename": "dcrossingright-sr", - "clickable": true, - "routes": [ - "A0|C0,A0|B1,B1|D0,D0|C0", - "A0|C1,A0|D0,B0|D0,B0|C1" - ], - "states": { - "deg0": [ - { - "source": "left", - "to": "top", - "state": "turnleft|straight" - }, - { - "source": "top", - "to": "left", - "state": "turnleft|straight" - }, - { - "source": "left", - "to": "right", - "state": "straight|straight" - }, - { - "source": "right", - "to": "left", - "state": "straight|straight" - }, - { - "source": "bottom", - "to": "right", - "state": "straight|turnleft" - }, - { - "source": "right", - "to": "bottom", - "state": "straight|turnleft" - }, - { - "source": "bottom", - "to": "top", - "state": "turnleft|turnleft" - }, - { - "source": "top", - "to": "bottom", - "state": "turnleft|turnleft" - } - ], - "deg90": [ - { - "source": "left", - "to": "bottom", - "state": "turnleft|straight" - }, - { - "source": "bottom", - "to": "left", - "state": "turnleft|straight" - }, - { - "source": "left", - "to": "right", - "state": "straight|straight" - }, - { - "source": "right", - "to": "left", - "state": "straight|straight" - }, - { - "source": "bottom", - "to": "left", - "state": "straight|turnleft" - }, - { - "source": "left", - "to": "bottom", - "state": "straight|turnleft" - }, - { - "source": "bottom", - "to": "top", - "state": "turnleft|turnleft" - }, - { - "source": "top", - "to": "bottom", - "state": "turnleft|turnleft" - } - ] + "addresses": { + "Addr": 39, + "Addr1": 0, + "Port1": 0, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, - "dimensions": [ - { - "w": 2, - "h": 1 - }, - { - "w": 1, - "h": 2 - } + "editor": { + "themeId": 200, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "15x17": { + "identifier": "FB22.2", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" ], + "states": {}, "coord": { - "x": 18, - "y": 19 + "x": 15, + "y": 17 }, "addresses": { - "Addr": 0, - "Addr1": 7, - "Port1": 3, + "Addr": 37, + "Addr1": 0, + "Port1": 0, "Inverse1": false, - "Addr2": 7, - "Port2": 2, - "Inverse2": true + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, "editor": { - "themeId": 58, + "themeId": 200, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "20x19": { - "identifier": "tk20171218191818875", + "16x18": { + "identifier": "tk20171218190853128", "name": "Straigth", "basename": "straight", "clickable": false, @@ -8627,8 +8075,8 @@ ], "states": {}, "coord": { - "x": 20, - "y": 19 + "x": 16, + "y": 18 }, "editor": { "themeId": 10, @@ -8637,79 +8085,151 @@ "themeDimIdx": 0 } }, - "21x19": { - "identifier": "tk20171218191820875", - "name": "Buffer", - "basename": "buffer", + "16x17": { + "identifier": "tk20171218190852848", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "A", - "B", - "C", - "D" + "AC", + "BD" ], "states": {}, "coord": { - "x": 21, - "y": 19 + "x": 16, + "y": 17 }, "editor": { - "themeId": 13, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "5x17": { - "id": 50, - "name": "Turnout Left", - "basename": "turnoutleft", + "17x17": { + "identifier": "tk20171218191814604", + "name": "Straigth", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 17, + "y": 17 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "17x18": { + "identifier": "tk20171218191747502", + "name": "Straigth", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 17, + "y": 18 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "18x18": { + "identifier": "Signal_B13_rechts", + "name": "Main Signal A", + "basename": "semaphoremain-r", "clickable": true, "routes": [ - "AC,CA,CD,DC", - "BD,DB,DA,AD", - "AC,CA,AB,BA", - "BD,DB,BC,CB" + "AC", + "BD", + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 18, + "y": 18 + }, + "addresses": { + "Addr": 0, + "Addr1": 21, + "Port1": 2, + "Inverse1": true, + "Addr2": 0, + "Port2": 0, + "Inverse2": false + }, + "editor": { + "themeId": 101, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 2 + } + }, + "19x18": { + "identifier": "s23", + "name": "Turnout Right", + "basename": "turnoutright", + "clickable": true, + "routes": [ + "AC,CA,AD,DA", + "BD,DB,BA,AB", + "CA,AC,CB,BC", + "DB,BD,DC,CD" ], "states": { "deg0": [ { "source": "left", - "to": "right", - "state": "straight" + "to": "bottom", + "state": "turnright" }, { - "source": "right", - "to": "left", + "source": "left", + "to": "right", "state": "straight" }, { "source": "bottom", - "to": "right", - "state": "turnleft" + "to": "left", + "state": "turnright" }, { "source": "right", - "to": "bottom", - "state": "turnleft" + "to": "left", + "state": "straight" } ], "deg90": [ { - "source": "left", - "to": "bottom", - "state": "turnleft" - }, - { - "source": "bottom", + "source": "top", "to": "left", - "state": "turnleft" + "state": "turnright" }, { "source": "top", "to": "bottom", "state": "straight" }, + { + "source": "left", + "to": "top", + "state": "turnright" + }, { "source": "bottom", "to": "top", @@ -8719,13 +8239,13 @@ "deg180": [ { "source": "top", - "to": "left", - "state": "turnleft" + "to": "right", + "state": "turnright" }, { - "source": "left", + "source": "right", "to": "top", - "state": "turnleft" + "state": "turnright" }, { "source": "left", @@ -8751,338 +8271,191 @@ }, { "source": "right", - "to": "top", - "state": "turnleft" + "to": "bottom", + "state": "turnright" }, { - "source": "top", + "source": "bottom", "to": "right", - "state": "turnleft" + "state": "turnright" } ] }, - "editor": { - "themeId": 50, - "offsetX": 23, - "offsetY": 18, - "themeDimIdx": 2 - }, - "identifier": "SW_1", - "coord": { - "x": 5, - "y": 17 - }, - "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false - }, - "isMaintenance": false - }, - "7x17": { - "identifier": "tk20171218191334342", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 7, - "y": 17 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "3x16": { - "identifier": "tk20171218191420723", - "name": "Buffer", - "basename": "buffer", - "clickable": false, - "routes": [ - "A", - "B", - "C", - "D" - ], - "states": {}, - "coord": { - "x": 3, - "y": 16 + "coord": { + "x": 19, + "y": 18 + }, + "addresses": { + "Addr": 0, + "Addr1": 7, + "Port1": 4, + "Inverse1": true, + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, "editor": { - "themeId": 13, + "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 2 + "themeDimIdx": 1 } }, - "4x16": { - "identifier": "tk20171218191428562", - "name": "Straigth", - "basename": "straight", - "clickable": false, + "18x17": { + "identifier": "Signal_B12_rechts", + "name": "Main Signal A", + "basename": "semaphoremain-r", + "clickable": true, "routes": [ + "AC", + "BD", "AC", "BD" ], "states": {}, "coord": { - "x": 4, - "y": 16 + "x": 18, + "y": 17 + }, + "addresses": { + "Addr": 0, + "Addr1": 21, + "Port1": 1, + "Inverse1": true, + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, "editor": { - "themeId": 10, + "themeId": 101, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 2 } }, - "5x16": { - "identifier": "SK1", - "name": "Crossing Left sr", - "basename": "dcrossingright-sr", + "19x17": { + "identifier": "s22", + "name": "Turnout Left", + "basename": "turnoutleft", "clickable": true, "routes": [ - "A0|C0,A0|B1,B1|D0,D0|C0", - "A0|C1,A0|D0,B0|D0,B0|C1" + "AC,CA,CD,DC", + "BD,DB,DA,AD", + "AC,CA,AB,BA", + "BD,DB,BC,CB" ], "states": { "deg0": [ - { - "source": "left", - "to": "top", - "state": "turnleft|straight" - }, - { - "source": "top", - "to": "left", - "state": "turnleft|straight" - }, { "source": "left", "to": "right", - "state": "straight|straight" + "state": "straight" }, { "source": "right", "to": "left", - "state": "straight|straight" + "state": "straight" }, { "source": "bottom", "to": "right", - "state": "straight|turnleft" + "state": "turnleft" }, { "source": "right", "to": "bottom", - "state": "straight|turnleft" + "state": "turnleft" + } + ], + "deg90": [ + { + "source": "left", + "to": "bottom", + "state": "turnleft" }, { "source": "bottom", - "to": "top", - "state": "turnleft|turnleft" + "to": "left", + "state": "turnleft" }, { "source": "top", "to": "bottom", - "state": "turnleft|turnleft" + "state": "straight" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" } ], - "deg90": [ + "deg180": [ { - "source": "left", - "to": "bottom", - "state": "turnleft|straight" + "source": "top", + "to": "left", + "state": "turnleft" }, { - "source": "bottom", - "to": "left", - "state": "turnleft|straight" + "source": "left", + "to": "top", + "state": "turnleft" }, { "source": "left", "to": "right", - "state": "straight|straight" + "state": "straight" }, { "source": "right", "to": "left", - "state": "straight|straight" - }, - { - "source": "bottom", - "to": "left", - "state": "straight|turnleft" - }, + "state": "straight" + } + ], + "deg270": [ { - "source": "left", + "source": "top", "to": "bottom", - "state": "straight|turnleft" + "state": "straight" }, { "source": "bottom", "to": "top", - "state": "turnleft|turnleft" + "state": "straight" + }, + { + "source": "right", + "to": "top", + "state": "turnleft" }, { "source": "top", - "to": "bottom", - "state": "turnleft|turnleft" + "to": "right", + "state": "turnleft" } ] - }, - "dimensions": [ - { - "w": 2, - "h": 1 - }, - { - "w": 1, - "h": 2 - } - ], - "coord": { - "x": 5, - "y": 16 - }, - "addresses": { - "Addr": 0, - "Addr1": 7, - "Port1": 1, - "Inverse1": false, - "Addr2": 6, - "Port2": 4, - "Inverse2": false - }, - "editor": { - "themeId": 58, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "6x15": { - "identifier": "tk20171218191431074", - "name": "Curve", - "basename": "curve", - "clickable": false, - "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" - ], - "states": {}, - "coord": { - "x": 6, - "y": 15 - }, - "editor": { - "themeId": 11, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 3 - } - }, - "7x15": { - "identifier": "tk20171218191429618", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 7, - "y": 15 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "7x14": { - "identifier": "LblHauptbahnhof", - "name": "Text", - "basename": "textelement", - "clickable": false, - "routes": [], - "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } - ], - "coord": { - "x": 7, - "y": 14 - }, - "editor": { - "themeId": 1010, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0, - "innerHtml": "HAUPTBAHNHOF", - "outerHtml": "\n
HAUPTBAHNHOF
\n
", - "size": { - "width": "132px", - "height": "32px" - } - } - }, - "8x15": { - "identifier": "FB20.1", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, + }, "coord": { - "x": 8, - "y": 15 + "x": 19, + "y": 17 }, "addresses": { - "Addr": 34, - "Addr1": 9, - "Port1": 2, + "Addr": 0, + "Addr1": 8, + "Port1": 1, "Inverse1": false, - "Addr2": -1, - "Port2": -1, + "Addr2": 0, + "Port2": 0, "Inverse2": false }, "editor": { - "themeId": 200, + "themeId": 50, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "7x16": { - "identifier": "tk20171218191429042", + "20x17": { + "identifier": "tk20171218191825179", "name": "Straigth", "basename": "straight", "clickable": false, @@ -9092,8 +8465,8 @@ ], "states": {}, "coord": { - "x": 7, - "y": 16 + "x": 20, + "y": 17 }, "editor": { "themeId": 10, @@ -9102,38 +8475,52 @@ "themeDimIdx": 0 } }, - "8x16": { - "identifier": "FB21.1", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, + "21x17": { + "identifier": "tk1017396001", + "name": "Straigth", + "basename": "straight", + "clickable": false, "routes": [ "AC", "BD" ], "states": {}, "coord": { - "x": 8, - "y": 16 - }, - "addresses": { - "Addr": 36, - "Addr1": 9, - "Port1": 4, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false + "x": 21, + "y": 17 }, "editor": { - "themeId": 200, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "8x17": { - "identifier": "FB22.1", + "22x17": { + "identifier": "tk20171218191900201", + "name": "Curve", + "basename": "curve", + "clickable": false, + "routes": [ + "AD,DA", + "AB,BA", + "BC,CB", + "CD,DC" + ], + "states": {}, + "coord": { + "x": 22, + "y": 17 + }, + "editor": { + "themeId": 11, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 1 + } + }, + "22x16": { + "identifier": "FBR1", "name": "Sensor", "basename": "sensor-off", "clickable": true, @@ -9143,11 +8530,11 @@ ], "states": {}, "coord": { - "x": 8, - "y": 17 + "x": 22, + "y": 16 }, "addresses": { - "Addr": 38, + "Addr": 51, "Addr1": 0, "Port1": 0, "Inverse1": false, @@ -9159,73 +8546,239 @@ "themeId": 200, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 1 } }, - "9x17": { - "identifier": "tk20171218190844456", - "name": "Straigth", + "22x10": { + "id": 11, + "name": "Curve", + "basename": "curve", + "clickable": false, + "routes": [ + "AD,DA", + "AB,BA", + "BC,CB", + "CD,DC" + ], + "editor": { + "themeId": 11, + "themeDimIdx": 0, + "offsetX": 18, + "offsetY": 16 + }, + "identifier": "TK_13", + "coord": { + "x": 22, + "y": 10 + } + }, + "21x10": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "editor": { + "themeId": 10, + "themeDimIdx": 0, + "offsetX": 16, + "offsetY": 23 + }, + "identifier": "TK_14", + "coord": { + "x": 21, + "y": 10 + } + }, + "15x11": { + "id": 50, + "name": "Turnout Left", + "basename": "turnoutleft", + "clickable": true, + "routes": [ + "AC,CA,CD,DC", + "BD,DB,DA,AD", + "AC,CA,AB,BA", + "BD,DB,BC,CB" + ], + "states": { + "deg0": [ + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "right", + "to": "left", + "state": "straight" + }, + { + "source": "bottom", + "to": "right", + "state": "turnleft" + }, + { + "source": "right", + "to": "bottom", + "state": "turnleft" + } + ], + "deg90": [ + { + "source": "left", + "to": "bottom", + "state": "turnleft" + }, + { + "source": "bottom", + "to": "left", + "state": "turnleft" + }, + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + } + ], + "deg180": [ + { + "source": "top", + "to": "left", + "state": "turnleft" + }, + { + "source": "left", + "to": "top", + "state": "turnleft" + }, + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "right", + "to": "left", + "state": "straight" + } + ], + "deg270": [ + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + }, + { + "source": "right", + "to": "top", + "state": "turnleft" + }, + { + "source": "top", + "to": "right", + "state": "turnleft" + } + ] + }, + "editor": { + "themeId": 50, + "themeDimIdx": 3, + "offsetX": 17, + "offsetY": 20 + }, + "identifier": "SW_4", + "coord": { + "x": 15, + "y": 11 + }, + "addresses": { + "Addr": 0, + "Addr1": 29, + "Port1": 2, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false + } + }, + "16x11": { + "id": 10, + "name": "Straight", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], - "states": {}, - "coord": { - "x": 9, - "y": 17 - }, "editor": { "themeId": 10, - "offsetX": 0, - "offsetY": 0, + "offsetX": 21, + "offsetY": 22, "themeDimIdx": 0 + }, + "identifier": "TK_7", + "coord": { + "x": 16, + "y": 11 } }, - "9x16": { - "identifier": "tk20171218190835089", - "name": "Straigth", + "17x11": { + "id": 10, + "name": "Straight", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], - "states": {}, - "coord": { - "x": 9, - "y": 16 - }, "editor": { "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 0, + "offsetX": 14, + "offsetY": 20 + }, + "identifier": "TK_8", + "coord": { + "x": 17, + "y": 11 } }, - "10x16": { - "identifier": "tk20171218190834257", - "name": "Straigth", + "18x11": { + "id": 10, + "name": "Straight", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], - "states": {}, - "coord": { - "x": 10, - "y": 16 - }, "editor": { "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 0, + "offsetX": 14, + "offsetY": 20 + }, + "identifier": "TK_9", + "coord": { + "x": 18, + "y": 11 } }, - "9x15": { + "19x11": { "id": 10, "name": "Straight", "basename": "straight", @@ -9237,16 +8790,16 @@ "editor": { "themeId": 10, "themeDimIdx": 0, - "offsetX": 16, - "offsetY": 13 + "offsetX": 14, + "offsetY": 20 }, - "identifier": "TK_1", + "identifier": "TK_10", "coord": { - "x": 9, - "y": 15 + "x": 19, + "y": 11 } }, - "10x15": { + "20x11": { "id": 10, "name": "Straight", "basename": "straight", @@ -9257,110 +8810,139 @@ ], "editor": { "themeId": 10, - "offsetX": 16, - "offsetY": 13, - "themeDimIdx": 0 - }, - "identifier": "TK_0", - "coord": { - "x": 10, - "y": 15 - } - }, - "11x15": { - "identifier": "B10", - "name": "Short Block", - "basename": "block-s", - "clickable": false, - "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" - ], - "states": {}, - "dimensions": [ - { - "w": 2, - "h": 1 - }, - { - "w": 1, - "h": 2 - } - ], - "coord": { - "x": 11, - "y": 15 + "themeDimIdx": 0, + "offsetX": 14, + "offsetY": 20 }, - "editor": { - "themeId": 151, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "11x16": { - "identifier": "B11", - "name": "Short Block", - "basename": "block-s", - "clickable": false, - "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" - ], - "states": {}, - "dimensions": [ - { - "w": 2, - "h": 1 - }, - { - "w": 1, - "h": 2 - } - ], + "identifier": "TK_11", "coord": { - "x": 11, - "y": 16 - }, - "editor": { - "themeId": 151, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "x": 20, + "y": 11 } }, - "10x17": { - "identifier": "B12", - "name": "Block", - "basename": "block", - "clickable": false, + "22x11": { + "id": 51, + "name": "Turnout Right", + "basename": "turnoutright", + "clickable": true, "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" - ], - "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } + "AC,CA,AD,DA", + "BD,DB,BA,AB", + "CA,AC,CB,BC", + "DB,BD,DC,CD" ], - "coord": { - "x": 10, - "y": 17 + "states": { + "deg0": [ + { + "source": "left", + "to": "bottom", + "state": "turnright" + }, + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "bottom", + "to": "left", + "state": "turnright" + }, + { + "source": "right", + "to": "left", + "state": "straight" + } + ], + "deg90": [ + { + "source": "top", + "to": "left", + "state": "turnright" + }, + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "left", + "to": "top", + "state": "turnright" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + } + ], + "deg180": [ + { + "source": "top", + "to": "right", + "state": "turnright" + }, + { + "source": "right", + "to": "top", + "state": "turnright" + }, + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "right", + "to": "left", + "state": "straight" + } + ], + "deg270": [ + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + }, + { + "source": "right", + "to": "bottom", + "state": "turnright" + }, + { + "source": "bottom", + "to": "right", + "state": "turnright" + } + ] }, "editor": { - "themeId": 150, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "themeId": 51, + "offsetX": 12, + "offsetY": 16, + "themeDimIdx": 1 + }, + "identifier": "SW_0", + "coord": { + "x": 22, + "y": 11 + }, + "addresses": { + "Addr": 0, + "Addr1": 29, + "Port1": 4, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false } }, - "13x15": { + "21x11": { "id": 10, "name": "Straight", "basename": "straight", @@ -9372,37 +8954,39 @@ "editor": { "themeId": 10, "themeDimIdx": 0, - "offsetX": 16, - "offsetY": 13 + "offsetX": 14, + "offsetY": 20 }, - "identifier": "TK_2", + "identifier": "TK_12", "coord": { - "x": 13, - "y": 15 + "x": 21, + "y": 11 } }, - "13x16": { - "id": 10, - "name": "Straight", - "basename": "straight", + "15x12": { + "id": 11, + "name": "Curve", + "basename": "curve", "clickable": false, "routes": [ - "AC", - "BD" + "AD,DA", + "AB,BA", + "BC,CB", + "CD,DC" ], "editor": { - "themeId": 10, - "themeDimIdx": 0, - "offsetX": 16, - "offsetY": 13 + "themeId": 11, + "offsetX": 12, + "offsetY": 21, + "themeDimIdx": 2 }, - "identifier": "TK_3", + "identifier": "TK_6", "coord": { - "x": 13, - "y": 16 + "x": 15, + "y": 12 } }, - "14x15": { + "16x12": { "id": 10, "name": "Straight", "basename": "straight", @@ -9413,17 +8997,17 @@ ], "editor": { "themeId": 10, - "themeDimIdx": 0, - "offsetX": 16, - "offsetY": 13 + "themeDimIdx": 2, + "offsetX": 14, + "offsetY": 20 }, - "identifier": "TK_4", + "identifier": "TK_17", "coord": { - "x": 14, - "y": 15 + "x": 16, + "y": 12 } }, - "14x16": { + "17x12": { "id": 10, "name": "Straight", "basename": "straight", @@ -9434,191 +9018,129 @@ ], "editor": { "themeId": 10, - "themeDimIdx": 0, - "offsetX": 16, - "offsetY": 13 + "themeDimIdx": 2, + "offsetX": 14, + "offsetY": 20 }, - "identifier": "TK_5", + "identifier": "TK_18", "coord": { - "x": 14, - "y": 16 + "x": 17, + "y": 12 } }, - "15x15": { - "identifier": "FB20.2", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, + "18x12": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, "routes": [ "AC", "BD" ], - "states": {}, - "coord": { - "x": 15, - "y": 15 - }, - "addresses": { - "Addr": 33, - "Addr1": 9, - "Port1": 1, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false - }, "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "15x16": { - "identifier": "FB21.2", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 15, - "y": 16 - }, - "addresses": { - "Addr": 35, - "Addr1": 9, - "Port1": 3, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false + "themeId": 10, + "themeDimIdx": 2, + "offsetX": 14, + "offsetY": 20 }, - "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "identifier": "TK_19", + "coord": { + "x": 18, + "y": 12 } }, - "16x16": { - "identifier": "tk20171218190835937", - "name": "Straigth", + "19x12": { + "id": 10, + "name": "Straight", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], - "states": {}, - "coord": { - "x": 16, - "y": 16 - }, "editor": { "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 2, + "offsetX": 14, + "offsetY": 20 + }, + "identifier": "TK_20", + "coord": { + "x": 19, + "y": 12 } }, - "16x15": { - "identifier": "tk20171218190841280", - "name": "Straigth", + "20x12": { + "id": 10, + "name": "Straight", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], - "states": {}, - "coord": { - "x": 16, - "y": 15 - }, "editor": { "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "18x15": { - "identifier": "tk20171218191454673", - "name": "Curve", - "basename": "curve", - "clickable": false, - "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" - ], - "states": {}, - "coord": { - "x": 18, - "y": 15 + "themeDimIdx": 2, + "offsetX": 14, + "offsetY": 20 }, - "editor": { - "themeId": 11, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "identifier": "TK_21", + "coord": { + "x": 20, + "y": 12 } }, - "18x16": { - "identifier": "s21", - "name": "Turnout Right", - "basename": "turnoutright", + "22x12": { + "id": 50, + "name": "Turnout Left", + "basename": "turnoutleft", "clickable": true, "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" + "AC,CA,CD,DC", + "BD,DB,DA,AD", + "AC,CA,AB,BA", + "BD,DB,BC,CB" ], "states": { "deg0": [ { "source": "left", - "to": "bottom", - "state": "turnright" + "to": "right", + "state": "straight" }, { - "source": "left", - "to": "right", + "source": "right", + "to": "left", "state": "straight" }, { "source": "bottom", - "to": "left", - "state": "turnright" + "to": "right", + "state": "turnleft" }, { "source": "right", - "to": "left", - "state": "straight" + "to": "bottom", + "state": "turnleft" } ], "deg90": [ { - "source": "top", + "source": "left", + "to": "bottom", + "state": "turnleft" + }, + { + "source": "bottom", "to": "left", - "state": "turnright" + "state": "turnleft" }, { "source": "top", "to": "bottom", "state": "straight" }, - { - "source": "left", - "to": "top", - "state": "turnright" - }, { "source": "bottom", "to": "top", @@ -9628,13 +9150,13 @@ "deg180": [ { "source": "top", - "to": "right", - "state": "turnright" + "to": "left", + "state": "turnleft" }, { - "source": "right", + "source": "left", "to": "top", - "state": "turnright" + "state": "turnleft" }, { "source": "left", @@ -9660,38 +9182,60 @@ }, { "source": "right", - "to": "bottom", - "state": "turnright" + "to": "top", + "state": "turnleft" }, { - "source": "bottom", + "source": "top", "to": "right", - "state": "turnright" + "state": "turnleft" } ] }, + "editor": { + "themeId": 50, + "offsetX": 21, + "offsetY": 12, + "themeDimIdx": 1 + }, + "identifier": "SW_2", "coord": { - "x": 18, - "y": 16 + "x": 22, + "y": 12 }, "addresses": { "Addr": 0, - "Addr1": 8, - "Port1": 2, + "Addr1": 29, + "Port1": 3, "Inverse1": false, - "Addr2": 0, - "Port2": 0, + "Addr2": -1, + "Port2": -1, "Inverse2": false + } + }, + "22x13": { + "identifier": "tk1017396011", + "name": "Straigth", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 22, + "y": 13 }, "editor": { - "themeId": 51, + "themeId": 10, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 2 + "themeDimIdx": 1 } }, - "19x16": { - "identifier": "tk20171218191457185", + "22x14": { + "identifier": "tk1017396004", "name": "Straigth", "basename": "straight", "clickable": false, @@ -9701,20 +9245,144 @@ ], "states": {}, "coord": { - "x": 19, - "y": 16 + "x": 22, + "y": 14 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 3 + } + }, + "22x15": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "editor": { + "themeId": 10, + "themeDimIdx": 1, + "offsetX": 14, + "offsetY": 20 + }, + "identifier": "TK_16", + "coord": { + "x": 22, + "y": 15 + } + }, + "15x10": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "editor": { + "themeId": 10, + "offsetX": 23, + "offsetY": 18, + "themeDimIdx": 1 }, + "identifier": "TK_15", + "coord": { + "x": 15, + "y": 10 + } + }, + "21x12": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], "editor": { "themeId": 10, + "offsetX": 24, + "offsetY": 20, + "themeDimIdx": 0 + }, + "identifier": "TK_22", + "coord": { + "x": 21, + "y": 12 + } + }, + "6x9": { + "identifier": "FB2A", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 6, + "y": 9 + }, + "addresses": { + "Addr": 46, + "Addr1": 0, + "Port1": 0, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false + }, + "editor": { + "themeId": 200, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "20x16": { - "identifier": "Bahnuebergang", - "name": "Level Crossing C", - "basename": "accessory-12", + "7x9": { + "identifier": "B09", + "name": "Block", + "basename": "block", + "clickable": false, + "routes": [ + "A0|C0,C0|A0", + "B0|D0,D0|B0" + ], + "states": {}, + "dimensions": [ + { + "w": 4, + "h": 1 + }, + { + "w": 1, + "h": 4 + } + ], + "coord": { + "x": 7, + "y": 9 + }, + "editor": { + "themeId": 150, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "11x9": { + "identifier": "FB2B", + "name": "Sensor", + "basename": "sensor-off", "clickable": true, "routes": [ "AC", @@ -9722,51 +9390,78 @@ ], "states": {}, "coord": { - "x": 20, - "y": 16 + "x": 11, + "y": 9 }, "addresses": { - "Addr": 0, - "Addr1": 18, - "Port1": 2, + "Addr": 47, + "Addr1": 0, + "Port1": 0, "Inverse1": false, "Addr2": 0, "Port2": 0, "Inverse2": false }, "editor": { - "themeId": 255, + "themeId": 200, "offsetX": 0, "offsetY": 0, "themeDimIdx": 0 } }, - "21x16": { - "identifier": "tk20171218191504632", - "name": "Connector", - "basename": "connector", + "12x9": { + "identifier": "tk20171218190024391", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "A+", - "B+", - "C+", - "D+" + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 12, + "y": 9 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "13x9": { + "identifier": "FB3", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" ], "states": {}, "coord": { - "x": 21, - "y": 16 + "x": 13, + "y": 9 + }, + "addresses": { + "Addr": 48, + "Addr1": 0, + "Port1": 0, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, "editor": { - "themeId": 17, + "themeId": 200, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0, - "connectorId": 13 + "themeDimIdx": 0 } }, - "14x17": { - "identifier": "tk20171218190845416", + "14x9": { + "identifier": "tk20171218190020712", "name": "Straigth", "basename": "straight", "clickable": false, @@ -9777,7 +9472,7 @@ "states": {}, "coord": { "x": 14, - "y": 17 + "y": 9 }, "editor": { "themeId": 10, @@ -9786,205 +9481,529 @@ "themeDimIdx": 0 } }, - "14x18": { - "identifier": "tk20171218190845704", - "name": "Straigth", - "basename": "straight", - "clickable": false, + "6x17": { + "id": 101, + "name": "Main Signal A", + "basename": "semaphoremain-r", + "clickable": true, "routes": [ + "AC", + "BD", "AC", "BD" ], - "states": {}, - "coord": { - "x": 14, - "y": 18 - }, "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, + "themeId": 101, + "offsetX": 20, + "offsetY": 19, "themeDimIdx": 0 + }, + "identifier": "SE_0", + "coord": { + "x": 6, + "y": 17 + }, + "addresses": { + "Addr": -1, + "Addr1": -1, + "Port1": -1, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false } }, - "15x18": { - "identifier": "FB23.2", - "name": "Sensor", - "basename": "sensor-off", + "6x18": { + "id": 101, + "name": "Main Signal A", + "basename": "semaphoremain-r", "clickable": true, "routes": [ + "AC", + "BD", "AC", "BD" ], - "states": {}, + "editor": { + "themeId": 101, + "themeDimIdx": 0, + "offsetX": 26, + "offsetY": 19 + }, + "identifier": "SE_1", "coord": { - "x": 15, + "x": 6, "y": 18 }, "addresses": { - "Addr": 39, - "Addr1": 0, - "Port1": 0, + "Addr": -1, + "Addr1": -1, + "Port1": -1, "Inverse1": false, - "Addr2": 0, - "Port2": 0, + "Addr2": -1, + "Port2": -1, "Inverse2": false + } + }, + "6x19": { + "id": 101, + "name": "Main Signal A", + "basename": "semaphoremain-r", + "clickable": true, + "routes": [ + "AC", + "BD", + "AC", + "BD" + ], + "editor": { + "themeId": 101, + "themeDimIdx": 0, + "offsetX": 18, + "offsetY": 13 + }, + "identifier": "SE_2", + "coord": { + "x": 6, + "y": 19 }, + "addresses": { + "Addr": -1, + "Addr1": -1, + "Port1": -1, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false + } + }, + "6x20": { + "id": 101, + "name": "Main Signal A", + "basename": "semaphoremain-r", + "clickable": true, + "routes": [ + "AC", + "BD", + "AC", + "BD" + ], "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "themeId": 101, + "themeDimIdx": 0, + "offsetX": 18, + "offsetY": 13 + }, + "identifier": "SE_3", + "coord": { + "x": 6, + "y": 20 + }, + "addresses": { + "Addr": -1, + "Addr1": -1, + "Port1": -1, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false } }, - "15x17": { - "identifier": "FB22.2", - "name": "Sensor", - "basename": "sensor-off", + "17x19": { + "id": 101, + "name": "Main Signal A", + "basename": "semaphoremain-r", "clickable": true, "routes": [ + "AC", + "BD", "AC", "BD" ], - "states": {}, + "editor": { + "themeId": 101, + "offsetX": 21, + "offsetY": 15, + "themeDimIdx": 2 + }, + "identifier": "SE_4", "coord": { - "x": 15, - "y": 17 + "x": 17, + "y": 19 }, "addresses": { - "Addr": 37, - "Addr1": 0, - "Port1": 0, + "Addr": -1, + "Addr1": -1, + "Port1": -1, "Inverse1": false, - "Addr2": 0, - "Port2": 0, + "Addr2": -1, + "Port2": -1, "Inverse2": false + } + }, + "17x20": { + "id": 101, + "name": "Main Signal A", + "basename": "semaphoremain-r", + "clickable": true, + "routes": [ + "AC", + "BD", + "AC", + "BD" + ], + "editor": { + "themeId": 101, + "themeDimIdx": 2, + "offsetX": 21, + "offsetY": 15 + }, + "identifier": "SE_5", + "coord": { + "x": 17, + "y": 20 }, + "addresses": { + "Addr": -1, + "Addr1": -1, + "Port1": -1, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false + } + }, + "17x16": { + "id": 101, + "name": "Main Signal A", + "basename": "semaphoremain-r", + "clickable": true, + "routes": [ + "AC", + "BD", + "AC", + "BD" + ], "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "themeId": 101, + "offsetX": 21, + "offsetY": 9, + "themeDimIdx": 2 + }, + "identifier": "SE_6", + "coord": { + "x": 17, + "y": 16 + }, + "addresses": { + "Addr": -1, + "Addr1": -1, + "Port1": -1, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false } }, - "16x18": { - "identifier": "tk20171218190853128", - "name": "Straigth", - "basename": "straight", - "clickable": false, + "17x15": { + "id": 101, + "name": "Main Signal A", + "basename": "semaphoremain-r", + "clickable": true, "routes": [ + "AC", + "BD", "AC", "BD" ], - "states": {}, + "editor": { + "themeId": 101, + "themeDimIdx": 2, + "offsetX": 21, + "offsetY": 9 + }, + "identifier": "SE_7", "coord": { - "x": 16, - "y": 18 + "x": 17, + "y": 15 }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "addresses": { + "Addr": -1, + "Addr1": -1, + "Port1": -1, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false } }, - "16x17": { - "identifier": "tk20171218190852848", - "name": "Straigth", - "basename": "straight", + "0x1": { + "identifier": "tk20171218185827860", + "name": "Curve", + "basename": "curve", "clickable": false, "routes": [ - "AC", - "BD" + "AD,DA", + "AB,BA", + "BC,CB", + "CD,DC" ], "states": {}, "coord": { - "x": 16, - "y": 17 + "x": 0, + "y": 1 }, "editor": { - "themeId": 10, + "themeId": 11, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 3 } }, - "17x17": { - "identifier": "tk20171218191814604", - "name": "Straigth", - "basename": "straight", - "clickable": false, + "0x2": { + "identifier": "s01", + "name": "Turnout Right", + "basename": "turnoutright", + "clickable": true, "routes": [ - "AC", - "BD" + "AC,CA,AD,DA", + "BD,DB,BA,AB", + "CA,AC,CB,BC", + "DB,BD,DC,CD" ], - "states": {}, + "states": { + "deg0": [ + { + "source": "left", + "to": "bottom", + "state": "turnright" + }, + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "bottom", + "to": "left", + "state": "turnright" + }, + { + "source": "right", + "to": "left", + "state": "straight" + } + ], + "deg90": [ + { + "source": "top", + "to": "left", + "state": "turnright" + }, + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "left", + "to": "top", + "state": "turnright" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + } + ], + "deg180": [ + { + "source": "top", + "to": "right", + "state": "turnright" + }, + { + "source": "right", + "to": "top", + "state": "turnright" + }, + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "right", + "to": "left", + "state": "straight" + } + ], + "deg270": [ + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + }, + { + "source": "right", + "to": "bottom", + "state": "turnright" + }, + { + "source": "bottom", + "to": "right", + "state": "turnright" + } + ] + }, "coord": { - "x": 17, - "y": 17 + "x": 0, + "y": 2 + }, + "addresses": { + "Addr": 0, + "Addr1": 3, + "Port1": 1, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, "editor": { - "themeId": 10, + "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 3 } }, - "17x18": { - "identifier": "tk20171218191747502", - "name": "Straigth", - "basename": "straight", - "clickable": false, + "0x3": { + "identifier": "s02", + "name": "Turnout Right", + "basename": "turnoutright", + "clickable": true, "routes": [ - "AC", - "BD" + "AC,CA,AD,DA", + "BD,DB,BA,AB", + "CA,AC,CB,BC", + "DB,BD,DC,CD" ], - "states": {}, - "coord": { - "x": 17, - "y": 18 + "states": { + "deg0": [ + { + "source": "left", + "to": "bottom", + "state": "turnright" + }, + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "bottom", + "to": "left", + "state": "turnright" + }, + { + "source": "right", + "to": "left", + "state": "straight" + } + ], + "deg90": [ + { + "source": "top", + "to": "left", + "state": "turnright" + }, + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "left", + "to": "top", + "state": "turnright" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + } + ], + "deg180": [ + { + "source": "top", + "to": "right", + "state": "turnright" + }, + { + "source": "right", + "to": "top", + "state": "turnright" + }, + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "right", + "to": "left", + "state": "straight" + } + ], + "deg270": [ + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + }, + { + "source": "right", + "to": "bottom", + "state": "turnright" + }, + { + "source": "bottom", + "to": "right", + "state": "turnright" + } + ] }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "18x18": { - "identifier": "Signal_B13_rechts", - "name": "Main Signal A", - "basename": "semaphoremain-r", - "clickable": true, - "routes": [ - "AC", - "BD", - "AC", - "BD" - ], - "states": {}, "coord": { - "x": 18, - "y": 18 + "x": 0, + "y": 3 }, "addresses": { "Addr": 0, - "Addr1": 21, - "Port1": 2, - "Inverse1": true, + "Addr1": 2, + "Port1": 4, + "Inverse1": false, "Addr2": 0, "Port2": 0, "Inverse2": false }, "editor": { - "themeId": 101, + "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 2 + "themeDimIdx": 3 } }, - "19x18": { - "identifier": "s23", + "0x4": { + "identifier": "s03", "name": "Turnout Right", "basename": "turnoutright", "clickable": true, @@ -10085,14 +10104,14 @@ ] }, "coord": { - "x": 19, - "y": 18 + "x": 0, + "y": 4 }, "addresses": { "Addr": 0, - "Addr1": 7, - "Port1": 4, - "Inverse1": true, + "Addr1": 2, + "Port1": 3, + "Inverse1": false, "Addr2": 0, "Port2": 0, "Inverse2": false @@ -10101,91 +10120,59 @@ "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 1 - } - }, - "18x17": { - "identifier": "Signal_B12_rechts", - "name": "Main Signal A", - "basename": "semaphoremain-r", - "clickable": true, - "routes": [ - "AC", - "BD", - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 18, - "y": 17 - }, - "addresses": { - "Addr": 0, - "Addr1": 21, - "Port1": 1, - "Inverse1": true, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, - "editor": { - "themeId": 101, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 2 + "themeDimIdx": 3 } }, - "19x17": { - "identifier": "s22", - "name": "Turnout Left", - "basename": "turnoutleft", + "0x5": { + "identifier": "s07", + "name": "Turnout Right", + "basename": "turnoutright", "clickable": true, "routes": [ - "AC,CA,CD,DC", - "BD,DB,DA,AD", - "AC,CA,AB,BA", - "BD,DB,BC,CB" + "AC,CA,AD,DA", + "BD,DB,BA,AB", + "CA,AC,CB,BC", + "DB,BD,DC,CD" ], "states": { "deg0": [ { "source": "left", - "to": "right", - "state": "straight" + "to": "bottom", + "state": "turnright" }, { - "source": "right", - "to": "left", + "source": "left", + "to": "right", "state": "straight" }, { "source": "bottom", - "to": "right", - "state": "turnleft" + "to": "left", + "state": "turnright" }, { "source": "right", - "to": "bottom", - "state": "turnleft" + "to": "left", + "state": "straight" } ], "deg90": [ { - "source": "left", - "to": "bottom", - "state": "turnleft" - }, - { - "source": "bottom", + "source": "top", "to": "left", - "state": "turnleft" + "state": "turnright" }, { "source": "top", "to": "bottom", "state": "straight" }, + { + "source": "left", + "to": "top", + "state": "turnright" + }, { "source": "bottom", "to": "top", @@ -10195,13 +10182,13 @@ "deg180": [ { "source": "top", - "to": "left", - "state": "turnleft" + "to": "right", + "state": "turnright" }, { - "source": "left", + "source": "right", "to": "top", - "state": "turnleft" + "state": "turnright" }, { "source": "left", @@ -10227,225 +10214,149 @@ }, { "source": "right", - "to": "top", - "state": "turnleft" + "to": "bottom", + "state": "turnright" }, { - "source": "top", + "source": "bottom", "to": "right", - "state": "turnleft" + "state": "turnright" } ] }, "coord": { - "x": 19, - "y": 17 + "x": 0, + "y": 5 }, "addresses": { "Addr": 0, - "Addr1": 8, - "Port1": 1, + "Addr1": 17, + "Port1": 4, "Inverse1": false, "Addr2": 0, "Port2": 0, "Inverse2": false }, "editor": { - "themeId": 50, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "20x17": { - "identifier": "tk20171218191825179", - "name": "Straigth", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 20, - "y": 17 - }, - "editor": { - "themeId": 10, + "themeId": 51, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 3 } }, - "21x17": { - "identifier": "tk1017396001", + "0x6": { + "identifier": "tk20171218190013551", "name": "Straigth", "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "states": {}, - "coord": { - "x": 21, - "y": 17 - }, - "editor": { - "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "22x17": { - "identifier": "tk20171218191900201", - "name": "Curve", - "basename": "curve", - "clickable": false, - "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" - ], - "states": {}, - "coord": { - "x": 22, - "y": 17 - }, - "editor": { - "themeId": 11, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 1 - } - }, - "22x16": { - "identifier": "FBR1", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, + "clickable": false, "routes": [ "AC", "BD" ], "states": {}, "coord": { - "x": 22, - "y": 16 - }, - "addresses": { - "Addr": 51, - "Addr1": 0, - "Port1": 0, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false + "x": 0, + "y": 6 }, "editor": { - "themeId": 200, + "themeId": 10, "offsetX": 0, "offsetY": 0, "themeDimIdx": 1 } }, - "22x10": { - "id": 11, - "name": "Curve", - "basename": "curve", + "0x7": { + "identifier": "tk20171218190015752", + "name": "Straigth", + "basename": "straight", "clickable": false, "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" + "AC", + "BD" ], - "editor": { - "themeId": 11, - "themeDimIdx": 0, - "offsetX": 18, - "offsetY": 16 - }, - "identifier": "TK_13", + "states": {}, "coord": { - "x": 22, - "y": 10 + "x": 0, + "y": 7 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 1 } }, - "21x10": { - "id": 10, - "name": "Straight", + "0x8": { + "identifier": "tk20171218190016000", + "name": "Straigth", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], + "states": {}, + "coord": { + "x": 0, + "y": 8 + }, "editor": { "themeId": 10, - "themeDimIdx": 0, - "offsetX": 16, - "offsetY": 23 - }, - "identifier": "TK_14", - "coord": { - "x": 21, - "y": 10 + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 1 } }, - "15x11": { - "id": 50, - "name": "Turnout Left", - "basename": "turnoutleft", + "0x9": { + "identifier": "s08", + "name": "Turnout Right", + "basename": "turnoutright", "clickable": true, "routes": [ - "AC,CA,CD,DC", - "BD,DB,DA,AD", - "AC,CA,AB,BA", - "BD,DB,BC,CB" + "AC,CA,AD,DA", + "BD,DB,BA,AB", + "CA,AC,CB,BC", + "DB,BD,DC,CD" ], "states": { "deg0": [ { "source": "left", - "to": "right", - "state": "straight" + "to": "bottom", + "state": "turnright" }, { - "source": "right", - "to": "left", + "source": "left", + "to": "right", "state": "straight" }, { "source": "bottom", - "to": "right", - "state": "turnleft" + "to": "left", + "state": "turnright" }, { "source": "right", - "to": "bottom", - "state": "turnleft" + "to": "left", + "state": "straight" } ], "deg90": [ { - "source": "left", - "to": "bottom", - "state": "turnleft" - }, - { - "source": "bottom", + "source": "top", "to": "left", - "state": "turnleft" + "state": "turnright" }, { "source": "top", "to": "bottom", "state": "straight" }, + { + "source": "left", + "to": "top", + "state": "turnright" + }, { "source": "bottom", "to": "top", @@ -10455,13 +10366,13 @@ "deg180": [ { "source": "top", - "to": "left", - "state": "turnleft" + "to": "right", + "state": "turnright" }, { - "source": "left", + "source": "right", "to": "top", - "state": "turnleft" + "state": "turnright" }, { "source": "left", @@ -10487,144 +10398,122 @@ }, { "source": "right", - "to": "top", - "state": "turnleft" + "to": "bottom", + "state": "turnright" }, { - "source": "top", + "source": "bottom", "to": "right", - "state": "turnleft" + "state": "turnright" } ] }, - "editor": { - "themeId": 50, - "themeDimIdx": 3, - "offsetX": 17, - "offsetY": 20 - }, - "identifier": "SW_4", "coord": { - "x": 15, - "y": 11 + "x": 0, + "y": 9 }, "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, + "Addr": 0, + "Addr1": 25, + "Port1": 4, "Inverse1": false, - "Addr2": -1, - "Port2": -1, + "Addr2": 0, + "Port2": 0, "Inverse2": false + }, + "editor": { + "themeId": 51, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 3 } }, - "16x11": { - "id": 10, - "name": "Straight", + "1x1": { + "identifier": "tk20171218185818172", + "name": "Straigth", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], + "states": {}, + "coord": { + "x": 1, + "y": 1 + }, "editor": { "themeId": 10, - "offsetX": 21, - "offsetY": 22, + "offsetX": 0, + "offsetY": 0, "themeDimIdx": 0 - }, - "identifier": "TK_7", - "coord": { - "x": 16, - "y": 11 } }, - "17x11": { - "id": 10, - "name": "Straight", + "1x2": { + "identifier": "tk20171218190006544", + "name": "Straigth", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], - "editor": { - "themeId": 10, - "themeDimIdx": 0, - "offsetX": 14, - "offsetY": 20 - }, - "identifier": "TK_8", + "states": {}, "coord": { - "x": 17, - "y": 11 - } - }, - "18x11": { - "id": 10, - "name": "Straight", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], + "x": 1, + "y": 2 + }, "editor": { "themeId": 10, - "themeDimIdx": 0, - "offsetX": 14, - "offsetY": 20 - }, - "identifier": "TK_9", - "coord": { - "x": 18, - "y": 11 + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 } }, - "19x11": { - "id": 10, - "name": "Straight", + "1x3": { + "identifier": "tk20171218190005576", + "name": "Straigth", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], + "states": {}, + "coord": { + "x": 1, + "y": 3 + }, "editor": { "themeId": 10, - "themeDimIdx": 0, - "offsetX": 14, - "offsetY": 20 - }, - "identifier": "TK_10", - "coord": { - "x": 19, - "y": 11 + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 } }, - "20x11": { - "id": 10, - "name": "Straight", + "1x4": { + "identifier": "tk20171218190005200", + "name": "Straigth", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], - "editor": { - "themeId": 10, - "themeDimIdx": 0, - "offsetX": 14, - "offsetY": 20 - }, - "identifier": "TK_11", + "states": {}, "coord": { - "x": 20, - "y": 11 + "x": 1, + "y": 4 + }, + "editor": { + "themeId": 10, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 } }, - "22x11": { - "id": 51, + "1x5": { + "identifier": "s04", "name": "Turnout Right", "basename": "turnoutright", "clickable": true, @@ -10724,178 +10613,150 @@ } ] }, - "editor": { - "themeId": 51, - "offsetX": 12, - "offsetY": 16, - "themeDimIdx": 1 - }, - "identifier": "SW_0", "coord": { - "x": 22, - "y": 11 + "x": 1, + "y": 5 }, "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, + "Addr": 0, + "Addr1": 3, + "Port1": 2, "Inverse1": false, - "Addr2": -1, - "Port2": -1, + "Addr2": 0, + "Port2": 0, "Inverse2": false - } - }, - "21x11": { - "id": 10, - "name": "Straight", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "editor": { - "themeId": 10, - "themeDimIdx": 0, - "offsetX": 14, - "offsetY": 20 - }, - "identifier": "TK_12", - "coord": { - "x": 21, - "y": 11 - } - }, - "15x12": { - "id": 11, - "name": "Curve", - "basename": "curve", - "clickable": false, - "routes": [ - "AD,DA", - "AB,BA", - "BC,CB", - "CD,DC" - ], - "editor": { - "themeId": 11, - "offsetX": 12, - "offsetY": 21, - "themeDimIdx": 2 }, - "identifier": "TK_6", - "coord": { - "x": 15, - "y": 12 - } - }, - "16x12": { - "id": 10, - "name": "Straight", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], "editor": { - "themeId": 10, - "themeDimIdx": 2, - "offsetX": 14, - "offsetY": 20 - }, - "identifier": "TK_17", - "coord": { - "x": 16, - "y": 12 + "themeId": 51, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 } }, - "17x12": { - "id": 10, - "name": "Straight", - "basename": "straight", - "clickable": false, + "1x6": { + "identifier": "s05", + "name": "Turnout Left", + "basename": "turnoutleft", + "clickable": true, "routes": [ - "AC", - "BD" + "AC,CA,CD,DC", + "BD,DB,DA,AD", + "AC,CA,AB,BA", + "BD,DB,BC,CB" ], - "editor": { - "themeId": 10, - "themeDimIdx": 2, - "offsetX": 14, - "offsetY": 20 + "states": { + "deg0": [ + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "right", + "to": "left", + "state": "straight" + }, + { + "source": "bottom", + "to": "right", + "state": "turnleft" + }, + { + "source": "right", + "to": "bottom", + "state": "turnleft" + } + ], + "deg90": [ + { + "source": "left", + "to": "bottom", + "state": "turnleft" + }, + { + "source": "bottom", + "to": "left", + "state": "turnleft" + }, + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + } + ], + "deg180": [ + { + "source": "top", + "to": "left", + "state": "turnleft" + }, + { + "source": "left", + "to": "top", + "state": "turnleft" + }, + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "right", + "to": "left", + "state": "straight" + } + ], + "deg270": [ + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + }, + { + "source": "right", + "to": "top", + "state": "turnleft" + }, + { + "source": "top", + "to": "right", + "state": "turnleft" + } + ] }, - "identifier": "TK_18", "coord": { - "x": 17, - "y": 12 - } - }, - "18x12": { - "id": 10, - "name": "Straight", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "editor": { - "themeId": 10, - "themeDimIdx": 2, - "offsetX": 14, - "offsetY": 20 + "x": 1, + "y": 6 }, - "identifier": "TK_19", - "coord": { - "x": 18, - "y": 12 - } - }, - "19x12": { - "id": 10, - "name": "Straight", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], - "editor": { - "themeId": 10, - "themeDimIdx": 2, - "offsetX": 14, - "offsetY": 20 + "addresses": { + "Addr": 0, + "Addr1": 3, + "Port1": 3, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false }, - "identifier": "TK_20", - "coord": { - "x": 19, - "y": 12 - } - }, - "20x12": { - "id": 10, - "name": "Straight", - "basename": "straight", - "clickable": false, - "routes": [ - "AC", - "BD" - ], "editor": { - "themeId": 10, - "themeDimIdx": 2, - "offsetX": 14, - "offsetY": 20 + "themeId": 50, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 3 }, - "identifier": "TK_21", - "coord": { - "x": 20, - "y": 12 - } + "isMaintenance": false }, - "22x12": { - "id": 50, + "1x7": { + "identifier": "s06", "name": "Turnout Left", "basename": "turnoutleft", "clickable": true, @@ -10995,70 +10856,311 @@ } ] }, + "coord": { + "x": 1, + "y": 7 + }, + "addresses": { + "Addr": 0, + "Addr1": 3, + "Port1": 4, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false + }, "editor": { "themeId": 50, - "offsetX": 21, - "offsetY": 12, - "themeDimIdx": 1 + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 3 + } + }, + "1x8": { + "identifier": "tk20171218190008087", + "name": "Curve", + "basename": "curve", + "clickable": false, + "routes": [ + "AD,DA", + "AB,BA", + "BC,CB", + "CD,DC" + ], + "states": {}, + "coord": { + "x": 1, + "y": 8 }, - "identifier": "SW_2", + "editor": { + "themeId": 11, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 2 + } + }, + "2x1": { + "identifier": "FB5.1", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 2, + "y": 1 + }, + "addresses": { + "Addr": 17, + "Addr1": 0, + "Port1": 0, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false + }, + "editor": { + "themeId": 200, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "2x2": { + "identifier": "FB5.2", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 2, + "y": 2 + }, + "addresses": { + "Addr": 18, + "Addr1": 5, + "Port1": 2, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false + }, + "editor": { + "themeId": 200, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "2x3": { + "identifier": "FB5.3", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 2, + "y": 3 + }, + "addresses": { + "Addr": 19, + "Addr1": 0, + "Port1": 0, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false + }, + "editor": { + "themeId": 200, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "2x4": { + "identifier": "FB5.4", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 2, + "y": 4 + }, + "addresses": { + "Addr": 20, + "Addr1": 0, + "Port1": 0, + "Inverse1": false, + "Addr2": 0, + "Port2": 0, + "Inverse2": false + }, + "editor": { + "themeId": 200, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "2x5": { + "identifier": "FB5.5", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 2, + "y": 5 + }, + "addresses": { + "Addr": 21, + "Addr1": 6, + "Port1": 1, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false + }, + "editor": { + "themeId": 200, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "2x6": { + "identifier": "FB5.6", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, + "coord": { + "x": 2, + "y": 6 + }, + "addresses": { + "Addr": 22, + "Addr1": 6, + "Port1": 2, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false + }, + "editor": { + "themeId": 200, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 + } + }, + "2x7": { + "identifier": "FB5.7", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, + "routes": [ + "AC", + "BD" + ], + "states": {}, "coord": { - "x": 22, - "y": 12 + "x": 2, + "y": 7 }, "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, + "Addr": 23, + "Addr1": 6, + "Port1": 3, "Inverse1": false, "Addr2": -1, "Port2": -1, "Inverse2": false + }, + "editor": { + "themeId": 200, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 0 } }, - "22x13": { - "identifier": "tk1017396011", - "name": "Straigth", - "basename": "straight", - "clickable": false, + "2x8": { + "identifier": "FB5.8", + "name": "Sensor", + "basename": "sensor-off", + "clickable": true, "routes": [ "AC", "BD" ], "states": {}, "coord": { - "x": 22, - "y": 13 + "x": 2, + "y": 8 + }, + "addresses": { + "Addr": 24, + "Addr1": 6, + "Port1": 4, + "Inverse1": false, + "Addr2": -1, + "Port2": -1, + "Inverse2": false }, "editor": { - "themeId": 10, + "themeId": 200, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 1 + "themeDimIdx": 0 } }, - "22x14": { - "identifier": "tk1017396004", - "name": "Straigth", + "4x1": { + "id": 10, + "name": "Straight", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], - "states": {}, - "coord": { - "x": 22, - "y": 14 - }, "editor": { "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 3 + "offsetX": 22, + "offsetY": 24, + "themeDimIdx": 0 + }, + "identifier": "TK_23", + "coord": { + "x": 4, + "y": 1 } }, - "22x15": { + "4x2": { "id": 10, "name": "Straight", "basename": "straight", @@ -11069,138 +11171,80 @@ ], "editor": { "themeId": 10, - "themeDimIdx": 1, - "offsetX": 14, - "offsetY": 20 + "themeDimIdx": 0, + "offsetX": 22, + "offsetY": 24 }, - "identifier": "TK_16", + "identifier": "TK_24", "coord": { - "x": 22, - "y": 15 + "x": 4, + "y": 2 } }, - "0x20": { - "identifier": "s19", - "name": "Turnout Right", - "basename": "turnoutright", - "clickable": true, + "4x3": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, "routes": [ - "AC,CA,AD,DA", - "BD,DB,BA,AB", - "CA,AC,CB,BC", - "DB,BD,DC,CD" + "AC", + "BD" ], - "states": { - "deg0": [ - { - "source": "left", - "to": "bottom", - "state": "turnright" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "bottom", - "to": "left", - "state": "turnright" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg90": [ - { - "source": "top", - "to": "left", - "state": "turnright" - }, - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "left", - "to": "top", - "state": "turnright" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - } - ], - "deg180": [ - { - "source": "top", - "to": "right", - "state": "turnright" - }, - { - "source": "right", - "to": "top", - "state": "turnright" - }, - { - "source": "left", - "to": "right", - "state": "straight" - }, - { - "source": "right", - "to": "left", - "state": "straight" - } - ], - "deg270": [ - { - "source": "top", - "to": "bottom", - "state": "straight" - }, - { - "source": "bottom", - "to": "top", - "state": "straight" - }, - { - "source": "right", - "to": "bottom", - "state": "turnright" - }, - { - "source": "bottom", - "to": "right", - "state": "turnright" - } - ] + "editor": { + "themeId": 10, + "themeDimIdx": 0, + "offsetX": 22, + "offsetY": 24 }, + "identifier": "TK_25", "coord": { - "x": 0, - "y": 20 - }, - "addresses": { - "Addr": 0, - "Addr1": 6, - "Port1": 1, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false + "x": 4, + "y": 3 + } + }, + "4x4": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], + "editor": { + "themeId": 10, + "themeDimIdx": 0, + "offsetX": 22, + "offsetY": 24 }, + "identifier": "TK_26", + "coord": { + "x": 4, + "y": 4 + } + }, + "4x5": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, + "routes": [ + "AC", + "BD" + ], "editor": { - "themeId": 51, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 3 + "themeId": 10, + "themeDimIdx": 0, + "offsetX": 22, + "offsetY": 24 + }, + "identifier": "TK_27", + "coord": { + "x": 4, + "y": 5 } }, - "15x10": { + "4x6": { "id": 10, "name": "Straight", "basename": "straight", @@ -11211,17 +11255,17 @@ ], "editor": { "themeId": 10, - "offsetX": 23, - "offsetY": 18, - "themeDimIdx": 1 + "themeDimIdx": 0, + "offsetX": 22, + "offsetY": 24 }, - "identifier": "TK_15", + "identifier": "TK_28", "coord": { - "x": 15, - "y": 10 + "x": 4, + "y": 6 } }, - "21x12": { + "4x7": { "id": 10, "name": "Straight", "basename": "straight", @@ -11232,160 +11276,60 @@ ], "editor": { "themeId": 10, - "offsetX": 24, - "offsetY": 20, - "themeDimIdx": 0 + "themeDimIdx": 0, + "offsetX": 22, + "offsetY": 24 }, - "identifier": "TK_22", + "identifier": "TK_29", "coord": { - "x": 21, - "y": 12 + "x": 4, + "y": 7 } }, - "6x9": { - "identifier": "FB2A", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, + "4x8": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, "routes": [ "AC", "BD" ], - "states": {}, - "coord": { - "x": 6, - "y": 9 - }, - "addresses": { - "Addr": 46, - "Addr1": 0, - "Port1": 0, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "7x9": { - "identifier": "B09", - "name": "Block", - "basename": "block", - "clickable": false, - "routes": [ - "A0|C0,C0|A0", - "B0|D0,D0|B0" - ], - "states": {}, - "dimensions": [ - { - "w": 4, - "h": 1 - }, - { - "w": 1, - "h": 4 - } - ], - "coord": { - "x": 7, - "y": 9 + "themeId": 10, + "themeDimIdx": 0, + "offsetX": 22, + "offsetY": 24 }, - "editor": { - "themeId": 150, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "11x9": { - "identifier": "FB2B", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, + "identifier": "TK_30", "coord": { - "x": 11, - "y": 9 - }, - "addresses": { - "Addr": 47, - "Addr1": 0, - "Port1": 0, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, - "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 + "x": 4, + "y": 8 } }, - "12x9": { - "identifier": "tk20171218190024391", - "name": "Straigth", + "1x9": { + "id": 10, + "name": "Straight", "basename": "straight", "clickable": false, "routes": [ "AC", "BD" ], - "states": {}, - "coord": { - "x": 12, - "y": 9 - }, "editor": { "themeId": 10, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 - } - }, - "13x9": { - "identifier": "FB3", - "name": "Sensor", - "basename": "sensor-off", - "clickable": true, - "routes": [ - "AC", - "BD" - ], - "states": {}, + "themeDimIdx": 0, + "offsetX": 22, + "offsetY": 24 + }, + "identifier": "TK_31", "coord": { - "x": 13, + "x": 1, "y": 9 - }, - "addresses": { - "Addr": 48, - "Addr1": 0, - "Port1": 0, - "Inverse1": false, - "Addr2": 0, - "Port2": 0, - "Inverse2": false - }, - "editor": { - "themeId": 200, - "offsetX": 0, - "offsetY": 0, - "themeDimIdx": 0 } }, - "14x9": { - "identifier": "tk20171218190020712", + "0x10": { + "identifier": "tk1017395988", "name": "Straigth", "basename": "straight", "clickable": false, @@ -11395,270 +11339,221 @@ ], "states": {}, "coord": { - "x": 14, - "y": 9 + "x": 0, + "y": 10 }, "editor": { "themeId": 10, "offsetX": 0, "offsetY": 0, - "themeDimIdx": 0 + "themeDimIdx": 1 } }, - "6x17": { - "id": 101, - "name": "Main Signal A", - "basename": "semaphoremain-r", + "0x11": { + "identifier": "sw10", + "name": "Turnout Left", + "basename": "turnoutleft", "clickable": true, "routes": [ - "AC", - "BD", - "AC", - "BD" + "AC,CA,CD,DC", + "BD,DB,DA,AD", + "AC,CA,AB,BA", + "BD,DB,BC,CB" ], - "editor": { - "themeId": 101, - "offsetX": 20, - "offsetY": 19, - "themeDimIdx": 0 + "states": { + "deg0": [ + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "right", + "to": "left", + "state": "straight" + }, + { + "source": "bottom", + "to": "right", + "state": "turnleft" + }, + { + "source": "right", + "to": "bottom", + "state": "turnleft" + } + ], + "deg90": [ + { + "source": "left", + "to": "bottom", + "state": "turnleft" + }, + { + "source": "bottom", + "to": "left", + "state": "turnleft" + }, + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + } + ], + "deg180": [ + { + "source": "top", + "to": "left", + "state": "turnleft" + }, + { + "source": "left", + "to": "top", + "state": "turnleft" + }, + { + "source": "left", + "to": "right", + "state": "straight" + }, + { + "source": "right", + "to": "left", + "state": "straight" + } + ], + "deg270": [ + { + "source": "top", + "to": "bottom", + "state": "straight" + }, + { + "source": "bottom", + "to": "top", + "state": "straight" + }, + { + "source": "right", + "to": "top", + "state": "turnleft" + }, + { + "source": "top", + "to": "right", + "state": "turnleft" + } + ] }, - "identifier": "SE_0", "coord": { - "x": 6, - "y": 17 + "x": 0, + "y": 11 }, "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, + "Addr": 0, + "Addr1": 17, + "Port1": 2, "Inverse1": false, - "Addr2": -1, - "Port2": -1, + "Addr2": 0, + "Port2": 0, "Inverse2": false - } - }, - "6x18": { - "id": 101, - "name": "Main Signal A", - "basename": "semaphoremain-r", - "clickable": true, - "routes": [ - "AC", - "BD", - "AC", - "BD" - ], - "editor": { - "themeId": 101, - "themeDimIdx": 0, - "offsetX": 26, - "offsetY": 19 - }, - "identifier": "SE_1", - "coord": { - "x": 6, - "y": 18 }, - "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false - } - }, - "6x19": { - "id": 101, - "name": "Main Signal A", - "basename": "semaphoremain-r", - "clickable": true, - "routes": [ - "AC", - "BD", - "AC", - "BD" - ], "editor": { - "themeId": 101, - "themeDimIdx": 0, - "offsetX": 18, - "offsetY": 13 - }, - "identifier": "SE_2", - "coord": { - "x": 6, - "y": 19 - }, - "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false + "themeId": 50, + "offsetX": 0, + "offsetY": 0, + "themeDimIdx": 3 } }, - "6x20": { - "id": 101, - "name": "Main Signal A", - "basename": "semaphoremain-r", - "clickable": true, + "1x11": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, "routes": [ - "AC", - "BD", "AC", "BD" ], "editor": { - "themeId": 101, + "themeId": 10, "themeDimIdx": 0, - "offsetX": 18, - "offsetY": 13 - }, - "identifier": "SE_3", - "coord": { - "x": 6, - "y": 20 - }, - "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false - } - }, - "17x19": { - "id": 101, - "name": "Main Signal A", - "basename": "semaphoremain-r", - "clickable": true, - "routes": [ - "AC", - "BD", - "AC", - "BD" - ], - "editor": { - "themeId": 101, - "offsetX": 21, - "offsetY": 15, - "themeDimIdx": 2 + "offsetX": 20, + "offsetY": 26 }, - "identifier": "SE_4", + "identifier": "TK_32", "coord": { - "x": 17, - "y": 19 - }, - "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false + "x": 1, + "y": 11 } }, - "17x20": { - "id": 101, - "name": "Main Signal A", - "basename": "semaphoremain-r", - "clickable": true, + "2x11": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, "routes": [ - "AC", - "BD", "AC", "BD" ], "editor": { - "themeId": 101, - "themeDimIdx": 2, - "offsetX": 21, - "offsetY": 15 + "themeId": 10, + "themeDimIdx": 0, + "offsetX": 20, + "offsetY": 26 }, - "identifier": "SE_5", + "identifier": "TK_33", "coord": { - "x": 17, - "y": 20 - }, - "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false + "x": 2, + "y": 11 } }, - "17x16": { - "id": 101, - "name": "Main Signal A", - "basename": "semaphoremain-r", - "clickable": true, + "0x12": { + "id": 10, + "name": "Straight", + "basename": "straight", + "clickable": false, "routes": [ - "AC", - "BD", "AC", "BD" ], "editor": { - "themeId": 101, - "offsetX": 21, - "offsetY": 9, - "themeDimIdx": 2 + "themeId": 10, + "themeDimIdx": 1, + "offsetX": 23, + "offsetY": 25 }, - "identifier": "SE_6", + "identifier": "TK_34", "coord": { - "x": 17, - "y": 16 - }, - "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false + "x": 0, + "y": 12 } }, - "17x15": { - "id": 101, - "name": "Main Signal A", - "basename": "semaphoremain-r", - "clickable": true, + "3x11": { + "id": 11, + "name": "Curve", + "basename": "curve", + "clickable": false, "routes": [ - "AC", - "BD", - "AC", - "BD" + "AD,DA", + "AB,BA", + "BC,CB", + "CD,DC" ], "editor": { - "themeId": 101, - "themeDimIdx": 2, - "offsetX": 21, - "offsetY": 9 + "themeId": 11, + "offsetX": 10, + "offsetY": 17, + "themeDimIdx": 1 }, - "identifier": "SE_7", + "identifier": "TK_35", "coord": { - "x": 17, - "y": 15 - }, - "addresses": { - "Addr": -1, - "Addr1": -1, - "Port1": -1, - "Inverse1": false, - "Addr2": -1, - "Port2": -1, - "Inverse2": false + "x": 3, + "y": 11 } } } diff --git a/Workspaces/Basement/routes.json b/Workspaces/Basement/routes.json index 04569803..c82f8895 100644 --- a/Workspaces/Basement/routes.json +++ b/Workspaces/Basement/routes.json @@ -1,6 +1,6 @@ [ { - "name": "B01[+]_B25[+]", + "name": "B01[+]_B09[+]", "tracks": [ { "x": 6, @@ -11,11 +11,11 @@ "y": 1 }, { - "x": 3, + "x": 4, "y": 1 }, { - "x": 2, + "x": 3, "y": 1 }, { @@ -23,45 +23,41 @@ "y": 1 }, { - "x": 1, + "x": 0, + "y": 1 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, - { - "x": 0, - "y": 11 - }, { "x": 1, - "y": 12 + "y": 11 }, { - "x": 1, - "y": 13 + "x": 2, + "y": 11 }, { - "x": 2, - "y": 13 + "x": 3, + "y": 11 } ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -69,7 +65,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -77,7 +73,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -85,7 +81,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -93,7 +89,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -102,7 +98,15 @@ }, { "x": 0, - "y": 12, + "y": 11, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 3, + "y": 9, "Switch": { "State": "turnleft" }, @@ -111,11 +115,28 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 1 + }, + { + "x": 3, + "y": 10 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 6, + "y": 9 + } + ], + "signals": [ + { + "x": 4, + "y": 9 } ], - "signals": [], "blocks": [ { "x": 7, @@ -125,9 +146,9 @@ "side": 0 }, { - "x": 3, - "y": 13, - "identifier": "B25", + "x": 7, + "y": 9, + "identifier": "B09", "start": false, "side": 0 } @@ -148,11 +169,11 @@ "y": 1 }, { - "x": 3, + "x": 4, "y": 1 }, { - "x": 2, + "x": 3, "y": 1 }, { @@ -160,28 +181,28 @@ "y": 1 }, { - "x": 1, + "x": 0, + "y": 1 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -214,7 +235,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -222,7 +243,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -230,7 +251,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -238,7 +259,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -246,7 +267,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -255,7 +276,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -280,7 +301,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 1 }, { @@ -342,11 +363,11 @@ "y": 1 }, { - "x": 3, + "x": 4, "y": 1 }, { - "x": 2, + "x": 3, "y": 1 }, { @@ -354,28 +375,28 @@ "y": 1 }, { - "x": 1, + "x": 0, + "y": 1 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -416,7 +437,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -424,7 +445,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -432,7 +453,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -440,7 +461,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -448,7 +469,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -457,7 +478,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -490,7 +511,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 1 }, { @@ -552,11 +573,11 @@ "y": 1 }, { - "x": 3, + "x": 4, "y": 1 }, { - "x": 2, + "x": 3, "y": 1 }, { @@ -564,28 +585,28 @@ "y": 1 }, { - "x": 1, + "x": 0, + "y": 1 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -622,7 +643,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -630,7 +651,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -638,7 +659,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -646,7 +667,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -654,7 +675,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -663,7 +684,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -696,7 +717,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 1 }, { @@ -758,11 +779,11 @@ "y": 1 }, { - "x": 3, + "x": 4, "y": 1 }, { - "x": 2, + "x": 3, "y": 1 }, { @@ -770,28 +791,28 @@ "y": 1 }, { - "x": 1, + "x": 0, + "y": 1 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -820,7 +841,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -828,7 +849,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -836,7 +857,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -844,7 +865,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -852,7 +873,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -861,7 +882,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -886,7 +907,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 1 }, { @@ -948,11 +969,11 @@ "y": 1 }, { - "x": 3, + "x": 4, "y": 1 }, { - "x": 2, + "x": 3, "y": 1 }, { @@ -960,28 +981,28 @@ "y": 1 }, { - "x": 1, + "x": 0, + "y": 1 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -1018,7 +1039,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -1026,7 +1047,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -1034,7 +1055,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -1042,7 +1063,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -1050,7 +1071,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -1059,7 +1080,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -1092,7 +1113,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 1 }, { @@ -1149,11 +1170,11 @@ "y": 1 }, { - "x": 3, + "x": 4, "y": 1 }, { - "x": 2, + "x": 3, "y": 1 }, { @@ -1161,28 +1182,28 @@ "y": 1 }, { - "x": 1, + "x": 0, + "y": 1 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -1215,7 +1236,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -1223,7 +1244,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -1231,7 +1252,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -1239,7 +1260,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -1247,7 +1268,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -1256,7 +1277,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -1289,7 +1310,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 1 }, { @@ -2364,7 +2385,7 @@ "occupied": false }, { - "name": "B02[+]_B25[+]", + "name": "B02[+]_B09[+]", "tracks": [ { "x": 6, @@ -2374,203 +2395,50 @@ "x": 5, "y": 2 }, - { - "x": 3, - "y": 2 - }, - { - "x": 2, - "y": 2 - }, - { - "x": 1, - "y": 6 - }, - { - "x": 1, - "y": 7 - }, - { - "x": 1, - "y": 8 - }, - { - "x": 1, - "y": 10 - }, - { - "x": 0, - "y": 10 - }, - { - "x": 0, - "y": 11 - }, - { - "x": 1, - "y": 12 - }, - { - "x": 1, - "y": 13 - }, - { - "x": 2, - "y": 13 - } - ], - "switches": [ - { - "x": 1, - "y": 2, - "Switch": { - "State": "turnright" - }, - "State": "turnright" - }, - { - "x": 1, - "y": 3, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 1, - "y": 4, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 1, - "y": 5, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 1, - "y": 9, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 0, - "y": 12, - "Switch": { - "State": "turnleft" - }, - "State": "turnleft" - } - ], - "sensors": [ { "x": 4, "y": 2 - } - ], - "signals": [], - "blocks": [ - { - "x": 7, - "y": 2, - "identifier": "B02", - "start": true, - "side": 0 }, { "x": 3, - "y": 13, - "identifier": "B25", - "start": false, - "side": 0 - } - ], - "isDisabled": false, - "locked": false, - "occupied": false - }, - { - "name": "B02[+]_B13[+]", - "tracks": [ - { - "x": 6, "y": 2 }, { - "x": 5, - "y": 2 - }, - { - "x": 3, - "y": 2 - }, - { - "x": 2, + "x": 1, "y": 2 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { - "x": 0, + "x": 1, "y": 11 }, - { - "x": 0, - "y": 14 - }, - { - "x": 0, - "y": 15 - }, - { - "x": 0, - "y": 17 - }, { "x": 2, - "y": 17 - }, - { - "x": 4, - "y": 18 - }, - { - "x": 7, - "y": 18 + "y": 11 }, { - "x": 9, - "y": 18 + "x": 3, + "y": 11 } ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -2578,7 +2446,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -2586,7 +2454,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -2594,7 +2462,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -2602,7 +2470,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -2611,59 +2479,43 @@ }, { "x": 0, - "y": 12, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 4, - "y": 17, + "y": 11, "Switch": { - "State": "turnright" + "State": "turnleft" }, - "State": "turnright" + "State": "turnleft" }, { - "x": 5, - "y": 18, + "x": 3, + "y": 9, "Switch": { - "State": "straight" + "State": "turnleft" }, - "State": "straight" + "State": "turnleft" } ], "sensors": [ { - "x": 4, + "x": 2, "y": 2 }, { - "x": 0, - "y": 13 - }, - { - "x": 0, - "y": 16 - }, - { - "x": 1, - "y": 17 + "x": 3, + "y": 10 }, { - "x": 3, - "y": 17 + "x": 5, + "y": 9 }, { - "x": 8, - "y": 18 + "x": 6, + "y": 9 } ], "signals": [ { - "x": 6, - "y": 18 + "x": 4, + "y": 9 } ], "blocks": [ @@ -2675,9 +2527,9 @@ "side": 0 }, { - "x": 10, - "y": 18, - "identifier": "B13", + "x": 7, + "y": 9, + "identifier": "B09", "start": false, "side": 0 } @@ -2687,7 +2539,7 @@ "occupied": false }, { - "name": "B02[+]_B15[+]", + "name": "B02[+]_B13[+]", "tracks": [ { "x": 6, @@ -2698,36 +2550,226 @@ "y": 2 }, { - "x": 3, + "x": 4, "y": 2 }, { - "x": 2, + "x": 3, "y": 2 }, { "x": 1, + "y": 2 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 + }, + { + "x": 0, + "y": 14 + }, + { + "x": 0, + "y": 15 + }, + { + "x": 0, + "y": 17 + }, + { + "x": 2, + "y": 17 + }, + { + "x": 4, + "y": 18 + }, + { + "x": 7, + "y": 18 + }, + { + "x": 9, + "y": 18 + } + ], + "switches": [ + { + "x": 0, + "y": 2, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 0, + "y": 3, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 4, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 5, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 4, + "y": 17, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 5, + "y": 18, + "Switch": { + "State": "straight" + }, + "State": "straight" + } + ], + "sensors": [ + { + "x": 2, + "y": 2 + }, + { + "x": 0, + "y": 13 + }, + { + "x": 0, + "y": 16 + }, + { + "x": 1, + "y": 17 + }, + { + "x": 3, + "y": 17 + }, + { + "x": 8, + "y": 18 + } + ], + "signals": [ + { + "x": 6, + "y": 18 + } + ], + "blocks": [ + { + "x": 7, + "y": 2, + "identifier": "B02", + "start": true, + "side": 0 + }, + { + "x": 10, + "y": 18, + "identifier": "B13", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B02[+]_B15[+]", + "tracks": [ + { + "x": 6, + "y": 2 + }, + { + "x": 5, + "y": 2 + }, + { + "x": 4, + "y": 2 + }, + { + "x": 3, + "y": 2 + }, + { + "x": 1, + "y": 2 + }, + { + "x": 0, + "y": 6 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 0, + "y": 8 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 12 }, { "x": 0, @@ -2768,7 +2810,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -2776,7 +2818,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -2784,7 +2826,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -2792,7 +2834,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -2800,7 +2842,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -2809,7 +2851,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -2842,7 +2884,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 2 }, { @@ -2904,36 +2946,36 @@ "y": 2 }, { - "x": 3, + "x": 4, "y": 2 }, { - "x": 2, + "x": 3, "y": 2 }, { "x": 1, + "y": 2 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -2970,7 +3012,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -2978,7 +3020,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -2986,7 +3028,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -2994,7 +3036,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -3002,7 +3044,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -3011,7 +3053,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -3044,7 +3086,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 2 }, { @@ -3106,36 +3148,36 @@ "y": 2 }, { - "x": 3, + "x": 4, "y": 2 }, { - "x": 2, + "x": 3, "y": 2 }, { "x": 1, + "y": 2 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -3164,7 +3206,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -3172,7 +3214,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -3180,7 +3222,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -3188,7 +3230,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -3196,7 +3238,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -3205,7 +3247,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -3230,7 +3272,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 2 }, { @@ -3292,36 +3334,36 @@ "y": 2 }, { - "x": 3, + "x": 4, "y": 2 }, { - "x": 2, + "x": 3, "y": 2 }, { "x": 1, + "y": 2 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -3358,7 +3400,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -3366,7 +3408,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -3374,7 +3416,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -3382,7 +3424,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -3390,7 +3432,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -3399,7 +3441,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -3432,7 +3474,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 2 }, { @@ -3489,36 +3531,36 @@ "y": 2 }, { - "x": 3, + "x": 4, "y": 2 }, { - "x": 2, + "x": 3, "y": 2 }, { "x": 1, + "y": 2 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -3551,7 +3593,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -3559,7 +3601,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -3567,7 +3609,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -3575,7 +3617,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -3583,7 +3625,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -3592,7 +3634,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -3625,7 +3667,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 2 }, { @@ -4740,7 +4782,7 @@ "occupied": false }, { - "name": "B03[+]_B25[+]", + "name": "B03[+]_B09[+]", "tracks": [ { "x": 6, @@ -4751,53 +4793,49 @@ "y": 3 }, { - "x": 3, + "x": 4, "y": 3 }, { - "x": 2, + "x": 3, "y": 3 }, { "x": 1, + "y": 3 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, - { - "x": 0, - "y": 11 - }, { "x": 1, - "y": 12 + "y": 11 }, { - "x": 1, - "y": 13 + "x": 2, + "y": 11 }, { - "x": 2, - "y": 13 + "x": 3, + "y": 11 } ], "switches": [ { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -4805,7 +4843,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -4813,7 +4851,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -4821,7 +4859,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -4830,7 +4868,15 @@ }, { "x": 0, - "y": 12, + "y": 11, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 3, + "y": 9, "Switch": { "State": "turnleft" }, @@ -4839,11 +4885,28 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 3 + }, + { + "x": 3, + "y": 10 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 6, + "y": 9 + } + ], + "signals": [ + { + "x": 4, + "y": 9 } ], - "signals": [], "blocks": [ { "x": 7, @@ -4853,9 +4916,9 @@ "side": 0 }, { - "x": 3, - "y": 13, - "identifier": "B25", + "x": 7, + "y": 9, + "identifier": "B09", "start": false, "side": 0 } @@ -4876,36 +4939,36 @@ "y": 3 }, { - "x": 3, + "x": 4, "y": 3 }, { - "x": 2, + "x": 3, "y": 3 }, { "x": 1, + "y": 3 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -4938,7 +5001,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -4946,7 +5009,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -4954,7 +5017,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -4962,7 +5025,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -4971,7 +5034,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -4996,7 +5059,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 3 }, { @@ -5058,36 +5121,36 @@ "y": 3 }, { - "x": 3, + "x": 4, "y": 3 }, { - "x": 2, + "x": 3, "y": 3 }, { "x": 1, + "y": 3 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -5128,7 +5191,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -5136,7 +5199,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -5144,7 +5207,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -5152,7 +5215,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -5161,7 +5224,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -5194,7 +5257,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 3 }, { @@ -5256,36 +5319,36 @@ "y": 3 }, { - "x": 3, + "x": 4, "y": 3 }, { - "x": 2, + "x": 3, "y": 3 }, { "x": 1, + "y": 3 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -5322,7 +5385,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -5330,7 +5393,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -5338,7 +5401,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -5346,7 +5409,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -5355,7 +5418,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -5388,7 +5451,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 3 }, { @@ -5450,36 +5513,36 @@ "y": 3 }, { - "x": 3, + "x": 4, "y": 3 }, { - "x": 2, + "x": 3, "y": 3 }, { "x": 1, + "y": 3 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -5508,7 +5571,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -5516,7 +5579,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -5524,7 +5587,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -5532,7 +5595,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -5541,7 +5604,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -5566,7 +5629,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 3 }, { @@ -5628,36 +5691,36 @@ "y": 3 }, { - "x": 3, + "x": 4, "y": 3 }, { - "x": 2, + "x": 3, "y": 3 }, { "x": 1, + "y": 3 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -5694,7 +5757,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -5702,7 +5765,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -5710,7 +5773,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -5718,7 +5781,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -5727,7 +5790,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -5760,7 +5823,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 3 }, { @@ -5817,36 +5880,36 @@ "y": 3 }, { - "x": 3, + "x": 4, "y": 3 }, { - "x": 2, + "x": 3, "y": 3 }, { "x": 1, + "y": 3 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -5879,7 +5942,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -5887,7 +5950,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -5895,7 +5958,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -5903,7 +5966,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -5912,7 +5975,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -5945,7 +6008,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 3 }, { @@ -7100,7 +7163,7 @@ "occupied": false }, { - "name": "B04[+]_B25[+]", + "name": "B04[+]_B09[+]", "tracks": [ { "x": 6, @@ -7111,53 +7174,49 @@ "y": 4 }, { - "x": 3, + "x": 4, "y": 4 }, { - "x": 2, + "x": 3, "y": 4 }, { "x": 1, + "y": 4 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, - { - "x": 0, - "y": 11 - }, { "x": 1, - "y": 12 + "y": 11 }, { - "x": 1, - "y": 13 + "x": 2, + "y": 11 }, { - "x": 2, - "y": 13 + "x": 3, + "y": 11 } ], "switches": [ { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -7165,7 +7224,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -7173,7 +7232,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -7182,7 +7241,15 @@ }, { "x": 0, - "y": 12, + "y": 11, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 3, + "y": 9, "Switch": { "State": "turnleft" }, @@ -7191,11 +7258,28 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 4 + }, + { + "x": 3, + "y": 10 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 6, + "y": 9 + } + ], + "signals": [ + { + "x": 4, + "y": 9 } ], - "signals": [], "blocks": [ { "x": 7, @@ -7205,14 +7289,14 @@ "side": 0 }, { - "x": 3, - "y": 13, - "identifier": "B25", + "x": 7, + "y": 9, + "identifier": "B09", "start": false, "side": 0 } ], - "isDisabled": true, + "isDisabled": false, "locked": false, "occupied": false }, @@ -7228,36 +7312,36 @@ "y": 4 }, { - "x": 3, + "x": 4, "y": 4 }, { - "x": 2, + "x": 3, "y": 4 }, { "x": 1, + "y": 4 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -7290,7 +7374,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -7298,7 +7382,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -7306,7 +7390,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -7315,7 +7399,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -7340,7 +7424,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 4 }, { @@ -7402,36 +7486,36 @@ "y": 4 }, { - "x": 3, + "x": 4, "y": 4 }, { - "x": 2, + "x": 3, "y": 4 }, { "x": 1, + "y": 4 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -7472,7 +7556,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -7480,7 +7564,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -7488,7 +7572,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -7497,7 +7581,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -7530,7 +7614,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 4 }, { @@ -7592,36 +7676,36 @@ "y": 4 }, { - "x": 3, + "x": 4, "y": 4 }, { - "x": 2, + "x": 3, "y": 4 }, { "x": 1, + "y": 4 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -7658,7 +7742,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -7666,7 +7750,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -7674,7 +7758,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -7683,7 +7767,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -7716,7 +7800,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 4 }, { @@ -7778,36 +7862,36 @@ "y": 4 }, { - "x": 3, + "x": 4, "y": 4 }, { - "x": 2, + "x": 3, "y": 4 }, { "x": 1, + "y": 4 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -7836,7 +7920,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -7844,7 +7928,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -7852,7 +7936,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -7861,7 +7945,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -7886,7 +7970,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 4 }, { @@ -7948,36 +8032,36 @@ "y": 4 }, { - "x": 3, + "x": 4, "y": 4 }, { - "x": 2, + "x": 3, "y": 4 }, { "x": 1, + "y": 4 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -8014,7 +8098,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -8022,7 +8106,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -8030,7 +8114,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -8039,7 +8123,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -8072,7 +8156,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 4 }, { @@ -8129,36 +8213,36 @@ "y": 4 }, { - "x": 3, + "x": 4, "y": 4 }, { - "x": 2, + "x": 3, "y": 4 }, { "x": 1, + "y": 4 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -8191,7 +8275,7 @@ ], "switches": [ { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -8199,7 +8283,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -8207,7 +8291,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -8216,7 +8300,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -8249,7 +8333,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 4 }, { @@ -9424,7 +9508,7 @@ "occupied": false }, { - "name": "B05[+]_B25[+]", + "name": "B05[+]_B09[+]", "tracks": [ { "x": 6, @@ -9434,179 +9518,46 @@ "x": 5, "y": 5 }, - { - "x": 3, - "y": 5 - }, - { - "x": 1, - "y": 6 - }, - { - "x": 1, - "y": 7 - }, - { - "x": 1, - "y": 8 - }, - { - "x": 1, - "y": 10 - }, - { - "x": 0, - "y": 10 - }, - { - "x": 0, - "y": 11 - }, - { - "x": 1, - "y": 12 - }, - { - "x": 1, - "y": 13 - }, - { - "x": 2, - "y": 13 - } - ], - "switches": [ - { - "x": 2, - "y": 5, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 1, - "y": 5, - "Switch": { - "State": "turnright" - }, - "State": "turnright" - }, - { - "x": 1, - "y": 9, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 0, - "y": 12, - "Switch": { - "State": "turnleft" - }, - "State": "turnleft" - } - ], - "sensors": [ { "x": 4, "y": 5 - } - ], - "signals": [], - "blocks": [ - { - "x": 7, - "y": 5, - "identifier": "B05", - "start": true, - "side": 0 - }, - { - "x": 3, - "y": 13, - "identifier": "B25", - "start": false, - "side": 0 - } - ], - "isDisabled": true, - "locked": false, - "occupied": false - }, - { - "name": "B05[+]_B13[+]", - "tracks": [ - { - "x": 6, - "y": 5 - }, - { - "x": 5, - "y": 5 }, { "x": 3, "y": 5 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { - "x": 0, + "x": 1, "y": 11 }, - { - "x": 0, - "y": 14 - }, - { - "x": 0, - "y": 15 - }, - { - "x": 0, - "y": 17 - }, { "x": 2, - "y": 17 - }, - { - "x": 4, - "y": 18 - }, - { - "x": 7, - "y": 18 + "y": 11 }, { - "x": 9, - "y": 18 + "x": 3, + "y": 11 } ], "switches": [ { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "straight" @@ -9614,7 +9565,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -9622,7 +9573,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -9631,59 +9582,43 @@ }, { "x": 0, - "y": 12, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 4, - "y": 17, + "y": 11, "Switch": { - "State": "turnright" + "State": "turnleft" }, - "State": "turnright" + "State": "turnleft" }, { - "x": 5, - "y": 18, + "x": 3, + "y": 9, "Switch": { - "State": "straight" + "State": "turnleft" }, - "State": "straight" + "State": "turnleft" } ], "sensors": [ { - "x": 4, + "x": 2, "y": 5 }, { - "x": 0, - "y": 13 - }, - { - "x": 0, - "y": 16 - }, - { - "x": 1, - "y": 17 + "x": 3, + "y": 10 }, { - "x": 3, - "y": 17 + "x": 5, + "y": 9 }, { - "x": 8, - "y": 18 + "x": 6, + "y": 9 } ], "signals": [ { - "x": 6, - "y": 18 + "x": 4, + "y": 9 } ], "blocks": [ @@ -9695,9 +9630,9 @@ "side": 0 }, { - "x": 10, - "y": 18, - "identifier": "B13", + "x": 7, + "y": 9, + "identifier": "B09", "start": false, "side": 0 } @@ -9707,7 +9642,7 @@ "occupied": false }, { - "name": "B05[+]_B15[+]", + "name": "B05[+]_B13[+]", "tracks": [ { "x": 6, @@ -9717,33 +9652,203 @@ "x": 5, "y": 5 }, + { + "x": 4, + "y": 5 + }, { "x": 3, "y": 5 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 + }, + { + "x": 0, + "y": 14 + }, + { + "x": 0, + "y": 15 + }, + { + "x": 0, + "y": 17 + }, + { + "x": 2, + "y": 17 + }, + { + "x": 4, + "y": 18 + }, + { + "x": 7, + "y": 18 + }, + { + "x": 9, + "y": 18 + } + ], + "switches": [ + { + "x": 1, + "y": 5, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 5, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 4, + "y": 17, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 5, + "y": 18, + "Switch": { + "State": "straight" + }, + "State": "straight" + } + ], + "sensors": [ + { + "x": 2, + "y": 5 + }, + { + "x": 0, + "y": 13 + }, + { + "x": 0, + "y": 16 + }, + { + "x": 1, + "y": 17 + }, + { + "x": 3, + "y": 17 + }, + { + "x": 8, + "y": 18 + } + ], + "signals": [ + { + "x": 6, + "y": 18 + } + ], + "blocks": [ + { + "x": 7, + "y": 5, + "identifier": "B05", + "start": true, + "side": 0 + }, + { + "x": 10, + "y": 18, + "identifier": "B13", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B05[+]_B15[+]", + "tracks": [ + { + "x": 6, + "y": 5 + }, + { + "x": 5, + "y": 5 + }, + { + "x": 4, + "y": 5 + }, + { + "x": 3, + "y": 5 + }, + { + "x": 0, + "y": 6 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 0, + "y": 8 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 12 }, { "x": 0, @@ -9784,7 +9889,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "straight" @@ -9792,7 +9897,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -9800,7 +9905,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -9809,7 +9914,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -9842,7 +9947,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 5 }, { @@ -9903,33 +10008,33 @@ "x": 5, "y": 5 }, + { + "x": 4, + "y": 5 + }, { "x": 3, "y": 5 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -9966,7 +10071,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "straight" @@ -9974,7 +10079,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -9982,7 +10087,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -9991,7 +10096,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -10024,7 +10129,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 5 }, { @@ -10085,33 +10190,33 @@ "x": 5, "y": 5 }, + { + "x": 4, + "y": 5 + }, { "x": 3, "y": 5 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -10140,7 +10245,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "straight" @@ -10148,7 +10253,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -10156,7 +10261,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -10165,7 +10270,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -10190,7 +10295,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 5 }, { @@ -10251,33 +10356,33 @@ "x": 5, "y": 5 }, + { + "x": 4, + "y": 5 + }, { "x": 3, "y": 5 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -10314,7 +10419,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "straight" @@ -10322,7 +10427,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -10330,7 +10435,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -10339,7 +10444,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -10372,7 +10477,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 5 }, { @@ -10428,33 +10533,33 @@ "x": 5, "y": 5 }, + { + "x": 4, + "y": 5 + }, { "x": 3, "y": 5 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -10487,7 +10592,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "straight" @@ -10495,7 +10600,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -10503,7 +10608,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -10512,7 +10617,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -10545,7 +10650,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 5 }, { @@ -11580,7 +11685,7 @@ "occupied": false }, { - "name": "B06[+]_B25[+]", + "name": "B06[+]_B09[+]", "tracks": [ { "x": 6, @@ -11590,187 +11695,46 @@ "x": 5, "y": 6 }, - { - "x": 3, - "y": 6 - }, - { - "x": 1, - "y": 6 - }, - { - "x": 1, - "y": 7 - }, - { - "x": 1, - "y": 8 - }, - { - "x": 1, - "y": 10 - }, - { - "x": 0, - "y": 10 - }, - { - "x": 0, - "y": 11 - }, - { - "x": 1, - "y": 12 - }, - { - "x": 1, - "y": 13 - }, - { - "x": 2, - "y": 13 - } - ], - "switches": [ - { - "x": 2, - "y": 6, - "Switch": { - "State": "turnleft" - }, - "State": "turnleft" - }, - { - "x": 2, - "y": 5, - "Switch": { - "State": "turnright" - }, - "State": "turnright" - }, - { - "x": 1, - "y": 5, - "Switch": { - "State": "turnright" - }, - "State": "turnright" - }, - { - "x": 1, - "y": 9, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 0, - "y": 12, - "Switch": { - "State": "turnleft" - }, - "State": "turnleft" - } - ], - "sensors": [ { "x": 4, "y": 6 - } - ], - "signals": [], - "blocks": [ - { - "x": 7, - "y": 6, - "identifier": "B06", - "start": true, - "side": 0 }, { "x": 3, - "y": 13, - "identifier": "B25", - "start": false, - "side": 0 - } - ], - "isDisabled": false, - "locked": false, - "occupied": false - }, - { - "name": "B06[+]_B13[+]", - "tracks": [ - { - "x": 6, "y": 6 }, { - "x": 5, - "y": 6 - }, - { - "x": 3, - "y": 6 - }, - { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { - "x": 0, + "x": 1, "y": 11 }, - { - "x": 0, - "y": 14 - }, - { - "x": 0, - "y": 15 - }, - { - "x": 0, - "y": 17 - }, { "x": 2, - "y": 17 - }, - { - "x": 4, - "y": 18 - }, - { - "x": 7, - "y": 18 + "y": 11 }, { - "x": 9, - "y": 18 + "x": 3, + "y": 11 } ], "switches": [ { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -11778,7 +11742,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -11786,7 +11750,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -11794,7 +11758,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -11803,59 +11767,43 @@ }, { "x": 0, - "y": 12, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 4, - "y": 17, + "y": 11, "Switch": { - "State": "turnright" + "State": "turnleft" }, - "State": "turnright" + "State": "turnleft" }, { - "x": 5, - "y": 18, + "x": 3, + "y": 9, "Switch": { - "State": "straight" + "State": "turnleft" }, - "State": "straight" + "State": "turnleft" } ], "sensors": [ { - "x": 4, + "x": 2, "y": 6 }, { - "x": 0, - "y": 13 - }, - { - "x": 0, - "y": 16 - }, - { - "x": 1, - "y": 17 + "x": 3, + "y": 10 }, { - "x": 3, - "y": 17 + "x": 5, + "y": 9 }, { - "x": 8, - "y": 18 + "x": 6, + "y": 9 } ], "signals": [ { - "x": 6, - "y": 18 + "x": 4, + "y": 9 } ], "blocks": [ @@ -11867,9 +11815,9 @@ "side": 0 }, { - "x": 10, - "y": 18, - "identifier": "B13", + "x": 7, + "y": 9, + "identifier": "B09", "start": false, "side": 0 } @@ -11879,7 +11827,7 @@ "occupied": false }, { - "name": "B06[+]_B15[+]", + "name": "B06[+]_B13[+]", "tracks": [ { "x": 6, @@ -11889,33 +11837,211 @@ "x": 5, "y": 6 }, + { + "x": 4, + "y": 6 + }, { "x": 3, "y": 6 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 + }, + { + "x": 0, + "y": 14 + }, + { + "x": 0, + "y": 15 + }, + { + "x": 0, + "y": 17 + }, + { + "x": 2, + "y": 17 + }, + { + "x": 4, + "y": 18 + }, + { + "x": 7, + "y": 18 + }, + { + "x": 9, + "y": 18 + } + ], + "switches": [ + { + "x": 1, + "y": 6, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 1, + "y": 5, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 0, + "y": 5, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 4, + "y": 17, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 5, + "y": 18, + "Switch": { + "State": "straight" + }, + "State": "straight" + } + ], + "sensors": [ + { + "x": 2, + "y": 6 + }, + { + "x": 0, + "y": 13 + }, + { + "x": 0, + "y": 16 + }, + { + "x": 1, + "y": 17 + }, + { + "x": 3, + "y": 17 + }, + { + "x": 8, + "y": 18 + } + ], + "signals": [ + { + "x": 6, + "y": 18 + } + ], + "blocks": [ + { + "x": 7, + "y": 6, + "identifier": "B06", + "start": true, + "side": 0 + }, + { + "x": 10, + "y": 18, + "identifier": "B13", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B06[+]_B15[+]", + "tracks": [ + { + "x": 6, + "y": 6 + }, + { + "x": 5, + "y": 6 + }, + { + "x": 4, + "y": 6 + }, + { + "x": 3, + "y": 6 + }, + { + "x": 0, + "y": 6 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 0, + "y": 8 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 12 }, { "x": 0, @@ -11956,7 +12082,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -11964,7 +12090,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -11972,7 +12098,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -11980,7 +12106,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -11989,7 +12115,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -12022,7 +12148,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 6 }, { @@ -12083,33 +12209,33 @@ "x": 5, "y": 6 }, + { + "x": 4, + "y": 6 + }, { "x": 3, "y": 6 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -12146,7 +12272,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -12154,7 +12280,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -12162,7 +12288,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -12170,7 +12296,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -12179,7 +12305,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -12212,7 +12338,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 6 }, { @@ -12273,33 +12399,33 @@ "x": 5, "y": 6 }, + { + "x": 4, + "y": 6 + }, { "x": 3, "y": 6 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -12328,7 +12454,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -12336,7 +12462,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -12344,7 +12470,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -12352,7 +12478,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -12361,7 +12487,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -12386,7 +12512,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 6 }, { @@ -12447,33 +12573,33 @@ "x": 5, "y": 6 }, + { + "x": 4, + "y": 6 + }, { "x": 3, "y": 6 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -12510,7 +12636,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -12518,7 +12644,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -12526,7 +12652,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -12534,7 +12660,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -12543,7 +12669,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -12576,7 +12702,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 6 }, { @@ -12632,33 +12758,33 @@ "x": 5, "y": 6 }, + { + "x": 4, + "y": 6 + }, { "x": 3, "y": 6 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -12691,7 +12817,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -12699,7 +12825,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -12707,7 +12833,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -12715,7 +12841,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -12724,7 +12850,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -12757,7 +12883,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 6 }, { @@ -13772,7 +13898,7 @@ "occupied": false }, { - "name": "B07[+]_B25[+]", + "name": "B07[+]_B09[+]", "tracks": [ { "x": 6, @@ -13782,50 +13908,46 @@ "x": 5, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 3, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, - { - "x": 0, - "y": 11 - }, { "x": 1, - "y": 12 + "y": 11 }, { - "x": 1, - "y": 13 + "x": 2, + "y": 11 }, { - "x": 2, - "y": 13 + "x": 3, + "y": 11 } ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -13833,7 +13955,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -13841,7 +13963,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -13849,7 +13971,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -13857,7 +13979,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -13866,7 +13988,15 @@ }, { "x": 0, - "y": 12, + "y": 11, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 3, + "y": 9, "Switch": { "State": "turnleft" }, @@ -13875,11 +14005,28 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 7 + }, + { + "x": 3, + "y": 10 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 6, + "y": 9 + } + ], + "signals": [ + { + "x": 4, + "y": 9 } ], - "signals": [], "blocks": [ { "x": 7, @@ -13889,9 +14036,9 @@ "side": 0 }, { - "x": 3, - "y": 13, - "identifier": "B25", + "x": 7, + "y": 9, + "identifier": "B09", "start": false, "side": 0 } @@ -13911,33 +14058,33 @@ "x": 5, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 3, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -13970,7 +14117,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -13978,7 +14125,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -13986,7 +14133,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -13994,7 +14141,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -14002,7 +14149,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -14011,7 +14158,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -14036,7 +14183,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 7 }, { @@ -14097,33 +14244,33 @@ "x": 5, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 3, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -14164,7 +14311,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -14172,7 +14319,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -14180,7 +14327,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -14188,7 +14335,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -14196,7 +14343,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -14205,7 +14352,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -14238,7 +14385,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 7 }, { @@ -14299,33 +14446,33 @@ "x": 5, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 3, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -14362,7 +14509,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -14370,7 +14517,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -14378,7 +14525,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -14386,7 +14533,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -14394,7 +14541,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -14403,7 +14550,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -14436,7 +14583,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 7 }, { @@ -14497,33 +14644,33 @@ "x": 5, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 3, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -14552,7 +14699,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -14560,7 +14707,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -14568,7 +14715,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -14576,7 +14723,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -14584,7 +14731,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -14593,7 +14740,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -14618,7 +14765,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 7 }, { @@ -14679,33 +14826,33 @@ "x": 5, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 3, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -14742,7 +14889,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -14750,7 +14897,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -14758,7 +14905,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -14766,7 +14913,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -14774,7 +14921,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -14783,7 +14930,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -14816,7 +14963,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 7 }, { @@ -14872,33 +15019,33 @@ "x": 5, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 3, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -14931,7 +15078,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -14939,7 +15086,7 @@ "State": "turnleft" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -14947,7 +15094,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -14955,7 +15102,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -14963,7 +15110,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -14972,7 +15119,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -15005,7 +15152,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 7 }, { @@ -15980,7 +16127,7 @@ "occupied": false }, { - "name": "B08[+]_B25[+]", + "name": "B08[+]_B09[+]", "tracks": [ { "x": 6, @@ -15991,53 +16138,49 @@ "y": 8 }, { - "x": 3, + "x": 4, "y": 8 }, { - "x": 2, + "x": 3, "y": 8 }, { "x": 1, + "y": 8 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, - { - "x": 0, - "y": 11 - }, { "x": 1, - "y": 12 + "y": 11 }, { - "x": 1, - "y": 13 + "x": 2, + "y": 11 }, { - "x": 2, - "y": 13 + "x": 3, + "y": 11 } ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -16045,7 +16188,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -16053,7 +16196,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -16061,7 +16204,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -16069,7 +16212,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -16078,7 +16221,15 @@ }, { "x": 0, - "y": 12, + "y": 11, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 3, + "y": 9, "Switch": { "State": "turnleft" }, @@ -16087,11 +16238,28 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 8 + }, + { + "x": 3, + "y": 10 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 6, + "y": 9 + } + ], + "signals": [ + { + "x": 4, + "y": 9 } ], - "signals": [], "blocks": [ { "x": 7, @@ -16101,9 +16269,9 @@ "side": 0 }, { - "x": 3, - "y": 13, - "identifier": "B25", + "x": 7, + "y": 9, + "identifier": "B09", "start": false, "side": 0 } @@ -16124,36 +16292,36 @@ "y": 8 }, { - "x": 3, + "x": 4, "y": 8 }, { - "x": 2, + "x": 3, "y": 8 }, { "x": 1, + "y": 8 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -16186,7 +16354,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -16194,7 +16362,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -16202,7 +16370,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -16210,7 +16378,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -16218,7 +16386,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -16227,7 +16395,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -16252,7 +16420,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 8 }, { @@ -16314,36 +16482,36 @@ "y": 8 }, { - "x": 3, + "x": 4, "y": 8 }, { - "x": 2, + "x": 3, "y": 8 }, { "x": 1, + "y": 8 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -16384,7 +16552,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -16392,7 +16560,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -16400,7 +16568,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -16408,7 +16576,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -16416,7 +16584,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -16425,7 +16593,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -16458,7 +16626,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 8 }, { @@ -16520,36 +16688,36 @@ "y": 8 }, { - "x": 3, + "x": 4, "y": 8 }, { - "x": 2, + "x": 3, "y": 8 }, { "x": 1, + "y": 8 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -16586,7 +16754,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -16594,7 +16762,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -16602,7 +16770,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -16610,7 +16778,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -16618,7 +16786,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -16627,7 +16795,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -16660,7 +16828,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 8 }, { @@ -16722,36 +16890,36 @@ "y": 8 }, { - "x": 3, + "x": 4, "y": 8 }, { - "x": 2, + "x": 3, "y": 8 }, { "x": 1, + "y": 8 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -16780,7 +16948,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -16788,7 +16956,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -16796,7 +16964,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -16804,7 +16972,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -16812,7 +16980,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -16821,7 +16989,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -16846,7 +17014,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 8 }, { @@ -16908,36 +17076,36 @@ "y": 8 }, { - "x": 3, + "x": 4, "y": 8 }, { - "x": 2, + "x": 3, "y": 8 }, { "x": 1, + "y": 8 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -16974,7 +17142,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -16982,7 +17150,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -16990,7 +17158,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -16998,7 +17166,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -17006,7 +17174,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -17015,7 +17183,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -17048,7 +17216,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 8 }, { @@ -17105,36 +17273,36 @@ "y": 8 }, { - "x": 3, + "x": 4, "y": 8 }, { - "x": 2, + "x": 3, "y": 8 }, { "x": 1, + "y": 8 + }, + { + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 8 }, - { - "x": 1, - "y": 10 - }, { "x": 0, "y": 10 }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -17167,7 +17335,7 @@ ], "switches": [ { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -17175,7 +17343,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -17183,7 +17351,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -17191,7 +17359,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -17199,7 +17367,7 @@ "State": "turnright" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -17208,7 +17376,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -17241,7 +17409,7 @@ ], "sensors": [ { - "x": 4, + "x": 2, "y": 8 }, { @@ -19783,80 +19951,6 @@ "locked": false, "occupied": false }, - { - "name": "B25[-]_B09[+]", - "tracks": [ - { - "x": 5, - "y": 13 - }, - { - "x": 5, - "y": 12 - }, - { - "x": 5, - "y": 11 - }, - { - "x": 4, - "y": 11 - }, - { - "x": 3, - "y": 11 - } - ], - "switches": [ - { - "x": 3, - "y": 9, - "Switch": { - "State": "turnleft" - }, - "State": "turnleft" - } - ], - "sensors": [ - { - "x": 3, - "y": 10 - }, - { - "x": 5, - "y": 9 - }, - { - "x": 6, - "y": 9 - } - ], - "signals": [ - { - "x": 4, - "y": 9 - } - ], - "blocks": [ - { - "x": 3, - "y": 13, - "identifier": "B25", - "start": true, - "side": 1 - }, - { - "x": 7, - "y": 9, - "identifier": "B09", - "start": false, - "side": 0 - } - ], - "isDisabled": false, - "locked": false, - "occupied": false - }, { "name": "B15[+]_B09[+]", "tracks": [ @@ -19898,7 +19992,7 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -19906,7 +20000,7 @@ }, { "x": 1, - "y": 10 + "y": 9 } ], "switches": [ @@ -19936,14 +20030,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "turnright" @@ -20064,32 +20158,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 5 }, + { + "x": 4, + "y": 5 + }, { "x": 5, "y": 5 @@ -20126,14 +20220,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -20141,7 +20235,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -20149,7 +20243,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "straight" @@ -20179,7 +20273,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 5 } ], @@ -20250,32 +20344,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 6 }, + { + "x": 4, + "y": 6 + }, { "x": 5, "y": 6 @@ -20312,14 +20406,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -20327,7 +20421,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -20335,7 +20429,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -20343,7 +20437,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -20373,7 +20467,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 6 } ], @@ -20444,36 +20538,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 8 }, { "x": 3, "y": 8 }, + { + "x": 4, + "y": 8 + }, { "x": 5, "y": 8 @@ -20510,14 +20604,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -20525,7 +20619,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -20533,7 +20627,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -20541,7 +20635,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -20549,7 +20643,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -20579,7 +20673,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 8 } ], @@ -20650,32 +20744,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 5, "y": 7 @@ -20712,14 +20806,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -20727,7 +20821,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -20735,7 +20829,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -20743,7 +20837,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -20751,7 +20845,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -20781,7 +20875,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 7 } ], @@ -20852,36 +20946,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 4 }, { "x": 3, "y": 4 }, + { + "x": 4, + "y": 4 + }, { "x": 5, "y": 4 @@ -20918,14 +21012,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -20933,7 +21027,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -20941,7 +21035,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -20971,7 +21065,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 4 } ], @@ -21042,36 +21136,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 3 }, { "x": 3, "y": 3 }, + { + "x": 4, + "y": 3 + }, { "x": 5, "y": 3 @@ -21108,14 +21202,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -21123,7 +21217,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -21131,7 +21225,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -21139,7 +21233,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -21169,7 +21263,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 3 } ], @@ -21240,40 +21334,40 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 1 }, { - "x": 2, + "x": 1, "y": 1 }, { "x": 3, "y": 1 }, + { + "x": 4, + "y": 1 + }, { "x": 5, "y": 1 @@ -21310,14 +21404,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -21325,7 +21419,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -21333,7 +21427,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -21341,7 +21435,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -21349,7 +21443,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -21379,7 +21473,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 1 } ], @@ -21450,36 +21544,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 2 }, { "x": 3, "y": 2 }, + { + "x": 4, + "y": 2 + }, { "x": 5, "y": 2 @@ -21516,14 +21610,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -21531,7 +21625,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -21539,7 +21633,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -21547,7 +21641,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -21555,7 +21649,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -21585,7 +21679,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 2 } ], @@ -23732,7 +23826,7 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -23740,7 +23834,7 @@ }, { "x": 1, - "y": 10 + "y": 9 } ], "switches": [ @@ -23770,14 +23864,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "turnright" @@ -23894,32 +23988,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 5 }, + { + "x": 4, + "y": 5 + }, { "x": 5, "y": 5 @@ -23956,14 +24050,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -23971,7 +24065,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -23979,7 +24073,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "straight" @@ -24009,7 +24103,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 5 } ], @@ -24076,32 +24170,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 6 }, + { + "x": 4, + "y": 6 + }, { "x": 5, "y": 6 @@ -24138,14 +24232,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -24153,7 +24247,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -24161,7 +24255,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -24169,7 +24263,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -24199,7 +24293,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 6 } ], @@ -24266,36 +24360,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 8 }, { "x": 3, "y": 8 }, + { + "x": 4, + "y": 8 + }, { "x": 5, "y": 8 @@ -24332,14 +24426,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -24347,7 +24441,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -24355,7 +24449,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -24363,7 +24457,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -24371,7 +24465,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -24401,7 +24495,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 8 } ], @@ -24468,32 +24562,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 5, "y": 7 @@ -24530,14 +24624,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -24545,7 +24639,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -24553,7 +24647,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -24561,7 +24655,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -24569,7 +24663,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -24599,7 +24693,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 7 } ], @@ -24666,36 +24760,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 4 }, { "x": 3, "y": 4 }, + { + "x": 4, + "y": 4 + }, { "x": 5, "y": 4 @@ -24732,14 +24826,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -24747,7 +24841,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -24755,7 +24849,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -24785,7 +24879,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 4 } ], @@ -24852,36 +24946,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 3 }, { "x": 3, "y": 3 }, + { + "x": 4, + "y": 3 + }, { "x": 5, "y": 3 @@ -24918,14 +25012,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -24933,7 +25027,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -24941,7 +25035,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -24949,7 +25043,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -24979,7 +25073,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 3 } ], @@ -25046,40 +25140,40 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 1 }, { - "x": 2, + "x": 1, "y": 1 }, { "x": 3, "y": 1 }, + { + "x": 4, + "y": 1 + }, { "x": 5, "y": 1 @@ -25116,14 +25210,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -25131,7 +25225,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -25139,7 +25233,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -25147,7 +25241,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -25155,7 +25249,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -25185,7 +25279,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 1 } ], @@ -25252,36 +25346,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 2 }, { "x": 3, "y": 2 }, + { + "x": 4, + "y": 2 + }, { "x": 5, "y": 2 @@ -25318,14 +25412,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -25333,7 +25427,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -25341,7 +25435,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -25349,7 +25443,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -25357,7 +25451,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -25387,7 +25481,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 2 } ], @@ -27490,7 +27584,7 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -27498,7 +27592,7 @@ }, { "x": 1, - "y": 10 + "y": 9 } ], "switches": [ @@ -27520,14 +27614,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "turnright" @@ -27640,32 +27734,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 5 }, + { + "x": 4, + "y": 5 + }, { "x": 5, "y": 5 @@ -27694,14 +27788,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -27709,7 +27803,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -27717,7 +27811,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "straight" @@ -27747,7 +27841,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 5 } ], @@ -27810,32 +27904,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 6 }, + { + "x": 4, + "y": 6 + }, { "x": 5, "y": 6 @@ -27864,14 +27958,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -27879,7 +27973,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -27887,7 +27981,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -27895,7 +27989,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -27925,7 +28019,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 6 } ], @@ -27988,36 +28082,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 8 }, { "x": 3, "y": 8 }, + { + "x": 4, + "y": 8 + }, { "x": 5, "y": 8 @@ -28046,14 +28140,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -28061,7 +28155,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -28069,7 +28163,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -28077,7 +28171,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -28085,7 +28179,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -28115,7 +28209,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 8 } ], @@ -28178,32 +28272,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 5, "y": 7 @@ -28232,14 +28326,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -28247,7 +28341,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -28255,7 +28349,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -28263,7 +28357,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -28271,7 +28365,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -28301,7 +28395,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 7 } ], @@ -28364,36 +28458,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 4 }, { "x": 3, "y": 4 }, + { + "x": 4, + "y": 4 + }, { "x": 5, "y": 4 @@ -28422,14 +28516,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -28437,7 +28531,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -28445,7 +28539,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -28475,7 +28569,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 4 } ], @@ -28538,36 +28632,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 3 }, { "x": 3, "y": 3 }, + { + "x": 4, + "y": 3 + }, { "x": 5, "y": 3 @@ -28596,14 +28690,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -28611,7 +28705,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -28619,7 +28713,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -28627,7 +28721,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -28657,7 +28751,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 3 } ], @@ -28720,40 +28814,40 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 1 }, { - "x": 2, + "x": 1, "y": 1 }, { "x": 3, "y": 1 }, + { + "x": 4, + "y": 1 + }, { "x": 5, "y": 1 @@ -28782,14 +28876,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -28797,7 +28891,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -28805,7 +28899,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -28813,7 +28907,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -28821,7 +28915,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -28851,7 +28945,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 1 } ], @@ -28914,36 +29008,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 2 }, { "x": 3, "y": 2 }, + { + "x": 4, + "y": 2 + }, { "x": 5, "y": 2 @@ -28972,14 +29066,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -28987,7 +29081,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -28995,7 +29089,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -29003,7 +29097,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -29011,7 +29105,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -29041,7 +29135,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 2 } ], @@ -31068,7 +31162,7 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -31076,7 +31170,7 @@ }, { "x": 1, - "y": 10 + "y": 9 } ], "switches": [ @@ -31106,14 +31200,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "turnright" @@ -31226,216 +31320,39 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 5 }, - { - "x": 5, - "y": 5 - }, - { - "x": 6, - "y": 5 - } - ], - "switches": [ - { - "x": 5, - "y": 16, - "Switch": { - "State": "turnleft|turnleft" - }, - "State": "turnleft|turnleft" - }, - { - "x": 5, - "y": 17, - "Switch": { - "State": "turnleft" - }, - "State": "turnleft" - }, - { - "x": 4, - "y": 17, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 0, - "y": 12, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 1, - "y": 9, - "Switch": { - "State": "straight" - }, - "State": "straight" - }, - { - "x": 1, - "y": 5, - "Switch": { - "State": "turnright" - }, - "State": "turnright" - }, - { - "x": 2, - "y": 5, - "Switch": { - "State": "straight" - }, - "State": "straight" - } - ], - "sensors": [ - { - "x": 8, - "y": 15 - }, - { - "x": 3, - "y": 17 - }, - { - "x": 1, - "y": 17 - }, - { - "x": 0, - "y": 16 - }, - { - "x": 0, - "y": 13 - }, { "x": 4, "y": 5 - } - ], - "signals": [], - "blocks": [ - { - "x": 11, - "y": 15, - "identifier": "B10", - "start": true, - "side": 0 - }, - { - "x": 7, - "y": 5, - "identifier": "B05", - "start": false, - "side": 0 - } - ], - "isDisabled": false, - "locked": false, - "occupied": false - }, - { - "name": "B10[+]_B06[+]", - "tracks": [ - { - "x": 10, - "y": 15 - }, - { - "x": 9, - "y": 15 - }, - { - "x": 7, - "y": 15 - }, - { - "x": 6, - "y": 15 - }, - { - "x": 2, - "y": 17 - }, - { - "x": 0, - "y": 17 - }, - { - "x": 0, - "y": 15 - }, - { - "x": 0, - "y": 14 - }, - { - "x": 0, - "y": 11 - }, - { - "x": 0, - "y": 10 - }, - { - "x": 1, - "y": 10 - }, - { - "x": 1, - "y": 8 - }, - { - "x": 1, - "y": 7 - }, - { - "x": 1, - "y": 6 - }, - { - "x": 3, - "y": 6 }, { "x": 5, - "y": 6 + "y": 5 }, { "x": 6, - "y": 6 + "y": 5 } ], "switches": [ @@ -31465,14 +31382,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -31480,15 +31397,184 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" }, "State": "turnright" }, + { + "x": 1, + "y": 5, + "Switch": { + "State": "straight" + }, + "State": "straight" + } + ], + "sensors": [ + { + "x": 8, + "y": 15 + }, + { + "x": 3, + "y": 17 + }, + { + "x": 1, + "y": 17 + }, + { + "x": 0, + "y": 16 + }, + { + "x": 0, + "y": 13 + }, { "x": 2, + "y": 5 + } + ], + "signals": [], + "blocks": [ + { + "x": 11, + "y": 15, + "identifier": "B10", + "start": true, + "side": 0 + }, + { + "x": 7, + "y": 5, + "identifier": "B05", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B10[+]_B06[+]", + "tracks": [ + { + "x": 10, + "y": 15 + }, + { + "x": 9, + "y": 15 + }, + { + "x": 7, + "y": 15 + }, + { + "x": 6, + "y": 15 + }, + { + "x": 2, + "y": 17 + }, + { + "x": 0, + "y": 17 + }, + { + "x": 0, + "y": 15 + }, + { + "x": 0, + "y": 14 + }, + { + "x": 0, + "y": 12 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 8 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 0, + "y": 6 + }, + { + "x": 3, + "y": 6 + }, + { + "x": 4, + "y": 6 + }, + { + "x": 5, + "y": 6 + }, + { + "x": 6, + "y": 6 + } + ], + "switches": [ + { + "x": 5, + "y": 16, + "Switch": { + "State": "turnleft|turnleft" + }, + "State": "turnleft|turnleft" + }, + { + "x": 5, + "y": 17, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 4, + "y": 17, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -31496,7 +31582,15 @@ "State": "turnright" }, { - "x": 2, + "x": 1, + "y": 5, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -31526,7 +31620,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 6 } ], @@ -31588,36 +31682,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 8 }, { "x": 3, "y": 8 }, + { + "x": 4, + "y": 8 + }, { "x": 5, "y": 8 @@ -31654,14 +31748,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -31669,7 +31763,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -31677,7 +31771,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -31685,7 +31779,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -31693,7 +31787,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -31723,7 +31817,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 8 } ], @@ -31785,32 +31879,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 5, "y": 7 @@ -31847,14 +31941,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -31862,7 +31956,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -31870,7 +31964,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -31878,7 +31972,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -31886,7 +31980,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -31916,7 +32010,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 7 } ], @@ -31978,36 +32072,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 4 }, { "x": 3, "y": 4 }, + { + "x": 4, + "y": 4 + }, { "x": 5, "y": 4 @@ -32044,14 +32138,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -32059,7 +32153,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -32067,7 +32161,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -32097,7 +32191,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 4 } ], @@ -32159,36 +32253,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 3 }, { "x": 3, "y": 3 }, + { + "x": 4, + "y": 3 + }, { "x": 5, "y": 3 @@ -32225,14 +32319,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -32240,7 +32334,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -32248,7 +32342,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -32256,7 +32350,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -32286,7 +32380,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 3 } ], @@ -32348,40 +32442,40 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 1 }, { - "x": 2, + "x": 1, "y": 1 }, { "x": 3, "y": 1 }, + { + "x": 4, + "y": 1 + }, { "x": 5, "y": 1 @@ -32418,14 +32512,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -32433,7 +32527,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -32441,7 +32535,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -32449,7 +32543,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -32457,7 +32551,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -32487,7 +32581,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 1 } ], @@ -32549,36 +32643,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 2 }, { "x": 3, "y": 2 }, + { + "x": 4, + "y": 2 + }, { "x": 5, "y": 2 @@ -32615,14 +32709,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -32630,7 +32724,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -32638,7 +32732,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -32646,7 +32740,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -32654,7 +32748,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -32684,7 +32778,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 2 } ], @@ -32934,7 +33028,7 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -32942,7 +33036,7 @@ }, { "x": 1, - "y": 10 + "y": 9 } ], "switches": [ @@ -32972,14 +33066,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "turnright" @@ -33088,32 +33182,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 5 }, + { + "x": 4, + "y": 5 + }, { "x": 5, "y": 5 @@ -33150,14 +33244,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -33165,7 +33259,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -33173,7 +33267,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "straight" @@ -33203,7 +33297,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 5 } ], @@ -33261,32 +33355,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 6 }, + { + "x": 4, + "y": 6 + }, { "x": 5, "y": 6 @@ -33323,14 +33417,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -33338,7 +33432,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -33346,7 +33440,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -33354,7 +33448,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -33384,7 +33478,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 6 } ], @@ -33442,36 +33536,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 8 }, { "x": 3, "y": 8 }, + { + "x": 4, + "y": 8 + }, { "x": 5, "y": 8 @@ -33508,14 +33602,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -33523,7 +33617,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -33531,7 +33625,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -33539,7 +33633,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -33547,7 +33641,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -33577,7 +33671,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 8 } ], @@ -33635,32 +33729,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 5, "y": 7 @@ -33697,14 +33791,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -33712,7 +33806,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -33720,7 +33814,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -33728,7 +33822,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -33736,7 +33830,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -33766,7 +33860,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 7 } ], @@ -33824,36 +33918,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 4 }, { "x": 3, "y": 4 }, + { + "x": 4, + "y": 4 + }, { "x": 5, "y": 4 @@ -33890,14 +33984,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -33905,7 +33999,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -33913,7 +34007,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -33943,7 +34037,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 4 } ], @@ -34001,36 +34095,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 3 }, { "x": 3, "y": 3 }, + { + "x": 4, + "y": 3 + }, { "x": 5, "y": 3 @@ -34067,14 +34161,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -34082,7 +34176,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -34090,7 +34184,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -34098,7 +34192,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -34128,7 +34222,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 3 } ], @@ -34186,40 +34280,40 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 1 }, { - "x": 2, + "x": 1, "y": 1 }, { "x": 3, "y": 1 }, + { + "x": 4, + "y": 1 + }, { "x": 5, "y": 1 @@ -34256,14 +34350,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -34271,7 +34365,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -34279,7 +34373,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -34287,7 +34381,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -34295,7 +34389,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -34325,7 +34419,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 1 } ], @@ -34383,36 +34477,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 2 }, { "x": 3, "y": 2 }, + { + "x": 4, + "y": 2 + }, { "x": 5, "y": 2 @@ -34449,14 +34543,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -34464,7 +34558,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -34472,7 +34566,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -34480,7 +34574,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -34488,7 +34582,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -34518,7 +34612,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 2 } ], @@ -34756,7 +34850,7 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -34764,7 +34858,7 @@ }, { "x": 1, - "y": 10 + "y": 9 } ], "switches": [ @@ -34786,14 +34880,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "turnright" @@ -34902,32 +34996,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 5 }, + { + "x": 4, + "y": 5 + }, { "x": 5, "y": 5 @@ -34956,14 +35050,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -34971,7 +35065,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -34979,7 +35073,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "straight" @@ -35009,7 +35103,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 5 } ], @@ -35068,32 +35162,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 6 }, + { + "x": 4, + "y": 6 + }, { "x": 5, "y": 6 @@ -35122,14 +35216,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -35137,7 +35231,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -35145,7 +35239,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -35153,7 +35247,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "turnleft" @@ -35183,7 +35277,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 6 } ], @@ -35242,36 +35336,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 8 }, { "x": 3, "y": 8 }, + { + "x": 4, + "y": 8 + }, { "x": 5, "y": 8 @@ -35300,14 +35394,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -35315,7 +35409,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -35323,7 +35417,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -35331,7 +35425,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -35339,7 +35433,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "straight" @@ -35369,7 +35463,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 8 } ], @@ -35428,32 +35522,32 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { "x": 3, "y": 7 }, + { + "x": 4, + "y": 7 + }, { "x": 5, "y": 7 @@ -35482,14 +35576,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -35497,7 +35591,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "turnright" @@ -35505,7 +35599,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 5, "Switch": { "State": "turnright" @@ -35513,7 +35607,7 @@ "State": "turnright" }, { - "x": 2, + "x": 1, "y": 6, "Switch": { "State": "straight" @@ -35521,7 +35615,7 @@ "State": "straight" }, { - "x": 2, + "x": 1, "y": 7, "Switch": { "State": "turnleft" @@ -35551,7 +35645,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 7 } ], @@ -35610,36 +35704,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 4 }, { "x": 3, "y": 4 }, + { + "x": 4, + "y": 4 + }, { "x": 5, "y": 4 @@ -35668,14 +35762,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -35683,7 +35777,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -35691,7 +35785,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "turnright" @@ -35721,7 +35815,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 4 } ], @@ -35780,36 +35874,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 3 }, { "x": 3, "y": 3 }, + { + "x": 4, + "y": 3 + }, { "x": 5, "y": 3 @@ -35838,14 +35932,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -35853,7 +35947,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -35861,7 +35955,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -35869,7 +35963,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "turnright" @@ -35899,7 +35993,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 3 } ], @@ -35958,40 +36052,40 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 1, + "x": 0, "y": 1 }, { - "x": 2, + "x": 1, "y": 1 }, { "x": 3, "y": 1 }, + { + "x": 4, + "y": 1 + }, { "x": 5, "y": 1 @@ -36020,14 +36114,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -36035,7 +36129,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -36043,7 +36137,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -36051,7 +36145,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -36059,7 +36153,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "straight" @@ -36089,7 +36183,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 1 } ], @@ -36148,36 +36242,36 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, "y": 10 }, { - "x": 1, - "y": 10 - }, - { - "x": 1, + "x": 0, "y": 8 }, { - "x": 1, + "x": 0, "y": 7 }, { - "x": 1, + "x": 0, "y": 6 }, { - "x": 2, + "x": 1, "y": 2 }, { "x": 3, "y": 2 }, + { + "x": 4, + "y": 2 + }, { "x": 5, "y": 2 @@ -36206,14 +36300,14 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "straight" @@ -36221,7 +36315,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 5, "Switch": { "State": "straight" @@ -36229,7 +36323,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 4, "Switch": { "State": "straight" @@ -36237,7 +36331,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 3, "Switch": { "State": "straight" @@ -36245,7 +36339,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 2, "Switch": { "State": "turnright" @@ -36275,7 +36369,7 @@ "y": 13 }, { - "x": 4, + "x": 2, "y": 2 } ], @@ -38186,31 +38280,27 @@ "occupied": false }, { - "name": "B09[+]_B25[+]", + "name": "B09[+]_B09[+]", "tracks": [ { - "x": 1, - "y": 10 - }, - { - "x": 0, - "y": 10 + "x": 3, + "y": 11 }, { - "x": 0, + "x": 2, "y": 11 }, { "x": 1, - "y": 12 + "y": 11 }, { - "x": 1, - "y": 13 + "x": 0, + "y": 10 }, { - "x": 2, - "y": 13 + "x": 1, + "y": 9 } ], "switches": [ @@ -38218,12 +38308,20 @@ "x": 3, "y": 9, "Switch": { - "State": "straight" + "State": "turnleft" }, - "State": "straight" + "State": "turnleft" }, { - "x": 1, + "x": 0, + "y": 11, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 0, "y": 9, "Switch": { "State": "turnright" @@ -38231,12 +38329,12 @@ "State": "turnright" }, { - "x": 0, - "y": 12, + "x": 3, + "y": 9, "Switch": { - "State": "turnleft" + "State": "straight" }, - "State": "turnleft" + "State": "straight" } ], "sensors": [ @@ -38248,12 +38346,28 @@ "x": 5, "y": 9 }, + { + "x": 3, + "y": 10 + }, { "x": 2, "y": 9 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 6, + "y": 9 } ], "signals": [ + { + "x": 4, + "y": 9 + }, { "x": 4, "y": 9 @@ -38268,10 +38382,10 @@ "side": 0 }, { - "x": 3, - "y": 13, - "identifier": "B25", - "start": false, + "x": 7, + "y": 9, + "identifier": "B09", + "start": true, "side": 0 } ], @@ -38280,47 +38394,51 @@ "occupied": false }, { - "name": "B09[+]_B13[+]", + "name": "B09[+]_B05[+]", "tracks": [ { - "x": 1, - "y": 10 + "x": 3, + "y": 11 }, { - "x": 0, - "y": 10 + "x": 2, + "y": 11 }, { - "x": 0, + "x": 1, "y": 11 }, { "x": 0, - "y": 14 + "y": 10 }, { "x": 0, - "y": 15 + "y": 8 }, { "x": 0, - "y": 17 + "y": 7 }, { - "x": 2, - "y": 17 + "x": 0, + "y": 6 + }, + { + "x": 3, + "y": 5 }, { "x": 4, - "y": 18 + "y": 5 }, { - "x": 7, - "y": 18 + "x": 5, + "y": 5 }, { - "x": 9, - "y": 18 + "x": 6, + "y": 5 } ], "switches": [ @@ -38328,37 +38446,37 @@ "x": 3, "y": 9, "Switch": { - "State": "straight" + "State": "turnleft" }, - "State": "straight" + "State": "turnleft" }, { - "x": 1, - "y": 9, + "x": 0, + "y": 11, "Switch": { - "State": "turnright" + "State": "turnleft" }, - "State": "turnright" + "State": "turnleft" }, { "x": 0, - "y": 12, + "y": 9, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 4, - "y": 17, + "x": 0, + "y": 5, "Switch": { "State": "turnright" }, "State": "turnright" }, { - "x": 5, - "y": 18, + "x": 1, + "y": 5, "Switch": { "State": "straight" }, @@ -38374,39 +38492,19 @@ "x": 5, "y": 9 }, - { - "x": 2, - "y": 9 - }, - { - "x": 0, - "y": 13 - }, - { - "x": 0, - "y": 16 - }, - { - "x": 1, - "y": 17 - }, { "x": 3, - "y": 17 + "y": 10 }, { - "x": 8, - "y": 18 + "x": 2, + "y": 5 } ], "signals": [ { "x": 4, "y": 9 - }, - { - "x": 6, - "y": 18 } ], "blocks": [ @@ -38418,9 +38516,9 @@ "side": 0 }, { - "x": 10, - "y": 18, - "identifier": "B13", + "x": 7, + "y": 5, + "identifier": "B05", "start": false, "side": 0 } @@ -38430,55 +38528,51 @@ "occupied": false }, { - "name": "B09[+]_B15[+]", + "name": "B09[+]_B06[+]", "tracks": [ { - "x": 1, - "y": 10 + "x": 3, + "y": 11 }, { - "x": 0, - "y": 10 + "x": 2, + "y": 11 }, { - "x": 0, + "x": 1, "y": 11 }, { "x": 0, - "y": 14 + "y": 10 }, { "x": 0, - "y": 15 + "y": 8 }, { "x": 0, - "y": 17 - }, - { - "x": 2, - "y": 17 + "y": 7 }, { - "x": 4, - "y": 18 + "x": 0, + "y": 6 }, { - "x": 5, - "y": 20 + "x": 3, + "y": 6 }, { - "x": 7, - "y": 20 + "x": 4, + "y": 6 }, { - "x": 9, - "y": 20 + "x": 5, + "y": 6 }, { - "x": 10, - "y": 20 + "x": 6, + "y": 6 } ], "switches": [ @@ -38486,49 +38580,49 @@ "x": 3, "y": 9, "Switch": { - "State": "straight" + "State": "turnleft" }, - "State": "straight" + "State": "turnleft" }, { - "x": 1, - "y": 9, + "x": 0, + "y": 11, "Switch": { - "State": "turnright" + "State": "turnleft" }, - "State": "turnright" + "State": "turnleft" }, { "x": 0, - "y": 12, + "y": 9, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 4, - "y": 17, + "x": 0, + "y": 5, "Switch": { "State": "turnright" }, "State": "turnright" }, { - "x": 5, - "y": 18, + "x": 1, + "y": 5, "Switch": { "State": "turnright" }, "State": "turnright" }, { - "x": 5, - "y": 19, + "x": 1, + "y": 6, "Switch": { - "State": "straight" + "State": "turnleft" }, - "State": "straight" + "State": "turnleft" } ], "sensors": [ @@ -38540,39 +38634,19 @@ "x": 5, "y": 9 }, - { - "x": 2, - "y": 9 - }, - { - "x": 0, - "y": 13 - }, - { - "x": 0, - "y": 16 - }, - { - "x": 1, - "y": 17 - }, { "x": 3, - "y": 17 + "y": 10 }, { - "x": 8, - "y": 20 + "x": 2, + "y": 6 } ], "signals": [ { "x": 4, "y": 9 - }, - { - "x": 6, - "y": 20 } ], "blocks": [ @@ -38584,9 +38658,9 @@ "side": 0 }, { - "x": 11, - "y": 20, - "identifier": "B15", + "x": 7, + "y": 6, + "identifier": "B06", "start": false, "side": 0 } @@ -38596,11 +38670,19 @@ "occupied": false }, { - "name": "B09[+]_B14[+]", + "name": "B09[+]_B08[+]", "tracks": [ + { + "x": 3, + "y": 11 + }, + { + "x": 2, + "y": 11 + }, { "x": 1, - "y": 10 + "y": 11 }, { "x": 0, @@ -38608,39 +38690,35 @@ }, { "x": 0, - "y": 11 + "y": 8 }, { "x": 0, - "y": 14 + "y": 7 }, { "x": 0, - "y": 15 + "y": 6 }, { - "x": 0, - "y": 17 + "x": 1, + "y": 8 }, { - "x": 2, - "y": 17 + "x": 3, + "y": 8 }, { "x": 4, - "y": 18 - }, - { - "x": 7, - "y": 19 + "y": 8 }, { - "x": 9, - "y": 19 + "x": 5, + "y": 8 }, { - "x": 10, - "y": 19 + "x": 6, + "y": 8 } ], "switches": [ @@ -38648,49 +38726,57 @@ "x": 3, "y": 9, "Switch": { - "State": "straight" + "State": "turnleft" }, - "State": "straight" + "State": "turnleft" }, { - "x": 1, - "y": 9, + "x": 0, + "y": 11, "Switch": { - "State": "turnright" + "State": "turnleft" }, - "State": "turnright" + "State": "turnleft" }, { "x": 0, - "y": 12, + "y": 9, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 4, - "y": 17, + "x": 0, + "y": 5, "Switch": { "State": "turnright" }, "State": "turnright" }, { - "x": 5, - "y": 18, + "x": 1, + "y": 5, "Switch": { "State": "turnright" }, "State": "turnright" }, { - "x": 5, - "y": 19, + "x": 1, + "y": 6, "Switch": { - "State": "turnleft" + "State": "straight" }, - "State": "turnleft" + "State": "straight" + }, + { + "x": 1, + "y": 7, + "Switch": { + "State": "straight" + }, + "State": "straight" } ], "sensors": [ @@ -38702,39 +38788,19 @@ "x": 5, "y": 9 }, - { - "x": 2, - "y": 9 - }, - { - "x": 0, - "y": 13 - }, - { - "x": 0, - "y": 16 - }, - { - "x": 1, - "y": 17 - }, { "x": 3, - "y": 17 + "y": 10 }, { - "x": 8, - "y": 19 + "x": 2, + "y": 8 } ], "signals": [ { "x": 4, "y": 9 - }, - { - "x": 6, - "y": 19 } ], "blocks": [ @@ -38746,9 +38812,9 @@ "side": 0 }, { - "x": 11, - "y": 19, - "identifier": "B14", + "x": 7, + "y": 8, + "identifier": "B08", "start": false, "side": 0 } @@ -38758,11 +38824,19 @@ "occupied": false }, { - "name": "B09[+]_B12[+]", + "name": "B09[+]_B07[+]", "tracks": [ + { + "x": 3, + "y": 11 + }, + { + "x": 2, + "y": 11 + }, { "x": 1, - "y": 10 + "y": 11 }, { "x": 0, @@ -38770,31 +38844,31 @@ }, { "x": 0, - "y": 11 + "y": 8 }, { "x": 0, - "y": 14 + "y": 7 }, { "x": 0, - "y": 15 + "y": 6 }, { - "x": 0, - "y": 17 + "x": 3, + "y": 7 }, { - "x": 2, - "y": 17 + "x": 4, + "y": 7 }, { - "x": 7, - "y": 17 + "x": 5, + "y": 7 }, { - "x": 9, - "y": 17 + "x": 6, + "y": 7 } ], "switches": [ @@ -38802,47 +38876,1377 @@ "x": 3, "y": 9, "Switch": { - "State": "straight" + "State": "turnleft" }, - "State": "straight" + "State": "turnleft" }, { - "x": 1, - "y": 9, + "x": 0, + "y": 11, "Switch": { - "State": "turnright" + "State": "turnleft" }, - "State": "turnright" + "State": "turnleft" }, { "x": 0, - "y": 12, + "y": 9, "Switch": { "State": "straight" }, "State": "straight" }, { - "x": 4, - "y": 17, + "x": 0, + "y": 5, "Switch": { - "State": "straight" + "State": "turnright" }, - "State": "straight" + "State": "turnright" }, { - "x": 5, - "y": 17, + "x": 1, + "y": 5, "Switch": { - "State": "straight" + "State": "turnright" }, - "State": "straight" - } - ], - "sensors": [ - { - "x": 6, - "y": 9 + "State": "turnright" + }, + { + "x": 1, + "y": 6, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 1, + "y": 7, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + } + ], + "sensors": [ + { + "x": 6, + "y": 9 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 3, + "y": 10 + }, + { + "x": 2, + "y": 7 + } + ], + "signals": [ + { + "x": 4, + "y": 9 + } + ], + "blocks": [ + { + "x": 7, + "y": 9, + "identifier": "B09", + "start": true, + "side": 0 + }, + { + "x": 7, + "y": 7, + "identifier": "B07", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B09[+]_B04[+]", + "tracks": [ + { + "x": 3, + "y": 11 + }, + { + "x": 2, + "y": 11 + }, + { + "x": 1, + "y": 11 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 8 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 0, + "y": 6 + }, + { + "x": 1, + "y": 4 + }, + { + "x": 3, + "y": 4 + }, + { + "x": 4, + "y": 4 + }, + { + "x": 5, + "y": 4 + }, + { + "x": 6, + "y": 4 + } + ], + "switches": [ + { + "x": 3, + "y": 9, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 5, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 4, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + } + ], + "sensors": [ + { + "x": 6, + "y": 9 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 3, + "y": 10 + }, + { + "x": 2, + "y": 4 + } + ], + "signals": [ + { + "x": 4, + "y": 9 + } + ], + "blocks": [ + { + "x": 7, + "y": 9, + "identifier": "B09", + "start": true, + "side": 0 + }, + { + "x": 7, + "y": 4, + "identifier": "B04", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B09[+]_B03[+]", + "tracks": [ + { + "x": 3, + "y": 11 + }, + { + "x": 2, + "y": 11 + }, + { + "x": 1, + "y": 11 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 8 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 0, + "y": 6 + }, + { + "x": 1, + "y": 3 + }, + { + "x": 3, + "y": 3 + }, + { + "x": 4, + "y": 3 + }, + { + "x": 5, + "y": 3 + }, + { + "x": 6, + "y": 3 + } + ], + "switches": [ + { + "x": 3, + "y": 9, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 5, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 4, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 3, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + } + ], + "sensors": [ + { + "x": 6, + "y": 9 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 3, + "y": 10 + }, + { + "x": 2, + "y": 3 + } + ], + "signals": [ + { + "x": 4, + "y": 9 + } + ], + "blocks": [ + { + "x": 7, + "y": 9, + "identifier": "B09", + "start": true, + "side": 0 + }, + { + "x": 7, + "y": 3, + "identifier": "B03", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B09[+]_B01[+]", + "tracks": [ + { + "x": 3, + "y": 11 + }, + { + "x": 2, + "y": 11 + }, + { + "x": 1, + "y": 11 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 8 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 0, + "y": 6 + }, + { + "x": 0, + "y": 1 + }, + { + "x": 1, + "y": 1 + }, + { + "x": 3, + "y": 1 + }, + { + "x": 4, + "y": 1 + }, + { + "x": 5, + "y": 1 + }, + { + "x": 6, + "y": 1 + } + ], + "switches": [ + { + "x": 3, + "y": 9, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 5, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 4, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 3, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 2, + "Switch": { + "State": "straight" + }, + "State": "straight" + } + ], + "sensors": [ + { + "x": 6, + "y": 9 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 3, + "y": 10 + }, + { + "x": 2, + "y": 1 + } + ], + "signals": [ + { + "x": 4, + "y": 9 + } + ], + "blocks": [ + { + "x": 7, + "y": 9, + "identifier": "B09", + "start": true, + "side": 0 + }, + { + "x": 7, + "y": 1, + "identifier": "B01", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B09[+]_B02[+]", + "tracks": [ + { + "x": 3, + "y": 11 + }, + { + "x": 2, + "y": 11 + }, + { + "x": 1, + "y": 11 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 8 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 0, + "y": 6 + }, + { + "x": 1, + "y": 2 + }, + { + "x": 3, + "y": 2 + }, + { + "x": 4, + "y": 2 + }, + { + "x": 5, + "y": 2 + }, + { + "x": 6, + "y": 2 + } + ], + "switches": [ + { + "x": 3, + "y": 9, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 5, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 4, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 3, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 2, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + } + ], + "sensors": [ + { + "x": 6, + "y": 9 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 3, + "y": 10 + }, + { + "x": 2, + "y": 2 + } + ], + "signals": [ + { + "x": 4, + "y": 9 + } + ], + "blocks": [ + { + "x": 7, + "y": 9, + "identifier": "B09", + "start": true, + "side": 0 + }, + { + "x": 7, + "y": 2, + "identifier": "B02", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B09[+]_B09[+]", + "tracks": [ + { + "x": 1, + "y": 9 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 1, + "y": 11 + }, + { + "x": 2, + "y": 11 + }, + { + "x": 3, + "y": 11 + } + ], + "switches": [ + { + "x": 3, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + }, + { + "x": 3, + "y": 9, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + } + ], + "sensors": [ + { + "x": 6, + "y": 9 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 2, + "y": 9 + }, + { + "x": 3, + "y": 10 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 6, + "y": 9 + } + ], + "signals": [ + { + "x": 4, + "y": 9 + }, + { + "x": 4, + "y": 9 + } + ], + "blocks": [ + { + "x": 7, + "y": 9, + "identifier": "B09", + "start": true, + "side": 0 + }, + { + "x": 7, + "y": 9, + "identifier": "B09", + "start": true, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B09[+]_B13[+]", + "tracks": [ + { + "x": 1, + "y": 9 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 12 + }, + { + "x": 0, + "y": 14 + }, + { + "x": 0, + "y": 15 + }, + { + "x": 0, + "y": 17 + }, + { + "x": 2, + "y": 17 + }, + { + "x": 4, + "y": 18 + }, + { + "x": 7, + "y": 18 + }, + { + "x": 9, + "y": 18 + } + ], + "switches": [ + { + "x": 3, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 4, + "y": 17, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 5, + "y": 18, + "Switch": { + "State": "straight" + }, + "State": "straight" + } + ], + "sensors": [ + { + "x": 6, + "y": 9 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 2, + "y": 9 + }, + { + "x": 0, + "y": 13 + }, + { + "x": 0, + "y": 16 + }, + { + "x": 1, + "y": 17 + }, + { + "x": 3, + "y": 17 + }, + { + "x": 8, + "y": 18 + } + ], + "signals": [ + { + "x": 4, + "y": 9 + }, + { + "x": 6, + "y": 18 + } + ], + "blocks": [ + { + "x": 7, + "y": 9, + "identifier": "B09", + "start": true, + "side": 0 + }, + { + "x": 10, + "y": 18, + "identifier": "B13", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B09[+]_B15[+]", + "tracks": [ + { + "x": 1, + "y": 9 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 12 + }, + { + "x": 0, + "y": 14 + }, + { + "x": 0, + "y": 15 + }, + { + "x": 0, + "y": 17 + }, + { + "x": 2, + "y": 17 + }, + { + "x": 4, + "y": 18 + }, + { + "x": 5, + "y": 20 + }, + { + "x": 7, + "y": 20 + }, + { + "x": 9, + "y": 20 + }, + { + "x": 10, + "y": 20 + } + ], + "switches": [ + { + "x": 3, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 4, + "y": 17, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 5, + "y": 18, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 5, + "y": 19, + "Switch": { + "State": "straight" + }, + "State": "straight" + } + ], + "sensors": [ + { + "x": 6, + "y": 9 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 2, + "y": 9 + }, + { + "x": 0, + "y": 13 + }, + { + "x": 0, + "y": 16 + }, + { + "x": 1, + "y": 17 + }, + { + "x": 3, + "y": 17 + }, + { + "x": 8, + "y": 20 + } + ], + "signals": [ + { + "x": 4, + "y": 9 + }, + { + "x": 6, + "y": 20 + } + ], + "blocks": [ + { + "x": 7, + "y": 9, + "identifier": "B09", + "start": true, + "side": 0 + }, + { + "x": 11, + "y": 20, + "identifier": "B15", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B09[+]_B14[+]", + "tracks": [ + { + "x": 1, + "y": 9 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 12 + }, + { + "x": 0, + "y": 14 + }, + { + "x": 0, + "y": 15 + }, + { + "x": 0, + "y": 17 + }, + { + "x": 2, + "y": 17 + }, + { + "x": 4, + "y": 18 + }, + { + "x": 7, + "y": 19 + }, + { + "x": 9, + "y": 19 + }, + { + "x": 10, + "y": 19 + } + ], + "switches": [ + { + "x": 3, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 4, + "y": 17, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 5, + "y": 18, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 5, + "y": 19, + "Switch": { + "State": "turnleft" + }, + "State": "turnleft" + } + ], + "sensors": [ + { + "x": 6, + "y": 9 + }, + { + "x": 5, + "y": 9 + }, + { + "x": 2, + "y": 9 + }, + { + "x": 0, + "y": 13 + }, + { + "x": 0, + "y": 16 + }, + { + "x": 1, + "y": 17 + }, + { + "x": 3, + "y": 17 + }, + { + "x": 8, + "y": 19 + } + ], + "signals": [ + { + "x": 4, + "y": 9 + }, + { + "x": 6, + "y": 19 + } + ], + "blocks": [ + { + "x": 7, + "y": 9, + "identifier": "B09", + "start": true, + "side": 0 + }, + { + "x": 11, + "y": 19, + "identifier": "B14", + "start": false, + "side": 0 + } + ], + "isDisabled": false, + "locked": false, + "occupied": false + }, + { + "name": "B09[+]_B12[+]", + "tracks": [ + { + "x": 1, + "y": 9 + }, + { + "x": 0, + "y": 10 + }, + { + "x": 0, + "y": 12 + }, + { + "x": 0, + "y": 14 + }, + { + "x": 0, + "y": 15 + }, + { + "x": 0, + "y": 17 + }, + { + "x": 2, + "y": 17 + }, + { + "x": 7, + "y": 17 + }, + { + "x": 9, + "y": 17 + } + ], + "switches": [ + { + "x": 3, + "y": 9, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 0, + "y": 9, + "Switch": { + "State": "turnright" + }, + "State": "turnright" + }, + { + "x": 0, + "y": 11, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 4, + "y": 17, + "Switch": { + "State": "straight" + }, + "State": "straight" + }, + { + "x": 5, + "y": 17, + "Switch": { + "State": "straight" + }, + "State": "straight" + } + ], + "sensors": [ + { + "x": 6, + "y": 9 }, { "x": 5, @@ -38908,7 +40312,7 @@ "tracks": [ { "x": 1, - "y": 10 + "y": 9 }, { "x": 0, @@ -38916,7 +40320,7 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -38961,7 +40365,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "turnright" @@ -38970,7 +40374,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, @@ -39066,7 +40470,7 @@ "tracks": [ { "x": 1, - "y": 10 + "y": 9 }, { "x": 0, @@ -39074,7 +40478,7 @@ }, { "x": 0, - "y": 11 + "y": 12 }, { "x": 0, @@ -39115,7 +40519,7 @@ "State": "straight" }, { - "x": 1, + "x": 0, "y": 9, "Switch": { "State": "turnright" @@ -39124,7 +40528,7 @@ }, { "x": 0, - "y": 12, + "y": 11, "Switch": { "State": "straight" }, diff --git a/Workspaces/Basement/statistics.json b/Workspaces/Basement/statistics.json index 45186461..d51cd1f1 100644 --- a/Workspaces/Basement/statistics.json +++ b/Workspaces/Basement/statistics.json @@ -172,5 +172,20 @@ "objectId": 1000, "durations": [], "touches": [] + }, + { + "objectId": 1007, + "durations": [], + "touches": [] + }, + { + "objectId": 1011, + "durations": [], + "touches": [] + }, + { + "objectId": 1015, + "durations": [], + "touches": [] } ] \ No newline at end of file diff --git a/ecoslibNet48/Entities/Locomotive.cs b/ecoslibNet48/Entities/Locomotive.cs index 44d70d5e..ec6446a0 100644 --- a/ecoslibNet48/Entities/Locomotive.cs +++ b/ecoslibNet48/Entities/Locomotive.cs @@ -345,6 +345,8 @@ public override bool Parse(List arguments) } else if (arg.Name.Equals("funcset", StringComparison.OrdinalIgnoreCase)) { + if (arg.Parameter.Count == 0) continue; + NrOfFunctions = arg.Parameter[0].Length; var usedFncs = 0; for (var i = 0; i < Funcset.Count; ++i) @@ -376,6 +378,8 @@ public override bool Parse(List arguments) { try { + if (arg.Parameter.Count == 0) continue; + var idx = Convert.ToInt32(arg.Parameter[0]); var currentValue = Funcset[idx]; var newValue = arg.Parameter[1].Equals("1", StringComparison.OrdinalIgnoreCase); @@ -391,9 +395,9 @@ public override bool Parse(List arguments) } else if (arg.Name.Equals("profile", StringComparison.OrdinalIgnoreCase)) { + if (arg.Parameter.Count == 0) continue; if (Profile.Equals(arg.Parameter[0])) continue; _hasChanged = true; - Profile = arg.Parameter[0]; } else diff --git a/railessentials/WebServer.cs b/railessentials/WebServer.cs index 8a132219..461e4352 100644 --- a/railessentials/WebServer.cs +++ b/railessentials/WebServer.cs @@ -217,6 +217,12 @@ private void HandleRequest(object state) return; } + // + // cleanup image filenames + // + if (fileName.IsImageFileExtension()) + fileName.RemoveInvalidFileNameChars(); + var fullFilePath = Path.Combine(RootDir, fileName).Replace("/", "\\"); var decodedFullFilePath = Uri.UnescapeDataString(fullFilePath); var lastIdx = decodedFullFilePath.LastIndexOf("?r=", StringComparison.OrdinalIgnoreCase); @@ -262,7 +268,7 @@ private string GenerateReport() var stats = Statistics.Instance(Globals.GetCfgDataPath("Statistics"), null); var reportGenerator = new Report.Report(_sniffer, _metadata, stats); var res = reportGenerator.Generate(fullFilePath, out var errorMessage); - if(!res) + if (!res) { var sb = new StringBuilder(); sb.AppendLine($"{errorMessage}"); diff --git a/railessentials/railessentials.json b/railessentials/railessentials.json index f38fdf91..83856ff2 100644 --- a/railessentials/railessentials.json +++ b/railessentials/railessentials.json @@ -1,5 +1,5 @@ { - "SimulationMode": true, + "SimulationMode": false, "SimulationData": "Demos\\Ecos\\ecosJson.txt", "RootWorkspace": "Workspaces\\", "RecentWorkspace": "Basement", @@ -15,7 +15,7 @@ } ], "Ecos": { - "Ip": "192.168.178.61", + "Ip": "192.168.178.119", "Port": 15471 }, "Mqtt": {