Clean up #includes and add fields for counting attributes

This commit is contained in:
Eric Fischer
2017-07-14 16:56:23 -07:00
parent 24a182772f
commit 65c095cc2b
18 changed files with 123 additions and 10 deletions
+12
View File
@@ -1,3 +1,13 @@
#ifndef GEOJSON_HPP
#define GEOJSON_HPP
#include <stdio.h>
#include <set>
#include <map>
#include <string>
#include "mbtiles.hpp"
#include "jsonpull/jsonpull.h"
struct parse_json_args {
json_pull *jp;
const char *reading;
@@ -39,3 +49,5 @@ void json_end_map(struct json_pull *jp);
void parse_json(json_pull *jp, const char *reading, volatile long long *layer_seq, volatile long long *progress_seq, long long *metapos, long long *geompos, long long *indexpos, std::set<std::string> *exclude, std::set<std::string> *include, int exclude_all, FILE *metafile, FILE *geomfile, FILE *indexfile, struct memfile *poolfile, struct memfile *treefile, char *fname, int basezoom, int layer, double droprate, long long *file_bbox, int segment, int *initialized, unsigned *initial_x, unsigned *initial_y, struct reader *readers, int maxzoom, std::map<std::string, layermap_entry> *layermap, std::string layername, bool uses_gamma, std::map<std::string, int> const *attribute_types, double *dist_sum, size_t *dist_count, bool want_dist);
void *run_parse_json(void *v);
#endif