diff --git a/setup.cfg b/setup.cfg index 7d99292..bb43499 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,3 @@ [metadata] -version = attr: vtzero.version.__version__ +name = vtzero +version = 0.0.1b5 diff --git a/vendor/mvt-fixtures b/vendor/mvt-fixtures index aeeb6ff..c629300 160000 --- a/vendor/mvt-fixtures +++ b/vendor/mvt-fixtures @@ -1 +1 @@ -Subproject commit aeeb6ff59fcd09a152d99506a2f87b353ec65dc8 +Subproject commit c629300e853dd5502e8eced356234eb48c994199 diff --git a/vendor/protozero b/vendor/protozero index aa8b304..f379578 160000 --- a/vendor/protozero +++ b/vendor/protozero @@ -1 +1 @@ -Subproject commit aa8b304cf63831589f52c254b5af2c688bdc2fc4 +Subproject commit f379578a3f7c8162aac0ac31c2696de09a5b5f93 diff --git a/vendor/vtzero b/vendor/vtzero index 5e70144..32c3648 160000 --- a/vendor/vtzero +++ b/vendor/vtzero @@ -1 +1 @@ -Subproject commit 5e70144a3a2ea1231b6e271ec75b6d49198eaa67 +Subproject commit 32c364863430278b31d229b0d568284ca30371da diff --git a/vtzero/cvtzero.pxd b/vtzero/cvtzero.pxd index c8c1629..a3ae624 100644 --- a/vtzero/cvtzero.pxd +++ b/vtzero/cvtzero.pxd @@ -82,6 +82,8 @@ cdef extern from 'vtzero/builder.hpp' namespace 'vtzero': void set_point(const point p) void set_point(const int32_t x, const int32_t y) void add_property(char* key, char* value) + void add_property(char* key, const int32_t value) + void add_property(char* key, const double value) void set_id(const uint64_t id) void commit() void rollback() @@ -94,6 +96,8 @@ cdef extern from 'vtzero/builder.hpp' namespace 'vtzero': void set_point(const point p) void set_point(const int32_t x, const int32_t y) void add_property(char* key, char* value) + void add_property(char* key, const int32_t value) + void add_property(char* key, const double value) void set_id(const uint64_t id) void commit() void rollback() @@ -105,17 +109,18 @@ cdef extern from 'vtzero/builder.hpp' namespace 'vtzero': void set_point(const point p) void set_point(const int32_t x, const int32_t y) void add_property(char* key, char* value) + void add_property(char* key, const int32_t value) + void add_property(char* key, const double value) void set_id(const uint64_t id) void commit() void rollback() cdef cppclass tile_builder: tile_builder() - layer_builder_impl* add_layer(layer& layer) layer_builder_impl* add_layer(const char*, uint32_t version, uint32_t extent) string serialize() cdef cppclass layer_builder: layer_builder() - layer_builder(tile_builder& tile, char* name) + layer_builder(tile_builder& tile, char* name, uint32_t version, uint32_t extent) void add_feature(const feature& feature) diff --git a/vtzero/tile.pyx b/vtzero/tile.pyx index 0b1645a..3c0372b 100644 --- a/vtzero/tile.pyx +++ b/vtzero/tile.pyx @@ -117,8 +117,8 @@ cdef class Layer: cdef cvtzero.layer_builder* builder - def __cinit__(self, Tile tile, char* name): - self.builder = new cvtzero.layer_builder(tile.builder, name) + def __cinit__(self, Tile tile, char* name, version=2, extent=4096): + self.builder = new cvtzero.layer_builder(tile.builder, name, version, extent) cdef class Point: @@ -137,9 +137,16 @@ cdef class Point: def set_point(self, x, y): self.builder.set_point(x, y) - def add_property(self, char* key, char* value): + def add_property(self, char* key, char*value): + self.builder.add_property(key, value) + + def add_property(self, char* key, float value): self.builder.add_property(key, value) + def add_property(self, char* key, int value): + self.builder.add_property(key, value) + + def set_id(self, int id): self.builder.set_id(id) @@ -169,6 +176,12 @@ cdef class Polygon: def add_property(self, char* key, char* value): self.builder.add_property(key, value) + def add_property(self, char* key, float value): + self.builder.add_property(key, value) + + def add_property(self, char* key, int value): + self.builder.add_property(key, value) + def set_id(self, int id): self.builder.set_id(id) @@ -195,6 +208,12 @@ cdef class Linestring: def add_property(self, char* key, char* value): self.builder.add_property(key, value) + def add_property(self, char* key, float value): + self.builder.add_property(key, value) + + def add_property(self, char* key, int value): + self.builder.add_property(key, value) + def set_id(self, int id): self.builder.set_id(id)