From 410c61946a751bf90f2862c3b9609bcdea4671df Mon Sep 17 00:00:00 2001
From: Frank Bausch <bausch@enews.nrl.navy.mil>
Date: Wed, 11 Mar 2020 10:29:25 -0400
Subject: [PATCH] simUtil: remove unnecessary map setProfile for config.txt
 loading (SIM-11196)

 Release Note: N/A

 Notes:

 Test Environment: Windows 10, VC14, Debug, 64-bit.

 Test: tss: fixes artifacts with no apparent changes to map

 Review: 20957
---
 SDK/simUtil/DbConfigurationFile.cpp | 10 +---------
 SDK/simUtil/DbConfigurationFile.h   |  7 -------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/SDK/simUtil/DbConfigurationFile.cpp b/SDK/simUtil/DbConfigurationFile.cpp
index 1dd990518..7349ffd82 100644
--- a/SDK/simUtil/DbConfigurationFile.cpp
+++ b/SDK/simUtil/DbConfigurationFile.cpp
@@ -197,7 +197,7 @@ osgEarth::Map* DbConfigurationFile::loadLegacyConfigFile(const std::string& file
     gotValidFirstLine = true;
     if (!map)
     {
-      map = DbConfigurationFile::createDefaultMap_();
+      map = new osgEarth::Map();
       map->beginUpdate();
     }
 
@@ -499,14 +499,6 @@ std::string DbConfigurationFile::findTokenValue_(const std::vector<std::string>&
   return std::string();
 }
 
-osgEarth::Map* DbConfigurationFile::createDefaultMap_()
-{
-  // configure an EGM96 MSL globe.for the Map
-  osgEarth::Map* map = new osgEarth::Map();
-  map->setProfile(osgEarth::Profile::create("wgs84", "egm96"));
-  return map;
-}
-
 osg::Node* DbConfigurationFile::readEarthFile(std::istream& istream, const std::string& relativeTo)
 {
   osg::ref_ptr<osgDB::ReaderWriter> readWrite = osgDB::Registry::instance()->getReaderWriterForExtension("earth");
diff --git a/SDK/simUtil/DbConfigurationFile.h b/SDK/simUtil/DbConfigurationFile.h
index 080e1d395..f4b5d901b 100644
--- a/SDK/simUtil/DbConfigurationFile.h
+++ b/SDK/simUtil/DbConfigurationFile.h
@@ -114,13 +114,6 @@ class SDKUTIL_EXPORT DbConfigurationFile
   static std::string findTokenValue_(const std::vector<std::string>& tokens, const std::string& keyword);
   /// convert QuadSphere levels to osgEarth levels
   static unsigned int getOsgEarthLevel_(unsigned int QSlevel);
-
-  /**
-  * Creates a default osgEarth::Map object with the EGM96 MSL globe
-  * Loads parts of a legacy .txt configuration file (typically consisting of .db files)
-  * @return the osgEarth::Map created
-  */
-  static osgEarth::Map* createDefaultMap_();
 };
 
 }