Fixed GeoJson export (for MultiGeometries)

Grandro · Jul 9, 2024 · dd612f0 · dd612f0
1 parent 4d8e817
commit dd612f0
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 8 deletions.
diff --git a/src/qlever-petrimaps/server/GeoJSONRequestor.cpp b/src/qlever-petrimaps/server/GeoJSONRequestor.cpp
@@ -20,12 +20,22 @@ void GeoJSONRequestor::request() {
   _ready = false;
   _objects.clear();
   _clusterObjects.clear();
+  _rowIdToObjectId.clear();
 
   _objects = _cache->getRelObjects();
   _numObjects = _objects.size();
 
   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;
+  }
+
+  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.cpp b/src/qlever-petrimaps/server/Requestor.cpp
@@ -454,23 +454,23 @@ const ResObj Requestor::getNearest(util::geo::DPoint rp, double rad, double res,
 }
 
 // _____________________________________________________________________________
-const ResObj Requestor::getGeom(size_t id, double rad) const {
+const ResObj Requestor::getGeom(size_t objectId, double rad) const {
   if (!_cache->ready()) {
     throw std::runtime_error("Geom cache not ready");
   }
-  auto obj = _objects[id];
+  std::pair<ID_TYPE, ID_TYPE> obj = _objects[objectId];
+
   if (obj.first >= I_OFFSET) {
     size_t lineId = obj.first - I_OFFSET;
 
     bool isArea = Requestor::isArea(lineId);
-
     if (isArea) {
-      return {true, id, {{0, 0}}, {}, {}, geomPolyGeoms(id, rad / 10)};
+      return {true, objectId, {{0, 0}}, {}, {}, geomPolyGeoms(objectId, rad / 10)};
     } else {
-      return {true, id, {{0, 0}}, {}, geomLineGeoms(id, rad / 10), {}};
+      return {true, objectId, {{0, 0}}, {}, geomLineGeoms(objectId, rad / 10), {}};
     }
   } else {
-    return {true, id, geomPointGeoms(id), {}, {}, {}};
+    return {true, objectId, geomPointGeoms(objectId), {}, {}, {}};
   }
 }
 

diff --git a/src/qlever-petrimaps/server/Requestor.h b/src/qlever-petrimaps/server/Requestor.h
@@ -63,6 +63,10 @@ class Requestor {
     return _clusterObjects;
   }
 
+  ID_TYPE getObjectIdFromRowId(ID_TYPE row_id) const {
+    return _rowIdToObjectId.at(row_id);
+  }
+
   const util::geo::FPoint& getPoint(ID_TYPE id) const {
     return _cache->getPoint(id);
   }
@@ -120,6 +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
 };
 }  // namespace petrimaps
 

diff --git a/src/qlever-petrimaps/server/SPARQLRequestor.cpp b/src/qlever-petrimaps/server/SPARQLRequestor.cpp
@@ -24,6 +24,7 @@ void SPARQLRequestor::request(const std::string& query) {
   _ready = false;
   _objects.clear();
   _clusterObjects.clear();
+  _rowIdToObjectId.clear();
 
   RequestReader reader(_cache->getBackendURL(), _maxMemory);
 
@@ -48,6 +49,15 @@ 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;
+  }
+
+  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
@@ -1071,16 +1071,18 @@ util::http::Answer Server::handleExportReq(const Params& pars, int sock) const {
   }
 
   bool first = false;
+  size_t rowId = 0;
 
   reqor->requestRows(
-      [sock, &first, reqor, this](
+      [sock, &first, reqor, &rowId, this](
           std::vector<std::vector<std::pair<std::string, std::string>>> rows) {
         std::stringstream ss;
         ss << std::setprecision(10);
         util::json::Val attrs;
         for (size_t i = 0; i < rows.size(); i++) {
           auto& row = rows[i];
-          auto res = reqor->getGeom(i, 0);
+          ID_TYPE objectId = reqor->getObjectIdFromRowId(rowId);
+          auto res = reqor->getGeom(objectId, 0);
 
           for (size_t j = 0; j < row.size(); j++) {
             attrs.dict[row[j].first] = row[j].second;
@@ -1091,6 +1093,8 @@ util::http::Answer Server::handleExportReq(const Params& pars, int sock) const {
           processGeoJsonOutput(geoJsonOut, res, attrs);
           first = true;
           ss << "\n";
+
+          rowId += 1;
         }
 
         std::string buff = ss.str();