Fix pelicanmapping#66 JSON assertion failure

emminizer · Dec 20, 2024 · ad5e27b · ad5e27b
1 parent db5c7a0
commit ad5e27b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/rocky/vsg/MapNode.cpp b/src/rocky/vsg/MapNode.cpp
@@ -41,14 +41,14 @@ MapNode::from_json(const std::string& JSON, const IOOptions& io)
 
     Status status = j.status;
 
-    if (status.ok() && map)
-    {
-        status = map->from_json(j["map"].dump(), io);
+    if (status.ok() && map && j.contains("map"))
+    {        
+        status = map->from_json(j.at("map").dump(), io);
     }
 
-    if (status.ok() && terrainNode)
+    if (status.ok() && terrainNode && j.contains("terrain"))
     {
-        status = terrainNode->from_json(j["terrain"].dump(), io);
+        status = terrainNode->from_json(j.at("map").dump(), io);
     }
 
     return status;