From 02994bccd5c92fa3c8c214d1eedcb370ff7ebd39 Mon Sep 17 00:00:00 2001 From: Erica Fischer Date: Fri, 11 Apr 2025 10:35:53 -0700 Subject: [PATCH] Get rid of the "segment" field of the index, which is no longer used --- main.hpp | 11 ++++++----- serial.cpp | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main.hpp b/main.hpp index 714af5c3..6b979cfa 100644 --- a/main.hpp +++ b/main.hpp @@ -11,15 +11,16 @@ #include "serial.hpp" struct index { - long long start = 0; + long long start = 0; // offset of data in geom file long long end = 0; - unsigned long long ix = 0; - short segment = 0; - unsigned short t : 2; - unsigned long long seq : (64 - 18); // pack with segment and t to stay in 32 bytes + unsigned long long ix = 0; // quadkey or hilbert index + unsigned short t : 2; // geometry type + unsigned short dup : 8; // instance number of identical geometry + unsigned long long seq : (64 - 2 - 8); // input sequence number; pack with t and dup to stay in 32 bytes index() : t(0), + dup(0), seq(0) { } }; diff --git a/serial.cpp b/serial.cpp index 5afc2ed2..224cd886 100644 --- a/serial.cpp +++ b/serial.cpp @@ -882,7 +882,6 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf, std:: struct index index; index.start = geomstart; index.end = r->geompos; - index.segment = sst->segment; index.seq = *(sst->layer_seq); index.t = sf.t; index.ix = bbox_index;