cleanup

2 files changed, 5 insertions, 4 deletions

diff --git a/tagstats/tagstats.cpp b/tagstats/tagstats.cpp
index 4b27b9c..b474a62 100644
--- a/tagstats/tagstats.cpp
+++ b/tagstats/tagstats.cpp
@@ -111,8 +111,10 @@ int main(int argc, char *argv[]) {
         exit(1);
     }
 
+    GeoDistribution::set_dimensions(width, height);
     Osmium::OSMFile infile(argv[optind]);
-    TagStatsHandler handler(left, bottom, right, top, width, height);
+    MapToInt<rough_position_t> map_to_int(left, bottom, right, top, width, height);
+    TagStatsHandler handler(map_to_int);
     infile.read(handler);
 }
 
diff --git a/tagstats/tagstats_handler.hpp b/tagstats/tagstats_handler.hpp
index 0e791bb..939949a 100644
--- a/tagstats/tagstats_handler.hpp
+++ b/tagstats/tagstats_handler.hpp
@@ -291,18 +291,17 @@ class TagStatsHandler : public Osmium::Handler::Base {
 
 public:
 
-    TagStatsHandler(double minx, double miny, double maxx, double maxy, unsigned int width, unsigned int height) :
+    TagStatsHandler(MapToInt<rough_position_t>& map_to_int) :
         Base(),
         max_timestamp(0),
         osmium_handler_stats(),
-        m_map_to_int(minx, miny, maxx, maxy, width, height)
+        m_map_to_int(map_to_int)
 #ifdef TAGSTATS_GEODISTRIBUTION_FOR_WAYS
         , m_storage()
 #endif
         {
         string_store = new StringStore(string_store_size);
         db = new Osmium::Sqlite::Database("taginfo-db.db");
-        GeoDistribution::set_dimensions(width, height);
     }
 
     ~TagStatsHandler() {