Make drop-densest more consistent across tile boundaries

Makefile

@@ -494,7 +494,7 @@ layer-json-test:
 prep-test: $(TESTS)
 
 tests/%.json: Makefile tippecanoe tippecanoe-decode
-	./tippecanoe -q -a@ -f -o [email protected] $(call testargs,$(patsubst %.json,%,$(word 4,$(subst /, ,$@)))) $(foreach suffix,$(suffixes),$(sort $(wildcard $(subst $(SPACE),/,$(wordlist 1,2,$(subst /, ,$@)))/*.$(suffix))))
+	./tippecanoe -q -a@ -f -o [email protected] $(call testargs,$(patsubst %.json,%,$(word 4,$(subst /, ,$@)))) $(foreach suffix,$(suffixes),$(sort $(wildcard $(subst $(SPACE),/,$(wordlist 1,2,$(subst /, ,$@)))/*.$(suffix)))) < /dev/null
 	./tippecanoe-decode -x generator [email protected] > $@
 	cmp $(patsubst %.check,%,$@) $@
 	rm [email protected]

overzoom.cpp

@@ -11,7 +11,7 @@ extern char *optarg;
 extern int optind;
 
 int detail = 12;  // tippecanoe-style: mvt extent == 1 << detail
-int buffer = 5;  // tippecanoe-style: mvt buffer == extent * buffer / 256;
+int buffer = 5;	  // tippecanoe-style: mvt buffer == extent * buffer / 256;
 
 std::set<std::string> keep;
 

serial.cpp

@@ -225,6 +225,7 @@ std::string serialize_feature(serial_feature *sf, long long wx, long long wy) {
 	if (sf->index != 0) {
 		serialize_ulong_long(s, sf->index);
 	}
+	serialize_long_long(s, sf->gap);
 	if (sf->label_point != 0) {
 		serialize_ulong_long(s, sf->label_point);
 	}
@@ -262,9 +263,11 @@ serial_feature deserialize_feature(std::string &geoms, unsigned z, unsigned tx,
 	sf.has_id = false;
 	if (sf.layer & (1 << FLAG_MINZOOM)) {
 		deserialize_int(&cp, &sf.tippecanoe_minzoom);
+		sf.has_tippecanoe_minzoom = true;
 	}
 	if (sf.layer & (1 << FLAG_MAXZOOM)) {
 		deserialize_int(&cp, &sf.tippecanoe_maxzoom);
+		sf.has_tippecanoe_maxzoom = true;
 	}
 	if (sf.layer & (1 << FLAG_ID)) {
 		sf.has_id = true;
@@ -274,6 +277,7 @@ serial_feature deserialize_feature(std::string &geoms, unsigned z, unsigned tx,
 	deserialize_int(&cp, &sf.segment);
 
 	sf.index = 0;
+	sf.gap = -1;
 	sf.label_point = 0;
 	sf.extent = 0;
 
@@ -282,6 +286,7 @@ serial_feature deserialize_feature(std::string &geoms, unsigned z, unsigned tx,
 	if (sf.layer & (1 << FLAG_INDEX)) {
 		deserialize_ulong_long(&cp, &sf.index);
 	}
+	deserialize_long_long(&cp, &sf.gap);
 	if (sf.layer & (1 << FLAG_LABEL_POINT)) {
 		deserialize_ulong_long(&cp, &sf.label_point);
 	}
@@ -607,6 +612,8 @@ int serialize_feature(struct serialization_state *sst, serial_feature &sf) {
 		sf.index = 0;
 	}
 
+	sf.gap = -1;  // will be calculated during z0
+
 	if (sst->layermap->count(sf.layername) == 0) {
 		sst->layermap->insert(std::pair<std::string, layermap_entry>(sf.layername, layermap_entry(sst->layermap->size())));
 	}

serial.hpp

@@ -55,6 +55,7 @@ struct serial_feature {
 
 	drawvec geometry = drawvec();
 	unsigned long long index = 0;
+	long long gap = -1;
 	unsigned long long label_point = 0;
 	long long extent = 0;