mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-02 16:35:40 +02:00
Erica FischerandCursor
05b1762077
- jsontool.cpp `out()`: route JSON_NUMBER (and anything else non-string)
through `json_stringify` instead of `o->string()`, which now asserts
on a non-string type and would crash `--extract` on numeric attributes.
- geojson.{hpp,cpp} `json_end_map`: take `json_pull_ptr` by reference so
the caller's shared_ptr is released, null-guard before touching
`jp->source`, and clear `jp->source` after delete to avoid a dangling
pointer.
- jsonpull/jsonpull.cpp: low-surrogate range check was comparing the
outer-loop byte `c` instead of the parsed code unit `ch`, breaking
surrogate-pair decoding for some \\uXXXX escapes. Pre-existing bug
preserved across the port.
- tile-join.cpp `handle_vector_layers`: require the field value to have
type JSON_STRING (and the key to be non-null) before calling
`string()`; the previous truthy `type` check would assert on a
non-string value.
Co-authored-by: Cursor <cursoragent@cursor.com>
31 lines
718 B
C++
31 lines
718 B
C++
#ifndef GEOJSON_HPP
|
|
#define GEOJSON_HPP
|
|
|
|
#include <stdio.h>
|
|
#include <set>
|
|
#include <map>
|
|
#include <string>
|
|
#include "mbtiles.hpp"
|
|
#include "jsonpull/jsonpull.h"
|
|
#include "serial.hpp"
|
|
|
|
struct parse_json_args {
|
|
json_pull_ptr jp;
|
|
int layer;
|
|
std::string *layername;
|
|
|
|
struct serialization_state *sst;
|
|
|
|
parse_json_args(json_pull_ptr jp1, int layer1, std::string *layername1, struct serialization_state *sst1)
|
|
: jp(jp1), layer(layer1), layername(layername1), sst(sst1) {
|
|
}
|
|
};
|
|
|
|
json_pull_ptr json_begin_map(char *map, long long len);
|
|
void json_end_map(json_pull_ptr &jp);
|
|
|
|
void parse_json(struct serialization_state *sst, json_pull_ptr jp, int layer, std::string layername);
|
|
void *run_parse_json(void *v);
|
|
|
|
#endif
|