forked from organicmaps/organicmaps
Drules auto generation
This commit is contained in:
Constantin Shalnev
r.kuznetsov
parent
a73a7c9c79
commit
7fb96e01a4
3 changed files with 89 additions and 13 deletions
|
|
@ -3366,6 +3366,7 @@ const int ShieldRuleProto::kHeightFieldNumber;
|
|||
const int ShieldRuleProto::kColorFieldNumber;
|
||||
const int ShieldRuleProto::kStrokeColorFieldNumber;
|
||||
const int ShieldRuleProto::kPriorityFieldNumber;
|
||||
const int ShieldRuleProto::kMinDistanceFieldNumber;
|
||||
#endif // !_MSC_VER
|
||||
|
||||
ShieldRuleProto::ShieldRuleProto()
|
||||
|
|
@ -3390,6 +3391,7 @@ void ShieldRuleProto::SharedCtor() {
|
|||
color_ = 0u;
|
||||
stroke_color_ = 0u;
|
||||
priority_ = 0;
|
||||
min_distance_ = 0;
|
||||
::memset(_has_bits_, 0, sizeof(_has_bits_));
|
||||
}
|
||||
|
||||
|
|
@ -3438,7 +3440,9 @@ void ShieldRuleProto::Clear() {
|
|||
::memset(&first, 0, n); \
|
||||
} while (0)
|
||||
|
||||
ZR_(height_, priority_);
|
||||
if (_has_bits_[0 / 32] & 31) {
|
||||
ZR_(height_, min_distance_);
|
||||
}
|
||||
|
||||
#undef OFFSET_OF_FIELD_
|
||||
#undef ZR_
|
||||
|
|
@ -3516,6 +3520,21 @@ bool ShieldRuleProto::MergePartialFromCodedStream(
|
|||
} else {
|
||||
goto handle_unusual;
|
||||
}
|
||||
if (input->ExpectTag(40)) goto parse_min_distance;
|
||||
break;
|
||||
}
|
||||
|
||||
// optional int32 min_distance = 5;
|
||||
case 5: {
|
||||
if (tag == 40) {
|
||||
parse_min_distance:
|
||||
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
||||
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
|
||||
input, &min_distance_)));
|
||||
set_has_min_distance();
|
||||
} else {
|
||||
goto handle_unusual;
|
||||
}
|
||||
if (input->ExpectAtEnd()) goto success;
|
||||
break;
|
||||
}
|
||||
|
|
@ -3565,6 +3584,11 @@ void ShieldRuleProto::SerializeWithCachedSizes(
|
|||
::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output);
|
||||
}
|
||||
|
||||
// optional int32 min_distance = 5;
|
||||
if (has_min_distance()) {
|
||||
::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->min_distance(), output);
|
||||
}
|
||||
|
||||
output->WriteRaw(unknown_fields().data(),
|
||||
unknown_fields().size());
|
||||
// @@protoc_insertion_point(serialize_end:ShieldRuleProto)
|
||||
|
|
@ -3602,6 +3626,13 @@ int ShieldRuleProto::ByteSize() const {
|
|||
this->priority());
|
||||
}
|
||||
|
||||
// optional int32 min_distance = 5;
|
||||
if (has_min_distance()) {
|
||||
total_size += 1 +
|
||||
::google::protobuf::internal::WireFormatLite::Int32Size(
|
||||
this->min_distance());
|
||||
}
|
||||
|
||||
}
|
||||
total_size += unknown_fields().size();
|
||||
|
||||
|
|
@ -3631,6 +3662,9 @@ void ShieldRuleProto::MergeFrom(const ShieldRuleProto& from) {
|
|||
if (from.has_priority()) {
|
||||
set_priority(from.priority());
|
||||
}
|
||||
if (from.has_min_distance()) {
|
||||
set_min_distance(from.min_distance());
|
||||
}
|
||||
}
|
||||
mutable_unknown_fields()->append(from.unknown_fields());
|
||||
}
|
||||
|
|
@ -3653,6 +3687,7 @@ void ShieldRuleProto::Swap(ShieldRuleProto* other) {
|
|||
std::swap(color_, other->color_);
|
||||
std::swap(stroke_color_, other->stroke_color_);
|
||||
std::swap(priority_, other->priority_);
|
||||
std::swap(min_distance_, other->min_distance_);
|
||||
std::swap(_has_bits_[0], other->_has_bits_[0]);
|
||||
_unknown_fields_.swap(other->_unknown_fields_);
|
||||
std::swap(_cached_size_, other->_cached_size_);
|
||||
|
|
|
|||
|
|
@ -1424,6 +1424,13 @@ class ShieldRuleProto : public ::google::protobuf::MessageLite {
|
|||
inline ::google::protobuf::int32 priority() const;
|
||||
inline void set_priority(::google::protobuf::int32 value);
|
||||
|
||||
// optional int32 min_distance = 5;
|
||||
inline bool has_min_distance() const;
|
||||
inline void clear_min_distance();
|
||||
static const int kMinDistanceFieldNumber = 5;
|
||||
inline ::google::protobuf::int32 min_distance() const;
|
||||
inline void set_min_distance(::google::protobuf::int32 value);
|
||||
|
||||
// @@protoc_insertion_point(class_scope:ShieldRuleProto)
|
||||
private:
|
||||
inline void set_has_height();
|
||||
|
|
@ -1434,6 +1441,8 @@ class ShieldRuleProto : public ::google::protobuf::MessageLite {
|
|||
inline void clear_has_stroke_color();
|
||||
inline void set_has_priority();
|
||||
inline void clear_has_priority();
|
||||
inline void set_has_min_distance();
|
||||
inline void clear_has_min_distance();
|
||||
|
||||
::std::string _unknown_fields_;
|
||||
|
||||
|
|
@ -1443,6 +1452,7 @@ class ShieldRuleProto : public ::google::protobuf::MessageLite {
|
|||
::google::protobuf::uint32 color_;
|
||||
::google::protobuf::uint32 stroke_color_;
|
||||
::google::protobuf::int32 priority_;
|
||||
::google::protobuf::int32 min_distance_;
|
||||
#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
||||
friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl();
|
||||
#else
|
||||
|
|
@ -3377,6 +3387,30 @@ inline void ShieldRuleProto::set_priority(::google::protobuf::int32 value) {
|
|||
// @@protoc_insertion_point(field_set:ShieldRuleProto.priority)
|
||||
}
|
||||
|
||||
// optional int32 min_distance = 5;
|
||||
inline bool ShieldRuleProto::has_min_distance() const {
|
||||
return (_has_bits_[0] & 0x00000010u) != 0;
|
||||
}
|
||||
inline void ShieldRuleProto::set_has_min_distance() {
|
||||
_has_bits_[0] |= 0x00000010u;
|
||||
}
|
||||
inline void ShieldRuleProto::clear_has_min_distance() {
|
||||
_has_bits_[0] &= ~0x00000010u;
|
||||
}
|
||||
inline void ShieldRuleProto::clear_min_distance() {
|
||||
min_distance_ = 0;
|
||||
clear_has_min_distance();
|
||||
}
|
||||
inline ::google::protobuf::int32 ShieldRuleProto::min_distance() const {
|
||||
// @@protoc_insertion_point(field_get:ShieldRuleProto.min_distance)
|
||||
return min_distance_;
|
||||
}
|
||||
inline void ShieldRuleProto::set_min_distance(::google::protobuf::int32 value) {
|
||||
set_has_min_distance();
|
||||
min_distance_ = value;
|
||||
// @@protoc_insertion_point(field_set:ShieldRuleProto.min_distance)
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
|
||||
// DrawElementProto
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ _sym_db = _symbol_database.Default()
|
|||
DESCRIPTOR = _descriptor.FileDescriptor(
|
||||
name='drules_struct.proto',
|
||||
package='',
|
||||
serialized_pb=_b('\n\x13\x64rules_struct.proto\"*\n\x0c\x44\x61shDotProto\x12\n\n\x02\x64\x64\x18\x01 \x03(\x01\x12\x0e\n\x06offset\x18\x02 \x01(\x01\":\n\x0cPathSymProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x0c\n\x04step\x18\x02 \x02(\x01\x12\x0e\n\x06offset\x18\x03 \x01(\x01\"\xaf\x01\n\rLineRuleProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\x12\x1e\n\x07pathsym\x18\x05 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"\x9c\x01\n\x0cLineDefProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x1e\n\x07pathsym\x18\x04 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"O\n\rAreaRuleProto\x12\r\n\x05\x63olor\x18\x01 \x02(\r\x12\x1d\n\x06\x62order\x18\x02 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"_\n\x0fSymbolRuleProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x16\n\x0e\x61pply_for_type\x18\x02 \x01(\x05\x12\x10\n\x08priority\x18\x03 \x02(\x05\x12\x14\n\x0cmin_distance\x18\x04 \x01(\x05\"\x8d\x01\n\x0f\x43\x61ptionDefProto\x12\x0e\n\x06height\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x14\n\x0cstroke_color\x18\x03 \x01(\r\x12\x10\n\x08offset_x\x18\x04 \x01(\x05\x12\x10\n\x08offset_y\x18\x05 \x01(\x05\x12\x0c\n\x04text\x18\x06 \x01(\t\x12\x13\n\x0bis_optional\x18\x07 \x01(\x08\"l\n\x10\x43\x61ptionRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"a\n\x0f\x43ircleRuleProto\x12\x0e\n\x06radius\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1d\n\x06\x62order\x18\x03 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\"m\n\x11PathTextRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"X\n\x0fShieldRuleProto\x12\x0e\n\x06height\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x14\n\x0cstroke_color\x18\x03 \x01(\r\x12\x10\n\x08priority\x18\x04 \x02(\x05\"\xa1\x02\n\x10\x44rawElementProto\x12\r\n\x05scale\x18\x01 \x02(\x05\x12\x1d\n\x05lines\x18\x02 \x03(\x0b\x32\x0e.LineRuleProto\x12\x1c\n\x04\x61rea\x18\x03 \x01(\x0b\x32\x0e.AreaRuleProto\x12 \n\x06symbol\x18\x04 \x01(\x0b\x32\x10.SymbolRuleProto\x12\"\n\x07\x63\x61ption\x18\x05 \x01(\x0b\x32\x11.CaptionRuleProto\x12 \n\x06\x63ircle\x18\x06 \x01(\x0b\x32\x10.CircleRuleProto\x12%\n\tpath_text\x18\x07 \x01(\x0b\x32\x12.PathTextRuleProto\x12 \n\x06shield\x18\x08 \x01(\x0b\x32\x10.ShieldRuleProto\x12\x10\n\x08\x61pply_if\x18\t \x03(\t\"G\n\x13\x43lassifElementProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\"\n\x07\x65lement\x18\x02 \x03(\x0b\x32\x11.DrawElementProto\"4\n\x0e\x43ontainerProto\x12\"\n\x04\x63ont\x18\x01 \x03(\x0b\x32\x14.ClassifElementProto*4\n\x08LineJoin\x12\r\n\tROUNDJOIN\x10\x00\x12\r\n\tBEVELJOIN\x10\x01\x12\n\n\x06NOJOIN\x10\x02*3\n\x07LineCap\x12\x0c\n\x08ROUNDCAP\x10\x00\x12\x0b\n\x07\x42UTTCAP\x10\x01\x12\r\n\tSQUARECAP\x10\x02\x42\x02H\x03')
|
||||
serialized_pb=_b('\n\x13\x64rules_struct.proto\"*\n\x0c\x44\x61shDotProto\x12\n\n\x02\x64\x64\x18\x01 \x03(\x01\x12\x0e\n\x06offset\x18\x02 \x01(\x01\":\n\x0cPathSymProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x0c\n\x04step\x18\x02 \x02(\x01\x12\x0e\n\x06offset\x18\x03 \x01(\x01\"\xaf\x01\n\rLineRuleProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\x12\x1e\n\x07pathsym\x18\x05 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"\x9c\x01\n\x0cLineDefProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x1e\n\x07pathsym\x18\x04 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"O\n\rAreaRuleProto\x12\r\n\x05\x63olor\x18\x01 \x02(\r\x12\x1d\n\x06\x62order\x18\x02 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"_\n\x0fSymbolRuleProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x16\n\x0e\x61pply_for_type\x18\x02 \x01(\x05\x12\x10\n\x08priority\x18\x03 \x02(\x05\x12\x14\n\x0cmin_distance\x18\x04 \x01(\x05\"\x8d\x01\n\x0f\x43\x61ptionDefProto\x12\x0e\n\x06height\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x14\n\x0cstroke_color\x18\x03 \x01(\r\x12\x10\n\x08offset_x\x18\x04 \x01(\x05\x12\x10\n\x08offset_y\x18\x05 \x01(\x05\x12\x0c\n\x04text\x18\x06 \x01(\t\x12\x13\n\x0bis_optional\x18\x07 \x01(\x08\"l\n\x10\x43\x61ptionRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"a\n\x0f\x43ircleRuleProto\x12\x0e\n\x06radius\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1d\n\x06\x62order\x18\x03 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\"m\n\x11PathTextRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"n\n\x0fShieldRuleProto\x12\x0e\n\x06height\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x14\n\x0cstroke_color\x18\x03 \x01(\r\x12\x10\n\x08priority\x18\x04 \x02(\x05\x12\x14\n\x0cmin_distance\x18\x05 \x01(\x05\"\xa1\x02\n\x10\x44rawElementProto\x12\r\n\x05scale\x18\x01 \x02(\x05\x12\x1d\n\x05lines\x18\x02 \x03(\x0b\x32\x0e.LineRuleProto\x12\x1c\n\x04\x61rea\x18\x03 \x01(\x0b\x32\x0e.AreaRuleProto\x12 \n\x06symbol\x18\x04 \x01(\x0b\x32\x10.SymbolRuleProto\x12\"\n\x07\x63\x61ption\x18\x05 \x01(\x0b\x32\x11.CaptionRuleProto\x12 \n\x06\x63ircle\x18\x06 \x01(\x0b\x32\x10.CircleRuleProto\x12%\n\tpath_text\x18\x07 \x01(\x0b\x32\x12.PathTextRuleProto\x12 \n\x06shield\x18\x08 \x01(\x0b\x32\x10.ShieldRuleProto\x12\x10\n\x08\x61pply_if\x18\t \x03(\t\"G\n\x13\x43lassifElementProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\"\n\x07\x65lement\x18\x02 \x03(\x0b\x32\x11.DrawElementProto\"4\n\x0e\x43ontainerProto\x12\"\n\x04\x63ont\x18\x01 \x03(\x0b\x32\x14.ClassifElementProto*4\n\x08LineJoin\x12\r\n\tROUNDJOIN\x10\x00\x12\r\n\tBEVELJOIN\x10\x01\x12\n\n\x06NOJOIN\x10\x02*3\n\x07LineCap\x12\x0c\n\x08ROUNDCAP\x10\x00\x12\x0b\n\x07\x42UTTCAP\x10\x01\x12\r\n\tSQUARECAP\x10\x02\x42\x02H\x03')
|
||||
)
|
||||
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
||||
|
||||
|
|
@ -44,8 +44,8 @@ _LINEJOIN = _descriptor.EnumDescriptor(
|
|||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_start=1615,
|
||||
serialized_end=1667,
|
||||
serialized_start=1637,
|
||||
serialized_end=1689,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_LINEJOIN)
|
||||
|
||||
|
|
@ -71,8 +71,8 @@ _LINECAP = _descriptor.EnumDescriptor(
|
|||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_start=1669,
|
||||
serialized_end=1720,
|
||||
serialized_start=1691,
|
||||
serialized_end=1742,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_LINECAP)
|
||||
|
||||
|
|
@ -645,6 +645,13 @@ _SHIELDRULEPROTO = _descriptor.Descriptor(
|
|||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='min_distance', full_name='ShieldRuleProto.min_distance', index=4,
|
||||
number=5, type=5, cpp_type=1, label=1,
|
||||
has_default_value=False, default_value=0,
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
|
@ -657,7 +664,7 @@ _SHIELDRULEPROTO = _descriptor.Descriptor(
|
|||
oneofs=[
|
||||
],
|
||||
serialized_start=1106,
|
||||
serialized_end=1194,
|
||||
serialized_end=1216,
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -742,8 +749,8 @@ _DRAWELEMENTPROTO = _descriptor.Descriptor(
|
|||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=1197,
|
||||
serialized_end=1486,
|
||||
serialized_start=1219,
|
||||
serialized_end=1508,
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -779,8 +786,8 @@ _CLASSIFELEMENTPROTO = _descriptor.Descriptor(
|
|||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=1488,
|
||||
serialized_end=1559,
|
||||
serialized_start=1510,
|
||||
serialized_end=1581,
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -809,8 +816,8 @@ _CONTAINERPROTO = _descriptor.Descriptor(
|
|||
extension_ranges=[],
|
||||
oneofs=[
|
||||
],
|
||||
serialized_start=1561,
|
||||
serialized_end=1613,
|
||||
serialized_start=1583,
|
||||
serialized_end=1635,
|
||||
)
|
||||
|
||||
_LINERULEPROTO.fields_by_name['dashdot'].message_type = _DASHDOTPROTO
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue