From 68686e813b1b10ad135045e1344118fc2d981019 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Thu, 23 Aug 2018 17:45:33 -0700
Subject: [PATCH] Carry the per-node attributes into the tile structure

---
 mvt.hpp  |  2 ++
 tile.cpp | 22 ++++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/mvt.hpp b/mvt.hpp
index 26b415e..99d53cf 100644
--- a/mvt.hpp
+++ b/mvt.hpp
@@ -6,6 +6,7 @@
 #include <map>
 #include <set>
 #include <vector>
+#include <jsonpull/jsonpull.h>
 
 struct mvt_value;
 struct mvt_layer;
@@ -151,6 +152,7 @@ bool is_compressed(std::string const &data);
 int decompress(std::string const &input, std::string &output);
 int compress(std::string const &input, std::string &output);
 int dezig(unsigned n);
+void tag_object_v3(mvt_layer &layer, json_object *j, std::vector<unsigned long> &onto);
 
 mvt_value stringified_to_mvt_value(int type, const char *s);
 
diff --git a/tile.cpp b/tile.cpp
index 97aed2d..18f754a 100644
--- a/tile.cpp
+++ b/tile.cpp
@@ -58,11 +58,25 @@ extern "C" {
 pthread_mutex_t db_lock = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t var_lock = PTHREAD_MUTEX_INITIALIZER;
 
-std::vector<mvt_geometry> to_feature(drawvec &geom) {
+std::vector<mvt_geometry> to_feature(drawvec &geom, mvt_layer &layer) {
 	std::vector<mvt_geometry> out;
 
 	for (size_t i = 0; i < geom.size(); i++) {
-		out.push_back(mvt_geometry(geom[i].op, geom[i].x, geom[i].y, geom[i].elevation));
+		mvt_geometry g(geom[i].op, geom[i].x, geom[i].y, geom[i].elevation);
+
+		if (geom[i].attributes.size() != 0) {
+			json_pull *jp = json_begin_string(geom[i].attributes.c_str());
+			json_object *jo = json_read_tree(jp);
+			if (jo == NULL) {
+				fprintf(stderr, "Internal error: failed to reconstruct JSON %s\n", geom[i].attributes.c_str());
+				exit(EXIT_FAILURE);
+			}
+			tag_object_v3(layer, jo, g.attributes);
+			json_free(jo);
+			json_end(jp);
+		}
+
+		out.push_back(g);
 	}
 
 	return out;
@@ -1506,7 +1520,7 @@ void *run_prefilter(void *v) {
 
 		mvt_feature tmp_feature;
 		tmp_feature.type = sf.t;
-		tmp_feature.geometry = to_feature(sf.geometry);
+		tmp_feature.geometry = to_feature(sf.geometry, tmp_layer);
 		tmp_feature.id = sf.id;
 		tmp_feature.has_id = sf.has_id;
 		tmp_feature.dropped = sf.dropped;
@@ -2219,7 +2233,7 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
 				}
 
 				feature.type = layer_features[x].type;
-				feature.geometry = to_feature(layer_features[x].geom);
+				feature.geometry = to_feature(layer_features[x].geom, layer);
 				count += layer_features[x].geom.size();
 				layer_features[x].geom.clear();