openatc-components 0.5.42 → 0.5.44

package/src/kisscomps/components/IntersectionMap/crossDirection/posJson/busPos.left.json

@@ -1,196 +1,196 @@
-{
-  "busphases": [{
-      "id": 1,
-      "name": "东直行",
-      "x": "645px",
-      "y": "359px"
-    },
-    {
-      "id": 2,
-      "name": "东左转",
-      "x": "645px",
-      "y": "388px"
-    },
-    {
-      "id": 3,
-      "name": "东右转",
-      "x": "645px",
-      "y": "330px"
-    },
-    {
-      "id": 4,
-      "name": "东掉头",
-      "x": "645px",
-      "y": "300px"
-    },
-    {
-      "id": 5,
-      "name": "西直行",
-      "x": "196px",
-      "y": "267px"
-    },
-    {
-      "id": 6,
-      "name": "西左转",
-      "x": "196px",
-      "y": "238px"
-    },
-    {
-      "id": 7,
-      "name": "西右转",
-      "x": "196px",
-      "y": "297px"
-    },
-    {
-      "id": 8,
-      "name": "西掉头",
-      "x": "196px",
-      "y": "327px"
-    },
-    {
-      "id": 9,
-      "name": "北直行",
-      "x": "471px",
-      "y": "85px"
-    },
-    {
-      "id": 10,
-      "name": "北左转",
-      "x": "500px",
-      "y": "85px"
-    },
-    {
-      "id": 11,
-      "name": "北右转",
-      "x": "442px",
-      "y": "85px"
-    },
-    {
-      "id": 12,
-      "name": "北掉头",
-      "x": "412px",
-      "y": "85px"
-    },
-    {
-      "id": 13,
-      "name": "南直行",
-      "x": "379px",
-      "y": "534px"
-    },
-    {
-      "id": 14,
-      "name": "南左转",
-      "x": "349px",
-      "y": "534px"
-    },
-    {
-      "id": 15,
-      "name": "南右转",
-      "x": "408px",
-      "y": "534px"
-    },
-    {
-      "id": 16,
-      "name": "南掉头",
-      "x": "438px",
-      "y": "534px"
-    }
-  ],
-  "busMap": [{
-    "id": 1,
-    "name": "东直行",
-    "x": "638px",
-    "y": "358px"
-  },
-  {
-    "id": 2,
-    "name": "东左转",
-    "x": "638px",
-    "y": "386px"
-  },
-  {
-    "id": 3,
-    "name": "东右转",
-    "x": "638px",
-    "y": "329px"
-  },
-  {
-    "id": 4,
-    "name": "东掉头",
-    "x": "638px",
-    "y": "300px"
-  },
-  {
-    "id": 5,
-    "name": "西直行",
-    "x": "145px",
-    "y": "266px"
-  },
-  {
-    "id": 6,
-    "name": "西左转",
-    "x": "145px",
-    "y": "236px"
-  },
-  {
-    "id": 7,
-    "name": "西右转",
-    "x": "145px",
-    "y": "295px"
-  },
-  {
-    "id": 8,
-    "name": "西掉头",
-    "x": "145px",
-    "y": "325px"
-  },
-  {
-    "id": 9,
-    "name": "北直行",
-    "x": "469px",
-    "y": "34px"
-  },
-  {
-    "id": 10,
-    "name": "北左转",
-    "x": "497px",
-    "y": "34px"
-  },
-  {
-    "id": 11,
-    "name": "北右转",
-    "x": "440px",
-    "y": "34px"
-  },
-  {
-    "id": 12,
-    "name": "北掉头",
-    "x": "410px",
-    "y": "34px"
-  },
-  {
-    "id": 13,
-    "name": "南直行",
-    "x": "377px",
-    "y": "526px"
-  },
-  {
-    "id": 14,
-    "name": "南左转",
-    "x": "349px",
-    "y": "526px"
-  },
-  {
-    "id": 15,
-    "name": "南右转",
-    "x": "406px",
-    "y": "526px"
-  },
-  {
-    "id": 16,
-    "name": "南掉头",
-    "x": "436px",
-    "y": "526px"
-  }
-]
-}
+{
+  "busphases": [{
+      "id": 1,
+      "name": "东直行",
+      "x": "645px",
+      "y": "359px"
+    },
+    {
+      "id": 2,
+      "name": "东左转",
+      "x": "645px",
+      "y": "388px"
+    },
+    {
+      "id": 3,
+      "name": "东右转",
+      "x": "645px",
+      "y": "330px"
+    },
+    {
+      "id": 4,
+      "name": "东掉头",
+      "x": "645px",
+      "y": "300px"
+    },
+    {
+      "id": 5,
+      "name": "西直行",
+      "x": "196px",
+      "y": "267px"
+    },
+    {
+      "id": 6,
+      "name": "西左转",
+      "x": "196px",
+      "y": "238px"
+    },
+    {
+      "id": 7,
+      "name": "西右转",
+      "x": "196px",
+      "y": "297px"
+    },
+    {
+      "id": 8,
+      "name": "西掉头",
+      "x": "196px",
+      "y": "327px"
+    },
+    {
+      "id": 9,
+      "name": "北直行",
+      "x": "471px",
+      "y": "85px"
+    },
+    {
+      "id": 10,
+      "name": "北左转",
+      "x": "500px",
+      "y": "85px"
+    },
+    {
+      "id": 11,
+      "name": "北右转",
+      "x": "442px",
+      "y": "85px"
+    },
+    {
+      "id": 12,
+      "name": "北掉头",
+      "x": "412px",
+      "y": "85px"
+    },
+    {
+      "id": 13,
+      "name": "南直行",
+      "x": "379px",
+      "y": "534px"
+    },
+    {
+      "id": 14,
+      "name": "南左转",
+      "x": "349px",
+      "y": "534px"
+    },
+    {
+      "id": 15,
+      "name": "南右转",
+      "x": "408px",
+      "y": "534px"
+    },
+    {
+      "id": 16,
+      "name": "南掉头",
+      "x": "438px",
+      "y": "534px"
+    }
+  ],
+  "busMap": [{
+    "id": 1,
+    "name": "东直行",
+    "x": "638px",
+    "y": "358px"
+  },
+  {
+    "id": 2,
+    "name": "东左转",
+    "x": "638px",
+    "y": "386px"
+  },
+  {
+    "id": 3,
+    "name": "东右转",
+    "x": "638px",
+    "y": "329px"
+  },
+  {
+    "id": 4,
+    "name": "东掉头",
+    "x": "638px",
+    "y": "300px"
+  },
+  {
+    "id": 5,
+    "name": "西直行",
+    "x": "145px",
+    "y": "266px"
+  },
+  {
+    "id": 6,
+    "name": "西左转",
+    "x": "145px",
+    "y": "236px"
+  },
+  {
+    "id": 7,
+    "name": "西右转",
+    "x": "145px",
+    "y": "295px"
+  },
+  {
+    "id": 8,
+    "name": "西掉头",
+    "x": "145px",
+    "y": "325px"
+  },
+  {
+    "id": 9,
+    "name": "北直行",
+    "x": "469px",
+    "y": "34px"
+  },
+  {
+    "id": 10,
+    "name": "北左转",
+    "x": "497px",
+    "y": "34px"
+  },
+  {
+    "id": 11,
+    "name": "北右转",
+    "x": "440px",
+    "y": "34px"
+  },
+  {
+    "id": 12,
+    "name": "北掉头",
+    "x": "410px",
+    "y": "34px"
+  },
+  {
+    "id": 13,
+    "name": "南直行",
+    "x": "377px",
+    "y": "526px"
+  },
+  {
+    "id": 14,
+    "name": "南左转",
+    "x": "349px",
+    "y": "526px"
+  },
+  {
+    "id": 15,
+    "name": "南右转",
+    "x": "406px",
+    "y": "526px"
+  },
+  {
+    "id": 16,
+    "name": "南掉头",
+    "x": "436px",
+    "y": "526px"
+  }
+]
+}

package/src/kisscomps/components/IntersectionMap/crossDirection/posJson/phasePos.json

@@ -5,7 +5,9 @@
       "ename": "East-Straight",
       "commonname": "openatccomponents.overview.es",
       "x": "588px",
-      "y": "267px"
+      "y": "267px",
+      "lightx": "658px",
+      "lighty": "269px"
     },
     {
       "id": 2,
@@ -13,7 +15,9 @@
       "ename": "East-Left",
       "commonname": "openatccomponents.overview.el",
       "x": "588px",
-      "y": "297px"
+      "y": "297px",
+      "lightx": "658px",
+      "lighty": "297px"
     },
     {
       "id": 3,
@@ -21,7 +25,9 @@
       "ename": "East-Right",
       "commonname": "openatccomponents.overview.er",
       "x": "588px",
-      "y": "238px"
+      "y": "238px",
+      "lightx": "658px",
+      "lighty": "240px"
     },
     {
       "id": 4,
@@ -29,7 +35,9 @@
       "ename": "East-Back",
       "commonname": "openatccomponents.overview.eb",
       "x": "628px",
-      "y": "297px"
+      "y": "297px",
+      "lightx": "658px",
+      "lighty": "297px"
     },
     {
       "id": 5,
@@ -37,7 +45,9 @@
       "ename": "West-Straight",
       "commonname": "openatccomponents.overview.ws",
       "x": "244px",
-      "y": "359px"
+      "y": "359px",
+      "lightx": "188px",
+      "lighty": "361px"
     },
     {
       "id": 6,
@@ -45,7 +55,9 @@
       "ename": "West-Left",
       "commonname": "openatccomponents.overview.wl",
       "x": "244px",
-      "y": "329px"
+      "y": "329px",
+      "lightx": "188px",
+      "lighty": "332px"
     },
     {
       "id": 7,
@@ -53,7 +65,9 @@
       "ename": "West-Right",
       "commonname": "openatccomponents.overview.wr",
       "x": "244px",
-      "y": "388px"
+      "y": "388px",
+      "lightx": "188px",
+      "lighty": "390px"
     },
     {
       "id": 8,
@@ -61,7 +75,9 @@
       "ename": "West-Back",
       "commonname": "openatccomponents.overview.wb",
       "x": "204px",
-      "y": "329px"
+      "y": "329px",
+      "lightx": "188px",
+      "lighty": "332px"
     },
     {
       "id": 9,
@@ -69,7 +85,9 @@
       "ename": "North-Straight",
       "commonname": "openatccomponents.overview.ns",
       "x": "379px",
-      "y": "134px"
+      "y": "134px",
+      "lightx": "380px",
+      "lighty": "75px"
     },
     {
       "id": 10,
@@ -77,7 +95,9 @@
       "ename": "North-Left",
       "commonname": "openatccomponents.overview.nl",
       "x": "408px",
-      "y": "134px"
+      "y": "134px",
+      "lightx": "410px",
+      "lighty": "75px"
     },
     {
       "id": 11,
@@ -85,7 +105,9 @@
       "ename": "North-Right",
       "commonname": "openatccomponents.overview.nr",
       "x": "348px",
-      "y": "134px"
+      "y": "134px",
+      "lightx": "352px",
+      "lighty": "75px"
     },
     {
       "id": 12,
@@ -93,7 +115,9 @@
       "ename": "North-Back",
       "commonname": "openatccomponents.overview.nb",
       "x": "408px",
-      "y": "94px"
+      "y": "94px",
+      "lightx": "410px",
+      "lighty": "75px"
     },
     {
       "id": 13,
@@ -101,7 +125,9 @@
       "ename": "South-Straight",
       "commonname": "openatccomponents.overview.ss",
       "x": "470px",
-      "y": "476px"
+      "y": "476px",
+      "lightx": "473px",
+      "lighty": "553px"
     },
     {
       "id": 14,
@@ -109,7 +135,9 @@
       "ename": "South-Left",
       "commonname": "openatccomponents.overview.sl",
       "x": "440px",
-      "y": "476px"
+      "y": "476px",
+      "lightx": "444px",
+      "lighty": "553px"
     },
     {
       "id": 15,
@@ -117,7 +145,9 @@
       "ename": "South-Right",
       "commonname": "openatccomponents.overview.sr",
       "x": "500px",
-      "y": "476px"
+      "y": "476px",
+      "lightx": "501px",
+      "lighty": "553px"
     },
     {
       "id": 16,
@@ -125,7 +155,9 @@
       "ename": "South-Back",
       "commonname": "openatccomponents.overview.sb",
       "x": "440px",
-      "y": "516px"
+      "y": "516px",
+      "lightx": "444px",
+      "lighty": "553px"
     }
   ]
-}
+}

package/src/kisscomps/components/IntersectionMap/crossDirection/posJson/rampPos.json

@@ -1,52 +1,52 @@
-{
-  "rampMainPhaseList": [{
-      "id": 1,
-      "name": "东直行",
-      "x": "608px",
-      "y": "380px"
-    },
-    {
-      "id": 5,
-      "name": "西直行",
-      "x": "187px",
-      "y": "195px"
-    },
-    {
-      "id": 9,
-      "name": "北直行",
-      "x": "490px",
-      "y": "187px"
-    },
-    {
-      "id": 13,
-      "name": "南直行",
-      "x": "305px",
-      "y": "387px"
-    }
-  ],
-  "rampSidePhaseList": [{
-    "id": 1,
-    "name": "东支路",
-    "x": "648px",
-    "y": "197px"
-  },
-  {
-    "id": 5,
-    "name": "西支路",
-    "x": "147px",
-    "y": "377px"
-  },
-  {
-    "id": 9,
-    "name": "北支路",
-    "x": "307px",
-    "y": "147px"
-  },
-  {
-    "id": 13,
-    "name": "南支路",
-    "x": "488px",
-    "y": "428px"
-  }
-]
-}
+{
+  "rampMainPhaseList": [{
+      "id": 1,
+      "name": "东直行",
+      "x": "608px",
+      "y": "380px"
+    },
+    {
+      "id": 5,
+      "name": "西直行",
+      "x": "187px",
+      "y": "195px"
+    },
+    {
+      "id": 9,
+      "name": "北直行",
+      "x": "490px",
+      "y": "187px"
+    },
+    {
+      "id": 13,
+      "name": "南直行",
+      "x": "305px",
+      "y": "387px"
+    }
+  ],
+  "rampSidePhaseList": [{
+    "id": 1,
+    "name": "东支路",
+    "x": "648px",
+    "y": "197px"
+  },
+  {
+    "id": 5,
+    "name": "西支路",
+    "x": "147px",
+    "y": "377px"
+  },
+  {
+    "id": 9,
+    "name": "北支路",
+    "x": "307px",
+    "y": "147px"
+  },
+  {
+    "id": 13,
+    "name": "南支路",
+    "x": "488px",
+    "y": "428px"
+  }
+]
+}

package/src/kisscomps/components/IntersectionMap/crossDirection/utils.js

@@ -57,6 +57,13 @@ export default class PhaseDataModel {
       if (phase.desc) {
         value.desc = phase.desc
       }
+      // 车道灯图标坐标
+      if (phase.lightx) {
+        value.lightx = phase.lightx
+      }
+      if (phase.lighty) {
+        value.lighty = phase.lighty
+      }
       phaseMap.set(phase.id, value)
     })
   }