From f03b89656ca510c8ef79ff8ee83e014a04de4457 Mon Sep 17 00:00:00 2001
From: Shan-Chun Kuo <joy961406@gmail.com>
Date: Wed, 5 Apr 2017 15:59:37 +0100
Subject: [PATCH] Seperated out to method and added test for --raw-tiles

---
 .gitignore                               |   3 ++
 Makefile                                 |   9 +++-
 main.cpp                                 |   2 +-
 rawtiles.cpp                             |  20 +++++++
 rawtiles.hpp                             |   1 +
 tests/raw-tiles/compare/0/0/0.pbf        | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/1/0/0.pbf        | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/10/163/366.pbf   | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/11/326/732.pbf   | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/12/652/1464.pbf  | Bin 0 -> 218 bytes
 tests/raw-tiles/compare/12/652/1465.pbf  | Bin 0 -> 138 bytes
 tests/raw-tiles/compare/13/1304/2928.pbf | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/13/1304/2929.pbf | Bin 0 -> 139 bytes
 tests/raw-tiles/compare/13/1304/2930.pbf | Bin 0 -> 139 bytes
 tests/raw-tiles/compare/14/2608/5856.pbf | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/14/2608/5857.pbf | Bin 0 -> 167 bytes
 tests/raw-tiles/compare/14/2609/5860.pbf | Bin 0 -> 246 bytes
 tests/raw-tiles/compare/2/0/1.pbf        | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/3/1/2.pbf        | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/4/2/5.pbf        | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/5/5/11.pbf       | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/6/10/22.pbf      | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/7/20/45.pbf      | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/8/40/91.pbf      | Bin 0 -> 131 bytes
 tests/raw-tiles/compare/9/81/183.pbf     | Bin 0 -> 131 bytes
 tests/raw-tiles/hackspots.geojson        |  65 +++++++++++++++++++++++
 tile.cpp                                 |  14 +----
 27 files changed, 99 insertions(+), 15 deletions(-)
 create mode 100644 rawtiles.cpp
 create mode 100644 rawtiles.hpp
 create mode 100644 tests/raw-tiles/compare/0/0/0.pbf
 create mode 100644 tests/raw-tiles/compare/1/0/0.pbf
 create mode 100644 tests/raw-tiles/compare/10/163/366.pbf
 create mode 100644 tests/raw-tiles/compare/11/326/732.pbf
 create mode 100644 tests/raw-tiles/compare/12/652/1464.pbf
 create mode 100644 tests/raw-tiles/compare/12/652/1465.pbf
 create mode 100644 tests/raw-tiles/compare/13/1304/2928.pbf
 create mode 100644 tests/raw-tiles/compare/13/1304/2929.pbf
 create mode 100644 tests/raw-tiles/compare/13/1304/2930.pbf
 create mode 100644 tests/raw-tiles/compare/14/2608/5856.pbf
 create mode 100644 tests/raw-tiles/compare/14/2608/5857.pbf
 create mode 100644 tests/raw-tiles/compare/14/2609/5860.pbf
 create mode 100644 tests/raw-tiles/compare/2/0/1.pbf
 create mode 100644 tests/raw-tiles/compare/3/1/2.pbf
 create mode 100644 tests/raw-tiles/compare/4/2/5.pbf
 create mode 100644 tests/raw-tiles/compare/5/5/11.pbf
 create mode 100644 tests/raw-tiles/compare/6/10/22.pbf
 create mode 100644 tests/raw-tiles/compare/7/20/45.pbf
 create mode 100644 tests/raw-tiles/compare/8/40/91.pbf
 create mode 100644 tests/raw-tiles/compare/9/81/183.pbf
 create mode 100644 tests/raw-tiles/hackspots.geojson

diff --git a/.gitignore b/.gitignore
index 4581ef2..4bf996a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,6 @@
 *.exe
 *.out
 *.app
+
+# Mac 
+.DS_Store
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 8e3f7fa..3be98a6 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ C = $(wildcard *.c) $(wildcard *.cpp)
 INCLUDES = -I/usr/local/include -I.
 LIBS = -L/usr/local/lib
 
-tippecanoe: geojson.o jsonpull/jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o mvt.o serial.o main.o text.o
+tippecanoe: geojson.o jsonpull/jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o mvt.o serial.o main.o text.o rawtiles.o
 	$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 -lpthread
 
 tippecanoe-enumerate: enumerate.o
@@ -78,7 +78,7 @@ indent:
 TESTS = $(wildcard tests/*/out/*.json)
 SPACE = $(NULL) $(NULL)
 
-test: tippecanoe tippecanoe-decode $(addsuffix .check,$(TESTS)) parallel-test pbf-test join-test enumerate-test decode-test unit
+test: tippecanoe tippecanoe-decode $(addsuffix .check,$(TESTS)) raw-tiles-test parallel-test pbf-test join-test enumerate-test decode-test unit
 	./unit
 
 # Work around Makefile and filename punctuation limits: _ for space, @ for :, % for /
@@ -111,6 +111,11 @@ parallel-test:
 	cmp tests/parallel/linear-file.json tests/parallel/parallel-pipes.json
 	rm tests/parallel/*.mbtiles tests/parallel/*.json
 
+raw-tiles-test:	
+	./tippecanoe -o tests/raw-tiles/raw-tiles tests/raw-tiles/hackspots.geojson --raw-tiles	
+	diff -x '.*' -rq tests/raw-tiles/raw-tiles tests/raw-tiles/compare
+	rm -rf tests/raw-tiles/raw-tiles
+
 decode-test:
 	mkdir -p tests/muni/decode
 	./tippecanoe -z11 -Z11 -f -o tests/muni/decode/multi.mbtiles tests/muni/*.json
diff --git a/main.cpp b/main.cpp
index b2584d6..4b85373 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2255,7 +2255,7 @@ int main(int argc, char **argv) {
 
 	if(!prevent[P_PBF_COMPRESSION]){
 		outdb = mbtiles_open(outdir, argv, forcetable);
-	}else{		
+	}else{
 		outpbfdir = outdir;
 	}
 
diff --git a/rawtiles.cpp b/rawtiles.cpp
new file mode 100644
index 0000000..07f28dc
--- /dev/null
+++ b/rawtiles.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <sys/stat.h>
+#include "rawtiles.hpp"
+
+void write_raw_tile(char *outdir, int z, int tx, int ty, std::string pbf) {
+	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";
+	
+    std::ofstream pbfFile (newdir, std::ios::out | std::ios::binary);
+    pbfFile.write (pbf.data(), pbf.size());
+    pbfFile.close();
+}
\ No newline at end of file
diff --git a/rawtiles.hpp b/rawtiles.hpp
new file mode 100644
index 0000000..8a135ef
--- /dev/null
+++ b/rawtiles.hpp
@@ -0,0 +1 @@
+void write_raw_tile(char *outdir, int z, int tx, int ty, std::string pbf);
\ No newline at end of file
diff --git a/tests/raw-tiles/compare/0/0/0.pbf b/tests/raw-tiles/compare/0/0/0.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..3f518d33c94233448f2ed74f2992cd6c8a2c19c8
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<($FwK@0%znj(z=

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/1/0/0.pbf b/tests/raw-tiles/compare/1/0/0.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..49b703d2772eb386f39b2d47e244228d28c810a1
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<=i0hKo<b;4<fbz

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/10/163/366.pbf b/tests/raw-tiles/compare/10/163/366.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..9fd8fe08b416e0358c94a8ef2613de7bb48d3055
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<y^zGix~j#QzB3R

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/11/326/732.pbf b/tests/raw-tiles/compare/11/326/732.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..ae7fcdba119e1f942f79b9837057529556a61860
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<-Ec2jST?sgd)8F

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/12/652/1464.pbf b/tests/raw-tiles/compare/12/652/1464.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..173f8208a654b8de6993272bab5688ca2842a657
GIT binary patch
literal 218
zcmb2T&RD_3C6JMroLyXyUs9Z&nx9pipQq8FAjRUBn42oa?wFENlv-RY#p;(|l3J|9
z%f;<jl$2kj;FF({o~oqHrD<qtV6Nb&5R_k>s1T4?lwGV4o>-}%5RhL~l9QO1qNCs+
zq+n@oWN5C$#KoW_%_SL<QIwjh;8v8GnwL_n;GCb9mYSN8Us{~1q{^jiWMHTe?5bdB
sRFa|KSeB}TX^x4Ipai238v_F)BNLMnE9VBzH@r|GW=0l>kn8~m02?AX7ytkO

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/12/652/1465.pbf b/tests/raw-tiles/compare/12/652/1465.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..385f335712a7c1dd36de79f220ea038220987977
GIT binary patch
literal 138
zcmb1YXRKi2639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}Ni9~A
z=8_D_C`wILa4X78%}Xg(aL!LlOHIwlFD*`0Qsq)MGB8vKc2zJmD#=iAEKAi<2*@ug
p$w|yh(NXXZQm`~PGBi<Q;$jdIkYE&IV_;xpWMWcc;oKnW003JQB?15d

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/13/1304/2928.pbf b/tests/raw-tiles/compare/13/1304/2928.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..22531b0a030aa0bf737b48d1eb8f5c8903b8ff76
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<$NS`OBw+1vm(v_

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/13/1304/2929.pbf b/tests/raw-tiles/compare/13/1304/2929.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..6aad49f6f3f217b671330c32178472e33b32039f
GIT binary patch
literal 139
zcmb2@V60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}Ni9~A
z=8_D_C`wILa4X78%}Xg(aL!LlOHIwlFD*`0Qsq)MGB8vKc2zJmD#=iAEKAi<2*@ug
q$w|yh(NXXZQm`~PGBi<Q;$jdIlwcHMV_;xpWMWcc<$Pq-;0OSMm?hN!

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/13/1304/2930.pbf b/tests/raw-tiles/compare/13/1304/2930.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..cecb84feefa8818a815df7325869cbdd3c6adccc
GIT binary patch
literal 139
zcmb2@V60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}Ni9~A
z=8_D_C`wILa4X78%}Xg(aL!LlOHIwlFD*`0Qsq)MGB8vKc2zJmD#=iAEKAi<2*@ug
q$w|yh(NXXZQm`~PGBi<Q;$jdIlwcHMV_;xpWMWcc<$Pq-zz6_>SS6JJ

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/14/2608/5856.pbf b/tests/raw-tiles/compare/14/2608/5856.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..b279fba5a085aabd47c303346784b53d7a69de6e
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<vgOg#T)?eL?XEW

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/14/2608/5857.pbf b/tests/raw-tiles/compare/14/2608/5857.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..2272a83038d649acde3b98377b29f514136d145d
GIT binary patch
literal 167
zcmb1I!dSt?C6JMroLyXyUs9Z&nx9pipQq8FAjRUBn42oa?wFENlv-RY#p;(|l3J|9
z$Hn8Ala!g4s1N`WR#N9uH8C?bSMXDS3OkmiDkucx7nS5B=B4N;_y;Linj0CKD`|46
zmll^M=Hyf=B$XCd>L}!wmgJ<C6f5NCDHLa>q$-pH<$#==N+CfBMj<u^21Z6ECM8zR
IYgPyJ0IG*E2LJ#7

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/14/2609/5860.pbf b/tests/raw-tiles/compare/14/2609/5860.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..d8f0684ddf251bc660c349d9111c3a20068cbc90
GIT binary patch
literal 246
zcmb38%viz1C6JMroLyXyUs9Z&nx9pipQq8FAjRUBn42oa?wFENlv-RY#p;(|l3J`J
z%_SL<QIwjh;8v8GnwL_n;GCb9mYSN8Us{~1q{^jiWMHTe?5bdBRFa|KSeB}z5RhL~
zl9QO1qNCs+q+n@oWN4zq#KoW_$tCVnnw(v!;FFkCl$erVq~KJPTCNaKnxv%7rD<ts
z3NpnbvAiTBzbG$N!6~OKMGu=<d|W&(`RNL2VAteS3JFRu3b8RTFfuYRDY0@MF>PXk
R3NbUXFtGxK9vDtg2LNU$LazV-

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/2/0/1.pbf b/tests/raw-tiles/compare/2/0/1.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..ecd69b4ed080da2019fb461594c14326fe5c24e5
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<$R!VKpFt>xgy8_

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/3/1/2.pbf b/tests/raw-tiles/compare/3/1/2.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..acf10f52bbfd3b5fdba26ff4cde9d8460d4e92c5
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<vb+VWDWrDoFZ`m

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/4/2/5.pbf b/tests/raw-tiles/compare/4/2/5.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..2e4698bd83d30d30413cbd328f4de56e2bf712d5
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<!n)I(*pqR*&;vy

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/5/5/11.pbf b/tests/raw-tiles/compare/5/5/11.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..40ab997aaa823ba1adb08c9ae512df5d374a45f6
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<?LYVkpTeij3OHV

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/6/10/22.pbf b/tests/raw-tiles/compare/6/10/22.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..75c556bda2079cd6acaf46a3c67b9685e534d7ab
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<($Mb%K`xI{vuTX

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/7/20/45.pbf b/tests/raw-tiles/compare/7/20/45.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..b54f433ca26d946ab1a432d922ccb6b579125010
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<y<1M%>V%Jnj(h)

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/8/40/91.pbf b/tests/raw-tiles/compare/8/40/91.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..26c2f2aab7ab3d5abf6fc8124fe76384582d8eac
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<veBZP5}V$+9K@$

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/compare/9/81/183.pbf b/tests/raw-tiles/compare/9/81/183.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..dd0721fd3d92893ac211fdd7ecd5e8fd51033b2f
GIT binary patch
literal 131
zcmb1YV60%`639qQ&Mq#<FDXt>&Ce>%&(mm7kYe#m%uSVIcT7nsN-ZvyV)e@}NiA05
z<>GcMO3E)%@X1d}PgT<9(lj(RFjw$X2+A)`R0v2c$}Uz2Ppni>2*@ug$w|yh(NXXZ
iQm`~PGBj6W;$jdIlwcHMV_;xpWMWcc<(#H?hY<kpnj(1s

literal 0
HcmV?d00001

diff --git a/tests/raw-tiles/hackspots.geojson b/tests/raw-tiles/hackspots.geojson
new file mode 100644
index 0000000..1f6e981
--- /dev/null
+++ b/tests/raw-tiles/hackspots.geojson
@@ -0,0 +1,65 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {
+        "Name": "Albina Press",
+        "Address": "4637 N Albina Ave  Portland, OR 97217",
+        "Notes": "usually busy, outlets on side wall only"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -122.67516911029816,
+          45.55673233031101
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "Name": "Arbor Lodge",
+        "Address": "1507 N Rosa Parks Way  Portland, OR 97217",
+        "Notes": ""
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -122.68242716789246,
+          45.56997505986905
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "Name": "Three Friends Coffeehouse",
+        "Address": "201 SE 12th Ave, Portland, OR 97214",
+        "Notes": ""
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -122.65496134757996,
+          45.5212590460849
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "Name": "Lucky Labrador Brew Pub",
+        "Address": "915 SE Hawthorne Blvd. Portland, OR 97214",
+        "Notes": "Dog friendly"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -122.65625953674315,
+          45.512331780814186
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tile.cpp b/tile.cpp
index 317295d..521cdd3 100644
--- a/tile.cpp
+++ b/tile.cpp
@@ -22,6 +22,7 @@
 #include <time.h>
 #include "mvt.hpp"
 #include "mbtiles.hpp"
+#include "rawtiles.hpp"
 #include "geometry.hpp"
 #include "tile.hpp"
 #include "pool.hpp"
@@ -1919,18 +1920,7 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
 					if(!prevent[P_PBF_COMPRESSION]){
 						mbtiles_write_tile(outdb, z, tx, ty, compressed.data(), compressed.size());						
 					}else{
-						mkdir(outpbfdir, S_IRWXU | S_IRWXG | S_IRWXO);
-						std::string curdir(outpbfdir);
-					    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";
-						
-					    std::ofstream pbfFile (newdir, std::ios::out | std::ios::app | std::ios::binary);
-					    pbfFile.write (pbf.data(), pbf.size());
-					    pbfFile.close();
+						write_raw_tile(outpbfdir, z, tx, ty, pbf);
 					}
 
 					if (pthread_mutex_unlock(&db_lock) != 0) {