Merge branch 'master' into plugins

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.16.13
+
+* Add --detect-longitude-wraparound option
+
+## 1.16.12
+
+* Stop processing higher zooms when a feature reaches its explicit maxzoom tag
+
+## 1.16.11
+
+* Remove polygon splitting, since polygon cleaning is now fast enough
+
 ## 1.16.10
 
 * Add a tippecanoe-decode option to specify layer names

README.md

@@ -132,6 +132,7 @@ resolution is obtained than by using a smaller _maxzoom_ or _detail_.
  * -ad or --drop-fraction-as-needed: Dynamically drop some fraction of features from each zoom level to keep large tiles under the 500K size limit. (This is like `-pd` but applies to the entire zoom level, not to each tile.)
  * -an or --drop-smallest-as-needed: Dynamically drop the smallest features (physically smallest: the shortest lines or the smallest polygons) from each zoom level to keep large tiles under the 500K size limit. This option will not work for point features.
  * -aL or --grid-low-zooms: At all zoom levels below _maxzoom_, snap all lines and polygons to a stairstep grid instead of allowing diagonals. You will also want to specify a tile resolution, probably `-D8`. This option provides a way to display continuous parcel, gridded, or binned data at low zooms without overwhelming the tiles with tiny polygons, since features will either get stretched out to the grid unit or lost entirely, depending on how they happened to be aligned in the original data.
+ * -aw or --detect-longitude-wraparound: Detect when adjacent points within a feature jump to the other side of the world, and try to fix the geometry.
 
 ### Doing less
 
@@ -141,7 +142,7 @@ resolution is obtained than by using a smaller _maxzoom_ or _detail_.
  * -pk or --no-tile-size-limit: Don't limit tiles to 500K bytes
  * -pd or --force-feature-limit: Dynamically drop some fraction of features from large tiles to keep them under the 500K size limit. It will probably look ugly at the tile boundaries. (This is like `-ad` but applies to each tile individually, not to the entire zoom level.)
  * -pi or --preserve-input-order: Preserve the original input order of features as the drawing order instead of ordering geographically. (This is implemented as a restoration of the original order at the end, so that dot-dropping is still geographic, which means it also undoes -ao).
- * -pp or --no-polygon-splitting: Don't split complex polygons (over 700 vertices after simplification) into multiple features.
+ * -pp or --no-polygon-splitting: This no longer has any effect.
  * -pc or --no-clipping: Don't clip features to the size of the tile. If a feature overlaps the tile's bounds or buffer at all, it is included completely. Be careful: this can produce very large tilesets, especially with large polygons.
  * -pD or --no-duplication: As with --no-clipping, each feature is included intact instead of cut to tile boundaries. In addition, it is included only in a single tile per zoom level rather than potentially in multiple copies. Clients of the tileset must check adjacent tiles (possibly some distance away) to ensure they have all features.
  * -pt or --no-tiny-polygon-reduction: Don't combine the area of very small polygons into small squares that represent their combined area.
@@ -287,9 +288,6 @@ have their probability diffused, so that some of them will be drawn as a square
 this minimum size and others will not be drawn at all, preserving the total area that
 all of them should have had together.
 
-Any polygons that have over 700 vertices after line simplification will be split into
-multiple features so they can be rendered efficiently, unless you use -pp to prevent this.
-
 Features in the same tile that share the same type and attributes are coalesced
 together into a single geometry if you use `--coalesce`. You are strongly encouraged to use -x to exclude
 any unnecessary properties to reduce wasted file size.

geojson.cpp

@@ -40,7 +40,7 @@ extern "C" {
 #include "text.hpp"
 #include "read_json.hpp"
 
-static long long parse_geometry1(int t, json_object *j, long long *bbox, drawvec &geom, int op, const char *fname, int line, int *initialized, unsigned *initial_x, unsigned *initial_y, json_object *feature) {
+static long long parse_geometry1(int t, json_object *j, long long *bbox, drawvec &geom, int op, const char *fname, int line, int *initialized, unsigned *initial_x, unsigned *initial_y, json_object *feature, long long &prev, long long &offset, bool &has_prev) {
 	parse_geometry(t, j, geom, op, fname, line, feature);
 
 	for (size_t i = 0; i < geom.size(); i++) {
@@ -48,6 +48,22 @@ static long long parse_geometry1(int t, json_object *j, long long *bbox, drawvec
 			long long x = geom[i].x;
 			long long y = geom[i].y;
 
+			if (additional[A_DETECT_WRAPAROUND]) {
+				x += offset;
+				if (has_prev) {
+					if (x - prev > (1LL << 31)) {
+						offset -= 1LL << 32;
+						x -= 1LL << 32;
+					} else if (prev - x > (1LL << 31)) {
+						offset += 1LL << 32;
+						x += 1LL << 32;
+					}
+				}
+
+				has_prev = true;
+				prev = x;
+			}
+
 			if (x < bbox[0]) {
 				bbox[0] = x;
 			}
@@ -244,8 +260,12 @@ int serialize_geometry(json_object *geometry, json_object *properties, json_obje
 		}
 	}
 
+	bool has_prev = false;
+	long long prev = 0;
+	long long offset = 0;
+
 	drawvec dv;
-	long long g = parse_geometry1(t, coordinates, bbox, dv, VT_MOVETO, fname, line, initialized, initial_x, initial_y, feature);
+	long long g = parse_geometry1(t, coordinates, bbox, dv, VT_MOVETO, fname, line, initialized, initial_x, initial_y, feature, prev, offset, has_prev);
 	if (mb_geometry[t] == VT_POLYGON) {
 		dv = fix_polygon(dv);
 	}

main.cpp

@@ -1954,6 +1954,7 @@ int main(int argc, char **argv) {
 		{"drop-fraction-as-needed", no_argument, &additional[A_DROP_FRACTION_AS_NEEDED], 1},
 		{"drop-smallest-as-needed", no_argument, &additional[A_DROP_SMALLEST_AS_NEEDED], 1},
 		{"grid-low-zooms", no_argument, &additional[A_GRID_LOW_ZOOMS], 1},
+		{"detect-longitude-wraparound", no_argument, &additional[A_DETECT_WRAPAROUND], 1},
 
 		{"no-line-simplification", no_argument, &prevent[P_SIMPLIFY], 1},
 		{"simplify-only-low-zooms", no_argument, &prevent[P_SIMPLIFY_LOW], 1},

options.hpp

@@ -13,6 +13,7 @@
 #define A_DROP_FRACTION_AS_NEEDED ((int) 'd')
 #define A_DROP_SMALLEST_AS_NEEDED ((int) 'n')
 #define A_GRID_LOW_ZOOMS ((int) 'L')
+#define A_DETECT_WRAPAROUND ((int) 'w')
 
 #define P_SIMPLIFY ((int) 's')
 #define P_SIMPLIFY_LOW ((int) 'S')

tile.cpp

@@ -441,10 +441,6 @@ void *partial_feature_worker(void *v) {
 		std::vector<drawvec> geoms;
 		geoms.push_back(geom);
 
-		if (t == VT_POLYGON && !prevent[P_POLYGON_SPLIT]) {
-			geoms = chop_polygon(geoms);
-		}
-
 		if (t == VT_POLYGON) {
 			// Scaling may have made the polygon degenerate.
 			// Give Clipper a chance to try to fix it.
@@ -1283,7 +1279,9 @@ serial_feature next_feature(FILE *geoms, long long *geompos_in, char *metabase,
 		}
 
 		if (*first_time && pass == 1) { /* only write out the next zoom once, even if we retry */
-			rewrite(sf.geometry, z, nextzoom, maxzoom, sf.bbox, tx, ty, buffer, line_detail, within, geompos, geomfile, fname, sf.t, sf.layer, sf.metapos, sf.feature_minzoom, child_shards, max_zoom_increment, sf.seq, sf.tippecanoe_minzoom, sf.tippecanoe_maxzoom, sf.segment, initial_x, initial_y, sf.m, sf.keys, sf.values, sf.has_id, sf.id, sf.index, sf.extent);
+			if (sf.tippecanoe_maxzoom == -1 || sf.tippecanoe_maxzoom >= nextzoom) {
+				rewrite(sf.geometry, z, nextzoom, maxzoom, sf.bbox, tx, ty, buffer, line_detail, within, geompos, geomfile, fname, sf.t, sf.layer, sf.metapos, sf.feature_minzoom, child_shards, max_zoom_increment, sf.seq, sf.tippecanoe_minzoom, sf.tippecanoe_maxzoom, sf.segment, initial_x, initial_y, sf.m, sf.keys, sf.values, sf.has_id, sf.id, sf.index, sf.extent);
+			}
 		}
 
 		if (z < minzoom) {

version.hpp

@@ -1 +1 @@
-#define VERSION "tippecanoe v1.16.10\n"
+#define VERSION "tippecanoe v1.16.13\n"