diff options
| -rw-r--r-- | taginfo-config-example.json | 4 | ||||
| -rw-r--r-- | tagstats/Makefile | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/taginfo-config-example.json b/taginfo-config-example.json index 9795904..cea3424 100644 --- a/taginfo-config-example.json +++ b/taginfo-config-example.json @@ -80,6 +80,8 @@ "cxxflags": "-I../../../osmium/osmium/include", // Node location store. For really large OSM files (whole planet or large continent) // this should be "MmapAnon", otherwise "SparseTable". - "geodistribution": "SparseTable" + "geodistribution": "SparseTable", + // C++ type used for geodistribution + "geodistribution_int": "uint16_t" } } diff --git a/tagstats/Makefile b/tagstats/Makefile index 856fb80..763c149 100644 --- a/tagstats/Makefile +++ b/tagstats/Makefile @@ -20,6 +20,7 @@ CXXFLAGS += -O3 CXXFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CXXFLAGS += `../bin/taginfo-config.rb tagstats.cxxflags` +GEODISTRIBUTION_TYPE := $(shell ../bin/taginfo-config.rb tagstats.geodistribution_int uint16_t) BYID := $(shell ../bin/taginfo-config.rb tagstats.geodistribution) #BYID := SparseTable #BYID := MmapFile @@ -30,7 +31,7 @@ BYID_INCL := "<osmium/storage/byid/$(BYID_LC).hpp>" CXXFLAGS_FEATURES += -DTAGSTATS_COUNT_USERS CXXFLAGS_FEATURES += -DTAGSTATS_COUNT_KEY_COMBINATIONS CXXFLAGS_FEATURES += -DTAGSTATS_COUNT_TAG_COMBINATIONS -CXXFLAGS_FEATURES += -DTAGSTATS_GEODISTRIBUTION_INT=uint16_t +CXXFLAGS_FEATURES += -DTAGSTATS_GEODISTRIBUTION_INT=$(GEODISTRIBUTION_TYPE) CXXFLAGS_FEATURES += -DTAGSTATS_GEODISTRIBUTION_FOR_WAYS=$(BYID) CXXFLAGS_FEATURES += -DTAGSTATS_GEODISTRIBUTION_INCLUDE=$(BYID_INCL) |