support full geojson export of GEOMETRYCOLLECTIONs

ad-freiburg · Sep 25, 2024 · d50e65c · d50e65c
1 parent 192001d
commit d50e65c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/qlever-petrimaps/GeomCache.cpp b/src/qlever-petrimaps/GeomCache.cpp
@@ -831,14 +831,6 @@ std::vector<size_t> GeomCache::getGeomStarts(const std::string &str, size_t p) {
     a++;
   }
 
-  a = p;
-  while (1) {
-    a = str.find("GEOMETRYCOLLECTION(", a);
-    if (a == std::string::npos) break;
-    starts.push_back(a);
-    a++;
-  }
-
   starts.push_back(std::string::npos);
 
   std::sort(starts.begin(), starts.end());

diff --git a/src/qlever-petrimaps/server/Server.cpp b/src/qlever-petrimaps/server/Server.cpp
@@ -1116,6 +1116,13 @@ util::http::Answer Server::handleExportReq(const Params& pars, int sock) const {
             first = true;
           } catch (std::runtime_error& e) {
           }
+          try {
+            auto geom = util::geo::collectionFromWKT<double>(wkt);
+            if (first) ss << ",";
+            geoJsonOut.print(geom, dict);
+            first = true;
+          } catch (std::runtime_error& e) {
+          }
           ss << "\n";
         }
 

diff --git a/src/util b/src/util