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

Clean up serialization

Browse Source
This commit is contained in:
Erica Fischer
2025-02-10 13:11:10 -08:00
parent 0ce1271b06
commit 752204fc94
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serial.cpp
+8 -14
View File
@@ -211,13 +211,13 @@ std::string serialize_feature(serial_feature *sf, long long wx, long long wy) {
if (sf->index != 0) { if (sf->index != 0) {
serialize_ulong_long(s, sf->index); serialize_ulong_long(s, sf->index);
serialize_ulong_long(s, sf->wx); serialize_uint(s, sf->wx);
serialize_ulong_long(s, sf->wy); serialize_uint(s, sf->wy);
serialize_ulong_long(s, sf->gap); serialize_ulong_long(s, sf->gap);
} }
if ((sf->label_x | sf->label_y) != 0) { if ((sf->label_x | sf->label_y) != 0) {
serialize_ulong_long(s, sf->label_x); serialize_uint(s, sf->label_x);
serialize_ulong_long(s, sf->label_y); serialize_uint(s, sf->label_y);
} }
if (sf->extent != 0) { if (sf->extent != 0) {
serialize_long_long(s, sf->extent); serialize_long_long(s, sf->extent);
@@ -271,20 +271,14 @@ 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)) {
unsigned long long wx, wy;
deserialize_ulong_long(&cp, &sf.index); deserialize_ulong_long(&cp, &sf.index);
deserialize_ulong_long(&cp, &wx); deserialize_uint(&cp, &sf.wx);
deserialize_ulong_long(&cp, &wy); deserialize_uint(&cp, &sf.wy);
sf.wx = wx;
sf.wy = wy;
deserialize_ulong_long(&cp, &sf.gap); deserialize_ulong_long(&cp, &sf.gap);
} }
if (sf.layer & (1 << FLAG_LABEL_POINT)) { if (sf.layer & (1 << FLAG_LABEL_POINT)) {
unsigned long long wx, wy; deserialize_uint(&cp, &sf.label_x);
deserialize_ulong_long(&cp, &wx); deserialize_uint(&cp, &sf.label_y);
deserialize_ulong_long(&cp, &wy);
sf.label_x = wx;
sf.label_y = wy;
} }
if (sf.layer & (1 << FLAG_EXTENT)) { if (sf.layer & (1 << FLAG_EXTENT)) {
deserialize_long_long(&cp, &sf.extent); deserialize_long_long(&cp, &sf.extent);