From 9b30ac3be52d135a4a1998273152dfdb621cb546 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 25 十月 2019 16:09:39 +0800
Subject: [PATCH] update Camera

---
 protomsg.proto |    6 
 protomsg.pb.go |  392 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 199 insertions(+), 199 deletions(-)

diff --git a/protomsg.pb.go b/protomsg.pb.go
index cf6ea92..d26dc84 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -226,9 +226,9 @@
 	SnapshotUrl string  `protobuf:"bytes,4,opt,name=snapshot_url,json=snapshotUrl,proto3" json:"snapshot_url,omitempty"`
 	Type        int32   `protobuf:"varint,5,opt,name=type,proto3" json:"type,omitempty"`
 	Addr        string  `protobuf:"bytes,6,opt,name=addr,proto3" json:"addr,omitempty"`
-	Areaid      int32   `protobuf:"varint,7,opt,name=areaid,proto3" json:"areaid,omitempty"`
-	Longitude   float32 `protobuf:"fixed32,8,opt,name=longitude,proto3" json:"longitude,omitempty"`
-	Latitude    float32 `protobuf:"fixed32,9,opt,name=latitude,proto3" json:"latitude,omitempty"`
+	Longitude   float32 `protobuf:"fixed32,7,opt,name=longitude,proto3" json:"longitude,omitempty"`
+	Latitude    float32 `protobuf:"fixed32,8,opt,name=latitude,proto3" json:"latitude,omitempty"`
+	Floor       int32   `protobuf:"varint,9,opt,name=floor,proto3" json:"floor,omitempty"`
 	Rtsp        string  `protobuf:"bytes,10,opt,name=rtsp,proto3" json:"rtsp,omitempty"`
 	Ip          string  `protobuf:"bytes,11,opt,name=ip,proto3" json:"ip,omitempty"`
 	Port        int32   `protobuf:"varint,12,opt,name=port,proto3" json:"port,omitempty"`
@@ -317,13 +317,6 @@
 	return ""
 }
 
-func (m *Camera) GetAreaid() int32 {
-	if m != nil {
-		return m.Areaid
-	}
-	return 0
-}
-
 func (m *Camera) GetLongitude() float32 {
 	if m != nil {
 		return m.Longitude
@@ -334,6 +327,13 @@
 func (m *Camera) GetLatitude() float32 {
 	if m != nil {
 		return m.Latitude
+	}
+	return 0
+}
+
+func (m *Camera) GetFloor() int32 {
+	if m != nil {
+		return m.Floor
 	}
 	return 0
 }
@@ -2856,162 +2856,162 @@
 func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
 
 var fileDescriptor_32de24555f916688 = []byte{
-	// 2472 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0x4b, 0x8f, 0x24, 0x47,
-	0x11, 0x9e, 0xea, 0x77, 0x45, 0x77, 0xcf, 0xd6, 0xe6, 0x2e, 0x76, 0x79, 0x8d, 0xc7, 0xe3, 0x62,
-	0x2d, 0x2f, 0x2b, 0xdb, 0xa0, 0xb5, 0x0f, 0x88, 0x03, 0xd2, 0x78, 0x1f, 0xa8, 0x25, 0x63, 0x86,
-	0x9a, 0xd9, 0xe5, 0x46, 0x29, 0xbb, 0x2b, 0xa7, 0xa7, 0x34, 0x39, 0x55, 0xa5, 0xcc, 0xaa, 0xb5,
-	0xe7, 0xc0, 0x0f, 0xe0, 0x04, 0x7f, 0x81, 0x7f, 0x82, 0x38, 0x71, 0xe0, 0xe0, 0x23, 0x9c, 0x8c,
-	0x6c, 0x09, 0x21, 0x21, 0x7e, 0x02, 0x08, 0x45, 0x64, 0x66, 0x3d, 0x7a, 0x76, 0xed, 0x3d, 0x75,
-	0xc6, 0x17, 0x51, 0xf9, 0x88, 0x77, 0x34, 0xec, 0x97, 0xaa, 0xa8, 0x8a, 0x4b, 0xbd, 0xfd, 0x90,
-	0x16, 0x6c, 0xe6, 0xe8, 0x3b, 0xb0, 0xe6, 0x5a, 0x18, 0x34, 0x7a, 0x02, 0xa3, 0x23, 0x25, 0x38,
-	0xdb, 0x87, 0x41, 0x96, 0x86, 0xde, 0xa1, 0x77, 0x6f, 0x1c, 0x0f, 0xb2, 0x94, 0xdd, 0x81, 0x59,
-	0xc9, 0x95, 0xc8, 0xab, 0x2c, 0x0d, 0x07, 0x84, 0x36, 0x34, 0x63, 0x30, 0xca, 0xf9, 0xa5, 0x08,
-	0x87, 0x87, 0xde, 0x3d, 0x3f, 0xa6, 0x75, 0xf4, 0xbf, 0x21, 0x4c, 0x1e, 0xf2, 0x4b, 0xa1, 0xba,
-	0x5b, 0xf9, 0xb4, 0x95, 0x13, 0x1f, 0xb4, 0xe2, 0xec, 0x36, 0x8c, 0xb9, 0xcc, 0xb8, 0xb6, 0x7b,
-	0x18, 0x82, 0xbd, 0x03, 0x0b, 0x9d, 0xf3, 0x52, 0x9f, 0x17, 0x55, 0x52, 0x2b, 0x19, 0x8e, 0x88,
-	0x39, 0x77, 0xd8, 0x53, 0x25, 0x71, 0xb3, 0xea, 0xaa, 0x14, 0xe1, 0x98, 0xee, 0x44, 0x6b, 0xc4,
-	0x78, 0x9a, 0xaa, 0x70, 0x62, 0x0e, 0xc0, 0x35, 0x7b, 0x0d, 0x26, 0x5c, 0x09, 0x9e, 0xa5, 0xe1,
-	0x94, 0x24, 0x2d, 0xc5, 0xbe, 0x0f, 0xbe, 0x2c, 0xf2, 0x6d, 0x56, 0xd5, 0xa9, 0x08, 0x67, 0x87,
-	0xde, 0xbd, 0x41, 0xdc, 0x02, 0xf8, 0x6a, 0xc9, 0x2b, 0xc3, 0xf4, 0x89, 0xd9, 0xd0, 0x78, 0x8a,
-	0xaa, 0x74, 0x19, 0x82, 0x39, 0x05, 0xd7, 0xf4, 0xd4, 0x32, 0x9c, 0xdb, 0xa7, 0x96, 0x28, 0x53,
-	0x16, 0xaa, 0x0a, 0x17, 0xe6, 0x76, 0xb8, 0xc6, 0x3d, 0x6b, 0x2d, 0x14, 0xa9, 0x60, 0x49, 0x92,
-	0x0d, 0x6d, 0xb4, 0xac, 0xf5, 0xe7, 0x85, 0x4a, 0xc3, 0x7d, 0xc3, 0x73, 0x34, 0xaa, 0x68, 0xad,
-	0x78, 0x9e, 0x86, 0x37, 0x8c, 0x8a, 0x88, 0xc0, 0x2f, 0x94, 0xd0, 0x42, 0x3d, 0x17, 0x69, 0x18,
-	0x98, 0x2f, 0x1c, 0xcd, 0xde, 0x02, 0xc8, 0x74, 0xa2, 0xea, 0x3c, 0xcf, 0xf2, 0x6d, 0x78, 0xf3,
-	0xd0, 0xbb, 0x37, 0x8b, 0xfd, 0x4c, 0xc7, 0x06, 0x40, 0xb6, 0xaa, 0xf3, 0x44, 0xe4, 0x7c, 0x2d,
-	0x45, 0xc8, 0x0c, 0x5b, 0xd5, 0xf9, 0x63, 0x02, 0xd8, 0x1b, 0x30, 0x43, 0x36, 0x69, 0xf7, 0x16,
-	0xdd, 0x7f, 0xaa, 0xea, 0xfc, 0x14, 0x15, 0x1c, 0xc1, 0x12, 0x59, 0x74, 0x8c, 0x4a, 0xb2, 0x34,
-	0xbc, 0x6d, 0x0c, 0xa3, 0xea, 0xfc, 0x84, 0xb0, 0x55, 0x1a, 0x6d, 0xe0, 0xa6, 0xb1, 0xff, 0x51,
-	0x9e, 0x9e, 0x72, 0x7d, 0xb1, 0xca, 0xcf, 0x0a, 0x76, 0x0f, 0x26, 0x1b, 0x02, 0xc9, 0x1d, 0xe6,
-	0x0f, 0x82, 0x0f, 0x1b, 0xa7, 0x34, 0xc2, 0xb1, 0xe5, 0xb3, 0xbb, 0x30, 0xae, 0xb8, 0xbe, 0xd0,
-	0xe1, 0xe0, 0x70, 0x78, 0x6f, 0xfe, 0x60, 0xbf, 0x15, 0xc4, 0xcd, 0x62, 0xc3, 0x8c, 0xbe, 0xf2,
-	0x60, 0x84, 0x34, 0x9a, 0x17, 0x91, 0xc6, 0xcf, 0x2c, 0x85, 0xea, 0xc1, 0x55, 0xc7, 0xdf, 0x1a,
-	0x9a, 0xbd, 0x09, 0xfe, 0x46, 0x09, 0x5e, 0x89, 0x84, 0x57, 0xd6, 0xef, 0x66, 0x06, 0x38, 0xaa,
-	0x3a, 0xcc, 0xf5, 0x95, 0xf5, 0x3b, 0xcb, 0xfc, 0xe4, 0x0a, 0x99, 0x75, 0x99, 0xda, 0x2f, 0xc7,
-	0xd6, 0x86, 0x04, 0x1c, 0x55, 0x78, 0x15, 0xab, 0xd2, 0x09, 0xa9, 0xd4, 0x52, 0xa8, 0xcf, 0x4c,
-	0x27, 0x5c, 0x72, 0x75, 0x49, 0x3e, 0x38, 0x8b, 0xa7, 0x99, 0x3e, 0x42, 0x12, 0x59, 0xa9, 0x90,
-	0xc9, 0x99, 0xe4, 0x5b, 0xf2, 0xc1, 0x59, 0x3c, 0x4d, 0x85, 0x7c, 0x22, 0xf9, 0x36, 0x3a, 0x85,
-	0x39, 0x3e, 0xf0, 0x24, 0x35, 0x0a, 0x8c, 0x60, 0x84, 0xf7, 0xb7, 0xea, 0xdb, 0xd5, 0x0a, 0xf1,
-	0xd8, 0x3b, 0x30, 0xd2, 0x69, 0xa3, 0xb9, 0x65, 0x2b, 0x73, 0x92, 0x5e, 0xc4, 0xc4, 0x8a, 0x7e,
-	0x0a, 0x13, 0x24, 0xea, 0x9c, 0x7d, 0x0f, 0x26, 0x59, 0xb9, 0x49, 0x1a, 0xc5, 0x8d, 0xb3, 0x72,
-	0xb3, 0x4a, 0xf1, 0x46, 0x3a, 0xbd, 0x30, 0xc6, 0x37, 0x7a, 0x9b, 0xea, 0xf4, 0x02, 0x8d, 0x1f,
-	0x3d, 0x03, 0xb0, 0x37, 0xc2, 0xef, 0x5f, 0xe5, 0x42, 0x77, 0x7b, 0x17, 0x0a, 0xfa, 0x17, 0xaa,
-	0x73, 0x7b, 0xa7, 0x7f, 0x0e, 0x00, 0x8c, 0x13, 0x90, 0x45, 0x77, 0xb3, 0x06, 0x1a, 0x84, 0xb8,
-	0x89, 0xcd, 0x40, 0x68, 0x10, 0x02, 0x56, 0x29, 0x7b, 0x1d, 0xa6, 0x78, 0x12, 0xb2, 0x86, 0xad,
-	0xfd, 0x57, 0x29, 0xfb, 0x00, 0xfc, 0x2a, 0xbb, 0x14, 0x89, 0xaa, 0xa5, 0x08, 0x47, 0xbb, 0xe7,
-	0x3f, 0xe2, 0x57, 0x0f, 0x2b, 0x19, 0xcf, 0x50, 0x24, 0xae, 0xa5, 0xa0, 0x90, 0x10, 0x7c, 0x53,
-	0x19, 0x79, 0x63, 0x59, 0x9f, 0x10, 0x62, 0xbf, 0x03, 0x0b, 0xc3, 0x4e, 0xc5, 0xf3, 0x6c, 0x23,
-	0x6c, 0x82, 0x99, 0x13, 0xf6, 0x88, 0xa0, 0x9e, 0x29, 0xa7, 0x3d, 0x53, 0xb2, 0xb7, 0x61, 0x6e,
-	0xbd, 0xa6, 0x63, 0x68, 0x30, 0x10, 0x09, 0xb4, 0x9e, 0xe3, 0xf7, 0x3c, 0x87, 0xc1, 0x48, 0x63,
-	0x16, 0x01, 0x93, 0x45, 0x70, 0x8d, 0x2f, 0xce, 0x74, 0x72, 0x56, 0x4b, 0x49, 0xe9, 0x66, 0x16,
-	0x4f, 0x32, 0xfd, 0xa4, 0x96, 0x92, 0x1d, 0xc2, 0x42, 0x66, 0xf9, 0x45, 0xe2, 0xf4, 0xb1, 0xa0,
-	0x3b, 0x02, 0x62, 0x14, 0x86, 0x69, 0xf4, 0x2b, 0xd8, 0xb7, 0x7a, 0xce, 0x2e, 0x05, 0x3e, 0xf4,
-	0x95, 0x32, 0xf4, 0x9b, 0x5d, 0x4d, 0xda, 0x68, 0x71, 0x7a, 0x8b, 0x3e, 0x83, 0x89, 0xd1, 0x25,
-	0x0b, 0x60, 0x98, 0xf2, 0x2b, 0x5b, 0x38, 0x70, 0xc9, 0x1e, 0x00, 0x98, 0x0f, 0x79, 0xbe, 0x15,
-	0xd6, 0x07, 0x6e, 0x75, 0xfc, 0x04, 0xf7, 0x40, 0x56, 0x4c, 0xfb, 0xd3, 0x32, 0xfa, 0x08, 0xfc,
-	0x06, 0xc7, 0xc4, 0xa7, 0x2b, 0xae, 0x2a, 0xe7, 0xa1, 0x44, 0xe0, 0x41, 0x22, 0x77, 0x9e, 0x80,
-	0xcb, 0xe8, 0x19, 0x4c, 0x8f, 0x0b, 0x79, 0xb5, 0x2d, 0xf2, 0x57, 0x7a, 0xd0, 0x7b, 0x30, 0x29,
-	0x8b, 0x2c, 0xaf, 0xb0, 0xe6, 0xe0, 0x9d, 0x6e, 0xb4, 0x77, 0x3a, 0x46, 0x3c, 0xb6, 0xec, 0x68,
-	0xd3, 0xe8, 0x8b, 0xeb, 0x8b, 0x23, 0xb5, 0xd5, 0x7d, 0x5f, 0xf4, 0x76, 0x7c, 0xf1, 0x63, 0xf0,
-	0x49, 0xf7, 0x5c, 0x6d, 0x9d, 0xcb, 0xbf, 0xde, 0x0f, 0x8b, 0x9f, 0xab, 0xa2, 0x2e, 0x71, 0x23,
-	0x93, 0x8c, 0x70, 0x15, 0x3d, 0x87, 0x65, 0x8f, 0xd5, 0x75, 0x69, 0xaf, 0xe7, 0xd2, 0x1f, 0xc3,
-	0x7c, 0x8b, 0x52, 0x64, 0x09, 0x7d, 0x5d, 0xa1, 0xb4, 0x05, 0x5a, 0x25, 0x86, 0xad, 0x5b, 0xea,
-	0x8e, 0x6f, 0x0d, 0xbb, 0xbe, 0x15, 0xfd, 0xd5, 0x03, 0xbf, 0xf9, 0x02, 0xbd, 0xd7, 0xec, 0xdd,
-	0x9c, 0x3a, 0x25, 0x7a, 0x45, 0xc5, 0xc4, 0xb0, 0x2a, 0xf1, 0x45, 0x65, 0x15, 0xe9, 0x13, 0x72,
-	0x2a, 0xbe, 0xa8, 0xd0, 0xb9, 0x29, 0xb5, 0x25, 0x52, 0x3c, 0x17, 0x92, 0x0e, 0x19, 0xc7, 0x40,
-	0xd0, 0xa7, 0x88, 0x60, 0x42, 0x37, 0x17, 0x1e, 0xed, 0x26, 0x74, 0xba, 0xab, 0x61, 0x52, 0xde,
-	0x11, 0x55, 0xd2, 0x94, 0x74, 0xcc, 0x3b, 0xa2, 0xa2, 0xa2, 0xf3, 0x03, 0x58, 0xa6, 0xe2, 0x4c,
-	0xe4, 0x1b, 0x91, 0xe8, 0x8a, 0x57, 0x2e, 0xbd, 0x2e, 0x2c, 0x78, 0x82, 0x58, 0xf4, 0xef, 0x01,
-	0x8c, 0xe2, 0x17, 0xb9, 0xf4, 0x5d, 0xd8, 0xb7, 0x26, 0x73, 0x5a, 0x35, 0x4f, 0x58, 0x6c, 0x1a,
-	0xd3, 0xae, 0x76, 0x92, 0xcc, 0x70, 0xc7, 0xb0, 0x6f, 0x01, 0x94, 0xc6, 0xbf, 0x90, 0x6b, 0x6a,
-	0x82, 0x6f, 0x91, 0x55, 0x8a, 0x99, 0x14, 0x53, 0x66, 0x96, 0xda, 0x8b, 0x8f, 0x75, 0x8a, 0x5b,
-	0x46, 0xb0, 0x44, 0x98, 0xab, 0x6d, 0x62, 0x3a, 0x1c, 0x9b, 0x34, 0x74, 0x8a, 0x86, 0x3f, 0xa2,
-	0x3e, 0xe7, 0x0e, 0xcc, 0x8a, 0x52, 0x28, 0x5e, 0x15, 0x8a, 0x92, 0x86, 0x1f, 0x37, 0x34, 0x3e,
-	0xdb, 0xad, 0x8d, 0x5a, 0x66, 0xe6, 0xde, 0x0e, 0x74, 0x05, 0xd9, 0x1d, 0xf2, 0x9c, 0xcb, 0xda,
-	0x24, 0x90, 0xe6, 0x90, 0x67, 0x08, 0xbd, 0x30, 0x8b, 0x50, 0x21, 0x97, 0x22, 0xf9, 0x3c, 0xab,
-	0xce, 0x93, 0x52, 0x09, 0xdb, 0xba, 0xcc, 0x11, 0xfc, 0x75, 0x56, 0x9d, 0x1f, 0xab, 0xbe, 0x4f,
-	0x2c, 0x7a, 0x3e, 0x11, 0xfd, 0x69, 0x00, 0xc3, 0x93, 0xf4, 0x7a, 0xae, 0x6e, 0x8b, 0xca, 0xe0,
-	0x65, 0x45, 0x65, 0xd8, 0x2b, 0x2a, 0x8e, 0x45, 0x41, 0x3a, 0x6a, 0x58, 0x9f, 0x61, 0x9c, 0xde,
-	0x85, 0x11, 0x85, 0xd2, 0xf8, 0x05, 0xd5, 0xe3, 0x48, 0x6d, 0x63, 0xe2, 0xe2, 0xeb, 0xb2, 0x4d,
-	0x91, 0xbb, 0x9e, 0x0f, 0xd7, 0x98, 0x22, 0xb0, 0x6b, 0x34, 0x1a, 0xc5, 0x25, 0x7a, 0xa9, 0xad,
-	0xea, 0x98, 0x6b, 0xac, 0x2a, 0xc1, 0x40, 0x98, 0x70, 0x3a, 0x39, 0x9a, 0x04, 0x8c, 0x1a, 0x6d,
-	0x8e, 0x26, 0x81, 0x5e, 0x5f, 0x00, 0x3b, 0x7d, 0x41, 0x1b, 0x64, 0xf3, 0xdd, 0xd2, 0xdf, 0x14,
-	0x05, 0xd3, 0x0a, 0x36, 0xf5, 0xbd, 0x68, 0xea, 0x3b, 0xb9, 0xad, 0xed, 0x63, 0x56, 0xbb, 0x41,
-	0xdf, 0xee, 0x3c, 0xe8, 0xed, 0xfc, 0x63, 0xd2, 0x1b, 0x85, 0xb8, 0x4d, 0x63, 0xb7, 0x77, 0xca,
-	0xab, 0x14, 0x27, 0xa2, 0x8a, 0x1b, 0xa9, 0xa8, 0x06, 0x68, 0x71, 0xca, 0xad, 0x69, 0x7b, 0x9c,
-	0xf5, 0xd9, 0xdb, 0x60, 0x2c, 0xd6, 0x37, 0xdf, 0x7b, 0x2e, 0x82, 0xcd, 0x41, 0x37, 0xaf, 0x1d,
-	0xe4, 0x82, 0xd8, 0x79, 0xda, 0xa8, 0xf5, 0xb4, 0xe8, 0xb7, 0x30, 0x75, 0x6f, 0xdc, 0xf5, 0x96,
-	0x6b, 0x11, 0x32, 0xf8, 0xf6, 0x08, 0x19, 0xee, 0x44, 0xc8, 0x35, 0xe7, 0x1f, 0x5d, 0x73, 0xfe,
-	0xe8, 0x5f, 0x1e, 0x75, 0x3c, 0x47, 0x6a, 0xdb, 0x8e, 0x1a, 0x5e, 0x77, 0xd4, 0x78, 0x51, 0x85,
-	0x70, 0xb3, 0x85, 0x9d, 0x6b, 0xdc, 0x6c, 0x71, 0x59, 0x6b, 0xf3, 0xb6, 0x59, 0x4c, 0x6b, 0xc4,
-	0xea, 0x3c, 0x73, 0x9d, 0x20, 0xad, 0xf1, 0x14, 0x53, 0xf0, 0x8c, 0x43, 0x1a, 0xc2, 0xe6, 0x30,
-	0x5e, 0xcb, 0xca, 0x5e, 0xd5, 0xf8, 0xe6, 0xc2, 0x82, 0x26, 0x50, 0x7f, 0x08, 0x81, 0x13, 0x6a,
-	0xde, 0x6c, 0x3c, 0xf5, 0x86, 0xc5, 0x7f, 0xe9, 0x9e, 0xee, 0x34, 0xed, 0x77, 0x34, 0xfd, 0x7b,
-	0x0f, 0x6e, 0x3c, 0x5a, 0x3f, 0x3c, 0xc7, 0x03, 0x7f, 0x21, 0xb4, 0xe6, 0x5b, 0xc1, 0xde, 0xc7,
-	0x6e, 0x1a, 0xbd, 0x07, 0xdf, 0xbc, 0xff, 0xe0, 0xb5, 0x6e, 0x3d, 0x5a, 0x4b, 0x61, 0x84, 0xd3,
-	0xd8, 0x08, 0x59, 0x03, 0x0d, 0x1a, 0x03, 0xdd, 0x87, 0x09, 0xdf, 0x54, 0x59, 0x91, 0x93, 0x26,
-	0xf6, 0x1f, 0xb0, 0x4e, 0x07, 0xb5, 0x3e, 0x22, 0x4e, 0x6c, 0x25, 0x28, 0x0e, 0xf3, 0xb3, 0xc2,
-	0xda, 0x80, 0xd6, 0xd1, 0x7f, 0x3c, 0x58, 0x9a, 0x0a, 0xfa, 0xb2, 0xfa, 0xfc, 0xad, 0xcd, 0xdd,
-	0x0b, 0xc6, 0x4b, 0x16, 0xc2, 0xd4, 0x66, 0x5e, 0x97, 0x2e, 0x2c, 0x89, 0x3d, 0x5a, 0xa5, 0xb2,
-	0xed, 0x56, 0xa8, 0x44, 0x66, 0xb9, 0xab, 0x22, 0x73, 0x8b, 0x7d, 0x9a, 0xe5, 0x82, 0xbd, 0x0b,
-	0xfb, 0x69, 0xa6, 0x04, 0x5d, 0xd8, 0x08, 0x19, 0x23, 0x2d, 0x1b, 0x94, 0xc4, 0x9c, 0xf9, 0xa7,
-	0x1d, 0xf3, 0x5f, 0x2b, 0x42, 0x33, 0xd2, 0x7c, 0xbf, 0x08, 0xfd, 0xd1, 0x83, 0xe5, 0xb3, 0x2c,
-	0x15, 0x45, 0xc5, 0x4b, 0x41, 0x6d, 0xfb, 0x1d, 0x98, 0x09, 0xfd, 0x88, 0x57, 0xbc, 0x89, 0xb4,
-	0x86, 0x46, 0x9e, 0x7b, 0xea, 0xb5, 0xa7, 0xb7, 0xe9, 0xa0, 0xdf, 0xd6, 0x62, 0x80, 0x5e, 0x6e,
-	0x57, 0xa6, 0x0a, 0x0d, 0x63, 0x43, 0xa0, 0x34, 0xc5, 0xaf, 0xc9, 0x95, 0x7e, 0x6c, 0xa9, 0xe6,
-	0x21, 0x93, 0x76, 0x46, 0x8e, 0xfe, 0x3b, 0x80, 0xf9, 0xc3, 0xe2, 0x12, 0x67, 0x78, 0x6a, 0x37,
-	0x68, 0x50, 0x5a, 0x4b, 0x81, 0x5f, 0x7b, 0xf4, 0x75, 0x43, 0xb3, 0xfb, 0x10, 0x6c, 0x8c, 0xe8,
-	0xe9, 0xb9, 0x12, 0xfa, 0xbc, 0x90, 0xe6, 0xa6, 0x83, 0xf8, 0x1a, 0xce, 0x0e, 0x61, 0x7e, 0xc6,
-	0x37, 0xe2, 0x89, 0xe0, 0x55, 0xad, 0x8c, 0xcd, 0x16, 0x71, 0x17, 0xc2, 0xbb, 0x9b, 0xc9, 0x6e,
-	0x44, 0xc7, 0x18, 0x02, 0xe7, 0xf0, 0x4a, 0x09, 0xf1, 0x59, 0x91, 0x0a, 0x77, 0xfd, 0x16, 0xa0,
-	0x17, 0xf0, 0x35, 0xd6, 0xce, 0x21, 0x99, 0x82, 0xaf, 0x35, 0x3b, 0x80, 0x4e, 0x7b, 0x11, 0x4e,
-	0x0f, 0x87, 0x3b, 0x0d, 0xc7, 0x01, 0x80, 0x16, 0x5c, 0x6d, 0xce, 0x4f, 0x4d, 0xaa, 0xc7, 0x2f,
-	0x3b, 0x08, 0xf2, 0xb3, 0xbc, 0xac, 0x4d, 0xd0, 0xb9, 0x4c, 0xdf, 0x22, 0xc8, 0xdf, 0x14, 0x52,
-	0x1a, 0x87, 0xb0, 0xa9, 0xbe, 0x83, 0x90, 0xb6, 0x8b, 0x5a, 0x6d, 0x9a, 0x64, 0x6f, 0x28, 0x76,
-	0x17, 0x96, 0x3c, 0xe7, 0xf2, 0xca, 0x4d, 0xc2, 0xb6, 0x68, 0xf6, 0xc1, 0x68, 0x0d, 0x0b, 0xab,
-	0xfe, 0xc7, 0xcf, 0x45, 0x5e, 0xb1, 0x9f, 0x80, 0x2f, 0x70, 0x81, 0xd5, 0xd0, 0x46, 0xe9, 0x9d,
-	0xce, 0x70, 0xdc, 0x11, 0x45, 0x89, 0xb8, 0x15, 0xa6, 0x50, 0xe0, 0x57, 0xb2, 0xe0, 0xc6, 0x28,
-	0x8b, 0xd8, 0x91, 0xd1, 0x6f, 0x60, 0xff, 0x24, 0xbd, 0x70, 0xdf, 0xf2, 0xcd, 0xf9, 0xb5, 0xb8,
-	0x0b, 0xb1, 0xc9, 0x5c, 0x4b, 0xd1, 0x44, 0x9d, 0x23, 0x59, 0x04, 0x0b, 0x6b, 0xdb, 0x93, 0x4d,
-	0x61, 0x0d, 0x39, 0x88, 0x7b, 0x58, 0x14, 0x43, 0xd0, 0xee, 0x1f, 0x0b, 0x5d, 0xcb, 0x8a, 0xfd,
-	0x0c, 0x96, 0x9b, 0x2e, 0x40, 0xce, 0x34, 0x7f, 0x10, 0xf6, 0x8a, 0x45, 0xe7, 0x4a, 0x71, 0x5f,
-	0x3c, 0xfa, 0xdd, 0x10, 0x7c, 0x7a, 0xe6, 0x71, 0xad, 0xcf, 0x5f, 0xa9, 0x8f, 0x7f, 0xcb, 0xce,
-	0x17, 0x66, 0x46, 0x30, 0x71, 0x42, 0xa3, 0xc4, 0x09, 0xcd, 0x09, 0x6f, 0x00, 0x8d, 0x29, 0x09,
-	0x0e, 0x0b, 0x36, 0x55, 0x20, 0xfd, 0x38, 0xa7, 0x9e, 0x30, 0xd3, 0x89, 0xe6, 0x55, 0xa6, 0xcf,
-	0xae, 0x12, 0x2e, 0x25, 0x25, 0x8b, 0x59, 0xbc, 0xc8, 0xf4, 0x89, 0x01, 0x8f, 0xa4, 0xc4, 0xdc,
-	0x44, 0x3d, 0x12, 0xf5, 0xbd, 0x13, 0xfb, 0x17, 0x4b, 0x2d, 0x05, 0xb5, 0xbd, 0x6d, 0x5d, 0x9e,
-	0xf6, 0xea, 0xf2, 0x9b, 0xe0, 0x9b, 0x29, 0xac, 0xed, 0xd8, 0x66, 0x34, 0x82, 0xa1, 0xc5, 0xde,
-	0x86, 0x39, 0x31, 0xed, 0x14, 0xe9, 0xb7, 0x13, 0x9a, 0x1d, 0x22, 0x7f, 0x04, 0xb3, 0xac, 0x4c,
-	0xca, 0x42, 0x55, 0x3a, 0x84, 0xdd, 0xaa, 0x8e, 0x8a, 0x59, 0x95, 0xc7, 0x85, 0xaa, 0xe2, 0x69,
-	0x46, 0xbf, 0x9a, 0xbd, 0x0b, 0xa3, 0x5a, 0x49, 0x1d, 0xce, 0x77, 0x2b, 0x33, 0x0a, 0x3f, 0x55,
-	0x32, 0x26, 0x36, 0xfb, 0xc0, 0x55, 0xf0, 0xc5, 0xee, 0x58, 0xd2, 0xa8, 0xbc, 0x53, 0xc7, 0xa3,
-	0xaf, 0x3c, 0x58, 0xf6, 0x18, 0xd7, 0xec, 0x81, 0xba, 0x2f, 0xca, 0x6c, 0xd3, 0xfd, 0xa3, 0xc0,
-	0x27, 0x84, 0x1e, 0x8a, 0x33, 0x23, 0xb1, 0xb9, 0xda, 0x36, 0x33, 0x23, 0x02, 0x58, 0x87, 0xbb,
-	0x25, 0x7d, 0xf4, 0x5d, 0x4d, 0xef, 0xf8, 0x05, 0x4d, 0x2f, 0xfd, 0x7f, 0x25, 0x85, 0xad, 0xa4,
-	0x13, 0x3b, 0xac, 0xd7, 0x52, 0x98, 0xf8, 0x8d, 0x60, 0x49, 0x41, 0x92, 0x94, 0xb5, 0x3e, 0x4f,
-	0xec, 0x1f, 0x7f, 0x7e, 0x3c, 0x17, 0xee, 0x45, 0xab, 0x34, 0x7a, 0x0a, 0xd0, 0xaa, 0x13, 0xaf,
-	0xeb, 0xfe, 0xd2, 0x2a, 0x5d, 0x9a, 0x36, 0xc0, 0xaa, 0xfd, 0x2b, 0x6f, 0xd0, 0xf9, 0x2b, 0xef,
-	0x65, 0x43, 0xd5, 0x47, 0x30, 0xb5, 0x8a, 0x77, 0x3d, 0xa8, 0xd7, 0xf6, 0xa0, 0x2f, 0x69, 0xe5,
-	0xa2, 0xbf, 0x7b, 0x70, 0xeb, 0xb1, 0x3e, 0x16, 0x4a, 0x17, 0xf9, 0x43, 0xbe, 0x39, 0xb7, 0x55,
-	0x99, 0xbd, 0x6f, 0xb3, 0xb7, 0x49, 0x0a, 0x9d, 0x40, 0x7a, 0xac, 0x3b, 0x62, 0xa9, 0x2d, 0x50,
-	0x6f, 0xd8, 0x3c, 0x6e, 0x0a, 0xe9, 0xb0, 0x09, 0x69, 0x33, 0xdc, 0x94, 0xb4, 0x7b, 0x67, 0xb8,
-	0x31, 0xc0, 0x8a, 0x32, 0xc1, 0x99, 0xcd, 0xd9, 0x36, 0x4a, 0x2c, 0xd9, 0xa9, 0xfe, 0xe3, 0xef,
-	0xac, 0xfe, 0xfd, 0xff, 0xbe, 0xc6, 0xee, 0x6d, 0xf7, 0xff, 0xec, 0xc1, 0xa2, 0xdb, 0x69, 0xb0,
-	0x05, 0xcc, 0x4e, 0x13, 0xd3, 0x13, 0x04, 0x7b, 0x2c, 0x80, 0x85, 0xa3, 0xb0, 0x19, 0x0e, 0x3c,
-	0x76, 0x1b, 0x82, 0x2e, 0x82, 0x25, 0x2a, 0x18, 0x30, 0x80, 0xc9, 0x69, 0x42, 0x12, 0x43, 0xb6,
-	0x04, 0xdf, 0xac, 0x4f, 0xd2, 0x8b, 0x60, 0xc4, 0x6e, 0xc2, 0xb2, 0x21, 0xd1, 0x55, 0x83, 0x31,
-	0xf3, 0x61, 0x7c, 0x9a, 0x20, 0x77, 0xc2, 0x6e, 0xc1, 0x0d, 0xb7, 0x9d, 0x6d, 0x41, 0x82, 0x29,
-	0xdb, 0x07, 0x38, 0x4d, 0x4e, 0xed, 0x5f, 0x18, 0xc1, 0xcc, 0xdc, 0xc9, 0x24, 0xe8, 0xc0, 0x37,
-	0x77, 0x3a, 0x2e, 0xa4, 0x7c, 0x58, 0xe4, 0x67, 0xd9, 0x36, 0x80, 0xfb, 0x1f, 0xc2, 0xcc, 0x3d,
-	0x18, 0x6f, 0xb2, 0xca, 0xb5, 0x50, 0x55, 0xb0, 0x87, 0xeb, 0xa7, 0x34, 0x20, 0x04, 0x1e, 0xae,
-	0x1f, 0x09, 0x29, 0x2a, 0x11, 0x0c, 0xee, 0x1f, 0x41, 0xb0, 0x9b, 0xb7, 0xd9, 0x0d, 0x98, 0xc7,
-	0x62, 0x95, 0x67, 0x15, 0x99, 0x2e, 0xd8, 0x43, 0xc0, 0x7c, 0x6c, 0x00, 0x8f, 0xcd, 0x61, 0x6a,
-	0xbf, 0x0a, 0x06, 0xf7, 0x3f, 0x86, 0xfd, 0xbe, 0x95, 0xcd, 0xb3, 0x1f, 0xad, 0x49, 0x99, 0xc1,
-	0x9e, 0x79, 0x98, 0x25, 0x8d, 0xeb, 0x04, 0xde, 0x27, 0xe1, 0x5f, 0xbe, 0x3e, 0xf0, 0xbe, 0xfc,
-	0xfa, 0xc0, 0xfb, 0xc7, 0xd7, 0x07, 0xde, 0x1f, 0xbe, 0x39, 0xd8, 0xfb, 0xf2, 0x9b, 0x83, 0xbd,
-	0xbf, 0x7d, 0x73, 0xb0, 0xb7, 0x9e, 0x90, 0xe9, 0x3e, 0xfa, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x2b, 0x7f, 0x1d, 0xa7, 0x0c, 0x18, 0x00, 0x00,
+	// 2469 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x18, 0x4b, 0x8f, 0x1c, 0x47,
+	0x79, 0x7b, 0xde, 0xfd, 0xcd, 0xcc, 0xba, 0x5d, 0x36, 0x49, 0xc7, 0x21, 0x9b, 0x4d, 0xe3, 0x28,
+	0xc6, 0x4a, 0x02, 0x72, 0x72, 0x40, 0x1c, 0x90, 0x36, 0x7e, 0xa0, 0x91, 0x42, 0x58, 0x7a, 0xd7,
+	0xe6, 0x46, 0xab, 0x66, 0xba, 0x76, 0xb6, 0xb5, 0xb5, 0xdd, 0xad, 0xaa, 0x6e, 0x27, 0x7b, 0xe0,
+	0x07, 0x70, 0x82, 0xbf, 0xc0, 0x3f, 0x41, 0x9c, 0x38, 0x70, 0xc8, 0x11, 0x4e, 0x41, 0x89, 0x84,
+	0x90, 0x10, 0xff, 0x00, 0x24, 0xf4, 0x7d, 0x55, 0xd5, 0x8f, 0x59, 0x3b, 0xf1, 0x69, 0xea, 0x7b,
+	0x74, 0xd5, 0xf7, 0x7e, 0x0c, 0xec, 0x97, 0xaa, 0xa8, 0x8a, 0x4b, 0xbd, 0xfd, 0x90, 0x0e, 0x6c,
+	0xe6, 0xe0, 0x3b, 0xb0, 0xe6, 0x5a, 0x18, 0x6c, 0xf4, 0x04, 0x46, 0x47, 0x4a, 0x70, 0xb6, 0x0f,
+	0x83, 0x2c, 0x0d, 0xbd, 0x43, 0xef, 0xde, 0x38, 0x1e, 0x64, 0x29, 0xbb, 0x03, 0xb3, 0x92, 0x2b,
+	0x91, 0x57, 0x59, 0x1a, 0x0e, 0x08, 0xdb, 0xc0, 0x8c, 0xc1, 0x28, 0xe7, 0x97, 0x22, 0x1c, 0x1e,
+	0x7a, 0xf7, 0xfc, 0x98, 0xce, 0xd1, 0x7f, 0x87, 0x30, 0x79, 0xc8, 0x2f, 0x85, 0xea, 0x5e, 0xe5,
+	0xd3, 0x55, 0x8e, 0x7d, 0xd0, 0xb2, 0xb3, 0xdb, 0x30, 0xe6, 0x32, 0xe3, 0xda, 0xde, 0x61, 0x00,
+	0xf6, 0x0e, 0x2c, 0x74, 0xce, 0x4b, 0x7d, 0x5e, 0x54, 0x49, 0xad, 0x64, 0x38, 0x22, 0xe2, 0xdc,
+	0xe1, 0x9e, 0x2a, 0x89, 0x97, 0x55, 0x57, 0xa5, 0x08, 0xc7, 0x24, 0x13, 0x9d, 0x11, 0xc7, 0xd3,
+	0x54, 0x85, 0x13, 0xf3, 0x00, 0x9e, 0xd9, 0xf7, 0xc1, 0x97, 0x45, 0xbe, 0xcd, 0xaa, 0x3a, 0x15,
+	0xe1, 0xf4, 0xd0, 0xbb, 0x37, 0x88, 0x5b, 0x04, 0x6a, 0x27, 0x79, 0x65, 0x88, 0x33, 0x22, 0x36,
+	0x30, 0x8a, 0x76, 0x26, 0x8b, 0x42, 0x85, 0x3e, 0x3d, 0x61, 0x00, 0x7c, 0x43, 0x55, 0xba, 0x0c,
+	0xc1, 0xbc, 0x81, 0x67, 0x52, 0xb4, 0x0c, 0xe7, 0x56, 0xd1, 0x12, 0x79, 0xca, 0x42, 0x55, 0xe1,
+	0xc2, 0xc8, 0x86, 0x67, 0x7c, 0xa9, 0xd6, 0x42, 0x91, 0x01, 0x96, 0xc4, 0xd9, 0xc0, 0xc6, 0xc6,
+	0x5a, 0x7f, 0x5e, 0xa8, 0x34, 0xdc, 0x37, 0x34, 0x07, 0xa3, 0x14, 0x6b, 0xc5, 0xf3, 0x34, 0xbc,
+	0x61, 0x0c, 0x44, 0x00, 0x7e, 0xa1, 0x84, 0x16, 0xea, 0xb9, 0x48, 0xc3, 0xc0, 0x7c, 0xe1, 0x60,
+	0xf6, 0x16, 0x40, 0xa6, 0x13, 0x55, 0xe7, 0x79, 0x96, 0x6f, 0xc3, 0x9b, 0x87, 0xde, 0xbd, 0x59,
+	0xec, 0x67, 0x3a, 0x36, 0x08, 0x24, 0xab, 0x3a, 0x4f, 0x44, 0xce, 0xd7, 0x52, 0x84, 0xcc, 0x90,
+	0x55, 0x9d, 0x3f, 0x26, 0x04, 0x7b, 0x03, 0x66, 0x48, 0x26, 0xdb, 0xde, 0x22, 0xf9, 0xa7, 0xaa,
+	0xce, 0x4f, 0xd1, 0xbc, 0x11, 0x2c, 0x91, 0x44, 0xcf, 0xa8, 0x24, 0x4b, 0xc3, 0xdb, 0xc6, 0x2d,
+	0xaa, 0xce, 0x4f, 0x08, 0xb7, 0x4a, 0xa3, 0x0d, 0xdc, 0x34, 0xde, 0x3f, 0xca, 0xd3, 0x53, 0xae,
+	0x2f, 0x56, 0xf9, 0x59, 0xc1, 0xee, 0xc1, 0x64, 0x43, 0x48, 0x0a, 0x86, 0xf9, 0x83, 0xe0, 0xc3,
+	0x26, 0x24, 0x0d, 0x73, 0x6c, 0xe9, 0xec, 0x2e, 0x8c, 0x2b, 0xae, 0x2f, 0x74, 0x38, 0x38, 0x1c,
+	0xde, 0x9b, 0x3f, 0xd8, 0x6f, 0x19, 0xf1, 0xb2, 0xd8, 0x10, 0xa3, 0xaf, 0x3c, 0x18, 0x21, 0xcc,
+	0x5e, 0x83, 0x09, 0x62, 0x9a, 0x28, 0xb3, 0x10, 0x9a, 0x07, 0x4f, 0x9d, 0x68, 0x6b, 0x60, 0xf6,
+	0x26, 0xf8, 0x1b, 0x25, 0x78, 0x25, 0x12, 0x5e, 0xd9, 0xa8, 0x9b, 0x19, 0xc4, 0x51, 0xd5, 0x21,
+	0xae, 0xaf, 0x6c, 0xd4, 0x59, 0xe2, 0x27, 0x57, 0x48, 0xac, 0xcb, 0xd4, 0x7e, 0x39, 0xb6, 0x3e,
+	0x24, 0xc4, 0x51, 0x85, 0xa2, 0x58, 0x93, 0x4e, 0xc8, 0xa4, 0x16, 0x42, 0x7b, 0x66, 0x3a, 0xe1,
+	0x92, 0xab, 0x4b, 0x0a, 0xbf, 0x59, 0x3c, 0xcd, 0xf4, 0x11, 0x82, 0x48, 0x4a, 0x85, 0x4c, 0xce,
+	0x24, 0xdf, 0x52, 0xf0, 0xcd, 0xe2, 0x69, 0x2a, 0xe4, 0x13, 0xc9, 0xb7, 0xd1, 0x29, 0xcc, 0x51,
+	0xc1, 0x93, 0xd4, 0x18, 0x30, 0x82, 0x11, 0xca, 0x6f, 0xcd, 0xb7, 0x6b, 0x15, 0xa2, 0xb1, 0x77,
+	0x60, 0xa4, 0xd3, 0xc6, 0x72, 0xcb, 0x96, 0xe7, 0x24, 0xbd, 0x88, 0x89, 0x14, 0xfd, 0x14, 0x26,
+	0x08, 0xd4, 0x39, 0xfb, 0x1e, 0x4c, 0xb2, 0x72, 0x93, 0x34, 0x86, 0x1b, 0x67, 0xe5, 0x66, 0x95,
+	0xa2, 0x44, 0x3a, 0xbd, 0x30, 0xce, 0x37, 0x76, 0x9b, 0xea, 0xf4, 0x02, 0x9d, 0x1f, 0x3d, 0x03,
+	0xb0, 0x12, 0xe1, 0xf7, 0xaf, 0x22, 0xd0, 0xdd, 0x9e, 0x40, 0x41, 0x5f, 0xa0, 0x3a, 0xb7, 0x32,
+	0xfd, 0x73, 0x00, 0x60, 0x82, 0x80, 0x3c, 0xba, 0x5b, 0x33, 0xd0, 0x21, 0x44, 0x4d, 0x6c, 0xfd,
+	0x41, 0x87, 0x10, 0x62, 0x95, 0xb2, 0xd7, 0x61, 0x8a, 0x2f, 0x21, 0x69, 0xd8, 0xfa, 0x7f, 0x95,
+	0xb2, 0x0f, 0xc0, 0xaf, 0xb2, 0x4b, 0x91, 0xa8, 0x5a, 0x8a, 0x70, 0xb4, 0xfb, 0xfe, 0x23, 0x7e,
+	0xf5, 0xb0, 0x92, 0xf1, 0x0c, 0x59, 0xe2, 0x5a, 0x0a, 0x4a, 0x09, 0xc1, 0x37, 0x95, 0xe1, 0x37,
+	0x9e, 0xf5, 0x09, 0x43, 0xe4, 0x77, 0x60, 0x61, 0xc8, 0xa9, 0x78, 0x9e, 0x6d, 0x84, 0x2d, 0x2f,
+	0x73, 0xc2, 0x3d, 0x22, 0x54, 0xcf, 0x95, 0xd3, 0x9e, 0x2b, 0xd9, 0xdb, 0x30, 0xb7, 0x51, 0xd3,
+	0x71, 0x34, 0x18, 0x14, 0x31, 0xb4, 0x91, 0xe3, 0xf7, 0x22, 0x87, 0xc1, 0x48, 0x63, 0x15, 0x01,
+	0x53, 0x45, 0xf0, 0x8c, 0x1a, 0x67, 0x3a, 0x39, 0xab, 0xa5, 0xa4, 0x72, 0x33, 0x8b, 0x27, 0x99,
+	0x7e, 0x52, 0x4b, 0xc9, 0x0e, 0x61, 0x21, 0xb3, 0xfc, 0x22, 0x71, 0xf6, 0x58, 0x90, 0x8c, 0x80,
+	0x38, 0x4a, 0xc3, 0x34, 0xfa, 0x15, 0xec, 0x5b, 0x3b, 0x67, 0x97, 0x02, 0x15, 0x7d, 0xa5, 0xfa,
+	0xfc, 0x66, 0xd7, 0x92, 0x36, 0x5b, 0x9c, 0xdd, 0xa2, 0xcf, 0x60, 0x62, 0x6c, 0xc9, 0x02, 0x18,
+	0xa6, 0xfc, 0xca, 0xb6, 0x0d, 0x3c, 0xb2, 0x07, 0x00, 0xe6, 0x43, 0x9e, 0x6f, 0x85, 0x8d, 0x81,
+	0x5b, 0x9d, 0x38, 0xc1, 0x3b, 0x90, 0x14, 0xd3, 0xfd, 0x74, 0x8c, 0x3e, 0x02, 0xbf, 0xc1, 0x63,
+	0xe1, 0xd3, 0x15, 0x57, 0x95, 0x8b, 0x50, 0x02, 0xf0, 0x21, 0x91, 0xbb, 0x48, 0xc0, 0x63, 0xf4,
+	0x0c, 0xa6, 0xc7, 0x85, 0xbc, 0xda, 0x16, 0xf9, 0x2b, 0x29, 0xf4, 0x1e, 0x4c, 0xca, 0x22, 0xcb,
+	0x2b, 0xec, 0x38, 0x28, 0xd3, 0x8d, 0x56, 0xa6, 0x63, 0xc4, 0xc7, 0x96, 0x1c, 0x6d, 0x1a, 0x7b,
+	0x71, 0x7d, 0x71, 0xa4, 0xb6, 0xba, 0x1f, 0x8b, 0xde, 0x4e, 0x2c, 0x7e, 0x0c, 0x3e, 0xd9, 0x9e,
+	0xab, 0xad, 0x0b, 0xf9, 0xd7, 0xfb, 0x69, 0xf1, 0x73, 0x55, 0xd4, 0x25, 0x5e, 0x64, 0x8a, 0x11,
+	0x9e, 0xa2, 0xe7, 0xb0, 0xec, 0x91, 0xba, 0x21, 0xed, 0xf5, 0x42, 0xfa, 0x63, 0x98, 0x6f, 0x91,
+	0x8b, 0x3c, 0xa1, 0xaf, 0x1b, 0x94, 0xae, 0x40, 0xaf, 0xc4, 0xb0, 0x75, 0x47, 0xdd, 0x89, 0xad,
+	0x61, 0x37, 0xb6, 0xa2, 0xbf, 0x7a, 0xe0, 0x37, 0x5f, 0x60, 0xf4, 0x9a, 0xbb, 0x9b, 0x57, 0xa7,
+	0x04, 0xaf, 0xa8, 0x99, 0x18, 0x52, 0x25, 0xbe, 0xa8, 0xac, 0x21, 0x7d, 0xc2, 0x9c, 0x8a, 0x2f,
+	0x2a, 0x0c, 0x6e, 0x2a, 0x6d, 0x89, 0x14, 0xcf, 0x85, 0xa4, 0x47, 0xc6, 0x31, 0x10, 0xea, 0x53,
+	0xc4, 0x60, 0x41, 0x37, 0x02, 0x8f, 0x76, 0x0b, 0x3a, 0xc9, 0x6a, 0x88, 0x54, 0x77, 0x44, 0x95,
+	0x34, 0x0d, 0x1d, 0xeb, 0x8e, 0xa8, 0xa8, 0xe9, 0xfc, 0x00, 0x96, 0xa9, 0x38, 0x13, 0xf9, 0x46,
+	0x24, 0xba, 0xe2, 0x95, 0x2b, 0xaf, 0x0b, 0x8b, 0x3c, 0x41, 0x5c, 0xf4, 0xef, 0x01, 0x8c, 0xe2,
+	0x17, 0x85, 0xf4, 0x5d, 0xd8, 0xb7, 0x2e, 0x73, 0x56, 0x35, 0x2a, 0x2c, 0x36, 0x8d, 0x6b, 0x57,
+	0x3b, 0x45, 0x66, 0xb8, 0xe3, 0xd8, 0xb7, 0x00, 0x4a, 0x13, 0x5f, 0x48, 0x35, 0x3d, 0xc1, 0xb7,
+	0x98, 0x55, 0x8a, 0x95, 0x14, 0x4b, 0x66, 0x96, 0x5a, 0xc1, 0xc7, 0x3a, 0xc5, 0x2b, 0x23, 0x58,
+	0x22, 0x9a, 0xab, 0x6d, 0x62, 0xe6, 0x1b, 0x5b, 0x34, 0x74, 0x8a, 0x8e, 0x3f, 0xa2, 0x29, 0xe7,
+	0x0e, 0xcc, 0x8a, 0x52, 0x28, 0x5e, 0x15, 0x8a, 0x8a, 0x86, 0x1f, 0x37, 0x30, 0xaa, 0xed, 0xce,
+	0xc6, 0x2c, 0x33, 0x23, 0xb7, 0x43, 0xba, 0x86, 0xec, 0x1e, 0x79, 0xce, 0x65, 0x6d, 0x0a, 0x48,
+	0xf3, 0xc8, 0x33, 0x44, 0xbd, 0xb0, 0x8a, 0x50, 0x23, 0x97, 0x22, 0xf9, 0x3c, 0xab, 0xce, 0x93,
+	0x52, 0x09, 0x3b, 0xba, 0xcc, 0x11, 0xf9, 0xeb, 0xac, 0x3a, 0x3f, 0x56, 0xfd, 0x98, 0x58, 0xf4,
+	0x62, 0x22, 0xfa, 0xd3, 0x00, 0x86, 0x27, 0xe9, 0xf5, 0x5a, 0xdd, 0x36, 0x95, 0xc1, 0xcb, 0x9a,
+	0xca, 0xb0, 0xd7, 0x54, 0x1c, 0x89, 0x92, 0x74, 0xd4, 0x90, 0x3e, 0xc3, 0x3c, 0xbd, 0x0b, 0x23,
+	0x4a, 0xa5, 0xf1, 0x0b, 0xba, 0xc7, 0x91, 0xda, 0xc6, 0x44, 0x45, 0xed, 0xb2, 0x4d, 0x91, 0xbb,
+	0x89, 0x0f, 0xcf, 0x58, 0x22, 0x70, 0x66, 0x34, 0x16, 0xc5, 0x23, 0x46, 0xa9, 0xed, 0xea, 0x58,
+	0x6b, 0xac, 0x29, 0xc1, 0xa0, 0xb0, 0xe0, 0x74, 0x6a, 0x34, 0x31, 0x18, 0x33, 0xda, 0x1a, 0x4d,
+	0x0c, 0xbd, 0xb9, 0x00, 0x76, 0xe6, 0x82, 0x36, 0xc9, 0xe6, 0xbb, 0xad, 0xbf, 0x69, 0x0a, 0x66,
+	0x14, 0x6c, 0xfa, 0x7b, 0xd1, 0xf4, 0x77, 0x0a, 0x5b, 0x3b, 0xc7, 0xac, 0x76, 0x93, 0xbe, 0xbd,
+	0x79, 0xd0, 0xbb, 0xf9, 0xc7, 0x64, 0x37, 0x4a, 0x71, 0x5b, 0xc6, 0x6e, 0xef, 0xb4, 0x57, 0x29,
+	0x4e, 0x44, 0x15, 0x37, 0x5c, 0x51, 0x0d, 0xd0, 0xe2, 0xa9, 0xb6, 0xa6, 0xed, 0x73, 0x36, 0x66,
+	0x6f, 0x83, 0xf1, 0x58, 0xdf, 0x7d, 0xef, 0xb9, 0x0c, 0x36, 0x0f, 0xdd, 0xbc, 0xf6, 0x90, 0x4b,
+	0x62, 0x17, 0x69, 0xa3, 0x36, 0xd2, 0xa2, 0xdf, 0xc2, 0xd4, 0xe9, 0xb8, 0x1b, 0x2d, 0xd7, 0x32,
+	0x64, 0xf0, 0xed, 0x19, 0x32, 0xdc, 0xc9, 0x90, 0x6b, 0xc1, 0x3f, 0xba, 0x16, 0xfc, 0xd1, 0xbf,
+	0x3c, 0x9a, 0x78, 0x8e, 0xd4, 0xb6, 0x5d, 0x34, 0xbc, 0xee, 0xa2, 0xf1, 0xa2, 0x0e, 0xe1, 0x36,
+	0x0b, 0xbb, 0xd5, 0xb8, 0xcd, 0xe2, 0xb2, 0xd6, 0x46, 0xb7, 0x59, 0x4c, 0x67, 0xc4, 0xd5, 0x79,
+	0xe6, 0x26, 0x41, 0x3a, 0xe3, 0x2b, 0xa6, 0xe1, 0x99, 0x80, 0x34, 0x80, 0xad, 0x61, 0xbc, 0x96,
+	0x95, 0x15, 0xd5, 0xc4, 0xe6, 0xc2, 0x22, 0x4d, 0xa2, 0xfe, 0x10, 0x02, 0xc7, 0xd4, 0xe8, 0x6c,
+	0x22, 0xf5, 0x86, 0xc5, 0xff, 0xd2, 0xa9, 0xee, 0x2c, 0xed, 0x77, 0x2c, 0xfd, 0x7b, 0x0f, 0x6e,
+	0x3c, 0x5a, 0x3f, 0x3c, 0xc7, 0x07, 0x7f, 0x21, 0xb4, 0xe6, 0x5b, 0xc1, 0xde, 0xc7, 0x69, 0x1a,
+	0xa3, 0x07, 0x75, 0xde, 0x7f, 0xf0, 0x5a, 0xb7, 0x1f, 0xad, 0xa5, 0x30, 0xcc, 0x69, 0x6c, 0x98,
+	0xac, 0x83, 0x06, 0x8d, 0x83, 0xee, 0xc3, 0x84, 0x6f, 0xaa, 0xac, 0xc8, 0xc9, 0x12, 0xfb, 0x0f,
+	0x58, 0x67, 0x82, 0x5a, 0x1f, 0x11, 0x25, 0xb6, 0x1c, 0x94, 0x87, 0xf9, 0x59, 0x61, 0x7d, 0x40,
+	0xe7, 0xe8, 0x3f, 0x1e, 0x2c, 0x4d, 0x07, 0x7d, 0x59, 0x7f, 0xfe, 0xd6, 0xe1, 0xee, 0x05, 0xcb,
+	0x25, 0x0b, 0x61, 0x6a, 0x2b, 0xaf, 0x2b, 0x17, 0x16, 0xc4, 0x19, 0xad, 0x52, 0xd9, 0x76, 0x2b,
+	0x54, 0x22, 0xb3, 0xdc, 0x75, 0x91, 0xb9, 0xc5, 0x7d, 0x9a, 0xe5, 0x82, 0xbd, 0x0b, 0xfb, 0x69,
+	0xa6, 0x04, 0x09, 0x6c, 0x98, 0x8c, 0x93, 0x96, 0x0d, 0x96, 0xd8, 0x9c, 0xfb, 0xa7, 0x1d, 0xf7,
+	0x5f, 0x6b, 0x42, 0x33, 0xb2, 0x7c, 0xbf, 0x09, 0xfd, 0xd1, 0x83, 0xe5, 0xb3, 0x2c, 0x15, 0x45,
+	0xc5, 0x4b, 0x41, 0x63, 0xfb, 0x1d, 0x98, 0x09, 0xfd, 0x88, 0x57, 0xbc, 0xc9, 0xb4, 0x06, 0x46,
+	0x9a, 0x53, 0xf5, 0x9a, 0xea, 0x6d, 0x39, 0xe8, 0x8f, 0xb5, 0x98, 0xa0, 0x97, 0xdb, 0x95, 0xe9,
+	0x42, 0xc3, 0xd8, 0x00, 0xc8, 0x4d, 0xf9, 0x6b, 0x6a, 0xa5, 0x1f, 0x5b, 0xa8, 0x51, 0x64, 0xd2,
+	0x6e, 0xc8, 0xd1, 0xff, 0x06, 0x30, 0x7f, 0x58, 0x5c, 0xe2, 0x06, 0x4f, 0xe3, 0x06, 0x2d, 0x4a,
+	0x6b, 0x29, 0xf0, 0x6b, 0x8f, 0xbe, 0x6e, 0x60, 0x76, 0x1f, 0x82, 0x8d, 0x61, 0x3d, 0x3d, 0x57,
+	0x42, 0x9f, 0x17, 0xd2, 0x48, 0x3a, 0x88, 0xaf, 0xe1, 0xd9, 0x21, 0xcc, 0xcf, 0xf8, 0x46, 0x3c,
+	0x11, 0xbc, 0xaa, 0x95, 0xf1, 0xd9, 0x22, 0xee, 0xa2, 0x50, 0x76, 0xb3, 0xd9, 0x8d, 0xe8, 0x19,
+	0x03, 0xe0, 0x76, 0x5e, 0x29, 0x21, 0x3e, 0x2b, 0x52, 0xe1, 0xc4, 0x6f, 0x11, 0xa4, 0x01, 0x5f,
+	0x63, 0xef, 0x1c, 0x92, 0x2b, 0xf8, 0x5a, 0xb3, 0x03, 0xe8, 0x8c, 0x17, 0xe1, 0xf4, 0x70, 0xb8,
+	0x33, 0x70, 0x1c, 0x00, 0x68, 0xc1, 0xd5, 0xe6, 0xfc, 0xd4, 0x94, 0x7a, 0xfc, 0xb2, 0x83, 0x41,
+	0x7a, 0x96, 0x97, 0xb5, 0x49, 0x3a, 0x57, 0xe9, 0x5b, 0x0c, 0xd2, 0x37, 0x85, 0x94, 0x26, 0x20,
+	0x6c, 0xa9, 0xef, 0x60, 0xc8, 0xda, 0x45, 0xad, 0x36, 0x4d, 0xb1, 0x37, 0x10, 0xbb, 0x0b, 0x4b,
+	0x9e, 0x73, 0x79, 0xe5, 0x36, 0x61, 0xdb, 0x34, 0xfb, 0xc8, 0x68, 0x0d, 0x0b, 0x6b, 0xfe, 0xc7,
+	0xcf, 0x45, 0x5e, 0xb1, 0x9f, 0x80, 0x2f, 0xf0, 0x80, 0xdd, 0xd0, 0x66, 0xe9, 0x9d, 0xce, 0x72,
+	0xdc, 0x61, 0x45, 0x8e, 0xb8, 0x65, 0xa6, 0x54, 0xe0, 0x57, 0xb2, 0xe0, 0xc6, 0x29, 0x8b, 0xd8,
+	0x81, 0xd1, 0x6f, 0x60, 0xff, 0x24, 0xbd, 0x70, 0xdf, 0xf2, 0xcd, 0xf9, 0xb5, 0xbc, 0x0b, 0x71,
+	0xc8, 0x5c, 0x4b, 0xd1, 0x64, 0x9d, 0x03, 0x59, 0x04, 0x0b, 0xeb, 0xdb, 0x93, 0x4d, 0x61, 0x1d,
+	0x39, 0x88, 0x7b, 0xb8, 0x28, 0x86, 0xa0, 0xbd, 0x3f, 0x16, 0xba, 0x96, 0x15, 0xfb, 0x19, 0x2c,
+	0x37, 0x5d, 0x04, 0x05, 0xd3, 0xfc, 0x41, 0xd8, 0x6b, 0x16, 0x1d, 0x91, 0xe2, 0x3e, 0x7b, 0xf4,
+	0xbb, 0x21, 0xf8, 0xa4, 0xe6, 0x71, 0xad, 0xcf, 0x5f, 0x69, 0x8e, 0x7f, 0xcb, 0xee, 0x17, 0x66,
+	0x47, 0x30, 0x79, 0x42, 0xab, 0xc4, 0x09, 0xed, 0x09, 0x6f, 0x00, 0xad, 0x29, 0x09, 0x2e, 0x0b,
+	0xb6, 0x54, 0x20, 0xfc, 0x38, 0xa7, 0x99, 0x30, 0xd3, 0x89, 0xe6, 0x55, 0xa6, 0xcf, 0xae, 0x12,
+	0x2e, 0x25, 0x15, 0x8b, 0x59, 0xbc, 0xc8, 0xf4, 0x89, 0x41, 0x1e, 0x49, 0x89, 0xb5, 0x89, 0x66,
+	0x24, 0x9a, 0x7b, 0x27, 0xf6, 0x2f, 0x96, 0x5a, 0x0a, 0x1a, 0x7b, 0xdb, 0xbe, 0x3c, 0xed, 0xf5,
+	0xe5, 0x37, 0xc1, 0x37, 0x5b, 0x58, 0x3b, 0xb1, 0xcd, 0x68, 0x05, 0x43, 0x8f, 0xbd, 0x0d, 0x73,
+	0x22, 0xda, 0x2d, 0xd2, 0x6f, 0x37, 0x34, 0xbb, 0x44, 0xfe, 0x08, 0x66, 0x59, 0x99, 0x94, 0x85,
+	0xaa, 0x74, 0x08, 0xbb, 0x5d, 0x1d, 0x0d, 0xb3, 0x2a, 0x8f, 0x0b, 0x55, 0xc5, 0xd3, 0x8c, 0x7e,
+	0x35, 0x7b, 0x17, 0x46, 0xb5, 0x92, 0x3a, 0x9c, 0xef, 0x76, 0x66, 0x64, 0x7e, 0xaa, 0x64, 0x4c,
+	0x64, 0xf6, 0x81, 0xeb, 0xe0, 0x8b, 0xdd, 0xb5, 0xa4, 0x31, 0x79, 0xa7, 0x8f, 0x47, 0x5f, 0x79,
+	0xb0, 0xec, 0x11, 0xae, 0xf9, 0x03, 0x6d, 0x5f, 0x94, 0xd9, 0xa6, 0xfb, 0x47, 0x81, 0x4f, 0x18,
+	0x52, 0x14, 0x77, 0x46, 0x22, 0x73, 0xb5, 0x6d, 0x76, 0x46, 0x44, 0x60, 0x1f, 0xee, 0xb6, 0xf4,
+	0xd1, 0x77, 0x0d, 0xbd, 0xe3, 0x17, 0x0c, 0xbd, 0xf4, 0xff, 0x95, 0x14, 0xb6, 0x93, 0x4e, 0xec,
+	0xb2, 0x5e, 0x4b, 0x61, 0xf2, 0x37, 0x82, 0x25, 0x25, 0x49, 0x52, 0xd6, 0xfa, 0x1c, 0xfb, 0x8a,
+	0xa9, 0xe3, 0x73, 0xe1, 0x34, 0x5a, 0xa5, 0xd1, 0x53, 0x80, 0xd6, 0x9c, 0x28, 0xae, 0xfb, 0x4b,
+	0xab, 0x74, 0x65, 0xda, 0x20, 0x56, 0xed, 0x5f, 0x79, 0x83, 0xce, 0x5f, 0x79, 0x2f, 0x5b, 0xaa,
+	0x3e, 0x82, 0xa9, 0x35, 0xbc, 0x9b, 0x41, 0xbd, 0x76, 0x06, 0x7d, 0xc9, 0x28, 0x17, 0xfd, 0xdd,
+	0x83, 0x5b, 0x8f, 0xf5, 0xb1, 0x50, 0xba, 0xc8, 0x1f, 0xf2, 0xcd, 0xb9, 0xed, 0xca, 0xec, 0x7d,
+	0x5b, 0xbd, 0x4d, 0x51, 0xe8, 0x24, 0xd2, 0x63, 0xdd, 0x61, 0x4b, 0x6d, 0x83, 0x7a, 0xc3, 0xd6,
+	0x71, 0xd3, 0x48, 0x87, 0x4d, 0x4a, 0x9b, 0xe5, 0xa6, 0xa4, 0xdb, 0x3b, 0xcb, 0x8d, 0x41, 0xac,
+	0xa8, 0x12, 0x9c, 0xd9, 0x9a, 0x6d, 0xb3, 0xc4, 0x82, 0x9d, 0xee, 0x3f, 0xfe, 0xce, 0xee, 0xdf,
+	0xff, 0xef, 0x6b, 0xec, 0x74, 0xbb, 0xff, 0x67, 0x0f, 0x16, 0xdd, 0x49, 0x83, 0x2d, 0x60, 0x76,
+	0x9a, 0x98, 0x99, 0x20, 0xd8, 0x63, 0x01, 0x2c, 0x1c, 0x84, 0xc3, 0x70, 0xe0, 0xb1, 0xdb, 0x10,
+	0x74, 0x31, 0xd8, 0xa2, 0x82, 0x01, 0x03, 0x98, 0x9c, 0x26, 0xc4, 0x31, 0x64, 0x4b, 0xf0, 0xcd,
+	0xf9, 0x24, 0xbd, 0x08, 0x46, 0xec, 0x26, 0x2c, 0x1b, 0x10, 0x43, 0x35, 0x18, 0x33, 0x1f, 0xc6,
+	0xa7, 0x09, 0x52, 0x27, 0xec, 0x16, 0xdc, 0x70, 0xd7, 0xd9, 0x11, 0x24, 0x98, 0xb2, 0x7d, 0x80,
+	0xd3, 0xe4, 0xd4, 0xfe, 0x85, 0x11, 0xcc, 0x8c, 0x4c, 0xa6, 0x40, 0x07, 0xbe, 0x91, 0xe9, 0xb8,
+	0x90, 0xf2, 0x61, 0x91, 0x9f, 0x65, 0xdb, 0x00, 0xee, 0x7f, 0x08, 0x33, 0xa7, 0x30, 0x4a, 0xb2,
+	0xca, 0xb5, 0x50, 0x55, 0xb0, 0x87, 0xe7, 0xa7, 0xb4, 0x20, 0x04, 0x1e, 0x9e, 0x1f, 0x09, 0x29,
+	0x2a, 0x11, 0x0c, 0xee, 0x1f, 0x41, 0xb0, 0x5b, 0xb7, 0xd9, 0x0d, 0x98, 0xc7, 0x62, 0x95, 0x67,
+	0x15, 0xb9, 0x2e, 0xd8, 0x43, 0x84, 0xf9, 0xd8, 0x20, 0x3c, 0x36, 0x87, 0xa9, 0xfd, 0x2a, 0x18,
+	0xdc, 0xff, 0x18, 0xf6, 0xfb, 0x5e, 0x36, 0x6a, 0x3f, 0x5a, 0x93, 0x31, 0x83, 0x3d, 0xa3, 0x98,
+	0x05, 0x4d, 0xe8, 0x04, 0xde, 0x27, 0xe1, 0x5f, 0xbe, 0x3e, 0xf0, 0xbe, 0xfc, 0xfa, 0xc0, 0xfb,
+	0xc7, 0xd7, 0x07, 0xde, 0x1f, 0xbe, 0x39, 0xd8, 0xfb, 0xf2, 0x9b, 0x83, 0xbd, 0xbf, 0x7d, 0x73,
+	0xb0, 0xb7, 0x9e, 0x90, 0xeb, 0x3e, 0xfa, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd8, 0xb7, 0x23,
+	0x4d, 0x0a, 0x18, 0x00, 0x00,
 }
 
 func (m *Area) Marshal() (dAtA []byte, err error) {
@@ -3098,22 +3098,22 @@
 		i = encodeVarintProtomsg(dAtA, i, uint64(len(m.Addr)))
 		i += copy(dAtA[i:], m.Addr)
 	}
-	if m.Areaid != 0 {
-		dAtA[i] = 0x38
-		i++
-		i = encodeVarintProtomsg(dAtA, i, uint64(m.Areaid))
-	}
 	if m.Longitude != 0 {
-		dAtA[i] = 0x45
+		dAtA[i] = 0x3d
 		i++
 		encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Longitude))))
 		i += 4
 	}
 	if m.Latitude != 0 {
-		dAtA[i] = 0x4d
+		dAtA[i] = 0x45
 		i++
 		encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Latitude))))
 		i += 4
+	}
+	if m.Floor != 0 {
+		dAtA[i] = 0x48
+		i++
+		i = encodeVarintProtomsg(dAtA, i, uint64(m.Floor))
 	}
 	if len(m.Rtsp) > 0 {
 		dAtA[i] = 0x52
@@ -5003,14 +5003,14 @@
 	if l > 0 {
 		n += 1 + l + sovProtomsg(uint64(l))
 	}
-	if m.Areaid != 0 {
-		n += 1 + sovProtomsg(uint64(m.Areaid))
-	}
 	if m.Longitude != 0 {
 		n += 5
 	}
 	if m.Latitude != 0 {
 		n += 5
+	}
+	if m.Floor != 0 {
+		n += 1 + sovProtomsg(uint64(m.Floor))
 	}
 	l = len(m.Rtsp)
 	if l > 0 {
@@ -6321,25 +6321,6 @@
 			m.Addr = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		case 7:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Areaid", wireType)
-			}
-			m.Areaid = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowProtomsg
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Areaid |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 8:
 			if wireType != 5 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Longitude", wireType)
 			}
@@ -6350,7 +6331,7 @@
 			v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
 			iNdEx += 4
 			m.Longitude = float32(math.Float32frombits(v))
-		case 9:
+		case 8:
 			if wireType != 5 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Latitude", wireType)
 			}
@@ -6361,6 +6342,25 @@
 			v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
 			iNdEx += 4
 			m.Latitude = float32(math.Float32frombits(v))
+		case 9:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Floor", wireType)
+			}
+			m.Floor = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowProtomsg
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Floor |= int32(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		case 10:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Rtsp", wireType)
diff --git a/protomsg.proto b/protomsg.proto
index f009bc8..ecda9c5 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -20,9 +20,9 @@
     string snapshot_url = 4;//鎽勫儚鏈哄簳鍥惧揩鐓�
     int32 type = 5;
     string addr = 6;
-    int32 areaid = 7;
-    float longitude = 8;
-    float latitude = 9;
+    float longitude = 7;
+    float latitude = 8;
+    int32 floor = 9;
     string rtsp = 10;
     string ip = 11;
     int32 port = 12;

--
Gitblit v1.8.0