Merge pull request #448 from TomFischer/GeoLibGetGeoObjectsByName

[GeoLib] Another version for GEOObjects::getGeoObjects().

GeoLib/GEOObjects.cpp

@@ -591,6 +591,27 @@ const GeoLib::GeoObject* GEOObjects::getGeoObject(const std::string &geo_name,
 	return geo_obj;
 }
 
+GeoLib::GeoObject const* GEOObjects::getGeoObject(
+	const std::string &geo_name,
+	const std::string &geo_obj_name) const
+{
+	GeoLib::GeoObject const* geo_obj(
+		getGeoObject(geo_name, GeoLib::GEOTYPE::POINT, geo_obj_name)
+	);
+
+	if(!geo_obj)
+		geo_obj = getGeoObject(geo_name, GeoLib::GEOTYPE::POLYLINE, geo_obj_name);
+
+	if(!geo_obj)
+		geo_obj = getGeoObject(geo_name, GeoLib::GEOTYPE::SURFACE, geo_obj_name);
+
+	if (!geo_obj) {
+		ERR("GEOObjects::getGeoObject(): Could not find \"%s\" in geometry %s.",
+			geo_obj_name.c_str(), geo_name.c_str());
+	}
+	return geo_obj;
+}
+
 int GEOObjects::exists(const std::string &geometry_name) const
 {
 	std::size_t size (_pnt_vecs.size());

GeoLib/GEOObjects.h

 /**
- * \file
  * \author Thomas Fischer / Karsten Rink
  * \date   2010-01-21
  * \brief  Definition of the GeoObjects class.
@@ -257,6 +256,18 @@ public:
 	                                      GeoLib::GEOTYPE type,
 	                                      const std::string &geo_obj_name) const;
 
+	/// Return named (by the tuple geo_name and geo_obj_name) geo object.
+	// It is required that a tuple is a unique key for a geometric object!
+	// If there is another geo object with same name one of them is returned.
+	// In theory different types of geometric objects can have the same name.
+	// For instance it is possible that a point object and a polyline object
+	// share the same name. If there exists several objects sharing the same
+	// name the first object found will be returned.
+	// @param geo_name name of geometry
+	// @param geo_obj_name name of the geo object
+	GeoLib::GeoObject const* getGeoObject(const std::string &geo_name,
+	                                      const std::string &geo_obj_name) const;
+
 	/** constructor */
 	GEOObjects();
 	/** destructor */