mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-02 16:35:40 +02:00
Erica FischerandCursor
3da03c6075
Replace the manual malloc/realloc/free memory management in jsonpull with std::shared_ptr ownership. Each json_object now owns its children through std::vector<json_object_ptr>; raw back-pointers to parent and parser remain valid by structural invariant and are cleared on json_disconnect so detached subtrees can outlive their parser. Strings become std::string, child arrays become std::vector, and the old union becomes a struct so non-trivial members can coexist while preserving the existing o->value.xxx access paths. The old jsonpull.c is replaced by jsonpull.cpp, json_stringify now returns std::string, and all callers across tippecanoe, tile-join, tippecanoe-decode, tippecanoe-json-tool, tippecanoe-overzoom and the unit tests are updated to use json_object_ptr / json_pull_ptr. Co-authored-by: Cursor <cursoragent@cursor.com>
17 lines
657 B
C++
17 lines
657 B
C++
#ifndef EVALUATOR_HPP
|
|
#define EVALUATOR HPP
|
|
|
|
#include <unordered_map>
|
|
#include <string>
|
|
#include <set>
|
|
#include "jsonpull/jsonpull.h"
|
|
#include "mvt.hpp"
|
|
|
|
bool evaluate(std::unordered_map<std::string, mvt_value> const &feature, std::string const &layer, json_object_ptr filter, std::set<std::string> &exclude_attributes, std::vector<std::string> const &unidecode_data);
|
|
json_object_ptr parse_filter(const char *s);
|
|
json_object_ptr read_filter(const char *fname);
|
|
|
|
bool evaluate(mvt_feature const &feat, mvt_layer const &layer, json_object_ptr filter, std::set<std::string> &exclude_attributes, int z, std::vector<std::string> const &unidecode_data);
|
|
|
|
#endif
|