From 3f58919bf52c1937adfbb95d49750f2f73069b97 Mon Sep 17 00:00:00 2001 From: Jun Zhang Date: Thu, 26 Sep 2024 13:52:57 +0800 Subject: [PATCH] update npm-publish action --- .github/workflows/npm-publish.yml | 5 +- go/city/agent/v2/agent.pb.go | 16 ++--- go/city/agent/v2/agent_service.pb.go | 10 +-- go/city/agent/v2/motion.pb.go | 2 +- go/city/comm/input/v1/comm.pb.go | 18 ++--- go/city/config/v1/config.pb.go | 6 +- go/city/economy/v1/economy.pb.go | 14 ++-- go/city/economy/v1/org_service.pb.go | 12 ++-- go/city/elec/input/v1/config.pb.go | 10 +-- go/city/elec/input/v1/input.pb.go | 10 +-- go/city/elec/input/v1/input_service.pb.go | 2 +- go/city/event/v1/event.pb.go | 2 +- go/city/event/v2/event.pb.go | 6 +- go/city/geo/v2/geo.pb.go | 12 ++-- go/city/map/v2/aoi_service.pb.go | 6 +- go/city/map/v2/lane_service.pb.go | 6 +- go/city/map/v2/lane_state.pb.go | 2 +- go/city/map/v2/light.pb.go | 2 +- go/city/map/v2/map.pb.go | 84 +++++++++++----------- go/city/map/v2/road_service.pb.go | 12 ++-- go/city/map/v2/traffic_light_service.pb.go | 4 +- go/city/person/v1/motion.pb.go | 8 +-- go/city/person/v1/person.pb.go | 18 ++--- go/city/person/v1/person_runtime.pb.go | 2 +- go/city/person/v1/person_service.pb.go | 12 ++-- go/city/person/v1/vehicle.pb.go | 22 +++--- go/city/routing/v2/cost.pb.go | 4 +- go/city/routing/v2/routing.pb.go | 8 +-- go/city/routing/v2/routing_service.pb.go | 12 ++-- go/city/trip/v2/trip.pb.go | 6 +- go/city/water/input/v1/config.pb.go | 10 +-- go/city/water/input/v1/input_service.pb.go | 2 +- go/city/water/input/v1/water.pb.go | 2 +- 33 files changed, 175 insertions(+), 172 deletions(-) diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 2395997d..753a3eb7 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -10,6 +10,9 @@ on: jobs: publish-npm: runs-on: ubuntu-latest + permissions: + contents: read + id-token: write steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 @@ -18,6 +21,6 @@ jobs: registry-url: https://registry.npmjs.org/ - run: npm ci - run: npm version from-git --no-git-tag-version - - run: npm publish + - run: npm publish --provenance --access public env: NODE_AUTH_TOKEN: ${{secrets.npm_token}} diff --git a/go/city/agent/v2/agent.pb.go b/go/city/agent/v2/agent.pb.go index 39aef391..bb6924c7 100644 --- a/go/city/agent/v2/agent.pb.go +++ b/go/city/agent/v2/agent.pb.go @@ -87,19 +87,19 @@ type AgentAttribute struct { unknownFields protoimpl.UnknownFields // 智能体类型 - Type AgentType `protobuf:"varint,1,opt,name=type,proto3,enum=city.agent.v2.AgentType" json:"type,omitempty" bson:"type" db:"type" yaml:"type"` + Type AgentType `protobuf:"varint,1,opt,name=type,proto3,enum=city.agent.v2.AgentType" json:"type,omitempty" yaml:"type" bson:"type" db:"type"` // 单位: m，长度 Length float64 `protobuf:"fixed64,2,opt,name=length,proto3" json:"length,omitempty" yaml:"length" bson:"length" db:"length"` // 单位: m，宽度 Width float64 `protobuf:"fixed64,3,opt,name=width,proto3" json:"width,omitempty" yaml:"width" bson:"width" db:"width"` // 单位: m/s - MaxSpeed float64 `protobuf:"fixed64,4,opt,name=max_speed,json=maxSpeed,proto3" json:"max_speed,omitempty" yaml:"max_speed" bson:"max_speed" db:"max_speed"` + MaxSpeed float64 `protobuf:"fixed64,4,opt,name=max_speed,json=maxSpeed,proto3" json:"max_speed,omitempty" db:"max_speed" yaml:"max_speed" bson:"max_speed"` // 单位: m/s^2, 最大加速度（正值） MaxAcceleration float64 `protobuf:"fixed64,5,opt,name=max_acceleration,json=maxAcceleration,proto3" json:"max_acceleration,omitempty" db:"max_acceleration" yaml:"max_acceleration" bson:"max_acceleration"` // 单位: m/s^2, 最大减速度（负值） MaxBrakingAcceleration float64 `protobuf:"fixed64,6,opt,name=max_braking_acceleration,json=maxBrakingAcceleration,proto3" json:"max_braking_acceleration,omitempty" yaml:"max_braking_acceleration" bson:"max_braking_acceleration" db:"max_braking_acceleration"` // 单位: m/s^2, 一般加速度（正值），要求小于最大加速度 - UsualAcceleration float64 `protobuf:"fixed64,7,opt,name=usual_acceleration,json=usualAcceleration,proto3" json:"usual_acceleration,omitempty" yaml:"usual_acceleration" bson:"usual_acceleration" db:"usual_acceleration"` + UsualAcceleration float64 `protobuf:"fixed64,7,opt,name=usual_acceleration,json=usualAcceleration,proto3" json:"usual_acceleration,omitempty" bson:"usual_acceleration" db:"usual_acceleration" yaml:"usual_acceleration"` // 单位: m/s^2, 一般减速度（负值），要求大于最大减速度 UsualBrakingAcceleration float64 `protobuf:"fixed64,8,opt,name=usual_braking_acceleration,json=usualBrakingAcceleration,proto3" json:"usual_braking_acceleration,omitempty" yaml:"usual_braking_acceleration" bson:"usual_braking_acceleration" db:"usual_braking_acceleration"` } @@ -259,7 +259,7 @@ type BusAttribute struct { // 公交线路ID LineId int32 `protobuf:"varint,1,opt,name=line_id,json=lineId,proto3" json:"line_id,omitempty" yaml:"line_id" bson:"line_id" db:"line_id"` // 公交车容量 - Capacity int32 `protobuf:"varint,2,opt,name=capacity,proto3" json:"capacity,omitempty" yaml:"capacity" bson:"capacity" db:"capacity"` + Capacity int32 `protobuf:"varint,2,opt,name=capacity,proto3" json:"capacity,omitempty" db:"capacity" yaml:"capacity" bson:"capacity"` } func (x *BusAttribute) Reset() { @@ -356,15 +356,15 @@ type Agent struct { unknownFields protoimpl.UnknownFields // 智能体ID - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" bson:"id" db:"id" yaml:"id"` // 参数 - Attribute *AgentAttribute `protobuf:"bytes,2,opt,name=attribute,proto3" json:"attribute,omitempty" yaml:"attribute" bson:"attribute" db:"attribute"` + Attribute *AgentAttribute `protobuf:"bytes,2,opt,name=attribute,proto3" json:"attribute,omitempty" db:"attribute" yaml:"attribute" bson:"attribute"` // 初始位置 Home *v2.Position `protobuf:"bytes,3,opt,name=home,proto3" json:"home,omitempty" yaml:"home" bson:"home" db:"home"` // 初始日程 - Schedules []*v21.Schedule `protobuf:"bytes,4,rep,name=schedules,proto3" json:"schedules,omitempty" db:"schedules" yaml:"schedules" bson:"schedules"` + Schedules []*v21.Schedule `protobuf:"bytes,4,rep,name=schedules,proto3" json:"schedules,omitempty" bson:"schedules" db:"schedules" yaml:"schedules"` // 车辆附加属性 - VehicleAttribute *VehicleAttribute `protobuf:"bytes,7,opt,name=vehicle_attribute,json=vehicleAttribute,proto3,oneof" json:"vehicle_attribute,omitempty" yaml:"vehicle_attribute" bson:"vehicle_attribute" db:"vehicle_attribute"` + VehicleAttribute *VehicleAttribute `protobuf:"bytes,7,opt,name=vehicle_attribute,json=vehicleAttribute,proto3,oneof" json:"vehicle_attribute,omitempty" bson:"vehicle_attribute" db:"vehicle_attribute" yaml:"vehicle_attribute"` // 公交车附加属性 BusAttribute *BusAttribute `protobuf:"bytes,8,opt,name=bus_attribute,json=busAttribute,proto3,oneof" json:"bus_attribute,omitempty" yaml:"bus_attribute" bson:"bus_attribute" db:"bus_attribute"` // 自行车附加属性 diff --git a/go/city/agent/v2/agent_service.pb.go b/go/city/agent/v2/agent_service.pb.go index 719f68e2..1699c436 100644 --- a/go/city/agent/v2/agent_service.pb.go +++ b/go/city/agent/v2/agent_service.pb.go @@ -80,7 +80,7 @@ type GetAgentResponse struct { // agent信息 Base *Agent `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty" yaml:"base" bson:"base" db:"base"` // agent运动信息 - Motion *AgentMotion `protobuf:"bytes,2,opt,name=motion,proto3" json:"motion,omitempty" bson:"motion" db:"motion" yaml:"motion"` + Motion *AgentMotion `protobuf:"bytes,2,opt,name=motion,proto3" json:"motion,omitempty" yaml:"motion" bson:"motion" db:"motion"` } func (x *GetAgentResponse) Reset() { @@ -136,7 +136,7 @@ type AddAgentRequest struct { unknownFields protoimpl.UnknownFields // 约定：agent中不设置id - Agent *Agent `protobuf:"bytes,1,opt,name=agent,proto3" json:"agent,omitempty" yaml:"agent" bson:"agent" db:"agent"` + Agent *Agent `protobuf:"bytes,1,opt,name=agent,proto3" json:"agent,omitempty" db:"agent" yaml:"agent" bson:"agent"` } func (x *AddAgentRequest) Reset() { @@ -185,7 +185,7 @@ type AddAgentResponse struct { unknownFields protoimpl.UnknownFields // 新增的agent分配得到的ID - AgentId int32 `protobuf:"varint,1,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty" bson:"agent_id" db:"agent_id" yaml:"agent_id"` + AgentId int32 `protobuf:"varint,1,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty" yaml:"agent_id" bson:"agent_id" db:"agent_id"` } func (x *AddAgentResponse) Reset() { @@ -234,7 +234,7 @@ type SetScheduleRequest struct { unknownFields protoimpl.UnknownFields // agent id - AgentId int32 `protobuf:"varint,1,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty" db:"agent_id" yaml:"agent_id" bson:"agent_id"` + AgentId int32 `protobuf:"varint,1,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty" yaml:"agent_id" bson:"agent_id" db:"agent_id"` // 新的schedule（覆盖原有的schedule） Schedules []*v2.Schedule `protobuf:"bytes,2,rep,name=schedules,proto3" json:"schedules,omitempty" yaml:"schedules" bson:"schedules" db:"schedules"` } @@ -380,7 +380,7 @@ type GetAgentsByLongLatAreaResponse struct { unknownFields protoimpl.UnknownFields // 当前模拟步数 - Step int32 `protobuf:"varint,1,opt,name=step,proto3" json:"step,omitempty" bson:"step" db:"step" yaml:"step"` + Step int32 `protobuf:"varint,1,opt,name=step,proto3" json:"step,omitempty" yaml:"step" bson:"step" db:"step"` // 区域内的agent的运动信息 Motions []*AgentMotion `protobuf:"bytes,2,rep,name=motions,proto3" json:"motions,omitempty" yaml:"motions" bson:"motions" db:"motions"` } diff --git a/go/city/agent/v2/motion.pb.go b/go/city/agent/v2/motion.pb.go index 96774efd..c850e42a 100644 --- a/go/city/agent/v2/motion.pb.go +++ b/go/city/agent/v2/motion.pb.go @@ -103,7 +103,7 @@ type AgentMotion struct { // 状态 Status Status `protobuf:"varint,2,opt,name=status,proto3,enum=city.agent.v2.Status" json:"status,omitempty" yaml:"status" bson:"status" db:"status"` // 位置（包含逻辑位置、XY位置、经纬度位置） - Position *v2.Position `protobuf:"bytes,3,opt,name=position,proto3" json:"position,omitempty" yaml:"position" bson:"position" db:"position"` + Position *v2.Position `protobuf:"bytes,3,opt,name=position,proto3" json:"position,omitempty" bson:"position" db:"position" yaml:"position"` // 速度 V float64 `protobuf:"fixed64,4,opt,name=v,proto3" json:"v,omitempty" yaml:"v" bson:"v" db:"v"` // 方向角（atan2计算得到的弧度） diff --git a/go/city/comm/input/v1/comm.pb.go b/go/city/comm/input/v1/comm.pb.go index 0acf3ea1..ca077ea3 100644 --- a/go/city/comm/input/v1/comm.pb.go +++ b/go/city/comm/input/v1/comm.pb.go @@ -129,18 +129,18 @@ type Node struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` - Type NodeType `protobuf:"varint,2,opt,name=type,proto3,enum=city.comm.input.v1.NodeType" json:"type,omitempty" yaml:"type" bson:"type" db:"type"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" db:"id" yaml:"id" bson:"id"` + Type NodeType `protobuf:"varint,2,opt,name=type,proto3,enum=city.comm.input.v1.NodeType" json:"type,omitempty" db:"type" yaml:"type" bson:"type"` // 父节点 ParentId int32 `protobuf:"varint,3,opt,name=parent_id,json=parentId,proto3" json:"parent_id,omitempty" yaml:"parent_id" bson:"parent_id" db:"parent_id"` // 子节点 - ChildrenIds []int32 `protobuf:"varint,4,rep,packed,name=children_ids,json=childrenIds,proto3" json:"children_ids,omitempty" yaml:"children_ids" bson:"children_ids" db:"children_ids"` + ChildrenIds []int32 `protobuf:"varint,4,rep,packed,name=children_ids,json=childrenIds,proto3" json:"children_ids,omitempty" db:"children_ids" yaml:"children_ids" bson:"children_ids"` // 节点经纬度位置 Position *v2.Position `protobuf:"bytes,5,opt,name=position,proto3,oneof" json:"position,omitempty" yaml:"position" bson:"position" db:"position"` // 节点所在aoi AoiId *int32 `protobuf:"varint,6,opt,name=aoi_id,json=aoiId,proto3,oneof" json:"aoi_id,omitempty" yaml:"aoi_id" bson:"aoi_id" db:"aoi_id"` // 基站频段id - FreqRangeId *int32 `protobuf:"varint,7,opt,name=freq_range_id,json=freqRangeId,proto3,oneof" json:"freq_range_id,omitempty" yaml:"freq_range_id" bson:"freq_range_id" db:"freq_range_id"` + FreqRangeId *int32 `protobuf:"varint,7,opt,name=freq_range_id,json=freqRangeId,proto3,oneof" json:"freq_range_id,omitempty" db:"freq_range_id" yaml:"freq_range_id" bson:"freq_range_id"` // 室内外基站类型 BaseStationType *BaseStationType `protobuf:"varint,8,opt,name=base_station_type,json=baseStationType,proto3,enum=city.comm.input.v1.BaseStationType,oneof" json:"base_station_type,omitempty" yaml:"base_station_type" bson:"base_station_type" db:"base_station_type"` } @@ -303,7 +303,7 @@ type Pump struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" db:"id" yaml:"id" bson:"id"` Position *v2.Position `protobuf:"bytes,2,opt,name=position,proto3" json:"position,omitempty" yaml:"position" bson:"position" db:"position"` } @@ -359,8 +359,8 @@ type CommDemand struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" db:"id" yaml:"id" bson:"id"` - Demands []float64 `protobuf:"fixed64,2,rep,packed,name=demands,proto3" json:"demands,omitempty" bson:"demands" db:"demands" yaml:"demands"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` + Demands []float64 `protobuf:"fixed64,2,rep,packed,name=demands,proto3" json:"demands,omitempty" yaml:"demands" bson:"demands" db:"demands"` } func (x *CommDemand) Reset() { @@ -415,7 +415,7 @@ type Nodes struct { unknownFields protoimpl.UnknownFields Nodes []*Node `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty" yaml:"nodes" bson:"nodes" db:"nodes"` - RepairStations []*RepairStation `protobuf:"bytes,2,rep,name=repair_stations,json=repairStations,proto3" json:"repair_stations,omitempty" yaml:"repair_stations" bson:"repair_stations" db:"repair_stations"` + RepairStations []*RepairStation `protobuf:"bytes,2,rep,name=repair_stations,json=repairStations,proto3" json:"repair_stations,omitempty" bson:"repair_stations" db:"repair_stations" yaml:"repair_stations"` Pumps []*Pump `protobuf:"bytes,3,rep,name=pumps,proto3" json:"pumps,omitempty" yaml:"pumps" bson:"pumps" db:"pumps"` } @@ -477,7 +477,7 @@ type CommDemands struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - CommDemands []*CommDemand `protobuf:"bytes,1,rep,name=comm_demands,json=commDemands,proto3" json:"comm_demands,omitempty" bson:"comm_demands" db:"comm_demands" yaml:"comm_demands"` + CommDemands []*CommDemand `protobuf:"bytes,1,rep,name=comm_demands,json=commDemands,proto3" json:"comm_demands,omitempty" db:"comm_demands" yaml:"comm_demands" bson:"comm_demands"` } func (x *CommDemands) Reset() { diff --git a/go/city/config/v1/config.pb.go b/go/city/config/v1/config.pb.go index 60e35abb..ceae7dbc 100644 --- a/go/city/config/v1/config.pb.go +++ b/go/city/config/v1/config.pb.go @@ -27,9 +27,9 @@ type MongoPath struct { unknownFields protoimpl.UnknownFields // 数据库名 - Db string `protobuf:"bytes,1,opt,name=db,proto3" json:"db,omitempty" db:"db" yaml:"db" bson:"db"` + Db string `protobuf:"bytes,1,opt,name=db,proto3" json:"db,omitempty" yaml:"db" bson:"db" db:"db"` // 集合名 - Col string `protobuf:"bytes,2,opt,name=col,proto3" json:"col,omitempty" db:"col" yaml:"col" bson:"col"` + Col string `protobuf:"bytes,2,opt,name=col,proto3" json:"col,omitempty" bson:"col" db:"col" yaml:"col"` } func (x *MongoPath) Reset() { @@ -84,7 +84,7 @@ type OutputTarget struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Sql string `protobuf:"bytes,1,opt,name=sql,proto3" json:"sql,omitempty" db:"sql" yaml:"sql" bson:"sql"` + Sql string `protobuf:"bytes,1,opt,name=sql,proto3" json:"sql,omitempty" yaml:"sql" bson:"sql" db:"sql"` } func (x *OutputTarget) Reset() { diff --git a/go/city/economy/v1/economy.pb.go b/go/city/economy/v1/economy.pb.go index f2d4ccc3..b1aa0852 100644 --- a/go/city/economy/v1/economy.pb.go +++ b/go/city/economy/v1/economy.pb.go @@ -32,7 +32,7 @@ type Person struct { // 起始资金 Money float64 `protobuf:"fixed64,2,opt,name=money,proto3" json:"money,omitempty" yaml:"money" bson:"money" db:"money"` // 所在组织ID（初始化时不提供，由组织中的员工列表设定） - OrgId *int32 `protobuf:"varint,3,opt,name=org_id,json=orgId,proto3,oneof" json:"org_id,omitempty" bson:"org_id" db:"org_id" yaml:"org_id"` + OrgId *int32 `protobuf:"varint,3,opt,name=org_id,json=orgId,proto3,oneof" json:"org_id,omitempty" yaml:"org_id" bson:"org_id" db:"org_id"` } func (x *Person) Reset() { @@ -95,7 +95,7 @@ type Employee struct { unknownFields protoimpl.UnknownFields // 员工ID - PersonId int32 `protobuf:"varint,1,opt,name=person_id,json=personId,proto3" json:"person_id,omitempty" yaml:"person_id" bson:"person_id" db:"person_id"` + PersonId int32 `protobuf:"varint,1,opt,name=person_id,json=personId,proto3" json:"person_id,omitempty" bson:"person_id" db:"person_id" yaml:"person_id"` // 薪水 Salary float64 `protobuf:"fixed64,2,opt,name=salary,proto3" json:"salary,omitempty" yaml:"salary" bson:"salary" db:"salary"` } @@ -220,7 +220,7 @@ type Goods struct { unknownFields protoimpl.UnknownFields // 货物类型 - Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty" bson:"type" db:"type" yaml:"type"` + Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty" yaml:"type" bson:"type" db:"type"` // 货物名称 Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty" yaml:"name" bson:"name" db:"name"` // 货物数量 @@ -298,15 +298,15 @@ type Org struct { // 组织ID Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` // 组织所在的POI ID - PoiId int32 `protobuf:"varint,2,opt,name=poi_id,json=poiId,proto3" json:"poi_id,omitempty" yaml:"poi_id" bson:"poi_id" db:"poi_id"` + PoiId int32 `protobuf:"varint,2,opt,name=poi_id,json=poiId,proto3" json:"poi_id,omitempty" db:"poi_id" yaml:"poi_id" bson:"poi_id"` // 员工列表（初始化时由Orgs列表提供，单向绑定到person上） - Employees []*Employee `protobuf:"bytes,3,rep,name=employees,proto3" json:"employees,omitempty" bson:"employees" db:"employees" yaml:"employees"` + Employees []*Employee `protobuf:"bytes,3,rep,name=employees,proto3" json:"employees,omitempty" yaml:"employees" bson:"employees" db:"employees"` // 岗位列表 Jobs []*Job `protobuf:"bytes,4,rep,name=jobs,proto3" json:"jobs,omitempty" yaml:"jobs" bson:"jobs" db:"jobs"` // 资金 Money float64 `protobuf:"fixed64,5,opt,name=money,proto3" json:"money,omitempty" yaml:"money" bson:"money" db:"money"` // 货物 - Goods []*Goods `protobuf:"bytes,6,rep,name=goods,proto3" json:"goods,omitempty" yaml:"goods" bson:"goods" db:"goods"` + Goods []*Goods `protobuf:"bytes,6,rep,name=goods,proto3" json:"goods,omitempty" db:"goods" yaml:"goods" bson:"goods"` // 功能列表 // buy: 购买货物 // apply: 申请岗位 @@ -402,7 +402,7 @@ type Economy struct { unknownFields protoimpl.UnknownFields // 人 - Persons []*Person `protobuf:"bytes,1,rep,name=persons,proto3" json:"persons,omitempty" db:"persons" yaml:"persons" bson:"persons"` + Persons []*Person `protobuf:"bytes,1,rep,name=persons,proto3" json:"persons,omitempty" yaml:"persons" bson:"persons" db:"persons"` // 组织列表 Orgs []*Org `protobuf:"bytes,2,rep,name=orgs,proto3" json:"orgs,omitempty" yaml:"orgs" bson:"orgs" db:"orgs"` } diff --git a/go/city/economy/v1/org_service.pb.go b/go/city/economy/v1/org_service.pb.go index 61d6e84d..2a5ab02a 100644 --- a/go/city/economy/v1/org_service.pb.go +++ b/go/city/economy/v1/org_service.pb.go @@ -176,7 +176,7 @@ type UpdateOrgMoneyRequestItem struct { // 待修改的组织 OrgId int32 `protobuf:"varint,1,opt,name=org_id,json=orgId,proto3" json:"org_id,omitempty" yaml:"org_id" bson:"org_id" db:"org_id"` // 正数表示增加，负数表示减少 - Money float64 `protobuf:"fixed64,2,opt,name=money,proto3" json:"money,omitempty" db:"money" yaml:"money" bson:"money"` + Money float64 `protobuf:"fixed64,2,opt,name=money,proto3" json:"money,omitempty" yaml:"money" bson:"money" db:"money"` } func (x *UpdateOrgMoneyRequestItem) Reset() { @@ -232,7 +232,7 @@ type UpdateOrgMoneyResponse struct { unknownFields protoimpl.UnknownFields // 修改后的组织的经济情况 - Orgs []*Org `protobuf:"bytes,1,rep,name=orgs,proto3" json:"orgs,omitempty" bson:"orgs" db:"orgs" yaml:"orgs"` + Orgs []*Org `protobuf:"bytes,1,rep,name=orgs,proto3" json:"orgs,omitempty" yaml:"orgs" bson:"orgs" db:"orgs"` } func (x *UpdateOrgMoneyResponse) Reset() { @@ -391,7 +391,7 @@ type UpdateOrgGoodsResponse struct { unknownFields protoimpl.UnknownFields // 修改后的组织的经济情况 - Orgs []*Org `protobuf:"bytes,1,rep,name=orgs,proto3" json:"orgs,omitempty" yaml:"orgs" bson:"orgs" db:"orgs"` + Orgs []*Org `protobuf:"bytes,1,rep,name=orgs,proto3" json:"orgs,omitempty" db:"orgs" yaml:"orgs" bson:"orgs"` } func (x *UpdateOrgGoodsResponse) Reset() { @@ -493,7 +493,7 @@ type UpdateOrgEmployeeRequestItem struct { // 新增的员工 Adds []*Employee `protobuf:"bytes,2,rep,name=adds,proto3" json:"adds,omitempty" yaml:"adds" bson:"adds" db:"adds"` // 删除的员工 - Dels []int32 `protobuf:"varint,3,rep,packed,name=dels,proto3" json:"dels,omitempty" yaml:"dels" bson:"dels" db:"dels"` + Dels []int32 `protobuf:"varint,3,rep,packed,name=dels,proto3" json:"dels,omitempty" bson:"dels" db:"dels" yaml:"dels"` // 修改薪水的员工 Updates []*Employee `protobuf:"bytes,4,rep,name=updates,proto3" json:"updates,omitempty" yaml:"updates" bson:"updates" db:"updates"` } @@ -663,7 +663,7 @@ type UpdateOrgJobRequestItem struct { unknownFields protoimpl.UnknownFields // 待修改的组织 - OrgId int32 `protobuf:"varint,1,opt,name=org_id,json=orgId,proto3" json:"org_id,omitempty" yaml:"org_id" bson:"org_id" db:"org_id"` + OrgId int32 `protobuf:"varint,1,opt,name=org_id,json=orgId,proto3" json:"org_id,omitempty" bson:"org_id" db:"org_id" yaml:"org_id"` // 岗位变动 // 按照name相等来判断是否为同一种岗位 // 岗位数量为增量，正数表示增加，负数表示减少 @@ -724,7 +724,7 @@ type UpdateOrgJobResponse struct { unknownFields protoimpl.UnknownFields // 修改后的组织的经济情况 - Orgs []*Org `protobuf:"bytes,1,rep,name=orgs,proto3" json:"orgs,omitempty" bson:"orgs" db:"orgs" yaml:"orgs"` + Orgs []*Org `protobuf:"bytes,1,rep,name=orgs,proto3" json:"orgs,omitempty" yaml:"orgs" bson:"orgs" db:"orgs"` } func (x *UpdateOrgJobResponse) Reset() { diff --git a/go/city/elec/input/v1/config.pb.go b/go/city/elec/input/v1/config.pb.go index 24bae8e5..eda2d86e 100644 --- a/go/city/elec/input/v1/config.pb.go +++ b/go/city/elec/input/v1/config.pb.go @@ -26,7 +26,7 @@ type Mongo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty" db:"uri" yaml:"uri" bson:"uri"` + Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty" yaml:"uri" bson:"uri" db:"uri"` Map *v1.MongoPath `protobuf:"bytes,2,opt,name=map,proto3" json:"map,omitempty" yaml:"map" bson:"map" db:"map"` Facilities *v1.MongoPath `protobuf:"bytes,3,opt,name=facilities,proto3" json:"facilities,omitempty" yaml:"facilities" bson:"facilities" db:"facilities"` } @@ -89,7 +89,7 @@ type ControlStep struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Start int32 `protobuf:"varint,1,opt,name=start,proto3" json:"start,omitempty" bson:"start" db:"start" yaml:"start"` + Start int32 `protobuf:"varint,1,opt,name=start,proto3" json:"start,omitempty" yaml:"start" bson:"start" db:"start"` Total int32 `protobuf:"varint,2,opt,name=total,proto3" json:"total,omitempty" yaml:"total" bson:"total" db:"total"` } @@ -193,9 +193,9 @@ type OutputSwitch struct { unknownFields protoimpl.UnknownFields // 电网节点状态 - Node bool `protobuf:"varint,1,opt,name=node,proto3" json:"node,omitempty" yaml:"node" bson:"node" db:"node"` + Node bool `protobuf:"varint,1,opt,name=node,proto3" json:"node,omitempty" db:"node" yaml:"node" bson:"node"` Aoi bool `protobuf:"varint,2,opt,name=aoi,proto3" json:"aoi,omitempty" yaml:"aoi" bson:"aoi" db:"aoi"` - Event bool `protobuf:"varint,3,opt,name=event,proto3" json:"event,omitempty" yaml:"event" bson:"event" db:"event"` + Event bool `protobuf:"varint,3,opt,name=event,proto3" json:"event,omitempty" db:"event" yaml:"event" bson:"event"` } func (x *OutputSwitch) Reset() { @@ -313,7 +313,7 @@ type Config struct { Mongo *Mongo `protobuf:"bytes,1,opt,name=mongo,proto3" json:"mongo,omitempty" yaml:"mongo" bson:"mongo" db:"mongo"` Control *Control `protobuf:"bytes,2,opt,name=control,proto3" json:"control,omitempty" yaml:"control" bson:"control" db:"control"` - Output *Output `protobuf:"bytes,3,opt,name=output,proto3" json:"output,omitempty" yaml:"output" bson:"output" db:"output"` + Output *Output `protobuf:"bytes,3,opt,name=output,proto3" json:"output,omitempty" bson:"output" db:"output" yaml:"output"` } func (x *Config) Reset() { diff --git a/go/city/elec/input/v1/input.pb.go b/go/city/elec/input/v1/input.pb.go index bbdbefad..ae99c008 100644 --- a/go/city/elec/input/v1/input.pb.go +++ b/go/city/elec/input/v1/input.pb.go @@ -110,7 +110,7 @@ type RepairStation struct { unknownFields protoimpl.UnknownFields AoiId int32 `protobuf:"varint,1,opt,name=aoi_id,json=aoiId,proto3" json:"aoi_id,omitempty" yaml:"aoi_id" bson:"aoi_id" db:"aoi_id"` - Position *v2.LongLatPosition `protobuf:"bytes,2,opt,name=position,proto3" json:"position,omitempty" db:"position" yaml:"position" bson:"position"` + Position *v2.LongLatPosition `protobuf:"bytes,2,opt,name=position,proto3" json:"position,omitempty" yaml:"position" bson:"position" db:"position"` } func (x *RepairStation) Reset() { @@ -166,14 +166,14 @@ type Facility struct { Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` Position *v2.LongLatPosition `protobuf:"bytes,2,opt,name=position,proto3" json:"position,omitempty" yaml:"position" bson:"position" db:"position"` - Type FacilityType `protobuf:"varint,3,opt,name=type,proto3,enum=city.elec.input.v1.FacilityType" json:"type,omitempty" yaml:"type" bson:"type" db:"type"` + Type FacilityType `protobuf:"varint,3,opt,name=type,proto3,enum=city.elec.input.v1.FacilityType" json:"type,omitempty" db:"type" yaml:"type" bson:"type"` // 当前节点的邻居节点的id Relation []int32 `protobuf:"varint,4,rep,packed,name=relation,proto3" json:"relation,omitempty" yaml:"relation" bson:"relation" db:"relation"` // 在其它关联的网络中如水网使用时，可使用外部id // 对于负载，该值表示其在对应模拟中的id - ForeignId *int32 `protobuf:"varint,5,opt,name=foreign_id,json=foreignId,proto3,oneof" json:"foreign_id,omitempty" bson:"foreign_id" db:"foreign_id" yaml:"foreign_id"` + ForeignId *int32 `protobuf:"varint,5,opt,name=foreign_id,json=foreignId,proto3,oneof" json:"foreign_id,omitempty" yaml:"foreign_id" bson:"foreign_id" db:"foreign_id"` // 对于电力设施，该值表示所在aoi id - AoiId *int32 `protobuf:"varint,6,opt,name=aoi_id,json=aoiId,proto3,oneof" json:"aoi_id,omitempty" yaml:"aoi_id" bson:"aoi_id" db:"aoi_id"` + AoiId *int32 `protobuf:"varint,6,opt,name=aoi_id,json=aoiId,proto3,oneof" json:"aoi_id,omitempty" db:"aoi_id" yaml:"aoi_id" bson:"aoi_id"` // 对于10kv变压器组，该值表示变压器组中变压器的数量 NumTransformer *int32 `protobuf:"varint,7,opt,name=num_transformer,json=numTransformer,proto3,oneof" json:"num_transformer,omitempty" yaml:"num_transformer" bson:"num_transformer" db:"num_transformer"` } @@ -266,7 +266,7 @@ type Facilities struct { unknownFields protoimpl.UnknownFields Facilities []*Facility `protobuf:"bytes,1,rep,name=facilities,proto3" json:"facilities,omitempty" yaml:"facilities" bson:"facilities" db:"facilities"` - RepairStations []*RepairStation `protobuf:"bytes,2,rep,name=repair_stations,json=repairStations,proto3" json:"repair_stations,omitempty" db:"repair_stations" yaml:"repair_stations" bson:"repair_stations"` + RepairStations []*RepairStation `protobuf:"bytes,2,rep,name=repair_stations,json=repairStations,proto3" json:"repair_stations,omitempty" yaml:"repair_stations" bson:"repair_stations" db:"repair_stations"` } func (x *Facilities) Reset() { diff --git a/go/city/elec/input/v1/input_service.pb.go b/go/city/elec/input/v1/input_service.pb.go index 29c8ff68..f14dc99d 100644 --- a/go/city/elec/input/v1/input_service.pb.go +++ b/go/city/elec/input/v1/input_service.pb.go @@ -65,7 +65,7 @@ type InitResponse struct { unknownFields protoimpl.UnknownFields // 模拟器gRPC监听地址 - Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty" yaml:"address" bson:"address" db:"address"` + Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty" bson:"address" db:"address" yaml:"address"` Control *Control `protobuf:"bytes,3,opt,name=control,proto3" json:"control,omitempty" yaml:"control" bson:"control" db:"control"` Facilities *Facilities `protobuf:"bytes,1,opt,name=facilities,proto3" json:"facilities,omitempty" yaml:"facilities" bson:"facilities" db:"facilities"` Map *v2.Map `protobuf:"bytes,4,opt,name=map,proto3" json:"map,omitempty" yaml:"map" bson:"map" db:"map"` diff --git a/go/city/event/v1/event.pb.go b/go/city/event/v1/event.pb.go index 9eedb33e..ab8d6d81 100644 --- a/go/city/event/v1/event.pb.go +++ b/go/city/event/v1/event.pb.go @@ -113,7 +113,7 @@ type Event struct { unknownFields protoimpl.UnknownFields Type EventType `protobuf:"varint,1,opt,name=type,proto3,enum=city.event.v1.EventType" json:"type,omitempty" yaml:"type" bson:"type" db:"type"` - Level int32 `protobuf:"varint,2,opt,name=level,proto3" json:"level,omitempty" bson:"level" db:"level" yaml:"level"` + Level int32 `protobuf:"varint,2,opt,name=level,proto3" json:"level,omitempty" yaml:"level" bson:"level" db:"level"` Step int32 `protobuf:"varint,3,opt,name=step,proto3" json:"step,omitempty" yaml:"step" bson:"step" db:"step"` } diff --git a/go/city/event/v2/event.pb.go b/go/city/event/v2/event.pb.go index 79a44f56..2ad455f8 100644 --- a/go/city/event/v2/event.pb.go +++ b/go/city/event/v2/event.pb.go @@ -160,17 +160,17 @@ type Event struct { unknownFields protoimpl.UnknownFields // 主题 - Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty" bson:"topic" db:"topic" yaml:"topic"` + Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty" yaml:"topic" bson:"topic" db:"topic"` // ID Id *int32 `protobuf:"varint,2,opt,name=id,proto3,oneof" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` // 主语 Subject *Entity `protobuf:"bytes,3,opt,name=subject,proto3" json:"subject,omitempty" yaml:"subject" bson:"subject" db:"subject"` // 谓词 - Content string `protobuf:"bytes,4,opt,name=content,proto3" json:"content,omitempty" db:"content" yaml:"content" bson:"content"` + Content string `protobuf:"bytes,4,opt,name=content,proto3" json:"content,omitempty" yaml:"content" bson:"content" db:"content"` // 地点 Position *v2.Position `protobuf:"bytes,5,opt,name=position,proto3" json:"position,omitempty" yaml:"position" bson:"position" db:"position"` // 时间 - T float64 `protobuf:"fixed64,6,opt,name=t,proto3" json:"t,omitempty" bson:"t" db:"t" yaml:"t"` + T float64 `protobuf:"fixed64,6,opt,name=t,proto3" json:"t,omitempty" yaml:"t" bson:"t" db:"t"` } func (x *Event) Reset() { diff --git a/go/city/geo/v2/geo.pb.go b/go/city/geo/v2/geo.pb.go index ea61616f..2a0772e4 100644 --- a/go/city/geo/v2/geo.pb.go +++ b/go/city/geo/v2/geo.pb.go @@ -29,13 +29,13 @@ type LongLatPosition struct { // 经度 // longitude - Longitude float64 `protobuf:"fixed64,1,opt,name=longitude,proto3" json:"longitude,omitempty" yaml:"longitude" bson:"longitude" db:"longitude"` + Longitude float64 `protobuf:"fixed64,1,opt,name=longitude,proto3" json:"longitude,omitempty" bson:"longitude" db:"longitude" yaml:"longitude"` // 纬度 // latitude Latitude float64 `protobuf:"fixed64,2,opt,name=latitude,proto3" json:"latitude,omitempty" yaml:"latitude" bson:"latitude" db:"latitude"` // 高程（单位：米） // elevation (unit: meters) - Z *float64 `protobuf:"fixed64,3,opt,name=z,proto3,oneof" json:"z,omitempty" db:"z" yaml:"z" bson:"z"` + Z *float64 `protobuf:"fixed64,3,opt,name=z,proto3,oneof" json:"z,omitempty" yaml:"z" bson:"z" db:"z"` } func (x *LongLatPosition) Reset() { @@ -100,13 +100,13 @@ type XYPosition struct { // x坐标，单位米，对应经度 // x coordinate, in meters, corresponding to longitude - X float64 `protobuf:"fixed64,1,opt,name=x,proto3" json:"x,omitempty" db:"x" yaml:"x" bson:"x"` + X float64 `protobuf:"fixed64,1,opt,name=x,proto3" json:"x,omitempty" bson:"x" db:"x" yaml:"x"` // y坐标，单位米，对应纬度 // y coordinate, in meters, corresponding to latitude Y float64 `protobuf:"fixed64,2,opt,name=y,proto3" json:"y,omitempty" yaml:"y" bson:"y" db:"y"` // z坐标，单位米，对应高程 // z coordinate, in meters, corresponding to elevation - Z *float64 `protobuf:"fixed64,3,opt,name=z,proto3,oneof" json:"z,omitempty" yaml:"z" bson:"z" db:"z"` + Z *float64 `protobuf:"fixed64,3,opt,name=z,proto3,oneof" json:"z,omitempty" db:"z" yaml:"z" bson:"z"` } func (x *XYPosition) Reset() { @@ -171,7 +171,7 @@ type LanePosition struct { // 车道id // Lane ID - LaneId int32 `protobuf:"varint,1,opt,name=lane_id,json=laneId,proto3" json:"lane_id,omitempty" yaml:"lane_id" bson:"lane_id" db:"lane_id"` + LaneId int32 `protobuf:"varint,1,opt,name=lane_id,json=laneId,proto3" json:"lane_id,omitempty" db:"lane_id" yaml:"lane_id" bson:"lane_id"` // s是车道上的点到车道起点的距离 // s is the distance from the point on the lane to the starting point of the lane S float64 `protobuf:"fixed64,2,opt,name=s,proto3" json:"s,omitempty" db:"s" yaml:"s" bson:"s"` @@ -295,7 +295,7 @@ type Position struct { LanePosition *LanePosition `protobuf:"bytes,1,opt,name=lane_position,json=lanePosition,proto3,oneof" json:"lane_position,omitempty" yaml:"lane_position" bson:"lane_position" db:"lane_position"` // 地图坐标Lane+S（必须提供其中之一） // Map coordinates Lane+S (one of these must be provided) - AoiPosition *AoiPosition `protobuf:"bytes,2,opt,name=aoi_position,json=aoiPosition,proto3,oneof" json:"aoi_position,omitempty" yaml:"aoi_position" bson:"aoi_position" db:"aoi_position"` + AoiPosition *AoiPosition `protobuf:"bytes,2,opt,name=aoi_position,json=aoiPosition,proto3,oneof" json:"aoi_position,omitempty" db:"aoi_position" yaml:"aoi_position" bson:"aoi_position"` // WGS84经纬度坐标 // WGS84 longitute and latitude coordinates LonglatPosition *LongLatPosition `protobuf:"bytes,3,opt,name=longlat_position,json=longlatPosition,proto3,oneof" json:"longlat_position,omitempty" yaml:"longlat_position" bson:"longlat_position" db:"longlat_position"` diff --git a/go/city/map/v2/aoi_service.pb.go b/go/city/map/v2/aoi_service.pb.go index 447e91b1..a25857f8 100644 --- a/go/city/map/v2/aoi_service.pb.go +++ b/go/city/map/v2/aoi_service.pb.go @@ -29,10 +29,10 @@ type AoiState struct { unknownFields protoimpl.UnknownFields // AOI ID - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" db:"id" yaml:"id" bson:"id"` // AOI内的人 // Persons in AOI - Persons []*v1.PersonMotion `protobuf:"bytes,2,rep,name=persons,proto3" json:"persons,omitempty" yaml:"persons" bson:"persons" db:"persons"` + Persons []*v1.PersonMotion `protobuf:"bytes,2,rep,name=persons,proto3" json:"persons,omitempty" bson:"persons" db:"persons" yaml:"persons"` } func (x *AoiState) Reset() { @@ -90,7 +90,7 @@ type GetAoiRequest struct { // 指定AOI ID列表，如果为空，则返回所有AOI信息 // List of targeted AOI IDs, if empty, returns all information of AOIs - AoiIds []int32 `protobuf:"varint,1,rep,packed,name=aoi_ids,json=aoiIds,proto3" json:"aoi_ids,omitempty" bson:"aoi_ids" db:"aoi_ids" yaml:"aoi_ids"` + AoiIds []int32 `protobuf:"varint,1,rep,packed,name=aoi_ids,json=aoiIds,proto3" json:"aoi_ids,omitempty" yaml:"aoi_ids" bson:"aoi_ids" db:"aoi_ids"` } func (x *GetAoiRequest) Reset() { diff --git a/go/city/map/v2/lane_service.pb.go b/go/city/map/v2/lane_service.pb.go index 98cac74e..685815ee 100644 --- a/go/city/map/v2/lane_service.pb.go +++ b/go/city/map/v2/lane_service.pb.go @@ -230,10 +230,10 @@ type GetLaneRequest struct { // 指定的Lane id列表，如果为空，则返回所有Lane的信息 // List of targeted lane IDs, if empty, returns all information of lanes - LaneIds []int32 `protobuf:"varint,1,rep,packed,name=lane_ids,json=laneIds,proto3" json:"lane_ids,omitempty" db:"lane_ids" yaml:"lane_ids" bson:"lane_ids"` + LaneIds []int32 `protobuf:"varint,1,rep,packed,name=lane_ids,json=laneIds,proto3" json:"lane_ids,omitempty" yaml:"lane_ids" bson:"lane_ids" db:"lane_ids"` // 是否要排除车道上的人的信息 // Whether to exclude information of person on the lane - ExcludePerson bool `protobuf:"varint,2,opt,name=exclude_person,json=excludePerson,proto3" json:"exclude_person,omitempty" yaml:"exclude_person" bson:"exclude_person" db:"exclude_person"` + ExcludePerson bool `protobuf:"varint,2,opt,name=exclude_person,json=excludePerson,proto3" json:"exclude_person,omitempty" db:"exclude_person" yaml:"exclude_person" bson:"exclude_person"` } func (x *GetLaneRequest) Reset() { @@ -342,7 +342,7 @@ type GetLaneByLongLatBBoxRequest struct { // 经纬度范围 // latitude and longitude bounding box - Bbox *v2.LongLatBBox `protobuf:"bytes,1,opt,name=bbox,proto3" json:"bbox,omitempty" bson:"bbox" db:"bbox" yaml:"bbox"` + Bbox *v2.LongLatBBox `protobuf:"bytes,1,opt,name=bbox,proto3" json:"bbox,omitempty" yaml:"bbox" bson:"bbox" db:"bbox"` // 是否要排除车道上的人的信息 // Whether to exclude information of person on the lane ExcludePerson bool `protobuf:"varint,2,opt,name=exclude_person,json=excludePerson,proto3" json:"exclude_person,omitempty" yaml:"exclude_person" bson:"exclude_person" db:"exclude_person"` diff --git a/go/city/map/v2/lane_state.pb.go b/go/city/map/v2/lane_state.pb.go index f5cd6e64..2fd894e9 100644 --- a/go/city/map/v2/lane_state.pb.go +++ b/go/city/map/v2/lane_state.pb.go @@ -32,7 +32,7 @@ type LaneState struct { Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" bson:"id" db:"id" yaml:"id"` // Lane上的人/车 // person/vehicle on the lane - Persons []*v1.PersonMotion `protobuf:"bytes,2,rep,name=persons,proto3" json:"persons,omitempty" db:"persons" yaml:"persons" bson:"persons"` + Persons []*v1.PersonMotion `protobuf:"bytes,2,rep,name=persons,proto3" json:"persons,omitempty" yaml:"persons" bson:"persons" db:"persons"` // 平均速度（m/s） // average speed (m/s) AvgV float64 `protobuf:"fixed64,3,opt,name=avg_v,json=avgV,proto3" json:"avg_v,omitempty" yaml:"avg_v" bson:"avg_v" db:"avg_v"` diff --git a/go/city/map/v2/light.pb.go b/go/city/map/v2/light.pb.go index b9f03a09..b56e7d96 100644 --- a/go/city/map/v2/light.pb.go +++ b/go/city/map/v2/light.pb.go @@ -91,7 +91,7 @@ type Phase struct { // 相位持续时间，单位秒 // Phase duration in seconds - Duration float64 `protobuf:"fixed64,1,opt,name=duration,proto3" json:"duration,omitempty" yaml:"duration" bson:"duration" db:"duration"` + Duration float64 `protobuf:"fixed64,1,opt,name=duration,proto3" json:"duration,omitempty" db:"duration" yaml:"duration" bson:"duration"` // 描述该相位下每个lane的灯控情况，lane与Junction.lane_ids一一对应 // The lighting control situation of each lane in this phase, and the lane // corresponds one-to-one with junction.lane_ids diff --git a/go/city/map/v2/map.pb.go b/go/city/map/v2/map.pb.go index 553402e0..5a81c8ab 100644 --- a/go/city/map/v2/map.pb.go +++ b/go/city/map/v2/map.pb.go @@ -461,22 +461,22 @@ type Header struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty" yaml:"name" bson:"name" db:"name"` // 地图创建时间 // Map creation time - Date string `protobuf:"bytes,2,opt,name=date,proto3" json:"date,omitempty" bson:"date" db:"date" yaml:"date"` + Date string `protobuf:"bytes,2,opt,name=date,proto3" json:"date,omitempty" yaml:"date" bson:"date" db:"date"` // 最大纬度对应的y坐标 // y coordinate corresponding to the maximum latitude - North float64 `protobuf:"fixed64,3,opt,name=north,proto3" json:"north,omitempty" bson:"north" db:"north" yaml:"north"` + North float64 `protobuf:"fixed64,3,opt,name=north,proto3" json:"north,omitempty" yaml:"north" bson:"north" db:"north"` // 最小纬度对应的y坐标 // y coordinate corresponding to the minimum latitude South float64 `protobuf:"fixed64,4,opt,name=south,proto3" json:"south,omitempty" yaml:"south" bson:"south" db:"south"` // 最大经度对应的x坐标 // x coordinate corresponding to the maximum longitude - East float64 `protobuf:"fixed64,5,opt,name=east,proto3" json:"east,omitempty" yaml:"east" bson:"east" db:"east"` + East float64 `protobuf:"fixed64,5,opt,name=east,proto3" json:"east,omitempty" bson:"east" db:"east" yaml:"east"` // 最小经度对应的x坐标 // x coordinate corresponding to the minimum longitude - West float64 `protobuf:"fixed64,6,opt,name=west,proto3" json:"west,omitempty" yaml:"west" bson:"west" db:"west"` + West float64 `protobuf:"fixed64,6,opt,name=west,proto3" json:"west,omitempty" db:"west" yaml:"west" bson:"west"` // PROJ.4 投影字符串，用以支持xy坐标到其他坐标系的转换 // PROJ.4 projection string to support the conversion of xy coordinates to other coordinate systems - Projection string `protobuf:"bytes,7,opt,name=projection,proto3" json:"projection,omitempty" yaml:"projection" bson:"projection" db:"projection"` + Projection string `protobuf:"bytes,7,opt,name=projection,proto3" json:"projection,omitempty" db:"projection" yaml:"projection" bson:"projection"` // 在x方向划分TAZ的步长 // Step size of the TAZ in the x-direction TazXStep *float64 `protobuf:"fixed64,8,opt,name=taz_x_step,json=tazXStep,proto3,oneof" json:"taz_x_step,omitempty" yaml:"taz_x_step" bson:"taz_x_step" db:"taz_x_step"` @@ -589,13 +589,13 @@ type LaneOverlap struct { // 冲突点在本车道上的坐标 // Coordinates of the conflict point on this lane - Self *v2.LanePosition `protobuf:"bytes,1,opt,name=self,proto3" json:"self,omitempty" db:"self" yaml:"self" bson:"self"` + Self *v2.LanePosition `protobuf:"bytes,1,opt,name=self,proto3" json:"self,omitempty" yaml:"self" bson:"self" db:"self"` // 冲突点在冲突车道上的坐标 // Coordinates of the conflict point on the conflicted lane Other *v2.LanePosition `protobuf:"bytes,2,opt,name=other,proto3" json:"other,omitempty" yaml:"other" bson:"other" db:"other"` // 本车道是否有优先通行权 // Whether this lane has priority - SelfFirst bool `protobuf:"varint,3,opt,name=self_first,json=selfFirst,proto3" json:"self_first,omitempty" bson:"self_first" db:"self_first" yaml:"self_first"` + SelfFirst bool `protobuf:"varint,3,opt,name=self_first,json=selfFirst,proto3" json:"self_first,omitempty" db:"self_first" yaml:"self_first" bson:"self_first"` } func (x *LaneOverlap) Reset() { @@ -660,7 +660,7 @@ type LaneConnection struct { // 所连接的车道Lane的ID // ID of the connected lane - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" db:"id" yaml:"id" bson:"id"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` // 连接类型 // Connection type Type LaneConnectionType `protobuf:"varint,2,opt,name=type,proto3,enum=city.map.v2.LaneConnectionType" json:"type,omitempty" yaml:"type" bson:"type" db:"type"` @@ -721,7 +721,7 @@ type Lane struct { // 车道id（从0开始） // lane id (starts from 0) - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" db:"id" yaml:"id" bson:"id"` // 车道类型 // lane type Type LaneType `protobuf:"varint,2,opt,name=type,proto3,enum=city.map.v2.LaneType" json:"type,omitempty" yaml:"type" bson:"type" db:"type"` @@ -733,23 +733,23 @@ type Lane struct { MaxSpeed float64 `protobuf:"fixed64,4,opt,name=max_speed,json=maxSpeed,proto3" json:"max_speed,omitempty" yaml:"max_speed" bson:"max_speed" db:"max_speed"` // 中心线长度（单位：米） // centerline length (in meters) - Length float64 `protobuf:"fixed64,5,opt,name=length,proto3" json:"length,omitempty" db:"length" yaml:"length" bson:"length"` + Length float64 `protobuf:"fixed64,5,opt,name=length,proto3" json:"length,omitempty" yaml:"length" bson:"length" db:"length"` // 车道宽度（单位：米） // lane width (in meters) - Width float64 `protobuf:"fixed64,6,opt,name=width,proto3" json:"width,omitempty" db:"width" yaml:"width" bson:"width"` + Width float64 `protobuf:"fixed64,6,opt,name=width,proto3" json:"width,omitempty" bson:"width" db:"width" yaml:"width"` // 车道中心线（车辆/行车轨迹线） // Lane center line (vehicle/driving line) - CenterLine *Polyline `protobuf:"bytes,7,opt,name=center_line,json=centerLine,proto3" json:"center_line,omitempty" db:"center_line" yaml:"center_line" bson:"center_line"` + CenterLine *Polyline `protobuf:"bytes,7,opt,name=center_line,json=centerLine,proto3" json:"center_line,omitempty" yaml:"center_line" bson:"center_line" db:"center_line"` // 车道左边界线 // Lane left boundary line // // Deprecated: Marked as deprecated in city/map/v2/map.proto. - LeftBorderLine *Polyline `protobuf:"bytes,8,opt,name=left_border_line,json=leftBorderLine,proto3" json:"left_border_line,omitempty" yaml:"left_border_line" bson:"left_border_line" db:"left_border_line"` // 弃用 deprecated + LeftBorderLine *Polyline `protobuf:"bytes,8,opt,name=left_border_line,json=leftBorderLine,proto3" json:"left_border_line,omitempty" db:"left_border_line" yaml:"left_border_line" bson:"left_border_line"` // 弃用 deprecated // 车道右边界线 // Lane right boundary line // // Deprecated: Marked as deprecated in city/map/v2/map.proto. - RightBorderLine *Polyline `protobuf:"bytes,9,opt,name=right_border_line,json=rightBorderLine,proto3" json:"right_border_line,omitempty" yaml:"right_border_line" bson:"right_border_line" db:"right_border_line"` // 弃用 deprecated + RightBorderLine *Polyline `protobuf:"bytes,9,opt,name=right_border_line,json=rightBorderLine,proto3" json:"right_border_line,omitempty" bson:"right_border_line" db:"right_border_line" yaml:"right_border_line"` // 弃用 deprecated // Lanes can drive / walk from // 对于Junction内的车道至多1个前驱 // For lanes within junction, there is at most 1 predecessor @@ -757,7 +757,7 @@ type Lane struct { // For LANE_TYPE_DRIVING, the connection type must be LANE_CONNECTION_TYPE_TAIL // 对于LANE_TYPE_WALKING连接类型，两种都有可能 // For LANE_TYPE_WALKING, both connection types are possible - Predecessors []*LaneConnection `protobuf:"bytes,10,rep,name=predecessors,proto3" json:"predecessors,omitempty" yaml:"predecessors" bson:"predecessors" db:"predecessors"` + Predecessors []*LaneConnection `protobuf:"bytes,10,rep,name=predecessors,proto3" json:"predecessors,omitempty" db:"predecessors" yaml:"predecessors" bson:"predecessors"` // Lanes can drive / walk to // 对于Junction内的车道至多1个后继 // For lanes within junction, there is at most 1 successor @@ -765,7 +765,7 @@ type Lane struct { // For LANE_TYPE_DRIVING, the connection type must be LANE_CONNECTION_TYPE_HEAD // 对于LANE_TYPE_WALKING连接类型，两种都有可能 // For LANE_TYPE_WALKING, both connection types are possible - Successors []*LaneConnection `protobuf:"bytes,11,rep,name=successors,proto3" json:"successors,omitempty" bson:"successors" db:"successors" yaml:"successors"` + Successors []*LaneConnection `protobuf:"bytes,11,rep,name=successors,proto3" json:"successors,omitempty" yaml:"successors" bson:"successors" db:"successors"` // 左侧相邻车道（按从近到远排列） // Adjacent lanes on the left (arranged from nearest to far) LeftLaneIds []int32 `protobuf:"varint,12,rep,packed,name=left_lane_ids,json=leftLaneIds,proto3" json:"left_lane_ids,omitempty" yaml:"left_lane_ids" bson:"left_lane_ids" db:"left_lane_ids"` @@ -777,7 +777,7 @@ type Lane struct { ParentId int32 `protobuf:"varint,14,opt,name=parent_id,json=parentId,proto3" json:"parent_id,omitempty" yaml:"parent_id" bson:"parent_id" db:"parent_id"` // 车道之间的冲突点（仅在Junction内有效），保证按照self_s从小到大排序 // Conflict points between lanes (valid only within Junction), guaranteed to be sorted from small to large according to self_s - Overlaps []*LaneOverlap `protobuf:"bytes,15,rep,name=overlaps,proto3" json:"overlaps,omitempty" db:"overlaps" yaml:"overlaps" bson:"overlaps"` + Overlaps []*LaneOverlap `protobuf:"bytes,15,rep,name=overlaps,proto3" json:"overlaps,omitempty" yaml:"overlaps" bson:"overlaps" db:"overlaps"` // 连接到该车道的所有AOI // All AOIs connected to this lane AoiIds []int32 `protobuf:"varint,16,rep,packed,name=aoi_ids,json=aoiIds,proto3" json:"aoi_ids,omitempty" yaml:"aoi_ids" bson:"aoi_ids" db:"aoi_ids"` @@ -1003,7 +1003,7 @@ type NextRoadLanePlan struct { // 记录去往目标next_road的可行lane集合 // set of feasible lanes for going to the next_road - NextRoadLanes []*NextRoadLane `protobuf:"bytes,1,rep,name=next_road_lanes,json=nextRoadLanes,proto3" json:"next_road_lanes,omitempty" yaml:"next_road_lanes" bson:"next_road_lanes" db:"next_road_lanes"` + NextRoadLanes []*NextRoadLane `protobuf:"bytes,1,rep,name=next_road_lanes,json=nextRoadLanes,proto3" json:"next_road_lanes,omitempty" db:"next_road_lanes" yaml:"next_road_lanes" bson:"next_road_lanes"` } func (x *NextRoadLanePlan) Reset() { @@ -1062,7 +1062,7 @@ type Road struct { // All lanes/sidewalks belonging to the road // lane_id是按从最左侧车道到最右侧车道(从前进方向来看)的顺序给出的 // lane_ids are given in order from the leftmost lane to the rightmost lane (viewed from the forward direction) - LaneIds []int32 `protobuf:"varint,2,rep,packed,name=lane_ids,json=laneIds,proto3" json:"lane_ids,omitempty" db:"lane_ids" yaml:"lane_ids" bson:"lane_ids"` + LaneIds []int32 `protobuf:"varint,2,rep,packed,name=lane_ids,json=laneIds,proto3" json:"lane_ids,omitempty" yaml:"lane_ids" bson:"lane_ids" db:"lane_ids"` // 对于包含动态车道的道路，需要通过这一项来指定所有的候选方案 // For roads containing dynamic lanes, this is required to specify all candidates NextRoadLanePlans []*NextRoadLanePlan `protobuf:"bytes,3,rep,name=next_road_lane_plans,json=nextRoadLanePlans,proto3" json:"next_road_lane_plans,omitempty" yaml:"next_road_lane_plans" bson:"next_road_lane_plans" db:"next_road_lane_plans"` @@ -1147,7 +1147,7 @@ type JunctionLaneGroup struct { InAngle float64 `protobuf:"fixed64,2,opt,name=in_angle,json=inAngle,proto3" json:"in_angle,omitempty" yaml:"in_angle" bson:"in_angle" db:"in_angle"` // 该车道组的出口道路 // The exit road for this lane group - OutRoadId int32 `protobuf:"varint,3,opt,name=out_road_id,json=outRoadId,proto3" json:"out_road_id,omitempty" yaml:"out_road_id" bson:"out_road_id" db:"out_road_id"` + OutRoadId int32 `protobuf:"varint,3,opt,name=out_road_id,json=outRoadId,proto3" json:"out_road_id,omitempty" db:"out_road_id" yaml:"out_road_id" bson:"out_road_id"` // 该车道组的出口角度（弧度制） // The exit angle of this lane group (in radians) OutAngle float64 `protobuf:"fixed64,4,opt,name=out_angle,json=outAngle,proto3" json:"out_angle,omitempty" yaml:"out_angle" bson:"out_angle" db:"out_angle"` @@ -1156,7 +1156,7 @@ type JunctionLaneGroup struct { LaneIds []int32 `protobuf:"varint,5,rep,packed,name=lane_ids,json=laneIds,proto3" json:"lane_ids,omitempty" yaml:"lane_ids" bson:"lane_ids" db:"lane_ids"` // 该车道组的转向属性 // The turn type of this lane group - Turn LaneTurn `protobuf:"varint,6,opt,name=turn,proto3,enum=city.map.v2.LaneTurn" json:"turn,omitempty" db:"turn" yaml:"turn" bson:"turn"` + Turn LaneTurn `protobuf:"varint,6,opt,name=turn,proto3,enum=city.map.v2.LaneTurn" json:"turn,omitempty" yaml:"turn" bson:"turn" db:"turn"` } func (x *JunctionLaneGroup) Reset() { @@ -1242,10 +1242,10 @@ type Junction struct { // 路口id（从3_0000_0000开始） // Junction id (starting from 3_0000_0000) - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" db:"id" yaml:"id" bson:"id"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` // 属于该路口Junction的所有车道/人行道等lane // All driving/walking lanes belonging to this junction. - LaneIds []int32 `protobuf:"varint,2,rep,packed,name=lane_ids,json=laneIds,proto3" json:"lane_ids,omitempty" db:"lane_ids" yaml:"lane_ids" bson:"lane_ids"` + LaneIds []int32 `protobuf:"varint,2,rep,packed,name=lane_ids,json=laneIds,proto3" json:"lane_ids,omitempty" yaml:"lane_ids" bson:"lane_ids" db:"lane_ids"` // 属于该路口Junction的所有行车车道组 // All driving lane groups belonging to this junction DrivingLaneGroups []*JunctionLaneGroup `protobuf:"bytes,3,rep,name=driving_lane_groups,json=drivingLaneGroups,proto3" json:"driving_lane_groups,omitempty" yaml:"driving_lane_groups" bson:"driving_lane_groups" db:"driving_lane_groups"` @@ -1329,7 +1329,7 @@ type RoadIds struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RoadIds []int32 `protobuf:"varint,1,rep,packed,name=road_ids,json=roadIds,proto3" json:"road_ids,omitempty" db:"road_ids" yaml:"road_ids" bson:"road_ids"` + RoadIds []int32 `protobuf:"varint,1,rep,packed,name=road_ids,json=roadIds,proto3" json:"road_ids,omitempty" yaml:"road_ids" bson:"road_ids" db:"road_ids"` } func (x *RoadIds) Reset() { @@ -1452,9 +1452,9 @@ type HeuristicTAZCost struct { unknownFields protoimpl.UnknownFields TazXId int32 `protobuf:"varint,1,opt,name=taz_x_id,json=tazXId,proto3" json:"taz_x_id,omitempty" yaml:"taz_x_id" bson:"taz_x_id" db:"taz_x_id"` - TazYId int32 `protobuf:"varint,2,opt,name=taz_y_id,json=tazYId,proto3" json:"taz_y_id,omitempty" yaml:"taz_y_id" bson:"taz_y_id" db:"taz_y_id"` - AoiId int32 `protobuf:"varint,3,opt,name=aoi_id,json=aoiId,proto3" json:"aoi_id,omitempty" yaml:"aoi_id" bson:"aoi_id" db:"aoi_id"` - Cost float64 `protobuf:"fixed64,4,opt,name=cost,proto3" json:"cost,omitempty" bson:"cost" db:"cost" yaml:"cost"` + TazYId int32 `protobuf:"varint,2,opt,name=taz_y_id,json=tazYId,proto3" json:"taz_y_id,omitempty" bson:"taz_y_id" db:"taz_y_id" yaml:"taz_y_id"` + AoiId int32 `protobuf:"varint,3,opt,name=aoi_id,json=aoiId,proto3" json:"aoi_id,omitempty" db:"aoi_id" yaml:"aoi_id" bson:"aoi_id"` + Cost float64 `protobuf:"fixed64,4,opt,name=cost,proto3" json:"cost,omitempty" db:"cost" yaml:"cost" bson:"cost"` } func (x *HeuristicTAZCost) Reset() { @@ -1526,7 +1526,7 @@ type PublicTransportSubline struct { // 支线ID // Subline ID - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" db:"id" yaml:"id" bson:"id"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` // 支线名字 // Subline name Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty" yaml:"name" bson:"name" db:"name"` @@ -1538,7 +1538,7 @@ type PublicTransportSubline struct { StationConnectionRoadIds []*RoadIds `protobuf:"bytes,4,rep,name=station_connection_road_ids,json=stationConnectionRoadIds,proto3" json:"station_connection_road_ids,omitempty" yaml:"station_connection_road_ids" bson:"station_connection_road_ids" db:"station_connection_road_ids"` // 支线类型 // Type of subline - Type SublineType `protobuf:"varint,5,opt,name=type,proto3,enum=city.map.v2.SublineType" json:"type,omitempty" db:"type" yaml:"type" bson:"type"` + Type SublineType `protobuf:"varint,5,opt,name=type,proto3,enum=city.map.v2.SublineType" json:"type,omitempty" bson:"type" db:"type" yaml:"type"` // 所属线路名称 // Name of the belonging line ParentName string `protobuf:"bytes,6,opt,name=parent_name,json=parentName,proto3" json:"parent_name,omitempty" yaml:"parent_name" bson:"parent_name" db:"parent_name"` @@ -1547,7 +1547,7 @@ type PublicTransportSubline struct { Schedules *SublineSchedules `protobuf:"bytes,7,opt,name=schedules,proto3" json:"schedules,omitempty" yaml:"schedules" bson:"schedules" db:"schedules"` // 预计算公共交通权重 // Precalculate public transport costs - TazCosts []*HeuristicTAZCost `protobuf:"bytes,8,rep,name=taz_costs,json=tazCosts,proto3" json:"taz_costs,omitempty" db:"taz_costs" yaml:"taz_costs" bson:"taz_costs"` + TazCosts []*HeuristicTAZCost `protobuf:"bytes,8,rep,name=taz_costs,json=tazCosts,proto3" json:"taz_costs,omitempty" yaml:"taz_costs" bson:"taz_costs" db:"taz_costs"` } func (x *PublicTransportSubline) Reset() { @@ -1645,7 +1645,7 @@ type SublineDrivingLanePair struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - SublineId int32 `protobuf:"varint,1,opt,name=subline_id,json=sublineId,proto3" json:"subline_id,omitempty" yaml:"subline_id" bson:"subline_id" db:"subline_id"` + SublineId int32 `protobuf:"varint,1,opt,name=subline_id,json=sublineId,proto3" json:"subline_id,omitempty" bson:"subline_id" db:"subline_id" yaml:"subline_id"` DrivingLaneId int32 `protobuf:"varint,2,opt,name=driving_lane_id,json=drivingLaneId,proto3" json:"driving_lane_id,omitempty" yaml:"driving_lane_id" bson:"driving_lane_id" db:"driving_lane_id"` } @@ -1718,16 +1718,16 @@ type Aoi struct { DrivingPositions []*v2.LanePosition `protobuf:"bytes,3,rep,name=driving_positions,json=drivingPositions,proto3" json:"driving_positions,omitempty" yaml:"driving_positions" bson:"driving_positions" db:"driving_positions"` // Aoi与步行路网的连接点 // Connection point between Aoi and walking lanes - WalkingPositions []*v2.LanePosition `protobuf:"bytes,4,rep,name=walking_positions,json=walkingPositions,proto3" json:"walking_positions,omitempty" yaml:"walking_positions" bson:"walking_positions" db:"walking_positions"` + WalkingPositions []*v2.LanePosition `protobuf:"bytes,4,rep,name=walking_positions,json=walkingPositions,proto3" json:"walking_positions,omitempty" bson:"walking_positions" db:"walking_positions" yaml:"walking_positions"` // Aoi原始位置（如果只有一个值，则为Aoi所在的点，否则为Aoi多边形的边界） // Aoi original position (if there is only one value, it is the point where Aoi is located, otherwise it is the boundary of the Aoi polygon) Positions []*v2.XYPosition `protobuf:"bytes,5,rep,name=positions,proto3" json:"positions,omitempty" yaml:"positions" bson:"positions" db:"positions"` // Aoi与行车路网连接时在自身边界上的连接点, 与driving_positions按索引一一对应 // The connection point on its own boundary when Aoi is connected to the driving lanes corresponds one-to-one with driving_positions by index. - DrivingGates []*v2.XYPosition `protobuf:"bytes,6,rep,name=driving_gates,json=drivingGates,proto3" json:"driving_gates,omitempty" yaml:"driving_gates" bson:"driving_gates" db:"driving_gates"` + DrivingGates []*v2.XYPosition `protobuf:"bytes,6,rep,name=driving_gates,json=drivingGates,proto3" json:"driving_gates,omitempty" bson:"driving_gates" db:"driving_gates" yaml:"driving_gates"` // Aoi与步行路网连接时在自身边界上的连接点, 与walking_positions按索引一一对应 // The connection point on its own boundary when Aoi is connected to the walking lanes corresponds one-to-one with walking_positions by index. - WalkingGates []*v2.XYPosition `protobuf:"bytes,7,rep,name=walking_gates,json=walkingGates,proto3" json:"walking_gates,omitempty" db:"walking_gates" yaml:"walking_gates" bson:"walking_gates"` + WalkingGates []*v2.XYPosition `protobuf:"bytes,7,rep,name=walking_gates,json=walkingGates,proto3" json:"walking_gates,omitempty" yaml:"walking_gates" bson:"walking_gates" db:"walking_gates"` // Aoi面积, 若是Poi则无此字段 // Aoi area, if it is Poi, there is no such field Area *float64 `protobuf:"fixed64,8,opt,name=area,proto3,oneof" json:"area,omitempty" yaml:"area" bson:"area" db:"area"` @@ -1735,19 +1735,19 @@ type Aoi struct { // Land use type, if it is Poi, there is no such field // // Deprecated: Marked as deprecated in city/map/v2/map.proto. - LandUse *LandUseType `protobuf:"varint,10,opt,name=land_use,json=landUse,proto3,enum=city.map.v2.LandUseType,oneof" json:"land_use,omitempty" bson:"land_use" db:"land_use" yaml:"land_use"` // 弃用 deprecated + LandUse *LandUseType `protobuf:"varint,10,opt,name=land_use,json=landUse,proto3,enum=city.map.v2.LandUseType,oneof" json:"land_use,omitempty" yaml:"land_use" bson:"land_use" db:"land_use"` // 弃用 deprecated // 城市建设用地分类，参照执行标准GB 50137-2011（https://www.planning.org.cn/law/uploads/2013/1383993139.pdf） // Urban Land use type, refer to the national standard GB 50137-2011 UrbanLandUse *string `protobuf:"bytes,12,opt,name=urban_land_use,json=urbanLandUse,proto3,oneof" json:"urban_land_use,omitempty" yaml:"urban_land_use" bson:"urban_land_use" db:"urban_land_use"` // Aoi包含的Poi // Pois contained in Aoi - PoiIds []int32 `protobuf:"varint,9,rep,packed,name=poi_ids,json=poiIds,proto3" json:"poi_ids,omitempty" bson:"poi_ids" db:"poi_ids" yaml:"poi_ids"` + PoiIds []int32 `protobuf:"varint,9,rep,packed,name=poi_ids,json=poiIds,proto3" json:"poi_ids,omitempty" yaml:"poi_ids" bson:"poi_ids" db:"poi_ids"` // Aoi所在的所有公共交通线路ID // Subline IDs contained this Aoi SublineIds []int32 `protobuf:"varint,13,rep,packed,name=subline_ids,json=sublineIds,proto3" json:"subline_ids,omitempty" yaml:"subline_ids" bson:"subline_ids" db:"subline_ids"` // subline id对应连接的lane id // The lane id connecting to the subline id - SublineDrivingLanePairs []*SublineDrivingLanePair `protobuf:"bytes,14,rep,name=subline_driving_lane_pairs,json=sublineDrivingLanePairs,proto3" json:"subline_driving_lane_pairs,omitempty" db:"subline_driving_lane_pairs" yaml:"subline_driving_lane_pairs" bson:"subline_driving_lane_pairs"` + SublineDrivingLanePairs []*SublineDrivingLanePair `protobuf:"bytes,14,rep,name=subline_driving_lane_pairs,json=sublineDrivingLanePairs,proto3" json:"subline_driving_lane_pairs,omitempty" yaml:"subline_driving_lane_pairs" bson:"subline_driving_lane_pairs" db:"subline_driving_lane_pairs"` } func (x *Aoi) Reset() { @@ -1897,7 +1897,7 @@ type Poi struct { Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty" db:"name" yaml:"name" bson:"name"` // Poi分类编码 // Poi category code - Category string `protobuf:"bytes,3,opt,name=category,proto3" json:"category,omitempty" yaml:"category" bson:"category" db:"category"` + Category string `protobuf:"bytes,3,opt,name=category,proto3" json:"category,omitempty" db:"category" yaml:"category" bson:"category"` // Poi原始位置 // Poi original position Position *v2.XYPosition `protobuf:"bytes,4,opt,name=position,proto3" json:"position,omitempty" yaml:"position" bson:"position" db:"position"` @@ -2001,12 +2001,12 @@ type Map struct { unknownFields protoimpl.UnknownFields Header *Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty" yaml:"header" bson:"header" db:"header"` - Lanes []*Lane `protobuf:"bytes,2,rep,name=lanes,proto3" json:"lanes,omitempty" yaml:"lanes" bson:"lanes" db:"lanes"` - Roads []*Road `protobuf:"bytes,3,rep,name=roads,proto3" json:"roads,omitempty" db:"roads" yaml:"roads" bson:"roads"` + Lanes []*Lane `protobuf:"bytes,2,rep,name=lanes,proto3" json:"lanes,omitempty" bson:"lanes" db:"lanes" yaml:"lanes"` + Roads []*Road `protobuf:"bytes,3,rep,name=roads,proto3" json:"roads,omitempty" yaml:"roads" bson:"roads" db:"roads"` Junctions []*Junction `protobuf:"bytes,4,rep,name=junctions,proto3" json:"junctions,omitempty" yaml:"junctions" bson:"junctions" db:"junctions"` - Aois []*Aoi `protobuf:"bytes,5,rep,name=aois,proto3" json:"aois,omitempty" yaml:"aois" bson:"aois" db:"aois"` + Aois []*Aoi `protobuf:"bytes,5,rep,name=aois,proto3" json:"aois,omitempty" bson:"aois" db:"aois" yaml:"aois"` Pois []*Poi `protobuf:"bytes,6,rep,name=pois,proto3" json:"pois,omitempty" yaml:"pois" bson:"pois" db:"pois"` - Sublines []*PublicTransportSubline `protobuf:"bytes,7,rep,name=sublines,proto3" json:"sublines,omitempty" bson:"sublines" db:"sublines" yaml:"sublines"` + Sublines []*PublicTransportSubline `protobuf:"bytes,7,rep,name=sublines,proto3" json:"sublines,omitempty" yaml:"sublines" bson:"sublines" db:"sublines"` } func (x *Map) Reset() { diff --git a/go/city/map/v2/road_service.pb.go b/go/city/map/v2/road_service.pb.go index 04d56069..bee2f9b1 100644 --- a/go/city/map/v2/road_service.pb.go +++ b/go/city/map/v2/road_service.pb.go @@ -164,7 +164,7 @@ type GetRoadRequest struct { RoadIds []int32 `protobuf:"varint,1,rep,packed,name=road_ids,json=roadIds,proto3" json:"road_ids,omitempty" yaml:"road_ids" bson:"road_ids" db:"road_ids"` // 是否要排除车道信息 // Whether to exclude lane information - ExcludeLane bool `protobuf:"varint,2,opt,name=exclude_lane,json=excludeLane,proto3" json:"exclude_lane,omitempty" yaml:"exclude_lane" bson:"exclude_lane" db:"exclude_lane"` + ExcludeLane bool `protobuf:"varint,2,opt,name=exclude_lane,json=excludeLane,proto3" json:"exclude_lane,omitempty" db:"exclude_lane" yaml:"exclude_lane" bson:"exclude_lane"` // 是否要排除车道上的人的信息（仅在包含车道信息时有效） // Whether to exclude information about person in the lane (only valid when lane information is included) ExcludePerson bool `protobuf:"varint,3,opt,name=exclude_person,json=excludePerson,proto3" json:"exclude_person,omitempty" yaml:"exclude_person" bson:"exclude_person" db:"exclude_person"` @@ -232,7 +232,7 @@ type GetRoadResponse struct { // 道路信息列表 // List of road information - States []*RoadState `protobuf:"bytes,1,rep,name=states,proto3" json:"states,omitempty" bson:"states" db:"states" yaml:"states"` + States []*RoadState `protobuf:"bytes,1,rep,name=states,proto3" json:"states,omitempty" yaml:"states" bson:"states" db:"states"` } func (x *GetRoadResponse) Reset() { @@ -317,8 +317,8 @@ type RuinInfo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Num int32 `protobuf:"varint,1,opt,name=num,proto3" json:"num,omitempty" yaml:"num" bson:"num" db:"num"` // 损坏数量。Ruined number - Ratio float64 `protobuf:"fixed64,2,opt,name=ratio,proto3" json:"ratio,omitempty" db:"ratio" yaml:"ratio" bson:"ratio"` // 损坏占比。Ruined ratio + Num int32 `protobuf:"varint,1,opt,name=num,proto3" json:"num,omitempty" db:"num" yaml:"num" bson:"num"` // 损坏数量。Ruined number + Ratio float64 `protobuf:"fixed64,2,opt,name=ratio,proto3" json:"ratio,omitempty" yaml:"ratio" bson:"ratio" db:"ratio"` // 损坏占比。Ruined ratio } func (x *RuinInfo) Reset() { @@ -526,10 +526,10 @@ type RoadState struct { // 道路ID // road ID - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" bson:"id" db:"id" yaml:"id"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` // 道路平均速度（m/s） // road average speed (m/s) - AvgV float64 `protobuf:"fixed64,4,opt,name=avg_v,json=avgV,proto3" json:"avg_v,omitempty" db:"avg_v" yaml:"avg_v" bson:"avg_v"` + AvgV float64 `protobuf:"fixed64,4,opt,name=avg_v,json=avgV,proto3" json:"avg_v,omitempty" yaml:"avg_v" bson:"avg_v" db:"avg_v"` // 道路拥堵情况 // road congestion level Level RoadLevel `protobuf:"varint,2,opt,name=level,proto3,enum=city.map.v2.RoadLevel" json:"level,omitempty" yaml:"level" bson:"level" db:"level"` diff --git a/go/city/map/v2/traffic_light_service.pb.go b/go/city/map/v2/traffic_light_service.pb.go index aa690d59..a9a959a8 100644 --- a/go/city/map/v2/traffic_light_service.pb.go +++ b/go/city/map/v2/traffic_light_service.pb.go @@ -83,10 +83,10 @@ type GetTrafficLightResponse struct { TrafficLight *TrafficLight `protobuf:"bytes,1,opt,name=traffic_light,json=trafficLight,proto3" json:"traffic_light,omitempty" yaml:"traffic_light" bson:"traffic_light" db:"traffic_light"` // 表示当前路口处的红绿灯处于哪一个相位 // Which phase the traffic light is currently in - PhaseIndex int32 `protobuf:"varint,2,opt,name=phase_index,json=phaseIndex,proto3" json:"phase_index,omitempty" yaml:"phase_index" bson:"phase_index" db:"phase_index"` + PhaseIndex int32 `protobuf:"varint,2,opt,name=phase_index,json=phaseIndex,proto3" json:"phase_index,omitempty" db:"phase_index" yaml:"phase_index" bson:"phase_index"` // 当前相位的剩余时间 // The remaining time of the current phase - TimeRemaining float64 `protobuf:"fixed64,3,opt,name=time_remaining,json=timeRemaining,proto3" json:"time_remaining,omitempty" yaml:"time_remaining" bson:"time_remaining" db:"time_remaining"` + TimeRemaining float64 `protobuf:"fixed64,3,opt,name=time_remaining,json=timeRemaining,proto3" json:"time_remaining,omitempty" bson:"time_remaining" db:"time_remaining" yaml:"time_remaining"` } func (x *GetTrafficLightResponse) Reset() { diff --git a/go/city/person/v1/motion.pb.go b/go/city/person/v1/motion.pb.go index 6f49482c..354b856b 100644 --- a/go/city/person/v1/motion.pb.go +++ b/go/city/person/v1/motion.pb.go @@ -119,18 +119,18 @@ type PersonMotion struct { Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` // 状态 // status - Status Status `protobuf:"varint,2,opt,name=status,proto3,enum=city.person.v1.Status" json:"status,omitempty" db:"status" yaml:"status" bson:"status"` + Status Status `protobuf:"varint,2,opt,name=status,proto3,enum=city.person.v1.Status" json:"status,omitempty" yaml:"status" bson:"status" db:"status"` // 位置（包含逻辑位置、XY位置、经纬度位置） // Position (including logical position, XY position, longitude and latitude position) - Position *v2.Position `protobuf:"bytes,3,opt,name=position,proto3" json:"position,omitempty" db:"position" yaml:"position" bson:"position"` + Position *v2.Position `protobuf:"bytes,3,opt,name=position,proto3" json:"position,omitempty" yaml:"position" bson:"position" db:"position"` // speed V float64 `protobuf:"fixed64,4,opt,name=v,proto3" json:"v,omitempty" yaml:"v" bson:"v" db:"v"` // 方向角（atan2计算得到的弧度） // Direction angle (radians calculated by atan2) - Direction float64 `protobuf:"fixed64,5,opt,name=direction,proto3" json:"direction,omitempty" yaml:"direction" bson:"direction" db:"direction"` + Direction float64 `protobuf:"fixed64,5,opt,name=direction,proto3" json:"direction,omitempty" db:"direction" yaml:"direction" bson:"direction"` // 活动描述 // activity descriptions - Activity string `protobuf:"bytes,6,opt,name=activity,proto3" json:"activity,omitempty" db:"activity" yaml:"activity" bson:"activity"` + Activity string `protobuf:"bytes,6,opt,name=activity,proto3" json:"activity,omitempty" bson:"activity" db:"activity" yaml:"activity"` // 长度 // length L float64 `protobuf:"fixed64,7,opt,name=l,proto3" json:"l,omitempty" yaml:"l" bson:"l" db:"l"` diff --git a/go/city/person/v1/person.pb.go b/go/city/person/v1/person.pb.go index 70d70f24..3af9ce90 100644 --- a/go/city/person/v1/person.pb.go +++ b/go/city/person/v1/person.pb.go @@ -308,16 +308,16 @@ type PersonAttribute struct { MaxSpeed float64 `protobuf:"fixed64,4,opt,name=max_speed,json=maxSpeed,proto3" json:"max_speed,omitempty" yaml:"max_speed" bson:"max_speed" db:"max_speed"` // 单位: m/s^2, 最大加速度（正值） // max accelaration: m/s^2 (positive value) - MaxAcceleration float64 `protobuf:"fixed64,5,opt,name=max_acceleration,json=maxAcceleration,proto3" json:"max_acceleration,omitempty" db:"max_acceleration" yaml:"max_acceleration" bson:"max_acceleration"` + MaxAcceleration float64 `protobuf:"fixed64,5,opt,name=max_acceleration,json=maxAcceleration,proto3" json:"max_acceleration,omitempty" yaml:"max_acceleration" bson:"max_acceleration" db:"max_acceleration"` // 单位: m/s^2, 最大减速度（负值） // max deceleration: m/s^2 (negative value) MaxBrakingAcceleration float64 `protobuf:"fixed64,6,opt,name=max_braking_acceleration,json=maxBrakingAcceleration,proto3" json:"max_braking_acceleration,omitempty" yaml:"max_braking_acceleration" bson:"max_braking_acceleration" db:"max_braking_acceleration"` // 单位: m/s^2, 一般加速度（正值），要求小于最大加速度 // usual acceleration: m/s^2 (positive value), required to be less than the max acceleration - UsualAcceleration float64 `protobuf:"fixed64,7,opt,name=usual_acceleration,json=usualAcceleration,proto3" json:"usual_acceleration,omitempty" bson:"usual_acceleration" db:"usual_acceleration" yaml:"usual_acceleration"` + UsualAcceleration float64 `protobuf:"fixed64,7,opt,name=usual_acceleration,json=usualAcceleration,proto3" json:"usual_acceleration,omitempty" yaml:"usual_acceleration" bson:"usual_acceleration" db:"usual_acceleration"` // 单位: m/s^2, 一般减速度（负值），要求大于最大减速度 // usual deceleration: m/s^2 (negative value), required to be greater than the max deceleration - UsualBrakingAcceleration float64 `protobuf:"fixed64,8,opt,name=usual_braking_acceleration,json=usualBrakingAcceleration,proto3" json:"usual_braking_acceleration,omitempty" db:"usual_braking_acceleration" yaml:"usual_braking_acceleration" bson:"usual_braking_acceleration"` + UsualBrakingAcceleration float64 `protobuf:"fixed64,8,opt,name=usual_braking_acceleration,json=usualBrakingAcceleration,proto3" json:"usual_braking_acceleration,omitempty" yaml:"usual_braking_acceleration" bson:"usual_braking_acceleration" db:"usual_braking_acceleration"` } func (x *PersonAttribute) Reset() { @@ -481,13 +481,13 @@ type BusAttribute struct { // 公交线路ID // bus line ID - SublineId int32 `protobuf:"varint,1,opt,name=subline_id,json=sublineId,proto3" json:"subline_id,omitempty" yaml:"subline_id" bson:"subline_id" db:"subline_id"` + SublineId int32 `protobuf:"varint,1,opt,name=subline_id,json=sublineId,proto3" json:"subline_id,omitempty" bson:"subline_id" db:"subline_id" yaml:"subline_id"` // 公交车容量 // bus capacity Capacity int32 `protobuf:"varint,2,opt,name=capacity,proto3" json:"capacity,omitempty" yaml:"capacity" bson:"capacity" db:"capacity"` // 公交车模型标签 // bus model tag - Model *string `protobuf:"bytes,3,opt,name=model,proto3,oneof" json:"model,omitempty" db:"model" yaml:"model" bson:"model"` + Model *string `protobuf:"bytes,3,opt,name=model,proto3,oneof" json:"model,omitempty" yaml:"model" bson:"model" db:"model"` // 公交车类型 // type of bus Type BusType `protobuf:"varint,5,opt,name=type,proto3,enum=city.person.v1.BusType" json:"type,omitempty" yaml:"type" bson:"type" db:"type"` @@ -623,7 +623,7 @@ type BikeAttribute struct { // 单位: m/s // speed: m/s - Speed float64 `protobuf:"fixed64,1,opt,name=speed,proto3" json:"speed,omitempty" yaml:"speed" bson:"speed" db:"speed"` + Speed float64 `protobuf:"fixed64,1,opt,name=speed,proto3" json:"speed,omitempty" bson:"speed" db:"speed" yaml:"speed"` // 自行车模型标签 // Bike model tag Model *string `protobuf:"bytes,2,opt,name=model,proto3,oneof" json:"model,omitempty" yaml:"model" bson:"model" db:"model"` @@ -778,7 +778,7 @@ type Person struct { Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` // 参数 // attribute - Attribute *PersonAttribute `protobuf:"bytes,2,opt,name=attribute,proto3" json:"attribute,omitempty" bson:"attribute" db:"attribute" yaml:"attribute"` + Attribute *PersonAttribute `protobuf:"bytes,2,opt,name=attribute,proto3" json:"attribute,omitempty" yaml:"attribute" bson:"attribute" db:"attribute"` // 初始位置 // initial position Home *v2.Position `protobuf:"bytes,3,opt,name=home,proto3" json:"home,omitempty" yaml:"home" bson:"home" db:"home"` @@ -790,7 +790,7 @@ type Person struct { VehicleAttribute *VehicleAttribute `protobuf:"bytes,7,opt,name=vehicle_attribute,json=vehicleAttribute,proto3,oneof" json:"vehicle_attribute,omitempty" yaml:"vehicle_attribute" bson:"vehicle_attribute" db:"vehicle_attribute"` // 公交车附加属性 // bus additional attribute - BusAttribute *BusAttribute `protobuf:"bytes,8,opt,name=bus_attribute,json=busAttribute,proto3,oneof" json:"bus_attribute,omitempty" yaml:"bus_attribute" bson:"bus_attribute" db:"bus_attribute"` + BusAttribute *BusAttribute `protobuf:"bytes,8,opt,name=bus_attribute,json=busAttribute,proto3,oneof" json:"bus_attribute,omitempty" bson:"bus_attribute" db:"bus_attribute" yaml:"bus_attribute"` // 行人附加属性 // pedestrian additional attribute PedestrianAttribute *PedestrianAttribute `protobuf:"bytes,12,opt,name=pedestrian_attribute,json=pedestrianAttribute,proto3,oneof" json:"pedestrian_attribute,omitempty" yaml:"pedestrian_attribute" bson:"pedestrian_attribute" db:"pedestrian_attribute"` @@ -934,7 +934,7 @@ type Persons struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Persons []*Person `protobuf:"bytes,1,rep,name=persons,proto3" json:"persons,omitempty" bson:"persons" db:"persons" yaml:"persons"` + Persons []*Person `protobuf:"bytes,1,rep,name=persons,proto3" json:"persons,omitempty" yaml:"persons" bson:"persons" db:"persons"` } func (x *Persons) Reset() { diff --git a/go/city/person/v1/person_runtime.pb.go b/go/city/person/v1/person_runtime.pb.go index 3e710905..287167bc 100644 --- a/go/city/person/v1/person_runtime.pb.go +++ b/go/city/person/v1/person_runtime.pb.go @@ -29,7 +29,7 @@ type PersonRuntime struct { // person信息 // person information - Base *Person `protobuf:"bytes,1,opt,name=base,proto3,oneof" json:"base,omitempty" yaml:"base" bson:"base" db:"base"` + Base *Person `protobuf:"bytes,1,opt,name=base,proto3,oneof" json:"base,omitempty" bson:"base" db:"base" yaml:"base"` // person运动信息 // person motion information Motion *PersonMotion `protobuf:"bytes,2,opt,name=motion,proto3" json:"motion,omitempty" yaml:"motion" bson:"motion" db:"motion"` diff --git a/go/city/person/v1/person_service.pb.go b/go/city/person/v1/person_service.pb.go index 705ab1a0..20300c1f 100644 --- a/go/city/person/v1/person_service.pb.go +++ b/go/city/person/v1/person_service.pb.go @@ -79,7 +79,7 @@ type GetPersonResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Person *PersonRuntime `protobuf:"bytes,1,opt,name=person,proto3" json:"person,omitempty" db:"person" yaml:"person" bson:"person"` + Person *PersonRuntime `protobuf:"bytes,1,opt,name=person,proto3" json:"person,omitempty" bson:"person" db:"person" yaml:"person"` } func (x *GetPersonResponse) Reset() { @@ -130,7 +130,7 @@ type AddPersonRequest struct { // 约定：person中不设置id // Convention: personid is not set here - Person *Person `protobuf:"bytes,1,opt,name=person,proto3" json:"person,omitempty" db:"person" yaml:"person" bson:"person"` + Person *Person `protobuf:"bytes,1,opt,name=person,proto3" json:"person,omitempty" bson:"person" db:"person" yaml:"person"` } func (x *AddPersonRequest) Reset() { @@ -181,7 +181,7 @@ type AddPersonResponse struct { // 新增的person分配得到的ID // The ID assigned to the newly added person - PersonId int32 `protobuf:"varint,1,opt,name=person_id,json=personId,proto3" json:"person_id,omitempty" bson:"person_id" db:"person_id" yaml:"person_id"` + PersonId int32 `protobuf:"varint,1,opt,name=person_id,json=personId,proto3" json:"person_id,omitempty" yaml:"person_id" bson:"person_id" db:"person_id"` } func (x *AddPersonResponse) Reset() { @@ -454,7 +454,7 @@ type GetPersonByLongLatBBoxRequest struct { // 经纬度范围 // longitude and latitude bounding box - Bbox *v21.LongLatBBox `protobuf:"bytes,1,opt,name=bbox,proto3" json:"bbox,omitempty" yaml:"bbox" bson:"bbox" db:"bbox"` + Bbox *v21.LongLatBBox `protobuf:"bytes,1,opt,name=bbox,proto3" json:"bbox,omitempty" bson:"bbox" db:"bbox" yaml:"bbox"` // 过滤人的状态（状态为列表内的值的人不返回） // Filter person's status (person whose status is in the list will not be returned) ExcludeStatuses []Status `protobuf:"varint,2,rep,packed,name=exclude_statuses,json=excludeStatuses,proto3,enum=city.person.v1.Status" json:"exclude_statuses,omitempty" yaml:"exclude_statuses" bson:"exclude_statuses" db:"exclude_statuses"` @@ -616,7 +616,7 @@ type GetAllVehiclesResponse struct { // 所有车辆的信息 // Information of all vehicles - Vehicles []*VehicleRuntime `protobuf:"bytes,1,rep,name=vehicles,proto3" json:"vehicles,omitempty" bson:"vehicles" db:"vehicles" yaml:"vehicles"` + Vehicles []*VehicleRuntime `protobuf:"bytes,1,rep,name=vehicles,proto3" json:"vehicles,omitempty" db:"vehicles" yaml:"vehicles" bson:"vehicles"` } func (x *GetAllVehiclesResponse) Reset() { @@ -666,7 +666,7 @@ type ResetPersonPositionRequest struct { unknownFields protoimpl.UnknownFields // person id - PersonId int32 `protobuf:"varint,1,opt,name=person_id,json=personId,proto3" json:"person_id,omitempty" bson:"person_id" db:"person_id" yaml:"person_id"` + PersonId int32 `protobuf:"varint,1,opt,name=person_id,json=personId,proto3" json:"person_id,omitempty" yaml:"person_id" bson:"person_id" db:"person_id"` // 重置位置 // reset position Position *v21.Position `protobuf:"bytes,2,opt,name=position,proto3" json:"position,omitempty" yaml:"position" bson:"position" db:"position"` diff --git a/go/city/person/v1/vehicle.pb.go b/go/city/person/v1/vehicle.pb.go index 4ee386a7..c43ae517 100644 --- a/go/city/person/v1/vehicle.pb.go +++ b/go/city/person/v1/vehicle.pb.go @@ -180,13 +180,13 @@ type LC struct { ShadowLaneId int32 `protobuf:"varint,1,opt,name=shadow_lane_id,json=shadowLaneId,proto3" json:"shadow_lane_id,omitempty" yaml:"shadow_lane_id" bson:"shadow_lane_id" db:"shadow_lane_id"` // 投影到影子车道的坐标 // s coordinate projected to shadow lane - ShadowS float64 `protobuf:"fixed64,2,opt,name=shadow_s,json=shadowS,proto3" json:"shadow_s,omitempty" yaml:"shadow_s" bson:"shadow_s" db:"shadow_s"` + ShadowS float64 `protobuf:"fixed64,2,opt,name=shadow_s,json=shadowS,proto3" json:"shadow_s,omitempty" bson:"shadow_s" db:"shadow_s" yaml:"shadow_s"` // 变道过程车头相对于前进方向的偏转角（弧度，总是为正，0代表不转向） // deviation angle of the vehicle head relative to the forward direction during lane change (radians, always positive, 0 means no steering) - Angle float64 `protobuf:"fixed64,3,opt,name=angle,proto3" json:"angle,omitempty" db:"angle" yaml:"angle" bson:"angle"` + Angle float64 `protobuf:"fixed64,3,opt,name=angle,proto3" json:"angle,omitempty" yaml:"angle" bson:"angle" db:"angle"` // 已完成的变道比例 // completed ratio of lane change - CompletedRatio float64 `protobuf:"fixed64,4,opt,name=completed_ratio,json=completedRatio,proto3" json:"completed_ratio,omitempty" yaml:"completed_ratio" bson:"completed_ratio" db:"completed_ratio"` + CompletedRatio float64 `protobuf:"fixed64,4,opt,name=completed_ratio,json=completedRatio,proto3" json:"completed_ratio,omitempty" db:"completed_ratio" yaml:"completed_ratio" bson:"completed_ratio"` } func (x *LC) Reset() { @@ -258,10 +258,10 @@ type VehicleAction struct { // 车辆编号 // vehicle id - Id int32 `protobuf:"varint,4,opt,name=id,proto3" json:"id,omitempty" db:"id" yaml:"id" bson:"id"` + Id int32 `protobuf:"varint,4,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` // 本轮更新中设定的加速度 // acceleration set in this step - Acc float64 `protobuf:"fixed64,1,opt,name=acc,proto3" json:"acc,omitempty" db:"acc" yaml:"acc" bson:"acc"` + Acc float64 `protobuf:"fixed64,1,opt,name=acc,proto3" json:"acc,omitempty" yaml:"acc" bson:"acc" db:"acc"` // 变道目标（可选，不设置代表不变道或保持变道状态） // lane change target (optional, not set means no lane change) LcTargetId *int32 `protobuf:"varint,2,opt,name=lc_target_id,json=lcTargetId,proto3,oneof" json:"lc_target_id,omitempty" yaml:"lc_target_id" bson:"lc_target_id" db:"lc_target_id"` @@ -340,19 +340,19 @@ type VehicleRuntime struct { Base *PersonMotion `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty" yaml:"base" bson:"base" db:"base"` // 变道信息 // lane change information - Lc *LC `protobuf:"bytes,4,opt,name=lc,proto3,oneof" json:"lc,omitempty" yaml:"lc" bson:"lc" db:"lc"` + Lc *LC `protobuf:"bytes,4,opt,name=lc,proto3,oneof" json:"lc,omitempty" bson:"lc" db:"lc" yaml:"lc"` // 本轮车辆行为（获取车辆环境信息时不返回） // vehicle action in the step (not returned when getting vehicle environment information) Action *VehicleAction `protobuf:"bytes,5,opt,name=action,proto3,oneof" json:"action,omitempty" yaml:"action" bson:"action" db:"action"` // 走过的里程 // running distance - RunningDistance float64 `protobuf:"fixed64,6,opt,name=running_distance,json=runningDistance,proto3" json:"running_distance,omitempty" yaml:"running_distance" bson:"running_distance" db:"running_distance"` + RunningDistance float64 `protobuf:"fixed64,6,opt,name=running_distance,json=runningDistance,proto3" json:"running_distance,omitempty" bson:"running_distance" db:"running_distance" yaml:"running_distance"` // 走错路次数 // number of going astray - NumGoingAstray int32 `protobuf:"varint,7,opt,name=num_going_astray,json=numGoingAstray,proto3" json:"num_going_astray,omitempty" bson:"num_going_astray" db:"num_going_astray" yaml:"num_going_astray"` + NumGoingAstray int32 `protobuf:"varint,7,opt,name=num_going_astray,json=numGoingAstray,proto3" json:"num_going_astray,omitempty" yaml:"num_going_astray" bson:"num_going_astray" db:"num_going_astray"` // 出发时刻 // departure time - DepartureTime float64 `protobuf:"fixed64,8,opt,name=departure_time,json=departureTime,proto3" json:"departure_time,omitempty" yaml:"departure_time" bson:"departure_time" db:"departure_time"` + DepartureTime float64 `protobuf:"fixed64,8,opt,name=departure_time,json=departureTime,proto3" json:"departure_time,omitempty" db:"departure_time" yaml:"departure_time" bson:"departure_time"` // 预计到达时刻（导航返回的eta+出发时刻） // estimated arrival time (eta returned by routing + departure time) Eta float64 `protobuf:"fixed64,9,opt,name=eta,proto3" json:"eta,omitempty" yaml:"eta" bson:"eta" db:"eta"` @@ -458,7 +458,7 @@ type ObservedVehicle struct { // 车辆编号 // vehicle id - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" db:"id" yaml:"id" bson:"id"` // 当前的车辆运行时信息 // current vehicle runtime information Motion *PersonMotion `protobuf:"bytes,2,opt,name=motion,proto3" json:"motion,omitempty" yaml:"motion" bson:"motion" db:"motion"` @@ -541,7 +541,7 @@ type ObservedLane struct { Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` // 是否限行 // whether restricted - Restriction bool `protobuf:"varint,2,opt,name=restriction,proto3" json:"restriction,omitempty" yaml:"restriction" bson:"restriction" db:"restriction"` + Restriction bool `protobuf:"varint,2,opt,name=restriction,proto3" json:"restriction,omitempty" bson:"restriction" db:"restriction" yaml:"restriction"` // 交通灯状态 // traffic light state LightState LightState `protobuf:"varint,3,opt,name=light_state,json=lightState,proto3,enum=city.person.v1.LightState" json:"light_state,omitempty" yaml:"light_state" bson:"light_state" db:"light_state"` diff --git a/go/city/routing/v2/cost.pb.go b/go/city/routing/v2/cost.pb.go index 1688b30e..7f360d82 100644 --- a/go/city/routing/v2/cost.pb.go +++ b/go/city/routing/v2/cost.pb.go @@ -29,7 +29,7 @@ type Cost struct { // 目标拓扑元素（只支持道路Road） // Target topology element (only supports roads) - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" db:"id" yaml:"id" bson:"id"` // 路径成本（单位：秒） // Path cost (in seconds) Cost float64 `protobuf:"fixed64,2,opt,name=cost,proto3" json:"cost,omitempty" yaml:"cost" bson:"cost" db:"cost"` @@ -39,7 +39,7 @@ type Cost struct { // That is, set the cost as the value at what time // 为空表示设置全天通行成本均为cost // If empty, it means that the all-day cost is set to the value. - Time *float64 `protobuf:"fixed64,3,opt,name=time,proto3,oneof" json:"time,omitempty" bson:"time" db:"time" yaml:"time"` + Time *float64 `protobuf:"fixed64,3,opt,name=time,proto3,oneof" json:"time,omitempty" yaml:"time" bson:"time" db:"time"` } func (x *Cost) Reset() { diff --git a/go/city/routing/v2/routing.pb.go b/go/city/routing/v2/routing.pb.go index 322c1c45..cc581516 100644 --- a/go/city/routing/v2/routing.pb.go +++ b/go/city/routing/v2/routing.pb.go @@ -220,7 +220,7 @@ type DrivingJourneyBody struct { // The reason for using road sequences is that active lane changing requires frequent modifications to lane level navigation // 优先使用road_ids，如果road_ids为空，则使用route（也可以直接忽略route） // Prioritize using road_ids. If road_ids is empty, use route (or simply ignore route) - RoadIds []int32 `protobuf:"varint,2,rep,packed,name=road_ids,json=roadIds,proto3" json:"road_ids,omitempty" db:"road_ids" yaml:"road_ids" bson:"road_ids"` + RoadIds []int32 `protobuf:"varint,2,rep,packed,name=road_ids,json=roadIds,proto3" json:"road_ids,omitempty" yaml:"road_ids" bson:"road_ids" db:"road_ids"` // 从起点到终点预计的时间(estimation time of arrival) // estimation time of arrival Eta float64 `protobuf:"fixed64,3,opt,name=eta,proto3" json:"eta,omitempty" yaml:"eta" bson:"eta" db:"eta"` @@ -466,7 +466,7 @@ type BusJourneyBody struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Transfers []*TransferSegment `protobuf:"bytes,1,rep,name=transfers,proto3" json:"transfers,omitempty" bson:"transfers" db:"transfers" yaml:"transfers"` + Transfers []*TransferSegment `protobuf:"bytes,1,rep,name=transfers,proto3" json:"transfers,omitempty" yaml:"transfers" bson:"transfers" db:"transfers"` // 从起点到终点预计的时间(estimation time of arrival) // estimation time of arrival Eta float64 `protobuf:"fixed64,2,opt,name=eta,proto3" json:"eta,omitempty" yaml:"eta" bson:"eta" db:"eta"` @@ -536,7 +536,7 @@ type Journey struct { Walking *WalkingJourneyBody `protobuf:"bytes,3,opt,name=walking,proto3,oneof" json:"walking,omitempty" yaml:"walking" bson:"walking" db:"walking"` // 公交 // Routing results of bus journey - ByBus *BusJourneyBody `protobuf:"bytes,4,opt,name=by_bus,json=byBus,proto3,oneof" json:"by_bus,omitempty" db:"by_bus" yaml:"by_bus" bson:"by_bus"` + ByBus *BusJourneyBody `protobuf:"bytes,4,opt,name=by_bus,json=byBus,proto3,oneof" json:"by_bus,omitempty" yaml:"by_bus" bson:"by_bus" db:"by_bus"` } func (x *Journey) Reset() { @@ -611,7 +611,7 @@ type RoadStatus struct { Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id" bson:"id" db:"id"` // 车道在各个时间片（每个5min）的速度 // The speed of the lane at each time slot (5 minutes each) - Speed []float64 `protobuf:"fixed64,2,rep,packed,name=speed,proto3" json:"speed,omitempty" yaml:"speed" bson:"speed" db:"speed"` + Speed []float64 `protobuf:"fixed64,2,rep,packed,name=speed,proto3" json:"speed,omitempty" bson:"speed" db:"speed" yaml:"speed"` } func (x *RoadStatus) Reset() { diff --git a/go/city/routing/v2/routing_service.pb.go b/go/city/routing/v2/routing_service.pb.go index 01e43cdd..b6cbfa51 100644 --- a/go/city/routing/v2/routing_service.pb.go +++ b/go/city/routing/v2/routing_service.pb.go @@ -30,7 +30,7 @@ type GetRouteRequest struct { // 导航类型 // routing type - Type RouteType `protobuf:"varint,1,opt,name=type,proto3,enum=city.routing.v2.RouteType" json:"type,omitempty" yaml:"type" bson:"type" db:"type"` + Type RouteType `protobuf:"varint,1,opt,name=type,proto3,enum=city.routing.v2.RouteType" json:"type,omitempty" db:"type" yaml:"type" bson:"type"` // 起点，约定：包含LanePosition或AoiPosition中的一种 // Starting point, convention: as LanePosition or AoiPosition Start *v2.Position `protobuf:"bytes,2,opt,name=start,proto3" json:"start,omitempty" yaml:"start" bson:"start" db:"start"` @@ -39,7 +39,7 @@ type GetRouteRequest struct { End *v2.Position `protobuf:"bytes,3,opt,name=end,proto3" json:"end,omitempty" yaml:"end" bson:"end" db:"end"` // 发送导航请求的时间（目前仅在行车导航中使用） // The time to send routing request (currently only used in driving routing) - Time float64 `protobuf:"fixed64,5,opt,name=time,proto3" json:"time,omitempty" bson:"time" db:"time" yaml:"time"` + Time float64 `protobuf:"fixed64,5,opt,name=time,proto3" json:"time,omitempty" yaml:"time" bson:"time" db:"time"` } func (x *GetRouteRequest) Reset() { @@ -109,7 +109,7 @@ type GetRouteResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Journeys []*Journey `protobuf:"bytes,1,rep,name=journeys,proto3" json:"journeys,omitempty" yaml:"journeys" bson:"journeys" db:"journeys"` + Journeys []*Journey `protobuf:"bytes,1,rep,name=journeys,proto3" json:"journeys,omitempty" db:"journeys" yaml:"journeys" bson:"journeys"` } func (x *GetRouteResponse) Reset() { @@ -160,7 +160,7 @@ type SetDrivingCostsRequest struct { // 道路通行成本 // travelling cost - Costs []*Cost `protobuf:"bytes,1,rep,name=costs,proto3" json:"costs,omitempty" bson:"costs" db:"costs" yaml:"costs"` + Costs []*Cost `protobuf:"bytes,1,rep,name=costs,proto3" json:"costs,omitempty" yaml:"costs" bson:"costs" db:"costs"` } func (x *SetDrivingCostsRequest) Reset() { @@ -251,7 +251,7 @@ type GetDrivingCostsRequest struct { // 道路通行成本（按照给定的id和time进行查询） // travelling cost (query via the given ID and time) - Costs []*Cost `protobuf:"bytes,1,rep,name=costs,proto3" json:"costs,omitempty" yaml:"costs" bson:"costs" db:"costs"` + Costs []*Cost `protobuf:"bytes,1,rep,name=costs,proto3" json:"costs,omitempty" db:"costs" yaml:"costs" bson:"costs"` } func (x *GetDrivingCostsRequest) Reset() { @@ -302,7 +302,7 @@ type GetDrivingCostsResponse struct { // 道路通行成本（补全cost后的结果） // travelling cost (results after completing the cost) - Costs []*Cost `protobuf:"bytes,1,rep,name=costs,proto3" json:"costs,omitempty" yaml:"costs" bson:"costs" db:"costs"` + Costs []*Cost `protobuf:"bytes,1,rep,name=costs,proto3" json:"costs,omitempty" db:"costs" yaml:"costs" bson:"costs"` } func (x *GetDrivingCostsResponse) Reset() { diff --git a/go/city/trip/v2/trip.pb.go b/go/city/trip/v2/trip.pb.go index e3a2eb94..249fa2aa 100644 --- a/go/city/trip/v2/trip.pb.go +++ b/go/city/trip/v2/trip.pb.go @@ -169,10 +169,10 @@ type Trip struct { // 出行方式 // trip mode - Mode TripMode `protobuf:"varint,1,opt,name=mode,proto3,enum=city.trip.v2.TripMode" json:"mode,omitempty" bson:"mode" db:"mode" yaml:"mode"` + Mode TripMode `protobuf:"varint,1,opt,name=mode,proto3,enum=city.trip.v2.TripMode" json:"mode,omitempty" yaml:"mode" bson:"mode" db:"mode"` // 目的地，如果目的地是AOI且指定了XYPosition，则以XYPosition为室内步行的终点 // destination, if the destination is AOI and XYPosition is specified, XYPosition is the end point of indoor walking - End *v2.Position `protobuf:"bytes,2,opt,name=end,proto3" json:"end,omitempty" yaml:"end" bson:"end" db:"end"` + End *v2.Position `protobuf:"bytes,2,opt,name=end,proto3" json:"end,omitempty" db:"end" yaml:"end" bson:"end"` // 期望的出发时间（单位: 秒） // Expected departure time (in seconds) DepartureTime *float64 `protobuf:"fixed64,3,opt,name=departure_time,json=departureTime,proto3,oneof" json:"departure_time,omitempty" yaml:"departure_time" bson:"departure_time" db:"departure_time"` @@ -330,7 +330,7 @@ type Schedule struct { // 出行列表 // List of trips - Trips []*Trip `protobuf:"bytes,1,rep,name=trips,proto3" json:"trips,omitempty" db:"trips" yaml:"trips" bson:"trips"` + Trips []*Trip `protobuf:"bytes,1,rep,name=trips,proto3" json:"trips,omitempty" yaml:"trips" bson:"trips" db:"trips"` // trips的执行次数，0表示无限循环，大于0表示执行几次 // The number of times trips are executed, where 0 represents infinite loops and greater than 0 represents how many times they are executed LoopCount int32 `protobuf:"varint,2,opt,name=loop_count,json=loopCount,proto3" json:"loop_count,omitempty" yaml:"loop_count" bson:"loop_count" db:"loop_count"` diff --git a/go/city/water/input/v1/config.pb.go b/go/city/water/input/v1/config.pb.go index afb55cc8..82ce44f1 100644 --- a/go/city/water/input/v1/config.pb.go +++ b/go/city/water/input/v1/config.pb.go @@ -27,7 +27,7 @@ type Mongo struct { unknownFields protoimpl.UnknownFields Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty" yaml:"uri" bson:"uri" db:"uri"` - Map *v1.MongoPath `protobuf:"bytes,2,opt,name=map,proto3" json:"map,omitempty" yaml:"map" bson:"map" db:"map"` + Map *v1.MongoPath `protobuf:"bytes,2,opt,name=map,proto3" json:"map,omitempty" db:"map" yaml:"map" bson:"map"` Rain *v1.MongoPath `protobuf:"bytes,3,opt,name=rain,proto3" json:"rain,omitempty" yaml:"rain" bson:"rain" db:"rain"` } @@ -152,7 +152,7 @@ type Control struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Step *ControlStep `protobuf:"bytes,1,opt,name=step,proto3" json:"step,omitempty" yaml:"step" bson:"step" db:"step"` + Step *ControlStep `protobuf:"bytes,1,opt,name=step,proto3" json:"step,omitempty" bson:"step" db:"step" yaml:"step"` } func (x *Control) Reset() { @@ -202,8 +202,8 @@ type OutputSwitch struct { Road bool `protobuf:"varint,1,opt,name=road,proto3" json:"road,omitempty" yaml:"road" bson:"road" db:"road"` Drainage bool `protobuf:"varint,2,opt,name=drainage,proto3" json:"drainage,omitempty" yaml:"drainage" bson:"drainage" db:"drainage"` - Supply bool `protobuf:"varint,3,opt,name=supply,proto3" json:"supply,omitempty" yaml:"supply" bson:"supply" db:"supply"` - Aoi bool `protobuf:"varint,4,opt,name=aoi,proto3" json:"aoi,omitempty" db:"aoi" yaml:"aoi" bson:"aoi"` + Supply bool `protobuf:"varint,3,opt,name=supply,proto3" json:"supply,omitempty" db:"supply" yaml:"supply" bson:"supply"` + Aoi bool `protobuf:"varint,4,opt,name=aoi,proto3" json:"aoi,omitempty" bson:"aoi" db:"aoi" yaml:"aoi"` Event bool `protobuf:"varint,5,opt,name=event,proto3" json:"event,omitempty" yaml:"event" bson:"event" db:"event"` } @@ -280,7 +280,7 @@ type Output struct { unknownFields protoimpl.UnknownFields // 统一的输出目标 - Target *v1.OutputTarget `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty" yaml:"target" bson:"target" db:"target"` + Target *v1.OutputTarget `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty" db:"target" yaml:"target" bson:"target"` Switch *OutputSwitch `protobuf:"bytes,2,opt,name=switch,proto3" json:"switch,omitempty" yaml:"switch" bson:"switch" db:"switch"` } diff --git a/go/city/water/input/v1/input_service.pb.go b/go/city/water/input/v1/input_service.pb.go index 192726ca..ab239ce7 100644 --- a/go/city/water/input/v1/input_service.pb.go +++ b/go/city/water/input/v1/input_service.pb.go @@ -67,7 +67,7 @@ type InitResponse struct { // 模拟器gRPC监听地址 Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty" yaml:"address" bson:"address" db:"address"` Control *Control `protobuf:"bytes,3,opt,name=control,proto3" json:"control,omitempty" yaml:"control" bson:"control" db:"control"` - Rain *Rain `protobuf:"bytes,1,opt,name=rain,proto3" json:"rain,omitempty" bson:"rain" db:"rain" yaml:"rain"` + Rain *Rain `protobuf:"bytes,1,opt,name=rain,proto3" json:"rain,omitempty" yaml:"rain" bson:"rain" db:"rain"` // 仅包括header与roads Map *v2.Map `protobuf:"bytes,4,opt,name=map,proto3" json:"map,omitempty" yaml:"map" bson:"map" db:"map"` } diff --git a/go/city/water/input/v1/water.pb.go b/go/city/water/input/v1/water.pb.go index 70ec5f81..e09693bc 100644 --- a/go/city/water/input/v1/water.pb.go +++ b/go/city/water/input/v1/water.pb.go @@ -83,7 +83,7 @@ type Rain struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Rains []*RainPeriod `protobuf:"bytes,1,rep,name=rains,proto3" json:"rains,omitempty" bson:"rains" db:"rains" yaml:"rains"` + Rains []*RainPeriod `protobuf:"bytes,1,rep,name=rains,proto3" json:"rains,omitempty" yaml:"rains" bson:"rains" db:"rains"` } func (x *Rain) Reset() {