Fixing a problem if JSON node does not exist

9ce1279c · Dipl.-Ing. Jonas Stienen · 7a62cf58 · 9ce1279c
Commit 9ce1279c authored Jul 18, 2019 by Dipl.-Ing. Jonas Stienen
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 6 deletions

src/ITAGeo/Base.cpp src/ITAGeo/Base.cpp +13 -6

No files found.
--- a/src/ITAGeo/Base.cpp
+++ b/src/ITAGeo/Base.cpp
@@ -195,9 +195,12 @@ void ITAGeo::CEmitter::LoadFromJSONString( const std::string& sContent, std::sha
 	//Set the orientation
 	qOrient.SetValues( dOrientation );

-	std::string sDirectivityID = jnRoot.at( "directivity_id" ).as_string();
-	if( pResourceManager && pResourceManager->HasDirectivity( sDirectivityID ) )
-		pDirectivity = pResourceManager->GetDirectivity( sDirectivityID );
+	if( jnRoot.find( "directivity_id" ) != jnRoot.end() )
+	{
+		std::string sDirectivityID = jnRoot.at( "directivity_id" ).as_string();
+		if( pResourceManager && pResourceManager->HasDirectivity( sDirectivityID ) )
+			pDirectivity = pResourceManager->GetDirectivity( sDirectivityID );
+	}
 #endif
 }

@@ -304,9 +307,13 @@ void ITAGeo::CSensor::LoadFromJSONString( const std::string& sContent, std::shar
 	//Set the orientation
 	qOrient.SetValues( dOrientation );

-	std::string sDirectivityID = ( std::string ) jnRoot.at( "directivity_id" ).as_string();
-	if( pResourceManager->HasDirectivity( sDirectivityID ) )
-		pDirectivity = pResourceManager->GetDirectivity( sDirectivityID );
+
+	if( jnRoot.find( "directivity_id" ) != jnRoot.end() )
+	{
+		std::string sDirectivityID = ( std::string ) jnRoot.at( "directivity_id" ).as_string();
+		if( pResourceManager->HasDirectivity( sDirectivityID ) )
+			pDirectivity = pResourceManager->GetDirectivity( sDirectivityID );
+	}
 #endif
 }