mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-02 08:25:40 +02:00
* Put all of this back in geometry.cpp for conflict resolution * Stabilize line simplification to behave the same regardless of winding * Round instead of truncating when clipping lines * Restore non-Wagyu polygon clipping from prior to2fdec7d2* Make it round, not truncate, which reverts the last commit's test diffs * Clip in floating point, not integers, which makes no difference * Track nodes added at tile edges during clipping * Scale geometry up before wagyu to prevent changes from precision loss * Actually do the shared edge detection * Fix cases where nodes were not being added at the tile boundary * One more place I should have rounded * Narrow down where the discrepancy comes in * Revert "Narrow down where the discrepancy comes in" This reverts commit 221c4c5fc0ac9a6567e091c6a94b3d87dc8ade83. * Another attempt to narrow it down * The discrepancy seems to be introduced in reordering. No obvious bug * Was still truncating instead of rounding in projection * Also makes no difference... * Just forget that line reversal exists for a minute * Just reversal no coalescing * Try clipping in integers instead of floating point * Don't simplify after coalescing if they said no simplification * Check whether behavior is consistent with intentional simplification * Replace more floating point with integer * Are these three features enough to demonstrate the problem? * Add a few more nearby borders * All the features that touch tile 6/16/23 * Stay in integers in line simplification * More attempts to solve failures to simplify consistently * Fix most of the overflow errors * Fix known cases of integer overflow * All the tests change again * Pull clipping and scaling code back out into clip.cpp * Resolve the test conflicts * Stabilize choice of which three points to keep with different windings * Almost right, I think! * Fix collapse of islands to shards * Self-intersections in the same feature don't count * Revert "Self-intersections in the same feature don't count" This reverts commite04b19916e. * Don't scale down geometry if we are going to look for shared nodes * Fix the missing multiply that was keeping simplification from happening * Fix one more opportunity for overflow * Somehow I deleted this test? * Lost this test too * Clean up debugging printfs * Restore code sequence from main to make it reviewable * Remove unneeded rounding * Update documentation * This test is no longer useful * Back to floating point Douglas-Peucker to fix undersimplification * Try an older ubuntu * Revert "Try an older ubuntu" This reverts commit13fefacfd7. * Log OS info * Remove tests that are no longer needed * Oops, did need that one after all * Fix the arm vs x86 discrepancy? * Try another quantization * Cleanup from review * Add a test for the actual purpose of this PR
165 lines
4.6 KiB
C++
165 lines
4.6 KiB
C++
#ifndef SERIAL_HPP
|
|
#define SERIAL_HPP
|
|
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <vector>
|
|
#include <atomic>
|
|
#include <sys/stat.h>
|
|
#include "geometry.hpp"
|
|
#include "mbtiles.hpp"
|
|
#include "jsonpull/jsonpull.h"
|
|
|
|
size_t fwrite_check(const void *ptr, size_t size, size_t nitems, FILE *stream, std::atomic<long long> *fpos, const char *fname);
|
|
|
|
void serialize_int(FILE *out, int n, std::atomic<long long> *fpos, const char *fname);
|
|
void serialize_long_long(FILE *out, long long n, std::atomic<long long> *fpos, const char *fname);
|
|
void serialize_ulong_long(FILE *out, unsigned long long n, std::atomic<long long> *fpos, const char *fname);
|
|
void serialize_byte(FILE *out, signed char n, std::atomic<long long> *fpos, const char *fname);
|
|
void serialize_uint(FILE *out, unsigned n, std::atomic<long long> *fpos, const char *fname);
|
|
|
|
void serialize_int(std::string &out, int n);
|
|
void serialize_long_long(std::string &out, long long n);
|
|
void serialize_ulong_long(std::string &out, unsigned long long n);
|
|
void serialize_byte(std::string &out, signed char n);
|
|
void serialize_uint(std::string &out, unsigned n);
|
|
|
|
void deserialize_int(char **f, int *n);
|
|
void deserialize_long_long(char **f, long long *n);
|
|
void deserialize_ulong_long(char **f, unsigned long long *n);
|
|
void deserialize_uint(char **f, unsigned *n);
|
|
void deserialize_byte(char **f, signed char *n);
|
|
|
|
struct serial_val {
|
|
int type = 0;
|
|
std::string s = "";
|
|
};
|
|
|
|
struct serial_feature {
|
|
long long layer = 0;
|
|
int segment = 0;
|
|
long long seq = 0;
|
|
|
|
signed char t = 0;
|
|
signed char feature_minzoom = 0;
|
|
|
|
bool has_id = false;
|
|
unsigned long long id = 0;
|
|
|
|
bool has_tippecanoe_minzoom = false;
|
|
int tippecanoe_minzoom = 0;
|
|
|
|
bool has_tippecanoe_maxzoom = false;
|
|
int tippecanoe_maxzoom = 0;
|
|
|
|
drawvec geometry = drawvec();
|
|
unsigned long long index = 0;
|
|
unsigned long long label_point = 0;
|
|
long long extent = 0;
|
|
|
|
std::vector<long long> keys{};
|
|
std::vector<long long> values{};
|
|
|
|
// XXX This isn't serialized. Should it be here?
|
|
long long bbox[4] = {0, 0, 0, 0};
|
|
std::vector<std::string> full_keys{};
|
|
std::vector<serial_val> full_values{};
|
|
std::string layername = "";
|
|
bool dropped = false;
|
|
drawvec edge_nodes;
|
|
};
|
|
|
|
std::string serialize_feature(serial_feature *sf, long long wx, long long wy);
|
|
serial_feature deserialize_feature(std::string &geoms, unsigned z, unsigned tx, unsigned ty, unsigned *initial_x, unsigned *initial_y);
|
|
|
|
struct reader {
|
|
int poolfd = -1;
|
|
int treefd = -1;
|
|
int geomfd = -1;
|
|
int indexfd = -1;
|
|
|
|
struct memfile *poolfile = NULL;
|
|
struct memfile *treefile = NULL;
|
|
FILE *geomfile = NULL;
|
|
FILE *indexfile = NULL;
|
|
|
|
std::atomic<long long> geompos;
|
|
std::atomic<long long> indexpos;
|
|
|
|
long long file_bbox[4] = {0, 0, 0, 0};
|
|
|
|
long long file_bbox1[4] = {0xFFFFFFFF, 0xFFFFFFFF, 0, 0}; // standard -180 to 180 world plane
|
|
long long file_bbox2[4] = {0x1FFFFFFFF, 0xFFFFFFFF, 0x100000000, 0}; // 0 to 360 world plane
|
|
|
|
struct stat geomst {};
|
|
|
|
char *geom_map = NULL;
|
|
|
|
reader()
|
|
: geompos(0), indexpos(0) {
|
|
}
|
|
|
|
reader(reader const &r) {
|
|
poolfd = r.poolfd;
|
|
treefd = r.treefd;
|
|
geomfd = r.geomfd;
|
|
indexfd = r.indexfd;
|
|
|
|
poolfile = r.poolfile;
|
|
treefile = r.treefile;
|
|
geomfile = r.geomfile;
|
|
indexfile = r.indexfile;
|
|
|
|
long long p = r.geompos;
|
|
geompos = p;
|
|
|
|
p = r.indexpos;
|
|
indexpos = p;
|
|
|
|
memcpy(file_bbox, r.file_bbox, sizeof(file_bbox));
|
|
|
|
geomst = r.geomst;
|
|
|
|
geom_map = r.geom_map;
|
|
}
|
|
};
|
|
|
|
struct serialization_state {
|
|
const char *fname = NULL; // source file name
|
|
int line = 0; // user-oriented location within source for error reports
|
|
|
|
std::atomic<long long> *layer_seq = NULL; // sequence within current layer
|
|
std::atomic<long long> *progress_seq = NULL; // overall sequence for progress indicator
|
|
|
|
std::vector<struct reader> *readers = NULL; // array of data for each input thread
|
|
int segment = 0; // the current input thread
|
|
|
|
unsigned *initial_x = NULL; // relative offset of all geometries
|
|
unsigned *initial_y = NULL;
|
|
int *initialized = NULL;
|
|
|
|
double *dist_sum = NULL; // running tally for calculation of resolution within features
|
|
size_t *dist_count = NULL;
|
|
double *area_sum = NULL;
|
|
bool want_dist = false;
|
|
|
|
int maxzoom = 0;
|
|
int basezoom = 0;
|
|
|
|
bool filters = false;
|
|
bool uses_gamma = false;
|
|
|
|
std::map<std::string, layermap_entry> *layermap = NULL;
|
|
|
|
std::map<std::string, int> const *attribute_types = NULL;
|
|
std::set<std::string> *exclude = NULL;
|
|
std::set<std::string> *include = NULL;
|
|
int exclude_all = 0;
|
|
};
|
|
|
|
int serialize_feature(struct serialization_state *sst, serial_feature &sf);
|
|
void coerce_value(std::string const &key, int &vt, std::string &val, std::map<std::string, int> const *attribute_types);
|
|
|
|
#endif
|