mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-02 16:35:40 +02:00
Erica Fischer
e2a7a409c7
* Add a way to run tippecanoe single-threaded for profiling * Do less work when the tilestats sample values list is already full * Save a copy when retrieving the attribute key * Fewer atomic operations * Move string hashing from mbtiles to text * Only do approximate attribute deduplication when writing tiles * Feature dropping tests are sensitive to exact tile size * All tile creators now create a string pool for the tile * Features clipped away to nothing should not participate in that tile * Revert "Only do approximate attribute deduplication when writing tiles" This reverts commitc42b34b498. * Also revert the related test changes * Revert "Revert "Only do approximate attribute deduplication when writing tiles"" This reverts commit18509876c3. * Be more specific about the string hash function * Use fnv1a instead of std::hash for everything * Reduce the chance of hash collisions * Stick a hash search on the front of the tree search in addpool * Eliminate repeated hashing of the same string * Switch instead of ifs in json parsing * A few more cases to populate the hash in addpool * Store the hash in the tree instead of recalculating * Add explanatory comment for mysterious argument * Fewer copies in attribute stringification * Clean up ancient weirdness in JSON attribute stringification * More serial_val cleanup * Pass a serial_feature to rewrite instead of many broken-down arguments * Get rid of the multiple geometries within `partial` * Revert "Pass a serial_feature to rewrite instead of many broken-down arguments" This reverts commit6f4ab9b725. * Goodbye, struct coalesce * Revert "Features clipped away to nothing should not participate in that tile" This reverts commit124462fbdc. * Migrating fields from partial to serial_feature * Name reconciliation between serial_feature and partial * Replace struct partial with an augmented serial_feature * Fix some overzealous search-and-replace renaming * Don't say struct so often * Remove more of the former partial construction * Commenting and cleaning up * Trying again to avoid all these arguments to rewrite * I swear I did this same thing before and it didn't work. * More rewrite cleanup * Exile --detect-shared-borders to its own file * Add missing headers * More commenting and cleanup * More comments * Sprinkle consts around * Emplacing and std::moving * More cleanup * That shouldn't have worked after a std::move * Don't need to allocate memory to compare keys * Reduce use of the global string pool in tiling * Another avoidable mvt_value construction * Further reduction to explicit string pool passing * These reverses are no longer optimizations * These layernames can all be references * Don't drag an unused layername string around with every feature * Heed a compiler warning about potential buffer overflow * Fix my confusion about which feature's string pool is relevant * Avoid some unnecessary allocations in attribute accumulation * Maybe faster serialization? * Eliminate a comparison * Do the same here * Save a couple of allocations when parsing numbers in JSON * Immediately assign features to layers instead of subdividing later * Maintain tilestats for tippecanoe:retain_points_multiplier_sequence * Crunch out more duplicate attribute values when writing out the tile * Do tilestats for tippecanoe:retain_points_multiplier_first too * Shell filters need to be real threads, even if nothing else does * Simplify tippecanoe_minzoom/maxzoom representation * Update version and changelog
98 lines
1.9 KiB
C
98 lines
1.9 KiB
C
#ifndef JSONPULL_H
|
|
#define JSONPULL_H
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
typedef enum json_type {
|
|
// These types can be returned by json_read()
|
|
JSON_HASH,
|
|
JSON_ARRAY,
|
|
JSON_NUMBER,
|
|
JSON_STRING,
|
|
JSON_TRUE,
|
|
JSON_FALSE,
|
|
JSON_NULL,
|
|
|
|
// These and JSON_HASH and JSON_ARRAY can be called back by json_read_with_separators()
|
|
JSON_COMMA,
|
|
JSON_COLON,
|
|
|
|
// These are only used internally as expectations of what comes next
|
|
JSON_ITEM,
|
|
JSON_KEY,
|
|
JSON_VALUE,
|
|
} json_type;
|
|
|
|
typedef struct json_object {
|
|
struct json_object *parent;
|
|
struct json_pull *parser;
|
|
|
|
union {
|
|
struct {
|
|
double number;
|
|
unsigned long long large_unsigned;
|
|
long long large_signed;
|
|
} number;
|
|
|
|
struct {
|
|
char *string;
|
|
} string;
|
|
|
|
struct {
|
|
struct json_object **array;
|
|
size_t length;
|
|
} array;
|
|
|
|
struct {
|
|
struct json_object **keys;
|
|
struct json_object **values;
|
|
size_t length;
|
|
} object;
|
|
} value;
|
|
|
|
json_type type;
|
|
int expect;
|
|
} json_object;
|
|
|
|
typedef struct json_pull {
|
|
char *error;
|
|
int line;
|
|
|
|
ssize_t (*read)(struct json_pull *, char *buf, size_t n);
|
|
void *source;
|
|
char *buffer;
|
|
ssize_t buffer_tail;
|
|
ssize_t buffer_head;
|
|
|
|
json_object *container;
|
|
json_object *root;
|
|
|
|
struct string *number_buffer;
|
|
} json_pull;
|
|
|
|
json_pull *json_begin_file(FILE *f);
|
|
json_pull *json_begin_string(const char *s);
|
|
|
|
json_pull *json_begin(ssize_t (*read)(struct json_pull *, char *buffer, size_t n), void *source);
|
|
void json_end(json_pull *p);
|
|
|
|
typedef void (*json_separator_callback)(json_type type, json_pull *j, void *state);
|
|
|
|
json_object *json_read_tree(json_pull *j);
|
|
json_object *json_read(json_pull *j);
|
|
json_object *json_read_separators(json_pull *j, json_separator_callback cb, void *state);
|
|
void json_free(json_object *j);
|
|
void json_disconnect(json_object *j);
|
|
|
|
json_object *json_hash_get(json_object *o, const char *s);
|
|
|
|
char *json_stringify(json_object *o);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|