[Git][debian-gis-team/mapbox-vector-tile][master] 3 commits: Add patch to include vector_tile.proto file.
Bas Couwenberg
gitlab at salsa.debian.org
Fri Oct 12 10:59:03 BST 2018
Bas Couwenberg pushed to branch master at Debian GIS Project / mapbox-vector-tile
Commits:
9f1055fa by Bas Couwenberg at 2018-10-12T09:02:47Z
Add patch to include vector_tile.proto file.
- - - - -
8dea7fcd by Bas Couwenberg at 2018-10-12T09:34:47Z
Add patch for regenerated Python source with Protobuf 3.6.1.
- - - - -
16c6d31f by Bas Couwenberg at 2018-10-12T09:49:28Z
Set distribution to unstable.
- - - - -
4 changed files:
- debian/changelog
- + debian/patches/proto-source.patch
- + debian/patches/protobuf-3.6.1.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,11 +1,13 @@
-mapbox-vector-tile (0.5.0+ds-6) UNRELEASED; urgency=medium
+mapbox-vector-tile (0.5.0+ds-6) unstable; urgency=medium
* Strip trailing whitespace from control & rules files.
* Bump Standards-Version to 4.2.1, no changes.
* Drop autopkgtest to test installability.
* Add lintian override for testsuite-autopkgtest-missing.
+ * Add patch to include vector_tile.proto file.
+ * Add patch for regenerated Python source with Protobuf 3.6.1.
- -- Bas Couwenberg <sebastic at debian.org> Mon, 07 May 2018 21:06:56 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 12 Oct 2018 11:49:08 +0200
mapbox-vector-tile (0.5.0+ds-5) unstable; urgency=medium
=====================================
debian/patches/proto-source.patch
=====================================
@@ -0,0 +1,100 @@
+Description: Add vector_tile.proto file.
+Origin: https://github.com/tilezen/mapbox-vector-tile/blob/master/mapbox_vector_tile/Mapbox/vector_tile.proto
+
+--- /dev/null
++++ b/mapbox_vector_tile/Mapbox/vector_tile.proto
+@@ -0,0 +1,94 @@
++// Protocol Version 1
++
++syntax = "proto2";
++
++package mapnik.vector;
++
++option optimize_for = LITE_RUNTIME;
++
++message tile {
++ enum GeomType {
++ Unknown = 0;
++ Point = 1;
++ LineString = 2;
++ Polygon = 3;
++ }
++
++ // Variant type encoding
++ message value {
++ // Exactly one of these values may be present in a valid message
++ optional string string_value = 1;
++ optional float float_value = 2;
++ optional double double_value = 3;
++ optional int64 int_value = 4;
++ optional uint64 uint_value = 5;
++ optional sint64 sint_value = 6;
++ optional bool bool_value = 7;
++
++ extensions 8 to max;
++ }
++
++ message feature {
++ optional uint64 id = 1;
++
++ // Tags of this feature. Even numbered values refer to the nth
++ // value in the keys list on the tile message, odd numbered
++ // values refer to the nth value in the values list on the tile
++ // message.
++ repeated uint32 tags = 2 [ packed = true ];
++
++ // The type of geometry stored in this feature.
++ optional GeomType type = 3 [ default = Unknown ];
++
++ // Contains a stream of commands and parameters (vertices). The
++ // repeat count is shifted to the left by 3 bits. This means
++ // that the command has 3 bits (0-7). The repeat count
++ // indicates how often this command is to be repeated. Defined
++ // commands are:
++ // - MoveTo: 1 (2 parameters follow)
++ // - LineTo: 2 (2 parameters follow)
++ // - ClosePath: 7 (no parameters follow)
++ //
++ // Ex.: MoveTo(3, 6), LineTo(8, 12), LineTo(20, 34), ClosePath
++ // Encoded as: [ 9 3 6 18 5 6 12 22 15 ]
++ // == command type 7 (ClosePath), length 1
++ // ===== relative LineTo(+12, +22) == LineTo(20, 34)
++ // === relative LineTo(+5, +6) == LineTo(8, 12)
++ // == [00010 010] = command type 2 (LineTo), length 2
++ // === relative MoveTo(+3, +6)
++ // == [00001 001] = command type 1 (MoveTo), length 1
++ // Commands are encoded as uint32 varints, vertex parameters are
++ // encoded as sint32 varints (zigzag). Vertex parameters are
++ // also encoded as deltas to the previous position. The original
++ // position is (0,0)
++ repeated uint32 geometry = 4 [ packed = true ];
++ }
++
++ message layer {
++ // Any compliant implementation must first read the version
++ // number encoded in this message and choose the correct
++ // implementation for this version number before proceeding to
++ // decode other parts of this message.
++ required uint32 version = 15 [ default = 1 ];
++
++ required string name = 1;
++
++ // The actual features in this tile.
++ repeated feature features = 2;
++
++ // Dictionary encoding for keys
++ repeated string keys = 3;
++
++ // Dictionary encoding for values
++ repeated value values = 4;
++
++ // The bounding box in this tile spans from 0..4095 units
++ optional uint32 extent = 5 [ default = 4096 ];
++
++ extensions 16 to max;
++ }
++
++ repeated layer layers = 3;
++
++ extensions 16 to 8191;
++}
=====================================
debian/patches/protobuf-3.6.1.patch
=====================================
@@ -0,0 +1,617 @@
+Description: Regenerate Python sources with Protobuf 3.6.1.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/mapbox_vector_tile/Mapbox/vector_tile_pb2.py
++++ b/mapbox_vector_tile/Mapbox/vector_tile_pb2.py
+@@ -1,19 +1,26 @@
+ # Generated by the protocol buffer compiler. DO NOT EDIT!
+ # source: vector_tile.proto
+
++import sys
++_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+ from google.protobuf import descriptor as _descriptor
+ from google.protobuf import message as _message
+ from google.protobuf import reflection as _reflection
+-from google.protobuf import descriptor_pb2
++from google.protobuf import symbol_database as _symbol_database
+ # @@protoc_insertion_point(imports)
+
++_sym_db = _symbol_database.Default()
++
+
+
+
+ DESCRIPTOR = _descriptor.FileDescriptor(
+ name='vector_tile.proto',
+ package='mapnik.vector',
+- serialized_pb='\n\x11vector_tile.proto\x12\rmapnik.vector\"\xc5\x04\n\x04tile\x12)\n\x06layers\x18\x03 \x03(\x0b\x32\x19.mapnik.vector.tile.layer\x1a\xa1\x01\n\x05value\x12\x14\n\x0cstring_value\x18\x01 \x01(\t\x12\x13\n\x0b\x66loat_value\x18\x02 \x01(\x02\x12\x14\n\x0c\x64ouble_value\x18\x03 \x01(\x01\x12\x11\n\tint_value\x18\x04 \x01(\x03\x12\x12\n\nuint_value\x18\x05 \x01(\x04\x12\x12\n\nsint_value\x18\x06 \x01(\x12\x12\x12\n\nbool_value\x18\x07 \x01(\x08*\x08\x08\x08\x10\x80\x80\x80\x80\x02\x1ar\n\x07\x66\x65\x61ture\x12\n\n\x02id\x18\x01 \x01(\x04\x12\x10\n\x04tags\x18\x02 \x03(\rB\x02\x10\x01\x12\x33\n\x04type\x18\x03 \x01(\x0e\x32\x1c.mapnik.vector.tile.GeomType:\x07Unknown\x12\x14\n\x08geometry\x18\x04 \x03(\rB\x02\x10\x01\x1a\xb1\x01\n\x05layer\x12\x12\n\x07version\x18\x0f \x02(\r:\x01\x31\x12\x0c\n\x04name\x18\x01 \x02(\t\x12-\n\x08\x66\x65\x61tures\x18\x02 \x03(\x0b\x32\x1b.mapnik.vector.tile.feature\x12\x0c\n\x04keys\x18\x03 \x03(\t\x12)\n\x06values\x18\x04 \x03(\x0b\x32\x19.mapnik.vector.tile.value\x12\x14\n\x06\x65xtent\x18\x05 \x01(\r:\x04\x34\x30\x39\x36*\x08\x08\x10\x10\x80\x80\x80\x80\x02\"?\n\x08GeomType\x12\x0b\n\x07Unknown\x10\x00\x12\t\n\x05Point\x10\x01\x12\x0e\n\nLineString\x10\x02\x12\x0b\n\x07Polygon\x10\x03*\x05\x08\x10\x10\x80 at B\x02H\x03')
++ syntax='proto2',
++ serialized_options=_b('H\003'),
++ serialized_pb=_b('\n\x11vector_tile.proto\x12\rmapnik.vector\"\xc5\x04\n\x04tile\x12)\n\x06layers\x18\x03 \x03(\x0b\x32\x19.mapnik.vector.tile.layer\x1a\xa1\x01\n\x05value\x12\x14\n\x0cstring_value\x18\x01 \x01(\t\x12\x13\n\x0b\x66loat_value\x18\x02 \x01(\x02\x12\x14\n\x0c\x64ouble_value\x18\x03 \x01(\x01\x12\x11\n\tint_value\x18\x04 \x01(\x03\x12\x12\n\nuint_value\x18\x05 \x01(\x04\x12\x12\n\nsint_value\x18\x06 \x01(\x12\x12\x12\n\nbool_value\x18\x07 \x01(\x08*\x08\x08\x08\x10\x80\x80\x80\x80\x02\x1ar\n\x07\x66\x65\x61ture\x12\n\n\x02id\x18\x01 \x01(\x04\x12\x10\n\x04tags\x18\x02 \x03(\rB\x02\x10\x01\x12\x33\n\x04type\x18\x03 \x01(\x0e\x32\x1c.mapnik.vector.tile.GeomType:\x07Unknown\x12\x14\n\x08geometry\x18\x04 \x03(\rB\x02\x10\x01\x1a\xb1\x01\n\x05layer\x12\x12\n\x07version\x18\x0f \x02(\r:\x01\x31\x12\x0c\n\x04name\x18\x01 \x02(\t\x12-\n\x08\x66\x65\x61tures\x18\x02 \x03(\x0b\x32\x1b.mapnik.vector.tile.feature\x12\x0c\n\x04keys\x18\x03 \x03(\t\x12)\n\x06values\x18\x04 \x03(\x0b\x32\x19.mapnik.vector.tile.value\x12\x14\n\x06\x65xtent\x18\x05 \x01(\r:\x04\x34\x30\x39\x36*\x08\x08\x10\x10\x80\x80\x80\x80\x02\"?\n\x08GeomType\x12\x0b\n\x07Unknown\x10\x00\x12\t\n\x05Point\x10\x01\x12\x0e\n\nLineString\x10\x02\x12\x0b\n\x07Polygon\x10\x03*\x05\x08\x10\x10\x80 at B\x02H\x03')
++)
+
+
+
+@@ -25,26 +32,27 @@ _TILE_GEOMTYPE = _descriptor.EnumDescrip
+ values=[
+ _descriptor.EnumValueDescriptor(
+ name='Unknown', index=0, number=0,
+- options=None,
++ serialized_options=None,
+ type=None),
+ _descriptor.EnumValueDescriptor(
+ name='Point', index=1, number=1,
+- options=None,
++ serialized_options=None,
+ type=None),
+ _descriptor.EnumValueDescriptor(
+ name='LineString', index=2, number=2,
+- options=None,
++ serialized_options=None,
+ type=None),
+ _descriptor.EnumValueDescriptor(
+ name='Polygon', index=3, number=3,
+- options=None,
++ serialized_options=None,
+ type=None),
+ ],
+ containing_type=None,
+- options=None,
++ serialized_options=None,
+ serialized_start=548,
+ serialized_end=611,
+ )
++_sym_db.RegisterEnumDescriptor(_TILE_GEOMTYPE)
+
+
+ _TILE_VALUE = _descriptor.Descriptor(
+@@ -57,61 +65,64 @@ _TILE_VALUE = _descriptor.Descriptor(
+ _descriptor.FieldDescriptor(
+ name='string_value', full_name='mapnik.vector.tile.value.string_value', index=0,
+ number=1, type=9, cpp_type=9, label=1,
+- has_default_value=False, default_value=unicode("", "utf-8"),
++ has_default_value=False, default_value=_b("").decode('utf-8'),
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='float_value', full_name='mapnik.vector.tile.value.float_value', index=1,
+ number=2, type=2, cpp_type=6, label=1,
+- has_default_value=False, default_value=0,
++ has_default_value=False, default_value=float(0),
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='double_value', full_name='mapnik.vector.tile.value.double_value', index=2,
+ number=3, type=1, cpp_type=5, label=1,
+- has_default_value=False, default_value=0,
++ has_default_value=False, default_value=float(0),
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='int_value', full_name='mapnik.vector.tile.value.int_value', index=3,
+ number=4, type=3, cpp_type=2, 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),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='uint_value', full_name='mapnik.vector.tile.value.uint_value', index=4,
+ number=5, type=4, cpp_type=4, 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),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='sint_value', full_name='mapnik.vector.tile.value.sint_value', index=5,
+ number=6, type=18, cpp_type=2, 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),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='bool_value', full_name='mapnik.vector.tile.value.bool_value', index=6,
+ number=7, type=8, cpp_type=7, label=1,
+ has_default_value=False, default_value=False,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+ nested_types=[],
+ enum_types=[
+ ],
+- options=None,
++ serialized_options=None,
+ is_extendable=True,
++ syntax='proto2',
+ extension_ranges=[(8, 536870912), ],
++ oneofs=[
++ ],
+ serialized_start=89,
+ serialized_end=250,
+ )
+@@ -129,37 +140,40 @@ _TILE_FEATURE = _descriptor.Descriptor(
+ has_default_value=False, default_value=0,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='tags', full_name='mapnik.vector.tile.feature.tags', index=1,
+ number=2, type=13, cpp_type=3, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), '\020\001')),
++ serialized_options=_b('\020\001'), file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='type', full_name='mapnik.vector.tile.feature.type', index=2,
+ number=3, type=14, cpp_type=8, label=1,
+ has_default_value=True, default_value=0,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='geometry', full_name='mapnik.vector.tile.feature.geometry', index=3,
+ number=4, type=13, cpp_type=3, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), '\020\001')),
++ serialized_options=_b('\020\001'), file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+ nested_types=[],
+ enum_types=[
+ ],
+- options=None,
++ serialized_options=None,
+ is_extendable=False,
++ syntax='proto2',
+ extension_ranges=[],
++ oneofs=[
++ ],
+ serialized_start=252,
+ serialized_end=366,
+ )
+@@ -177,51 +191,54 @@ _TILE_LAYER = _descriptor.Descriptor(
+ has_default_value=True, default_value=1,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='name', full_name='mapnik.vector.tile.layer.name', index=1,
+ number=1, type=9, cpp_type=9, label=2,
+- has_default_value=False, default_value=unicode("", "utf-8"),
++ has_default_value=False, default_value=_b("").decode('utf-8'),
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='features', full_name='mapnik.vector.tile.layer.features', index=2,
+ number=2, type=11, cpp_type=10, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='keys', full_name='mapnik.vector.tile.layer.keys', index=3,
+ number=3, type=9, cpp_type=9, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='values', full_name='mapnik.vector.tile.layer.values', index=4,
+ number=4, type=11, cpp_type=10, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='extent', full_name='mapnik.vector.tile.layer.extent', index=5,
+ number=5, type=13, cpp_type=3, label=1,
+ has_default_value=True, default_value=4096,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+ nested_types=[],
+ enum_types=[
+ ],
+- options=None,
++ serialized_options=None,
+ is_extendable=True,
++ syntax='proto2',
+ extension_ranges=[(16, 536870912), ],
++ oneofs=[
++ ],
+ serialized_start=369,
+ serialized_end=546,
+ )
+@@ -239,7 +256,7 @@ _TILE = _descriptor.Descriptor(
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+@@ -247,52 +264,60 @@ _TILE = _descriptor.Descriptor(
+ enum_types=[
+ _TILE_GEOMTYPE,
+ ],
+- options=None,
++ serialized_options=None,
+ is_extendable=True,
++ syntax='proto2',
+ extension_ranges=[(16, 8192), ],
++ oneofs=[
++ ],
+ serialized_start=37,
+ serialized_end=618,
+ )
+
+-_TILE_VALUE.containing_type = _TILE;
++_TILE_VALUE.containing_type = _TILE
+ _TILE_FEATURE.fields_by_name['type'].enum_type = _TILE_GEOMTYPE
+-_TILE_FEATURE.containing_type = _TILE;
++_TILE_FEATURE.containing_type = _TILE
+ _TILE_LAYER.fields_by_name['features'].message_type = _TILE_FEATURE
+ _TILE_LAYER.fields_by_name['values'].message_type = _TILE_VALUE
+-_TILE_LAYER.containing_type = _TILE;
++_TILE_LAYER.containing_type = _TILE
+ _TILE.fields_by_name['layers'].message_type = _TILE_LAYER
+-_TILE_GEOMTYPE.containing_type = _TILE;
++_TILE_GEOMTYPE.containing_type = _TILE
+ DESCRIPTOR.message_types_by_name['tile'] = _TILE
++_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+-class tile(_message.Message):
+- __metaclass__ = _reflection.GeneratedProtocolMessageType
+-
+- class value(_message.Message):
+- __metaclass__ = _reflection.GeneratedProtocolMessageType
+- DESCRIPTOR = _TILE_VALUE
++tile = _reflection.GeneratedProtocolMessageType('tile', (_message.Message,), dict(
+
++ value = _reflection.GeneratedProtocolMessageType('value', (_message.Message,), dict(
++ DESCRIPTOR = _TILE_VALUE,
++ __module__ = 'vector_tile_pb2'
+ # @@protoc_insertion_point(class_scope:mapnik.vector.tile.value)
++ ))
++ ,
+
+- class feature(_message.Message):
+- __metaclass__ = _reflection.GeneratedProtocolMessageType
+- DESCRIPTOR = _TILE_FEATURE
+-
++ feature = _reflection.GeneratedProtocolMessageType('feature', (_message.Message,), dict(
++ DESCRIPTOR = _TILE_FEATURE,
++ __module__ = 'vector_tile_pb2'
+ # @@protoc_insertion_point(class_scope:mapnik.vector.tile.feature)
++ ))
++ ,
+
+- class layer(_message.Message):
+- __metaclass__ = _reflection.GeneratedProtocolMessageType
+- DESCRIPTOR = _TILE_LAYER
+-
++ layer = _reflection.GeneratedProtocolMessageType('layer', (_message.Message,), dict(
++ DESCRIPTOR = _TILE_LAYER,
++ __module__ = 'vector_tile_pb2'
+ # @@protoc_insertion_point(class_scope:mapnik.vector.tile.layer)
+- DESCRIPTOR = _TILE
+-
++ ))
++ ,
++ DESCRIPTOR = _TILE,
++ __module__ = 'vector_tile_pb2'
+ # @@protoc_insertion_point(class_scope:mapnik.vector.tile)
++ ))
++_sym_db.RegisterMessage(tile)
++_sym_db.RegisterMessage(tile.value)
++_sym_db.RegisterMessage(tile.feature)
++_sym_db.RegisterMessage(tile.layer)
+
+
+-DESCRIPTOR.has_options = True
+-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), 'H\003')
+-_TILE_FEATURE.fields_by_name['tags'].has_options = True
+-_TILE_FEATURE.fields_by_name['tags']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), '\020\001')
+-_TILE_FEATURE.fields_by_name['geometry'].has_options = True
+-_TILE_FEATURE.fields_by_name['geometry']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), '\020\001')
++DESCRIPTOR._options = None
++_TILE_FEATURE.fields_by_name['tags']._options = None
++_TILE_FEATURE.fields_by_name['geometry']._options = None
+ # @@protoc_insertion_point(module_scope)
+--- a/mapbox_vector_tile/Mapbox/vector_tile_p3_pb2.py
++++ b/mapbox_vector_tile/Mapbox/vector_tile_p3_pb2.py
+@@ -1,11 +1,12 @@
+ # Generated by the protocol buffer compiler. DO NOT EDIT!
+ # source: vector_tile.proto
+
++import sys
++_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+ from google.protobuf import descriptor as _descriptor
+ from google.protobuf import message as _message
+ from google.protobuf import reflection as _reflection
+ from google.protobuf import symbol_database as _symbol_database
+-from google.protobuf import descriptor_pb2
+ # @@protoc_insertion_point(imports)
+
+ _sym_db = _symbol_database.Default()
+@@ -17,9 +18,9 @@ DESCRIPTOR = _descriptor.FileDescriptor(
+ name='vector_tile.proto',
+ package='mapnik.vector',
+ syntax='proto2',
+- serialized_pb=b'\n\x11vector_tile.proto\x12\rmapnik.vector\"\xc5\x04\n\x04tile\x12)\n\x06layers\x18\x03 \x03(\x0b\x32\x19.mapnik.vector.tile.layer\x1a\xa1\x01\n\x05value\x12\x14\n\x0cstring_value\x18\x01 \x01(\t\x12\x13\n\x0b\x66loat_value\x18\x02 \x01(\x02\x12\x14\n\x0c\x64ouble_value\x18\x03 \x01(\x01\x12\x11\n\tint_value\x18\x04 \x01(\x03\x12\x12\n\nuint_value\x18\x05 \x01(\x04\x12\x12\n\nsint_value\x18\x06 \x01(\x12\x12\x12\n\nbool_value\x18\x07 \x01(\x08*\x08\x08\x08\x10\x80\x80\x80\x80\x02\x1ar\n\x07\x66\x65\x61ture\x12\n\n\x02id\x18\x01 \x01(\x04\x12\x10\n\x04tags\x18\x02 \x03(\rB\x02\x10\x01\x12\x33\n\x04type\x18\x03 \x01(\x0e\x32\x1c.mapnik.vector.tile.GeomType:\x07Unknown\x12\x14\n\x08geometry\x18\x04 \x03(\rB\x02\x10\x01\x1a\xb1\x01\n\x05layer\x12\x12\n\x07version\x18\x0f \x02(\r:\x01\x31\x12\x0c\n\x04name\x18\x01 \x02(\t\x12-\n\x08\x66\x65\x61tures\x18\x02 \x03(\x0b\x32\x1b.mapnik.vector.tile.feature\x12\x0c\n\x04keys\x18\x03 \x03(\t\x12)\n\x06values\x18\x04 \x03(\x0b\x32\x19.mapnik.vector.tile.value\x12\x14\n\x06\x65xtent\x18\x05 \x01(\r:\x04\x34\x30\x39\x36*\x08\x08\x10\x10\x80\x80\x80\x80\x02\"?\n\x08GeomType\x12\x0b\n\x07Unknown\x10\x00\x12\t\n\x05Point\x10\x01\x12\x0e\n\nLineString\x10\x02\x12\x0b\n\x07Polygon\x10\x03*\x05\x08\x10\x10\x80 at B\x02H\x03'
++ serialized_options=_b('H\003'),
++ serialized_pb=_b('\n\x11vector_tile.proto\x12\rmapnik.vector\"\xc5\x04\n\x04tile\x12)\n\x06layers\x18\x03 \x03(\x0b\x32\x19.mapnik.vector.tile.layer\x1a\xa1\x01\n\x05value\x12\x14\n\x0cstring_value\x18\x01 \x01(\t\x12\x13\n\x0b\x66loat_value\x18\x02 \x01(\x02\x12\x14\n\x0c\x64ouble_value\x18\x03 \x01(\x01\x12\x11\n\tint_value\x18\x04 \x01(\x03\x12\x12\n\nuint_value\x18\x05 \x01(\x04\x12\x12\n\nsint_value\x18\x06 \x01(\x12\x12\x12\n\nbool_value\x18\x07 \x01(\x08*\x08\x08\x08\x10\x80\x80\x80\x80\x02\x1ar\n\x07\x66\x65\x61ture\x12\n\n\x02id\x18\x01 \x01(\x04\x12\x10\n\x04tags\x18\x02 \x03(\rB\x02\x10\x01\x12\x33\n\x04type\x18\x03 \x01(\x0e\x32\x1c.mapnik.vector.tile.GeomType:\x07Unknown\x12\x14\n\x08geometry\x18\x04 \x03(\rB\x02\x10\x01\x1a\xb1\x01\n\x05layer\x12\x12\n\x07version\x18\x0f \x02(\r:\x01\x31\x12\x0c\n\x04name\x18\x01 \x02(\t\x12-\n\x08\x66\x65\x61tures\x18\x02 \x03(\x0b\x32\x1b.mapnik.vector.tile.feature\x12\x0c\n\x04keys\x18\x03 \x03(\t\x12)\n\x06values\x18\x04 \x03(\x0b\x32\x19.mapnik.vector.tile.value\x12\x14\n\x06\x65xtent\x18\x05 \x01(\r:\x04\x34\x30\x39\x36*\x08\x08\x10\x10\x80\x80\x80\x80\x02\"?\n\x08GeomType\x12\x0b\n\x07Unknown\x10\x00\x12\t\n\x05Point\x10\x01\x12\x0e\n\nLineString\x10\x02\x12\x0b\n\x07Polygon\x10\x03*\x05\x08\x10\x10\x80 at B\x02H\x03')
+ )
+-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+
+
+@@ -31,23 +32,23 @@ _TILE_GEOMTYPE = _descriptor.EnumDescrip
+ values=[
+ _descriptor.EnumValueDescriptor(
+ name='Unknown', index=0, number=0,
+- options=None,
++ serialized_options=None,
+ type=None),
+ _descriptor.EnumValueDescriptor(
+ name='Point', index=1, number=1,
+- options=None,
++ serialized_options=None,
+ type=None),
+ _descriptor.EnumValueDescriptor(
+ name='LineString', index=2, number=2,
+- options=None,
++ serialized_options=None,
+ type=None),
+ _descriptor.EnumValueDescriptor(
+ name='Polygon', index=3, number=3,
+- options=None,
++ serialized_options=None,
+ type=None),
+ ],
+ containing_type=None,
+- options=None,
++ serialized_options=None,
+ serialized_start=548,
+ serialized_end=611,
+ )
+@@ -64,59 +65,59 @@ _TILE_VALUE = _descriptor.Descriptor(
+ _descriptor.FieldDescriptor(
+ name='string_value', full_name='mapnik.vector.tile.value.string_value', index=0,
+ number=1, type=9, cpp_type=9, label=1,
+- has_default_value=False, default_value=b"".decode('utf-8'),
++ has_default_value=False, default_value=_b("").decode('utf-8'),
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='float_value', full_name='mapnik.vector.tile.value.float_value', index=1,
+ number=2, type=2, cpp_type=6, label=1,
+- has_default_value=False, default_value=0,
++ has_default_value=False, default_value=float(0),
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='double_value', full_name='mapnik.vector.tile.value.double_value', index=2,
+ number=3, type=1, cpp_type=5, label=1,
+- has_default_value=False, default_value=0,
++ has_default_value=False, default_value=float(0),
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='int_value', full_name='mapnik.vector.tile.value.int_value', index=3,
+ number=4, type=3, cpp_type=2, 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),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='uint_value', full_name='mapnik.vector.tile.value.uint_value', index=4,
+ number=5, type=4, cpp_type=4, 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),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='sint_value', full_name='mapnik.vector.tile.value.sint_value', index=5,
+ number=6, type=18, cpp_type=2, 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),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='bool_value', full_name='mapnik.vector.tile.value.bool_value', index=6,
+ number=7, type=8, cpp_type=7, label=1,
+ has_default_value=False, default_value=False,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+ nested_types=[],
+ enum_types=[
+ ],
+- options=None,
++ serialized_options=None,
+ is_extendable=True,
+ syntax='proto2',
+ extension_ranges=[(8, 536870912), ],
+@@ -139,35 +140,35 @@ _TILE_FEATURE = _descriptor.Descriptor(
+ has_default_value=False, default_value=0,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='tags', full_name='mapnik.vector.tile.feature.tags', index=1,
+ number=2, type=13, cpp_type=3, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')),
++ serialized_options=_b('\020\001'), file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='type', full_name='mapnik.vector.tile.feature.type', index=2,
+ number=3, type=14, cpp_type=8, label=1,
+ has_default_value=True, default_value=0,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='geometry', full_name='mapnik.vector.tile.feature.geometry', index=3,
+ number=4, type=13, cpp_type=3, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')),
++ serialized_options=_b('\020\001'), file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+ nested_types=[],
+ enum_types=[
+ ],
+- options=None,
++ serialized_options=None,
+ is_extendable=False,
+ syntax='proto2',
+ extension_ranges=[],
+@@ -190,49 +191,49 @@ _TILE_LAYER = _descriptor.Descriptor(
+ has_default_value=True, default_value=1,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='name', full_name='mapnik.vector.tile.layer.name', index=1,
+ number=1, type=9, cpp_type=9, label=2,
+- has_default_value=False, default_value=b"".decode('utf-8'),
++ has_default_value=False, default_value=_b("").decode('utf-8'),
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='features', full_name='mapnik.vector.tile.layer.features', index=2,
+ number=2, type=11, cpp_type=10, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='keys', full_name='mapnik.vector.tile.layer.keys', index=3,
+ number=3, type=9, cpp_type=9, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='values', full_name='mapnik.vector.tile.layer.values', index=4,
+ number=4, type=11, cpp_type=10, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='extent', full_name='mapnik.vector.tile.layer.extent', index=5,
+ number=5, type=13, cpp_type=3, label=1,
+ has_default_value=True, default_value=4096,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+ nested_types=[],
+ enum_types=[
+ ],
+- options=None,
++ serialized_options=None,
+ is_extendable=True,
+ syntax='proto2',
+ extension_ranges=[(16, 536870912), ],
+@@ -255,7 +256,7 @@ _TILE = _descriptor.Descriptor(
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+- options=None),
++ serialized_options=None, file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+@@ -263,7 +264,7 @@ _TILE = _descriptor.Descriptor(
+ enum_types=[
+ _TILE_GEOMTYPE,
+ ],
+- options=None,
++ serialized_options=None,
+ is_extendable=True,
+ syntax='proto2',
+ extension_ranges=[(16, 8192), ],
+@@ -282,6 +283,7 @@ _TILE_LAYER.containing_type = _TILE
+ _TILE.fields_by_name['layers'].message_type = _TILE_LAYER
+ _TILE_GEOMTYPE.containing_type = _TILE
+ DESCRIPTOR.message_types_by_name['tile'] = _TILE
++_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+ tile = _reflection.GeneratedProtocolMessageType('tile', (_message.Message,), dict(
+
+@@ -315,10 +317,7 @@ _sym_db.RegisterMessage(tile.feature)
+ _sym_db.RegisterMessage(tile.layer)
+
+
+-DESCRIPTOR.has_options = True
+-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), b'H\003')
+-_TILE_FEATURE.fields_by_name['tags'].has_options = True
+-_TILE_FEATURE.fields_by_name['tags']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')
+-_TILE_FEATURE.fields_by_name['geometry'].has_options = True
+-_TILE_FEATURE.fields_by_name['geometry']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), b'\020\001')
++DESCRIPTOR._options = None
++_TILE_FEATURE.fields_by_name['tags']._options = None
++_TILE_FEATURE.fields_by_name['geometry']._options = None
+ # @@protoc_insertion_point(module_scope)
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
missing-files.patch
+proto-source.patch
python3-protobuf.patch
+protobuf-3.6.1.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapbox-vector-tile/compare/7e62768774230b41bf834e3ea5caca60da3a77be...16c6d31fee5e410a1970b5f8e9f716d7486346fc
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapbox-vector-tile/compare/7e62768774230b41bf834e3ea5caca60da3a77be...16c6d31fee5e410a1970b5f8e9f716d7486346fc
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181012/486a5179/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list