Merge branch 'master' into plugins

This commit is contained in:
Eric Fischer
2017-04-17 16:01:12 -07:00
17 changed files with 5494 additions and 243 deletions
+4 -2
View File
@@ -244,7 +244,8 @@ std::vector<mvt_layer> parse_layers(int fd, int z, unsigned x, unsigned y, std::
int tp = -1;
std::string s;
stringify_value(properties->values[i], tp, s, "Filter output", jp->line, j);
std::map<std::string, int> nullmap;
stringify_value(properties->values[i], tp, s, "Filter output", jp->line, j, "", &nullmap);
if (tp >= 0) {
mvt_value v = stringified_to_mvt_value(tp, s.c_str());
l->second.tag(feature, std::string(properties->keys[i]->string), v);
@@ -458,7 +459,8 @@ serial_feature parse_feature(json_pull *jp, int z, unsigned x, unsigned y, std::
serial_val v;
v.type = -1;
stringify_value(properties->values[i], v.type, v.s, "Filter output", jp->line, j);
std::map<std::string, int> nullmap;
stringify_value(properties->values[i], v.type, v.s, "Filter output", jp->line, j, "", &nullmap);
if (v.type >= 0) {
sf.full_keys.push_back(std::string(properties->keys[i]->string));