Merge remote-tracking branch 'origin/main' into flatgeobuf-fix

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 2.15.0
+
+* Generate label points in a more straightforward checkerboard, and fewer of them at high zoom levels.
+
+## 2.14.0
+
+* Don't preflight each zoom level if one of the as-needed options is specified. Instead, go ahead and write out the tiles, and then clear out the zoom level for another try if necessary.
+
+## 2.13.1
+
+* Simplify geometry earlier when the in-memory representation of a tile gets large, to reduce peak memory usage
+
 ## 2.13.0
 
 * Add --limit-tile-feature-count and --limit-tile-feature-count-at-maximum-zoom

dirtiles.cpp

@@ -24,13 +24,19 @@ std::string dir_read_tile(std::string base, struct zxy tile) {
 }
 
 void dir_write_tile(const char *outdir, int z, int tx, int ty, std::string const &pbf) {
+	// Don't check mkdir error returns, since most of these calls to
+	// mkdir will be creating directories that already exist.
 	mkdir(outdir, S_IRWXU | S_IRWXG | S_IRWXO);
+
 	std::string curdir(outdir);
 	std::string slash("/");
+
 	std::string newdir = curdir + slash + std::to_string(z);
 	mkdir(newdir.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
+
 	newdir = newdir + "/" + std::to_string(tx);
 	mkdir(newdir.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
+
 	newdir = newdir + "/" + std::to_string(ty) + ".pbf";
 
 	struct stat st;
@@ -39,9 +45,21 @@ void dir_write_tile(const char *outdir, int z, int tx, int ty, std::string const
 		exit(EXIT_EXISTS);
 	}
 
-	std::ofstream pbfFile(newdir, std::ios::out | std::ios::binary);
+	FILE *fp = fopen(newdir.c_str(), "wb");
-	pbfFile.write(pbf.data(), pbf.size());
+	if (fp == NULL) {
-	pbfFile.close();
+		fprintf(stderr, "%s: %s\n", newdir.c_str(), strerror(errno));
+		exit(EXIT_WRITE);
+	}
+
+	if (fwrite(pbf.c_str(), sizeof(char), pbf.size(), fp) != pbf.size()) {
+		fprintf(stderr, "%s: %s\n", newdir.c_str(), strerror(errno));
+		exit(EXIT_WRITE);
+	}
+
+	if (fclose(fp) != 0) {
+		fprintf(stderr, "%s: %s\n", newdir.c_str(), strerror(errno));
+		exit(EXIT_CLOSE);
+	}
 }
 
 static bool numeric(const char *s) {
@@ -160,6 +178,54 @@ std::vector<zxy> enumerate_dirtiles(const char *fname, int minzoom, int maxzoom)
 	return tiles;
 }
 
+void dir_erase_zoom(const char *fname, int zoom) {
+	DIR *d1 = opendir(fname);
+	if (d1 != NULL) {
+		struct dirent *dp;
+		while ((dp = readdir(d1)) != NULL) {
+			if (numeric(dp->d_name) && atoi(dp->d_name) == zoom) {
+				std::string z = std::string(fname) + "/" + dp->d_name;
+
+				DIR *d2 = opendir(z.c_str());
+				if (d2 == NULL) {
+					perror(z.c_str());
+					exit(EXIT_OPEN);
+				}
+
+				struct dirent *dp2;
+				while ((dp2 = readdir(d2)) != NULL) {
+					if (numeric(dp2->d_name)) {
+						std::string x = z + "/" + dp2->d_name;
+
+						DIR *d3 = opendir(x.c_str());
+						if (d3 == NULL) {
+							perror(x.c_str());
+							exit(EXIT_OPEN);
+						}
+
+						struct dirent *dp3;
+						while ((dp3 = readdir(d3)) != NULL) {
+							if (pbfname(dp3->d_name)) {
+								std::string y = x + "/" + dp3->d_name;
+								if (unlink(y.c_str()) != 0) {
+									perror(y.c_str());
+									exit(EXIT_UNLINK);
+								}
+							}
+						}
+
+						closedir(d3);
+					}
+				}
+
+				closedir(d2);
+			}
+		}
+
+		closedir(d1);
+	}
+}
+
 sqlite3 *dirmeta2tmp(const char *fname) {
 	sqlite3 *db;
 	char *err = NULL;

dirtiles.hpp

@@ -6,6 +6,7 @@
 #define DIRTILES_HPP
 
 void dir_write_tile(const char *outdir, int z, int tx, int ty, std::string const &pbf);
+void dir_erase_zoom(const char *outdir, int z);
 
 void check_dir(const char *d, char **argv, bool force, bool forcetable);
 

geometry.cpp

@@ -1612,13 +1612,7 @@ drawvec polygon_to_anchor(const drawvec &geom) {
 	return drawvec();
 }
 
-static double dist(long long x1, long long y1, long long x2, long long y2) {
+drawvec checkerboard_anchors(drawvec const &geom, int tx, int ty, int z, unsigned long long label_point) {
-	double dx = x2 - x1;
-	double dy = y2 - y1;
-	return sqrt(dx * dx + dy * dy);
-}
-
-drawvec spiral_anchors(drawvec const &geom, int tx, int ty, int z, unsigned long long label_point) {
 	drawvec out;
 
 	// anchor point in world coordinates
@@ -1628,48 +1622,59 @@ drawvec spiral_anchors(drawvec const &geom, int tx, int ty, int z, unsigned long
 	// upper left of tile in world coordinates
 	long long tx1 = 0, ty1 = 0;
 	// lower right of tile in world coordinates;
-	long long tx2 = 1LL << 32, ty2 = 1LL << 32;
+	long long tx2 = 1LL << 32; // , ty2 = 1LL << 32;
 	if (z != 0) {
 		tx1 = (long long) tx << (32 - z);
 		ty1 = (long long) ty << (32 - z);
 
 		tx2 = (long long) (tx + 1) << (32 - z);
-		ty2 = (long long) (ty + 1) << (32 - z);
+		// ty2 = (long long) (ty + 1) << (32 - z);
 	}
 
-	// min and max distance of corners of this tile from the label point
+	// upper left of feature in world coordinates
-	double min_radius, max_radius;
+	long long bx1 = LLONG_MAX, by1 = LLONG_MAX;
-	if (wx >= tx1 && wx <= tx2 && wy >= ty1 && wy <= ty2) {
+	// lower right of feature in world coordinates;
-		// center is in this tile,
+	long long bx2 = LLONG_MIN, by2 = LLONG_MIN;
-		// so min is 0, max can't be more than sqrt(2) tiles
+
-		min_radius = 0;
+	for (auto const &g : geom) {
-		max_radius = sqrt(2);
+		bx1 = std::min(bx1, g.x + tx1);
-	} else {
+		by1 = std::min(by1, g.y + ty1);
-		// center is elsewhere,
+
-		// so min is at most sqrt(2)/2 tiles short of the center of the tile
+		bx2 = std::max(bx2, g.x + tx1);
-		// and max is at most sqrt(2)/2 tiles past the center of the tile
+		by2 = std::max(by2, g.y + ty1);
-		min_radius = std::max(0.0, dist(wx, wy, (tx1 + tx2) / 2, (ty1 + ty2) / 2) / (1LL << (32 - z)) - sqrt(2) / 2);
-		max_radius = min_radius + sqrt(2);
 	}
 
-	// labels complete a circle every 0.4 tiles of radius
+	if (bx1 > bx2 || by1 > by2) {
-	const double spiral_dist = 0.4;
+		return out;
+	}
 
-	size_t min_i = pow(min_radius / spiral_dist, 2);
+	// labels repeat every 0.3 tiles at z0
-	size_t max_i = pow(max_radius / spiral_dist, 2);
+	double spiral_dist = 0.3;
+	if (z > 0) {
+		// only every ~6 tiles by the time we get to z15
+		spiral_dist = spiral_dist * exp(log(z) * 1.2);
+	}
 
-	// https://craftofcoding.wordpress.com/tag/sunflower-spiral/
+	const long long label_spacing = spiral_dist * (tx2 - tx1);
-	double angle = M_PI * (3.0 - sqrt(5.0));  // 137.5 in radians
 
-	for (size_t i = min_i; i <= max_i; i++) {
+	long long x1 = floor(std::min(bx1 - wx, bx2 - wx) / label_spacing);
-		double r = sqrt(i) * spiral_dist;
+	long long x2 = ceil(std::max(bx1 - wx, bx2 - wx) / label_spacing);
-		double theta = i * angle;
-		// Convert polar to cartesian
-		long long x = r * cos(theta) * (1LL << (32 - z)) + wx;
-		long long y = r * sin(theta) * (1LL << (32 - z)) + wy;
 
-		if (x >= tx1 && x <= tx2 && y >= ty1 && y <= ty2) {
+	long long y1 = floor(std::min(by1 - wy, by2 - wy) / label_spacing - 0.5);
-			// is it actually inside the bounding box of the feature? then keep it.
+	long long y2 = ceil(std::max(by1 - wy, by2 - wy) / label_spacing);
+
+	for (long long lx = x1; lx <= x2; lx++) {
+		for (long long ly = y1; ly <= y2; ly++) {
+			long long x = lx * label_spacing + wx;
+			long long y = ly * label_spacing + wy;
+
+			if (((unsigned long long) lx & 1) == 1) {
+				y += label_spacing / 2;
+			}
+
+			if (x < bx1 || x > bx2 || y < by1 || y > by2) {
+				continue;
+			}
 
 			for (size_t a = 0; a < geom.size(); a++) {
 				if (geom[a].op == VT_MOVETO) {
@@ -1683,7 +1688,7 @@ drawvec spiral_anchors(drawvec const &geom, int tx, int ty, int z, unsigned long
 					// If it's the central label, it's the best we've got,
 					// so accept it in any case. If it's from the outer spiral,
 					// don't use it if it's too close to a border.
-					if (i == 0) {
+					if (lx == 0 && ly == 0) {
 						out.push_back(draw(VT_MOVETO, x - tx1, y - ty1));
 						break;
 					} else {

geometry.hpp

@@ -79,7 +79,7 @@ void check_polygon(drawvec &geom);
 double get_area(const drawvec &geom, size_t i, size_t j);
 double get_mp_area(drawvec &geom);
 drawvec polygon_to_anchor(const drawvec &geom);
-drawvec spiral_anchors(drawvec const &geom, int tx, int ty, int z, unsigned long long label_point);
+drawvec checkerboard_anchors(drawvec const &geom, int tx, int ty, int z, unsigned long long label_point);
 
 drawvec simple_clip_poly(drawvec &geom, long long x1, long long y1, long long x2, long long y2);
 drawvec clip_lines(drawvec &geom, long long x1, long long y1, long long x2, long long y2);

mbtiles.cpp

@@ -73,14 +73,14 @@ sqlite3 *mbtiles_open(char *dbname, char **argv, int forcetable) {
 		}
 	}
 
-	// "images" maps a content hash to tile contents
+	// "images" maps a content hash to tile contents, per zoom level
-	if (sqlite3_exec(outdb, "CREATE TABLE images (tile_data blob, tile_id text);", NULL, NULL, &err) != SQLITE_OK) {
+	if (sqlite3_exec(outdb, "CREATE TABLE images (zoom_level integer, tile_data blob, tile_id text);", NULL, NULL, &err) != SQLITE_OK) {
 		fprintf(stderr, "%s: create images table: %s\n", argv[0], err);
 		if (!forcetable) {
 			exit(EXIT_EXISTS);
 		}
 	}
-	if (sqlite3_exec(outdb, "CREATE UNIQUE INDEX images_id ON images (tile_id);", NULL, NULL, &err) != SQLITE_OK) {
+	if (sqlite3_exec(outdb, "CREATE UNIQUE INDEX images_id ON images (zoom_level, tile_id);", NULL, NULL, &err) != SQLITE_OK) {
 		fprintf(stderr, "%s: create images index: %s\n", argv[0], err);
 		if (!forcetable) {
 			exit(EXIT_EXISTS);
@@ -89,7 +89,7 @@ sqlite3 *mbtiles_open(char *dbname, char **argv, int forcetable) {
 
 	// "tiles" is a view that retrieves content from "images"
 	// via the content hash looked up from "map".
-	if (sqlite3_exec(outdb, "CREATE VIEW tiles AS SELECT map.zoom_level AS zoom_level, map.tile_column AS tile_column, map.tile_row AS tile_row, images.tile_data AS tile_data FROM map JOIN images ON images.tile_id = map.tile_id;", NULL, NULL, &err) != SQLITE_OK) {
+	if (sqlite3_exec(outdb, "CREATE VIEW tiles AS SELECT map.zoom_level AS zoom_level, map.tile_column AS tile_column, map.tile_row AS tile_row, images.tile_data AS tile_data FROM map JOIN images ON images.tile_id = map.tile_id and images.zoom_level = map.zoom_level;", NULL, NULL, &err) != SQLITE_OK) {
 		fprintf(stderr, "%s: create tiles view: %s\n", argv[0], err);
 		if (!forcetable) {
 			exit(EXIT_EXISTS);
@@ -113,20 +113,23 @@ void mbtiles_write_tile(sqlite3 *outdb, int z, int tx, int ty, const char *data,
 	// following https://github.com/mapbox/node-mbtiles/blob/master/lib/mbtiles.js
 
 	sqlite3_stmt *stmt;
-	const char *images = "replace into images (tile_id, tile_data) values (?, ?)";
+	const char *images = "replace into images (zoom_level, tile_id, tile_data) values (?, ?, ?)";
 	if (sqlite3_prepare_v2(outdb, images, -1, &stmt, NULL) != SQLITE_OK) {
 		fprintf(stderr, "sqlite3 images prep failed\n");
 		exit(EXIT_SQLITE);
 	}
 
-	sqlite3_bind_blob(stmt, 1, hash.c_str(), hash.size(), NULL);
+	sqlite3_bind_int(stmt, 1, z);
-	sqlite3_bind_blob(stmt, 2, data, size, NULL);
+	sqlite3_bind_blob(stmt, 2, hash.c_str(), hash.size(), NULL);
+	sqlite3_bind_blob(stmt, 3, data, size, NULL);
 
 	if (sqlite3_step(stmt) != SQLITE_DONE) {
 		fprintf(stderr, "sqlite3 images insert failed: %s\n", sqlite3_errmsg(outdb));
+		exit(EXIT_SQLITE);
 	}
 	if (sqlite3_finalize(stmt) != SQLITE_OK) {
 		fprintf(stderr, "sqlite3 images finalize failed: %s\n", sqlite3_errmsg(outdb));
+		exit(EXIT_SQLITE);
 	}
 
 	const char *map = "insert into map (zoom_level, tile_column, tile_row, tile_id) values (?, ?, ?, ?)";
@@ -142,9 +145,47 @@ void mbtiles_write_tile(sqlite3 *outdb, int z, int tx, int ty, const char *data,
 
 	if (sqlite3_step(stmt) != SQLITE_DONE) {
 		fprintf(stderr, "sqlite3 map insert failed: %s\n", sqlite3_errmsg(outdb));
+		exit(EXIT_SQLITE);
 	}
 	if (sqlite3_finalize(stmt) != SQLITE_OK) {
-		fprintf(stderr, "sqlite3 map finalize failed: %s\n", sqlite3_errmsg(outdb));
+		fprintf(stderr, "sqlite3 finalize failed: %s\n", sqlite3_errmsg(outdb));
+		exit(EXIT_SQLITE);
+	}
+}
+
+void mbtiles_erase_zoom(sqlite3 *outdb, int z) {
+	sqlite3_stmt *stmt;
+
+	const char *query = "delete from map where zoom_level = ?";
+	if (sqlite3_prepare_v2(outdb, query, -1, &stmt, NULL) != SQLITE_OK) {
+		fprintf(stderr, "sqlite3 delete map prep failed\n");
+		exit(EXIT_SQLITE);
+	}
+
+	sqlite3_bind_int(stmt, 1, z);
+	if (sqlite3_step(stmt) != SQLITE_DONE) {
+		fprintf(stderr, "sqlite3 delete map failed: %s\n", sqlite3_errmsg(outdb));
+		exit(EXIT_SQLITE);
+	}
+	if (sqlite3_finalize(stmt) != SQLITE_OK) {
+		fprintf(stderr, "sqlite3 delete map finalize failed: %s\n", sqlite3_errmsg(outdb));
+		exit(EXIT_SQLITE);
+	}
+
+	query = "delete from images where zoom_level = ?";
+	if (sqlite3_prepare_v2(outdb, query, -1, &stmt, NULL) != SQLITE_OK) {
+		fprintf(stderr, "sqlite3 delete images prep failed\n");
+		exit(EXIT_SQLITE);
+	}
+
+	sqlite3_bind_int(stmt, 1, z);
+	if (sqlite3_step(stmt) != SQLITE_DONE) {
+		fprintf(stderr, "sqlite3 delete images failed: %s\n", sqlite3_errmsg(outdb));
+		exit(EXIT_SQLITE);
+	}
+	if (sqlite3_finalize(stmt) != SQLITE_OK) {
+		fprintf(stderr, "sqlite3 delete images finalize failed: %s\n", sqlite3_errmsg(outdb));
+		exit(EXIT_SQLITE);
 	}
 }
 

mbtiles.hpp

@@ -46,6 +46,7 @@ struct layermap_entry {
 sqlite3 *mbtiles_open(char *dbname, char **argv, int forcetable);
 
 void mbtiles_write_tile(sqlite3 *outdb, int z, int tx, int ty, const char *data, int size);
+void mbtiles_erase_zoom(sqlite3 *outdb, int z);
 
 void mbtiles_write_metadata(sqlite3 *outdb, const char *outdir, const char *fname, int minzoom, int maxzoom, double minlat, double minlon, double maxlat, double maxlon, double midlat, double midlon, int forcetable, const char *attribution, std::map<std::string, layermap_entry> const &layermap, bool vector, const char *description, bool do_tilestats, std::map<std::string, std::string> const &attribute_descriptions, std::string const &program, std::string const &commandline, std::vector<strategy> const &strategies);
 

tests/ne_110m_admin_0_countries/out/-z2_--convert-polygons-to-label-points.json

@@ -366,7 +366,7 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "New Zealand", "sov_a3": "NZ1", "adm0_dif": 1, "level": 2, "type": "Country", "admin": "New Zealand", "adm0_a3": "NZL", "geou_dif": 0, "geounit": "New Zealand", "gu_a3": "NZL", "su_dif": 0, "subunit": "New Zealand", "su_a3": "NZL", "brk_diff": 0, "name": "New Zealand", "name_long": "New Zealand", "brk_a3": "NZL", "brk_name": "New Zealand", "abbrev": "N.Z.", "postal": "NZ", "formal_en": "New Zealand", "name_sort": "New Zealand", "mapcolor7": 3, "mapcolor8": 3, "mapcolor9": 4, "mapcolor13": 4, "pop_est": 4213418, "gdp_md_est": 116700, "pop_year": -99, "lastcensus": 2006, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "NZ", "iso_a3": "NZL", "iso_n3": "554", "un_a3": "554", "wb_a2": "NZ", "wb_a3": "NZL", "woe_id": -99, "adm0_a3_is": "NZL", "adm0_a3_us": "NZL", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Oceania", "region_un": "Oceania", "subregion": "Australia and New Zealand", "region_wb": "East Asia & Pacific", "name_len": 11, "long_len": 11, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 170.419922, -44.024422 ] } }
 ,
-{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 4.833984, 70.757966 ] } }
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "MultiPoint", "coordinates": [ [ -103.183594, -83.932990 ], [ 4.833984, -74.496413 ], [ 112.851562, -83.932990 ] ] } }
 ] }
 ] }
 ,
@@ -389,6 +389,8 @@
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Argentina", "sov_a3": "ARG", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Argentina", "adm0_a3": "ARG", "geou_dif": 0, "geounit": "Argentina", "gu_a3": "ARG", "su_dif": 0, "subunit": "Argentina", "su_a3": "ARG", "brk_diff": 0, "name": "Argentina", "name_long": "Argentina", "brk_a3": "ARG", "brk_name": "Argentina", "abbrev": "Arg.", "postal": "AR", "formal_en": "Argentine Republic", "name_sort": "Argentina", "mapcolor7": 3, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 13, "pop_est": 40913584, "gdp_md_est": 573900, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "5. Emerging region: G20", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "AR", "iso_a3": "ARG", "iso_n3": "032", "un_a3": "032", "wb_a2": "AR", "wb_a3": "ARG", "woe_id": -99, "adm0_a3_is": "ARG", "adm0_a3_us": "ARG", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "South America", "region_un": "Americas", "subregion": "South America", "region_wb": "Latin America & Caribbean", "name_len": 9, "long_len": 9, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -65.434570, -36.350527 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 5, "sovereignt": "United Kingdom", "sov_a3": "GB1", "adm0_dif": 1, "level": 2, "type": "Dependency", "admin": "Falkland Islands", "adm0_a3": "FLK", "geou_dif": 0, "geounit": "Falkland Islands", "gu_a3": "FLK", "su_dif": 0, "subunit": "Falkland Islands", "su_a3": "FLK", "brk_diff": 1, "name": "Falkland Is.", "name_long": "Falkland Islands", "brk_a3": "B12", "brk_name": "Falkland Is.", "abbrev": "Flk. Is.", "postal": "FK", "formal_en": "Falkland Islands", "note_adm0": "U.K.", "note_brk": "Admin. by U.K.; Claimed by Argentina", "name_sort": "Falkland Islands", "name_alt": "Islas Malvinas", "mapcolor7": 6, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 3, "pop_est": 3140, "gdp_md_est": 105.1, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "FK", "iso_a3": "FLK", "iso_n3": "238", "un_a3": "238", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "FLK", "adm0_a3_us": "FLK", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "South America", "region_un": "Americas", "subregion": "South America", "region_wb": "Latin America & Caribbean", "name_len": 12, "long_len": 16, "abbrev_len": 8, "tiny": -99, "homepart": -99 }, "geometry": { "type": "Point", "coordinates": [ -59.458008, -51.699800 ] } }
+,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "MultiPoint", "coordinates": [ [ -103.139648, -83.932990 ], [ -49.130859, -80.297927 ] ] } }
 ] }
 ] }
 ,
@@ -428,6 +430,8 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Colombia", "sov_a3": "COL", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Colombia", "adm0_a3": "COL", "geou_dif": 0, "geounit": "Colombia", "gu_a3": "COL", "su_dif": 0, "subunit": "Colombia", "su_a3": "COL", "brk_diff": 0, "name": "Colombia", "name_long": "Colombia", "brk_a3": "COL", "brk_name": "Colombia", "abbrev": "Col.", "postal": "CO", "formal_en": "Republic of Colombia", "name_sort": "Colombia", "mapcolor7": 2, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 1, "pop_est": 45644023, "gdp_md_est": 395400, "pop_year": -99, "lastcensus": 2006, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "CO", "iso_a3": "COL", "iso_n3": "170", "un_a3": "170", "wb_a2": "CO", "wb_a3": "COL", "woe_id": -99, "adm0_a3_is": "COL", "adm0_a3_us": "COL", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "South America", "region_un": "Americas", "subregion": "South America", "region_wb": "Latin America & Caribbean", "name_len": 8, "long_len": 8, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -73.125000, 3.995781 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Ecuador", "sov_a3": "ECU", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Ecuador", "adm0_a3": "ECU", "geou_dif": 0, "geounit": "Ecuador", "gu_a3": "ECU", "su_dif": 0, "subunit": "Ecuador", "su_a3": "ECU", "brk_diff": 0, "name": "Ecuador", "name_long": "Ecuador", "brk_a3": "ECU", "brk_name": "Ecuador", "abbrev": "Ecu.", "postal": "EC", "formal_en": "Republic of Ecuador", "name_sort": "Ecuador", "mapcolor7": 1, "mapcolor8": 5, "mapcolor9": 2, "mapcolor13": 12, "pop_est": 14573101, "gdp_md_est": 107700, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "EC", "iso_a3": "ECU", "iso_n3": "218", "un_a3": "218", "wb_a2": "EC", "wb_a3": "ECU", "woe_id": -99, "adm0_a3_is": "ECU", "adm0_a3_us": "ECU", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "South America", "region_un": "Americas", "subregion": "South America", "region_wb": "Latin America & Caribbean", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -78.398438, -1.406109 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 5, "sovereignt": "United States of America", "sov_a3": "US1", "adm0_dif": 1, "level": 2, "type": "Dependency", "admin": "Puerto Rico", "adm0_a3": "PRI", "geou_dif": 0, "geounit": "Puerto Rico", "gu_a3": "PRI", "su_dif": 0, "subunit": "Puerto Rico", "su_a3": "PRI", "brk_diff": 0, "name": "Puerto Rico", "name_long": "Puerto Rico", "brk_a3": "PRI", "brk_name": "Puerto Rico", "abbrev": "P.R.", "postal": "PR", "formal_en": "Commonwealth of Puerto Rico", "note_adm0": "Commonwealth of U.S.A.", "name_sort": "Puerto Rico", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": 1, "pop_est": 3971020, "gdp_md_est": 70230, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "PR", "iso_a3": "PRI", "iso_n3": "630", "un_a3": "630", "wb_a2": "PR", "wb_a3": "PRI", "woe_id": -99, "adm0_a3_is": "PRI", "adm0_a3_us": "PRI", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "North America", "region_un": "Americas", "subregion": "Caribbean", "region_wb": "Latin America & Caribbean", "name_len": 11, "long_len": 11, "abbrev_len": 4, "tiny": -99, "homepart": -99 }, "geometry": { "type": "Point", "coordinates": [ -66.489258, 18.271086 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Venezuela", "sov_a3": "VEN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Venezuela", "adm0_a3": "VEN", "geou_dif": 0, "geounit": "Venezuela", "gu_a3": "VEN", "su_dif": 0, "subunit": "Venezuela", "su_a3": "VEN", "brk_diff": 0, "name": "Venezuela", "name_long": "Venezuela", "brk_a3": "VEN", "brk_name": "Venezuela", "abbrev": "Ven.", "postal": "VE", "formal_en": "Bolivarian Republic of Venezuela", "formal_fr": "República Bolivariana de Venezuela", "name_sort": "Venezuela, RB", "mapcolor7": 1, "mapcolor8": 3, "mapcolor9": 1, "mapcolor13": 4, "pop_est": 26814843, "gdp_md_est": 357400, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "5. Emerging region: G20", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "VE", "iso_a3": "VEN", "iso_n3": "862", "un_a3": "862", "wb_a2": "VE", "wb_a3": "VEN", "woe_id": -99, "adm0_a3_is": "VEN", "adm0_a3_us": "VEN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "South America", "region_un": "Americas", "subregion": "South America", "region_wb": "Latin America & Caribbean", "name_len": 9, "long_len": 9, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -66.181641, 7.231699 ] } }
@@ -450,6 +454,8 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Spain", "sov_a3": "ESP", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Spain", "adm0_a3": "ESP", "geou_dif": 0, "geounit": "Spain", "gu_a3": "ESP", "su_dif": 0, "subunit": "Spain", "su_a3": "ESP", "brk_diff": 0, "name": "Spain", "name_long": "Spain", "brk_a3": "ESP", "brk_name": "Spain", "abbrev": "Sp.", "postal": "E", "formal_en": "Kingdom of Spain", "name_sort": "Spain", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 5, "mapcolor13": 5, "pop_est": 40525002, "gdp_md_est": 1403000, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "ES", "iso_a3": "ESP", "iso_n3": "724", "un_a3": "724", "wb_a2": "ES", "wb_a3": "ESP", "woe_id": -99, "adm0_a3_is": "ESP", "adm0_a3_us": "ESP", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Southern Europe", "region_wb": "Europe & Central Asia", "name_len": 5, "long_len": 5, "abbrev_len": 3, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -3.647461, 40.446947 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Algeria", "sov_a3": "DZA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Algeria", "adm0_a3": "DZA", "geou_dif": 0, "geounit": "Algeria", "gu_a3": "DZA", "su_dif": 0, "subunit": "Algeria", "su_a3": "DZA", "brk_diff": 0, "name": "Algeria", "name_long": "Algeria", "brk_a3": "DZA", "brk_name": "Algeria", "abbrev": "Alg.", "postal": "DZ", "formal_en": "People's Democratic Republic of Algeria", "name_sort": "Algeria", "mapcolor7": 5, "mapcolor8": 1, "mapcolor9": 6, "mapcolor13": 3, "pop_est": 34178188, "gdp_md_est": 232900, "pop_year": -99, "lastcensus": 2008, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "DZ", "iso_a3": "DZA", "iso_n3": "012", "un_a3": "012", "wb_a2": "DZ", "wb_a3": "DZA", "woe_id": -99, "adm0_a3_is": "DZA", "adm0_a3_us": "DZA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Northern Africa", "region_wb": "Middle East & North Africa", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 2.548828, 28.459033 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 7, "sovereignt": "Western Sahara", "sov_a3": "SAH", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Western Sahara", "adm0_a3": "SAH", "geou_dif": 0, "geounit": "Western Sahara", "gu_a3": "SAH", "su_dif": 0, "subunit": "Western Sahara", "su_a3": "SAH", "brk_diff": 1, "name": "W. Sahara", "name_long": "Western Sahara", "brk_a3": "B28", "brk_name": "W. Sahara", "abbrev": "W. Sah.", "postal": "WS", "formal_en": "Sahrawi Arab Democratic Republic", "note_adm0": "Self admin.", "note_brk": "Self admin.; Claimed by Morocco", "name_sort": "Western Sahara", "mapcolor7": 4, "mapcolor8": 7, "mapcolor9": 4, "mapcolor13": 4, "pop_est": -99, "gdp_md_est": -99, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "EH", "iso_a3": "ESH", "iso_n3": "732", "un_a3": "732", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "MAR", "adm0_a3_us": "SAH", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Northern Africa", "region_wb": "Middle East & North Africa", "name_len": 9, "long_len": 14, "abbrev_len": 7, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -12.172852, 24.367114 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Gambia", "sov_a3": "GMB", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Gambia", "adm0_a3": "GMB", "geou_dif": 0, "geounit": "Gambia", "gu_a3": "GMB", "su_dif": 0, "subunit": "Gambia", "su_a3": "GMB", "brk_diff": 0, "name": "Gambia", "name_long": "The Gambia", "brk_a3": "GMB", "brk_name": "Gambia", "abbrev": "Gambia", "postal": "GM", "formal_en": "Republic of the Gambia", "name_sort": "Gambia, The", "mapcolor7": 1, "mapcolor8": 4, "mapcolor9": 1, "mapcolor13": 8, "pop_est": 1782893, "gdp_md_est": 2272, "pop_year": -99, "lastcensus": 2003, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "GM", "iso_a3": "GMB", "iso_n3": "270", "un_a3": "270", "wb_a2": "GM", "wb_a3": "GMB", "woe_id": -99, "adm0_a3_is": "GMB", "adm0_a3_us": "GMB", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Western Africa", "region_wb": "Sub-Saharan Africa", "name_len": 6, "long_len": 10, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -15.468750, 13.496473 ] } }
@@ -473,6 +479,12 @@
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Ghana", "sov_a3": "GHA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Ghana", "adm0_a3": "GHA", "geou_dif": 0, "geounit": "Ghana", "gu_a3": "GHA", "su_dif": 0, "subunit": "Ghana", "su_a3": "GHA", "brk_diff": 0, "name": "Ghana", "name_long": "Ghana", "brk_a3": "GHA", "brk_name": "Ghana", "abbrev": "Ghana", "postal": "GH", "formal_en": "Republic of Ghana", "name_sort": "Ghana", "mapcolor7": 5, "mapcolor8": 3, "mapcolor9": 1, "mapcolor13": 4, "pop_est": 23832495, "gdp_md_est": 34200, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "GH", "iso_a3": "GHA", "iso_n3": "288", "un_a3": "288", "wb_a2": "GH", "wb_a3": "GHA", "woe_id": -99, "adm0_a3_is": "GHA", "adm0_a3_us": "GHA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Western Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -1.274414, 7.972198 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "United Kingdom", "sov_a3": "GB1", "adm0_dif": 1, "level": 2, "type": "Country", "admin": "United Kingdom", "adm0_a3": "GBR", "geou_dif": 0, "geounit": "United Kingdom", "gu_a3": "GBR", "su_dif": 0, "subunit": "United Kingdom", "su_a3": "GBR", "brk_diff": 0, "name": "United Kingdom", "name_long": "United Kingdom", "brk_a3": "GBR", "brk_name": "United Kingdom", "abbrev": "U.K.", "postal": "GB", "formal_en": "United Kingdom of Great Britain and Northern Ireland", "name_sort": "United Kingdom", "mapcolor7": 6, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 3, "pop_est": 62262000, "gdp_md_est": 1977704, "pop_year": 0, "lastcensus": 2011, "gdp_year": 2009, "economy": "1. Developed region: G7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "GB", "iso_a3": "GBR", "iso_n3": "826", "un_a3": "826", "wb_a2": "GB", "wb_a3": "GBR", "woe_id": -99, "adm0_a3_is": "GBR", "adm0_a3_us": "GBR", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Northern Europe", "region_wb": "Europe & Central Asia", "name_len": 14, "long_len": 14, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -2.241211, 54.546580 ] } }
+,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "France", "sov_a3": "FR1", "adm0_dif": 1, "level": 2, "type": "Country", "admin": "France", "adm0_a3": "FRA", "geou_dif": 0, "geounit": "France", "gu_a3": "FRA", "su_dif": 0, "subunit": "France", "su_a3": "FRA", "brk_diff": 0, "name": "France", "name_long": "France", "brk_a3": "FRA", "brk_name": "France", "abbrev": "Fr.", "postal": "F", "formal_en": "French Republic", "name_sort": "France", "mapcolor7": 7, "mapcolor8": 5, "mapcolor9": 9, "mapcolor13": 11, "pop_est": 64057792, "gdp_md_est": 2128000, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "1. Developed region: G7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "FR", "iso_a3": "FRA", "iso_n3": "250", "un_a3": "250", "wb_a2": "FR", "wb_a3": "FRA", "woe_id": -99, "adm0_a3_is": "FRA", "adm0_a3_us": "FRA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Western Europe", "region_wb": "Europe & Central Asia", "name_len": 6, "long_len": 6, "abbrev_len": 3, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 2.285156, 46.739861 ] } }
+,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Togo", "sov_a3": "TGO", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Togo", "adm0_a3": "TGO", "geou_dif": 0, "geounit": "Togo", "gu_a3": "TGO", "su_dif": 0, "subunit": "Togo", "su_a3": "TGO", "brk_diff": 0, "name": "Togo", "name_long": "Togo", "brk_a3": "TGO", "brk_name": "Togo", "abbrev": "Togo", "postal": "TG", "formal_en": "Togolese Republic", "formal_fr": "République Togolaise", "name_sort": "Togo", "mapcolor7": 3, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 5, "pop_est": 6019877, "gdp_md_est": 5118, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "TG", "iso_a3": "TGO", "iso_n3": "768", "un_a3": "768", "wb_a2": "TG", "wb_a3": "TGO", "woe_id": -99, "adm0_a3_is": "TGO", "adm0_a3_us": "TGO", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Western Africa", "region_wb": "Sub-Saharan Africa", "name_len": 4, "long_len": 4, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 8.494105 ] } }
+,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 5, "sovereignt": "Benin", "sov_a3": "BEN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Benin", "adm0_a3": "BEN", "geou_dif": 0, "geounit": "Benin", "gu_a3": "BEN", "su_dif": 0, "subunit": "Benin", "su_a3": "BEN", "brk_diff": 0, "name": "Benin", "name_long": "Benin", "brk_a3": "BEN", "brk_name": "Benin", "abbrev": "Benin", "postal": "BJ", "formal_en": "Republic of Benin", "name_sort": "Benin", "mapcolor7": 1, "mapcolor8": 2, "mapcolor9": 2, "mapcolor13": 12, "pop_est": 8791832, "gdp_md_est": 12830, "pop_year": -99, "lastcensus": 2002, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "BJ", "iso_a3": "BEN", "iso_n3": "204", "un_a3": "204", "wb_a2": "BJ", "wb_a3": "BEN", "woe_id": -99, "adm0_a3_is": "BEN", "adm0_a3_us": "BEN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Western Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 2.285156, 9.709057 ] } }
 ] }
 ] }
 ,
@@ -480,8 +492,12 @@
 { "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Gabon", "sov_a3": "GAB", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Gabon", "adm0_a3": "GAB", "geou_dif": 0, "geounit": "Gabon", "gu_a3": "GAB", "su_dif": 0, "subunit": "Gabon", "su_a3": "GAB", "brk_diff": 0, "name": "Gabon", "name_long": "Gabon", "brk_a3": "GAB", "brk_name": "Gabon", "abbrev": "Gabon", "postal": "GA", "formal_en": "Gabonese Republic", "name_sort": "Gabon", "mapcolor7": 6, "mapcolor8": 2, "mapcolor9": 5, "mapcolor13": 5, "pop_est": 1514993, "gdp_md_est": 21110, "pop_year": -99, "lastcensus": 2003, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "GA", "iso_a3": "GAB", "iso_n3": "266", "un_a3": "266", "wb_a2": "GA", "wb_a3": "GAB", "woe_id": -99, "adm0_a3_is": "GAB", "adm0_a3_us": "GAB", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 5, "tiny": 3, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 11.645508, -0.615223 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Equatorial Guinea", "sov_a3": "GNQ", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Equatorial Guinea", "adm0_a3": "GNQ", "geou_dif": 0, "geounit": "Equatorial Guinea", "gu_a3": "GNQ", "su_dif": 0, "subunit": "Equatorial Guinea", "su_a3": "GNQ", "brk_diff": 0, "name": "Eq. Guinea", "name_long": "Equatorial Guinea", "brk_a3": "GNQ", "brk_name": "Eq. Guinea", "abbrev": "Eq. G.", "postal": "GQ", "formal_en": "Republic of Equatorial Guinea", "name_sort": "Equatorial Guinea", "mapcolor7": 4, "mapcolor8": 1, "mapcolor9": 4, "mapcolor13": 8, "pop_est": 650702, "gdp_md_est": 14060, "pop_year": 0, "lastcensus": 2002, "gdp_year": 0, "economy": "7. Least developed region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "GQ", "iso_a3": "GNQ", "iso_n3": "226", "un_a3": "226", "wb_a2": "GQ", "wb_a3": "GNQ", "woe_id": -99, "adm0_a3_is": "GNQ", "adm0_a3_us": "GNQ", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 10, "long_len": 17, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 10.327148, 1.669686 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Democratic Republic of the Congo", "sov_a3": "COD", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Democratic Republic of the Congo", "adm0_a3": "COD", "geou_dif": 0, "geounit": "Democratic Republic of the Congo", "gu_a3": "COD", "su_dif": 0, "subunit": "Democratic Republic of the Congo", "su_a3": "COD", "brk_diff": 0, "name": "Dem. Rep. Congo", "name_long": "Democratic Republic of the Congo", "brk_a3": "COD", "brk_name": "Democratic Republic of the Congo", "abbrev": "D.R.C.", "postal": "DRC", "formal_en": "Democratic Republic of the Congo", "name_sort": "Congo, Dem. Rep.", "mapcolor7": 4, "mapcolor8": 4, "mapcolor9": 4, "mapcolor13": 7, "pop_est": 68692542, "gdp_md_est": 20640, "pop_year": -99, "lastcensus": 1984, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "CD", "iso_a3": "COD", "iso_n3": "180", "un_a3": "180", "wb_a2": "ZR", "wb_a3": "ZAR", "woe_id": -99, "adm0_a3_is": "COD", "adm0_a3_us": "COD", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 15, "long_len": 32, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 23.554688, -2.855263 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Uganda", "sov_a3": "UGA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Uganda", "adm0_a3": "UGA", "geou_dif": 0, "geounit": "Uganda", "gu_a3": "UGA", "su_dif": 0, "subunit": "Uganda", "su_a3": "UGA", "brk_diff": 0, "name": "Uganda", "name_long": "Uganda", "brk_a3": "UGA", "brk_name": "Uganda", "abbrev": "Uga.", "postal": "UG", "formal_en": "Republic of Uganda", "name_sort": "Uganda", "mapcolor7": 6, "mapcolor8": 3, "mapcolor9": 6, "mapcolor13": 4, "pop_est": 32369558, "gdp_md_est": 39380, "pop_year": -99, "lastcensus": 2002, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "UG", "iso_a3": "UGA", "iso_n3": "800", "un_a3": "800", "wb_a2": "UG", "wb_a3": "UGA", "woe_id": -99, "adm0_a3_is": "UGA", "adm0_a3_us": "UGA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 32.343750, 1.318243 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Indonesia", "sov_a3": "IDN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Indonesia", "adm0_a3": "IDN", "geou_dif": 0, "geounit": "Indonesia", "gu_a3": "IDN", "su_dif": 0, "subunit": "Indonesia", "su_a3": "IDN", "brk_diff": 0, "name": "Indonesia", "name_long": "Indonesia", "brk_a3": "IDN", "brk_name": "Indonesia", "abbrev": "Indo.", "postal": "INDO", "formal_en": "Republic of Indonesia", "name_sort": "Indonesia", "mapcolor7": 6, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 11, "pop_est": 240271522, "gdp_md_est": 914600, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "4. Emerging region: MIKT", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "ID", "iso_a3": "IDN", "iso_n3": "360", "un_a3": "360", "wb_a2": "ID", "wb_a3": "IDN", "woe_id": -99, "adm0_a3_is": "IDN", "adm0_a3_us": "IDN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "South-Eastern Asia", "region_wb": "East Asia & Pacific", "name_len": 9, "long_len": 9, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 113.994141, -0.219726 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Republic of Congo", "sov_a3": "COG", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Republic of Congo", "adm0_a3": "COG", "geou_dif": 0, "geounit": "Republic of Congo", "gu_a3": "COG", "su_dif": 0, "subunit": "Republic of Congo", "su_a3": "COG", "brk_diff": 0, "name": "Congo", "name_long": "Republic of Congo", "brk_a3": "COG", "brk_name": "Republic of Congo", "abbrev": "Rep. Congo", "postal": "CG", "formal_en": "Republic of Congo", "name_sort": "Congo, Rep.", "mapcolor7": 2, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 10, "pop_est": 4012809, "gdp_md_est": 15350, "pop_year": -99, "lastcensus": 2007, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "CG", "iso_a3": "COG", "iso_n3": "178", "un_a3": "178", "wb_a2": "CG", "wb_a3": "COG", "woe_id": -99, "adm0_a3_is": "COG", "adm0_a3_us": "COG", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 17, "abbrev_len": 10, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 15.117188, -0.790990 ] } }
@@ -502,6 +518,8 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Mozambique", "sov_a3": "MOZ", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Mozambique", "adm0_a3": "MOZ", "geou_dif": 0, "geounit": "Mozambique", "gu_a3": "MOZ", "su_dif": 0, "subunit": "Mozambique", "su_a3": "MOZ", "brk_diff": 0, "name": "Mozambique", "name_long": "Mozambique", "brk_a3": "MOZ", "brk_name": "Mozambique", "abbrev": "Moz.", "postal": "MZ", "formal_en": "Republic of Mozambique", "name_sort": "Mozambique", "mapcolor7": 4, "mapcolor8": 2, "mapcolor9": 1, "mapcolor13": 4, "pop_est": 21669278, "gdp_md_est": 18940, "pop_year": -99, "lastcensus": 2007, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "MZ", "iso_a3": "MOZ", "iso_n3": "508", "un_a3": "508", "wb_a2": "MZ", "wb_a3": "MOZ", "woe_id": -99, "adm0_a3_is": "MOZ", "adm0_a3_us": "MOZ", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 38.100586, -14.519780 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Kenya", "sov_a3": "KEN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Kenya", "adm0_a3": "KEN", "geou_dif": 0, "geounit": "Kenya", "gu_a3": "KEN", "su_dif": 0, "subunit": "Kenya", "su_a3": "KEN", "brk_diff": 0, "name": "Kenya", "name_long": "Kenya", "brk_a3": "KEN", "brk_name": "Kenya", "abbrev": "Ken.", "postal": "KE", "formal_en": "Republic of Kenya", "name_sort": "Kenya", "mapcolor7": 5, "mapcolor8": 2, "mapcolor9": 7, "mapcolor13": 3, "pop_est": 39002772, "gdp_md_est": 61510, "pop_year": -99, "lastcensus": 2009, "gdp_year": -99, "economy": "5. Emerging region: G20", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "KE", "iso_a3": "KEN", "iso_n3": "404", "un_a3": "404", "wb_a2": "KE", "wb_a3": "KEN", "woe_id": -99, "adm0_a3_is": "KEN", "adm0_a3_us": "KEN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 37.749023, 0.615223 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Malawi", "sov_a3": "MWI", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Malawi", "adm0_a3": "MWI", "geou_dif": 0, "geounit": "Malawi", "gu_a3": "MWI", "su_dif": 0, "subunit": "Malawi", "su_a3": "MWI", "brk_diff": 0, "name": "Malawi", "name_long": "Malawi", "brk_a3": "MWI", "brk_name": "Malawi", "abbrev": "Mal.", "postal": "MW", "formal_en": "Republic of Malawi", "name_sort": "Malawi", "mapcolor7": 1, "mapcolor8": 3, "mapcolor9": 4, "mapcolor13": 5, "pop_est": 14268711, "gdp_md_est": 11810, "pop_year": -99, "lastcensus": 2008, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "MW", "iso_a3": "MWI", "iso_n3": "454", "un_a3": "454", "wb_a2": "MW", "wb_a3": "MWI", "woe_id": -99, "adm0_a3_is": "MWI", "adm0_a3_us": "MWI", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 34.145508, -13.154376 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Madagascar", "sov_a3": "MDG", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Madagascar", "adm0_a3": "MDG", "geou_dif": 0, "geounit": "Madagascar", "gu_a3": "MDG", "su_dif": 0, "subunit": "Madagascar", "su_a3": "MDG", "brk_diff": 0, "name": "Madagascar", "name_long": "Madagascar", "brk_a3": "MDG", "brk_name": "Madagascar", "abbrev": "Mad.", "postal": "MG", "formal_en": "Republic of Madagascar", "name_sort": "Madagascar", "mapcolor7": 6, "mapcolor8": 5, "mapcolor9": 2, "mapcolor13": 3, "pop_est": 20653556, "gdp_md_est": 20130, "pop_year": -99, "lastcensus": 1993, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "MG", "iso_a3": "MDG", "iso_n3": "450", "un_a3": "450", "wb_a2": "MG", "wb_a3": "MDG", "woe_id": -99, "adm0_a3_is": "MDG", "adm0_a3_us": "MDG", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 46.625977, -19.435514 ] } }
@@ -532,7 +550,7 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "New Zealand", "sov_a3": "NZ1", "adm0_dif": 1, "level": 2, "type": "Country", "admin": "New Zealand", "adm0_a3": "NZL", "geou_dif": 0, "geounit": "New Zealand", "gu_a3": "NZL", "su_dif": 0, "subunit": "New Zealand", "su_a3": "NZL", "brk_diff": 0, "name": "New Zealand", "name_long": "New Zealand", "brk_a3": "NZL", "brk_name": "New Zealand", "abbrev": "N.Z.", "postal": "NZ", "formal_en": "New Zealand", "name_sort": "New Zealand", "mapcolor7": 3, "mapcolor8": 3, "mapcolor9": 4, "mapcolor13": 4, "pop_est": 4213418, "gdp_md_est": 116700, "pop_year": -99, "lastcensus": 2006, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "NZ", "iso_a3": "NZL", "iso_n3": "554", "un_a3": "554", "wb_a2": "NZ", "wb_a3": "NZL", "woe_id": -99, "adm0_a3_is": "NZL", "adm0_a3_us": "NZL", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Oceania", "region_un": "Oceania", "subregion": "Australia and New Zealand", "region_wb": "East Asia & Pacific", "name_len": 11, "long_len": 11, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 170.419922, -44.024422 ] } }
 ,
-{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 76.333008, -77.379906 ] } }
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "MultiPoint", "coordinates": [ [ 4.877930, -74.508155 ], [ 4.877930, -83.932990 ], [ 58.842773, -80.297927 ], [ 112.851562, -74.508155 ], [ 112.851562, -83.932990 ] ] } }
 ] }
 ] }
 ,
@@ -540,6 +558,10 @@
 { "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Algeria", "sov_a3": "DZA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Algeria", "adm0_a3": "DZA", "geou_dif": 0, "geounit": "Algeria", "gu_a3": "DZA", "su_dif": 0, "subunit": "Algeria", "su_a3": "DZA", "brk_diff": 0, "name": "Algeria", "name_long": "Algeria", "brk_a3": "DZA", "brk_name": "Algeria", "abbrev": "Alg.", "postal": "DZ", "formal_en": "People's Democratic Republic of Algeria", "name_sort": "Algeria", "mapcolor7": 5, "mapcolor8": 1, "mapcolor9": 6, "mapcolor13": 3, "pop_est": 34178188, "gdp_md_est": 232900, "pop_year": -99, "lastcensus": 2008, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "DZ", "iso_a3": "DZA", "iso_n3": "012", "un_a3": "012", "wb_a2": "DZ", "wb_a3": "DZA", "woe_id": -99, "adm0_a3_is": "DZA", "adm0_a3_us": "DZA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Northern Africa", "region_wb": "Middle East & North Africa", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 2.548828, 28.459033 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Burkina Faso", "sov_a3": "BFA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Burkina Faso", "adm0_a3": "BFA", "geou_dif": 0, "geounit": "Burkina Faso", "gu_a3": "BFA", "su_dif": 0, "subunit": "Burkina Faso", "su_a3": "BFA", "brk_diff": 0, "name": "Burkina Faso", "name_long": "Burkina Faso", "brk_a3": "BFA", "brk_name": "Burkina Faso", "abbrev": "B.F.", "postal": "BF", "formal_en": "Burkina Faso", "name_sort": "Burkina Faso", "mapcolor7": 2, "mapcolor8": 1, "mapcolor9": 5, "mapcolor13": 11, "pop_est": 15746232, "gdp_md_est": 17820, "pop_year": -99, "lastcensus": 2006, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "BF", "iso_a3": "BFA", "iso_n3": "854", "un_a3": "854", "wb_a2": "BF", "wb_a3": "BFA", "woe_id": -99, "adm0_a3_is": "BFA", "adm0_a3_us": "BFA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Western Africa", "region_wb": "Sub-Saharan Africa", "name_len": 12, "long_len": 12, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -1.801758, 12.340002 ] } }
+,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Ghana", "sov_a3": "GHA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Ghana", "adm0_a3": "GHA", "geou_dif": 0, "geounit": "Ghana", "gu_a3": "GHA", "su_dif": 0, "subunit": "Ghana", "su_a3": "GHA", "brk_diff": 0, "name": "Ghana", "name_long": "Ghana", "brk_a3": "GHA", "brk_name": "Ghana", "abbrev": "Ghana", "postal": "GH", "formal_en": "Republic of Ghana", "name_sort": "Ghana", "mapcolor7": 5, "mapcolor8": 3, "mapcolor9": 1, "mapcolor13": 4, "pop_est": 23832495, "gdp_md_est": 34200, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "GH", "iso_a3": "GHA", "iso_n3": "288", "un_a3": "288", "wb_a2": "GH", "wb_a3": "GHA", "woe_id": -99, "adm0_a3_is": "GHA", "adm0_a3_us": "GHA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Western Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -1.274414, 7.972198 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Norway", "sov_a3": "NOR", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Norway", "adm0_a3": "NOR", "geou_dif": 0, "geounit": "Norway", "gu_a3": "NOR", "su_dif": 0, "subunit": "Norway", "su_a3": "NOR", "brk_diff": 0, "name": "Norway", "name_long": "Norway", "brk_a3": "NOR", "brk_name": "Norway", "abbrev": "Nor.", "postal": "N", "formal_en": "Kingdom of Norway", "name_sort": "Norway", "mapcolor7": 5, "mapcolor8": 3, "mapcolor9": 8, "mapcolor13": 12, "pop_est": 4676305, "gdp_md_est": 276400, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "NO", "iso_a3": "NOR", "iso_n3": "578", "un_a3": "578", "wb_a2": "NO", "wb_a3": "NOR", "woe_id": -99, "adm0_a3_is": "NOR", "adm0_a3_us": "NOR", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Northern Europe", "region_wb": "Europe & Central Asia", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 8.261719, 62.000905 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Sweden", "sov_a3": "SWE", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Sweden", "adm0_a3": "SWE", "geou_dif": 0, "geounit": "Sweden", "gu_a3": "SWE", "su_dif": 0, "subunit": "Sweden", "su_a3": "SWE", "brk_diff": 0, "name": "Sweden", "name_long": "Sweden", "brk_a3": "SWE", "brk_name": "Sweden", "abbrev": "Swe.", "postal": "S", "formal_en": "Kingdom of Sweden", "name_sort": "Sweden", "mapcolor7": 1, "mapcolor8": 4, "mapcolor9": 2, "mapcolor13": 4, "pop_est": 9059651, "gdp_md_est": 344300, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "SE", "iso_a3": "SWE", "iso_n3": "752", "un_a3": "752", "wb_a2": "SE", "wb_a3": "SWE", "woe_id": -99, "adm0_a3_is": "SWE", "adm0_a3_us": "SWE", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Northern Europe", "region_wb": "Europe & Central Asia", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 16.831055, 63.450509 ] } }
@@ -550,6 +572,8 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Denmark", "sov_a3": "DN1", "adm0_dif": 1, "level": 2, "type": "Country", "admin": "Denmark", "adm0_a3": "DNK", "geou_dif": 0, "geounit": "Denmark", "gu_a3": "DNK", "su_dif": 0, "subunit": "Denmark", "su_a3": "DNK", "brk_diff": 0, "name": "Denmark", "name_long": "Denmark", "brk_a3": "DNK", "brk_name": "Denmark", "abbrev": "Den.", "postal": "DK", "formal_en": "Kingdom of Denmark", "name_sort": "Denmark", "mapcolor7": 4, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 12, "pop_est": 5500510, "gdp_md_est": 203600, "pop_year": -99, "lastcensus": 2011, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "DK", "iso_a3": "DNK", "iso_n3": "208", "un_a3": "208", "wb_a2": "DK", "wb_a3": "DNK", "woe_id": -99, "adm0_a3_is": "DNK", "adm0_a3_us": "DNK", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Northern Europe", "region_wb": "Europe & Central Asia", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 9.272461, 56.267761 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "United Kingdom", "sov_a3": "GB1", "adm0_dif": 1, "level": 2, "type": "Country", "admin": "United Kingdom", "adm0_a3": "GBR", "geou_dif": 0, "geounit": "United Kingdom", "gu_a3": "GBR", "su_dif": 0, "subunit": "United Kingdom", "su_a3": "GBR", "brk_diff": 0, "name": "United Kingdom", "name_long": "United Kingdom", "brk_a3": "GBR", "brk_name": "United Kingdom", "abbrev": "U.K.", "postal": "GB", "formal_en": "United Kingdom of Great Britain and Northern Ireland", "name_sort": "United Kingdom", "mapcolor7": 6, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 3, "pop_est": 62262000, "gdp_md_est": 1977704, "pop_year": 0, "lastcensus": 2011, "gdp_year": 2009, "economy": "1. Developed region: G7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "GB", "iso_a3": "GBR", "iso_n3": "826", "un_a3": "826", "wb_a2": "GB", "wb_a3": "GBR", "woe_id": -99, "adm0_a3_is": "GBR", "adm0_a3_us": "GBR", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Northern Europe", "region_wb": "Europe & Central Asia", "name_len": 14, "long_len": 14, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -2.241211, 54.546580 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 5, "sovereignt": "Netherlands", "sov_a3": "NL1", "adm0_dif": 1, "level": 2, "type": "Country", "admin": "Netherlands", "adm0_a3": "NLD", "geou_dif": 0, "geounit": "Netherlands", "gu_a3": "NLD", "su_dif": 0, "subunit": "Netherlands", "su_a3": "NLD", "brk_diff": 0, "name": "Netherlands", "name_long": "Netherlands", "brk_a3": "NLD", "brk_name": "Netherlands", "abbrev": "Neth.", "postal": "NL", "formal_en": "Kingdom of the Netherlands", "name_sort": "Netherlands", "mapcolor7": 4, "mapcolor8": 2, "mapcolor9": 2, "mapcolor13": 9, "pop_est": 16715999, "gdp_md_est": 672000, "pop_year": -99, "lastcensus": 2011, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "NL", "iso_a3": "NLD", "iso_n3": "528", "un_a3": "528", "wb_a2": "NL", "wb_a3": "NLD", "woe_id": -99, "adm0_a3_is": "NLD", "adm0_a3_us": "NLD", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Western Europe", "region_wb": "Europe & Central Asia", "name_len": 11, "long_len": 11, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 5.493164, 52.321911 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Belgium", "sov_a3": "BEL", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Belgium", "adm0_a3": "BEL", "geou_dif": 0, "geounit": "Belgium", "gu_a3": "BEL", "su_dif": 0, "subunit": "Belgium", "su_a3": "BEL", "brk_diff": 0, "name": "Belgium", "name_long": "Belgium", "brk_a3": "BEL", "brk_name": "Belgium", "abbrev": "Belg.", "postal": "B", "formal_en": "Kingdom of Belgium", "name_sort": "Belgium", "mapcolor7": 3, "mapcolor8": 2, "mapcolor9": 1, "mapcolor13": 8, "pop_est": 10414336, "gdp_md_est": 389300, "pop_year": -99, "lastcensus": 2011, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "BE", "iso_a3": "BEL", "iso_n3": "056", "un_a3": "056", "wb_a2": "BE", "wb_a3": "BEL", "woe_id": -99, "adm0_a3_is": "BEL", "adm0_a3_us": "BEL", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Western Europe", "region_wb": "Europe & Central Asia", "name_len": 7, "long_len": 7, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 4.570312, 50.680797 ] } }
@@ -624,6 +648,8 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Nigeria", "sov_a3": "NGA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Nigeria", "adm0_a3": "NGA", "geou_dif": 0, "geounit": "Nigeria", "gu_a3": "NGA", "su_dif": 0, "subunit": "Nigeria", "su_a3": "NGA", "brk_diff": 0, "name": "Nigeria", "name_long": "Nigeria", "brk_a3": "NGA", "brk_name": "Nigeria", "abbrev": "Nigeria", "postal": "NG", "formal_en": "Federal Republic of Nigeria", "name_sort": "Nigeria", "mapcolor7": 3, "mapcolor8": 2, "mapcolor9": 5, "mapcolor13": 2, "pop_est": 149229090, "gdp_md_est": 335400, "pop_year": -99, "lastcensus": 2006, "gdp_year": -99, "economy": "5. Emerging region: G20", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "NG", "iso_a3": "NGA", "iso_n3": "566", "un_a3": "566", "wb_a2": "NG", "wb_a3": "NGA", "woe_id": -99, "adm0_a3_is": "NGA", "adm0_a3_us": "NGA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Western Africa", "region_wb": "Sub-Saharan Africa", "name_len": 7, "long_len": 7, "abbrev_len": 7, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 7.954102, 9.622414 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Gabon", "sov_a3": "GAB", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Gabon", "adm0_a3": "GAB", "geou_dif": 0, "geounit": "Gabon", "gu_a3": "GAB", "su_dif": 0, "subunit": "Gabon", "su_a3": "GAB", "brk_diff": 0, "name": "Gabon", "name_long": "Gabon", "brk_a3": "GAB", "brk_name": "Gabon", "abbrev": "Gabon", "postal": "GA", "formal_en": "Gabonese Republic", "name_sort": "Gabon", "mapcolor7": 6, "mapcolor8": 2, "mapcolor9": 5, "mapcolor13": 5, "pop_est": 1514993, "gdp_md_est": 21110, "pop_year": -99, "lastcensus": 2003, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "GA", "iso_a3": "GAB", "iso_n3": "266", "un_a3": "266", "wb_a2": "GA", "wb_a3": "GAB", "woe_id": -99, "adm0_a3_is": "GAB", "adm0_a3_us": "GAB", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 5, "tiny": 3, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 11.645508, -0.615223 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Equatorial Guinea", "sov_a3": "GNQ", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Equatorial Guinea", "adm0_a3": "GNQ", "geou_dif": 0, "geounit": "Equatorial Guinea", "gu_a3": "GNQ", "su_dif": 0, "subunit": "Equatorial Guinea", "su_a3": "GNQ", "brk_diff": 0, "name": "Eq. Guinea", "name_long": "Equatorial Guinea", "brk_a3": "GNQ", "brk_name": "Eq. Guinea", "abbrev": "Eq. G.", "postal": "GQ", "formal_en": "Republic of Equatorial Guinea", "name_sort": "Equatorial Guinea", "mapcolor7": 4, "mapcolor8": 1, "mapcolor9": 4, "mapcolor13": 8, "pop_est": 650702, "gdp_md_est": 14060, "pop_year": 0, "lastcensus": 2002, "gdp_year": 0, "economy": "7. Least developed region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "GQ", "iso_a3": "GNQ", "iso_n3": "226", "un_a3": "226", "wb_a2": "GQ", "wb_a3": "GNQ", "woe_id": -99, "adm0_a3_is": "GNQ", "adm0_a3_us": "GNQ", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 10, "long_len": 17, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 10.327148, 1.669686 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Central African Republic", "sov_a3": "CAF", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Central African Republic", "adm0_a3": "CAF", "geou_dif": 0, "geounit": "Central African Republic", "gu_a3": "CAF", "su_dif": 0, "subunit": "Central African Republic", "su_a3": "CAF", "brk_diff": 0, "name": "Central African Rep.", "name_long": "Central African Republic", "brk_a3": "CAF", "brk_name": "Central African Rep.", "abbrev": "C.A.R.", "postal": "CF", "formal_en": "Central African Republic", "name_sort": "Central African Republic", "mapcolor7": 5, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 9, "pop_est": 4511488, "gdp_md_est": 3198, "pop_year": -99, "lastcensus": 2003, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "CF", "iso_a3": "CAF", "iso_n3": "140", "un_a3": "140", "wb_a2": "CF", "wb_a3": "CAF", "woe_id": -99, "adm0_a3_is": "CAF", "adm0_a3_us": "CAF", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 20, "long_len": 24, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 20.346680, 6.577303 ] } }
@@ -652,6 +678,8 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "South Sudan", "sov_a3": "SDS", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "South Sudan", "adm0_a3": "SDS", "geou_dif": 0, "geounit": "South Sudan", "gu_a3": "SDS", "su_dif": 0, "subunit": "South Sudan", "su_a3": "SDS", "brk_diff": 0, "name": "S. Sudan", "name_long": "South Sudan", "brk_a3": "SDS", "brk_name": "S. Sudan", "abbrev": "S. Sud.", "postal": "SS", "formal_en": "Republic of South Sudan", "name_sort": "South Sudan", "mapcolor7": 1, "mapcolor8": 3, "mapcolor9": 3, "mapcolor13": 5, "pop_est": 10625176, "gdp_md_est": 13227, "pop_year": -99, "lastcensus": 2008, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "SS", "iso_a3": "SSD", "iso_n3": "728", "un_a3": "728", "wb_a2": "SS", "wb_a3": "SSD", "woe_id": -99, "adm0_a3_is": "SSD", "adm0_a3_us": "SDS", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 8, "long_len": 11, "abbrev_len": 7, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 30.146484, 7.318882 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Democratic Republic of the Congo", "sov_a3": "COD", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Democratic Republic of the Congo", "adm0_a3": "COD", "geou_dif": 0, "geounit": "Democratic Republic of the Congo", "gu_a3": "COD", "su_dif": 0, "subunit": "Democratic Republic of the Congo", "su_a3": "COD", "brk_diff": 0, "name": "Dem. Rep. Congo", "name_long": "Democratic Republic of the Congo", "brk_a3": "COD", "brk_name": "Democratic Republic of the Congo", "abbrev": "D.R.C.", "postal": "DRC", "formal_en": "Democratic Republic of the Congo", "name_sort": "Congo, Dem. Rep.", "mapcolor7": 4, "mapcolor8": 4, "mapcolor9": 4, "mapcolor13": 7, "pop_est": 68692542, "gdp_md_est": 20640, "pop_year": -99, "lastcensus": 1984, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "CD", "iso_a3": "COD", "iso_n3": "180", "un_a3": "180", "wb_a2": "ZR", "wb_a3": "ZAR", "woe_id": -99, "adm0_a3_is": "COD", "adm0_a3_us": "COD", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 15, "long_len": 32, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 23.554688, -2.855263 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Uganda", "sov_a3": "UGA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Uganda", "adm0_a3": "UGA", "geou_dif": 0, "geounit": "Uganda", "gu_a3": "UGA", "su_dif": 0, "subunit": "Uganda", "su_a3": "UGA", "brk_diff": 0, "name": "Uganda", "name_long": "Uganda", "brk_a3": "UGA", "brk_name": "Uganda", "abbrev": "Uga.", "postal": "UG", "formal_en": "Republic of Uganda", "name_sort": "Uganda", "mapcolor7": 6, "mapcolor8": 3, "mapcolor9": 6, "mapcolor13": 4, "pop_est": 32369558, "gdp_md_est": 39380, "pop_year": -99, "lastcensus": 2002, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "UG", "iso_a3": "UGA", "iso_n3": "800", "un_a3": "800", "wb_a2": "UG", "wb_a3": "UGA", "woe_id": -99, "adm0_a3_is": "UGA", "adm0_a3_us": "UGA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 32.343750, 1.318243 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Eritrea", "sov_a3": "ERI", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Eritrea", "adm0_a3": "ERI", "geou_dif": 0, "geounit": "Eritrea", "gu_a3": "ERI", "su_dif": 0, "subunit": "Eritrea", "su_a3": "ERI", "brk_diff": 0, "name": "Eritrea", "name_long": "Eritrea", "brk_a3": "ERI", "brk_name": "Eritrea", "abbrev": "Erit.", "postal": "ER", "formal_en": "State of Eritrea", "name_sort": "Eritrea", "mapcolor7": 3, "mapcolor8": 1, "mapcolor9": 2, "mapcolor13": 12, "pop_est": 5647168, "gdp_md_est": 3945, "pop_year": -99, "lastcensus": 1984, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "ER", "iso_a3": "ERI", "iso_n3": "232", "un_a3": "232", "wb_a2": "ER", "wb_a3": "ERI", "woe_id": -99, "adm0_a3_is": "ERI", "adm0_a3_us": "ERI", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 7, "long_len": 7, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 38.627930, 15.453680 ] } }
@@ -734,12 +762,26 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Brunei", "sov_a3": "BRN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Brunei", "adm0_a3": "BRN", "geou_dif": 0, "geounit": "Brunei", "gu_a3": "BRN", "su_dif": 0, "subunit": "Brunei", "su_a3": "BRN", "brk_diff": 0, "name": "Brunei", "name_long": "Brunei Darussalam", "brk_a3": "BRN", "brk_name": "Brunei", "abbrev": "Brunei", "postal": "BN", "formal_en": "Negara Brunei Darussalam", "name_sort": "Brunei", "mapcolor7": 4, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 12, "pop_est": 388190, "gdp_md_est": 20250, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "BN", "iso_a3": "BRN", "iso_n3": "096", "un_a3": "096", "wb_a2": "BN", "wb_a3": "BRN", "woe_id": -99, "adm0_a3_is": "BRN", "adm0_a3_us": "BRN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "South-Eastern Asia", "region_wb": "East Asia & Pacific", "name_len": 6, "long_len": 17, "abbrev_len": 6, "tiny": 2, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 114.873047, 4.740675 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Indonesia", "sov_a3": "IDN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Indonesia", "adm0_a3": "IDN", "geou_dif": 0, "geounit": "Indonesia", "gu_a3": "IDN", "su_dif": 0, "subunit": "Indonesia", "su_a3": "IDN", "brk_diff": 0, "name": "Indonesia", "name_long": "Indonesia", "brk_a3": "IDN", "brk_name": "Indonesia", "abbrev": "Indo.", "postal": "INDO", "formal_en": "Republic of Indonesia", "name_sort": "Indonesia", "mapcolor7": 6, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 11, "pop_est": 240271522, "gdp_md_est": 914600, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "4. Emerging region: MIKT", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "ID", "iso_a3": "IDN", "iso_n3": "360", "un_a3": "360", "wb_a2": "ID", "wb_a3": "IDN", "woe_id": -99, "adm0_a3_is": "IDN", "adm0_a3_us": "IDN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "South-Eastern Asia", "region_wb": "East Asia & Pacific", "name_len": 9, "long_len": 9, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 113.994141, -0.219726 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Japan", "sov_a3": "JPN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Japan", "adm0_a3": "JPN", "geou_dif": 0, "geounit": "Japan", "gu_a3": "JPN", "su_dif": 0, "subunit": "Japan", "su_a3": "JPN", "brk_diff": 0, "name": "Japan", "name_long": "Japan", "brk_a3": "JPN", "brk_name": "Japan", "abbrev": "Japan", "postal": "J", "formal_en": "Japan", "name_sort": "Japan", "mapcolor7": 5, "mapcolor8": 3, "mapcolor9": 5, "mapcolor13": 4, "pop_est": 127078679, "gdp_md_est": 4329000, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "1. Developed region: G7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "JP", "iso_a3": "JPN", "iso_n3": "392", "un_a3": "392", "wb_a2": "JP", "wb_a3": "JPN", "woe_id": -99, "adm0_a3_is": "JPN", "adm0_a3_us": "JPN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "Eastern Asia", "region_wb": "East Asia & Pacific", "name_len": 5, "long_len": 5, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 136.933594, 36.137875 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Republic of Congo", "sov_a3": "COG", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Republic of Congo", "adm0_a3": "COG", "geou_dif": 0, "geounit": "Republic of Congo", "gu_a3": "COG", "su_dif": 0, "subunit": "Republic of Congo", "su_a3": "COG", "brk_diff": 0, "name": "Congo", "name_long": "Republic of Congo", "brk_a3": "COG", "brk_name": "Republic of Congo", "abbrev": "Rep. Congo", "postal": "CG", "formal_en": "Republic of Congo", "name_sort": "Congo, Rep.", "mapcolor7": 2, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 10, "pop_est": 4012809, "gdp_md_est": 15350, "pop_year": -99, "lastcensus": 2007, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "CG", "iso_a3": "COG", "iso_n3": "178", "un_a3": "178", "wb_a2": "CG", "wb_a3": "COG", "woe_id": -99, "adm0_a3_is": "COG", "adm0_a3_us": "COG", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 17, "abbrev_len": 10, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 15.117188, -0.790990 ] } }
+,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Rwanda", "sov_a3": "RWA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Rwanda", "adm0_a3": "RWA", "geou_dif": 0, "geounit": "Rwanda", "gu_a3": "RWA", "su_dif": 0, "subunit": "Rwanda", "su_a3": "RWA", "brk_diff": 0, "name": "Rwanda", "name_long": "Rwanda", "brk_a3": "RWA", "brk_name": "Rwanda", "abbrev": "Rwa.", "postal": "RW", "formal_en": "Republic of Rwanda", "name_sort": "Rwanda", "mapcolor7": 5, "mapcolor8": 2, "mapcolor9": 3, "mapcolor13": 10, "pop_est": 10473282, "gdp_md_est": 9706, "pop_year": -99, "lastcensus": 2002, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "RW", "iso_a3": "RWA", "iso_n3": "646", "un_a3": "646", "wb_a2": "RW", "wb_a3": "RWA", "woe_id": -99, "adm0_a3_is": "RWA", "adm0_a3_us": "RWA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 29.882812, -1.977147 ] } }
+,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Burundi", "sov_a3": "BDI", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Burundi", "adm0_a3": "BDI", "geou_dif": 0, "geounit": "Burundi", "gu_a3": "BDI", "su_dif": 0, "subunit": "Burundi", "su_a3": "BDI", "brk_diff": 0, "name": "Burundi", "name_long": "Burundi", "brk_a3": "BDI", "brk_name": "Burundi", "abbrev": "Bur.", "postal": "BI", "formal_en": "Republic of Burundi", "name_sort": "Burundi", "mapcolor7": 2, "mapcolor8": 2, "mapcolor9": 5, "mapcolor13": 8, "pop_est": 8988091, "gdp_md_est": 3102, "pop_year": -99, "lastcensus": 2008, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "BI", "iso_a3": "BDI", "iso_n3": "108", "un_a3": "108", "wb_a2": "BI", "wb_a3": "BDI", "woe_id": -99, "adm0_a3_is": "BDI", "adm0_a3_us": "BDI", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 29.882812, -3.337954 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Kenya", "sov_a3": "KEN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Kenya", "adm0_a3": "KEN", "geou_dif": 0, "geounit": "Kenya", "gu_a3": "KEN", "su_dif": 0, "subunit": "Kenya", "su_a3": "KEN", "brk_diff": 0, "name": "Kenya", "name_long": "Kenya", "brk_a3": "KEN", "brk_name": "Kenya", "abbrev": "Ken.", "postal": "KE", "formal_en": "Republic of Kenya", "name_sort": "Kenya", "mapcolor7": 5, "mapcolor8": 2, "mapcolor9": 7, "mapcolor13": 3, "pop_est": 39002772, "gdp_md_est": 61510, "pop_year": -99, "lastcensus": 2009, "gdp_year": -99, "economy": "5. Emerging region: G20", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "KE", "iso_a3": "KEN", "iso_n3": "404", "un_a3": "404", "wb_a2": "KE", "wb_a3": "KEN", "woe_id": -99, "adm0_a3_is": "KEN", "adm0_a3_us": "KEN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 37.749023, 0.615223 ] } }
 ] }
 ] }
 ,
+{ "type": "FeatureCollection", "properties": { "zoom": 2, "x": 0, "y": 3 }, "features": [
+{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "MultiPoint", "coordinates": [ [ -181.230469, -84.826305 ], [ -119.201660, -81.123779 ] ] } }
+] }
+] }
+,
 { "type": "FeatureCollection", "properties": { "zoom": 2, "x": 0, "y": 1 }, "features": [
 { "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "United States of America", "sov_a3": "US1", "adm0_dif": 1, "level": 2, "type": "Country", "admin": "United States of America", "adm0_a3": "USA", "geou_dif": 0, "geounit": "United States of America", "gu_a3": "USA", "su_dif": 0, "subunit": "United States of America", "su_a3": "USA", "brk_diff": 0, "name": "United States", "name_long": "United States", "brk_a3": "USA", "brk_name": "United States", "abbrev": "U.S.A.", "postal": "US", "formal_en": "United States of America", "name_sort": "United States of America", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": 1, "pop_est": 313973000, "gdp_md_est": 15094000, "pop_year": 0, "lastcensus": 2010, "gdp_year": 0, "economy": "1. Developed region: G7", "income_grp": "1. High income: OECD", "wikipedia": 0, "iso_a2": "US", "iso_a3": "USA", "iso_n3": "840", "un_a3": "840", "wb_a2": "US", "wb_a3": "USA", "woe_id": -99, "adm0_a3_is": "USA", "adm0_a3_us": "USA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "North America", "region_un": "Americas", "subregion": "Northern America", "region_wb": "North America", "name_len": 13, "long_len": 13, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -99.250488, 40.128491 ] } }
@@ -749,12 +791,16 @@
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Guatemala", "sov_a3": "GTM", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Guatemala", "adm0_a3": "GTM", "geou_dif": 0, "geounit": "Guatemala", "gu_a3": "GTM", "su_dif": 0, "subunit": "Guatemala", "su_a3": "GTM", "brk_diff": 0, "name": "Guatemala", "name_long": "Guatemala", "brk_a3": "GTM", "brk_name": "Guatemala", "abbrev": "Guat.", "postal": "GT", "formal_en": "Republic of Guatemala", "name_sort": "Guatemala", "mapcolor7": 3, "mapcolor8": 3, "mapcolor9": 3, "mapcolor13": 6, "pop_est": 13276517, "gdp_md_est": 68580, "pop_year": -99, "lastcensus": 2002, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "GT", "iso_a3": "GTM", "iso_n3": "320", "un_a3": "320", "wb_a2": "GT", "wb_a3": "GTM", "woe_id": -99, "adm0_a3_is": "GTM", "adm0_a3_us": "GTM", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "North America", "region_un": "Americas", "subregion": "Central America", "region_wb": "Latin America & Caribbean", "name_len": 9, "long_len": 9, "abbrev_len": 5, "tiny": 4, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -90.395508, 15.728814 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Canada", "sov_a3": "CAN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Canada", "adm0_a3": "CAN", "geou_dif": 0, "geounit": "Canada", "gu_a3": "CAN", "su_dif": 0, "subunit": "Canada", "su_a3": "CAN", "brk_diff": 0, "name": "Canada", "name_long": "Canada", "brk_a3": "CAN", "brk_name": "Canada", "abbrev": "Can.", "postal": "CA", "formal_en": "Canada", "name_sort": "Canada", "mapcolor7": 6, "mapcolor8": 6, "mapcolor9": 2, "mapcolor13": 2, "pop_est": 33487208, "gdp_md_est": 1300000, "pop_year": -99, "lastcensus": 2011, "gdp_year": -99, "economy": "1. Developed region: G7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "CA", "iso_a3": "CAN", "iso_n3": "124", "un_a3": "124", "wb_a2": "CA", "wb_a3": "CAN", "woe_id": -99, "adm0_a3_is": "CAN", "adm0_a3_us": "CAN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "North America", "region_un": "Americas", "subregion": "Northern America", "region_wb": "North America", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -103.491211, 59.656642 ] } }
+,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "El Salvador", "sov_a3": "SLV", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "El Salvador", "adm0_a3": "SLV", "geou_dif": 0, "geounit": "El Salvador", "gu_a3": "SLV", "su_dif": 0, "subunit": "El Salvador", "su_a3": "SLV", "brk_diff": 0, "name": "El Salvador", "name_long": "El Salvador", "brk_a3": "SLV", "brk_name": "El Salvador", "abbrev": "El. S.", "postal": "SV", "formal_en": "Republic of El Salvador", "name_sort": "El Salvador", "mapcolor7": 1, "mapcolor8": 4, "mapcolor9": 6, "mapcolor13": 8, "pop_est": 7185218, "gdp_md_est": 43630, "pop_year": -99, "lastcensus": 2007, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "SV", "iso_a3": "SLV", "iso_n3": "222", "un_a3": "222", "wb_a2": "SV", "wb_a3": "SLV", "woe_id": -99, "adm0_a3_is": "SLV", "adm0_a3_us": "SLV", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "North America", "region_un": "Americas", "subregion": "Central America", "region_wb": "Latin America & Caribbean", "name_len": 11, "long_len": 11, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -88.901367, 13.752725 ] } }
+,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Belize", "sov_a3": "BLZ", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Belize", "adm0_a3": "BLZ", "geou_dif": 0, "geounit": "Belize", "gu_a3": "BLZ", "su_dif": 0, "subunit": "Belize", "su_a3": "BLZ", "brk_diff": 0, "name": "Belize", "name_long": "Belize", "brk_a3": "BLZ", "brk_name": "Belize", "abbrev": "Belize", "postal": "BZ", "formal_en": "Belize", "name_sort": "Belize", "mapcolor7": 1, "mapcolor8": 4, "mapcolor9": 5, "mapcolor13": 7, "pop_est": 307899, "gdp_md_est": 2536, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "BZ", "iso_a3": "BLZ", "iso_n3": "084", "un_a3": "084", "wb_a2": "BZ", "wb_a3": "BLZ", "woe_id": -99, "adm0_a3_is": "BLZ", "adm0_a3_us": "BLZ", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "North America", "region_un": "Americas", "subregion": "Central America", "region_wb": "Latin America & Caribbean", "name_len": 6, "long_len": 6, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -88.725586, 17.224758 ] } }
 ] }
 ] }
 ,
 { "type": "FeatureCollection", "properties": { "zoom": 2, "x": 1, "y": 3 }, "features": [
 { "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
-{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -81.892090, -83.657554 ] } }
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -57.172852, -84.826305 ] } }
 ] }
 ] }
 ,
@@ -782,6 +828,8 @@
 ,
 { "type": "FeatureCollection", "properties": { "zoom": 2, "x": 1, "y": 1 }, "features": [
 { "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Guatemala", "sov_a3": "GTM", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Guatemala", "adm0_a3": "GTM", "geou_dif": 0, "geounit": "Guatemala", "gu_a3": "GTM", "su_dif": 0, "subunit": "Guatemala", "su_a3": "GTM", "brk_diff": 0, "name": "Guatemala", "name_long": "Guatemala", "brk_a3": "GTM", "brk_name": "Guatemala", "abbrev": "Guat.", "postal": "GT", "formal_en": "Republic of Guatemala", "name_sort": "Guatemala", "mapcolor7": 3, "mapcolor8": 3, "mapcolor9": 3, "mapcolor13": 6, "pop_est": 13276517, "gdp_md_est": 68580, "pop_year": -99, "lastcensus": 2002, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "GT", "iso_a3": "GTM", "iso_n3": "320", "un_a3": "320", "wb_a2": "GT", "wb_a3": "GTM", "woe_id": -99, "adm0_a3_is": "GTM", "adm0_a3_us": "GTM", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "North America", "region_un": "Americas", "subregion": "Central America", "region_wb": "Latin America & Caribbean", "name_len": 9, "long_len": 9, "abbrev_len": 5, "tiny": 4, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -90.395508, 15.728814 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "The Bahamas", "sov_a3": "BHS", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "The Bahamas", "adm0_a3": "BHS", "geou_dif": 0, "geounit": "The Bahamas", "gu_a3": "BHS", "su_dif": 0, "subunit": "The Bahamas", "su_a3": "BHS", "brk_diff": 0, "name": "Bahamas", "name_long": "Bahamas", "brk_a3": "BHS", "brk_name": "Bahamas", "abbrev": "Bhs.", "postal": "BS", "formal_en": "Commonwealth of the Bahamas", "name_sort": "Bahamas, The", "mapcolor7": 1, "mapcolor8": 1, "mapcolor9": 2, "mapcolor13": 5, "pop_est": 309156, "gdp_md_est": 9093, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "BS", "iso_a3": "BHS", "iso_n3": "044", "un_a3": "044", "wb_a2": "BS", "wb_a3": "BHS", "woe_id": -99, "adm0_a3_is": "BHS", "adm0_a3_us": "BHS", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "North America", "region_un": "Americas", "subregion": "Caribbean", "region_wb": "Latin America & Caribbean", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -77.937012, 24.527135 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "El Salvador", "sov_a3": "SLV", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "El Salvador", "adm0_a3": "SLV", "geou_dif": 0, "geounit": "El Salvador", "gu_a3": "SLV", "su_dif": 0, "subunit": "El Salvador", "su_a3": "SLV", "brk_diff": 0, "name": "El Salvador", "name_long": "El Salvador", "brk_a3": "SLV", "brk_name": "El Salvador", "abbrev": "El. S.", "postal": "SV", "formal_en": "Republic of El Salvador", "name_sort": "El Salvador", "mapcolor7": 1, "mapcolor8": 4, "mapcolor9": 6, "mapcolor13": 8, "pop_est": 7185218, "gdp_md_est": 43630, "pop_year": -99, "lastcensus": 2007, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "SV", "iso_a3": "SLV", "iso_n3": "222", "un_a3": "222", "wb_a2": "SV", "wb_a3": "SLV", "woe_id": -99, "adm0_a3_is": "SLV", "adm0_a3_us": "SLV", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "North America", "region_un": "Americas", "subregion": "Central America", "region_wb": "Latin America & Caribbean", "name_len": 11, "long_len": 11, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -88.901367, 13.752725 ] } }
@@ -806,6 +854,8 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Colombia", "sov_a3": "COL", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Colombia", "adm0_a3": "COL", "geou_dif": 0, "geounit": "Colombia", "gu_a3": "COL", "su_dif": 0, "subunit": "Colombia", "su_a3": "COL", "brk_diff": 0, "name": "Colombia", "name_long": "Colombia", "brk_a3": "COL", "brk_name": "Colombia", "abbrev": "Col.", "postal": "CO", "formal_en": "Republic of Colombia", "name_sort": "Colombia", "mapcolor7": 2, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 1, "pop_est": 45644023, "gdp_md_est": 395400, "pop_year": -99, "lastcensus": 2006, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "CO", "iso_a3": "COL", "iso_n3": "170", "un_a3": "170", "wb_a2": "CO", "wb_a3": "COL", "woe_id": -99, "adm0_a3_is": "COL", "adm0_a3_us": "COL", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "South America", "region_un": "Americas", "subregion": "South America", "region_wb": "Latin America & Caribbean", "name_len": 8, "long_len": 8, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -73.103027, 3.973861 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Ecuador", "sov_a3": "ECU", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Ecuador", "adm0_a3": "ECU", "geou_dif": 0, "geounit": "Ecuador", "gu_a3": "ECU", "su_dif": 0, "subunit": "Ecuador", "su_a3": "ECU", "brk_diff": 0, "name": "Ecuador", "name_long": "Ecuador", "brk_a3": "ECU", "brk_name": "Ecuador", "abbrev": "Ecu.", "postal": "EC", "formal_en": "Republic of Ecuador", "name_sort": "Ecuador", "mapcolor7": 1, "mapcolor8": 5, "mapcolor9": 2, "mapcolor13": 12, "pop_est": 14573101, "gdp_md_est": 107700, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "EC", "iso_a3": "ECU", "iso_n3": "218", "un_a3": "218", "wb_a2": "EC", "wb_a3": "ECU", "woe_id": -99, "adm0_a3_is": "ECU", "adm0_a3_us": "ECU", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "South America", "region_un": "Americas", "subregion": "South America", "region_wb": "Latin America & Caribbean", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -78.398438, -1.428075 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 5, "sovereignt": "United States of America", "sov_a3": "US1", "adm0_dif": 1, "level": 2, "type": "Dependency", "admin": "Puerto Rico", "adm0_a3": "PRI", "geou_dif": 0, "geounit": "Puerto Rico", "gu_a3": "PRI", "su_dif": 0, "subunit": "Puerto Rico", "su_a3": "PRI", "brk_diff": 0, "name": "Puerto Rico", "name_long": "Puerto Rico", "brk_a3": "PRI", "brk_name": "Puerto Rico", "abbrev": "P.R.", "postal": "PR", "formal_en": "Commonwealth of Puerto Rico", "note_adm0": "Commonwealth of U.S.A.", "name_sort": "Puerto Rico", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": 1, "pop_est": 3971020, "gdp_md_est": 70230, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "PR", "iso_a3": "PRI", "iso_n3": "630", "un_a3": "630", "wb_a2": "PR", "wb_a3": "PRI", "woe_id": -99, "adm0_a3_is": "PRI", "adm0_a3_us": "PRI", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "North America", "region_un": "Americas", "subregion": "Caribbean", "region_wb": "Latin America & Caribbean", "name_len": 11, "long_len": 11, "abbrev_len": 4, "tiny": -99, "homepart": -99 }, "geometry": { "type": "Point", "coordinates": [ -66.489258, 18.250220 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Venezuela", "sov_a3": "VEN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Venezuela", "adm0_a3": "VEN", "geou_dif": 0, "geounit": "Venezuela", "gu_a3": "VEN", "su_dif": 0, "subunit": "Venezuela", "su_a3": "VEN", "brk_diff": 0, "name": "Venezuela", "name_long": "Venezuela", "brk_a3": "VEN", "brk_name": "Venezuela", "abbrev": "Ven.", "postal": "VE", "formal_en": "Bolivarian Republic of Venezuela", "formal_fr": "República Bolivariana de Venezuela", "name_sort": "Venezuela, RB", "mapcolor7": 1, "mapcolor8": 3, "mapcolor9": 1, "mapcolor13": 4, "pop_est": 26814843, "gdp_md_est": 357400, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "5. Emerging region: G20", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "VE", "iso_a3": "VEN", "iso_n3": "862", "un_a3": "862", "wb_a2": "VE", "wb_a3": "VEN", "woe_id": -99, "adm0_a3_is": "VEN", "adm0_a3_us": "VEN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "South America", "region_un": "Americas", "subregion": "South America", "region_wb": "Latin America & Caribbean", "name_len": 9, "long_len": 9, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -66.181641, 7.209900 ] } }
@@ -851,6 +901,8 @@
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Ghana", "sov_a3": "GHA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Ghana", "adm0_a3": "GHA", "geou_dif": 0, "geounit": "Ghana", "gu_a3": "GHA", "su_dif": 0, "subunit": "Ghana", "su_a3": "GHA", "brk_diff": 0, "name": "Ghana", "name_long": "Ghana", "brk_a3": "GHA", "brk_name": "Ghana", "abbrev": "Ghana", "postal": "GH", "formal_en": "Republic of Ghana", "name_sort": "Ghana", "mapcolor7": 5, "mapcolor8": 3, "mapcolor9": 1, "mapcolor13": 4, "pop_est": 23832495, "gdp_md_est": 34200, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "GH", "iso_a3": "GHA", "iso_n3": "288", "un_a3": "288", "wb_a2": "GH", "wb_a3": "GHA", "woe_id": -99, "adm0_a3_is": "GHA", "adm0_a3_us": "GHA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Western Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -1.252441, 7.950437 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "United Kingdom", "sov_a3": "GB1", "adm0_dif": 1, "level": 2, "type": "Country", "admin": "United Kingdom", "adm0_a3": "GBR", "geou_dif": 0, "geounit": "United Kingdom", "gu_a3": "GBR", "su_dif": 0, "subunit": "United Kingdom", "su_a3": "GBR", "brk_diff": 0, "name": "United Kingdom", "name_long": "United Kingdom", "brk_a3": "GBR", "brk_name": "United Kingdom", "abbrev": "U.K.", "postal": "GB", "formal_en": "United Kingdom of Great Britain and Northern Ireland", "name_sort": "United Kingdom", "mapcolor7": 6, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 3, "pop_est": 62262000, "gdp_md_est": 1977704, "pop_year": 0, "lastcensus": 2011, "gdp_year": 2009, "economy": "1. Developed region: G7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "GB", "iso_a3": "GBR", "iso_n3": "826", "un_a3": "826", "wb_a2": "GB", "wb_a3": "GBR", "woe_id": -99, "adm0_a3_is": "GBR", "adm0_a3_us": "GBR", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Northern Europe", "region_wb": "Europe & Central Asia", "name_len": 14, "long_len": 14, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -2.241211, 54.533833 ] } }
+,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Togo", "sov_a3": "TGO", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Togo", "adm0_a3": "TGO", "geou_dif": 0, "geounit": "Togo", "gu_a3": "TGO", "su_dif": 0, "subunit": "Togo", "su_a3": "TGO", "brk_diff": 0, "name": "Togo", "name_long": "Togo", "brk_a3": "TGO", "brk_name": "Togo", "abbrev": "Togo", "postal": "TG", "formal_en": "Togolese Republic", "formal_fr": "République Togolaise", "name_sort": "Togo", "mapcolor7": 3, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 5, "pop_est": 6019877, "gdp_md_est": 5118, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "TG", "iso_a3": "TGO", "iso_n3": "768", "un_a3": "768", "wb_a2": "TG", "wb_a3": "TGO", "woe_id": -99, "adm0_a3_is": "TGO", "adm0_a3_us": "TGO", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Western Africa", "region_wb": "Sub-Saharan Africa", "name_len": 4, "long_len": 4, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 0.966797, 8.472372 ] } }
 ] }
 ] }
 ,
@@ -862,7 +914,7 @@
 ,
 { "type": "FeatureCollection", "properties": { "zoom": 2, "x": 2, "y": 3 }, "features": [
 { "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
-{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 14.414062, -83.015539 ] } }
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "MultiPoint", "coordinates": [ [ 4.877930, -81.123779 ], [ 66.906738, -74.804666 ], [ 66.906738, -84.826305 ] ] } }
 ] }
 ] }
 ,
@@ -870,8 +922,12 @@
 { "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Gabon", "sov_a3": "GAB", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Gabon", "adm0_a3": "GAB", "geou_dif": 0, "geounit": "Gabon", "gu_a3": "GAB", "su_dif": 0, "subunit": "Gabon", "su_a3": "GAB", "brk_diff": 0, "name": "Gabon", "name_long": "Gabon", "brk_a3": "GAB", "brk_name": "Gabon", "abbrev": "Gabon", "postal": "GA", "formal_en": "Gabonese Republic", "name_sort": "Gabon", "mapcolor7": 6, "mapcolor8": 2, "mapcolor9": 5, "mapcolor13": 5, "pop_est": 1514993, "gdp_md_est": 21110, "pop_year": -99, "lastcensus": 2003, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "GA", "iso_a3": "GAB", "iso_n3": "266", "un_a3": "266", "wb_a2": "GA", "wb_a3": "GAB", "woe_id": -99, "adm0_a3_is": "GAB", "adm0_a3_us": "GAB", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 5, "tiny": 3, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 11.667480, -0.637194 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Equatorial Guinea", "sov_a3": "GNQ", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Equatorial Guinea", "adm0_a3": "GNQ", "geou_dif": 0, "geounit": "Equatorial Guinea", "gu_a3": "GNQ", "su_dif": 0, "subunit": "Equatorial Guinea", "su_a3": "GNQ", "brk_diff": 0, "name": "Eq. Guinea", "name_long": "Equatorial Guinea", "brk_a3": "GNQ", "brk_name": "Eq. Guinea", "abbrev": "Eq. G.", "postal": "GQ", "formal_en": "Republic of Equatorial Guinea", "name_sort": "Equatorial Guinea", "mapcolor7": 4, "mapcolor8": 1, "mapcolor9": 4, "mapcolor13": 8, "pop_est": 650702, "gdp_md_est": 14060, "pop_year": 0, "lastcensus": 2002, "gdp_year": 0, "economy": "7. Least developed region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "GQ", "iso_a3": "GNQ", "iso_n3": "226", "un_a3": "226", "wb_a2": "GQ", "wb_a3": "GNQ", "woe_id": -99, "adm0_a3_is": "GNQ", "adm0_a3_us": "GNQ", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 10, "long_len": 17, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 10.349121, 1.669686 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Democratic Republic of the Congo", "sov_a3": "COD", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Democratic Republic of the Congo", "adm0_a3": "COD", "geou_dif": 0, "geounit": "Democratic Republic of the Congo", "gu_a3": "COD", "su_dif": 0, "subunit": "Democratic Republic of the Congo", "su_a3": "COD", "brk_diff": 0, "name": "Dem. Rep. Congo", "name_long": "Democratic Republic of the Congo", "brk_a3": "COD", "brk_name": "Democratic Republic of the Congo", "abbrev": "D.R.C.", "postal": "DRC", "formal_en": "Democratic Republic of the Congo", "name_sort": "Congo, Dem. Rep.", "mapcolor7": 4, "mapcolor8": 4, "mapcolor9": 4, "mapcolor13": 7, "pop_est": 68692542, "gdp_md_est": 20640, "pop_year": -99, "lastcensus": 1984, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "CD", "iso_a3": "COD", "iso_n3": "180", "un_a3": "180", "wb_a2": "ZR", "wb_a3": "ZAR", "woe_id": -99, "adm0_a3_is": "COD", "adm0_a3_us": "COD", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 15, "long_len": 32, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 23.554688, -2.855263 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Uganda", "sov_a3": "UGA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Uganda", "adm0_a3": "UGA", "geou_dif": 0, "geounit": "Uganda", "gu_a3": "UGA", "su_dif": 0, "subunit": "Uganda", "su_a3": "UGA", "brk_diff": 0, "name": "Uganda", "name_long": "Uganda", "brk_a3": "UGA", "brk_name": "Uganda", "abbrev": "Uga.", "postal": "UG", "formal_en": "Republic of Uganda", "name_sort": "Uganda", "mapcolor7": 6, "mapcolor8": 3, "mapcolor9": 6, "mapcolor13": 4, "pop_est": 32369558, "gdp_md_est": 39380, "pop_year": -99, "lastcensus": 2002, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "UG", "iso_a3": "UGA", "iso_n3": "800", "un_a3": "800", "wb_a2": "UG", "wb_a3": "UGA", "woe_id": -99, "adm0_a3_is": "UGA", "adm0_a3_us": "UGA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 32.343750, 1.318243 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Republic of Congo", "sov_a3": "COG", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Republic of Congo", "adm0_a3": "COG", "geou_dif": 0, "geounit": "Republic of Congo", "gu_a3": "COG", "su_dif": 0, "subunit": "Republic of Congo", "su_a3": "COG", "brk_diff": 0, "name": "Congo", "name_long": "Republic of Congo", "brk_a3": "COG", "brk_name": "Republic of Congo", "abbrev": "Rep. Congo", "postal": "CG", "formal_en": "Republic of Congo", "name_sort": "Congo, Rep.", "mapcolor7": 2, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 10, "pop_est": 4012809, "gdp_md_est": 15350, "pop_year": -99, "lastcensus": 2007, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "CG", "iso_a3": "COG", "iso_n3": "178", "un_a3": "178", "wb_a2": "CG", "wb_a3": "COG", "woe_id": -99, "adm0_a3_is": "COG", "adm0_a3_us": "COG", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 17, "abbrev_len": 10, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 15.117188, -0.812961 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Angola", "sov_a3": "AGO", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Angola", "adm0_a3": "AGO", "geou_dif": 0, "geounit": "Angola", "gu_a3": "AGO", "su_dif": 0, "subunit": "Angola", "su_a3": "AGO", "brk_diff": 0, "name": "Angola", "name_long": "Angola", "brk_a3": "AGO", "brk_name": "Angola", "abbrev": "Ang.", "postal": "AO", "formal_en": "People's Republic of Angola", "name_sort": "Angola", "mapcolor7": 3, "mapcolor8": 2, "mapcolor9": 6, "mapcolor13": 1, "pop_est": 12799293, "gdp_md_est": 110300, "pop_year": -99, "lastcensus": 1970, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "AO", "iso_a3": "AGO", "iso_n3": "024", "un_a3": "024", "wb_a2": "AO", "wb_a3": "AGO", "woe_id": -99, "adm0_a3_is": "AGO", "adm0_a3_us": "AGO", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 17.490234, -12.318536 ] } }
@@ -890,6 +946,8 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Mozambique", "sov_a3": "MOZ", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Mozambique", "adm0_a3": "MOZ", "geou_dif": 0, "geounit": "Mozambique", "gu_a3": "MOZ", "su_dif": 0, "subunit": "Mozambique", "su_a3": "MOZ", "brk_diff": 0, "name": "Mozambique", "name_long": "Mozambique", "brk_a3": "MOZ", "brk_name": "Mozambique", "abbrev": "Moz.", "postal": "MZ", "formal_en": "Republic of Mozambique", "name_sort": "Mozambique", "mapcolor7": 4, "mapcolor8": 2, "mapcolor9": 1, "mapcolor13": 4, "pop_est": 21669278, "gdp_md_est": 18940, "pop_year": -99, "lastcensus": 2007, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "MZ", "iso_a3": "MOZ", "iso_n3": "508", "un_a3": "508", "wb_a2": "MZ", "wb_a3": "MOZ", "woe_id": -99, "adm0_a3_is": "MOZ", "adm0_a3_us": "MOZ", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 38.100586, -14.541050 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Kenya", "sov_a3": "KEN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Kenya", "adm0_a3": "KEN", "geou_dif": 0, "geounit": "Kenya", "gu_a3": "KEN", "su_dif": 0, "subunit": "Kenya", "su_a3": "KEN", "brk_diff": 0, "name": "Kenya", "name_long": "Kenya", "brk_a3": "KEN", "brk_name": "Kenya", "abbrev": "Ken.", "postal": "KE", "formal_en": "Republic of Kenya", "name_sort": "Kenya", "mapcolor7": 5, "mapcolor8": 2, "mapcolor9": 7, "mapcolor13": 3, "pop_est": 39002772, "gdp_md_est": 61510, "pop_year": -99, "lastcensus": 2009, "gdp_year": -99, "economy": "5. Emerging region: G20", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "KE", "iso_a3": "KEN", "iso_n3": "404", "un_a3": "404", "wb_a2": "KE", "wb_a3": "KEN", "woe_id": -99, "adm0_a3_is": "KEN", "adm0_a3_us": "KEN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 37.770996, 0.615223 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Malawi", "sov_a3": "MWI", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Malawi", "adm0_a3": "MWI", "geou_dif": 0, "geounit": "Malawi", "gu_a3": "MWI", "su_dif": 0, "subunit": "Malawi", "su_a3": "MWI", "brk_diff": 0, "name": "Malawi", "name_long": "Malawi", "brk_a3": "MWI", "brk_name": "Malawi", "abbrev": "Mal.", "postal": "MW", "formal_en": "Republic of Malawi", "name_sort": "Malawi", "mapcolor7": 1, "mapcolor8": 3, "mapcolor9": 4, "mapcolor13": 5, "pop_est": 14268711, "gdp_md_est": 11810, "pop_year": -99, "lastcensus": 2008, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "MW", "iso_a3": "MWI", "iso_n3": "454", "un_a3": "454", "wb_a2": "MW", "wb_a3": "MWI", "woe_id": -99, "adm0_a3_is": "MWI", "adm0_a3_us": "MWI", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 34.167480, -13.175771 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Madagascar", "sov_a3": "MDG", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Madagascar", "adm0_a3": "MDG", "geou_dif": 0, "geounit": "Madagascar", "gu_a3": "MDG", "su_dif": 0, "subunit": "Madagascar", "su_a3": "MDG", "brk_diff": 0, "name": "Madagascar", "name_long": "Madagascar", "brk_a3": "MDG", "brk_name": "Madagascar", "abbrev": "Mad.", "postal": "MG", "formal_en": "Republic of Madagascar", "name_sort": "Madagascar", "mapcolor7": 6, "mapcolor8": 5, "mapcolor9": 2, "mapcolor13": 3, "pop_est": 20653556, "gdp_md_est": 20130, "pop_year": -99, "lastcensus": 1993, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "MG", "iso_a3": "MDG", "iso_n3": "450", "un_a3": "450", "wb_a2": "MG", "wb_a3": "MDG", "woe_id": -99, "adm0_a3_is": "MDG", "adm0_a3_us": "MDG", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 46.647949, -19.435514 ] } }
@@ -910,6 +968,8 @@
 { "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Algeria", "sov_a3": "DZA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Algeria", "adm0_a3": "DZA", "geou_dif": 0, "geounit": "Algeria", "gu_a3": "DZA", "su_dif": 0, "subunit": "Algeria", "su_a3": "DZA", "brk_diff": 0, "name": "Algeria", "name_long": "Algeria", "brk_a3": "DZA", "brk_name": "Algeria", "abbrev": "Alg.", "postal": "DZ", "formal_en": "People's Democratic Republic of Algeria", "name_sort": "Algeria", "mapcolor7": 5, "mapcolor8": 1, "mapcolor9": 6, "mapcolor13": 3, "pop_est": 34178188, "gdp_md_est": 232900, "pop_year": -99, "lastcensus": 2008, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "DZ", "iso_a3": "DZA", "iso_n3": "012", "un_a3": "012", "wb_a2": "DZ", "wb_a3": "DZA", "woe_id": -99, "adm0_a3_is": "DZA", "adm0_a3_us": "DZA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Northern Africa", "region_wb": "Middle East & North Africa", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 2.570801, 28.459033 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Ghana", "sov_a3": "GHA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Ghana", "adm0_a3": "GHA", "geou_dif": 0, "geounit": "Ghana", "gu_a3": "GHA", "su_dif": 0, "subunit": "Ghana", "su_a3": "GHA", "brk_diff": 0, "name": "Ghana", "name_long": "Ghana", "brk_a3": "GHA", "brk_name": "Ghana", "abbrev": "Ghana", "postal": "GH", "formal_en": "Republic of Ghana", "name_sort": "Ghana", "mapcolor7": 5, "mapcolor8": 3, "mapcolor9": 1, "mapcolor13": 4, "pop_est": 23832495, "gdp_md_est": 34200, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "GH", "iso_a3": "GHA", "iso_n3": "288", "un_a3": "288", "wb_a2": "GH", "wb_a3": "GHA", "woe_id": -99, "adm0_a3_is": "GHA", "adm0_a3_us": "GHA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Western Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ -1.252441, 7.950437 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Norway", "sov_a3": "NOR", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Norway", "adm0_a3": "NOR", "geou_dif": 0, "geounit": "Norway", "gu_a3": "NOR", "su_dif": 0, "subunit": "Norway", "su_a3": "NOR", "brk_diff": 0, "name": "Norway", "name_long": "Norway", "brk_a3": "NOR", "brk_name": "Norway", "abbrev": "Nor.", "postal": "N", "formal_en": "Kingdom of Norway", "name_sort": "Norway", "mapcolor7": 5, "mapcolor8": 3, "mapcolor9": 8, "mapcolor13": 12, "pop_est": 4676305, "gdp_md_est": 276400, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "NO", "iso_a3": "NOR", "iso_n3": "578", "un_a3": "578", "wb_a2": "NO", "wb_a3": "NOR", "woe_id": -99, "adm0_a3_is": "NOR", "adm0_a3_us": "NOR", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Northern Europe", "region_wb": "Europe & Central Asia", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 8.261719, 61.990588 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Sweden", "sov_a3": "SWE", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Sweden", "adm0_a3": "SWE", "geou_dif": 0, "geounit": "Sweden", "gu_a3": "SWE", "su_dif": 0, "subunit": "Sweden", "su_a3": "SWE", "brk_diff": 0, "name": "Sweden", "name_long": "Sweden", "brk_a3": "SWE", "brk_name": "Sweden", "abbrev": "Swe.", "postal": "S", "formal_en": "Kingdom of Sweden", "name_sort": "Sweden", "mapcolor7": 1, "mapcolor8": 4, "mapcolor9": 2, "mapcolor13": 4, "pop_est": 9059651, "gdp_md_est": 344300, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "SE", "iso_a3": "SWE", "iso_n3": "752", "un_a3": "752", "wb_a2": "SE", "wb_a3": "SWE", "woe_id": -99, "adm0_a3_is": "SWE", "adm0_a3_us": "SWE", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Northern Europe", "region_wb": "Europe & Central Asia", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 16.831055, 63.450509 ] } }
@@ -992,6 +1052,8 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Nigeria", "sov_a3": "NGA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Nigeria", "adm0_a3": "NGA", "geou_dif": 0, "geounit": "Nigeria", "gu_a3": "NGA", "su_dif": 0, "subunit": "Nigeria", "su_a3": "NGA", "brk_diff": 0, "name": "Nigeria", "name_long": "Nigeria", "brk_a3": "NGA", "brk_name": "Nigeria", "abbrev": "Nigeria", "postal": "NG", "formal_en": "Federal Republic of Nigeria", "name_sort": "Nigeria", "mapcolor7": 3, "mapcolor8": 2, "mapcolor9": 5, "mapcolor13": 2, "pop_est": 149229090, "gdp_md_est": 335400, "pop_year": -99, "lastcensus": 2006, "gdp_year": -99, "economy": "5. Emerging region: G20", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "NG", "iso_a3": "NGA", "iso_n3": "566", "un_a3": "566", "wb_a2": "NG", "wb_a3": "NGA", "woe_id": -99, "adm0_a3_is": "NGA", "adm0_a3_us": "NGA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Western Africa", "region_wb": "Sub-Saharan Africa", "name_len": 7, "long_len": 7, "abbrev_len": 7, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 7.976074, 9.600750 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Gabon", "sov_a3": "GAB", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Gabon", "adm0_a3": "GAB", "geou_dif": 0, "geounit": "Gabon", "gu_a3": "GAB", "su_dif": 0, "subunit": "Gabon", "su_a3": "GAB", "brk_diff": 0, "name": "Gabon", "name_long": "Gabon", "brk_a3": "GAB", "brk_name": "Gabon", "abbrev": "Gabon", "postal": "GA", "formal_en": "Gabonese Republic", "name_sort": "Gabon", "mapcolor7": 6, "mapcolor8": 2, "mapcolor9": 5, "mapcolor13": 5, "pop_est": 1514993, "gdp_md_est": 21110, "pop_year": -99, "lastcensus": 2003, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "3. Upper middle income", "wikipedia": -99, "iso_a2": "GA", "iso_a3": "GAB", "iso_n3": "266", "un_a3": "266", "wb_a2": "GA", "wb_a3": "GAB", "woe_id": -99, "adm0_a3_is": "GAB", "adm0_a3_us": "GAB", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 5, "tiny": 3, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 11.667480, -0.637194 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Equatorial Guinea", "sov_a3": "GNQ", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Equatorial Guinea", "adm0_a3": "GNQ", "geou_dif": 0, "geounit": "Equatorial Guinea", "gu_a3": "GNQ", "su_dif": 0, "subunit": "Equatorial Guinea", "su_a3": "GNQ", "brk_diff": 0, "name": "Eq. Guinea", "name_long": "Equatorial Guinea", "brk_a3": "GNQ", "brk_name": "Eq. Guinea", "abbrev": "Eq. G.", "postal": "GQ", "formal_en": "Republic of Equatorial Guinea", "name_sort": "Equatorial Guinea", "mapcolor7": 4, "mapcolor8": 1, "mapcolor9": 4, "mapcolor13": 8, "pop_est": 650702, "gdp_md_est": 14060, "pop_year": 0, "lastcensus": 2002, "gdp_year": 0, "economy": "7. Least developed region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "GQ", "iso_a3": "GNQ", "iso_n3": "226", "un_a3": "226", "wb_a2": "GQ", "wb_a3": "GNQ", "woe_id": -99, "adm0_a3_is": "GNQ", "adm0_a3_us": "GNQ", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 10, "long_len": 17, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 10.349121, 1.669686 ] } }
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Central African Republic", "sov_a3": "CAF", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Central African Republic", "adm0_a3": "CAF", "geou_dif": 0, "geounit": "Central African Republic", "gu_a3": "CAF", "su_dif": 0, "subunit": "Central African Republic", "su_a3": "CAF", "brk_diff": 0, "name": "Central African Rep.", "name_long": "Central African Republic", "brk_a3": "CAF", "brk_name": "Central African Rep.", "abbrev": "C.A.R.", "postal": "CF", "formal_en": "Central African Republic", "name_sort": "Central African Republic", "mapcolor7": 5, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 9, "pop_est": 4511488, "gdp_md_est": 3198, "pop_year": -99, "lastcensus": 2003, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "CF", "iso_a3": "CAF", "iso_n3": "140", "un_a3": "140", "wb_a2": "CF", "wb_a3": "CAF", "woe_id": -99, "adm0_a3_is": "CAF", "adm0_a3_us": "CAF", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 20, "long_len": 24, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 20.368652, 6.577303 ] } }
@@ -1072,19 +1134,19 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Sri Lanka", "sov_a3": "LKA", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Sri Lanka", "adm0_a3": "LKA", "geou_dif": 0, "geounit": "Sri Lanka", "gu_a3": "LKA", "su_dif": 0, "subunit": "Sri Lanka", "su_a3": "LKA", "brk_diff": 0, "name": "Sri Lanka", "name_long": "Sri Lanka", "brk_a3": "LKA", "brk_name": "Sri Lanka", "abbrev": "Sri L.", "postal": "LK", "formal_en": "Democratic Socialist Republic of Sri Lanka", "name_sort": "Sri Lanka", "mapcolor7": 3, "mapcolor8": 5, "mapcolor9": 4, "mapcolor13": 9, "pop_est": 21324791, "gdp_md_est": 91870, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "LK", "iso_a3": "LKA", "iso_n3": "144", "un_a3": "144", "wb_a2": "LK", "wb_a3": "LKA", "woe_id": -99, "adm0_a3_is": "LKA", "adm0_a3_us": "LKA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "Southern Asia", "region_wb": "South Asia", "name_len": 9, "long_len": 9, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 80.661621, 7.732765 ] } }
 ,
-{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Kenya", "sov_a3": "KEN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Kenya", "adm0_a3": "KEN", "geou_dif": 0, "geounit": "Kenya", "gu_a3": "KEN", "su_dif": 0, "subunit": "Kenya", "su_a3": "KEN", "brk_diff": 0, "name": "Kenya", "name_long": "Kenya", "brk_a3": "KEN", "brk_name": "Kenya", "abbrev": "Ken.", "postal": "KE", "formal_en": "Republic of Kenya", "name_sort": "Kenya", "mapcolor7": 5, "mapcolor8": 2, "mapcolor9": 7, "mapcolor13": 3, "pop_est": 39002772, "gdp_md_est": 61510, "pop_year": -99, "lastcensus": 2009, "gdp_year": -99, "economy": "5. Emerging region: G20", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "KE", "iso_a3": "KEN", "iso_n3": "404", "un_a3": "404", "wb_a2": "KE", "wb_a3": "KEN", "woe_id": -99, "adm0_a3_is": "KEN", "adm0_a3_us": "KEN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 37.770996, 0.615223 ] } }
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 5, "sovereignt": "Bhutan", "sov_a3": "BTN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Bhutan", "adm0_a3": "BTN", "geou_dif": 0, "geounit": "Bhutan", "gu_a3": "BTN", "su_dif": 0, "subunit": "Bhutan", "su_a3": "BTN", "brk_diff": 0, "name": "Bhutan", "name_long": "Bhutan", "brk_a3": "BTN", "brk_name": "Bhutan", "abbrev": "Bhutan", "postal": "BT", "formal_en": "Kingdom of Bhutan", "name_sort": "Bhutan", "mapcolor7": 5, "mapcolor8": 6, "mapcolor9": 1, "mapcolor13": 8, "pop_est": 691141, "gdp_md_est": 3524, "pop_year": -99, "lastcensus": 2005, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "BT", "iso_a3": "BTN", "iso_n3": "064", "un_a3": "064", "wb_a2": "BT", "wb_a3": "BTN", "woe_id": -99, "adm0_a3_is": "BTN", "adm0_a3_us": "BTN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "Southern Asia", "region_wb": "South Asia", "name_len": 6, "long_len": 6, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 90.461426, 27.449790 ] } }
-] }
-] }
 ,
-{ "type": "FeatureCollection", "properties": { "zoom": 2, "x": 2, "y": 0 }, "features": [
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Bangladesh", "sov_a3": "BGD", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Bangladesh", "adm0_a3": "BGD", "geou_dif": 0, "geounit": "Bangladesh", "gu_a3": "BGD", "su_dif": 0, "subunit": "Bangladesh", "su_a3": "BGD", "brk_diff": 0, "name": "Bangladesh", "name_long": "Bangladesh", "brk_a3": "BGD", "brk_name": "Bangladesh", "abbrev": "Bang.", "postal": "BD", "formal_en": "People's Republic of Bangladesh", "name_sort": "Bangladesh", "mapcolor7": 3, "mapcolor8": 4, "mapcolor9": 7, "mapcolor13": 7, "pop_est": 156050883, "gdp_md_est": 224000, "pop_year": -99, "lastcensus": 2011, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "BD", "iso_a3": "BGD", "iso_n3": "050", "un_a3": "050", "wb_a2": "BD", "wb_a3": "BGD", "woe_id": -99, "adm0_a3_is": "BGD", "adm0_a3_us": "BGD", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "Southern Asia", "region_wb": "South Asia", "name_len": 10, "long_len": 10, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 90.241699, 23.885838 ] } }
-{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
+,
-{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Norway", "sov_a3": "NOR", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Norway", "adm0_a3": "NOR", "geou_dif": 0, "geounit": "Norway", "gu_a3": "NOR", "su_dif": 0, "subunit": "Norway", "su_a3": "NOR", "brk_diff": 0, "name": "Norway", "name_long": "Norway", "brk_a3": "NOR", "brk_name": "Norway", "abbrev": "Nor.", "postal": "N", "formal_en": "Kingdom of Norway", "name_sort": "Norway", "mapcolor7": 5, "mapcolor8": 3, "mapcolor9": 8, "mapcolor13": 12, "pop_est": 4676305, "gdp_md_est": 276400, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "2. Developed region: nonG7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "NO", "iso_a3": "NOR", "iso_n3": "578", "un_a3": "578", "wb_a2": "NO", "wb_a3": "NOR", "woe_id": -99, "adm0_a3_is": "NOR", "adm0_a3_us": "NOR", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Northern Europe", "region_wb": "Europe & Central Asia", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 12.700195, 78.251387 ] } }
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Republic of Congo", "sov_a3": "COG", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Republic of Congo", "adm0_a3": "COG", "geou_dif": 0, "geounit": "Republic of Congo", "gu_a3": "COG", "su_dif": 0, "subunit": "Republic of Congo", "su_a3": "COG", "brk_diff": 0, "name": "Congo", "name_long": "Republic of Congo", "brk_a3": "COG", "brk_name": "Republic of Congo", "abbrev": "Rep. Congo", "postal": "CG", "formal_en": "Republic of Congo", "name_sort": "Congo, Rep.", "mapcolor7": 2, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 10, "pop_est": 4012809, "gdp_md_est": 15350, "pop_year": -99, "lastcensus": 2007, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "CG", "iso_a3": "COG", "iso_n3": "178", "un_a3": "178", "wb_a2": "CG", "wb_a3": "COG", "woe_id": -99, "adm0_a3_is": "COG", "adm0_a3_us": "COG", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Middle Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 17, "abbrev_len": 10, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 15.117188, -0.812961 ] } }
+,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Kenya", "sov_a3": "KEN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Kenya", "adm0_a3": "KEN", "geou_dif": 0, "geounit": "Kenya", "gu_a3": "KEN", "su_dif": 0, "subunit": "Kenya", "su_a3": "KEN", "brk_diff": 0, "name": "Kenya", "name_long": "Kenya", "brk_a3": "KEN", "brk_name": "Kenya", "abbrev": "Ken.", "postal": "KE", "formal_en": "Republic of Kenya", "name_sort": "Kenya", "mapcolor7": 5, "mapcolor8": 2, "mapcolor9": 7, "mapcolor13": 3, "pop_est": 39002772, "gdp_md_est": 61510, "pop_year": -99, "lastcensus": 2009, "gdp_year": -99, "economy": "5. Emerging region: G20", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "KE", "iso_a3": "KEN", "iso_n3": "404", "un_a3": "404", "wb_a2": "KE", "wb_a3": "KEN", "woe_id": -99, "adm0_a3_is": "KEN", "adm0_a3_us": "KEN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 5, "long_len": 5, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 37.770996, 0.615223 ] } }
 ] }
 ] }
 ,
 { "type": "FeatureCollection", "properties": { "zoom": 2, "x": 3, "y": 3 }, "features": [
 { "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
-{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "MultiPoint", "coordinates": [ [ 95.910645, -76.434604 ], [ 160.356445, -76.930555 ] ] } }
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 4, "sovereignt": "Antarctica", "sov_a3": "ATA", "adm0_dif": 0, "level": 2, "type": "Indeterminate", "admin": "Antarctica", "adm0_a3": "ATA", "geou_dif": 0, "geounit": "Antarctica", "gu_a3": "ATA", "su_dif": 0, "subunit": "Antarctica", "su_a3": "ATA", "brk_diff": 0, "name": "Antarctica", "name_long": "Antarctica", "brk_a3": "ATA", "brk_name": "Antarctica", "abbrev": "Ant.", "postal": "AQ", "note_brk": "Multiple claims held in abeyance", "name_sort": "Antarctica", "mapcolor7": 4, "mapcolor8": 5, "mapcolor9": 1, "mapcolor13": -99, "pop_est": 3802, "gdp_md_est": 760.4, "pop_year": -99, "lastcensus": -99, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "AQ", "iso_a3": "ATA", "iso_n3": "010", "un_a3": "-099", "wb_a2": "-99", "wb_a3": "-99", "woe_id": -99, "adm0_a3_is": "ATA", "adm0_a3_us": "ATA", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Antarctica", "region_un": "Antarctica", "subregion": "Antarctica", "region_wb": "Antarctica", "name_len": 10, "long_len": 10, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 128.935547, -81.123779 ] } }
 ] }
 ] }
 ,
@@ -1144,6 +1206,8 @@
 ,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Brunei", "sov_a3": "BRN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Brunei", "adm0_a3": "BRN", "geou_dif": 0, "geounit": "Brunei", "gu_a3": "BRN", "su_dif": 0, "subunit": "Brunei", "su_a3": "BRN", "brk_diff": 0, "name": "Brunei", "name_long": "Brunei Darussalam", "brk_a3": "BRN", "brk_name": "Brunei", "abbrev": "Brunei", "postal": "BN", "formal_en": "Negara Brunei Darussalam", "name_sort": "Brunei", "mapcolor7": 4, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 12, "pop_est": 388190, "gdp_md_est": 20250, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "BN", "iso_a3": "BRN", "iso_n3": "096", "un_a3": "096", "wb_a2": "BN", "wb_a3": "BRN", "woe_id": -99, "adm0_a3_is": "BRN", "adm0_a3_us": "BRN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "South-Eastern Asia", "region_wb": "East Asia & Pacific", "name_len": 6, "long_len": 17, "abbrev_len": 6, "tiny": 2, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 114.895020, 4.718778 ] } }
 ,
+{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Indonesia", "sov_a3": "IDN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Indonesia", "adm0_a3": "IDN", "geou_dif": 0, "geounit": "Indonesia", "gu_a3": "IDN", "su_dif": 0, "subunit": "Indonesia", "su_a3": "IDN", "brk_diff": 0, "name": "Indonesia", "name_long": "Indonesia", "brk_a3": "IDN", "brk_name": "Indonesia", "abbrev": "Indo.", "postal": "INDO", "formal_en": "Republic of Indonesia", "name_sort": "Indonesia", "mapcolor7": 6, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 11, "pop_est": 240271522, "gdp_md_est": 914600, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "4. Emerging region: MIKT", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "ID", "iso_a3": "IDN", "iso_n3": "360", "un_a3": "360", "wb_a2": "ID", "wb_a3": "IDN", "woe_id": -99, "adm0_a3_is": "IDN", "adm0_a3_us": "IDN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "South-Eastern Asia", "region_wb": "East Asia & Pacific", "name_len": 9, "long_len": 9, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 113.994141, -0.219726 ] } }
+,
 { "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Japan", "sov_a3": "JPN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Japan", "adm0_a3": "JPN", "geou_dif": 0, "geounit": "Japan", "gu_a3": "JPN", "su_dif": 0, "subunit": "Japan", "su_a3": "JPN", "brk_diff": 0, "name": "Japan", "name_long": "Japan", "brk_a3": "JPN", "brk_name": "Japan", "abbrev": "Japan", "postal": "J", "formal_en": "Japan", "name_sort": "Japan", "mapcolor7": 5, "mapcolor8": 3, "mapcolor9": 5, "mapcolor13": 4, "pop_est": 127078679, "gdp_md_est": 4329000, "pop_year": -99, "lastcensus": 2010, "gdp_year": -99, "economy": "1. Developed region: G7", "income_grp": "1. High income: OECD", "wikipedia": -99, "iso_a2": "JP", "iso_a3": "JPN", "iso_n3": "392", "un_a3": "392", "wb_a2": "JP", "wb_a3": "JPN", "woe_id": -99, "adm0_a3_is": "JPN", "adm0_a3_us": "JPN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "Eastern Asia", "region_wb": "East Asia & Pacific", "name_len": 5, "long_len": 5, "abbrev_len": 5, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Point", "coordinates": [ 136.933594, 36.137875 ] } }
 ] }
 ] }

tile.cpp

@@ -517,73 +517,84 @@ drawvec revive_polygon(drawvec &geom, double area, int z, int detail) {
 	}
 }
 
+double simplify_partial(partial *p, drawvec &shared_nodes) {
+	drawvec geom;
+
+	for (size_t j = 0; j < p->geoms.size(); j++) {
+		for (size_t k = 0; k < p->geoms[j].size(); k++) {
+			geom.push_back(p->geoms[j][k]);
+		}
+	}
+
+	p->geoms.clear();  // avoid keeping two copies in memory
+	signed char t = p->t;
+	int z = p->z;
+	int line_detail = p->line_detail;
+	int maxzoom = p->maxzoom;
+
+	if (additional[A_GRID_LOW_ZOOMS] && z < maxzoom) {
+		geom = stairstep(geom, z, line_detail);
+	}
+
+	double area = 0;
+	if (t == VT_POLYGON) {
+		area = get_mp_area(geom);
+	}
+
+	if ((t == VT_LINE || t == VT_POLYGON) && !(prevent[P_SIMPLIFY] || (z == maxzoom && prevent[P_SIMPLIFY_LOW]) || (z < maxzoom && additional[A_GRID_LOW_ZOOMS]))) {
+		// Now I finally remember why it doesn't simplify if the feature was reduced:
+		// because it makes square placeholders look like weird triangular placeholders.
+		// Only matters if simplification is set higher than the tiny polygon size.
+		// Tiny polygons that are part of a tiny multipolygon will still get simplified.
+		if (!p->reduced) {
+			if (t == VT_LINE) {
+				// continues to deduplicate to line_detail even if we have extra detail
+				geom = remove_noop(geom, t, 32 - z - line_detail);
+			}
+
+			bool already_marked = false;
+			if (additional[A_DETECT_SHARED_BORDERS] && t == VT_POLYGON) {
+				already_marked = true;
+			}
+
+			if (!already_marked) {
+				if (p->coalesced && t == VT_POLYGON) {
+					// clean coalesced polygons before simplification to avoid
+					// introducing shards between shapes that otherwise would have
+					// unioned exactly
+					geom = clean_or_clip_poly(geom, 0, 0, false);
+				}
+
+				// continues to simplify to line_detail even if we have extra detail
+				drawvec ngeom = simplify_lines(geom, z, line_detail, !(prevent[P_CLIPPING] || prevent[P_DUPLICATION]), p->simplification, t == VT_POLYGON ? 4 : 0, shared_nodes);
+
+				if (t != VT_POLYGON || ngeom.size() >= 3) {
+					geom = ngeom;
+				}
+			}
+		}
+	}
+
+	if (t == VT_LINE && additional[A_REVERSE]) {
+		geom = reorder_lines(geom);
+	}
+
+	p->geoms.push_back(geom);
+	return area;
+}
+
 void *partial_feature_worker(void *v) {
 	struct partial_arg *a = (struct partial_arg *) v;
 	std::vector<struct partial> *partials = a->partials;
 
 	for (size_t i = a->task; i < (*partials).size(); i += a->tasks) {
-		drawvec geom;
+		double area = simplify_partial(&((*partials)[i]), *(a->shared_nodes));
 
-		for (size_t j = 0; j < (*partials)[i].geoms.size(); j++) {
-			for (size_t k = 0; k < (*partials)[i].geoms[j].size(); k++) {
-				geom.push_back((*partials)[i].geoms[j][k]);
-			}
-		}
-
-		(*partials)[i].geoms.clear();  // avoid keeping two copies in memory
 		signed char t = (*partials)[i].t;
 		int z = (*partials)[i].z;
-		int line_detail = (*partials)[i].line_detail;
 		int out_detail = (*partials)[i].extra_detail;
-		int maxzoom = (*partials)[i].maxzoom;
-
-		if (additional[A_GRID_LOW_ZOOMS] && z < maxzoom) {
-			geom = stairstep(geom, z, line_detail);
-		}
-
-		double area = 0;
-		if (t == VT_POLYGON) {
-			area = get_mp_area(geom);
-		}
-
-		if ((t == VT_LINE || t == VT_POLYGON) && !(prevent[P_SIMPLIFY] || (z == maxzoom && prevent[P_SIMPLIFY_LOW]) || (z < maxzoom && additional[A_GRID_LOW_ZOOMS]))) {
-			// Now I finally remember why it doesn't simplify if the feature was reduced:
-			// because it makes square placeholders look like weird triangular placeholders.
-			// Only matters if simplification is set higher than the tiny polygon size.
-			// Tiny polygons that are part of a tiny multipolygon will still get simplified.
-			if (!(*partials)[i].reduced) {
-				if (t == VT_LINE) {
-					// continues to deduplicate to line_detail even if we have extra detail
-					geom = remove_noop(geom, t, 32 - z - line_detail);
-				}
-
-				bool already_marked = false;
-				if (additional[A_DETECT_SHARED_BORDERS] && t == VT_POLYGON) {
-					already_marked = true;
-				}
-
-				if (!already_marked) {
-					if ((*partials)[i].coalesced && t == VT_POLYGON) {
-						// clean coalesced polygons before simplification to avoid
-						// introducing shards between shapes that otherwise would have
-						// unioned exactly
-						geom = clean_or_clip_poly(geom, 0, 0, false);
-					}
-
-					// continues to simplify to line_detail even if we have extra detail
-					drawvec ngeom = simplify_lines(geom, z, line_detail, !(prevent[P_CLIPPING] || prevent[P_DUPLICATION]), (*partials)[i].simplification, t == VT_POLYGON ? 4 : 0, *(a->shared_nodes));
-
-					if (t != VT_POLYGON || ngeom.size() >= 3) {
-						geom = ngeom;
-					}
-				}
-			}
-		}
-
-		if (t == VT_LINE && additional[A_REVERSE]) {
-			geom = reorder_lines(geom);
-		}
 
+		drawvec geom = (*partials)[i].geoms[0];
 		to_tile_scale(geom, z, out_detail);
 
 		if (t == VT_POLYGON) {
@@ -609,7 +620,7 @@ void *partial_feature_worker(void *v) {
 
 		if (t == VT_POLYGON && additional[A_GENERATE_POLYGON_LABEL_POINTS]) {
 			t = (*partials)[i].t = VT_POINT;
-			geom = spiral_anchors(from_tile_scale(geom, z, out_detail), (*partials)[i].tx, (*partials)[i].ty, z, (*partials)[i].label_point);
+			geom = checkerboard_anchors(from_tile_scale(geom, z, out_detail), (*partials)[i].tx, (*partials)[i].ty, z, (*partials)[i].label_point);
 			to_tile_scale(geom, z, out_detail);
 		}
 
@@ -1304,7 +1315,6 @@ struct write_tile_args {
 	std::vector<std::map<std::string, layermap_entry>> *layermaps = NULL;
 	std::vector<std::vector<std::string>> *layer_unmaps = NULL;
 	size_t pass = 0;
-	size_t passes = 0;
 	unsigned long long mingap = 0;
 	unsigned long long mingap_out = 0;
 	long long minextent = 0;
@@ -1419,14 +1429,15 @@ void remove_attributes(serial_feature &sf, std::set<std::string> const &exclude_
 	}
 }
 
-serial_feature next_feature(FILE *geoms, std::atomic<long long> *geompos_in, char *metabase, long long *meta_off, int z, unsigned tx, unsigned ty, unsigned *initial_x, unsigned *initial_y, long long *original_features, long long *unclipped_features, int nextzoom, int maxzoom, int minzoom, int max_zoom_increment, size_t pass, size_t passes, std::atomic<long long> *along, long long alongminus, int buffer, int *within, bool *first_time, FILE **geomfile, std::atomic<long long> *geompos, std::atomic<double> *oprogress, double todo, const char *fname, int child_shards, struct json_object *filter, const char *stringpool, long long *pool_off, std::vector<std::vector<std::string>> *layer_unmaps) {
+serial_feature next_feature(FILE *geoms, std::atomic<long long> *geompos_in, char *metabase, long long *meta_off, int z, unsigned tx, unsigned ty, unsigned *initial_x, unsigned *initial_y, long long *original_features, long long *unclipped_features, int nextzoom, int maxzoom, int minzoom, int max_zoom_increment, size_t pass, std::atomic<long long> *along, long long alongminus, int buffer, int *within, FILE **geomfile, std::atomic<long long> *geompos, std::atomic<double> *oprogress, double todo, const char *fname, int child_shards, struct json_object *filter, const char *stringpool, long long *pool_off, std::vector<std::vector<std::string>> *layer_unmaps, bool first_time) {
 	while (1) {
 		serial_feature sf = deserialize_feature(geoms, geompos_in, metabase, meta_off, z, tx, ty, initial_x, initial_y);
 		if (sf.t < 0) {
 			return sf;
 		}
 
-		double progress = floor(((((*geompos_in + *along - alongminus) / (double) todo) + (pass - (2 - passes))) / passes + z) / (maxzoom + 1) * 1000) / 10;
+		size_t passes = pass + 1;
+		double progress = floor(((((*geompos_in + *along - alongminus) / (double) todo) + pass) / passes + z) / (maxzoom + 1) * 1000) / 10;
 		if (progress >= *oprogress + 0.1) {
 			if (!quiet && !quiet_progress && progress_time()) {
 				fprintf(stderr, "  %3.1f%%  %d/%u/%u  \r", progress, z, tx, ty);
@@ -1447,7 +1458,7 @@ serial_feature next_feature(FILE *geoms, std::atomic<long long> *geompos_in, cha
 			(*unclipped_features)++;
 		}
 
-		if (*first_time && pass == 1) { /* only write out the next zoom once, even if we retry */
+		if (first_time && pass == 0) { /* only write out the next zoom once, even if we retry */
 			if (sf.tippecanoe_maxzoom == -1 || sf.tippecanoe_maxzoom >= nextzoom) {
 				rewrite(sf.geometry, z, nextzoom, maxzoom, sf.bbox, tx, ty, buffer, 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.keys, sf.values, sf.has_id, sf.id, sf.index, sf.label_point, sf.extent);
 			}
@@ -1566,12 +1577,10 @@ struct run_prefilter_args {
 	int minzoom = 0;
 	int max_zoom_increment = 0;
 	size_t pass = 0;
-	size_t passes = 0;
 	std::atomic<long long> *along = 0;
 	long long alongminus = 0;
 	int buffer = 0;
 	int *within = NULL;
-	bool *first_time = NULL;
 	FILE **geomfile = NULL;
 	std::atomic<long long> *geompos = NULL;
 	std::atomic<double> *oprogress = NULL;
@@ -1583,6 +1592,7 @@ struct run_prefilter_args {
 	long long *pool_off = NULL;
 	FILE *prefilter_fp = NULL;
 	struct json_object *filter = NULL;
+	bool first_time = false;
 };
 
 void *run_prefilter(void *v) {
@@ -1590,7 +1600,7 @@ void *run_prefilter(void *v) {
 	json_writer state(rpa->prefilter_fp);
 
 	while (1) {
-		serial_feature sf = next_feature(rpa->geoms, rpa->geompos_in, rpa->metabase, rpa->meta_off, rpa->z, rpa->tx, rpa->ty, rpa->initial_x, rpa->initial_y, rpa->original_features, rpa->unclipped_features, rpa->nextzoom, rpa->maxzoom, rpa->minzoom, rpa->max_zoom_increment, rpa->pass, rpa->passes, rpa->along, rpa->alongminus, rpa->buffer, rpa->within, rpa->first_time, rpa->geomfile, rpa->geompos, rpa->oprogress, rpa->todo, rpa->fname, rpa->child_shards, rpa->filter, rpa->stringpool, rpa->pool_off, rpa->layer_unmaps);
+		serial_feature sf = next_feature(rpa->geoms, rpa->geompos_in, rpa->metabase, rpa->meta_off, rpa->z, rpa->tx, rpa->ty, rpa->initial_x, rpa->initial_y, rpa->original_features, rpa->unclipped_features, rpa->nextzoom, rpa->maxzoom, rpa->minzoom, rpa->max_zoom_increment, rpa->pass, rpa->along, rpa->alongminus, rpa->buffer, rpa->within, rpa->geomfile, rpa->geompos, rpa->oprogress, rpa->todo, rpa->fname, rpa->child_shards, rpa->filter, rpa->stringpool, rpa->pool_off, rpa->layer_unmaps, rpa->first_time);
 		if (sf.t < 0) {
 			break;
 		}
@@ -1819,7 +1829,7 @@ static bool line_is_too_small(drawvec const &geometry, int z, int detail) {
 	return true;
 }
 
-long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *metabase, char *stringpool, int z, const unsigned tx, const unsigned ty, const int detail, int min_detail, sqlite3 *outdb, const char *outdir, int buffer, const char *fname, FILE **geomfile, int minzoom, int maxzoom, double todo, std::atomic<long long> *along, long long alongminus, double gamma, int child_shards, long long *meta_off, long long *pool_off, unsigned *initial_x, unsigned *initial_y, std::atomic<int> *running, double simplification, std::vector<std::map<std::string, layermap_entry>> *layermaps, std::vector<std::vector<std::string>> *layer_unmaps, size_t tiling_seg, size_t pass, size_t passes, unsigned long long mingap, long long minextent, double fraction, const char *prefilter, const char *postfilter, struct json_object *filter, write_tile_args *arg, atomic_strategy *strategy) {
+long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *metabase, char *stringpool, int z, const unsigned tx, const unsigned ty, const int detail, int min_detail, sqlite3 *outdb, const char *outdir, int buffer, const char *fname, FILE **geomfile, int minzoom, int maxzoom, double todo, std::atomic<long long> *along, long long alongminus, double gamma, int child_shards, long long *meta_off, long long *pool_off, unsigned *initial_x, unsigned *initial_y, std::atomic<int> *running, double simplification, std::vector<std::map<std::string, layermap_entry>> *layermaps, std::vector<std::vector<std::string>> *layer_unmaps, size_t tiling_seg, size_t pass, unsigned long long mingap, long long minextent, double fraction, const char *prefilter, const char *postfilter, struct json_object *filter, write_tile_args *arg, atomic_strategy *strategy) {
 	double merge_fraction = 1;
 	double mingap_fraction = 1;
 	double minextent_fraction = 1;
@@ -1877,6 +1887,9 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
 		size_t skipped = 0;
 		size_t kept = 0;
 
+		size_t unsimplified_geometry_size = 0;
+		size_t simplified_geometry_through = 0;
+
 		int within[child_shards];
 		std::atomic<long long> geompos[child_shards];
 		for (size_t i = 0; i < (size_t) child_shards; i++) {
@@ -1931,12 +1944,10 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
 			rpa.minzoom = minzoom;
 			rpa.max_zoom_increment = max_zoom_increment;
 			rpa.pass = pass;
-			rpa.passes = passes;
 			rpa.along = along;
 			rpa.alongminus = alongminus;
 			rpa.buffer = buffer;
 			rpa.within = within;
-			rpa.first_time = &first_time;
 			rpa.geomfile = geomfile;
 			rpa.geompos = geompos;
 			rpa.oprogress = &oprogress;
@@ -1948,6 +1959,7 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
 			rpa.stringpool = stringpool;
 			rpa.pool_off = pool_off;
 			rpa.filter = filter;
+			rpa.first_time = first_time;
 
 			if (pthread_create(&prefilter_writer, NULL, run_prefilter, &rpa) != 0) {
 				perror("pthread_create (prefilter writer)");
@@ -1967,7 +1979,7 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
 			ssize_t which_partial = -1;
 
 			if (prefilter == NULL) {
-				sf = next_feature(geoms, geompos_in, metabase, meta_off, z, tx, ty, initial_x, initial_y, &original_features, &unclipped_features, nextzoom, maxzoom, minzoom, max_zoom_increment, pass, passes, along, alongminus, buffer, within, &first_time, geomfile, geompos, &oprogress, todo, fname, child_shards, filter, stringpool, pool_off, layer_unmaps);
+				sf = next_feature(geoms, geompos_in, metabase, meta_off, z, tx, ty, initial_x, initial_y, &original_features, &unclipped_features, nextzoom, maxzoom, minzoom, max_zoom_increment, pass, along, alongminus, buffer, within, geomfile, geompos, &oprogress, todo, fname, child_shards, filter, stringpool, pool_off, layer_unmaps, first_time);
 			} else {
 				sf = parse_feature(prefilter_jp, z, tx, ty, layermaps, tiling_seg, layer_unmaps, postfilter != NULL);
 			}
@@ -2158,6 +2170,23 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
 					}
 
 					partials.push_back(p);
+
+					unsimplified_geometry_size += sf.geometry.size() * sizeof(draw);
+					if (unsimplified_geometry_size > 10 * 1024 * 1024 && !additional[A_DETECT_SHARED_BORDERS]) {
+						drawvec dv;
+
+						for (; simplified_geometry_through < partials.size(); simplified_geometry_through++) {
+							simplify_partial(&partials[simplified_geometry_through], dv);
+
+							for (auto &g : partials[simplified_geometry_through].geoms) {
+								if (partials[simplified_geometry_through].t == VT_POLYGON) {
+									g = clean_or_clip_poly(g, 0, 0, false);
+								}
+							}
+						}
+
+						unsimplified_geometry_size = 0;
+					}
 				}
 			}
 
@@ -2496,7 +2525,8 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
 			totalsize += layer_features.size();
 		}
 
-		double progress = floor(((((*geompos_in + *along - alongminus) / (double) todo) + (pass - (2 - passes))) / passes + z) / (maxzoom + 1) * 1000) / 10;
+		size_t passes = pass + 1;
+		double progress = floor(((((*geompos_in + *along - alongminus) / (double) todo) + pass) / passes + z) / (maxzoom + 1) * 1000) / 10;
 		if (progress >= oprogress + 0.1) {
 			if (!quiet && !quiet_progress && progress_time()) {
 				fprintf(stderr, "  %3.1f%%  %d/%u/%u  \r", progress, z, tx, ty);
@@ -2694,22 +2724,20 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
 					strategy->detail_reduced++;
 				}
 			} else {
-				if (pass == 1) {
+				if (pthread_mutex_lock(&db_lock) != 0) {
-					if (pthread_mutex_lock(&db_lock) != 0) {
+					perror("pthread_mutex_lock");
-						perror("pthread_mutex_lock");
+					exit(EXIT_PTHREAD);
-						exit(EXIT_PTHREAD);
+				}
-					}
 
-					if (outdb != NULL) {
+				if (outdb != NULL) {
-						mbtiles_write_tile(outdb, z, tx, ty, compressed.data(), compressed.size());
+					mbtiles_write_tile(outdb, z, tx, ty, compressed.data(), compressed.size());
-					} else if (outdir != NULL) {
+				} else if (outdir != NULL) {
-						dir_write_tile(outdir, z, tx, ty, compressed);
+					dir_write_tile(outdir, z, tx, ty, compressed);
-					}
+				}
 
-					if (pthread_mutex_unlock(&db_lock) != 0) {
+				if (pthread_mutex_unlock(&db_lock) != 0) {
-						perror("pthread_mutex_unlock");
+					perror("pthread_mutex_unlock");
-						exit(EXIT_PTHREAD);
+					exit(EXIT_PTHREAD);
-					}
 				}
 
 				return count;
@@ -2768,7 +2796,7 @@ void *run_thread(void *vargs) {
 
 			// fprintf(stderr, "%d/%u/%u\n", z, x, y);
 
-			long long len = write_tile(geom, &geompos, arg->metabase, arg->stringpool, z, x, y, z == arg->maxzoom ? arg->full_detail : arg->low_detail, arg->min_detail, arg->outdb, arg->outdir, arg->buffer, arg->fname, arg->geomfile, arg->minzoom, arg->maxzoom, arg->todo, arg->along, geompos, arg->gamma, arg->child_shards, arg->meta_off, arg->pool_off, arg->initial_x, arg->initial_y, arg->running, arg->simplification, arg->layermaps, arg->layer_unmaps, arg->tiling_seg, arg->pass, arg->passes, arg->mingap, arg->minextent, arg->fraction, arg->prefilter, arg->postfilter, arg->filter, arg, arg->strategy);
+			long long len = write_tile(geom, &geompos, arg->metabase, arg->stringpool, z, x, y, z == arg->maxzoom ? arg->full_detail : arg->low_detail, arg->min_detail, arg->outdb, arg->outdir, arg->buffer, arg->fname, arg->geomfile, arg->minzoom, arg->maxzoom, arg->todo, arg->along, geompos, arg->gamma, arg->child_shards, arg->meta_off, arg->pool_off, arg->initial_x, arg->initial_y, arg->running, arg->simplification, arg->layermaps, arg->layer_unmaps, arg->tiling_seg, arg->pass, arg->mingap, arg->minextent, arg->fraction, arg->prefilter, arg->postfilter, arg->filter, arg, arg->strategy);
 
 			if (len < 0) {
 				int *err = &arg->err;
@@ -2857,8 +2885,8 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
 		}
 	}
 
-	int i;
+	int z;
-	for (i = 0; i <= maxzoom; i++) {
+	for (z = 0; z <= maxzoom; z++) {
 		std::atomic<long long> most(0);
 
 		FILE *sub[TEMP_FILES];
@@ -2964,19 +2992,14 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
 
 		int err = INT_MAX;
 
-		size_t start = 1;
-		if (additional[A_INCREASE_GAMMA_AS_NEEDED] || additional[A_DROP_DENSEST_AS_NEEDED] || additional[A_COALESCE_DENSEST_AS_NEEDED] || additional[A_CLUSTER_DENSEST_AS_NEEDED] || additional[A_DROP_FRACTION_AS_NEEDED] || additional[A_COALESCE_FRACTION_AS_NEEDED] || additional[A_DROP_SMALLEST_AS_NEEDED] || additional[A_COALESCE_SMALLEST_AS_NEEDED]) {
-			start = 0;
-		}
-
 		double zoom_gamma = gamma;
-		unsigned long long zoom_mingap = ((1LL << (32 - i)) / 256 * cluster_distance) * ((1LL << (32 - i)) / 256 * cluster_distance);
+		unsigned long long zoom_mingap = ((1LL << (32 - z)) / 256 * cluster_distance) * ((1LL << (32 - z)) / 256 * cluster_distance);
 		long long zoom_minextent = 0;
 		double zoom_fraction = 1;
 		size_t zoom_tile_size = 0;
 		size_t zoom_feature_count = 0;
 
-		for (size_t pass = start; pass < 2; pass++) {
+		for (size_t pass = 0; ; pass++) {
 			pthread_t pthreads[threads];
 			std::vector<write_tile_args> args;
 			args.resize(threads);
@@ -3007,7 +3030,7 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
 				args[thread].feature_count_out = 0;
 				args[thread].child_shards = TEMP_FILES / threads;
 
-				if (i == maxzoom && maxzoom_simplification > 0) {
+				if (z == maxzoom && maxzoom_simplification > 0) {
 					args[thread].simplification = maxzoom_simplification;
 				} else {
 					args[thread].simplification = simplification;
@@ -3037,7 +3060,6 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
 				args[thread].tasks = dispatches[thread].tasks;
 				args[thread].running = &running;
 				args[thread].pass = pass;
-				args[thread].passes = 2 - start;
 				args[thread].wrote_zoom = -1;
 				args[thread].still_dropping = false;
 				args[thread].strategy = &strategy;
@@ -3048,6 +3070,7 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
 				}
 			}
 
+			bool again = false;
 			for (size_t thread = 0; thread < threads; thread++) {
 				void *retval;
 
@@ -3061,15 +3084,19 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
 
 				if (args[thread].gamma_out > zoom_gamma) {
 					zoom_gamma = args[thread].gamma_out;
+					again = true;
 				}
 				if (args[thread].mingap_out > zoom_mingap) {
 					zoom_mingap = args[thread].mingap_out;
+					again = true;
 				}
 				if (args[thread].minextent_out > zoom_minextent) {
 					zoom_minextent = args[thread].minextent_out;
+					again = true;
 				}
 				if (args[thread].fraction_out < zoom_fraction) {
 					zoom_fraction = args[thread].fraction_out;
+					again = true;
 				}
 				if (args[thread].tile_size_out > zoom_tile_size) {
 					zoom_tile_size = args[thread].tile_size_out;
@@ -3079,20 +3106,31 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
 				}
 
 				// Zoom counter might be lower than reality if zooms are being skipped
-				if (args[thread].wrote_zoom > i) {
+				if (args[thread].wrote_zoom > z) {
-					i = args[thread].wrote_zoom;
+					z = args[thread].wrote_zoom;
 				}
 
-				if (additional[A_EXTEND_ZOOMS] && i == maxzoom && args[thread].still_dropping && maxzoom < MAX_ZOOM) {
+				if (additional[A_EXTEND_ZOOMS] && z == maxzoom && args[thread].still_dropping && maxzoom < MAX_ZOOM) {
 					maxzoom++;
 				}
 			}
 
-			if ((size_t) i >= strategies.size()) {
+			if ((size_t) z >= strategies.size()) {
-				strategies.resize(i + 1);
+				strategies.resize(z + 1);
 			}
+
 			struct strategy s(strategy, zoom_tile_size, zoom_feature_count);
-			strategies[i] = s;
+			strategies[z] = s;
+
+			if (again) {
+				if (outdb != NULL) {
+					mbtiles_erase_zoom(outdb, z);
+				} else if (outdir != NULL) {
+					dir_erase_zoom(outdir, z);
+				}
+			} else {
+				break;
+			}
 		}
 
 		for (size_t j = 0; j < TEMP_FILES; j++) {

version.hpp

@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "v2.13.0"
+#define VERSION "v2.15.0"
 
 #endif