diff --git a/public/drawIcon.svg b/public/drawIcon.svg
index b214fc1..5fff84a 100644
--- a/public/drawIcon.svg
+++ b/public/drawIcon.svg
@@ -32,11 +32,6 @@
-
-
-
-
-
@@ -83,7 +78,7 @@
-
+
diff --git a/rts-sim-testing-message b/rts-sim-testing-message
index f9034ba..f566f96 160000
--- a/rts-sim-testing-message
+++ b/rts-sim-testing-message
@@ -1 +1 @@
-Subproject commit f9034ba53d9b201140e9e43dbe8f5b8faa21633a
+Subproject commit f566f96c40882d7691c57de3f5c9989cde85b82c
diff --git a/src/components/draw-app/DrawProperties.vue b/src/components/draw-app/DrawProperties.vue
index dc9b47c..7d29d25 100644
--- a/src/components/draw-app/DrawProperties.vue
+++ b/src/components/draw-app/DrawProperties.vue
@@ -139,18 +139,15 @@
drawStore.selectedGraphicType === ConcentrationDividingLine.Type
"
/>
-
-
+
@@ -229,14 +226,12 @@ import { TrackLogicSection } from 'src/graphics/trackLogicSection/TrackLogicSect
import MultipleSelectProperty from './properties/multipleSelectProperty.vue';
import { DepartureTimer } from 'src/graphics/departureTimer/DepartureTimer';
import DepartureTimerProperty from './properties/DepartureTimerProperty.vue';
-import FloodGateProperty from './properties/FloodGateProperty.vue';
-import { FloodGate } from 'src/graphics/floodGate/FloodGate';
import GarageDoorProperty from './properties/GarageDoorProperty.vue';
import { GarageDoor } from 'src/graphics/garageDoor/GarageDoor';
import CarWashingProperty from './properties/CarWashingProperty.vue';
import { CarWashing } from 'src/graphics/carWashing/CarWashing';
-import GarageDoorBoxProperty from './properties/GarageDoorBoxProperty.vue';
-import { GarageDoorBox } from 'src/graphics/garageDoorBox/GarageDoorBox';
+import { FloodGate } from 'src/graphics/floodGate/FloodGate';
+import FloodGateProperty from './properties/FloodGateProperty.vue';
const drawStore = useDrawStore();
diff --git a/src/components/draw-app/dialogs/CkmOperation.vue b/src/components/draw-app/dialogs/CkmOperation.vue
index a423c38..78f4a5a 100644
--- a/src/components/draw-app/dialogs/CkmOperation.vue
+++ b/src/components/draw-app/dialogs/CkmOperation.vue
@@ -3,7 +3,7 @@
@@ -22,7 +22,7 @@
class="q-gutter-sm"
style="border: 1px solid #ccc; border-radius: 3px"
>
- 车库门强制：
+ 强制：
- errorNotify('车库门操作失败：' + e.title, e)
- );
+ ckmUpdateParams(obj).catch((e) => errorNotify('操作失败：' + e.title, e));
showCkmOperation.value = false;
}
});
diff --git a/src/components/draw-app/properties/FloodGateProperty.vue b/src/components/draw-app/properties/FloodGateProperty.vue
index ddefe34..bdf347e 100644
--- a/src/components/draw-app/properties/FloodGateProperty.vue
+++ b/src/components/draw-app/properties/FloodGateProperty.vue
@@ -18,6 +18,14 @@
@update:model-value="onUpdate"
label="关联区段"
>
+
import { useFormData } from 'src/components/DrawAppFormUtils';
import { useDrawStore } from 'src/stores/draw-store';
-import { onMounted, reactive } from 'vue';
-import { Section } from 'src/graphics/section/Section';
+import { onMounted, reactive, ref } from 'vue';
import { FloodGateData } from 'src/drawApp/graphics/FloodGateInteraction';
+import { Section } from 'src/graphics/section/Section';
import AddCentralizedStationDialog from '../dialogs/AddCentralizedStationDialog.vue';
import { useQuasar } from 'quasar';
import { Station } from 'src/graphics/station/Station';
+import { getPublishList } from 'src/api/PublishApi';
+import { PictureType } from 'src/protos/picture';
const drawStore = useDrawStore();
const sectionList: { label: string; value: number }[] = reactive([]);
@@ -53,8 +63,20 @@ const { data: floodGateModel, onUpdate } = useFormData(
new FloodGateData(),
drawStore.getDrawApp()
);
-
+const pslNameList = ref([]);
onMounted(() => {
+ const list2: string[] = [];
+ getPublishList({
+ type: PictureType.Psl,
+ category: useDrawStore().categoryType,
+ }).then((pslMapList) => {
+ if (pslMapList && pslMapList.length) {
+ pslMapList.forEach((item) => {
+ list2.push(item.name);
+ });
+ }
+ pslNameList.value = list2;
+ });
const sections = drawStore
.getDrawApp()
.queryStore.queryByType(Section.Type);
@@ -65,12 +87,12 @@ onMounted(() => {
});
});
});
-
+const $q = useQuasar();
function removeStation(index: number) {
floodGateModel.centralizedStations.splice(index, 1);
onUpdate();
}
-const $q = useQuasar();
+
function addStation() {
$q.dialog({
title: '',
diff --git a/src/components/draw-app/properties/GarageDoorBoxProperty.vue b/src/components/draw-app/properties/GarageDoorBoxProperty.vue
deleted file mode 100644
index 891e572..0000000
--- a/src/components/draw-app/properties/GarageDoorBoxProperty.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/draw-app/properties/GarageDoorProperty.vue b/src/components/draw-app/properties/GarageDoorProperty.vue
index d537b75..3d3ed70 100644
--- a/src/components/draw-app/properties/GarageDoorProperty.vue
+++ b/src/components/draw-app/properties/GarageDoorProperty.vue
@@ -24,6 +24,14 @@
@update:model-value="onUpdate"
label="关联区段"
>
+
import { useFormData } from 'src/components/DrawAppFormUtils';
import { useDrawStore } from 'src/stores/draw-store';
-import { onMounted, reactive } from 'vue';
+import { onMounted, reactive, ref } from 'vue';
import { GarageDoorData } from 'src/drawApp/graphics/GarageDoorInteraction';
import { Section } from 'src/graphics/section/Section';
import AddCentralizedStationDialog from '../dialogs/AddCentralizedStationDialog.vue';
import { useQuasar } from 'quasar';
import { Station } from 'src/graphics/station/Station';
+import { getPublishList } from 'src/api/PublishApi';
+import { PictureType } from 'src/protos/picture';
const drawStore = useDrawStore();
const sectionList: { label: string; value: number }[] = reactive([]);
@@ -59,8 +69,20 @@ const { data: garageDoorModel, onUpdate } = useFormData(
new GarageDoorData(),
drawStore.getDrawApp()
);
-
+const pslNameList = ref([]);
onMounted(() => {
+ const list2: string[] = [];
+ getPublishList({
+ type: PictureType.Psl,
+ category: useDrawStore().categoryType,
+ }).then((pslMapList) => {
+ if (pslMapList && pslMapList.length) {
+ pslMapList.forEach((item) => {
+ list2.push(item.name);
+ });
+ }
+ pslNameList.value = list2;
+ });
const sections = drawStore
.getDrawApp()
.queryStore.queryByType(Section.Type);
diff --git a/src/components/line-app/StateProperties.vue b/src/components/line-app/StateProperties.vue
index 2ad0013..5a26118 100644
--- a/src/components/line-app/StateProperties.vue
+++ b/src/components/line-app/StateProperties.vue
@@ -31,6 +31,9 @@
+
@@ -61,6 +64,8 @@ import TransponderState from './states/TransponderState.vue';
import { Transponder } from 'src/graphics/transponder/Transponder';
import { GarageDoor } from 'src/graphics/garageDoor/GarageDoor';
import GarageDoorState from './states/GarageDoorState.vue';
+import { FloodGate } from 'src/graphics/floodGate/FloodGate';
+import FloodGateState from './states/FloodGateState.vue';
const lineStore = useLineStore();
diff --git a/src/components/line-app/states/FloodGateState.vue b/src/components/line-app/states/FloodGateState.vue
new file mode 100644
index 0000000..acdf9b7
--- /dev/null
+++ b/src/components/line-app/states/FloodGateState.vue
@@ -0,0 +1,186 @@
+
+
+
+ 防淹门状态
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+ {{
+ item.formatFn
+ ? item.formatFn(floodGateState[item.key])
+ : floodGateState[item.key]
+ }}
+
+
+
+
+
+
+
diff --git a/src/components/line-app/states/GarageDoorState.vue b/src/components/line-app/states/GarageDoorState.vue
index 43357c3..ce57a26 100644
--- a/src/components/line-app/states/GarageDoorState.vue
+++ b/src/components/line-app/states/GarageDoorState.vue
@@ -83,7 +83,7 @@ const list: KeyType[] = [
{ label: '车库门索引', key: 'id' },
{ label: '车库门名称', key: 'code', formatFn: getNameFormat },
{ label: '车库门关闭', key: 'mgj', formatFn: getName },
- { label: '状态丢失', key: 'stateLoss', formatFn: getName },
+ // { label: '状态丢失', key: 'stateLoss', formatFn: getName },
{ label: '车库门强制', key: 'param', formatFn: getForceName },
{ label: '设置故障', key: 'param', formatFn: getFaultName },
];
@@ -127,8 +127,9 @@ function getForceName() {
}
function getFaultName() {
- if (garageDoorFault.value == 1) return '是';
- return '否';
+ if (garageDoorFault.value == request.Ckm.Fault.FA_State_Loss)
+ return '状态丢失';
+ return '无';
}
function initGarageDoorState(garageDoor: GarageDoor) {
@@ -159,6 +160,7 @@ function doGarageDoorOperation(item: {
code: code.value,
ckmForceProp: garageDoorState.value.param.force,
ckmFaultProp: garageDoorState.value.param.fault,
+ title: '车库门设置参数',
},
cancel: true,
persistent: true,
diff --git a/src/configs/UrlManage.ts b/src/configs/UrlManage.ts
index b047e37..62d1883 100644
--- a/src/configs/UrlManage.ts
+++ b/src/configs/UrlManage.ts
@@ -9,7 +9,7 @@ function getHost(): string {
// return '192.168.3.7:9091';
// return '192.168.3.47:9091';
// return '192.168.3.37:9091';
- // return '192.168.33.207:9091'; // 张骞
+ return '192.168.33.207:9091'; // 张骞
// return '192.168.33.93:9091';
// return '192.168.3.37:9091'; //卫志宏
// return 'test.joylink.club/bjrtsts-service'; // 测试
diff --git a/src/drawApp/common.ts b/src/drawApp/common.ts
index 21bb5c9..f1d3927 100644
--- a/src/drawApp/common.ts
+++ b/src/drawApp/common.ts
@@ -24,7 +24,6 @@ import { PslBox } from 'src/graphics/pslBox/PslBox';
import { GarageDoor } from 'src/graphics/garageDoor/GarageDoor';
import { CarWashing } from 'src/graphics/carWashing/CarWashing';
import { FloodGate } from 'src/graphics/floodGate/FloodGate';
-import { GarageDoorBox } from 'src/graphics/garageDoorBox/GarageDoorBox';
export const drawCommonLayerList = [
// 图层列表 默认显示的图层defaultShow: true
@@ -60,7 +59,6 @@ export const drawCommonLayerList = [
defaultShow: true,
},
{ label: '车库门', value: GarageDoor.Type, defaultShow: true },
- { label: '防淹门', value: FloodGate.Type, defaultShow: true },
{ label: '洗车机', value: CarWashing.Type, defaultShow: true },
- { label: '车库门设置', value: GarageDoorBox.Type, defaultShow: true },
+ { label: '防淹门', value: FloodGate.Type, defaultShow: true },
];
diff --git a/src/drawApp/commonApp.ts b/src/drawApp/commonApp.ts
index 8a7e5c6..6094271 100644
--- a/src/drawApp/commonApp.ts
+++ b/src/drawApp/commonApp.ts
@@ -96,15 +96,6 @@ import {
GatedBoxData,
DrawGatedBoxInteraction,
} from './graphics/GatedBoxInteraction';
-import {
- GarageDoorBox,
- GarageDoorBoxTemplate,
-} from 'src/graphics/garageDoorBox/GarageDoorBox';
-import {
- GarageDoorBoxData,
- DrawGarageDoorBoxInteraction,
-} from './graphics/GarageDoorBoxInteraction';
-import { GarageDoorBoxDraw } from 'src/graphics/garageDoorBox/GarageDoorBoxAssistant';
// import { EsbButton, EsbButtonTemplate } from 'src/graphics/esbButton/EsbButton';
// import {
// EsbButtonData,
@@ -157,9 +148,6 @@ import {
CarWashingTemplate,
} from 'src/graphics/carWashing/CarWashing';
import { CarWashingDraw } from 'src/graphics/carWashing/CarWashingDrawAssistant';
-import { FloodGateData } from './graphics/FloodGateInteraction';
-import { FloodGate, FloodGateTemplate } from 'src/graphics/floodGate/FloodGate';
-import { FloodGateDraw } from 'src/graphics/floodGate/FloodGateDrawAssistant';
import {
GarageDoorData,
GarageDoorState,
@@ -169,6 +157,9 @@ import {
GarageDoorTemplate,
} from 'src/graphics/garageDoor/GarageDoor';
import { GarageDoorDraw } from 'src/graphics/garageDoor/GarageDoorDrawAssistant';
+import { FloodGateDraw } from 'src/graphics/floodGate/FloodGateDrawAssistant';
+import { FloodGate, FloodGateTemplate } from 'src/graphics/floodGate/FloodGate';
+import { FloodGateData, FloodGateState } from './graphics/FloodGateInteraction';
const UndoOptions: MenuItemOptions = {
name: '撤销',
@@ -235,10 +226,6 @@ export function initCommonDrawApp(app: IDrawApp) {
new StopPositionDraw(app, new StopPositionTemplate(new StopPositionData()));
new SpksSwitchDraw(app, new SpksSwitchTemplate(new SpksSwitchData()));
new GatedBoxDraw(app, new GatedBoxTemplate(new GatedBoxData()));
- new GarageDoorBoxDraw(
- app,
- new GarageDoorBoxTemplate(new GarageDoorBoxData())
- );
// new EsbButtonDraw(
// app,
// new EsbButtonTemplate(new EsbButtonData(), new EsbButtonState())
@@ -260,16 +247,18 @@ export function initCommonDrawApp(app: IDrawApp) {
new ConcentrationDividingLineTemplate(new ConcentrationDividingLineData())
);
new CarWashingDraw(app, new CarWashingTemplate(new CarWashingData()));
- new FloodGateDraw(app, new FloodGateTemplate(new FloodGateData()));
new GarageDoorDraw(
app,
new GarageDoorTemplate(new GarageDoorData(), new GarageDoorState())
);
+ new FloodGateDraw(
+ app,
+ new FloodGateTemplate(new FloodGateData(), new FloodGateState())
+ );
DrawSignalInteraction.init(app);
DrawStopPositionInteraction.init(app);
DrawSpksSwitchInteraction.init(app);
DrawGatedBoxInteraction.init(app);
- DrawGarageDoorBoxInteraction.init(app);
// DrawEsbButtonInteraction.init(app);
// 画布右键菜单
@@ -451,9 +440,6 @@ export function loadCommonDrawDatas(
storage.gateBoxs.forEach((gatedBox) => {
datas.push(new GatedBoxData(gatedBox));
});
- storage.garageDoorBoxes.forEach((garageDoorBox) => {
- datas.push(new GarageDoorBoxData(garageDoorBox));
- });
// storage.esbButtons.forEach((esbButton) => {
// datas.push(new EsbButtonData(esbButton));
// });
@@ -478,15 +464,15 @@ export function loadCommonDrawDatas(
storage.concentrationDividingLines.forEach((concentrationDividingLine) => {
datas.push(new ConcentrationDividingLineData(concentrationDividingLine));
});
- storage.floodGates.forEach((flood) => {
- datas.push(new FloodGateData(flood));
- });
storage.carWashings.forEach((carWashing) => {
datas.push(new CarWashingData(carWashing));
});
storage.garageDoors.forEach((garageDoor) => {
datas.push(new GarageDoorData(garageDoor));
});
+ storage.floodGates.forEach((floodGate) => {
+ datas.push(new FloodGateData(floodGate));
+ });
return datas;
}
@@ -546,11 +532,6 @@ export function saveCommonDrawDatas(app: IDrawApp) {
// } else if (EsbButton.Type === g.type) {
// const esbButtonData = (g as EsbButton).saveData();
// storage.esbButtons.push((esbButtonData as EsbButtonData).data);
- } else if (GarageDoorBox.Type === g.type) {
- const garageDoorBoxData = (g as GarageDoorBox).saveData();
- storage.garageDoorBoxes.push(
- (garageDoorBoxData as GarageDoorBoxData).data
- );
} else if (Transponder.Type === g.type) {
const transponderData = (g as Transponder).saveData();
storage.transponders.push((transponderData as TransponderData).data);
@@ -581,12 +562,12 @@ export function saveCommonDrawDatas(app: IDrawApp) {
} else if (g instanceof CarWashing) {
const carWashingData = g.saveData();
storage.carWashings.push((carWashingData as CarWashingData).data);
- } else if (g instanceof FloodGate) {
- const floodGateData = g.saveData();
- storage.floodGates.push((floodGateData as FloodGateData).data);
} else if (g instanceof GarageDoor) {
const garageDoorData = g.saveData();
storage.garageDoors.push((garageDoorData as GarageDoorData).data);
+ } else if (g instanceof FloodGate) {
+ const floodGateData = g.saveData();
+ storage.floodGates.push((floodGateData as FloodGateData).data);
}
});
// storage.Platforms.forEach((item) => {
diff --git a/src/drawApp/graphics/FloodGateInteraction.ts b/src/drawApp/graphics/FloodGateInteraction.ts
index 7240566..3cfd8c4 100644
--- a/src/drawApp/graphics/FloodGateInteraction.ts
+++ b/src/drawApp/graphics/FloodGateInteraction.ts
@@ -1,16 +1,33 @@
import * as pb_1 from 'google-protobuf';
-import { FederatedMouseEvent } from 'pixi.js';
-import { FloodGate, IFloodGateData } from 'src/graphics/floodGate/FloodGate';
-import { GraphicInteractionPlugin, JlGraphic, IGraphicScene } from 'jl-graphic';
+import { DisplayObject, FederatedMouseEvent } from 'pixi.js';
+import {
+ FloodGate,
+ IFloodGateData,
+ IFloodGateState,
+} from 'src/graphics/floodGate/FloodGate';
+import {
+ GraphicInteractionPlugin,
+ JlGraphic,
+ IGraphicScene,
+ MenuItemOptions,
+ ContextMenu,
+} from 'jl-graphic';
import { graphicData } from 'src/protos/stationLayoutGraphics';
-import { GraphicDataBase } from './GraphicDataBase';
+import { GraphicDataBase, GraphicStateBase } from './GraphicDataBase';
+import { useLineStore } from 'src/stores/line-store';
+import { Dialog } from 'quasar';
+import CkmOperation from 'src/components/draw-app/dialogs/CkmOperation.vue';
+import { state } from 'src/protos/device_state';
+import { request } from 'src/protos/request';
+import { FloodGateGraphicHitArea } from 'src/graphics/floodGate/FloodGateDrawAssistant';
+import { usePslStore } from 'src/stores/psl-store';
export class FloodGateData extends GraphicDataBase implements IFloodGateData {
- constructor(data?: graphicData.FloodGate) {
+ constructor(data?: graphicData.GarageDoor) {
let floodGate;
if (!data) {
- floodGate = new graphicData.FloodGate({
+ floodGate = new graphicData.GarageDoor({
common: GraphicDataBase.defaultCommonInfo(FloodGate.Type),
});
} else {
@@ -19,8 +36,8 @@ export class FloodGateData extends GraphicDataBase implements IFloodGateData {
super(floodGate);
}
- public get data(): graphicData.FloodGate {
- return this.getData();
+ public get data(): graphicData.GarageDoor {
+ return this.getData();
}
get code(): string {
return this.data.code;
@@ -40,6 +57,12 @@ export class FloodGateData extends GraphicDataBase implements IFloodGateData {
set centralizedStations(v: number[]) {
this.data.centralizedStations = v;
}
+ get refPslMapCode(): string {
+ return this.data.refPslMapCode;
+ }
+ set refPslMapCode(v: string) {
+ this.data.refPslMapCode = v;
+ }
clone(): FloodGateData {
return new FloodGateData(this.data.cloneMessage());
}
@@ -51,35 +74,126 @@ export class FloodGateData extends GraphicDataBase implements IFloodGateData {
}
}
+export class FloodGateState
+ extends GraphicStateBase
+ implements IFloodGateState
+{
+ constructor(proto?: state.CkmState) {
+ let states;
+ if (proto) {
+ states = proto;
+ } else {
+ states = new state.CkmState();
+ }
+ super(states, FloodGate.Type);
+ }
+ get code(): string {
+ return this.states.id + '';
+ }
+ get id(): number {
+ return this.states.id;
+ }
+ set id(id: number) {
+ this.states.id = id;
+ }
+ get mgj() {
+ return this.states.mgj;
+ }
+ set mgj(v: boolean) {
+ this.states.mgj = v;
+ }
+ get param(): request.CkmParam {
+ return this.states.param;
+ }
+ set param(param: request.CkmParam) {
+ this.states.param = param;
+ }
+ get states(): state.CkmState {
+ return this.getState();
+ }
+ clone(): FloodGateState {
+ return new FloodGateState(this.states.cloneMessage());
+ }
+ copyFrom(data: GraphicStateBase): void {
+ pb_1.Message.copyInto(data._state, this._state);
+ }
+ eq(data: GraphicStateBase): boolean {
+ return pb_1.Message.equals(this._state, data._state);
+ }
+}
+
+const setCkmrParam: MenuItemOptions = { name: '设置参数' };
+const ckmOperateMenu: ContextMenu = ContextMenu.init({
+ name: '防淹门操作菜单',
+ groups: [
+ {
+ items: [setCkmrParam],
+ },
+ ],
+});
+
export class FloodGateOperationInteraction extends GraphicInteractionPlugin {
static Name = 'flood_gate_operation';
- constructor(scene: IGraphicScene) {
- super(FloodGateOperationInteraction.Name, scene);
+ constructor(app: IGraphicScene) {
+ super(FloodGateOperationInteraction.Name, app);
+ app.registerMenu(ckmOperateMenu);
}
- static init(scene: IGraphicScene) {
- return new FloodGateOperationInteraction(scene);
+ static init(app: IGraphicScene) {
+ return new FloodGateOperationInteraction(app);
}
filter(...grahpics: JlGraphic[]): FloodGate[] | undefined {
return grahpics.filter((g): g is FloodGate => g.type === FloodGate.Type);
}
bind(g: FloodGate): void {
g.eventMode = 'static';
+ g.hitArea = new FloodGateGraphicHitArea(g);
g.cursor = 'pointer';
- g.on('mousedown', this.onPress, this);
+ g.selectable = true;
+ g.rectBody.eventMode = 'static';
+ g.rectBody.cursor = 'pointer';
+ g.rectBody.selectable = true;
+ g.on('_rightclick', this.onContextMenu);
+ g.rectBody.on('_leftclick', this.onLeftClick, this);
}
unbind(g: FloodGate): void {
g.eventMode = 'none';
g.cursor = 'default';
- g.off('mousedown', this.onPress, this);
+ g.selectable = false;
+ g.rectBody.eventMode = 'none';
+ g.rectBody.cursor = 'default';
+ g.rectBody.selectable = false;
+ g.off('_rightclick', this.onContextMenu);
+ g.rectBody.off('_leftclick', this.onLeftClick, this);
}
- onPress(e: FederatedMouseEvent) {
- const g = e.target as FloodGate;
- g.on('mouseleave', this.onRelease, this);
- g.on('mouseup', this.onRelease, this);
+
+ onContextMenu(e: FederatedMouseEvent) {
+ const target = e.target as DisplayObject;
+ const floodGate = target.getGraphic();
+ if (!floodGate) return;
+ const lineStore = useLineStore();
+ setCkmrParam.handler = async () => {
+ if (lineStore.deviceOpreratDialogInstance) return;
+ lineStore.deviceOpreratDialogInstance = Dialog.create({
+ component: CkmOperation,
+ componentProps: {
+ id: floodGate.id,
+ code: floodGate.datas.code,
+ ckmForceProp: floodGate.states.param.force,
+ ckmFaultProp: floodGate.states.param.fault,
+ title: '防淹门设置参数',
+ },
+ cancel: true,
+ persistent: true,
+ });
+ };
+ ckmOperateMenu.open(e.global);
}
- onRelease(e: FederatedMouseEvent) {
- const g = e.target as FloodGate;
- g.off('mouseleave', this.onRelease, this);
- g.off('mouseup', this.onRelease, this);
+ onLeftClick(e: FederatedMouseEvent) {
+ const target = e.target as DisplayObject;
+ const floodGate = target.getGraphic() as FloodGate;
+ usePslStore().setPslParam(
+ floodGate.datas.id,
+ floodGate.datas.refPslMapCode
+ );
}
}
diff --git a/src/drawApp/graphics/GarageDoorBoxInteraction.ts b/src/drawApp/graphics/GarageDoorBoxInteraction.ts
deleted file mode 100644
index 9c5860b..0000000
--- a/src/drawApp/graphics/GarageDoorBoxInteraction.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import * as pb_1 from 'google-protobuf';
-import { DisplayObject, FederatedMouseEvent } from 'pixi.js';
-import {
- GarageDoorBox,
- IGarageDoorBox,
-} from 'src/graphics/garageDoorBox/GarageDoorBox';
-import {
- IGraphicApp,
- GraphicInteractionPlugin,
- JlGraphic,
- IGraphicScene,
- MenuItemOptions,
- ContextMenu,
-} from 'jl-graphic';
-
-import { graphicData } from 'src/protos/stationLayoutGraphics';
-import { GraphicDataBase } from './GraphicDataBase';
-import { usePslStore } from 'src/stores/psl-store';
-
-export class GarageDoorBoxData
- extends GraphicDataBase
- implements IGarageDoorBox
-{
- constructor(data?: graphicData.GarageDoorBox) {
- let garageDoorBox;
- if (!data) {
- garageDoorBox = new graphicData.GarageDoorBox({
- common: GraphicDataBase.defaultCommonInfo(GarageDoorBox.Type),
- });
- } else {
- garageDoorBox = data;
- }
- super(garageDoorBox);
- }
-
- public get data(): graphicData.GarageDoorBox {
- return this.getData();
- }
- get code(): string {
- return this.data.code;
- }
- set code(v: string) {
- this.data.code = v;
- }
- get flip(): boolean {
- return this.data.flip;
- }
- set flip(v: boolean) {
- this.data.flip = v;
- }
- get refGarageDoorId(): number {
- return this.data.refGarageDoorId;
- }
- set refGarageDoorId(v: number) {
- this.data.refGarageDoorId = v;
- }
- get refPslMapCode(): string {
- return this.data.refPslMapCode;
- }
- set refPslMapCode(v: string) {
- this.data.refPslMapCode = v;
- }
- clone(): GarageDoorBoxData {
- return new GarageDoorBoxData(this.data.cloneMessage());
- }
- copyFrom(data: GarageDoorBoxData): void {
- pb_1.Message.copyInto(data.data, this.data);
- }
- eq(other: GarageDoorBoxData): boolean {
- return pb_1.Message.equals(this.data, other.data);
- }
-}
-
-const flipConfig: MenuItemOptions = {
- name: '上下翻转',
-};
-const GarageDoorBoxEditMenu: ContextMenu = ContextMenu.init({
- name: '设置车库门编辑菜单',
- groups: [
- {
- items: [flipConfig],
- },
- ],
-});
-export class DrawGarageDoorBoxInteraction extends GraphicInteractionPlugin {
- static Name = 'garage_door_box_draw_right_menu';
- constructor(app: IGraphicApp) {
- super(DrawGarageDoorBoxInteraction.Name, app);
- app.registerMenu(GarageDoorBoxEditMenu);
- }
- static init(app: IGraphicApp) {
- return new DrawGarageDoorBoxInteraction(app);
- }
- filter(...grahpics: JlGraphic[]): GarageDoorBox[] | undefined {
- return grahpics
- .filter((g) => g.type === GarageDoorBox.Type)
- .map((g) => g as GarageDoorBox);
- }
- bind(g: GarageDoorBox): void {
- g.on('_rightclick', this.onContextMenu, this);
- }
-
- unbind(g: GarageDoorBox): void {
- g.off('_rightclick', this.onContextMenu, this);
- }
-
- onContextMenu(e: FederatedMouseEvent) {
- const target = e.target as DisplayObject;
- const garageDoorBox = target.getGraphic() as GarageDoorBox;
- this.app.updateSelected(garageDoorBox);
- flipConfig.handler = () => {
- garageDoorBox.datas.flip = !garageDoorBox.datas.flip;
- garageDoorBox.repaint();
- };
- GarageDoorBoxEditMenu.open(e.global);
- }
-}
-
-export class GarageDoorBoxOperateInteraction extends GraphicInteractionPlugin {
- static Name = 'garage_door_box_operate_menu';
- constructor(app: IGraphicScene) {
- super(GarageDoorBoxOperateInteraction.Name, app);
- }
- static init(app: IGraphicScene) {
- return new GarageDoorBoxOperateInteraction(app);
- }
- filter(...grahpics: JlGraphic[]): GarageDoorBox[] | undefined {
- return grahpics
- .filter((g) => g.type === GarageDoorBox.Type)
- .map((g) => g as GarageDoorBox);
- }
- bind(g: GarageDoorBox): void {
- g.eventMode = 'static';
- g.cursor = 'pointer';
- g.on('_leftclick', this.onLeftClick, this);
- }
-
- unbind(g: GarageDoorBox): void {
- g.eventMode = 'none';
- g.off('_leftclick', this.onLeftClick, this);
- }
- onLeftClick(e: FederatedMouseEvent) {
- const target = e.target as DisplayObject;
- const garageDoorBox = target.getGraphic() as GarageDoorBox;
- usePslStore().setPslParam(
- garageDoorBox.datas.id,
- garageDoorBox.datas.refPslMapCode
- );
- }
-}
diff --git a/src/drawApp/graphics/GarageDoorInteraction.ts b/src/drawApp/graphics/GarageDoorInteraction.ts
index 8565091..8ec0801 100644
--- a/src/drawApp/graphics/GarageDoorInteraction.ts
+++ b/src/drawApp/graphics/GarageDoorInteraction.ts
@@ -21,6 +21,7 @@ import CkmOperation from 'src/components/draw-app/dialogs/CkmOperation.vue';
import { state } from 'src/protos/device_state';
import { request } from 'src/protos/request';
import { GarageDoorGraphicHitArea } from 'src/graphics/garageDoor/GarageDoorDrawAssistant';
+import { usePslStore } from 'src/stores/psl-store';
export class GarageDoorData extends GraphicDataBase implements IGarageDoorData {
constructor(data?: graphicData.GarageDoor) {
@@ -56,6 +57,12 @@ export class GarageDoorData extends GraphicDataBase implements IGarageDoorData {
set centralizedStations(v: number[]) {
this.data.centralizedStations = v;
}
+ get refPslMapCode(): string {
+ return this.data.refPslMapCode;
+ }
+ set refPslMapCode(v: string) {
+ this.data.refPslMapCode = v;
+ }
clone(): GarageDoorData {
return new GarageDoorData(this.data.cloneMessage());
}
@@ -95,13 +102,6 @@ export class GarageDoorState
set mgj(v: boolean) {
this.states.mgj = v;
}
- get stateLoss(): boolean {
- //状态丢失
- return this.states.stateLoss;
- }
- set stateLoss(v: boolean) {
- this.states.stateLoss = v;
- }
get param(): request.CkmParam {
return this.states.param;
}
@@ -149,13 +149,21 @@ export class GarageDoorOperationInteraction extends GraphicInteractionPlugin {
+ if (item.id) {
+ states.push(new FloodGateState(item));
+ }
+ });
storage.allStatus.trainState.forEach((item) => {
// 列车
if (!item.show) {
@@ -666,9 +663,6 @@ export async function loadLineDatas(): Promise {
storage.floodGates.forEach((floodGate) => {
datas.push(new FloodGateData(floodGate));
});
- storage.garageDoorBoxes.forEach((garageDoorBox) => {
- datas.push(new GarageDoorBoxData(garageDoorBox));
- });
// const linkIdGenerator = new IdGenerator(Link.Type);
// storage.CalculateLink.forEach((link) => {
// const g = new LinkData(link);
diff --git a/src/graphics/concentrationDividingLine/ConcentrationDividingLineUtils.ts b/src/graphics/concentrationDividingLine/ConcentrationDividingLineUtils.ts
index bbffbd0..2146c9b 100644
--- a/src/graphics/concentrationDividingLine/ConcentrationDividingLineUtils.ts
+++ b/src/graphics/concentrationDividingLine/ConcentrationDividingLineUtils.ts
@@ -16,8 +16,6 @@ import { GarageDoor } from '../garageDoor/GarageDoor';
import { CarWashing } from '../carWashing/CarWashing';
import { GarageDoorData } from 'src/drawApp/graphics/GarageDoorInteraction';
import { CarWashingData } from 'src/drawApp/graphics/CarWashingInteraction';
-import { FloodGate } from '../floodGate/FloodGate';
-import { FloodGateData } from 'src/drawApp/graphics/FloodGateInteraction';
//判断线段与线段有木有交点
export function isSegmentsIntersect(
@@ -178,7 +176,6 @@ export function handleCentralizedStationsData(
[Transponder.Type, new TransponderData()],
[GarageDoor.Type, new GarageDoorData()],
[CarWashing.Type, new CarWashingData()],
- [FloodGate.Type, new FloodGateData()],
]);
devices.forEach((device) => {
const data = dataMap.get(device.type);
diff --git a/src/graphics/floodGate/FloodGate.ts b/src/graphics/floodGate/FloodGate.ts
index 9a1eadd..1638474 100644
--- a/src/graphics/floodGate/FloodGate.ts
+++ b/src/graphics/floodGate/FloodGate.ts
@@ -1,11 +1,13 @@
import { Graphics } from 'pixi.js';
import {
GraphicData,
+ GraphicState,
JlGraphic,
JlGraphicTemplate,
VectorText,
linePoint,
} from 'jl-graphic';
+import { request } from 'src/protos/request';
import { Section, SectionType } from '../section/Section';
export interface IFloodGateData extends GraphicData {
@@ -15,30 +17,47 @@ export interface IFloodGateData extends GraphicData {
set linkSection(v: number);
get centralizedStations(): number[];
set centralizedStations(v: number[]);
+ get refPslMapCode(): string;
+ set refPslMapCode(v: string);
clone(): IFloodGateData;
copyFrom(data: IFloodGateData): void;
eq(other: IFloodGateData): boolean;
}
-const floodGateConsts = {
+export interface IFloodGateState extends GraphicState {
+ get id(): number;
+ set id(v: number);
+ get mgj(): boolean; //防淹门关闭继电器
+ set mgj(v: boolean);
+ get param(): request.CkmParam;
+ set param(v: request.CkmParam);
+}
+
+const garageConsts = {
codeFontSize: 12,
codeColor: 0xffffff,
bodyLineColor: 0xffffff,
+ lossStateColor: 0x0000ff,
bodyLineWidth: 2,
bodyColor: 0x000000,
bodyRectWidth: 10,
bodyRectHeight: 20,
+ rectButtonWidth: 10,
+ rectColor: 0xffffff,
};
export class FloodGate extends JlGraphic {
static Type = 'floodGate';
codeGraph: VectorText = new VectorText('');
lineBody: Graphics = new Graphics();
+ rectBody: Graphics = new Graphics();
constructor() {
super(FloodGate.Type);
this.addChild(this.codeGraph);
this.addChild(this.lineBody);
+ this.addChild(this.rectBody);
this.codeGraph.name = 'flood_code';
+ this.rectBody.name = 'flood_rect_body';
}
get code(): string {
return this.datas.code;
@@ -46,11 +65,15 @@ export class FloodGate extends JlGraphic {
get datas(): IFloodGateData {
return this.getDatas();
}
+
+ get states(): IFloodGateState {
+ return this.getStates();
+ }
doRepaint(): void {
const codeGraph = this.codeGraph;
codeGraph.text = this.datas.code;
- codeGraph.style.fill = floodGateConsts.codeColor;
- codeGraph.setVectorFontSize(floodGateConsts.codeFontSize);
+ codeGraph.style.fill = garageConsts.codeColor;
+ codeGraph.setVectorFontSize(garageConsts.codeFontSize);
codeGraph.anchor.set(0.5);
const codeTransform = this.datas?.childTransforms?.find(
(item) => item.name === 'flood_code'
@@ -64,28 +87,55 @@ export class FloodGate extends JlGraphic {
codeGraph.position.set(0, -30);
}
this.lineBody.clear();
- this.lineBody.lineStyle(
- floodGateConsts.bodyLineWidth,
- floodGateConsts.bodyLineColor
- );
+ const color =
+ this.states.param?.fault === request.Ckm.Fault.FA_State_Loss
+ ? garageConsts.lossStateColor
+ : garageConsts.bodyLineColor;
+ this.lineBody.lineStyle(garageConsts.bodyLineWidth, color);
this.lineBody.moveTo(
- -floodGateConsts.bodyRectWidth / 2,
- -floodGateConsts.bodyRectHeight / 2
+ -garageConsts.bodyRectWidth / 2,
+ -garageConsts.bodyRectHeight / 2
);
this.lineBody.lineTo(
- floodGateConsts.bodyRectWidth / 2,
- -floodGateConsts.bodyRectHeight / 2
+ garageConsts.bodyRectWidth / 2,
+ -garageConsts.bodyRectHeight / 2
);
this.lineBody.moveTo(
- -floodGateConsts.bodyRectWidth / 2,
- floodGateConsts.bodyRectHeight / 2
+ -garageConsts.bodyRectWidth / 2,
+ garageConsts.bodyRectHeight / 2
);
this.lineBody.lineTo(
- floodGateConsts.bodyRectWidth / 2,
- floodGateConsts.bodyRectHeight / 2
+ garageConsts.bodyRectWidth / 2,
+ garageConsts.bodyRectHeight / 2
);
- this.lineBody.moveTo(0, -floodGateConsts.bodyRectHeight / 2);
- this.lineBody.lineTo(0, floodGateConsts.bodyRectHeight / 2);
+ if (this.states.mgj) {
+ this.lineBody.moveTo(0, -garageConsts.bodyRectHeight / 2);
+ this.lineBody.lineTo(0, garageConsts.bodyRectHeight / 2);
+ } else {
+ this.lineBody.moveTo(0, -garageConsts.bodyRectHeight / 2);
+ this.lineBody.lineTo(0, -garageConsts.bodyRectHeight / 4);
+ this.lineBody.moveTo(0, garageConsts.bodyRectHeight / 4);
+ this.lineBody.lineTo(0, garageConsts.bodyRectHeight / 2);
+ }
+ this.rectBody.clear();
+ this.rectBody.beginFill(garageConsts.rectColor, 1);
+ // this.rectBody.lineStyle(1, garageConsts.rectColor);
+ this.rectBody.drawRect(
+ -garageConsts.bodyRectWidth / 2,
+ garageConsts.bodyRectHeight / 2 + 3,
+ garageConsts.rectButtonWidth,
+ garageConsts.rectButtonWidth
+ );
+ this.rectBody.endFill();
+ const rectTransform = this.datas?.childTransforms?.find(
+ (item) => item.name === 'flood_rect_body'
+ );
+ if (rectTransform) {
+ const position = rectTransform?.transform.position;
+ const rotation = rectTransform?.transform?.rotation;
+ this.rectBody.position.set(position?.x, position?.y);
+ this.rectBody.rotation = rotation || 0;
+ }
}
buildRelation() {
@@ -115,12 +165,13 @@ export class FloodGate extends JlGraphic {
}
export class FloodGateTemplate extends JlGraphicTemplate {
- constructor(dataTemplate: IFloodGateData) {
- super(FloodGate.Type, { dataTemplate });
+ constructor(dataTemplate: IFloodGateData, stateTemplate?: IFloodGateState) {
+ super(FloodGate.Type, { dataTemplate, stateTemplate });
}
new(): FloodGate {
const floodGate = new FloodGate();
floodGate.loadData(this.datas);
+ floodGate.loadState(this.states);
return floodGate;
}
}
diff --git a/src/graphics/floodGate/FloodGateDrawAssistant.ts b/src/graphics/floodGate/FloodGateDrawAssistant.ts
index c410cc6..210fab8 100644
--- a/src/graphics/floodGate/FloodGateDrawAssistant.ts
+++ b/src/graphics/floodGate/FloodGateDrawAssistant.ts
@@ -1,4 +1,4 @@
-import { DisplayObject, FederatedMouseEvent, Point } from 'pixi.js';
+import { DisplayObject, FederatedMouseEvent, Point, IHitArea } from 'pixi.js';
import {
AbsorbableLine,
AbsorbablePosition,
@@ -80,6 +80,21 @@ function buildAbsorbablePositions(floodGate: FloodGate): AbsorbablePosition[] {
return aps;
}
+export class FloodGateGraphicHitArea implements IHitArea {
+ floodGate: FloodGate;
+ constructor(floodGate: FloodGate) {
+ this.floodGate = floodGate;
+ }
+ contains(x: number, y: number): boolean {
+ const bound = this.floodGate.getLocalBounds();
+ const maxX = bound.x + bound.width;
+ const minX = bound.x;
+ const maxY = bound.y + bound.height;
+ const minY = bound.y;
+ return maxX >= x && x >= minX && maxY >= y && y >= minY;
+ }
+}
+
export class FloodGateInteraction extends GraphicInteractionPlugin {
static Name = 'flood_gate_transform';
constructor(app: IDrawApp) {
@@ -98,11 +113,17 @@ export class FloodGateInteraction extends GraphicInteractionPlugin {
g.cursor = 'pointer';
g.scalable = true;
g.rotatable = true;
+ g.hitArea = new FloodGateGraphicHitArea(g);
g.codeGraph.draggable = true;
g.codeGraph.selectable = true;
g.codeGraph.rotatable = true;
g.codeGraph.transformSave = true;
g.codeGraph.eventMode = 'static';
+ g.rectBody.draggable = true;
+ g.rectBody.selectable = true;
+ g.rectBody.rotatable = true;
+ g.rectBody.transformSave = true;
+ g.rectBody.eventMode = 'static';
g.on('transformstart', this.transformstart, this);
}
unbind(g: FloodGate): void {
@@ -114,6 +135,11 @@ export class FloodGateInteraction extends GraphicInteractionPlugin {
g.codeGraph.rotatable = false;
g.codeGraph.transformSave = false;
g.codeGraph.eventMode = 'none';
+ g.rectBody.draggable = false;
+ g.rectBody.selectable = false;
+ g.rectBody.rotatable = false;
+ g.rectBody.transformSave = false;
+ g.rectBody.eventMode = 'none';
g.off('transformstart', this.transformstart, this);
}
transformstart(e: GraphicTransformEvent) {
diff --git a/src/graphics/garageDoor/GarageDoor.ts b/src/graphics/garageDoor/GarageDoor.ts
index c640cb2..67f28ca 100644
--- a/src/graphics/garageDoor/GarageDoor.ts
+++ b/src/graphics/garageDoor/GarageDoor.ts
@@ -17,6 +17,8 @@ export interface IGarageDoorData extends GraphicData {
set linkSection(v: number);
get centralizedStations(): number[];
set centralizedStations(v: number[]);
+ get refPslMapCode(): string;
+ set refPslMapCode(v: string);
clone(): IGarageDoorData;
copyFrom(data: IGarageDoorData): void;
eq(other: IGarageDoorData): boolean;
@@ -29,8 +31,6 @@ export interface IGarageDoorState extends GraphicState {
set mgj(v: boolean);
get param(): request.CkmParam;
set param(v: request.CkmParam);
- get stateLoss(): boolean; //状态丢失
- set stateLoss(v: boolean);
}
const garageConsts = {
@@ -42,17 +42,22 @@ const garageConsts = {
bodyColor: 0x000000,
bodyRectWidth: 10,
bodyRectHeight: 20,
+ rectButtonWidth: 10,
+ rectColor: 0xffffff,
};
export class GarageDoor extends JlGraphic {
static Type = 'garageDoor';
codeGraph: VectorText = new VectorText('');
lineBody: Graphics = new Graphics();
+ rectBody: Graphics = new Graphics();
constructor() {
super(GarageDoor.Type);
this.addChild(this.codeGraph);
this.addChild(this.lineBody);
+ this.addChild(this.rectBody);
this.codeGraph.name = 'garage_code';
+ this.rectBody.name = 'garage_rect_body';
}
get code(): string {
return this.datas.code;
@@ -112,6 +117,25 @@ export class GarageDoor extends JlGraphic {
this.lineBody.moveTo(0, garageConsts.bodyRectHeight / 4);
this.lineBody.lineTo(0, garageConsts.bodyRectHeight / 2);
}
+ this.rectBody.clear();
+ this.rectBody.beginFill(garageConsts.rectColor, 1);
+ // this.rectBody.lineStyle(1, garageConsts.rectColor);
+ this.rectBody.drawRect(
+ -garageConsts.bodyRectWidth / 2,
+ garageConsts.bodyRectHeight / 2 + 3,
+ garageConsts.rectButtonWidth,
+ garageConsts.rectButtonWidth
+ );
+ this.rectBody.endFill();
+ const rectTransform = this.datas?.childTransforms?.find(
+ (item) => item.name === 'garage_rect_body'
+ );
+ if (rectTransform) {
+ const position = rectTransform?.transform.position;
+ const rotation = rectTransform?.transform?.rotation;
+ this.rectBody.position.set(position?.x, position?.y);
+ this.rectBody.rotation = rotation || 0;
+ }
}
buildRelation() {
diff --git a/src/graphics/garageDoor/GarageDoorDrawAssistant.ts b/src/graphics/garageDoor/GarageDoorDrawAssistant.ts
index 08bdcc0..20511b1 100644
--- a/src/graphics/garageDoor/GarageDoorDrawAssistant.ts
+++ b/src/graphics/garageDoor/GarageDoorDrawAssistant.ts
@@ -121,6 +121,11 @@ export class GarageDoorInteraction extends GraphicInteractionPlugin
g.codeGraph.rotatable = true;
g.codeGraph.transformSave = true;
g.codeGraph.eventMode = 'static';
+ g.rectBody.draggable = true;
+ g.rectBody.selectable = true;
+ g.rectBody.rotatable = true;
+ g.rectBody.transformSave = true;
+ g.rectBody.eventMode = 'static';
g.on('transformstart', this.transformstart, this);
}
unbind(g: GarageDoor): void {
@@ -132,6 +137,11 @@ export class GarageDoorInteraction extends GraphicInteractionPlugin
g.codeGraph.rotatable = false;
g.codeGraph.transformSave = false;
g.codeGraph.eventMode = 'none';
+ g.rectBody.draggable = false;
+ g.rectBody.selectable = false;
+ g.rectBody.rotatable = false;
+ g.rectBody.transformSave = false;
+ g.rectBody.eventMode = 'none';
g.off('transformstart', this.transformstart, this);
}
transformstart(e: GraphicTransformEvent) {
diff --git a/src/graphics/garageDoorBox/GarageDoorBox.ts b/src/graphics/garageDoorBox/GarageDoorBox.ts
deleted file mode 100644
index 162b2cf..0000000
--- a/src/graphics/garageDoorBox/GarageDoorBox.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Graphics } from 'pixi.js';
-import {
- GraphicData,
- JlGraphic,
- JlGraphicTemplate,
- VectorText,
-} from 'jl-graphic';
-
-export interface IGarageDoorBox extends GraphicData {
- get code(): string;
- set code(v: string);
- get flip(): boolean;
- set flip(v: boolean);
- get refGarageDoorId(): number;
- set refGarageDoorId(v: number);
- get refPslMapCode(): string;
- set refPslMapCode(v: string);
- clone(): IGarageDoorBox;
- copyFrom(data: IGarageDoorBox): void;
- eq(other: IGarageDoorBox): boolean;
-}
-
-const garageDoorBoxConsts = {
- codeFontSize: 12,
- codeColor: 0xffffff,
- bodyLineColor: 0xffffff,
- bodyLineWidth: 4,
- bodyRectLineColor: 0xffffff,
- bodyRectLineWidth: 2,
- bodyRectWidth: 20,
- bodyRectHeight: 20,
- bodyColor: 0x000000,
-};
-export class GarageDoorBox extends JlGraphic {
- static Type = 'garageDoorBox';
- codeGraph: VectorText = new VectorText('');
- rectBody: Graphics = new Graphics();
- lineBody: Graphics = new Graphics();
- textGraph: VectorText = new VectorText('G');
-
- constructor() {
- super(GarageDoorBox.Type);
- this.addChild(this.codeGraph);
- this.addChild(this.rectBody);
- this.addChild(this.lineBody);
- this.addChild(this.textGraph);
- this.codeGraph.name = 'g_d_b_code';
- }
- get code(): string {
- return this.datas.code;
- }
- get datas(): IGarageDoorBox {
- return this.getDatas();
- }
- doRepaint(): void {
- const codeGraph = this.codeGraph;
- codeGraph.text = this.datas.code;
- codeGraph.style.fill = garageDoorBoxConsts.codeColor;
- codeGraph.setVectorFontSize(garageDoorBoxConsts.codeFontSize);
- const codeTransform = this.datas?.childTransforms?.find(
- (item) => item.name === 'g_d_b_code'
- );
- if (codeTransform) {
- const position = codeTransform?.transform.position;
- const rotation = codeTransform?.transform?.rotation;
- codeGraph.position.set(position?.x, position?.y);
- codeGraph.rotation = rotation || 0;
- } else {
- codeGraph.position.set(20, 0);
- }
- codeGraph.anchor.set(0.5);
- this.textGraph.style.fill = garageDoorBoxConsts.codeColor;
- this.textGraph.setVectorFontSize(garageDoorBoxConsts.codeFontSize);
- this.textGraph.anchor.set(0.5);
- this.rectBody.clear();
- this.rectBody.beginFill(garageDoorBoxConsts.bodyColor, 0);
- this.rectBody.lineStyle(
- garageDoorBoxConsts.bodyRectLineWidth,
- garageDoorBoxConsts.bodyRectLineColor
- );
- this.rectBody.drawRect(
- -garageDoorBoxConsts.bodyRectWidth / 2,
- -garageDoorBoxConsts.bodyRectHeight / 2,
- garageDoorBoxConsts.bodyRectWidth,
- garageDoorBoxConsts.bodyRectHeight
- );
- this.rectBody.endFill();
- this.lineBody.clear();
- const lineY = this.datas.flip
- ? garageDoorBoxConsts.bodyRectHeight / 2
- : -garageDoorBoxConsts.bodyRectHeight / 2;
- this.lineBody.lineStyle(
- garageDoorBoxConsts.bodyLineWidth,
- garageDoorBoxConsts.bodyLineColor
- );
- this.lineBody.moveTo(-garageDoorBoxConsts.bodyRectWidth / 2, lineY);
- this.lineBody.lineTo(garageDoorBoxConsts.bodyRectWidth / 2, lineY);
- }
-}
-
-export class GarageDoorBoxTemplate extends JlGraphicTemplate {
- constructor(dataTemplate: IGarageDoorBox) {
- super(GarageDoorBox.Type, { dataTemplate });
- }
- new(): GarageDoorBox {
- const garageDoorBox = new GarageDoorBox();
- garageDoorBox.loadData(this.datas);
- return garageDoorBox;
- }
-}
diff --git a/src/graphics/garageDoorBox/GarageDoorBoxAssistant.ts b/src/graphics/garageDoorBox/GarageDoorBoxAssistant.ts
deleted file mode 100644
index c27f6e7..0000000
--- a/src/graphics/garageDoorBox/GarageDoorBoxAssistant.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { DisplayObject, FederatedMouseEvent, Point } from 'pixi.js';
-import {
- AbsorbableLine,
- AbsorbablePosition,
- GraphicDrawAssistant,
- GraphicInteractionPlugin,
- GraphicTransformEvent,
- IDrawApp,
- JlGraphic,
-} from 'jl-graphic';
-import {
- GarageDoorBox,
- GarageDoorBoxTemplate,
- IGarageDoorBox,
-} from './GarageDoorBox';
-
-export interface IGarageDoorBoxDrawOptions {
- newData: () => IGarageDoorBox;
-}
-export class GarageDoorBoxDraw extends GraphicDrawAssistant<
- GarageDoorBoxTemplate,
- IGarageDoorBox
-> {
- _garageDoorBox: GarageDoorBox | null = null;
- constructor(app: IDrawApp, template: GarageDoorBoxTemplate) {
- super(
- app,
- template,
- 'svguse:../../drawIcon.svg#icon-garage-door-box',
- '设置车库门GarageDoorBox'
- );
- GarageDoorBoxInteraction.init(app);
- }
- public get garageDoorBox(): GarageDoorBox {
- if (!this._garageDoorBox) {
- this._garageDoorBox = this.graphicTemplate.new();
- this._garageDoorBox.loadData(this.graphicTemplate.datas);
- this.container.addChild(this._garageDoorBox);
- }
- return this._garageDoorBox;
- }
-
- onLeftUp(e: FederatedMouseEvent): void {
- this.container.position.copyFrom(this.toCanvasCoordinates(e.global));
- this.createAndStore(true);
- }
-
- redraw(p: Point): void {
- this.garageDoorBox.repaint();
- this.container.position.set(p.x, p.y);
- }
-
- prepareData(data: IGarageDoorBox): boolean {
- data.transform = this.container.saveTransform();
- data.code = 'G';
- return true;
- }
-}
-/**
- * 构建吸附线
- * @param garageDoorBox
- */
-function buildAbsorbablePositions(
- garageDoorBox: GarageDoorBox
-): AbsorbablePosition[] {
- const aps: AbsorbablePosition[] = [];
- const garageDoorBoxs = garageDoorBox.queryStore.queryByType(
- GarageDoorBox.Type
- );
- const canvas = garageDoorBox.getCanvas();
- garageDoorBoxs.forEach((item) => {
- if (item.id === garageDoorBox.id) {
- return;
- }
- const ala = new AbsorbableLine(
- new Point(item.x, 0),
- new Point(item.x, canvas.height)
- );
- const alb = new AbsorbableLine(
- new Point(0, item.y),
- new Point(canvas.width, item.y)
- );
- aps.push(ala);
- aps.push(alb);
- });
- return aps;
-}
-
-export class GarageDoorBoxInteraction extends GraphicInteractionPlugin {
- static Name = 'garage_door_box_transform';
- constructor(app: IDrawApp) {
- super(GarageDoorBoxInteraction.Name, app);
- }
- static init(app: IDrawApp) {
- return new GarageDoorBoxInteraction(app);
- }
- filter(...grahpics: JlGraphic[]): GarageDoorBox[] | undefined {
- return grahpics
- .filter((g) => g.type === GarageDoorBox.Type)
- .map((g) => g as GarageDoorBox);
- }
- bind(g: GarageDoorBox): void {
- g.eventMode = 'static';
- g.cursor = 'pointer';
- g.scalable = true;
- g.rotatable = true;
- g.codeGraph.draggable = true;
- g.codeGraph.selectable = true;
- g.codeGraph.rotatable = true;
- g.codeGraph.transformSave = true;
- g.codeGraph.eventMode = 'static';
- g.on('transformstart', this.transformstart, this);
- }
- unbind(g: GarageDoorBox): void {
- g.eventMode = 'none';
- g.scalable = false;
- g.rotatable = false;
- g.codeGraph.draggable = false;
- g.codeGraph.selectable = false;
- g.codeGraph.rotatable = false;
- g.codeGraph.transformSave = false;
- g.codeGraph.eventMode = 'none';
- g.off('transformstart', this.transformstart, this);
- }
- transformstart(e: GraphicTransformEvent) {
- const target = e.target as DisplayObject;
- const garageDoorBox = target.getGraphic() as GarageDoorBox;
- garageDoorBox.getGraphicApp().setOptions({
- absorbablePositions: buildAbsorbablePositions(garageDoorBox),
- });
- }
-}
diff --git a/src/layouts/DrawLayout.vue b/src/layouts/DrawLayout.vue
index ed53f63..be29fca 100644
--- a/src/layouts/DrawLayout.vue
+++ b/src/layouts/DrawLayout.vue
@@ -275,9 +275,8 @@ import { distance2, JlGraphic } from 'jl-graphic';
import { IbpBox } from 'src/graphics/ibpBox/IbpBox';
import { PslBox } from 'src/graphics/pslBox/PslBox';
import { CarWashing } from 'src/graphics/carWashing/CarWashing';
-import { FloodGate } from 'src/graphics/floodGate/FloodGate';
import { GarageDoor } from 'src/graphics/garageDoor/GarageDoor';
-import { GarageDoorBox } from 'src/graphics/garageDoorBox/GarageDoorBox';
+import { FloodGate } from 'src/graphics/floodGate/FloodGate';
const $q = useQuasar();
const route = useRoute();
@@ -444,9 +443,8 @@ onMounted(() => {
IbpBox.Type,
PslBox.Type,
CarWashing.Type,
- FloodGate.Type,
GarageDoor.Type,
- GarageDoorBox.Type,
+ FloodGate.Type,
];
switch (drawStore.categoryType) {
case CategoryType.TH:
diff --git a/src/protos/device_state.ts b/src/protos/device_state.ts
index 86fa582..c63d7f0 100644
--- a/src/protos/device_state.ts
+++ b/src/protos/device_state.ts
@@ -6879,7 +6879,6 @@ export namespace state {
id?: number;
mgj?: boolean;
param?: dependency_3.request.CkmParam;
- stateLoss?: boolean;
}) {
super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@@ -6893,9 +6892,6 @@ export namespace state {
if ("param" in data && data.param != undefined) {
this.param = data.param;
}
- if ("stateLoss" in data && data.stateLoss != undefined) {
- this.stateLoss = data.stateLoss;
- }
}
}
get id() {
@@ -6919,17 +6915,10 @@ export namespace state {
get has_param() {
return pb_1.Message.getField(this, 3) != null;
}
- get stateLoss() {
- return pb_1.Message.getFieldWithDefault(this, 4, false) as boolean;
- }
- set stateLoss(value: boolean) {
- pb_1.Message.setField(this, 4, value);
- }
static fromObject(data: {
id?: number;
mgj?: boolean;
param?: ReturnType;
- stateLoss?: boolean;
}): CkmState {
const message = new CkmState({});
if (data.id != null) {
@@ -6941,9 +6930,6 @@ export namespace state {
if (data.param != null) {
message.param = dependency_3.request.CkmParam.fromObject(data.param);
}
- if (data.stateLoss != null) {
- message.stateLoss = data.stateLoss;
- }
return message;
}
toObject() {
@@ -6951,7 +6937,6 @@ export namespace state {
id?: number;
mgj?: boolean;
param?: ReturnType;
- stateLoss?: boolean;
} = {};
if (this.id != null) {
data.id = this.id;
@@ -6962,9 +6947,6 @@ export namespace state {
if (this.param != null) {
data.param = this.param.toObject();
}
- if (this.stateLoss != null) {
- data.stateLoss = this.stateLoss;
- }
return data;
}
serialize(): Uint8Array;
@@ -6977,8 +6959,6 @@ export namespace state {
writer.writeBool(2, this.mgj);
if (this.has_param)
writer.writeMessage(3, this.param, () => this.param.serialize(writer));
- if (this.stateLoss != false)
- writer.writeBool(4, this.stateLoss);
if (!w)
return writer.getResultBuffer();
}
@@ -6997,9 +6977,6 @@ export namespace state {
case 3:
reader.readMessage(message.param, () => message.param = dependency_3.request.CkmParam.deserialize(reader));
break;
- case 4:
- message.stateLoss = reader.readBool();
- break;
default: reader.skipField();
}
}
@@ -7188,9 +7165,10 @@ export namespace state {
baliseState?: BaliseState[];
stationQc?: StationQc;
ckmStates?: CkmState[];
+ fymStates?: CkmState[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("trainState" in data && data.trainState != undefined) {
this.trainState = data.trainState;
@@ -7234,6 +7212,9 @@ export namespace state {
if ("ckmStates" in data && data.ckmStates != undefined) {
this.ckmStates = data.ckmStates;
}
+ if ("fymStates" in data && data.fymStates != undefined) {
+ this.fymStates = data.fymStates;
+ }
}
}
get trainState() {
@@ -7323,6 +7304,12 @@ export namespace state {
set ckmStates(value: CkmState[]) {
pb_1.Message.setRepeatedWrapperField(this, 14, value);
}
+ get fymStates() {
+ return pb_1.Message.getRepeatedWrapperField(this, CkmState, 15) as CkmState[];
+ }
+ set fymStates(value: CkmState[]) {
+ pb_1.Message.setRepeatedWrapperField(this, 15, value);
+ }
static fromObject(data: {
trainState?: ReturnType[];
switchState?: ReturnType[];
@@ -7338,6 +7325,7 @@ export namespace state {
baliseState?: ReturnType[];
stationQc?: ReturnType;
ckmStates?: ReturnType[];
+ fymStates?: ReturnType[];
}): AllDevicesStatus {
const message = new AllDevicesStatus({});
if (data.trainState != null) {
@@ -7382,6 +7370,9 @@ export namespace state {
if (data.ckmStates != null) {
message.ckmStates = data.ckmStates.map(item => CkmState.fromObject(item));
}
+ if (data.fymStates != null) {
+ message.fymStates = data.fymStates.map(item => CkmState.fromObject(item));
+ }
return message;
}
toObject() {
@@ -7400,6 +7391,7 @@ export namespace state {
baliseState?: ReturnType[];
stationQc?: ReturnType;
ckmStates?: ReturnType[];
+ fymStates?: ReturnType[];
} = {};
if (this.trainState != null) {
data.trainState = this.trainState.map((item: TrainMapState) => item.toObject());
@@ -7443,6 +7435,9 @@ export namespace state {
if (this.ckmStates != null) {
data.ckmStates = this.ckmStates.map((item: CkmState) => item.toObject());
}
+ if (this.fymStates != null) {
+ data.fymStates = this.fymStates.map((item: CkmState) => item.toObject());
+ }
return data;
}
serialize(): Uint8Array;
@@ -7477,6 +7472,8 @@ export namespace state {
writer.writeMessage(13, this.stationQc, () => this.stationQc.serialize(writer));
if (this.ckmStates.length)
writer.writeRepeatedMessage(14, this.ckmStates, (item: CkmState) => item.serialize(writer));
+ if (this.fymStates.length)
+ writer.writeRepeatedMessage(15, this.fymStates, (item: CkmState) => item.serialize(writer));
if (!w)
return writer.getResultBuffer();
}
@@ -7528,6 +7525,9 @@ export namespace state {
case 14:
reader.readMessage(message.ckmStates, () => pb_1.Message.addToRepeatedWrapperField(message, 14, CkmState.deserialize(reader), CkmState));
break;
+ case 15:
+ reader.readMessage(message.fymStates, () => pb_1.Message.addToRepeatedWrapperField(message, 15, CkmState.deserialize(reader), CkmState));
+ break;
default: reader.skipField();
}
}
diff --git a/src/protos/stationLayoutGraphics.ts b/src/protos/stationLayoutGraphics.ts
index 32ddc6f..50de0e4 100644
--- a/src/protos/stationLayoutGraphics.ts
+++ b/src/protos/stationLayoutGraphics.ts
@@ -54,11 +54,10 @@ export namespace graphicData {
pslBoxs?: PslBox[];
carWashings?: CarWashing[];
garageDoors?: GarageDoor[];
- floodGates?: FloodGate[];
- garageDoorBoxes?: GarageDoorBox[];
+ floodGates?: GarageDoor[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 32, 33, 34, 35, 37, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 32, 33, 34, 35, 37, 39, 40, 41, 42, 43, 44, 45, 46, 47], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("canvas" in data && data.canvas != undefined) {
this.canvas = data.canvas;
@@ -186,9 +185,6 @@ export namespace graphicData {
if ("floodGates" in data && data.floodGates != undefined) {
this.floodGates = data.floodGates;
}
- if ("garageDoorBoxes" in data && data.garageDoorBoxes != undefined) {
- this.garageDoorBoxes = data.garageDoorBoxes;
- }
}
}
get canvas() {
@@ -450,17 +446,11 @@ export namespace graphicData {
pb_1.Message.setRepeatedWrapperField(this, 46, value);
}
get floodGates() {
- return pb_1.Message.getRepeatedWrapperField(this, FloodGate, 47) as FloodGate[];
+ return pb_1.Message.getRepeatedWrapperField(this, GarageDoor, 47) as GarageDoor[];
}
- set floodGates(value: FloodGate[]) {
+ set floodGates(value: GarageDoor[]) {
pb_1.Message.setRepeatedWrapperField(this, 47, value);
}
- get garageDoorBoxes() {
- return pb_1.Message.getRepeatedWrapperField(this, GarageDoorBox, 48) as GarageDoorBox[];
- }
- set garageDoorBoxes(value: GarageDoorBox[]) {
- pb_1.Message.setRepeatedWrapperField(this, 48, value);
- }
static fromObject(data: {
canvas?: ReturnType;
Platforms?: ReturnType[];
@@ -503,8 +493,7 @@ export namespace graphicData {
pslBoxs?: ReturnType[];
carWashings?: ReturnType[];
garageDoors?: ReturnType[];
- floodGates?: ReturnType[];
- garageDoorBoxes?: ReturnType[];
+ floodGates?: ReturnType[];
}): RtssGraphicStorage {
const message = new RtssGraphicStorage({});
if (data.canvas != null) {
@@ -631,10 +620,7 @@ export namespace graphicData {
message.garageDoors = data.garageDoors.map(item => GarageDoor.fromObject(item));
}
if (data.floodGates != null) {
- message.floodGates = data.floodGates.map(item => FloodGate.fromObject(item));
- }
- if (data.garageDoorBoxes != null) {
- message.garageDoorBoxes = data.garageDoorBoxes.map(item => GarageDoorBox.fromObject(item));
+ message.floodGates = data.floodGates.map(item => GarageDoor.fromObject(item));
}
return message;
}
@@ -681,8 +667,7 @@ export namespace graphicData {
pslBoxs?: ReturnType[];
carWashings?: ReturnType[];
garageDoors?: ReturnType[];
- floodGates?: ReturnType[];
- garageDoorBoxes?: ReturnType[];
+ floodGates?: ReturnType[];
} = {};
if (this.canvas != null) {
data.canvas = this.canvas.toObject();
@@ -808,10 +793,7 @@ export namespace graphicData {
data.garageDoors = this.garageDoors.map((item: GarageDoor) => item.toObject());
}
if (this.floodGates != null) {
- data.floodGates = this.floodGates.map((item: FloodGate) => item.toObject());
- }
- if (this.garageDoorBoxes != null) {
- data.garageDoorBoxes = this.garageDoorBoxes.map((item: GarageDoorBox) => item.toObject());
+ data.floodGates = this.floodGates.map((item: GarageDoor) => item.toObject());
}
return data;
}
@@ -902,9 +884,7 @@ export namespace graphicData {
if (this.garageDoors.length)
writer.writeRepeatedMessage(46, this.garageDoors, (item: GarageDoor) => item.serialize(writer));
if (this.floodGates.length)
- writer.writeRepeatedMessage(47, this.floodGates, (item: FloodGate) => item.serialize(writer));
- if (this.garageDoorBoxes.length)
- writer.writeRepeatedMessage(48, this.garageDoorBoxes, (item: GarageDoorBox) => item.serialize(writer));
+ writer.writeRepeatedMessage(47, this.floodGates, (item: GarageDoor) => item.serialize(writer));
if (!w)
return writer.getResultBuffer();
}
@@ -1038,10 +1018,7 @@ export namespace graphicData {
reader.readMessage(message.garageDoors, () => pb_1.Message.addToRepeatedWrapperField(message, 46, GarageDoor.deserialize(reader), GarageDoor));
break;
case 47:
- reader.readMessage(message.floodGates, () => pb_1.Message.addToRepeatedWrapperField(message, 47, FloodGate.deserialize(reader), FloodGate));
- break;
- case 48:
- reader.readMessage(message.garageDoorBoxes, () => pb_1.Message.addToRepeatedWrapperField(message, 48, GarageDoorBox.deserialize(reader), GarageDoorBox));
+ reader.readMessage(message.floodGates, () => pb_1.Message.addToRepeatedWrapperField(message, 47, GarageDoor.deserialize(reader), GarageDoor));
break;
default: reader.skipField();
}
@@ -1664,7 +1641,6 @@ export namespace graphicData {
export class CommonInfo extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
- oldid?: string;
graphicType?: string;
transform?: Transform;
childTransforms?: ChildTransform[];
@@ -1673,9 +1649,6 @@ export namespace graphicData {
super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [4], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
- if ("oldid" in data && data.oldid != undefined) {
- this.oldid = data.oldid;
- }
if ("graphicType" in data && data.graphicType != undefined) {
this.graphicType = data.graphicType;
}
@@ -1690,12 +1663,6 @@ export namespace graphicData {
}
}
}
- get oldid() {
- return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
- }
- set oldid(value: string) {
- pb_1.Message.setField(this, 1, value);
- }
get graphicType() {
return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
}
@@ -1724,16 +1691,12 @@ export namespace graphicData {
pb_1.Message.setField(this, 5, value);
}
static fromObject(data: {
- oldid?: string;
graphicType?: string;
transform?: ReturnType;
childTransforms?: ReturnType[];
id?: number;
}): CommonInfo {
const message = new CommonInfo({});
- if (data.oldid != null) {
- message.oldid = data.oldid;
- }
if (data.graphicType != null) {
message.graphicType = data.graphicType;
}
@@ -1750,15 +1713,11 @@ export namespace graphicData {
}
toObject() {
const data: {
- oldid?: string;
graphicType?: string;
transform?: ReturnType;
childTransforms?: ReturnType[];
id?: number;
} = {};
- if (this.oldid != null) {
- data.oldid = this.oldid;
- }
if (this.graphicType != null) {
data.graphicType = this.graphicType;
}
@@ -1777,8 +1736,6 @@ export namespace graphicData {
serialize(w: pb_1.BinaryWriter): void;
serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
const writer = w || new pb_1.BinaryWriter();
- if (this.oldid.length)
- writer.writeString(1, this.oldid);
if (this.graphicType.length)
writer.writeString(2, this.graphicType);
if (this.has_transform)
@@ -1796,9 +1753,6 @@ export namespace graphicData {
if (reader.isEndGroup())
break;
switch (reader.getFieldNumber()) {
- case 1:
- message.oldid = reader.readString();
- break;
case 2:
message.graphicType = reader.readString();
break;
@@ -1973,8 +1927,6 @@ export namespace graphicData {
common?: CommonInfo;
code?: string;
points?: Point[];
- oldrefLeftStationId?: string;
- oldrefRightStationId?: string;
nodeConWithSecs?: NodeConWithSec[];
isOtherLineConcentrationDividingLine?: boolean;
refLeftStationId?: number;
@@ -1992,12 +1944,6 @@ export namespace graphicData {
if ("points" in data && data.points != undefined) {
this.points = data.points;
}
- if ("oldrefLeftStationId" in data && data.oldrefLeftStationId != undefined) {
- this.oldrefLeftStationId = data.oldrefLeftStationId;
- }
- if ("oldrefRightStationId" in data && data.oldrefRightStationId != undefined) {
- this.oldrefRightStationId = data.oldrefRightStationId;
- }
if ("nodeConWithSecs" in data && data.nodeConWithSecs != undefined) {
this.nodeConWithSecs = data.nodeConWithSecs;
}
@@ -2033,18 +1979,6 @@ export namespace graphicData {
set points(value: Point[]) {
pb_1.Message.setRepeatedWrapperField(this, 3, value);
}
- get oldrefLeftStationId() {
- return pb_1.Message.getFieldWithDefault(this, 4, "") as string;
- }
- set oldrefLeftStationId(value: string) {
- pb_1.Message.setField(this, 4, value);
- }
- get oldrefRightStationId() {
- return pb_1.Message.getFieldWithDefault(this, 5, "") as string;
- }
- set oldrefRightStationId(value: string) {
- pb_1.Message.setField(this, 5, value);
- }
get nodeConWithSecs() {
return pb_1.Message.getRepeatedWrapperField(this, NodeConWithSec, 6) as NodeConWithSec[];
}
@@ -2073,8 +2007,6 @@ export namespace graphicData {
common?: ReturnType;
code?: string;
points?: ReturnType[];
- oldrefLeftStationId?: string;
- oldrefRightStationId?: string;
nodeConWithSecs?: ReturnType[];
isOtherLineConcentrationDividingLine?: boolean;
refLeftStationId?: number;
@@ -2090,12 +2022,6 @@ export namespace graphicData {
if (data.points != null) {
message.points = data.points.map(item => Point.fromObject(item));
}
- if (data.oldrefLeftStationId != null) {
- message.oldrefLeftStationId = data.oldrefLeftStationId;
- }
- if (data.oldrefRightStationId != null) {
- message.oldrefRightStationId = data.oldrefRightStationId;
- }
if (data.nodeConWithSecs != null) {
message.nodeConWithSecs = data.nodeConWithSecs.map(item => NodeConWithSec.fromObject(item));
}
@@ -2115,8 +2041,6 @@ export namespace graphicData {
common?: ReturnType;
code?: string;
points?: ReturnType[];
- oldrefLeftStationId?: string;
- oldrefRightStationId?: string;
nodeConWithSecs?: ReturnType[];
isOtherLineConcentrationDividingLine?: boolean;
refLeftStationId?: number;
@@ -2131,12 +2055,6 @@ export namespace graphicData {
if (this.points != null) {
data.points = this.points.map((item: Point) => item.toObject());
}
- if (this.oldrefLeftStationId != null) {
- data.oldrefLeftStationId = this.oldrefLeftStationId;
- }
- if (this.oldrefRightStationId != null) {
- data.oldrefRightStationId = this.oldrefRightStationId;
- }
if (this.nodeConWithSecs != null) {
data.nodeConWithSecs = this.nodeConWithSecs.map((item: NodeConWithSec) => item.toObject());
}
@@ -2161,10 +2079,6 @@ export namespace graphicData {
writer.writeString(2, this.code);
if (this.points.length)
writer.writeRepeatedMessage(3, this.points, (item: Point) => item.serialize(writer));
- if (this.oldrefLeftStationId.length)
- writer.writeString(4, this.oldrefLeftStationId);
- if (this.oldrefRightStationId.length)
- writer.writeString(5, this.oldrefRightStationId);
if (this.nodeConWithSecs.length)
writer.writeRepeatedMessage(6, this.nodeConWithSecs, (item: NodeConWithSec) => item.serialize(writer));
if (this.isOtherLineConcentrationDividingLine != false)
@@ -2191,12 +2105,6 @@ export namespace graphicData {
case 3:
reader.readMessage(message.points, () => pb_1.Message.addToRepeatedWrapperField(message, 3, Point.deserialize(reader), Point));
break;
- case 4:
- message.oldrefLeftStationId = reader.readString();
- break;
- case 5:
- message.oldrefRightStationId = reader.readString();
- break;
case 6:
reader.readMessage(message.nodeConWithSecs, () => pb_1.Message.addToRepeatedWrapperField(message, 6, NodeConWithSec.deserialize(reader), NodeConWithSec));
break;
@@ -2322,8 +2230,6 @@ export namespace graphicData {
constructor(data?: any[] | {
common?: CommonInfo;
code?: string;
- oldrefStationId?: string;
- oldrefSectionId?: string;
refEsbRelayCode?: string;
type?: Platform.TypeOfPlatform;
refStationId?: number;
@@ -2338,12 +2244,6 @@ export namespace graphicData {
if ("code" in data && data.code != undefined) {
this.code = data.code;
}
- if ("oldrefStationId" in data && data.oldrefStationId != undefined) {
- this.oldrefStationId = data.oldrefStationId;
- }
- if ("oldrefSectionId" in data && data.oldrefSectionId != undefined) {
- this.oldrefSectionId = data.oldrefSectionId;
- }
if ("refEsbRelayCode" in data && data.refEsbRelayCode != undefined) {
this.refEsbRelayCode = data.refEsbRelayCode;
}
@@ -2373,18 +2273,6 @@ export namespace graphicData {
set code(value: string) {
pb_1.Message.setField(this, 2, value);
}
- get oldrefStationId() {
- return pb_1.Message.getFieldWithDefault(this, 9, "") as string;
- }
- set oldrefStationId(value: string) {
- pb_1.Message.setField(this, 9, value);
- }
- get oldrefSectionId() {
- return pb_1.Message.getFieldWithDefault(this, 10, "") as string;
- }
- set oldrefSectionId(value: string) {
- pb_1.Message.setField(this, 10, value);
- }
get refEsbRelayCode() {
return pb_1.Message.getFieldWithDefault(this, 11, "") as string;
}
@@ -2412,8 +2300,6 @@ export namespace graphicData {
static fromObject(data: {
common?: ReturnType;
code?: string;
- oldrefStationId?: string;
- oldrefSectionId?: string;
refEsbRelayCode?: string;
type?: Platform.TypeOfPlatform;
refStationId?: number;
@@ -2426,12 +2312,6 @@ export namespace graphicData {
if (data.code != null) {
message.code = data.code;
}
- if (data.oldrefStationId != null) {
- message.oldrefStationId = data.oldrefStationId;
- }
- if (data.oldrefSectionId != null) {
- message.oldrefSectionId = data.oldrefSectionId;
- }
if (data.refEsbRelayCode != null) {
message.refEsbRelayCode = data.refEsbRelayCode;
}
@@ -2450,8 +2330,6 @@ export namespace graphicData {
const data: {
common?: ReturnType;
code?: string;
- oldrefStationId?: string;
- oldrefSectionId?: string;
refEsbRelayCode?: string;
type?: Platform.TypeOfPlatform;
refStationId?: number;
@@ -2463,12 +2341,6 @@ export namespace graphicData {
if (this.code != null) {
data.code = this.code;
}
- if (this.oldrefStationId != null) {
- data.oldrefStationId = this.oldrefStationId;
- }
- if (this.oldrefSectionId != null) {
- data.oldrefSectionId = this.oldrefSectionId;
- }
if (this.refEsbRelayCode != null) {
data.refEsbRelayCode = this.refEsbRelayCode;
}
@@ -2491,10 +2363,6 @@ export namespace graphicData {
writer.writeMessage(1, this.common, () => this.common.serialize(writer));
if (this.code.length)
writer.writeString(2, this.code);
- if (this.oldrefStationId.length)
- writer.writeString(9, this.oldrefStationId);
- if (this.oldrefSectionId.length)
- writer.writeString(10, this.oldrefSectionId);
if (this.refEsbRelayCode.length)
writer.writeString(11, this.refEsbRelayCode);
if (this.type != Platform.TypeOfPlatform.Unknown)
@@ -2518,12 +2386,6 @@ export namespace graphicData {
case 2:
message.code = reader.readString();
break;
- case 9:
- message.oldrefStationId = reader.readString();
- break;
- case 10:
- message.oldrefSectionId = reader.readString();
- break;
case 11:
message.refEsbRelayCode = reader.readString();
break;
@@ -2560,7 +2422,6 @@ export namespace graphicData {
constructor(data?: any[] | {
common?: CommonInfo;
code?: string;
- oldrefPlatformId?: string;
refPlatformId?: number;
}) {
super();
@@ -2572,9 +2433,6 @@ export namespace graphicData {
if ("code" in data && data.code != undefined) {
this.code = data.code;
}
- if ("oldrefPlatformId" in data && data.oldrefPlatformId != undefined) {
- this.oldrefPlatformId = data.oldrefPlatformId;
- }
if ("refPlatformId" in data && data.refPlatformId != undefined) {
this.refPlatformId = data.refPlatformId;
}
@@ -2595,12 +2453,6 @@ export namespace graphicData {
set code(value: string) {
pb_1.Message.setField(this, 2, value);
}
- get oldrefPlatformId() {
- return pb_1.Message.getFieldWithDefault(this, 4, "") as string;
- }
- set oldrefPlatformId(value: string) {
- pb_1.Message.setField(this, 4, value);
- }
get refPlatformId() {
return pb_1.Message.getFieldWithDefault(this, 6, 0) as number;
}
@@ -2610,7 +2462,6 @@ export namespace graphicData {
static fromObject(data: {
common?: ReturnType;
code?: string;
- oldrefPlatformId?: string;
refPlatformId?: number;
}): ScreenDoor {
const message = new ScreenDoor({});
@@ -2620,9 +2471,6 @@ export namespace graphicData {
if (data.code != null) {
message.code = data.code;
}
- if (data.oldrefPlatformId != null) {
- message.oldrefPlatformId = data.oldrefPlatformId;
- }
if (data.refPlatformId != null) {
message.refPlatformId = data.refPlatformId;
}
@@ -2632,7 +2480,6 @@ export namespace graphicData {
const data: {
common?: ReturnType;
code?: string;
- oldrefPlatformId?: string;
refPlatformId?: number;
} = {};
if (this.common != null) {
@@ -2641,9 +2488,6 @@ export namespace graphicData {
if (this.code != null) {
data.code = this.code;
}
- if (this.oldrefPlatformId != null) {
- data.oldrefPlatformId = this.oldrefPlatformId;
- }
if (this.refPlatformId != null) {
data.refPlatformId = this.refPlatformId;
}
@@ -2657,8 +2501,6 @@ export namespace graphicData {
writer.writeMessage(1, this.common, () => this.common.serialize(writer));
if (this.code.length)
writer.writeString(2, this.code);
- if (this.oldrefPlatformId.length)
- writer.writeString(4, this.oldrefPlatformId);
if (this.refPlatformId != 0)
writer.writeUint32(6, this.refPlatformId);
if (!w)
@@ -2676,9 +2518,6 @@ export namespace graphicData {
case 2:
message.code = reader.readString();
break;
- case 4:
- message.oldrefPlatformId = reader.readString();
- break;
case 6:
message.refPlatformId = reader.readUint32();
break;
@@ -2907,11 +2746,10 @@ export namespace graphicData {
stationName?: string;
stationNameAcronym?: string;
depots?: boolean;
- oldmanageStations?: string[];
manageStations?: number[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [12, 13], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [13], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("common" in data && data.common != undefined) {
this.common = data.common;
@@ -2934,9 +2772,6 @@ export namespace graphicData {
if ("depots" in data && data.depots != undefined) {
this.depots = data.depots;
}
- if ("oldmanageStations" in data && data.oldmanageStations != undefined) {
- this.oldmanageStations = data.oldmanageStations;
- }
if ("manageStations" in data && data.manageStations != undefined) {
this.manageStations = data.manageStations;
}
@@ -2990,12 +2825,6 @@ export namespace graphicData {
set depots(value: boolean) {
pb_1.Message.setField(this, 11, value);
}
- get oldmanageStations() {
- return pb_1.Message.getFieldWithDefault(this, 12, []) as string[];
- }
- set oldmanageStations(value: string[]) {
- pb_1.Message.setField(this, 12, value);
- }
get manageStations() {
return pb_1.Message.getFieldWithDefault(this, 13, []) as number[];
}
@@ -3010,7 +2839,6 @@ export namespace graphicData {
stationName?: string;
stationNameAcronym?: string;
depots?: boolean;
- oldmanageStations?: string[];
manageStations?: number[];
}): Station {
const message = new Station({});
@@ -3035,9 +2863,6 @@ export namespace graphicData {
if (data.depots != null) {
message.depots = data.depots;
}
- if (data.oldmanageStations != null) {
- message.oldmanageStations = data.oldmanageStations;
- }
if (data.manageStations != null) {
message.manageStations = data.manageStations;
}
@@ -3052,7 +2877,6 @@ export namespace graphicData {
stationName?: string;
stationNameAcronym?: string;
depots?: boolean;
- oldmanageStations?: string[];
manageStations?: number[];
} = {};
if (this.common != null) {
@@ -3076,9 +2900,6 @@ export namespace graphicData {
if (this.depots != null) {
data.depots = this.depots;
}
- if (this.oldmanageStations != null) {
- data.oldmanageStations = this.oldmanageStations;
- }
if (this.manageStations != null) {
data.manageStations = this.manageStations;
}
@@ -3102,8 +2923,6 @@ export namespace graphicData {
writer.writeString(10, this.stationNameAcronym);
if (this.depots != false)
writer.writeBool(11, this.depots);
- if (this.oldmanageStations.length)
- writer.writeRepeatedString(12, this.oldmanageStations);
if (this.manageStations.length)
writer.writePackedUint32(13, this.manageStations);
if (!w)
@@ -3136,9 +2955,6 @@ export namespace graphicData {
case 11:
message.depots = reader.readBool();
break;
- case 12:
- pb_1.Message.addToRepeatedField(message, 12, reader.readString());
- break;
case 13:
message.manageStations = reader.readPackedUint32();
break;
@@ -3278,11 +3094,10 @@ export namespace graphicData {
kilometerSystem?: KilometerSystem;
axleCountingRef?: RelatedRef[];
type?: AxleCounting.TypeDetectionPoint;
- oldcentralizedStations?: string[];
centralizedStations?: number[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [4, 8, 9], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [4, 9], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("common" in data && data.common != undefined) {
this.common = data.common;
@@ -3299,9 +3114,6 @@ export namespace graphicData {
if ("type" in data && data.type != undefined) {
this.type = data.type;
}
- if ("oldcentralizedStations" in data && data.oldcentralizedStations != undefined) {
- this.oldcentralizedStations = data.oldcentralizedStations;
- }
if ("centralizedStations" in data && data.centralizedStations != undefined) {
this.centralizedStations = data.centralizedStations;
}
@@ -3343,12 +3155,6 @@ export namespace graphicData {
set type(value: AxleCounting.TypeDetectionPoint) {
pb_1.Message.setField(this, 7, value);
}
- get oldcentralizedStations() {
- return pb_1.Message.getFieldWithDefault(this, 8, []) as string[];
- }
- set oldcentralizedStations(value: string[]) {
- pb_1.Message.setField(this, 8, value);
- }
get centralizedStations() {
return pb_1.Message.getFieldWithDefault(this, 9, []) as number[];
}
@@ -3361,7 +3167,6 @@ export namespace graphicData {
kilometerSystem?: ReturnType;
axleCountingRef?: ReturnType[];
type?: AxleCounting.TypeDetectionPoint;
- oldcentralizedStations?: string[];
centralizedStations?: number[];
}): AxleCounting {
const message = new AxleCounting({});
@@ -3380,9 +3185,6 @@ export namespace graphicData {
if (data.type != null) {
message.type = data.type;
}
- if (data.oldcentralizedStations != null) {
- message.oldcentralizedStations = data.oldcentralizedStations;
- }
if (data.centralizedStations != null) {
message.centralizedStations = data.centralizedStations;
}
@@ -3395,7 +3197,6 @@ export namespace graphicData {
kilometerSystem?: ReturnType;
axleCountingRef?: ReturnType[];
type?: AxleCounting.TypeDetectionPoint;
- oldcentralizedStations?: string[];
centralizedStations?: number[];
} = {};
if (this.common != null) {
@@ -3413,9 +3214,6 @@ export namespace graphicData {
if (this.type != null) {
data.type = this.type;
}
- if (this.oldcentralizedStations != null) {
- data.oldcentralizedStations = this.oldcentralizedStations;
- }
if (this.centralizedStations != null) {
data.centralizedStations = this.centralizedStations;
}
@@ -3435,8 +3233,6 @@ export namespace graphicData {
writer.writeRepeatedMessage(4, this.axleCountingRef, (item: RelatedRef) => item.serialize(writer));
if (this.type != AxleCounting.TypeDetectionPoint.AxleCounting)
writer.writeEnum(7, this.type);
- if (this.oldcentralizedStations.length)
- writer.writeRepeatedString(8, this.oldcentralizedStations);
if (this.centralizedStations.length)
writer.writePackedUint32(9, this.centralizedStations);
if (!w)
@@ -3463,9 +3259,6 @@ export namespace graphicData {
case 7:
message.type = reader.readEnum();
break;
- case 8:
- pb_1.Message.addToRepeatedField(message, 8, reader.readString());
- break;
case 9:
message.centralizedStations = reader.readPackedUint32();
break;
@@ -3490,20 +3283,12 @@ export namespace graphicData {
export class GenerateAxleCountingConfig extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
- oldbbConnect?: string[];
- oldnoGenerateGroup?: string[];
bbConnect?: number[];
noGenerateGroup?: number[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1, 2, 3, 4], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [3, 4], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
- if ("oldbbConnect" in data && data.oldbbConnect != undefined) {
- this.oldbbConnect = data.oldbbConnect;
- }
- if ("oldnoGenerateGroup" in data && data.oldnoGenerateGroup != undefined) {
- this.oldnoGenerateGroup = data.oldnoGenerateGroup;
- }
if ("bbConnect" in data && data.bbConnect != undefined) {
this.bbConnect = data.bbConnect;
}
@@ -3512,18 +3297,6 @@ export namespace graphicData {
}
}
}
- get oldbbConnect() {
- return pb_1.Message.getFieldWithDefault(this, 1, []) as string[];
- }
- set oldbbConnect(value: string[]) {
- pb_1.Message.setField(this, 1, value);
- }
- get oldnoGenerateGroup() {
- return pb_1.Message.getFieldWithDefault(this, 2, []) as string[];
- }
- set oldnoGenerateGroup(value: string[]) {
- pb_1.Message.setField(this, 2, value);
- }
get bbConnect() {
return pb_1.Message.getFieldWithDefault(this, 3, []) as number[];
}
@@ -3537,18 +3310,10 @@ export namespace graphicData {
pb_1.Message.setField(this, 4, value);
}
static fromObject(data: {
- oldbbConnect?: string[];
- oldnoGenerateGroup?: string[];
bbConnect?: number[];
noGenerateGroup?: number[];
}): GenerateAxleCountingConfig {
const message = new GenerateAxleCountingConfig({});
- if (data.oldbbConnect != null) {
- message.oldbbConnect = data.oldbbConnect;
- }
- if (data.oldnoGenerateGroup != null) {
- message.oldnoGenerateGroup = data.oldnoGenerateGroup;
- }
if (data.bbConnect != null) {
message.bbConnect = data.bbConnect;
}
@@ -3559,17 +3324,9 @@ export namespace graphicData {
}
toObject() {
const data: {
- oldbbConnect?: string[];
- oldnoGenerateGroup?: string[];
bbConnect?: number[];
noGenerateGroup?: number[];
} = {};
- if (this.oldbbConnect != null) {
- data.oldbbConnect = this.oldbbConnect;
- }
- if (this.oldnoGenerateGroup != null) {
- data.oldnoGenerateGroup = this.oldnoGenerateGroup;
- }
if (this.bbConnect != null) {
data.bbConnect = this.bbConnect;
}
@@ -3582,10 +3339,6 @@ export namespace graphicData {
serialize(w: pb_1.BinaryWriter): void;
serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
const writer = w || new pb_1.BinaryWriter();
- if (this.oldbbConnect.length)
- writer.writeRepeatedString(1, this.oldbbConnect);
- if (this.oldnoGenerateGroup.length)
- writer.writeRepeatedString(2, this.oldnoGenerateGroup);
if (this.bbConnect.length)
writer.writePackedUint32(3, this.bbConnect);
if (this.noGenerateGroup.length)
@@ -3599,12 +3352,6 @@ export namespace graphicData {
if (reader.isEndGroup())
break;
switch (reader.getFieldNumber()) {
- case 1:
- pb_1.Message.addToRepeatedField(message, 1, reader.readString());
- break;
- case 2:
- pb_1.Message.addToRepeatedField(message, 2, reader.readString());
- break;
case 3:
message.bbConnect = reader.readPackedUint32();
break;
@@ -3635,18 +3382,14 @@ export namespace graphicData {
pbRef?: RelatedRef;
pcRef?: RelatedRef;
kilometerSystem?: KilometerSystem[];
- oldpaTrackSectionId?: string;
- oldpbTrackSectionId?: string;
- oldpcTrackSectionId?: string;
switchMachineType?: Turnout.SwitchMachineType;
- oldcentralizedStations?: string[];
centralizedStations?: number[];
paTrackSectionId?: number;
pbTrackSectionId?: number;
pcTrackSectionId?: number;
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [6, 7, 8, 13, 19, 20], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [6, 7, 8, 13, 20], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("common" in data && data.common != undefined) {
this.common = data.common;
@@ -3675,21 +3418,9 @@ export namespace graphicData {
if ("kilometerSystem" in data && data.kilometerSystem != undefined) {
this.kilometerSystem = data.kilometerSystem;
}
- if ("oldpaTrackSectionId" in data && data.oldpaTrackSectionId != undefined) {
- this.oldpaTrackSectionId = data.oldpaTrackSectionId;
- }
- if ("oldpbTrackSectionId" in data && data.oldpbTrackSectionId != undefined) {
- this.oldpbTrackSectionId = data.oldpbTrackSectionId;
- }
- if ("oldpcTrackSectionId" in data && data.oldpcTrackSectionId != undefined) {
- this.oldpcTrackSectionId = data.oldpcTrackSectionId;
- }
if ("switchMachineType" in data && data.switchMachineType != undefined) {
this.switchMachineType = data.switchMachineType;
}
- if ("oldcentralizedStations" in data && data.oldcentralizedStations != undefined) {
- this.oldcentralizedStations = data.oldcentralizedStations;
- }
if ("centralizedStations" in data && data.centralizedStations != undefined) {
this.centralizedStations = data.centralizedStations;
}
@@ -3770,36 +3501,12 @@ export namespace graphicData {
set kilometerSystem(value: KilometerSystem[]) {
pb_1.Message.setRepeatedWrapperField(this, 13, value);
}
- get oldpaTrackSectionId() {
- return pb_1.Message.getFieldWithDefault(this, 15, "") as string;
- }
- set oldpaTrackSectionId(value: string) {
- pb_1.Message.setField(this, 15, value);
- }
- get oldpbTrackSectionId() {
- return pb_1.Message.getFieldWithDefault(this, 16, "") as string;
- }
- set oldpbTrackSectionId(value: string) {
- pb_1.Message.setField(this, 16, value);
- }
- get oldpcTrackSectionId() {
- return pb_1.Message.getFieldWithDefault(this, 17, "") as string;
- }
- set oldpcTrackSectionId(value: string) {
- pb_1.Message.setField(this, 17, value);
- }
get switchMachineType() {
return pb_1.Message.getFieldWithDefault(this, 18, Turnout.SwitchMachineType.Unknown) as Turnout.SwitchMachineType;
}
set switchMachineType(value: Turnout.SwitchMachineType) {
pb_1.Message.setField(this, 18, value);
}
- get oldcentralizedStations() {
- return pb_1.Message.getFieldWithDefault(this, 19, []) as string[];
- }
- set oldcentralizedStations(value: string[]) {
- pb_1.Message.setField(this, 19, value);
- }
get centralizedStations() {
return pb_1.Message.getFieldWithDefault(this, 20, []) as number[];
}
@@ -3834,11 +3541,7 @@ export namespace graphicData {
pbRef?: ReturnType;
pcRef?: ReturnType;
kilometerSystem?: ReturnType[];
- oldpaTrackSectionId?: string;
- oldpbTrackSectionId?: string;
- oldpcTrackSectionId?: string;
switchMachineType?: Turnout.SwitchMachineType;
- oldcentralizedStations?: string[];
centralizedStations?: number[];
paTrackSectionId?: number;
pbTrackSectionId?: number;
@@ -3872,21 +3575,9 @@ export namespace graphicData {
if (data.kilometerSystem != null) {
message.kilometerSystem = data.kilometerSystem.map(item => KilometerSystem.fromObject(item));
}
- if (data.oldpaTrackSectionId != null) {
- message.oldpaTrackSectionId = data.oldpaTrackSectionId;
- }
- if (data.oldpbTrackSectionId != null) {
- message.oldpbTrackSectionId = data.oldpbTrackSectionId;
- }
- if (data.oldpcTrackSectionId != null) {
- message.oldpcTrackSectionId = data.oldpcTrackSectionId;
- }
if (data.switchMachineType != null) {
message.switchMachineType = data.switchMachineType;
}
- if (data.oldcentralizedStations != null) {
- message.oldcentralizedStations = data.oldcentralizedStations;
- }
if (data.centralizedStations != null) {
message.centralizedStations = data.centralizedStations;
}
@@ -3912,11 +3603,7 @@ export namespace graphicData {
pbRef?: ReturnType;
pcRef?: ReturnType;
kilometerSystem?: ReturnType[];
- oldpaTrackSectionId?: string;
- oldpbTrackSectionId?: string;
- oldpcTrackSectionId?: string;
switchMachineType?: Turnout.SwitchMachineType;
- oldcentralizedStations?: string[];
centralizedStations?: number[];
paTrackSectionId?: number;
pbTrackSectionId?: number;
@@ -3949,21 +3636,9 @@ export namespace graphicData {
if (this.kilometerSystem != null) {
data.kilometerSystem = this.kilometerSystem.map((item: KilometerSystem) => item.toObject());
}
- if (this.oldpaTrackSectionId != null) {
- data.oldpaTrackSectionId = this.oldpaTrackSectionId;
- }
- if (this.oldpbTrackSectionId != null) {
- data.oldpbTrackSectionId = this.oldpbTrackSectionId;
- }
- if (this.oldpcTrackSectionId != null) {
- data.oldpcTrackSectionId = this.oldpcTrackSectionId;
- }
if (this.switchMachineType != null) {
data.switchMachineType = this.switchMachineType;
}
- if (this.oldcentralizedStations != null) {
- data.oldcentralizedStations = this.oldcentralizedStations;
- }
if (this.centralizedStations != null) {
data.centralizedStations = this.centralizedStations;
}
@@ -4000,16 +3675,8 @@ export namespace graphicData {
writer.writeMessage(11, this.pcRef, () => this.pcRef.serialize(writer));
if (this.kilometerSystem.length)
writer.writeRepeatedMessage(13, this.kilometerSystem, (item: KilometerSystem) => item.serialize(writer));
- if (this.oldpaTrackSectionId.length)
- writer.writeString(15, this.oldpaTrackSectionId);
- if (this.oldpbTrackSectionId.length)
- writer.writeString(16, this.oldpbTrackSectionId);
- if (this.oldpcTrackSectionId.length)
- writer.writeString(17, this.oldpcTrackSectionId);
if (this.switchMachineType != Turnout.SwitchMachineType.Unknown)
writer.writeEnum(18, this.switchMachineType);
- if (this.oldcentralizedStations.length)
- writer.writeRepeatedString(19, this.oldcentralizedStations);
if (this.centralizedStations.length)
writer.writePackedUint32(20, this.centralizedStations);
if (this.paTrackSectionId != 0)
@@ -4054,21 +3721,9 @@ export namespace graphicData {
case 13:
reader.readMessage(message.kilometerSystem, () => pb_1.Message.addToRepeatedWrapperField(message, 13, KilometerSystem.deserialize(reader), KilometerSystem));
break;
- case 15:
- message.oldpaTrackSectionId = reader.readString();
- break;
- case 16:
- message.oldpbTrackSectionId = reader.readString();
- break;
- case 17:
- message.oldpcTrackSectionId = reader.readString();
- break;
case 18:
message.switchMachineType = reader.readEnum();
break;
- case 19:
- pb_1.Message.addToRepeatedField(message, 19, reader.readString());
- break;
case 20:
message.centralizedStations = reader.readPackedUint32();
break;
@@ -4227,13 +3882,12 @@ export namespace graphicData {
mirror?: boolean;
kilometerSystem?: KilometerSystem;
refDev?: RelatedRef;
- oldcentralizedStations?: string[];
mt?: Signal.Model;
direction?: Direction;
centralizedStations?: number[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [9, 13], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [13], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("common" in data && data.common != undefined) {
this.common = data.common;
@@ -4250,9 +3904,6 @@ export namespace graphicData {
if ("refDev" in data && data.refDev != undefined) {
this.refDev = data.refDev;
}
- if ("oldcentralizedStations" in data && data.oldcentralizedStations != undefined) {
- this.oldcentralizedStations = data.oldcentralizedStations;
- }
if ("mt" in data && data.mt != undefined) {
this.mt = data.mt;
}
@@ -4303,12 +3954,6 @@ export namespace graphicData {
get has_refDev() {
return pb_1.Message.getField(this, 8) != null;
}
- get oldcentralizedStations() {
- return pb_1.Message.getFieldWithDefault(this, 9, []) as string[];
- }
- set oldcentralizedStations(value: string[]) {
- pb_1.Message.setField(this, 9, value);
- }
get mt() {
return pb_1.Message.getFieldWithDefault(this, 10, Signal.Model.HL) as Signal.Model;
}
@@ -4333,7 +3978,6 @@ export namespace graphicData {
mirror?: boolean;
kilometerSystem?: ReturnType;
refDev?: ReturnType;
- oldcentralizedStations?: string[];
mt?: Signal.Model;
direction?: Direction;
centralizedStations?: number[];
@@ -4354,9 +3998,6 @@ export namespace graphicData {
if (data.refDev != null) {
message.refDev = RelatedRef.fromObject(data.refDev);
}
- if (data.oldcentralizedStations != null) {
- message.oldcentralizedStations = data.oldcentralizedStations;
- }
if (data.mt != null) {
message.mt = data.mt;
}
@@ -4375,7 +4016,6 @@ export namespace graphicData {
mirror?: boolean;
kilometerSystem?: ReturnType;
refDev?: ReturnType;
- oldcentralizedStations?: string[];
mt?: Signal.Model;
direction?: Direction;
centralizedStations?: number[];
@@ -4395,9 +4035,6 @@ export namespace graphicData {
if (this.refDev != null) {
data.refDev = this.refDev.toObject();
}
- if (this.oldcentralizedStations != null) {
- data.oldcentralizedStations = this.oldcentralizedStations;
- }
if (this.mt != null) {
data.mt = this.mt;
}
@@ -4423,8 +4060,6 @@ export namespace graphicData {
writer.writeMessage(6, this.kilometerSystem, () => this.kilometerSystem.serialize(writer));
if (this.has_refDev)
writer.writeMessage(8, this.refDev, () => this.refDev.serialize(writer));
- if (this.oldcentralizedStations.length)
- writer.writeRepeatedString(9, this.oldcentralizedStations);
if (this.mt != Signal.Model.HL)
writer.writeEnum(10, this.mt);
if (this.direction != Direction.UP)
@@ -4455,9 +4090,6 @@ export namespace graphicData {
case 8:
reader.readMessage(message.refDev, () => message.refDev = RelatedRef.deserialize(reader));
break;
- case 9:
- pb_1.Message.addToRepeatedField(message, 9, reader.readString());
- break;
case 10:
message.mt = reader.readEnum();
break;
@@ -4500,11 +4132,8 @@ export namespace graphicData {
paRef?: RelatedRef;
pbRef?: RelatedRef;
sectionType?: Section.SectionType;
- oldaxleCountings?: string[];
- oldtrackSectionId?: string;
isCurve?: boolean;
segmentsCount?: number;
- oldcentralizedStations?: string[];
normalRunningDirection?: Section.RunningDirection;
isTurnBackZone?: boolean;
direction?: Direction;
@@ -4513,7 +4142,7 @@ export namespace graphicData {
centralizedStations?: number[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [3, 7, 13, 17, 19], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [3, 17, 19], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("common" in data && data.common != undefined) {
this.common = data.common;
@@ -4533,21 +4162,12 @@ export namespace graphicData {
if ("sectionType" in data && data.sectionType != undefined) {
this.sectionType = data.sectionType;
}
- if ("oldaxleCountings" in data && data.oldaxleCountings != undefined) {
- this.oldaxleCountings = data.oldaxleCountings;
- }
- if ("oldtrackSectionId" in data && data.oldtrackSectionId != undefined) {
- this.oldtrackSectionId = data.oldtrackSectionId;
- }
if ("isCurve" in data && data.isCurve != undefined) {
this.isCurve = data.isCurve;
}
if ("segmentsCount" in data && data.segmentsCount != undefined) {
this.segmentsCount = data.segmentsCount;
}
- if ("oldcentralizedStations" in data && data.oldcentralizedStations != undefined) {
- this.oldcentralizedStations = data.oldcentralizedStations;
- }
if ("normalRunningDirection" in data && data.normalRunningDirection != undefined) {
this.normalRunningDirection = data.normalRunningDirection;
}
@@ -4613,18 +4233,6 @@ export namespace graphicData {
set sectionType(value: Section.SectionType) {
pb_1.Message.setField(this, 6, value);
}
- get oldaxleCountings() {
- return pb_1.Message.getFieldWithDefault(this, 7, []) as string[];
- }
- set oldaxleCountings(value: string[]) {
- pb_1.Message.setField(this, 7, value);
- }
- get oldtrackSectionId() {
- return pb_1.Message.getFieldWithDefault(this, 9, "") as string;
- }
- set oldtrackSectionId(value: string) {
- pb_1.Message.setField(this, 9, value);
- }
get isCurve() {
return pb_1.Message.getFieldWithDefault(this, 10, false) as boolean;
}
@@ -4637,12 +4245,6 @@ export namespace graphicData {
set segmentsCount(value: number) {
pb_1.Message.setField(this, 12, value);
}
- get oldcentralizedStations() {
- return pb_1.Message.getFieldWithDefault(this, 13, []) as string[];
- }
- set oldcentralizedStations(value: string[]) {
- pb_1.Message.setField(this, 13, value);
- }
get normalRunningDirection() {
return pb_1.Message.getFieldWithDefault(this, 14, Section.RunningDirection.AtoB) as Section.RunningDirection;
}
@@ -4686,11 +4288,8 @@ export namespace graphicData {
paRef?: ReturnType;
pbRef?: ReturnType;
sectionType?: Section.SectionType;
- oldaxleCountings?: string[];
- oldtrackSectionId?: string;
isCurve?: boolean;
segmentsCount?: number;
- oldcentralizedStations?: string[];
normalRunningDirection?: Section.RunningDirection;
isTurnBackZone?: boolean;
direction?: Direction;
@@ -4717,21 +4316,12 @@ export namespace graphicData {
if (data.sectionType != null) {
message.sectionType = data.sectionType;
}
- if (data.oldaxleCountings != null) {
- message.oldaxleCountings = data.oldaxleCountings;
- }
- if (data.oldtrackSectionId != null) {
- message.oldtrackSectionId = data.oldtrackSectionId;
- }
if (data.isCurve != null) {
message.isCurve = data.isCurve;
}
if (data.segmentsCount != null) {
message.segmentsCount = data.segmentsCount;
}
- if (data.oldcentralizedStations != null) {
- message.oldcentralizedStations = data.oldcentralizedStations;
- }
if (data.normalRunningDirection != null) {
message.normalRunningDirection = data.normalRunningDirection;
}
@@ -4760,11 +4350,8 @@ export namespace graphicData {
paRef?: ReturnType;
pbRef?: ReturnType;
sectionType?: Section.SectionType;
- oldaxleCountings?: string[];
- oldtrackSectionId?: string;
isCurve?: boolean;
segmentsCount?: number;
- oldcentralizedStations?: string[];
normalRunningDirection?: Section.RunningDirection;
isTurnBackZone?: boolean;
direction?: Direction;
@@ -4790,21 +4377,12 @@ export namespace graphicData {
if (this.sectionType != null) {
data.sectionType = this.sectionType;
}
- if (this.oldaxleCountings != null) {
- data.oldaxleCountings = this.oldaxleCountings;
- }
- if (this.oldtrackSectionId != null) {
- data.oldtrackSectionId = this.oldtrackSectionId;
- }
if (this.isCurve != null) {
data.isCurve = this.isCurve;
}
if (this.segmentsCount != null) {
data.segmentsCount = this.segmentsCount;
}
- if (this.oldcentralizedStations != null) {
- data.oldcentralizedStations = this.oldcentralizedStations;
- }
if (this.normalRunningDirection != null) {
data.normalRunningDirection = this.normalRunningDirection;
}
@@ -4841,16 +4419,10 @@ export namespace graphicData {
writer.writeMessage(5, this.pbRef, () => this.pbRef.serialize(writer));
if (this.sectionType != Section.SectionType.Physical)
writer.writeEnum(6, this.sectionType);
- if (this.oldaxleCountings.length)
- writer.writeRepeatedString(7, this.oldaxleCountings);
- if (this.oldtrackSectionId.length)
- writer.writeString(9, this.oldtrackSectionId);
if (this.isCurve != false)
writer.writeBool(10, this.isCurve);
if (this.segmentsCount != 0)
writer.writeInt32(12, this.segmentsCount);
- if (this.oldcentralizedStations.length)
- writer.writeRepeatedString(13, this.oldcentralizedStations);
if (this.normalRunningDirection != Section.RunningDirection.AtoB)
writer.writeEnum(14, this.normalRunningDirection);
if (this.isTurnBackZone != false)
@@ -4890,21 +4462,12 @@ export namespace graphicData {
case 6:
message.sectionType = reader.readEnum();
break;
- case 7:
- pb_1.Message.addToRepeatedField(message, 7, reader.readString());
- break;
- case 9:
- message.oldtrackSectionId = reader.readString();
- break;
case 10:
message.isCurve = reader.readBool();
break;
case 12:
message.segmentsCount = reader.readInt32();
break;
- case 13:
- pb_1.Message.addToRepeatedField(message, 13, reader.readString());
- break;
case 14:
message.normalRunningDirection = reader.readEnum();
break;
@@ -4950,7 +4513,6 @@ export namespace graphicData {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
deviceType?: RelatedRef.DeviceType;
- oldid?: string;
devicePort?: RelatedRef.DevicePort;
id?: number;
}) {
@@ -4960,9 +4522,6 @@ export namespace graphicData {
if ("deviceType" in data && data.deviceType != undefined) {
this.deviceType = data.deviceType;
}
- if ("oldid" in data && data.oldid != undefined) {
- this.oldid = data.oldid;
- }
if ("devicePort" in data && data.devicePort != undefined) {
this.devicePort = data.devicePort;
}
@@ -4977,12 +4536,6 @@ export namespace graphicData {
set deviceType(value: RelatedRef.DeviceType) {
pb_1.Message.setField(this, 1, value);
}
- get oldid() {
- return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
- }
- set oldid(value: string) {
- pb_1.Message.setField(this, 2, value);
- }
get devicePort() {
return pb_1.Message.getFieldWithDefault(this, 3, RelatedRef.DevicePort.A) as RelatedRef.DevicePort;
}
@@ -4997,7 +4550,6 @@ export namespace graphicData {
}
static fromObject(data: {
deviceType?: RelatedRef.DeviceType;
- oldid?: string;
devicePort?: RelatedRef.DevicePort;
id?: number;
}): RelatedRef {
@@ -5005,9 +4557,6 @@ export namespace graphicData {
if (data.deviceType != null) {
message.deviceType = data.deviceType;
}
- if (data.oldid != null) {
- message.oldid = data.oldid;
- }
if (data.devicePort != null) {
message.devicePort = data.devicePort;
}
@@ -5019,16 +4568,12 @@ export namespace graphicData {
toObject() {
const data: {
deviceType?: RelatedRef.DeviceType;
- oldid?: string;
devicePort?: RelatedRef.DevicePort;
id?: number;
} = {};
if (this.deviceType != null) {
data.deviceType = this.deviceType;
}
- if (this.oldid != null) {
- data.oldid = this.oldid;
- }
if (this.devicePort != null) {
data.devicePort = this.devicePort;
}
@@ -5043,8 +4588,6 @@ export namespace graphicData {
const writer = w || new pb_1.BinaryWriter();
if (this.deviceType != RelatedRef.DeviceType.Section)
writer.writeEnum(1, this.deviceType);
- if (this.oldid.length)
- writer.writeString(2, this.oldid);
if (this.devicePort != RelatedRef.DevicePort.A)
writer.writeEnum(3, this.devicePort);
if (this.id != 0)
@@ -5061,9 +4604,6 @@ export namespace graphicData {
case 1:
message.deviceType = reader.readEnum();
break;
- case 2:
- message.oldid = reader.readString();
- break;
case 3:
message.devicePort = reader.readEnum();
break;
@@ -5107,16 +4647,12 @@ export namespace graphicData {
export class TurnoutPosRef extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
- oldid?: string;
position?: number;
id?: number;
}) {
super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
- if ("oldid" in data && data.oldid != undefined) {
- this.oldid = data.oldid;
- }
if ("position" in data && data.position != undefined) {
this.position = data.position;
}
@@ -5125,12 +4661,6 @@ export namespace graphicData {
}
}
}
- get oldid() {
- return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
- }
- set oldid(value: string) {
- pb_1.Message.setField(this, 1, value);
- }
get position() {
return pb_1.Message.getFieldWithDefault(this, 2, 0) as number;
}
@@ -5144,14 +4674,10 @@ export namespace graphicData {
pb_1.Message.setField(this, 3, value);
}
static fromObject(data: {
- oldid?: string;
position?: number;
id?: number;
}): TurnoutPosRef {
const message = new TurnoutPosRef({});
- if (data.oldid != null) {
- message.oldid = data.oldid;
- }
if (data.position != null) {
message.position = data.position;
}
@@ -5162,13 +4688,9 @@ export namespace graphicData {
}
toObject() {
const data: {
- oldid?: string;
position?: number;
id?: number;
} = {};
- if (this.oldid != null) {
- data.oldid = this.oldid;
- }
if (this.position != null) {
data.position = this.position;
}
@@ -5181,8 +4703,6 @@ export namespace graphicData {
serialize(w: pb_1.BinaryWriter): void;
serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
const writer = w || new pb_1.BinaryWriter();
- if (this.oldid.length)
- writer.writeString(1, this.oldid);
if (this.position != 0)
writer.writeInt32(2, this.position);
if (this.id != 0)
@@ -5196,9 +4716,6 @@ export namespace graphicData {
if (reader.isEndGroup())
break;
switch (reader.getFieldNumber()) {
- case 1:
- message.oldid = reader.readString();
- break;
case 2:
message.position = reader.readInt32();
break;
@@ -5340,7 +4857,6 @@ export namespace graphicData {
code?: string;
kilometerSystem?: KilometerSystem;
TransponderRef?: RelatedRef;
- oldcentralizedStations?: string[];
type?: Transponder.TransponderTypeEnum;
centralizedStations?: number[];
fixedTelegram?: string;
@@ -5348,7 +4864,7 @@ export namespace graphicData {
originalCode?: string;
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [7, 10], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [10], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("common" in data && data.common != undefined) {
this.common = data.common;
@@ -5362,9 +4878,6 @@ export namespace graphicData {
if ("TransponderRef" in data && data.TransponderRef != undefined) {
this.TransponderRef = data.TransponderRef;
}
- if ("oldcentralizedStations" in data && data.oldcentralizedStations != undefined) {
- this.oldcentralizedStations = data.oldcentralizedStations;
- }
if ("type" in data && data.type != undefined) {
this.type = data.type;
}
@@ -5415,12 +4928,6 @@ export namespace graphicData {
get has_TransponderRef() {
return pb_1.Message.getField(this, 6) != null;
}
- get oldcentralizedStations() {
- return pb_1.Message.getFieldWithDefault(this, 7, []) as string[];
- }
- set oldcentralizedStations(value: string[]) {
- pb_1.Message.setField(this, 7, value);
- }
get type() {
return pb_1.Message.getFieldWithDefault(this, 9, Transponder.TransponderTypeEnum.FB) as Transponder.TransponderTypeEnum;
}
@@ -5456,7 +4963,6 @@ export namespace graphicData {
code?: string;
kilometerSystem?: ReturnType;
TransponderRef?: ReturnType;
- oldcentralizedStations?: string[];
type?: Transponder.TransponderTypeEnum;
centralizedStations?: number[];
fixedTelegram?: string;
@@ -5476,9 +4982,6 @@ export namespace graphicData {
if (data.TransponderRef != null) {
message.TransponderRef = RelatedRef.fromObject(data.TransponderRef);
}
- if (data.oldcentralizedStations != null) {
- message.oldcentralizedStations = data.oldcentralizedStations;
- }
if (data.type != null) {
message.type = data.type;
}
@@ -5502,7 +5005,6 @@ export namespace graphicData {
code?: string;
kilometerSystem?: ReturnType;
TransponderRef?: ReturnType;
- oldcentralizedStations?: string[];
type?: Transponder.TransponderTypeEnum;
centralizedStations?: number[];
fixedTelegram?: string;
@@ -5521,9 +5023,6 @@ export namespace graphicData {
if (this.TransponderRef != null) {
data.TransponderRef = this.TransponderRef.toObject();
}
- if (this.oldcentralizedStations != null) {
- data.oldcentralizedStations = this.oldcentralizedStations;
- }
if (this.type != null) {
data.type = this.type;
}
@@ -5553,8 +5052,6 @@ export namespace graphicData {
writer.writeMessage(5, this.kilometerSystem, () => this.kilometerSystem.serialize(writer));
if (this.has_TransponderRef)
writer.writeMessage(6, this.TransponderRef, () => this.TransponderRef.serialize(writer));
- if (this.oldcentralizedStations.length)
- writer.writeRepeatedString(7, this.oldcentralizedStations);
if (this.type != Transponder.TransponderTypeEnum.FB)
writer.writeEnum(9, this.type);
if (this.centralizedStations.length)
@@ -5586,9 +5083,6 @@ export namespace graphicData {
case 6:
reader.readMessage(message.TransponderRef, () => message.TransponderRef = RelatedRef.deserialize(reader));
break;
- case 7:
- pb_1.Message.addToRepeatedField(message, 7, reader.readString());
- break;
case 9:
message.type = reader.readEnum();
break;
@@ -5629,7 +5123,6 @@ export namespace graphicData {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
deviceType?: SimpleRef.DeviceType;
- oldid?: string;
id?: number;
}) {
super();
@@ -5638,9 +5131,6 @@ export namespace graphicData {
if ("deviceType" in data && data.deviceType != undefined) {
this.deviceType = data.deviceType;
}
- if ("oldid" in data && data.oldid != undefined) {
- this.oldid = data.oldid;
- }
if ("id" in data && data.id != undefined) {
this.id = data.id;
}
@@ -5652,12 +5142,6 @@ export namespace graphicData {
set deviceType(value: SimpleRef.DeviceType) {
pb_1.Message.setField(this, 1, value);
}
- get oldid() {
- return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
- }
- set oldid(value: string) {
- pb_1.Message.setField(this, 2, value);
- }
get id() {
return pb_1.Message.getFieldWithDefault(this, 3, 0) as number;
}
@@ -5666,16 +5150,12 @@ export namespace graphicData {
}
static fromObject(data: {
deviceType?: SimpleRef.DeviceType;
- oldid?: string;
id?: number;
}): SimpleRef {
const message = new SimpleRef({});
if (data.deviceType != null) {
message.deviceType = data.deviceType;
}
- if (data.oldid != null) {
- message.oldid = data.oldid;
- }
if (data.id != null) {
message.id = data.id;
}
@@ -5684,15 +5164,11 @@ export namespace graphicData {
toObject() {
const data: {
deviceType?: SimpleRef.DeviceType;
- oldid?: string;
id?: number;
} = {};
if (this.deviceType != null) {
data.deviceType = this.deviceType;
}
- if (this.oldid != null) {
- data.oldid = this.oldid;
- }
if (this.id != null) {
data.id = this.id;
}
@@ -5704,8 +5180,6 @@ export namespace graphicData {
const writer = w || new pb_1.BinaryWriter();
if (this.deviceType != SimpleRef.DeviceType.Turnout)
writer.writeEnum(1, this.deviceType);
- if (this.oldid.length)
- writer.writeString(2, this.oldid);
if (this.id != 0)
writer.writeUint32(3, this.id);
if (!w)
@@ -5720,9 +5194,6 @@ export namespace graphicData {
case 1:
message.deviceType = reader.readEnum();
break;
- case 2:
- message.oldid = reader.readString();
- break;
case 3:
message.id = reader.readUint32();
break;
@@ -6184,8 +5655,6 @@ export namespace graphicData {
common?: CommonInfo;
code?: string;
points?: Point[];
- oldaxleSectionId?: string;
- oldturnoutId?: string;
axleSectionId?: number;
turnoutId?: number;
}) {
@@ -6201,12 +5670,6 @@ export namespace graphicData {
if ("points" in data && data.points != undefined) {
this.points = data.points;
}
- if ("oldaxleSectionId" in data && data.oldaxleSectionId != undefined) {
- this.oldaxleSectionId = data.oldaxleSectionId;
- }
- if ("oldturnoutId" in data && data.oldturnoutId != undefined) {
- this.oldturnoutId = data.oldturnoutId;
- }
if ("axleSectionId" in data && data.axleSectionId != undefined) {
this.axleSectionId = data.axleSectionId;
}
@@ -6236,18 +5699,6 @@ export namespace graphicData {
set points(value: Point[]) {
pb_1.Message.setRepeatedWrapperField(this, 3, value);
}
- get oldaxleSectionId() {
- return pb_1.Message.getFieldWithDefault(this, 4, "") as string;
- }
- set oldaxleSectionId(value: string) {
- pb_1.Message.setField(this, 4, value);
- }
- get oldturnoutId() {
- return pb_1.Message.getFieldWithDefault(this, 6, "") as string;
- }
- set oldturnoutId(value: string) {
- pb_1.Message.setField(this, 6, value);
- }
get axleSectionId() {
return pb_1.Message.getFieldWithDefault(this, 7, 0) as number;
}
@@ -6264,8 +5715,6 @@ export namespace graphicData {
common?: ReturnType;
code?: string;
points?: ReturnType[];
- oldaxleSectionId?: string;
- oldturnoutId?: string;
axleSectionId?: number;
turnoutId?: number;
}): LogicSection {
@@ -6279,12 +5728,6 @@ export namespace graphicData {
if (data.points != null) {
message.points = data.points.map(item => Point.fromObject(item));
}
- if (data.oldaxleSectionId != null) {
- message.oldaxleSectionId = data.oldaxleSectionId;
- }
- if (data.oldturnoutId != null) {
- message.oldturnoutId = data.oldturnoutId;
- }
if (data.axleSectionId != null) {
message.axleSectionId = data.axleSectionId;
}
@@ -6298,8 +5741,6 @@ export namespace graphicData {
common?: ReturnType;
code?: string;
points?: ReturnType[];
- oldaxleSectionId?: string;
- oldturnoutId?: string;
axleSectionId?: number;
turnoutId?: number;
} = {};
@@ -6312,12 +5753,6 @@ export namespace graphicData {
if (this.points != null) {
data.points = this.points.map((item: Point) => item.toObject());
}
- if (this.oldaxleSectionId != null) {
- data.oldaxleSectionId = this.oldaxleSectionId;
- }
- if (this.oldturnoutId != null) {
- data.oldturnoutId = this.oldturnoutId;
- }
if (this.axleSectionId != null) {
data.axleSectionId = this.axleSectionId;
}
@@ -6336,10 +5771,6 @@ export namespace graphicData {
writer.writeString(2, this.code);
if (this.points.length)
writer.writeRepeatedMessage(3, this.points, (item: Point) => item.serialize(writer));
- if (this.oldaxleSectionId.length)
- writer.writeString(4, this.oldaxleSectionId);
- if (this.oldturnoutId.length)
- writer.writeString(6, this.oldturnoutId);
if (this.axleSectionId != 0)
writer.writeUint32(7, this.axleSectionId);
if (this.turnoutId != 0)
@@ -6362,12 +5793,6 @@ export namespace graphicData {
case 3:
reader.readMessage(message.points, () => pb_1.Message.addToRepeatedWrapperField(message, 3, Point.deserialize(reader), Point));
break;
- case 4:
- message.oldaxleSectionId = reader.readString();
- break;
- case 6:
- message.oldturnoutId = reader.readString();
- break;
case 7:
message.axleSectionId = reader.readUint32();
break;
@@ -6394,13 +5819,12 @@ export namespace graphicData {
code?: string;
type?: TrackSection.TrackSectionType;
destinationCode?: string;
- oldtrackLogicSection?: string[];
isCurve?: boolean;
segmentsCount?: number;
trackLogicSection?: number[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 7, 10], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 10], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("common" in data && data.common != undefined) {
this.common = data.common;
@@ -6417,9 +5841,6 @@ export namespace graphicData {
if ("destinationCode" in data && data.destinationCode != undefined) {
this.destinationCode = data.destinationCode;
}
- if ("oldtrackLogicSection" in data && data.oldtrackLogicSection != undefined) {
- this.oldtrackLogicSection = data.oldtrackLogicSection;
- }
if ("isCurve" in data && data.isCurve != undefined) {
this.isCurve = data.isCurve;
}
@@ -6464,12 +5885,6 @@ export namespace graphicData {
set destinationCode(value: string) {
pb_1.Message.setField(this, 6, value);
}
- get oldtrackLogicSection() {
- return pb_1.Message.getFieldWithDefault(this, 7, []) as string[];
- }
- set oldtrackLogicSection(value: string[]) {
- pb_1.Message.setField(this, 7, value);
- }
get isCurve() {
return pb_1.Message.getFieldWithDefault(this, 8, false) as boolean;
}
@@ -6494,7 +5909,6 @@ export namespace graphicData {
code?: string;
type?: TrackSection.TrackSectionType;
destinationCode?: string;
- oldtrackLogicSection?: string[];
isCurve?: boolean;
segmentsCount?: number;
trackLogicSection?: number[];
@@ -6515,9 +5929,6 @@ export namespace graphicData {
if (data.destinationCode != null) {
message.destinationCode = data.destinationCode;
}
- if (data.oldtrackLogicSection != null) {
- message.oldtrackLogicSection = data.oldtrackLogicSection;
- }
if (data.isCurve != null) {
message.isCurve = data.isCurve;
}
@@ -6536,7 +5947,6 @@ export namespace graphicData {
code?: string;
type?: TrackSection.TrackSectionType;
destinationCode?: string;
- oldtrackLogicSection?: string[];
isCurve?: boolean;
segmentsCount?: number;
trackLogicSection?: number[];
@@ -6556,9 +5966,6 @@ export namespace graphicData {
if (this.destinationCode != null) {
data.destinationCode = this.destinationCode;
}
- if (this.oldtrackLogicSection != null) {
- data.oldtrackLogicSection = this.oldtrackLogicSection;
- }
if (this.isCurve != null) {
data.isCurve = this.isCurve;
}
@@ -6584,8 +5991,6 @@ export namespace graphicData {
writer.writeEnum(5, this.type);
if (this.destinationCode.length)
writer.writeString(6, this.destinationCode);
- if (this.oldtrackLogicSection.length)
- writer.writeRepeatedString(7, this.oldtrackLogicSection);
if (this.isCurve != false)
writer.writeBool(8, this.isCurve);
if (this.segmentsCount != 0)
@@ -6616,9 +6021,6 @@ export namespace graphicData {
case 6:
message.destinationCode = reader.readString();
break;
- case 7:
- pb_1.Message.addToRepeatedField(message, 7, reader.readString());
- break;
case 8:
message.isCurve = reader.readBool();
break;
@@ -6989,13 +6391,11 @@ export namespace graphicData {
common?: CommonInfo;
code?: string;
flip?: boolean;
- oldrefSections?: string[];
- oldrefStand?: string;
refSections?: number[];
refStand?: number;
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [6, 8], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [8], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("common" in data && data.common != undefined) {
this.common = data.common;
@@ -7006,12 +6406,6 @@ export namespace graphicData {
if ("flip" in data && data.flip != undefined) {
this.flip = data.flip;
}
- if ("oldrefSections" in data && data.oldrefSections != undefined) {
- this.oldrefSections = data.oldrefSections;
- }
- if ("oldrefStand" in data && data.oldrefStand != undefined) {
- this.oldrefStand = data.oldrefStand;
- }
if ("refSections" in data && data.refSections != undefined) {
this.refSections = data.refSections;
}
@@ -7041,18 +6435,6 @@ export namespace graphicData {
set flip(value: boolean) {
pb_1.Message.setField(this, 3, value);
}
- get oldrefSections() {
- return pb_1.Message.getFieldWithDefault(this, 6, []) as string[];
- }
- set oldrefSections(value: string[]) {
- pb_1.Message.setField(this, 6, value);
- }
- get oldrefStand() {
- return pb_1.Message.getFieldWithDefault(this, 7, "") as string;
- }
- set oldrefStand(value: string) {
- pb_1.Message.setField(this, 7, value);
- }
get refSections() {
return pb_1.Message.getFieldWithDefault(this, 8, []) as number[];
}
@@ -7069,8 +6451,6 @@ export namespace graphicData {
common?: ReturnType;
code?: string;
flip?: boolean;
- oldrefSections?: string[];
- oldrefStand?: string;
refSections?: number[];
refStand?: number;
}): SpksSwitch {
@@ -7084,12 +6464,6 @@ export namespace graphicData {
if (data.flip != null) {
message.flip = data.flip;
}
- if (data.oldrefSections != null) {
- message.oldrefSections = data.oldrefSections;
- }
- if (data.oldrefStand != null) {
- message.oldrefStand = data.oldrefStand;
- }
if (data.refSections != null) {
message.refSections = data.refSections;
}
@@ -7103,8 +6477,6 @@ export namespace graphicData {
common?: ReturnType;
code?: string;
flip?: boolean;
- oldrefSections?: string[];
- oldrefStand?: string;
refSections?: number[];
refStand?: number;
} = {};
@@ -7117,12 +6489,6 @@ export namespace graphicData {
if (this.flip != null) {
data.flip = this.flip;
}
- if (this.oldrefSections != null) {
- data.oldrefSections = this.oldrefSections;
- }
- if (this.oldrefStand != null) {
- data.oldrefStand = this.oldrefStand;
- }
if (this.refSections != null) {
data.refSections = this.refSections;
}
@@ -7141,10 +6507,6 @@ export namespace graphicData {
writer.writeString(2, this.code);
if (this.flip != false)
writer.writeBool(3, this.flip);
- if (this.oldrefSections.length)
- writer.writeRepeatedString(6, this.oldrefSections);
- if (this.oldrefStand.length)
- writer.writeString(7, this.oldrefStand);
if (this.refSections.length)
writer.writePackedUint32(8, this.refSections);
if (this.refStand != 0)
@@ -7167,12 +6529,6 @@ export namespace graphicData {
case 3:
message.flip = reader.readBool();
break;
- case 6:
- pb_1.Message.addToRepeatedField(message, 6, reader.readString());
- break;
- case 7:
- message.oldrefStand = reader.readString();
- break;
case 8:
message.refSections = reader.readPackedUint32();
break;
@@ -7197,7 +6553,6 @@ export namespace graphicData {
common?: CommonInfo;
code?: string;
flip?: boolean;
- oldrefStand?: string;
refStand?: number;
}) {
super();
@@ -7212,9 +6567,6 @@ export namespace graphicData {
if ("flip" in data && data.flip != undefined) {
this.flip = data.flip;
}
- if ("oldrefStand" in data && data.oldrefStand != undefined) {
- this.oldrefStand = data.oldrefStand;
- }
if ("refStand" in data && data.refStand != undefined) {
this.refStand = data.refStand;
}
@@ -7241,12 +6593,6 @@ export namespace graphicData {
set flip(value: boolean) {
pb_1.Message.setField(this, 3, value);
}
- get oldrefStand() {
- return pb_1.Message.getFieldWithDefault(this, 6, "") as string;
- }
- set oldrefStand(value: string) {
- pb_1.Message.setField(this, 6, value);
- }
get refStand() {
return pb_1.Message.getFieldWithDefault(this, 7, 0) as number;
}
@@ -7257,7 +6603,6 @@ export namespace graphicData {
common?: ReturnType;
code?: string;
flip?: boolean;
- oldrefStand?: string;
refStand?: number;
}): EsbButton {
const message = new EsbButton({});
@@ -7270,9 +6615,6 @@ export namespace graphicData {
if (data.flip != null) {
message.flip = data.flip;
}
- if (data.oldrefStand != null) {
- message.oldrefStand = data.oldrefStand;
- }
if (data.refStand != null) {
message.refStand = data.refStand;
}
@@ -7283,7 +6625,6 @@ export namespace graphicData {
common?: ReturnType;
code?: string;
flip?: boolean;
- oldrefStand?: string;
refStand?: number;
} = {};
if (this.common != null) {
@@ -7295,9 +6636,6 @@ export namespace graphicData {
if (this.flip != null) {
data.flip = this.flip;
}
- if (this.oldrefStand != null) {
- data.oldrefStand = this.oldrefStand;
- }
if (this.refStand != null) {
data.refStand = this.refStand;
}
@@ -7313,8 +6651,6 @@ export namespace graphicData {
writer.writeString(2, this.code);
if (this.flip != false)
writer.writeBool(3, this.flip);
- if (this.oldrefStand.length)
- writer.writeString(6, this.oldrefStand);
if (this.refStand != 0)
writer.writeUint32(7, this.refStand);
if (!w)
@@ -7335,9 +6671,6 @@ export namespace graphicData {
case 3:
message.flip = reader.readBool();
break;
- case 6:
- message.oldrefStand = reader.readString();
- break;
case 7:
message.refStand = reader.readUint32();
break;
@@ -7359,7 +6692,6 @@ export namespace graphicData {
common?: CommonInfo;
code?: string;
flip?: boolean;
- oldrefScreenDoor?: string;
refGatedBoxMapCode?: string;
refScreenDoor?: number;
}) {
@@ -7375,9 +6707,6 @@ export namespace graphicData {
if ("flip" in data && data.flip != undefined) {
this.flip = data.flip;
}
- if ("oldrefScreenDoor" in data && data.oldrefScreenDoor != undefined) {
- this.oldrefScreenDoor = data.oldrefScreenDoor;
- }
if ("refGatedBoxMapCode" in data && data.refGatedBoxMapCode != undefined) {
this.refGatedBoxMapCode = data.refGatedBoxMapCode;
}
@@ -7407,12 +6736,6 @@ export namespace graphicData {
set flip(value: boolean) {
pb_1.Message.setField(this, 3, value);
}
- get oldrefScreenDoor() {
- return pb_1.Message.getFieldWithDefault(this, 5, "") as string;
- }
- set oldrefScreenDoor(value: string) {
- pb_1.Message.setField(this, 5, value);
- }
get refGatedBoxMapCode() {
return pb_1.Message.getFieldWithDefault(this, 6, "") as string;
}
@@ -7429,7 +6752,6 @@ export namespace graphicData {
common?: ReturnType;
code?: string;
flip?: boolean;
- oldrefScreenDoor?: string;
refGatedBoxMapCode?: string;
refScreenDoor?: number;
}): GatedBox {
@@ -7443,9 +6765,6 @@ export namespace graphicData {
if (data.flip != null) {
message.flip = data.flip;
}
- if (data.oldrefScreenDoor != null) {
- message.oldrefScreenDoor = data.oldrefScreenDoor;
- }
if (data.refGatedBoxMapCode != null) {
message.refGatedBoxMapCode = data.refGatedBoxMapCode;
}
@@ -7459,7 +6778,6 @@ export namespace graphicData {
common?: ReturnType;
code?: string;
flip?: boolean;
- oldrefScreenDoor?: string;
refGatedBoxMapCode?: string;
refScreenDoor?: number;
} = {};
@@ -7472,9 +6790,6 @@ export namespace graphicData {
if (this.flip != null) {
data.flip = this.flip;
}
- if (this.oldrefScreenDoor != null) {
- data.oldrefScreenDoor = this.oldrefScreenDoor;
- }
if (this.refGatedBoxMapCode != null) {
data.refGatedBoxMapCode = this.refGatedBoxMapCode;
}
@@ -7493,8 +6808,6 @@ export namespace graphicData {
writer.writeString(2, this.code);
if (this.flip != false)
writer.writeBool(3, this.flip);
- if (this.oldrefScreenDoor.length)
- writer.writeString(5, this.oldrefScreenDoor);
if (this.refGatedBoxMapCode.length)
writer.writeString(6, this.refGatedBoxMapCode);
if (this.refScreenDoor != 0)
@@ -7517,9 +6830,6 @@ export namespace graphicData {
case 3:
message.flip = reader.readBool();
break;
- case 5:
- message.oldrefScreenDoor = reader.readString();
- break;
case 6:
message.refGatedBoxMapCode = reader.readString();
break;
@@ -8055,6 +7365,7 @@ export namespace graphicData {
code?: string;
linkSection?: number;
centralizedStations?: number[];
+ refPslMapCode?: string;
}) {
super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [4], this.#one_of_decls);
@@ -8071,6 +7382,9 @@ export namespace graphicData {
if ("centralizedStations" in data && data.centralizedStations != undefined) {
this.centralizedStations = data.centralizedStations;
}
+ if ("refPslMapCode" in data && data.refPslMapCode != undefined) {
+ this.refPslMapCode = data.refPslMapCode;
+ }
}
}
get common() {
@@ -8100,11 +7414,18 @@ export namespace graphicData {
set centralizedStations(value: number[]) {
pb_1.Message.setField(this, 4, value);
}
+ get refPslMapCode() {
+ return pb_1.Message.getFieldWithDefault(this, 5, "") as string;
+ }
+ set refPslMapCode(value: string) {
+ pb_1.Message.setField(this, 5, value);
+ }
static fromObject(data: {
common?: ReturnType;
code?: string;
linkSection?: number;
centralizedStations?: number[];
+ refPslMapCode?: string;
}): GarageDoor {
const message = new GarageDoor({});
if (data.common != null) {
@@ -8119,6 +7440,9 @@ export namespace graphicData {
if (data.centralizedStations != null) {
message.centralizedStations = data.centralizedStations;
}
+ if (data.refPslMapCode != null) {
+ message.refPslMapCode = data.refPslMapCode;
+ }
return message;
}
toObject() {
@@ -8127,6 +7451,7 @@ export namespace graphicData {
code?: string;
linkSection?: number;
centralizedStations?: number[];
+ refPslMapCode?: string;
} = {};
if (this.common != null) {
data.common = this.common.toObject();
@@ -8140,6 +7465,9 @@ export namespace graphicData {
if (this.centralizedStations != null) {
data.centralizedStations = this.centralizedStations;
}
+ if (this.refPslMapCode != null) {
+ data.refPslMapCode = this.refPslMapCode;
+ }
return data;
}
serialize(): Uint8Array;
@@ -8154,6 +7482,8 @@ export namespace graphicData {
writer.writeUint32(3, this.linkSection);
if (this.centralizedStations.length)
writer.writePackedUint32(4, this.centralizedStations);
+ if (this.refPslMapCode.length)
+ writer.writeString(5, this.refPslMapCode);
if (!w)
return writer.getResultBuffer();
}
@@ -8175,6 +7505,9 @@ export namespace graphicData {
case 4:
message.centralizedStations = reader.readPackedUint32();
break;
+ case 5:
+ message.refPslMapCode = reader.readString();
+ break;
default: reader.skipField();
}
}
@@ -8326,145 +7659,6 @@ export namespace graphicData {
return CarWashing.deserialize(bytes);
}
}
- export class FloodGate extends pb_1.Message {
- #one_of_decls: number[][] = [];
- constructor(data?: any[] | {
- common?: CommonInfo;
- code?: string;
- linkSection?: number;
- centralizedStations?: number[];
- }) {
- super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [4], this.#one_of_decls);
- if (!Array.isArray(data) && typeof data == "object") {
- if ("common" in data && data.common != undefined) {
- this.common = data.common;
- }
- if ("code" in data && data.code != undefined) {
- this.code = data.code;
- }
- if ("linkSection" in data && data.linkSection != undefined) {
- this.linkSection = data.linkSection;
- }
- if ("centralizedStations" in data && data.centralizedStations != undefined) {
- this.centralizedStations = data.centralizedStations;
- }
- }
- }
- get common() {
- return pb_1.Message.getWrapperField(this, CommonInfo, 1) as CommonInfo;
- }
- set common(value: CommonInfo) {
- pb_1.Message.setWrapperField(this, 1, value);
- }
- get has_common() {
- return pb_1.Message.getField(this, 1) != null;
- }
- get code() {
- return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
- }
- set code(value: string) {
- pb_1.Message.setField(this, 2, value);
- }
- get linkSection() {
- return pb_1.Message.getFieldWithDefault(this, 3, 0) as number;
- }
- set linkSection(value: number) {
- pb_1.Message.setField(this, 3, value);
- }
- get centralizedStations() {
- return pb_1.Message.getFieldWithDefault(this, 4, []) as number[];
- }
- set centralizedStations(value: number[]) {
- pb_1.Message.setField(this, 4, value);
- }
- static fromObject(data: {
- common?: ReturnType;
- code?: string;
- linkSection?: number;
- centralizedStations?: number[];
- }): FloodGate {
- const message = new FloodGate({});
- if (data.common != null) {
- message.common = CommonInfo.fromObject(data.common);
- }
- if (data.code != null) {
- message.code = data.code;
- }
- if (data.linkSection != null) {
- message.linkSection = data.linkSection;
- }
- if (data.centralizedStations != null) {
- message.centralizedStations = data.centralizedStations;
- }
- return message;
- }
- toObject() {
- const data: {
- common?: ReturnType;
- code?: string;
- linkSection?: number;
- centralizedStations?: number[];
- } = {};
- if (this.common != null) {
- data.common = this.common.toObject();
- }
- if (this.code != null) {
- data.code = this.code;
- }
- if (this.linkSection != null) {
- data.linkSection = this.linkSection;
- }
- if (this.centralizedStations != null) {
- data.centralizedStations = this.centralizedStations;
- }
- return data;
- }
- serialize(): Uint8Array;
- serialize(w: pb_1.BinaryWriter): void;
- serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
- const writer = w || new pb_1.BinaryWriter();
- if (this.has_common)
- writer.writeMessage(1, this.common, () => this.common.serialize(writer));
- if (this.code.length)
- writer.writeString(2, this.code);
- if (this.linkSection != 0)
- writer.writeUint32(3, this.linkSection);
- if (this.centralizedStations.length)
- writer.writePackedUint32(4, this.centralizedStations);
- if (!w)
- return writer.getResultBuffer();
- }
- static deserialize(bytes: Uint8Array | pb_1.BinaryReader): FloodGate {
- const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new FloodGate();
- while (reader.nextField()) {
- if (reader.isEndGroup())
- break;
- switch (reader.getFieldNumber()) {
- case 1:
- reader.readMessage(message.common, () => message.common = CommonInfo.deserialize(reader));
- break;
- case 2:
- message.code = reader.readString();
- break;
- case 3:
- message.linkSection = reader.readUint32();
- break;
- case 4:
- message.centralizedStations = reader.readPackedUint32();
- break;
- default: reader.skipField();
- }
- }
- return message;
- }
- serializeBinary(): Uint8Array {
- return this.serialize();
- }
- static deserializeBinary(bytes: Uint8Array): FloodGate {
- return FloodGate.deserialize(bytes);
- }
- }
export class Beacon extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
@@ -8616,11 +7810,10 @@ export namespace graphicData {
common?: CommonInfo;
points?: Point[];
slopeNumber?: number;
- oldrefDeviceId?: string[];
refDeviceId?: number[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 4, 5], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 5], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("common" in data && data.common != undefined) {
this.common = data.common;
@@ -8631,9 +7824,6 @@ export namespace graphicData {
if ("slopeNumber" in data && data.slopeNumber != undefined) {
this.slopeNumber = data.slopeNumber;
}
- if ("oldrefDeviceId" in data && data.oldrefDeviceId != undefined) {
- this.oldrefDeviceId = data.oldrefDeviceId;
- }
if ("refDeviceId" in data && data.refDeviceId != undefined) {
this.refDeviceId = data.refDeviceId;
}
@@ -8660,12 +7850,6 @@ export namespace graphicData {
set slopeNumber(value: number) {
pb_1.Message.setField(this, 3, value);
}
- get oldrefDeviceId() {
- return pb_1.Message.getFieldWithDefault(this, 4, []) as string[];
- }
- set oldrefDeviceId(value: string[]) {
- pb_1.Message.setField(this, 4, value);
- }
get refDeviceId() {
return pb_1.Message.getFieldWithDefault(this, 5, []) as number[];
}
@@ -8676,7 +7860,6 @@ export namespace graphicData {
common?: ReturnType;
points?: ReturnType[];
slopeNumber?: number;
- oldrefDeviceId?: string[];
refDeviceId?: number[];
}): Slope {
const message = new Slope({});
@@ -8689,9 +7872,6 @@ export namespace graphicData {
if (data.slopeNumber != null) {
message.slopeNumber = data.slopeNumber;
}
- if (data.oldrefDeviceId != null) {
- message.oldrefDeviceId = data.oldrefDeviceId;
- }
if (data.refDeviceId != null) {
message.refDeviceId = data.refDeviceId;
}
@@ -8702,7 +7882,6 @@ export namespace graphicData {
common?: ReturnType;
points?: ReturnType[];
slopeNumber?: number;
- oldrefDeviceId?: string[];
refDeviceId?: number[];
} = {};
if (this.common != null) {
@@ -8714,9 +7893,6 @@ export namespace graphicData {
if (this.slopeNumber != null) {
data.slopeNumber = this.slopeNumber;
}
- if (this.oldrefDeviceId != null) {
- data.oldrefDeviceId = this.oldrefDeviceId;
- }
if (this.refDeviceId != null) {
data.refDeviceId = this.refDeviceId;
}
@@ -8732,8 +7908,6 @@ export namespace graphicData {
writer.writeRepeatedMessage(2, this.points, (item: Point) => item.serialize(writer));
if (this.slopeNumber != 0)
writer.writeSint32(3, this.slopeNumber);
- if (this.oldrefDeviceId.length)
- writer.writeRepeatedString(4, this.oldrefDeviceId);
if (this.refDeviceId.length)
writer.writePackedUint32(5, this.refDeviceId);
if (!w)
@@ -8754,9 +7928,6 @@ export namespace graphicData {
case 3:
message.slopeNumber = reader.readSint32();
break;
- case 4:
- pb_1.Message.addToRepeatedField(message, 4, reader.readString());
- break;
case 5:
message.refDeviceId = reader.readPackedUint32();
break;
@@ -8778,11 +7949,10 @@ export namespace graphicData {
common?: CommonInfo;
points?: Point[];
curvatureNumber?: number;
- oldrefDeviceId?: string[];
refDeviceId?: number[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 4, 5], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 5], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("common" in data && data.common != undefined) {
this.common = data.common;
@@ -8793,9 +7963,6 @@ export namespace graphicData {
if ("curvatureNumber" in data && data.curvatureNumber != undefined) {
this.curvatureNumber = data.curvatureNumber;
}
- if ("oldrefDeviceId" in data && data.oldrefDeviceId != undefined) {
- this.oldrefDeviceId = data.oldrefDeviceId;
- }
if ("refDeviceId" in data && data.refDeviceId != undefined) {
this.refDeviceId = data.refDeviceId;
}
@@ -8822,12 +7989,6 @@ export namespace graphicData {
set curvatureNumber(value: number) {
pb_1.Message.setField(this, 3, value);
}
- get oldrefDeviceId() {
- return pb_1.Message.getFieldWithDefault(this, 4, []) as string[];
- }
- set oldrefDeviceId(value: string[]) {
- pb_1.Message.setField(this, 4, value);
- }
get refDeviceId() {
return pb_1.Message.getFieldWithDefault(this, 5, []) as number[];
}
@@ -8838,7 +7999,6 @@ export namespace graphicData {
common?: ReturnType;
points?: ReturnType[];
curvatureNumber?: number;
- oldrefDeviceId?: string[];
refDeviceId?: number[];
}): Curvature {
const message = new Curvature({});
@@ -8851,9 +8011,6 @@ export namespace graphicData {
if (data.curvatureNumber != null) {
message.curvatureNumber = data.curvatureNumber;
}
- if (data.oldrefDeviceId != null) {
- message.oldrefDeviceId = data.oldrefDeviceId;
- }
if (data.refDeviceId != null) {
message.refDeviceId = data.refDeviceId;
}
@@ -8864,7 +8021,6 @@ export namespace graphicData {
common?: ReturnType;
points?: ReturnType[];
curvatureNumber?: number;
- oldrefDeviceId?: string[];
refDeviceId?: number[];
} = {};
if (this.common != null) {
@@ -8876,9 +8032,6 @@ export namespace graphicData {
if (this.curvatureNumber != null) {
data.curvatureNumber = this.curvatureNumber;
}
- if (this.oldrefDeviceId != null) {
- data.oldrefDeviceId = this.oldrefDeviceId;
- }
if (this.refDeviceId != null) {
data.refDeviceId = this.refDeviceId;
}
@@ -8894,8 +8047,6 @@ export namespace graphicData {
writer.writeRepeatedMessage(2, this.points, (item: Point) => item.serialize(writer));
if (this.curvatureNumber != 0)
writer.writeSint32(3, this.curvatureNumber);
- if (this.oldrefDeviceId.length)
- writer.writeRepeatedString(4, this.oldrefDeviceId);
if (this.refDeviceId.length)
writer.writePackedUint32(5, this.refDeviceId);
if (!w)
@@ -8916,9 +8067,6 @@ export namespace graphicData {
case 3:
message.curvatureNumber = reader.readSint32();
break;
- case 4:
- pb_1.Message.addToRepeatedField(message, 4, reader.readString());
- break;
case 5:
message.refDeviceId = reader.readPackedUint32();
break;
@@ -8939,7 +8087,6 @@ export namespace graphicData {
constructor(data?: any[] | {
common?: CommonInfo;
code?: string;
- oldrefStand?: string;
runDirection?: string;
refStand?: number;
}) {
@@ -8952,9 +8099,6 @@ export namespace graphicData {
if ("code" in data && data.code != undefined) {
this.code = data.code;
}
- if ("oldrefStand" in data && data.oldrefStand != undefined) {
- this.oldrefStand = data.oldrefStand;
- }
if ("runDirection" in data && data.runDirection != undefined) {
this.runDirection = data.runDirection;
}
@@ -8978,12 +8122,6 @@ export namespace graphicData {
set code(value: string) {
pb_1.Message.setField(this, 2, value);
}
- get oldrefStand() {
- return pb_1.Message.getFieldWithDefault(this, 3, "") as string;
- }
- set oldrefStand(value: string) {
- pb_1.Message.setField(this, 3, value);
- }
get runDirection() {
return pb_1.Message.getFieldWithDefault(this, 4, "") as string;
}
@@ -8999,7 +8137,6 @@ export namespace graphicData {
static fromObject(data: {
common?: ReturnType;
code?: string;
- oldrefStand?: string;
runDirection?: string;
refStand?: number;
}): DepartureTimer {
@@ -9010,9 +8147,6 @@ export namespace graphicData {
if (data.code != null) {
message.code = data.code;
}
- if (data.oldrefStand != null) {
- message.oldrefStand = data.oldrefStand;
- }
if (data.runDirection != null) {
message.runDirection = data.runDirection;
}
@@ -9025,7 +8159,6 @@ export namespace graphicData {
const data: {
common?: ReturnType;
code?: string;
- oldrefStand?: string;
runDirection?: string;
refStand?: number;
} = {};
@@ -9035,9 +8168,6 @@ export namespace graphicData {
if (this.code != null) {
data.code = this.code;
}
- if (this.oldrefStand != null) {
- data.oldrefStand = this.oldrefStand;
- }
if (this.runDirection != null) {
data.runDirection = this.runDirection;
}
@@ -9054,8 +8184,6 @@ export namespace graphicData {
writer.writeMessage(1, this.common, () => this.common.serialize(writer));
if (this.code.length)
writer.writeString(2, this.code);
- if (this.oldrefStand.length)
- writer.writeString(3, this.oldrefStand);
if (this.runDirection.length)
writer.writeString(4, this.runDirection);
if (this.refStand != 0)
@@ -9075,9 +8203,6 @@ export namespace graphicData {
case 2:
message.code = reader.readString();
break;
- case 3:
- message.oldrefStand = reader.readString();
- break;
case 4:
message.runDirection = reader.readString();
break;
@@ -9103,7 +8228,6 @@ export namespace graphicData {
code?: string;
flip?: boolean;
index?: number;
- oldrefStand?: string;
refStand?: number;
}) {
super();
@@ -9121,9 +8245,6 @@ export namespace graphicData {
if ("index" in data && data.index != undefined) {
this.index = data.index;
}
- if ("oldrefStand" in data && data.oldrefStand != undefined) {
- this.oldrefStand = data.oldrefStand;
- }
if ("refStand" in data && data.refStand != undefined) {
this.refStand = data.refStand;
}
@@ -9156,12 +8277,6 @@ export namespace graphicData {
set index(value: number) {
pb_1.Message.setField(this, 4, value);
}
- get oldrefStand() {
- return pb_1.Message.getFieldWithDefault(this, 5, "") as string;
- }
- set oldrefStand(value: string) {
- pb_1.Message.setField(this, 5, value);
- }
get refStand() {
return pb_1.Message.getFieldWithDefault(this, 6, 0) as number;
}
@@ -9173,7 +8288,6 @@ export namespace graphicData {
code?: string;
flip?: boolean;
index?: number;
- oldrefStand?: string;
refStand?: number;
}): AutoReturnBox {
const message = new AutoReturnBox({});
@@ -9189,9 +8303,6 @@ export namespace graphicData {
if (data.index != null) {
message.index = data.index;
}
- if (data.oldrefStand != null) {
- message.oldrefStand = data.oldrefStand;
- }
if (data.refStand != null) {
message.refStand = data.refStand;
}
@@ -9203,7 +8314,6 @@ export namespace graphicData {
code?: string;
flip?: boolean;
index?: number;
- oldrefStand?: string;
refStand?: number;
} = {};
if (this.common != null) {
@@ -9218,9 +8328,6 @@ export namespace graphicData {
if (this.index != null) {
data.index = this.index;
}
- if (this.oldrefStand != null) {
- data.oldrefStand = this.oldrefStand;
- }
if (this.refStand != null) {
data.refStand = this.refStand;
}
@@ -9238,8 +8345,6 @@ export namespace graphicData {
writer.writeBool(3, this.flip);
if (this.index != 0)
writer.writeInt32(4, this.index);
- if (this.oldrefStand.length)
- writer.writeString(5, this.oldrefStand);
if (this.refStand != 0)
writer.writeUint32(6, this.refStand);
if (!w)
@@ -9263,9 +8368,6 @@ export namespace graphicData {
case 4:
message.index = reader.readInt32();
break;
- case 5:
- message.oldrefStand = reader.readString();
- break;
case 6:
message.refStand = reader.readUint32();
break;
@@ -9630,18 +8732,14 @@ export namespace graphicData {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
code?: string;
- oldrefDevices?: string[];
refDevices?: number[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 3], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [3], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("code" in data && data.code != undefined) {
this.code = data.code;
}
- if ("oldrefDevices" in data && data.oldrefDevices != undefined) {
- this.oldrefDevices = data.oldrefDevices;
- }
if ("refDevices" in data && data.refDevices != undefined) {
this.refDevices = data.refDevices;
}
@@ -9653,12 +8751,6 @@ export namespace graphicData {
set code(value: string) {
pb_1.Message.setField(this, 1, value);
}
- get oldrefDevices() {
- return pb_1.Message.getFieldWithDefault(this, 2, []) as string[];
- }
- set oldrefDevices(value: string[]) {
- pb_1.Message.setField(this, 2, value);
- }
get refDevices() {
return pb_1.Message.getFieldWithDefault(this, 3, []) as number[];
}
@@ -9667,16 +8759,12 @@ export namespace graphicData {
}
static fromObject(data: {
code?: string;
- oldrefDevices?: string[];
refDevices?: number[];
}): DeviceCombinationtype {
const message = new DeviceCombinationtype({});
if (data.code != null) {
message.code = data.code;
}
- if (data.oldrefDevices != null) {
- message.oldrefDevices = data.oldrefDevices;
- }
if (data.refDevices != null) {
message.refDevices = data.refDevices;
}
@@ -9685,15 +8773,11 @@ export namespace graphicData {
toObject() {
const data: {
code?: string;
- oldrefDevices?: string[];
refDevices?: number[];
} = {};
if (this.code != null) {
data.code = this.code;
}
- if (this.oldrefDevices != null) {
- data.oldrefDevices = this.oldrefDevices;
- }
if (this.refDevices != null) {
data.refDevices = this.refDevices;
}
@@ -9705,8 +8789,6 @@ export namespace graphicData {
const writer = w || new pb_1.BinaryWriter();
if (this.code.length)
writer.writeString(1, this.code);
- if (this.oldrefDevices.length)
- writer.writeRepeatedString(2, this.oldrefDevices);
if (this.refDevices.length)
writer.writePackedUint32(3, this.refDevices);
if (!w)
@@ -9721,9 +8803,6 @@ export namespace graphicData {
case 1:
message.code = reader.readString();
break;
- case 2:
- pb_1.Message.addToRepeatedField(message, 2, reader.readString());
- break;
case 3:
message.refDevices = reader.readPackedUint32();
break;
@@ -9742,20 +8821,12 @@ export namespace graphicData {
export class SectionCodePoint extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
- oldCentralizedStation?: string;
- oldsectionIds?: string[];
sectionIds?: number[];
centralizedStation?: number;
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 3], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [3], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
- if ("oldCentralizedStation" in data && data.oldCentralizedStation != undefined) {
- this.oldCentralizedStation = data.oldCentralizedStation;
- }
- if ("oldsectionIds" in data && data.oldsectionIds != undefined) {
- this.oldsectionIds = data.oldsectionIds;
- }
if ("sectionIds" in data && data.sectionIds != undefined) {
this.sectionIds = data.sectionIds;
}
@@ -9764,18 +8835,6 @@ export namespace graphicData {
}
}
}
- get oldCentralizedStation() {
- return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
- }
- set oldCentralizedStation(value: string) {
- pb_1.Message.setField(this, 1, value);
- }
- get oldsectionIds() {
- return pb_1.Message.getFieldWithDefault(this, 2, []) as string[];
- }
- set oldsectionIds(value: string[]) {
- pb_1.Message.setField(this, 2, value);
- }
get sectionIds() {
return pb_1.Message.getFieldWithDefault(this, 3, []) as number[];
}
@@ -9789,18 +8848,10 @@ export namespace graphicData {
pb_1.Message.setField(this, 4, value);
}
static fromObject(data: {
- oldCentralizedStation?: string;
- oldsectionIds?: string[];
sectionIds?: number[];
centralizedStation?: number;
}): SectionCodePoint {
const message = new SectionCodePoint({});
- if (data.oldCentralizedStation != null) {
- message.oldCentralizedStation = data.oldCentralizedStation;
- }
- if (data.oldsectionIds != null) {
- message.oldsectionIds = data.oldsectionIds;
- }
if (data.sectionIds != null) {
message.sectionIds = data.sectionIds;
}
@@ -9811,17 +8862,9 @@ export namespace graphicData {
}
toObject() {
const data: {
- oldCentralizedStation?: string;
- oldsectionIds?: string[];
sectionIds?: number[];
centralizedStation?: number;
} = {};
- if (this.oldCentralizedStation != null) {
- data.oldCentralizedStation = this.oldCentralizedStation;
- }
- if (this.oldsectionIds != null) {
- data.oldsectionIds = this.oldsectionIds;
- }
if (this.sectionIds != null) {
data.sectionIds = this.sectionIds;
}
@@ -9834,10 +8877,6 @@ export namespace graphicData {
serialize(w: pb_1.BinaryWriter): void;
serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
const writer = w || new pb_1.BinaryWriter();
- if (this.oldCentralizedStation.length)
- writer.writeString(1, this.oldCentralizedStation);
- if (this.oldsectionIds.length)
- writer.writeRepeatedString(2, this.oldsectionIds);
if (this.sectionIds.length)
writer.writePackedUint32(3, this.sectionIds);
if (this.centralizedStation != 0)
@@ -9851,12 +8890,6 @@ export namespace graphicData {
if (reader.isEndGroup())
break;
switch (reader.getFieldNumber()) {
- case 1:
- message.oldCentralizedStation = reader.readString();
- break;
- case 2:
- pb_1.Message.addToRepeatedField(message, 2, reader.readString());
- break;
case 3:
message.sectionIds = reader.readPackedUint32();
break;
@@ -10072,18 +9105,14 @@ export namespace graphicData {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
name?: string;
- oldids?: string[];
ids?: number[];
}) {
super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 3], this.#one_of_decls);
+ pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [3], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("name" in data && data.name != undefined) {
this.name = data.name;
}
- if ("oldids" in data && data.oldids != undefined) {
- this.oldids = data.oldids;
- }
if ("ids" in data && data.ids != undefined) {
this.ids = data.ids;
}
@@ -10095,12 +9124,6 @@ export namespace graphicData {
set name(value: string) {
pb_1.Message.setField(this, 1, value);
}
- get oldids() {
- return pb_1.Message.getFieldWithDefault(this, 2, []) as string[];
- }
- set oldids(value: string[]) {
- pb_1.Message.setField(this, 2, value);
- }
get ids() {
return pb_1.Message.getFieldWithDefault(this, 3, []) as number[];
}
@@ -10109,16 +9132,12 @@ export namespace graphicData {
}
static fromObject(data: {
name?: string;
- oldids?: string[];
ids?: number[];
}): OtherLine {
const message = new OtherLine({});
if (data.name != null) {
message.name = data.name;
}
- if (data.oldids != null) {
- message.oldids = data.oldids;
- }
if (data.ids != null) {
message.ids = data.ids;
}
@@ -10127,15 +9146,11 @@ export namespace graphicData {
toObject() {
const data: {
name?: string;
- oldids?: string[];
ids?: number[];
} = {};
if (this.name != null) {
data.name = this.name;
}
- if (this.oldids != null) {
- data.oldids = this.oldids;
- }
if (this.ids != null) {
data.ids = this.ids;
}
@@ -10147,8 +9162,6 @@ export namespace graphicData {
const writer = w || new pb_1.BinaryWriter();
if (this.name.length)
writer.writeString(1, this.name);
- if (this.oldids.length)
- writer.writeRepeatedString(2, this.oldids);
if (this.ids.length)
writer.writePackedUint32(3, this.ids);
if (!w)
@@ -10163,9 +9176,6 @@ export namespace graphicData {
case 1:
message.name = reader.readString();
break;
- case 2:
- pb_1.Message.addToRepeatedField(message, 2, reader.readString());
- break;
case 3:
message.ids = reader.readPackedUint32();
break;
@@ -10181,166 +9191,4 @@ export namespace graphicData {
return OtherLine.deserialize(bytes);
}
}
- export class GarageDoorBox extends pb_1.Message {
- #one_of_decls: number[][] = [];
- constructor(data?: any[] | {
- common?: CommonInfo;
- code?: string;
- refPslMapCode?: string;
- refGarageDoorId?: number;
- flip?: boolean;
- }) {
- super();
- pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
- if (!Array.isArray(data) && typeof data == "object") {
- if ("common" in data && data.common != undefined) {
- this.common = data.common;
- }
- if ("code" in data && data.code != undefined) {
- this.code = data.code;
- }
- if ("refPslMapCode" in data && data.refPslMapCode != undefined) {
- this.refPslMapCode = data.refPslMapCode;
- }
- if ("refGarageDoorId" in data && data.refGarageDoorId != undefined) {
- this.refGarageDoorId = data.refGarageDoorId;
- }
- if ("flip" in data && data.flip != undefined) {
- this.flip = data.flip;
- }
- }
- }
- get common() {
- return pb_1.Message.getWrapperField(this, CommonInfo, 1) as CommonInfo;
- }
- set common(value: CommonInfo) {
- pb_1.Message.setWrapperField(this, 1, value);
- }
- get has_common() {
- return pb_1.Message.getField(this, 1) != null;
- }
- get code() {
- return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
- }
- set code(value: string) {
- pb_1.Message.setField(this, 2, value);
- }
- get refPslMapCode() {
- return pb_1.Message.getFieldWithDefault(this, 3, "") as string;
- }
- set refPslMapCode(value: string) {
- pb_1.Message.setField(this, 3, value);
- }
- get refGarageDoorId() {
- return pb_1.Message.getFieldWithDefault(this, 4, 0) as number;
- }
- set refGarageDoorId(value: number) {
- pb_1.Message.setField(this, 4, value);
- }
- get flip() {
- return pb_1.Message.getFieldWithDefault(this, 5, false) as boolean;
- }
- set flip(value: boolean) {
- pb_1.Message.setField(this, 5, value);
- }
- static fromObject(data: {
- common?: ReturnType;
- code?: string;
- refPslMapCode?: string;
- refGarageDoorId?: number;
- flip?: boolean;
- }): GarageDoorBox {
- const message = new GarageDoorBox({});
- if (data.common != null) {
- message.common = CommonInfo.fromObject(data.common);
- }
- if (data.code != null) {
- message.code = data.code;
- }
- if (data.refPslMapCode != null) {
- message.refPslMapCode = data.refPslMapCode;
- }
- if (data.refGarageDoorId != null) {
- message.refGarageDoorId = data.refGarageDoorId;
- }
- if (data.flip != null) {
- message.flip = data.flip;
- }
- return message;
- }
- toObject() {
- const data: {
- common?: ReturnType;
- code?: string;
- refPslMapCode?: string;
- refGarageDoorId?: number;
- flip?: boolean;
- } = {};
- if (this.common != null) {
- data.common = this.common.toObject();
- }
- if (this.code != null) {
- data.code = this.code;
- }
- if (this.refPslMapCode != null) {
- data.refPslMapCode = this.refPslMapCode;
- }
- if (this.refGarageDoorId != null) {
- data.refGarageDoorId = this.refGarageDoorId;
- }
- if (this.flip != null) {
- data.flip = this.flip;
- }
- return data;
- }
- serialize(): Uint8Array;
- serialize(w: pb_1.BinaryWriter): void;
- serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
- const writer = w || new pb_1.BinaryWriter();
- if (this.has_common)
- writer.writeMessage(1, this.common, () => this.common.serialize(writer));
- if (this.code.length)
- writer.writeString(2, this.code);
- if (this.refPslMapCode.length)
- writer.writeString(3, this.refPslMapCode);
- if (this.refGarageDoorId != 0)
- writer.writeUint32(4, this.refGarageDoorId);
- if (this.flip != false)
- writer.writeBool(5, this.flip);
- if (!w)
- return writer.getResultBuffer();
- }
- static deserialize(bytes: Uint8Array | pb_1.BinaryReader): GarageDoorBox {
- const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new GarageDoorBox();
- while (reader.nextField()) {
- if (reader.isEndGroup())
- break;
- switch (reader.getFieldNumber()) {
- case 1:
- reader.readMessage(message.common, () => message.common = CommonInfo.deserialize(reader));
- break;
- case 2:
- message.code = reader.readString();
- break;
- case 3:
- message.refPslMapCode = reader.readString();
- break;
- case 4:
- message.refGarageDoorId = reader.readUint32();
- break;
- case 5:
- message.flip = reader.readBool();
- break;
- default: reader.skipField();
- }
- }
- return message;
- }
- serializeBinary(): Uint8Array {
- return this.serialize();
- }
- static deserializeBinary(bytes: Uint8Array): GarageDoorBox {
- return GarageDoorBox.deserialize(bytes);
- }
- }
}