diff --git a/src/electronicMap_graphic_data.proto b/src/electronicMap_graphic_data.proto index 83742ac..385c341 100644 --- a/src/electronicMap_graphic_data.proto +++ b/src/electronicMap_graphic_data.proto @@ -12,7 +12,9 @@ message ElectronicMapGraphicStorage { repeated Turnout turnouts = 6; repeated Signal signals = 7; repeated AxleCounting axleCountings = 8; - GenerateAxleCountingConfig generateAxleCountingConfig = 9;//一键生成计轴的配置 + repeated LogicSection logicSections = 9; + repeated ConcentrationDividingLine concentrationDividingLines = 10; // 集中区分割线 + GenerateAxleCountingConfig generateAxleCountingConfig = 11;//一键生成计轴的配置 } message Station { @@ -76,6 +78,13 @@ message Section { repeated uint32 centralizedStations = 14; // 集中站Id列表 } +/** 逻辑区段 */ +message LogicSection { + common.CommonInfo common = 1; + string code = 2; + repeated common.Point points = 3; +} + message Turnout { enum SwitchMachineType { @@ -140,6 +149,21 @@ message AxleCounting { repeated uint32 centralizedStations = 6; // 集中站Id列表 } +message ConcentrationDividingLine { + common.CommonInfo common = 1; + string code = 2; // 编号 + repeated common.Point points = 3; // 点列表 + repeated NodeConWithSec nodeConWithSecs = 4;// 集中区分割线与区段的交点 + bool isOtherLineConcentrationDividingLine = 5;//集中区分割线绘制在其它线的边界处 + uint32 refLeftStationId = 6;//左边关联的集中站id + uint32 refRightStationId = 7;//右边关联的集中站id +} + +message NodeConWithSec { + RelatedRef leftSection = 1; + RelatedRef rightSection = 2; +} + /** 上下行(区段/信号机) */ enum Direction { UP = 0;