factory.cpp: include authority name in exception

Author: rouault

src/iso19111/factory.cpp

@@ -4200,10 +4200,11 @@ AuthorityFactory::createObject(const std::string &code) const {
 
 //! @cond Doxygen_Suppress
 static FactoryException buildFactoryException(const char *type,
+                                              const std::string &authName,
                                               const std::string &code,
                                               const std::exception &ex) {
-    return FactoryException(std::string("cannot build ") + type + " " + code +
-                            ": " + ex.what());
+    return FactoryException(std::string("cannot build ") + type + " " +
+                            authName + ":" + code + ": " + ex.what());
 }
 //! @endcond
 
@@ -4258,7 +4259,7 @@ AuthorityFactory::createExtent(const std::string &code) const {
         return extent;
 
     } catch (const std::exception &ex) {
-        throw buildFactoryException("extent", code, ex);
+        throw buildFactoryException("extent", d->authority(), code, ex);
     }
 }
 
@@ -4323,7 +4324,8 @@ AuthorityFactory::createUnitOfMeasure(const std::string &code) const {
         d->context()->d->cache(cacheKey, uom);
         return uom;
     } catch (const std::exception &ex) {
-        throw buildFactoryException("unit of measure", code, ex);
+        throw buildFactoryException("unit of measure", d->authority(), code,
+                                    ex);
     }
 }
 
@@ -4410,7 +4412,7 @@ AuthorityFactory::createPrimeMeridian(const std::string &code) const {
         d->context()->d->cache(cacheKey, pm);
         return pm;
     } catch (const std::exception &ex) {
-        throw buildFactoryException("prime meridian", code, ex);
+        throw buildFactoryException("prime meridian", d->authority(), code, ex);
     }
 }
 
@@ -4509,7 +4511,7 @@ AuthorityFactory::createEllipsoid(const std::string &code) const {
             return ellps;
         }
     } catch (const std::exception &ex) {
-        throw buildFactoryException("ellipsoid", code, ex);
+        throw buildFactoryException("ellipsoid", d->authority(), code, ex);
     }
 }
 
@@ -4634,7 +4636,8 @@ void AuthorityFactory::createGeodeticDatumOrEnsemble(
             outDatum = datum.as_nullable();
         }
     } catch (const std::exception &ex) {
-        throw buildFactoryException("geodetic reference frame", code, ex);
+        throw buildFactoryException("geodetic reference frame", d->authority(),
+                                    code, ex);
     }
 }
 
@@ -4727,7 +4730,8 @@ void AuthorityFactory::createVerticalDatumOrEnsemble(
             }
         }
     } catch (const std::exception &ex) {
-        throw buildFactoryException("vertical reference frame", code, ex);
+        throw buildFactoryException("vertical reference frame", d->authority(),
+                                    code, ex);
     }
 }
 
@@ -5131,7 +5135,7 @@ AuthorityFactory::createGeodeticCRS(const std::string &code,
         throw FactoryException("unsupported (type, CS type) for geodeticCRS: " +
                                type + ", " + cs->getWKT2Type(true));
     } catch (const std::exception &ex) {
-        throw buildFactoryException("geodeticCRS", code, ex);
+        throw buildFactoryException("geodeticCRS", d->authority(), code, ex);
     }
 }
 
@@ -5196,7 +5200,7 @@ AuthorityFactory::createVerticalCRS(const std::string &code) const {
         throw FactoryException("unsupported CS type for verticalCRS: " +
                                cs->getWKT2Type(true));
     } catch (const std::exception &ex) {
-        throw buildFactoryException("verticalCRS", code, ex);
+        throw buildFactoryException("verticalCRS", d->authority(), code, ex);
     }
 }
 
@@ -5312,7 +5316,7 @@ AuthorityFactory::createConversion(const std::string &code) const {
         return operation::Conversion::create(propConversion, propMethod,
                                              parameters, values);
     } catch (const std::exception &ex) {
-        throw buildFactoryException("conversion", code, ex);
+        throw buildFactoryException("conversion", d->authority(), code, ex);
     }
 }
 
@@ -5450,7 +5454,7 @@ AuthorityFactory::Private::createProjectedCRSEnd(const std::string &code,
         throw FactoryException("unsupported CS type for projectedCRS: " +
                                cs->getWKT2Type(true));
     } catch (const std::exception &ex) {
-        throw buildFactoryException("projectedCRS", code, ex);
+        throw buildFactoryException("projectedCRS", authority(), code, ex);
     }
 }
 //! @endcond
@@ -5497,7 +5501,7 @@ AuthorityFactory::createCompoundCRS(const std::string &code) const {
         return crs::CompoundCRS::create(
             props, std::vector<crs::CRSNNPtr>{horizCRS, vertCRS});
     } catch (const std::exception &ex) {
-        throw buildFactoryException("compoundCRS", code, ex);
+        throw buildFactoryException("compoundCRS", d->authority(), code, ex);
     }
 }
 
@@ -5935,7 +5939,8 @@ operation::CoordinateOperationNNPtr AuthorityFactory::createCoordinateOperation(
                 values, accuracies);
 
         } catch (const std::exception &ex) {
-            throw buildFactoryException("transformation", code, ex);
+            throw buildFactoryException("transformation", d->authority(), code,
+                                        ex);
         }
     }
 
@@ -6050,7 +6055,8 @@ operation::CoordinateOperationNNPtr AuthorityFactory::createCoordinateOperation(
             return transf;
 
         } catch (const std::exception &ex) {
-            throw buildFactoryException("transformation", code, ex);
+            throw buildFactoryException("transformation", d->authority(), code,
+                                        ex);
         }
     }
 
@@ -6202,7 +6208,8 @@ operation::CoordinateOperationNNPtr AuthorityFactory::createCoordinateOperation(
                 parameters, values, accuracies);
 
         } catch (const std::exception &ex) {
-            throw buildFactoryException("transformation", code, ex);
+            throw buildFactoryException("transformation", d->authority(), code,
+                                        ex);
         }
     }
 
@@ -6306,7 +6313,8 @@ operation::CoordinateOperationNNPtr AuthorityFactory::createCoordinateOperation(
                                                             accuracies);
 
         } catch (const std::exception &ex) {
-            throw buildFactoryException("transformation", code, ex);
+            throw buildFactoryException("transformation", d->authority(), code,
+                                        ex);
         }
     }