Starting to factor out attribute accumulation into its own file

Makefile

@@ -58,7 +58,7 @@ C = $(wildcard *.c) $(wildcard *.cpp)
 INCLUDES = -I/usr/local/include -I.
 LIBS = -L/usr/local/lib
 
-tippecanoe: geojson.o jsonpull/jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o mvt.o serial.o main.o text.o dirtiles.o pmtiles_file.o plugin.o read_json.o write_json.o geobuf.o flatgeobuf.o evaluator.o geocsv.o csv.o geojson-loop.o json_logger.o visvalingam.o compression.o clip.o sort.o
+tippecanoe: geojson.o jsonpull/jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o mvt.o serial.o main.o text.o dirtiles.o pmtiles_file.o plugin.o read_json.o write_json.o geobuf.o flatgeobuf.o evaluator.o geocsv.o csv.o geojson-loop.o json_logger.o visvalingam.o compression.o clip.o sort.o attribute.o
 	$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 -lpthread
 
 tippecanoe-enumerate: enumerate.o

attribute.cpp

@@ -0,0 +1,78 @@
+#include <string>
+#include <map>
+#include "attribute.hpp"
+#include "errors.hpp"
+#include "jsonpull/jsonpull.h"
+
+void set_attribute_accum(std::map<std::string, attribute_op> &attribute_accum, std::string name, std::string type) {
+	attribute_op t;
+
+	if (type == "sum") {
+		t = op_sum;
+	} else if (type == "product") {
+		t = op_product;
+	} else if (type == "mean") {
+		t = op_mean;
+	} else if (type == "max") {
+		t = op_max;
+	} else if (type == "min") {
+		t = op_min;
+	} else if (type == "concat") {
+		t = op_concat;
+	} else if (type == "comma") {
+		t = op_comma;
+	} else {
+		fprintf(stderr, "Attribute method (%s) must be sum, product, mean, max, min, concat, or comma\n", type.c_str());
+		exit(EXIT_ARGS);
+	}
+
+	attribute_accum.insert(std::pair<std::string, attribute_op>(name, t));
+}
+
+void set_attribute_accum(std::map<std::string, attribute_op> &attribute_accum, const char *arg, char **argv) {
+	if (*arg == '{') {
+		json_pull *jp = json_begin_string(arg);
+		json_object *o = json_read_tree(jp);
+
+		if (o == NULL) {
+			fprintf(stderr, "%s: -E%s: %s\n", *argv, arg, jp->error);
+			exit(EXIT_JSON);
+		}
+
+		if (o->type != JSON_HASH) {
+			fprintf(stderr, "%s: -E%s: not a JSON object\n", *argv, arg);
+			exit(EXIT_JSON);
+		}
+
+		for (size_t i = 0; i < o->value.object.length; i++) {
+			json_object *k = o->value.object.keys[i];
+			json_object *v = o->value.object.values[i];
+
+			if (k->type != JSON_STRING) {
+				fprintf(stderr, "%s: -E%s: key %zu not a string\n", *argv, arg, i);
+				exit(EXIT_JSON);
+			}
+			if (v->type != JSON_STRING) {
+				fprintf(stderr, "%s: -E%s: value %zu not a string\n", *argv, arg, i);
+				exit(EXIT_JSON);
+			}
+
+			set_attribute_accum(attribute_accum, k->value.string.string, v->value.string.string);
+		}
+
+		json_free(o);
+		json_end(jp);
+		return;
+	}
+
+	const char *s = strchr(arg, ':');
+	if (s == NULL) {
+		fprintf(stderr, "-E%s option must be in the form -Ename:method\n", arg);
+		exit(EXIT_ARGS);
+	}
+
+	std::string name = std::string(arg, s - arg);
+	std::string type = std::string(s + 1);
+
+	set_attribute_accum(attribute_accum, name, type);
+}

attribute.hpp

@@ -0,0 +1,17 @@
+#ifndef ATTRIBUTE_HPP
+#define ATTRIBUTE_HPP
+
+enum attribute_op {
+	op_sum,
+	op_product,
+	op_mean,
+	op_concat,
+	op_comma,
+	op_max,
+	op_min,
+};
+
+void set_attribute_accum(std::map<std::string, attribute_op> &attribute_accum, std::string name, std::string type);
+void set_attribute_accum(std::map<std::string, attribute_op> &attribute_accum, const char *arg, char **argv);
+
+#endif

main.cpp

@@ -66,6 +66,7 @@
 #include "errors.hpp"
 #include "read_json.hpp"
 #include "sort.hpp"
+#include "attribute.hpp"
 
 static int low_detail = 12;
 static int full_detail = -1;
@@ -2871,79 +2872,6 @@ void set_attribute_type(std::map<std::string, int> &attribute_types, const char
 	attribute_types.insert(std::pair<std::string, int>(name, t));
 }
 
-void set_attribute_accum(std::map<std::string, attribute_op> &attribute_accum, std::string name, std::string type) {
-	attribute_op t;
-
-	if (type == "sum") {
-		t = op_sum;
-	} else if (type == "product") {
-		t = op_product;
-	} else if (type == "mean") {
-		t = op_mean;
-	} else if (type == "max") {
-		t = op_max;
-	} else if (type == "min") {
-		t = op_min;
-	} else if (type == "concat") {
-		t = op_concat;
-	} else if (type == "comma") {
-		t = op_comma;
-	} else {
-		fprintf(stderr, "Attribute method (%s) must be sum, product, mean, max, min, concat, or comma\n", type.c_str());
-		exit(EXIT_ARGS);
-	}
-
-	attribute_accum.insert(std::pair<std::string, attribute_op>(name, t));
-}
-
-void set_attribute_accum(std::map<std::string, attribute_op> &attribute_accum, const char *arg) {
-	if (*arg == '{') {
-		json_pull *jp = json_begin_string(arg);
-		json_object *o = json_read_tree(jp);
-
-		if (o == NULL) {
-			fprintf(stderr, "%s: -E%s: %s\n", *av, arg, jp->error);
-			exit(EXIT_JSON);
-		}
-
-		if (o->type != JSON_HASH) {
-			fprintf(stderr, "%s: -E%s: not a JSON object\n", *av, arg);
-			exit(EXIT_JSON);
-		}
-
-		for (size_t i = 0; i < o->value.object.length; i++) {
-			json_object *k = o->value.object.keys[i];
-			json_object *v = o->value.object.values[i];
-
-			if (k->type != JSON_STRING) {
-				fprintf(stderr, "%s: -E%s: key %zu not a string\n", *av, arg, i);
-				exit(EXIT_JSON);
-			}
-			if (v->type != JSON_STRING) {
-				fprintf(stderr, "%s: -E%s: value %zu not a string\n", *av, arg, i);
-				exit(EXIT_JSON);
-			}
-
-			set_attribute_accum(attribute_accum, k->value.string.string, v->value.string.string);
-		}
-
-		json_free(o);
-		json_end(jp);
-		return;
-	}
-
-	const char *s = strchr(arg, ':');
-	if (s == NULL) {
-		fprintf(stderr, "-E%s option must be in the form -Ename:method\n", arg);
-		exit(EXIT_ARGS);
-	}
-
-	std::string name = std::string(arg, s - arg);
-	std::string type = std::string(s + 1);
-
-	set_attribute_accum(attribute_accum, name, type);
-}
-
 void set_attribute_value(const char *arg) {
 	if (*arg == '{') {
 		json_pull *jp = json_begin_string(arg);
@@ -3694,7 +3622,7 @@ int main(int argc, char **argv) {
 			break;
 
 		case 'E':
-			set_attribute_accum(attribute_accum, optarg);
+			set_attribute_accum(attribute_accum, optarg, argv);
 			break;
 
 		default: {

tile.cpp

@@ -43,6 +43,7 @@
 #include "errors.hpp"
 #include "compression.hpp"
 #include "protozero/varint.hpp"
+#include "attribute.hpp"
 
 extern "C" {
 #include "jsonpull/jsonpull.h"

tile.hpp

@@ -8,18 +8,9 @@
 #include <map>
 #include "mbtiles.hpp"
 #include "serial.hpp"
+#include "attribute.hpp"
 #include "jsonpull/jsonpull.h"
 
-enum attribute_op {
-	op_sum,
-	op_product,
-	op_mean,
-	op_concat,
-	op_comma,
-	op_max,
-	op_min,
-};
-
 struct atomic_strategy {
 	std::atomic<size_t> dropped_by_rate;
 	std::atomic<size_t> dropped_by_gamma;