From 5c98d38398bf6959e15821a2771e245b7ee5c34b Mon Sep 17 00:00:00 2001 From: Edouard Maffert Date: Wed, 10 Jul 2019 11:14:53 +0200 Subject: [PATCH] Change StopArea PositionX and PositionY yo longitude and latitude --- inputs/stop_areas.proto | 4 ++-- stop_areas.pb.go | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/inputs/stop_areas.proto b/inputs/stop_areas.proto index 89570d3..f51236f 100644 --- a/inputs/stop_areas.proto +++ b/inputs/stop_areas.proto @@ -4,6 +4,6 @@ package external_models; message ExternalStopArea { string objectid = 1; string name = 2; - double position_x = 3; - double position_y = 4; + double longitude = 3; + double latitude = 4; } diff --git a/stop_areas.pb.go b/stop_areas.pb.go index 27c77ba..b7b3b7c 100644 --- a/stop_areas.pb.go +++ b/stop_areas.pb.go @@ -23,8 +23,8 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type ExternalStopArea struct { Objectid string `protobuf:"bytes,1,opt,name=objectid,proto3" json:"objectid,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - PositionX float64 `protobuf:"fixed64,3,opt,name=position_x,json=positionX,proto3" json:"position_x,omitempty"` - PositionY float64 `protobuf:"fixed64,4,opt,name=position_y,json=positionY,proto3" json:"position_y,omitempty"` + Longitude float64 `protobuf:"fixed64,3,opt,name=longitude,proto3" json:"longitude,omitempty"` + Latitude float64 `protobuf:"fixed64,4,opt,name=latitude,proto3" json:"latitude,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -69,16 +69,16 @@ func (m *ExternalStopArea) GetName() string { return "" } -func (m *ExternalStopArea) GetPositionX() float64 { +func (m *ExternalStopArea) GetLongitude() float64 { if m != nil { - return m.PositionX + return m.Longitude } return 0 } -func (m *ExternalStopArea) GetPositionY() float64 { +func (m *ExternalStopArea) GetLatitude() float64 { if m != nil { - return m.PositionY + return m.Latitude } return 0 } @@ -93,12 +93,12 @@ var fileDescriptor_82d1dca9db066224 = []byte{ // 147 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x28, 0x2e, 0xc9, 0x2f, 0x88, 0x4f, 0x2c, 0x4a, 0x4d, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x4f, 0xad, - 0x28, 0x49, 0x2d, 0xca, 0x4b, 0xcc, 0x89, 0xcf, 0xcd, 0x4f, 0x49, 0xcd, 0x29, 0x56, 0x6a, 0x60, - 0xe4, 0x12, 0x70, 0x85, 0x8a, 0x05, 0x97, 0xe4, 0x17, 0x38, 0x16, 0xa5, 0x26, 0x0a, 0x49, 0x71, - 0x71, 0xe4, 0x27, 0x65, 0xa5, 0x26, 0x97, 0x64, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, - 0xc1, 0xf9, 0x42, 0x42, 0x5c, 0x2c, 0x79, 0x89, 0xb9, 0xa9, 0x12, 0x4c, 0x60, 0x71, 0x30, 0x5b, - 0x48, 0x96, 0x8b, 0xab, 0x20, 0xbf, 0x38, 0xb3, 0x24, 0x33, 0x3f, 0x2f, 0xbe, 0x42, 0x82, 0x59, - 0x81, 0x51, 0x83, 0x31, 0x88, 0x13, 0x26, 0x12, 0x81, 0x22, 0x5d, 0x29, 0xc1, 0x82, 0x2a, 0x1d, - 0x99, 0xc4, 0x06, 0x76, 0x9a, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x11, 0x15, 0x07, 0xae, + 0x28, 0x49, 0x2d, 0xca, 0x4b, 0xcc, 0x89, 0xcf, 0xcd, 0x4f, 0x49, 0xcd, 0x29, 0x56, 0xaa, 0xe1, + 0x12, 0x70, 0x85, 0x0a, 0x05, 0x97, 0xe4, 0x17, 0x38, 0x16, 0xa5, 0x26, 0x0a, 0x49, 0x71, 0x71, + 0xe4, 0x27, 0x65, 0xa5, 0x26, 0x97, 0x64, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0xc1, + 0xf9, 0x42, 0x42, 0x5c, 0x2c, 0x79, 0x89, 0xb9, 0xa9, 0x12, 0x4c, 0x60, 0x71, 0x30, 0x5b, 0x48, + 0x86, 0x8b, 0x33, 0x27, 0x3f, 0x2f, 0x3d, 0xb3, 0xa4, 0x34, 0x25, 0x55, 0x82, 0x59, 0x81, 0x51, + 0x83, 0x31, 0x08, 0x21, 0x00, 0x32, 0x2d, 0x27, 0xb1, 0x04, 0x22, 0xc9, 0x02, 0x96, 0x84, 0xf3, + 0x93, 0xd8, 0xc0, 0xae, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x45, 0xa7, 0xeb, 0xa9, 0xa9, 0x00, 0x00, 0x00, }