remove some unused code found by clang, add some explicit static_cast…

…s in initializer lists, update util

src/spatialjoin/BoxIds.h

@@ -51,7 +51,6 @@ inline void getBoxIds(const util::geo::I32XSortedLine& line,
                       int yFrom, int yTo, int xWidth, int yHeight,
                       BoxIdList* ret, std::map<int32_t, size_t>* cutouts,
                       size_t startA, size_t startB) {
-
   for (int32_t y = yFrom; y < yTo; y += yHeight) {
     size_t firstInA = startA;
     size_t firstInB = startB;
@@ -61,9 +60,10 @@ inline void getBoxIds(const util::geo::I32XSortedLine& line,
       int localYHeight = std::min(yTo - y, yHeight);
 
       util::geo::I32Box box(
-          {(x * GRID_W - WORLD_W / 2.0), (y * GRID_H - WORLD_H / 2.0)},
-          {(x + localXWidth) * GRID_W - WORLD_W / 2.0,
-           (y + localYHeight) * GRID_H - WORLD_H / 2.0});
+          {static_cast<int>((x * GRID_W - WORLD_W / 2.0)),
+           static_cast<int>((y * GRID_H - WORLD_H / 2.0))},
+          {static_cast<int>((x + localXWidth) * GRID_W - WORLD_W / 2.0),
+           static_cast<int>((y + localYHeight) * GRID_H - WORLD_H / 2.0)});
 
       if (!util::geo::intersects(box, envelope)) continue;
 
@@ -113,9 +113,10 @@ inline void getBoxIds(const util::geo::I32XSortedPolygon& poly,
       int localYHeight = std::min(yTo - y, yHeight);
 
       util::geo::I32Box box(
-          {(x * GRID_W - WORLD_W / 2.0), (y * GRID_H - WORLD_H / 2.0)},
-          {(x + localXWidth) * GRID_W - WORLD_W / 2.0,
-           (y + localYHeight) * GRID_H - WORLD_H / 2.0});
+          {static_cast<int>((x * GRID_W - WORLD_W / 2.0)),
+           static_cast<int>((y * GRID_H - WORLD_H / 2.0))},
+          {static_cast<int>((x + localXWidth) * GRID_W - WORLD_W / 2.0),
+           static_cast<int>((y + localYHeight) * GRID_H - WORLD_H / 2.0)});
 
       if (!util::geo::intersects(box, envelope)) continue;
 
@@ -174,7 +175,6 @@ inline BoxIdList getBoxIds(const util::geo::I32XSortedLine& line,
   int32_t b = getBoxId(envelope.getUpperRight());
   if (a == b) return {{a, 0}};  // shortcut
 
-
   int32_t startX = std::floor(
       (1.0 * envelope.getLowerLeft().getX() + WORLD_W / 2.0) / GRID_W);
   int32_t startY = std::floor(

src/spatialjoin/GeometryCache.h

@@ -148,15 +148,6 @@ class GeometryCache {
   }
 
   ~GeometryCache() {
-    size_t access = 0;
-    size_t diskAccess = 0;
-    for (size_t i = 0; i < _accessCount.size(); i++) {
-      access += _accessCount[i];
-      diskAccess += _diskAccessCount[i];
-    }
-    // std::cerr << "Geometry cache <" << getFName() << ">: " << access
-              // << " accesses, " << diskAccess << " disk lookups" << std::endl;
-
     if (_geomsF.is_open()) _geomsF.close();
     for (size_t i = 0; i < _geomsFReads.size(); i++) {
       if (_geomsFReads[i].is_open()) _geomsFReads[i].close();

src/spatialjoin/WKTParse.h

@@ -45,7 +45,8 @@ inline util::geo::I32Line parseLineString(const char* c, const char** endr) {
     double y = util::atof(next, 10);
     auto projPoint = latLngToWebMerc(util::geo::DPoint(x, y));
 
-    line.push_back({projPoint.getX() * PREC, projPoint.getY() * PREC});
+    line.push_back({static_cast<int>(projPoint.getX() * PREC),
+                    static_cast<int>(projPoint.getY() * PREC)});
 
     auto n = strchr(next, ',');
     if (!n || n > end) break;
@@ -70,7 +71,8 @@ inline util::geo::I32Point parsePoint(const char* c) {
   double y = util::atof(next, 10);
   auto point = latLngToWebMerc(util::geo::DPoint(x, y));
 
-  return {point.getX() * PREC, point.getY() * PREC};
+  return {static_cast<int>(point.getX() * PREC),
+          static_cast<int>(point.getY() * PREC)};
 }
 
 // _____________________________________________________________________________