From 6384b6a49ac954f415299dfaf765f0608ba5feda Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 30 Aug 2017 15:40:55 -0700 Subject: [PATCH] Fix #include path and json2geobuf path --- Makefile | 2 +- geojson2nd.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ebb8d40..bab81b0 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ geobuf-test: geojson2nd $(addsuffix .checkbuf,$(TESTS)) # XXX Use proper makefile rules instead of a for loop %.json.checkbuf: - for i in $(wildcard $(subst $(SPACE),/,$(wordlist 1,2,$(subst /, ,$@)))/*.json); do ./geojson2nd -w $$i | json2geobuf > $$i.geobuf; done + for i in $(wildcard $(subst $(SPACE),/,$(wordlist 1,2,$(subst /, ,$@)))/*.json); do ./geojson2nd -w $$i | ./node_modules/geobuf/bin/json2geobuf > $$i.geobuf; done ./tippecanoe -aD -f -o $@.mbtiles $(subst @,:,$(subst %,/,$(subst _, ,$(patsubst %.json.checkbuf,%,$(word 4,$(subst /, ,$@)))))) $(addsuffix .geobuf,$(wildcard $(subst $(SPACE),/,$(wordlist 1,2,$(subst /, ,$@)))/*.json)) < /dev/null ./tippecanoe-decode $@.mbtiles | sed 's/checkbuf/check/g' > $@.out cmp $@.out $(patsubst %.checkbuf,%,$@) diff --git a/geojson2nd.cpp b/geojson2nd.cpp index 09be263..44594ba 100644 --- a/geojson2nd.cpp +++ b/geojson2nd.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "jsonpull.h" +#include "jsonpull/jsonpull.h" int fail = EXIT_SUCCESS; bool wrap = false;