Fixed inconsistencies.

Grandro · Jul 9, 2024 · 01c6f37 · 01c6f37
1 parent dd612f0
commit 01c6f37
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/src/qlever-petrimaps/server/GeoJSONRequestor.cpp b/src/qlever-petrimaps/server/GeoJSONRequestor.cpp
@@ -27,15 +27,13 @@ void GeoJSONRequestor::request() {
 
   LOG(INFO) << "[REQUESTOR] ... done, got " << _objects.size() << " objects.";
 
-  // Create mapping row_id to object_id for multigeometries
-  for (size_t oid = 0; oid < _objects.size(); oid++) {
-    std::pair<ID_TYPE, ID_TYPE> object = _objects[oid];
-    ID_TYPE object_row_id = object.second;
-    _rowIdToObjectId[object_row_id] = oid;
+  // Create mapping rowId to objectId for multigeometries
+  for (size_t objectId = 0; objectId < _objects.size(); objectId++) {
+    std::pair<ID_TYPE, ID_TYPE> object = _objects[objectId];
+    ID_TYPE rowId = object.second;
+    _rowIdToObjectId[rowId] = objectId;
   }
 
-  LOG(INFO) << "[REQUESTOR] Matching size: " << _rowIdToObjectId.size();
-
   LOG(INFO) << "[REQUESTOR] Calculating bounding box of result...";
 
   util::geo::FBox pointBbox;

diff --git a/src/qlever-petrimaps/server/Requestor.h b/src/qlever-petrimaps/server/Requestor.h
@@ -63,8 +63,8 @@ class Requestor {
     return _clusterObjects;
   }
 
-  ID_TYPE getObjectIdFromRowId(ID_TYPE row_id) const {
-    return _rowIdToObjectId.at(row_id);
+  ID_TYPE getObjectIdFromRowId(ID_TYPE rowId) const {
+    return _rowIdToObjectId.at(rowId);
   }
 
   const util::geo::FPoint& getPoint(ID_TYPE id) const {
@@ -124,7 +124,7 @@ class Requestor {
   std::vector<std::pair<ID_TYPE, ID_TYPE>> _objects;
   std::vector<std::pair<ID_TYPE, std::pair<size_t, size_t>>> _clusterObjects;
   size_t _numObjects = 0;
-  std::map<ID_TYPE, ID_TYPE> _rowIdToObjectId; // Match row_id to object_id for multigeometries
+  std::map<ID_TYPE, ID_TYPE> _rowIdToObjectId; // Match rowId to objectId for multigeometries
 };
 }  // namespace petrimaps
 

diff --git a/src/qlever-petrimaps/server/SPARQLRequestor.cpp b/src/qlever-petrimaps/server/SPARQLRequestor.cpp
@@ -49,15 +49,13 @@ void SPARQLRequestor::request(const std::string& query) {
   _numObjects = ret.second;
   LOG(INFO) << "[REQUESTOR] ... done, got " << _objects.size() << " objects.";
 
-  // Create mapping row_id to object_id for multigeometries
-  for (size_t oid = 0; oid < _objects.size(); oid++) {
-    std::pair<ID_TYPE, ID_TYPE> object = _objects[oid];
-    ID_TYPE object_row_id = object.second;
-    _rowIdToObjectId[object_row_id] = oid;
+  // Create mapping rowId to objectId for multigeometries
+  for (size_t objectId = 0; objectId < _objects.size(); objectId++) {
+    std::pair<ID_TYPE, ID_TYPE> object = _objects[objectId];
+    ID_TYPE rowId = object.second;
+    _rowIdToObjectId[rowId] = objectId;
   }
 
-  LOG(INFO) << "[REQUESTOR] Matching size: " << _rowIdToObjectId.size();
-
   LOG(INFO) << "[REQUESTOR] Calculating bounding box of result...";
 
   util::geo::FBox pointBbox;

diff --git a/src/qlever-petrimaps/server/Server.cpp b/src/qlever-petrimaps/server/Server.cpp
@@ -1074,7 +1074,7 @@ util::http::Answer Server::handleExportReq(const Params& pars, int sock) const {
   size_t rowId = 0;
 
   reqor->requestRows(
-      [sock, &first, reqor, &rowId, this](
+      [sock, &first, &rowId, reqor, this](
           std::vector<std::vector<std::pair<std::string, std::string>>> rows) {
         std::stringstream ss;
         ss << std::setprecision(10);
@@ -1094,7 +1094,7 @@ util::http::Answer Server::handleExportReq(const Params& pars, int sock) const {
           first = true;
           ss << "\n";
 
-          rowId += 1;
+          rowId++;
         }
 
         std::string buff = ss.str();