Merge remote-tracking branch 'origin/master'

protos/device_info.proto

@@ -26,7 +26,7 @@ message Section {
 }
 
 // 道岔
-message Switch {
+message Turnout {
 
   string id = 1;
 

protos/device_status.proto

@@ -12,11 +12,10 @@ enum DeviceType{
   TRACK = 5;
   ENTRY = 6;
   PLATFORM = 7;
-  SCADA = 8;
-  WATERPROOF_DOOR = 9;
-  WORK_AREA = 10;
-  GAMA = 11;
-
+  SCADA = 9;
+  WATERPROOF_DOOR = 11;
+  WORK_AREA = 12;
+  GAMA = 13;
 }
 
 message Rtu {
@@ -94,33 +93,33 @@ message Entry{
 }
 
 message Switch {
-  bool ipSingleSwitchStusCiOccupied = 1;
-  bool ipSingleSwitchStusCbtcOccupied = 2;
-  bool ipSingleSwitchStusLocked = 3;
-  bool ipSingleSwitchStusFailLocked = 4;
-  bool ipSingleSwitchStusNormal = 5;
-  bool ipSingleSwitchStusReverse = 6;
-  bool ipSingleSwitchStusBlocked1 = 7;
-  bool ipSingleSwitchStusJammed = 8;
-  bool ipSingleSwitchStusExpectLock = 9;
-  bool ipSingleSwitchStusExpectUnlock = 10;
-  bool ipSingleSwitchStusExpectNormal = 11;
-  bool ipSingleSwitchStusExpectReverse = 12;
-  bool ipSingleSwitchStusExpectBlock = 13;
-  bool ipSingleSwitchStusExpectUnblock = 14;
-  bool ipSingleSwitchStusInRoute = 15;
-  bool ipSingleSwitchStusManualMode = 16;
-  bool ipSingleSwitchStusCut = 17;
-  bool ipSingleSwitchStusAtcInvalid = 18;
-  bool ipSingleSwitchStusOverlap = 19;
-  bool ipSingleSwitchStusTsrCbtcMain = 20;
-  bool ipSingleSwitchStusTsrCbtcNormal = 21;
-  bool ipSingleSwitchStusTsrCbtcReverse = 22;
-  bool ipSingleSwitchStusTsrBmMain = 23;
-  bool ipSingleSwitchStusTsrBmNormal = 24;
-  bool ipSingleSwitchStusTsrBmReverse = 25;
-  bool ipSingleSwitchStusBlocked2 = 26;
-  bool ipSingleSwitchStusLostIndication = 27;
+  bool ipSingleSwitchStusCiOccupied = 1;      // 连锁报告道岔占用
+  bool ipSingleSwitchStusCbtcOccupied = 2;    // CBTC报告道岔占用
+  bool ipSingleSwitchStusLocked = 3;          // 道岔锁闭
+  bool ipSingleSwitchStusFailLocked = 4;      // 道岔故障锁闭
+  bool ipSingleSwitchStusNormal = 5;          // 定位
+  bool ipSingleSwitchStusReverse = 6;         // 反位
+  bool ipSingleSwitchStusBlocked1 = 7;        // 单锁
+  bool ipSingleSwitchStusJammed = 8;          // 挤岔
+  // bool ipSingleSwitchStusExpectLock = 9;      // 期望锁闭
+  // bool ipSingleSwitchStusExpectUnlock = 10;   // 期望锁闭解除
+  // bool ipSingleSwitchStusExpectNormal = 11;   // 期望道岔定位
+  // bool ipSingleSwitchStusExpectReverse = 12;  // 期望道岔反位
+  // bool ipSingleSwitchStusExpectBlock = 13;    // 期望道岔单锁
+  // bool ipSingleSwitchStusExpectUnblock = 14;  // 期望道岔解除单锁
+  // bool ipSingleSwitchStusInRoute = 15;        // 是否在进路中锁闭
+  // bool ipSingleSwitchStusManualMode = 16;     // 道岔为手动操作模式
+  bool ipSingleSwitchStusCut = 17;            // 道岔切除
+  bool ipSingleSwitchStusAtcInvalid = 18;     // 道岔区段被ATC报告失效
+  bool ipSingleSwitchStusOverlap = 19;        // OVERLAP
+  bool ipSingleSwitchStusTsrCbtcMain = 20;    // CBTC岔前限速
+  bool ipSingleSwitchStusTsrCbtcNormal = 21;  // CBTC定位限速
+  bool ipSingleSwitchStusTsrCbtcReverse = 22; // CBTC反位限速
+  bool ipSingleSwitchStusTsrBmMain = 23;      // BM岔前限速
+  bool ipSingleSwitchStusTsrBmNormal = 24;    // BM定位限速
+  bool ipSingleSwitchStusTsrBmReverse = 25;   // BM反位限速
+  bool ipSingleSwitchStusBlocked2 = 26;       // 道岔封锁
+  bool ipSingleSwitchStusLostIndication = 27; // 道岔失表示
   //设备唯一识别码，一般为设备名称
   string id = 28;
   //限速值KM/H
@@ -262,6 +261,3 @@ message OccNccFepNetwork{
   // false 代表断开
   bool active = 2;
 }
-
-
-

protos/stationLayoutGraphics.proto

@@ -200,10 +200,10 @@ message Section {
   CommonInfo common = 1;
   string code = 2;
   repeated Point points = 3;
-  RelatedRef paRef = 4;        // 区段A端关联的设备
-  RelatedRef pbRef = 5;        // 区段B端关联的设备
+  RelatedRef paRef = 4;              // 区段A端关联的设备(非岔区)
+  RelatedRef pbRef = 5;              // 区段B端关联的设备(非岔区)
   SectionType sectionType = 6;       // 区段类型
-  repeated string children = 7; // 物理区段的下属逻辑区段/道岔物理区段的下属道岔
+  repeated string axleCountings = 7; // 关联的计轴
 }
 
 message KilometerPoint {
@@ -218,6 +218,7 @@ message PathLine {
   repeated Point points = 3;
   bool isUp = 4;
   repeated KilometerPoint kilometerPoints = 5;
+  bool aToB = 6;
 }
 
 //关联设备