Adding the joined attribute should be per-feature, not per-attribute

felt · Jan 7, 2025 · 3d22a41 · 3d22a41
1 parent b0326b6
commit 3d22a41
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/tile-join.cpp b/tile-join.cpp
@@ -305,6 +305,26 @@ void append_tile(std::string message, int z, unsigned x, unsigned y, std::map<st
 			std::map<std::string, std::pair<mvt_value, serial_val>> attributes;
 			std::vector<std::string> key_order;
 
+			if (f < joined.size()) {
+				if (joined[f].size() > 0) {
+					matched = true;
+				}
+
+				for (auto const &joined_feature : joined[f]) {
+					for (auto const &kv : joined_feature) {
+						if (kv.first == attribute_for_id) {
+							outfeature.has_id = true;
+							outfeature.id = mvt_value_to_long_long(kv.second);
+						} else if (include.count(kv.first) || (!exclude_all && exclude.count(kv.first) == 0 && exclude_attributes.count(kv.first) == 0)) {
+							if (kv.second.type != mvt_null) {
+								attributes.insert(std::pair<std::string, std::pair<mvt_value, serial_val>>(kv.first, std::pair<mvt_value, serial_val>(kv.second, mvt_value_to_serial_val(kv.second))));
+								key_order.push_back(kv.first);
+							}
+						}
+					}
+				}
+			}
+
 			for (size_t t = 0; t + 1 < feat.tags.size(); t += 2) {
 				const std::string &key = layer.keys[feat.tags[t]];
 				mvt_value &val = layer.values[feat.tags[t + 1]];
@@ -321,26 +341,6 @@ void append_tile(std::string message, int z, unsigned x, unsigned y, std::map<st
 					}
 				}
 
-				if (f < joined.size()) {
-					if (joined[f].size() > 0) {
-						matched = true;
-					}
-
-					for (auto const &joined_feature : joined[f]) {
-						for (auto const &kv : joined_feature) {
-							if (kv.first == attribute_for_id) {
-								outfeature.has_id = true;
-								outfeature.id = mvt_value_to_long_long(kv.second);
-							} else if (include.count(kv.first) || (!exclude_all && exclude.count(kv.first) == 0 && exclude_attributes.count(kv.first) == 0)) {
-								if (kv.second.type != mvt_null) {
-									attributes.insert(std::pair<std::string, std::pair<mvt_value, serial_val>>(kv.first, std::pair<mvt_value, serial_val>(kv.second, mvt_value_to_serial_val(kv.second))));
-									key_order.push_back(kv.first);
-								}
-							}
-						}
-					}
-				}
-
 				if (header.size() > 0 && key == header[0]) {
 					std::map<std::string, std::vector<std::string>>::iterator ii = mapping.find(sv.s);