Move attribute include/exclude logic into serialization

This commit is contained in:
Eric Fischer
2017-08-24 17:10:15 -07:00
parent 34b1b215f4
commit f4818ffb07
4 changed files with 44 additions and 24 deletions
+1 -5
View File
@@ -11,10 +11,6 @@
struct parse_json_args {
json_pull *jp;
std::set<std::string> *exclude;
std::set<std::string> *include;
int exclude_all;
int basezoom;
int layer;
std::string *layername;
std::map<std::string, int> const *attribute_types;
@@ -26,7 +22,7 @@ struct parse_json_args {
struct json_pull *json_begin_map(char *map, long long len);
void json_end_map(struct json_pull *jp);
void parse_json(struct serialization_state *sst, json_pull *jp, std::set<std::string> *exclude, std::set<std::string> *include, int exclude_all, int basezoom, int layer, std::string layername, std::map<std::string, int> const *attribute_types);
void parse_json(struct serialization_state *sst, json_pull *jp, int layer, std::string layername, std::map<std::string, int> const *attribute_types);
void *run_parse_json(void *v);
#endif