diff options
| author | Jochen Topf <jochen@topf.org> | 2012-07-15 15:50:55 +0200 |
|---|---|---|
| committer | Jochen Topf <jochen@topf.org> | 2012-07-15 15:50:55 +0200 |
| commit | 1358b4d4d9056921eabe4618b86b4170b3644274 (patch) | |
| tree | 73e98bfb8415b98b5e1cae1193cccbcced976b81 /tagstats | |
| parent | c3f9e2cf18ae1f6cb75b6d9c136ccfeb4271a14a (diff) | |
| download | taginfo-1358b4d4d9056921eabe4618b86b4170b3644274.tar taginfo-1358b4d4d9056921eabe4618b86b4170b3644274.tar.gz | |
Changes for newest Osmium version
Diffstat (limited to 'tagstats')
| -rw-r--r-- | tagstats/Makefile | 10 | ||||
| -rw-r--r-- | tagstats/tagstats.cpp | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/tagstats/Makefile b/tagstats/Makefile index 6f50d93..c66e2b6 100644 --- a/tagstats/Makefile +++ b/tagstats/Makefile @@ -33,18 +33,18 @@ CXXFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CXXFLAGS += `../bin/taginfo-config.rb tagstats.cxxflags` -LDFLAGS = -L/usr/local/lib -lexpat -lpthread +LDFLAGS = -L/usr/local/lib -lexpat -LIB_SQLITE = -lsqlite3 -LIB_GD = -lgd -lz -lm -LIB_PROTOBUF = -lz -lprotobuf-lite -losmpbf +LIB_SQLITE = -lsqlite3 +LIB_GD = -lgd -lz -lm +LIB_PBF = -lz -lpthread -lprotobuf-lite -losmpbf .PHONY: all clean install all: tagstats tagstats: tagstats.cpp tagstats_handler.hpp statistics_handler.hpp string_store.hpp geodistribution.hpp - $(CXX) $(CXXFLAGS) -o $@ $< $(LDFLAGS) $(LIB_PROTOBUF) $(LIB_GD) $(LIB_SQLITE) + $(CXX) $(CXXFLAGS) -o $@ $< $(LDFLAGS) $(LIB_PBF) $(LIB_GD) $(LIB_SQLITE) check: cppcheck --enable=all tagstats.cpp diff --git a/tagstats/tagstats.cpp b/tagstats/tagstats.cpp index 01f2976..e941c88 100644 --- a/tagstats/tagstats.cpp +++ b/tagstats/tagstats.cpp @@ -22,6 +22,9 @@ You should have received a copy of the Licenses along with Osmium. If not, see #include <getopt.h> +#define OSMIUM_WITH_PBF_INPUT +#define OSMIUM_WITH_XML_INPUT + #include <osmium.hpp> #include "statistics_handler.hpp" @@ -154,6 +157,6 @@ int main(int argc, char *argv[]) { Osmium::Sqlite::Database db(argv[optind+1]); MapToInt<rough_position_t> map_to_int(left, bottom, right, top, width, height); TagStatsHandler handler(db, tags_list, map_to_int); - infile.read(handler); + Osmium::Input::read(infile, handler); } |