Allow App to specify GCS asset Dir

iModelCore/GeoCoord/BaseGeoCoord/basegeocoord.cpp

@@ -8946,7 +8946,10 @@ struct GeoCoordWorkspaces {
             Logging::LogMessageV("GeoCoord", LOG_ERROR, "Unable to read data for GCS file %s from workspace %s, rc=%d", path, row.db->GetDbFileName(), rc);
             delete resource; // weren't able to read from row.
         }
-        Logging::LogMessageV("GeoCoord", LOG_WARNING, "Unable to find GCS file %s in any workspace", path);
+        if (BentleyApi::GeoCoordinates::s_loadLocalFiles)
+            Logging::LogMessageV("GeoCoord", LOG_INFO, "Unable to find GCS file %s in any workspace, trying local file", path);
+        else
+            Logging::LogMessageV("GeoCoord", LOG_WARNING, "Unable to find GCS file %s in any workspace", path);
         return nullptr;
     }
 
@@ -9017,6 +9020,9 @@ StatusInt BaseGCS::Initialize(Utf8CP dataDirectory) {
     ::CS_gpfnm("GeodeticPath.dty");
     ::CS_altdr(s_assetsDirPrefix.c_str());
     s_assetsDir = dataDirectory;
+    if(getenv("GEOCOORD_DIR")){
+        s_assetsDir = getenv("GEOCOORD_DIR");
+    }
 
 #if defined (BENTLEY_WIN32)||defined (BENTLEY_WINRT)
     if (s_assetsDir.StartsWith("\\\\?\\")) // fopen doesn't work correctly with long path prefix on Windows
@@ -27323,6 +27329,11 @@ _csFile* CS_fopen(Utf8CP filename, Utf8CP mode) {
 
     auto name = BentleyApi::GeoCoordinates::toAssetName(filename);
     auto file = CS_fopen_caseInsensitive(name.c_str(), mode);
+    if (file != nullptr)
+        Logging::LogMessageV("GeoCoord", LOG_INFO, "Successfully loaded GCS file %s from %s", filename, name.c_str());
+    else
+        Logging::LogMessageV("GeoCoord", LOG_WARNING, "Unable to find GCS file %s in Workspace or locally", filename);
+
     return nullptr == file ? nullptr : new AssetDirFile(file);
 }
 

iModelCore/iModelPlatform/DgnGeoCoord/DgnGeoCoord.cpp

@@ -5340,7 +5340,12 @@ DgnGCSP         DgnGCS::FromProject(DgnDbR project)
     ScopedArray<Byte> buffer(propSize);
     project.QueryProperty(buffer.GetData(), propSize, DgnProjectProperty::DgnGCS());
 
+    StopWatch timer;
+    timer.Start();
     auto gcs = FromGeoCoordType66AppData((short const*)buffer.GetData(), project);
+    timer.Stop();
+    Logging::LogMessageV("GeoCoord", LOG_INFO, "Time to load gcs: %fs", timer.GetElapsedSeconds());
+
     if (NULL == gcs)
         {
         project.AddAppData(NotFoundAppData::GetKey(), new NotFoundAppData());