Fall back on a global-geodetic profile in the TiledFeatureModelLayer …

…is one is not found in the feature source
gwaldron · Dec 13, 2024 · 85a6722 · 85a6722
1 parent e6eb108
commit 85a6722
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/osgEarth/OGRFeatureSource.cpp b/src/osgEarth/OGRFeatureSource.cpp
@@ -687,7 +687,7 @@ OGRFeatureSource::openImplementation()
         return Status(Status::ResourceUnavailable, "Failed to establish a valid feature profile");
     }
 
-    OE_INFO << LC << getName() << " : opened OK" << std::endl;
+    OE_INFO << getName() << " (" << _source << ") opened OK" << std::endl;
 
     return Status::NoError;
 }

diff --git a/src/osgEarth/TiledFeatureModelLayer.cpp b/src/osgEarth/TiledFeatureModelLayer.cpp
@@ -391,7 +391,9 @@ TiledFeatureModelLayer::getProfile() const
     OE_SOFT_ASSERT_AND_RETURN(getFeatureSource() != nullptr, nullptr);
     OE_SOFT_ASSERT_AND_RETURN(getFeatureSource()->getFeatureProfile() != nullptr, nullptr);
 
-    return getFeatureSource()->getFeatureProfile()->getTilingProfile();
+    static const Profile* s_fallback = Profile::create(Profile::GLOBAL_GEODETIC);
+    auto profile = getFeatureSource()->getFeatureProfile()->getTilingProfile();
+    return profile ? profile : s_fallback;
 }
 
 unsigned