Add "csv" to the list of suffixes to trim off of layer names

mapbox · Aug 2, 2018 · c9cc12e · c9cc12e
1 parent bec1f41
commit c9cc12e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.30.5
+## 1.30.6
 
 * Take cluster distance into account when guessing a maxzoom
 

diff --git a/Makefile b/Makefile
@@ -296,7 +296,7 @@ csv-test:
 	cmp tests/csv/out-null.mbtiles.json.check tests/csv/out-null.mbtiles.json
 	rm -f tests/csv/out-null.mbtiles.json.check tests/csv/out-null.mbtiles
 	# Same, but specifying csv with -L format
-	./tippecanoe -q -zg -f -o tests/csv/out.mbtiles -L'{"file":"", "format":"csv", "layer":"ne_110m_populated_places_simplecsv"}' < tests/csv/ne_110m_populated_places_simple.csv
+	./tippecanoe -q -zg -f -o tests/csv/out.mbtiles -L'{"file":"", "format":"csv", "layer":"ne_110m_populated_places_simple"}' < tests/csv/ne_110m_populated_places_simple.csv
 	./tippecanoe-decode -x generator tests/csv/out.mbtiles > tests/csv/out.mbtiles.json.check
 	cmp tests/csv/out.mbtiles.json.check tests/csv/out.mbtiles.json
 	rm -f tests/csv/out.mbtiles.json.check tests/csv/out.mbtiles

diff --git a/main.cpp b/main.cpp
@@ -1268,6 +1268,7 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
 				".geojson",
 				".geobuf",
 				".mbtiles",
+				".csv",
 				".gz",
 			};
 

diff --git a/tests/csv/out-null.mbtiles.json b/tests/csv/out-null.mbtiles.json
diff --git a/tests/csv/out.mbtiles.json b/tests/csv/out.mbtiles.json
diff --git a/version.hpp b/version.hpp
@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "v1.30.5"
+#define VERSION "v1.30.6"
 
 #endif