Merge pull request #649 from cldellow/centroid-nil-on-error

Centroid(...) should return nil on error
systemed · Jan 19, 2024 · deae9ef · deae9ef
2 parents 782f639 + dedbfe7
commit deae9ef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/include/osm_lua_processing.h b/include/osm_lua_processing.h
@@ -144,7 +144,7 @@ class OsmLuaProcessing {
 	double Length();
 
 	// Return centroid lat/lon
-	std::vector<double> Centroid(kaguya::VariadicArgType algorithm);
+	kaguya::optional<std::vector<double>> Centroid(kaguya::VariadicArgType algorithm);
 
 	enum class CentroidAlgorithm: char { Centroid = 0, Polylabel = 1 };
 	CentroidAlgorithm defaultCentroidAlgorithm() const { return CentroidAlgorithm::Polylabel; }

diff --git a/src/osm_lua_processing.cpp b/src/osm_lua_processing.cpp
@@ -145,7 +145,7 @@ bool rawCoveredBy(const std::string& layerName) { return osmLuaProcessing->Cover
 bool rawIsClosed() { return osmLuaProcessing->IsClosed(); }
 double rawArea() { return osmLuaProcessing->Area(); }
 double rawLength() { return osmLuaProcessing->Length(); }
-std::vector<double> rawCentroid(kaguya::VariadicArgType algorithm) { return osmLuaProcessing->Centroid(algorithm); }
+kaguya::optional<std::vector<double>> rawCentroid(kaguya::VariadicArgType algorithm) { return osmLuaProcessing->Centroid(algorithm); }
 void rawLayer(const std::string& layerName, bool area) { return osmLuaProcessing->Layer(layerName, area); }
 void rawLayerAsCentroid(const std::string &layerName, kaguya::VariadicArgType nodeSources) { return osmLuaProcessing->LayerAsCentroid(layerName, nodeSources); }
 void rawMinZoom(const double z) { return osmLuaProcessing->MinZoom(z); }
@@ -788,16 +788,21 @@ OsmLuaProcessing::CentroidAlgorithm OsmLuaProcessing::parseCentroidAlgorithm(con
 	throw std::runtime_error("unknown centroid algorithm " + algorithm);
 }
 
-std::vector<double> OsmLuaProcessing::Centroid(kaguya::VariadicArgType algorithmArgs) {
+kaguya::optional<std::vector<double>> OsmLuaProcessing::Centroid(kaguya::VariadicArgType algorithmArgs) {
 	CentroidAlgorithm algorithm = defaultCentroidAlgorithm();
 
 	for (auto needleRef : algorithmArgs) {
 		const std::string needle = needleRef.get<std::string>();
 		algorithm = parseCentroidAlgorithm(needle);
 		break;
 	}
-	Point c = calculateCentroid(algorithm);
-	return std::vector<double> { latp2lat(c.y()/10000000.0), c.x()/10000000.0 };
+	try {
+		Point c = calculateCentroid(algorithm);
+		return std::vector<double> { latp2lat(c.y()/10000000.0), c.x()/10000000.0 };
+	} catch (geom::centroid_exception &err) {
+		if (verbose) cerr << "Problem geometry " << (isRelation ? "relation " : isWay ? "way " : "node " ) << originalOsmID << ": " << err.what() << endl;
+		return kaguya::optional<std::vector<double>>();
+	}
 }
 
 // Accept a relation in relation_scan phase