diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-05 18:05:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Getting a little closer to 128-bit indices

Browse Source
This commit is contained in:
Erica Fischer
2024-04-03 14:21:32 -07:00
parent 6c148a63f7
commit da94dbf9c4
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projection.cpp
+2 -2
View File
@@ -150,7 +150,7 @@ void hilbert_d2xy(unsigned long long n, unsigned long long d, unsigned *x, unsig
} }
} }
unsigned long long encode_hilbert(unsigned int wx, unsigned int wy) { index_t encode_hilbert(unsigned int wx, unsigned int wy) {
return hilbert_xy2d(1LL << UINT_BITS, wx, wy); return hilbert_xy2d(1LL << UINT_BITS, wx, wy);
} }
@@ -158,7 +158,7 @@ void decode_hilbert(index_t index, unsigned *wx, unsigned *wy) {
hilbert_d2xy(1LL << UINT_BITS, index, wx, wy); hilbert_d2xy(1LL << UINT_BITS, index, wx, wy);
} }
unsigned long long encode_quadkey(unsigned int wx, unsigned int wy) { index_t encode_quadkey(unsigned int wx, unsigned int wy) {
unsigned long long out = 0; unsigned long long out = 0;
int i; int i;
projection.hpp
+2 -2
View File
@@ -23,10 +23,10 @@ extern struct projection projections[];
extern index_t (*encode_index)(unsigned int wx, unsigned int wy); extern index_t (*encode_index)(unsigned int wx, unsigned int wy);
extern void (*decode_index)(index_t index, unsigned *wx, unsigned *wy); extern void (*decode_index)(index_t index, unsigned *wx, unsigned *wy);
unsigned long long encode_quadkey(unsigned int wx, unsigned int wy); index_t encode_quadkey(unsigned int wx, unsigned int wy);
void decode_quadkey(index_t index, unsigned *wx, unsigned *wy); void decode_quadkey(index_t index, unsigned *wx, unsigned *wy);
unsigned long long encode_hilbert(unsigned int wx, unsigned int wy); index_t encode_hilbert(unsigned int wx, unsigned int wy);
void decode_hilbert(index_t index, unsigned *wx, unsigned *wy); void decode_hilbert(index_t index, unsigned *wx, unsigned *wy);
unsigned coordinate_to_encodable(long long coord); unsigned coordinate_to_encodable(long long coord);
serial.cpp
+19 -4
View File
@@ -92,6 +92,11 @@ void serialize_ulong_long(std::string &out, unsigned long long zigzag) {
out.append(buf, s - buf); out.append(buf, s - buf);
} }
void serialize_index(std::string &out, index_t zigzag) {
serialize_ulong_long(out, zigzag);
serialize_ulong_long(out, ((__uint128_t) zigzag) >> 64);
}
void serialize_long_long(std::string &out, long long n) { void serialize_long_long(std::string &out, long long n) {
unsigned long long zigzag = protozero::encode_zigzag64(n); unsigned long long zigzag = protozero::encode_zigzag64(n);
@@ -142,6 +147,16 @@ void deserialize_ulong_long(const char **f, unsigned long long *zigzag) {
} }
} }
void deserialize_index(const char **f, index_t *zigzag) {
unsigned long long bottom;
unsigned long long top;
deserialize_ulong_long(f, &bottom);
deserialize_ulong_long(f, &top);
*zigzag = (((__uint128_t) top) << 64) | bottom;
}
void deserialize_uint(const char **f, unsigned *n) { void deserialize_uint(const char **f, unsigned *n) {
unsigned long long v; unsigned long long v;
deserialize_ulong_long(f, &v); deserialize_ulong_long(f, &v);
@@ -209,10 +224,10 @@ std::string serialize_feature(serial_feature *sf, long long wx, long long wy) {
write_geometry(sf->geometry, s, wx, wy); write_geometry(sf->geometry, s, wx, wy);
if (sf->index != 0) { if (sf->index != 0) {
serialize_ulong_long(s, sf->index); serialize_index(s, sf->index);
} }
if (sf->label_point != 0) { if (sf->label_point != 0) {
serialize_ulong_long(s, sf->label_point); serialize_index(s, sf->label_point);
} }
if (sf->extent != 0) { if (sf->extent != 0) {
serialize_long_long(s, sf->extent); serialize_long_long(s, sf->extent);
@@ -264,10 +279,10 @@ serial_feature deserialize_feature(std::string const &geoms, unsigned z, unsigne
sf.geometry = decode_geometry(&cp, z, tx, ty, sf.bbox, initial_x[sf.segment], initial_y[sf.segment]); sf.geometry = decode_geometry(&cp, z, tx, ty, sf.bbox, initial_x[sf.segment], initial_y[sf.segment]);
if (sf.layer & (1 << FLAG_INDEX)) { if (sf.layer & (1 << FLAG_INDEX)) {
deserialize_ulong_long(&cp, &sf.index); deserialize_index(&cp, &sf.index);
} }
if (sf.layer & (1 << FLAG_LABEL_POINT)) { if (sf.layer & (1 << FLAG_LABEL_POINT)) {
deserialize_ulong_long(&cp, &sf.label_point); deserialize_index(&cp, &sf.label_point);
} }
if (sf.layer & (1 << FLAG_EXTENT)) { if (sf.layer & (1 << FLAG_EXTENT)) {
deserialize_long_long(&cp, &sf.extent); deserialize_long_long(&cp, &sf.extent);