Allow App to specify GCS asset Dir

iModelCore/GeoCoord/BaseGeoCoord/basegeocoord.cpp

@@ -8921,6 +8921,9 @@ struct WorkspaceResource : _csFile {
     virtual int printf(Utf8CP format...) override { return readonly(); }
 };
 
+static bool s_loadLocalFiles = true;
+void BaseGCS::EnableLocalGcsFiles(bool yesNo) { s_loadLocalFiles = yesNo; }
+
 //=======================================================================================
 // static methods for finding resources in the list of GCS resource files.
 // @bsiclass
@@ -8946,7 +8949,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 (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;
     }
 
@@ -8980,9 +8986,6 @@ struct GeoCoordWorkspaces {
     }
 };
 
-static bool s_loadLocalFiles = true;
-void BaseGCS::EnableLocalGcsFiles(bool yesNo) { s_loadLocalFiles = yesNo; }
-
 /** Add a new entry to the list of gcs WorkspaceDbs */
 bool BaseGCS::AddWorkspaceDb(Utf8String dbName, CloudContainerP container, int priority) {
     WorkspaceDbPtr newDb = new WorkspaceDb(priority, dbName, container);
@@ -27323,6 +27326,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 %s", filename, name.c_str());
+
     return nullptr == file ? nullptr : new AssetDirFile(file);
 }
 

iModelCore/iModelPlatform/DgnCore/DgnCore.cpp

@@ -7,6 +7,7 @@
 #include <DgnPlatform/DgnGeoCoord.h>
 #include <DgnPlatform/DgnECSymbolProvider.h>
 #include <DgnPlatform/Visualization.h>
+#include <DgnPlatform/PlatformLib.h>
 
 BeThreadLocalStorage t_threadId;
 
@@ -220,7 +221,8 @@ void PlatformLib::Terminate(bool onProgramExit) {
 +---------------+---------------+---------------+---------------+---------------+------*/
 void PlatformLib::Host::Terminate(bool onProgramExit) {
 
-    ON_HOST_TERMINATE(m_geoCoordAdmin, onProgramExit);
+    if( m_geoCoordAdmin != nullptr )
+      ON_HOST_TERMINATE(m_geoCoordAdmin, onProgramExit);
     ON_HOST_TERMINATE(m_bRepGeometryAdmin, onProgramExit);
 
     // UnRegister Symbol Provider for ECExpressions
@@ -234,6 +236,13 @@ void PlatformLib::Host::Terminate(bool onProgramExit) {
 void _wassert(wchar_t const*, wchar_t const*, int) {BeAssert(false);}
 #endif
 
+/*---------------------------------------------------------------------------------**//**
+* @bsimethod
++---------------+---------------+---------------+---------------+---------------+------*/
+void PlatformLib::Host::TerminateGeoCoordAdmin(bool onProgramExit) {
+    ON_HOST_TERMINATE(m_geoCoordAdmin, onProgramExit);
+}
+
 /*---------------------------------------------------------------------------------**//**
 * *Private* method called by Dgn::Host::Initialize.
 * @bsimethod
@@ -242,7 +251,6 @@ void PlatformLib::Host::Initialize()
     {
     BeAssert(NULL == m_knownLocationsAdmin); m_knownLocationsAdmin = &_SupplyIKnownLocationsAdmin();
     BeAssert(NULL == m_exceptionHandler); m_exceptionHandler = &_SupplyExceptionHandler();
-    BeAssert(NULL == m_geoCoordAdmin); m_geoCoordAdmin = &_SupplyGeoCoordinationAdmin();
 
     auto assetDir = m_knownLocationsAdmin->GetDgnPlatformAssetsDirectory();
 
@@ -251,7 +259,6 @@ void PlatformLib::Host::Initialize()
                       &assetDir,
                        BeSQLiteLib::LogErrors::Yes);
 
-    GeoCoordinates::BaseGCS::Initialize(GetGeoCoordinationAdmin()._GetDataDirectory().GetNameUtf8().c_str());
 
     DgnDomains::RegisterDomain(BisCoreDomain::GetDomain(), DgnDomain::Required::Yes, DgnDomain::Readonly::No);
     DgnDomains::RegisterDomain(GenericDomain::GetDomain(), DgnDomain::Required::Yes, DgnDomain::Readonly::No);
@@ -272,6 +279,15 @@ void PlatformLib::Host::Initialize()
     m_bRepGeometryAdmin->_Initialize(assetDir, tempDirBase);
     }
 
+/*---------------------------------------------------------------------------------**//**
+* @bsimethod
++---------------+---------------+---------------+---------------+---------------+------*/
+void PlatformLib::Host::GeoCoordInitialize(BeFileName geoCoordAssetPath) 
+  {
+    BeAssert(NULL == m_geoCoordAdmin); m_geoCoordAdmin = &_SupplyGeoCoordinationAdmin(geoCoordAssetPath);
+    GeoCoordinates::BaseGCS::Initialize(GetGeoCoordinationAdmin()._GetDataDirectory().GetNameUtf8().c_str());
+  }
+
 /*---------------------------------------------------------------------------------**//**
 * @bsimethod
 +---------------+---------------+---------------+---------------+---------------+------*/
@@ -437,9 +453,14 @@ PlatformLib::Host::BRepGeometryAdmin& PlatformLib::Host::_SupplyBRepGeometryAdmi
 //---------------------------------------------------------------------------------------
 // @bsimethod
 //---------------------------------------------------------------------------------------
-PlatformLib::Host::GeoCoordinationAdmin& PlatformLib::Host::_SupplyGeoCoordinationAdmin()
+PlatformLib::Host::GeoCoordinationAdmin& PlatformLib::Host::_SupplyGeoCoordinationAdmin(BeFileName geoCoordAssetPath)
     {
-    BeFileName geo = GetIKnownLocationsAdmin().GetGeoCoordinateDataDirectory();
+    BeFileName geo;
+    if (geoCoordAssetPath.empty())
+        geo = GetIKnownLocationsAdmin().GetGeoCoordinateDataDirectory();
+    else
+        geo = geoCoordAssetPath;
+
 
     BeFileName path(geo);
     path.AppendToPath(L"DgnGeoCoord");

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());

iModelCore/iModelPlatform/DgnHandlers/ScopedDgnHost.cpp

@@ -74,6 +74,7 @@ ScopedDgnHostImpl::ScopedDgnHostImpl(ScopedDgnHostConfig* config) : m_config(con
 
     PlatformLib::Initialize(*this);
     m_isInitialized = true;
+    T_HOST.GeoCoordInitialize(BeFileName(""));
     }
 
 /*---------------------------------------------------------------------------------**//**

iModelCore/iModelPlatform/PublicAPI/DgnPlatform/PlatformLib.h

@@ -36,6 +36,7 @@ class PlatformLib {
         friend class PlatformLib;
 
     public:
+
         //! Provides Exception handling capabilities
         struct ExceptionHandler : IHostObject {
             //! Possible outcomes of handling an exception
@@ -248,7 +249,13 @@ class PlatformLib {
         DGNPLATFORM_EXPORT virtual VisualizationAdmin& _SupplyVisualizationAdmin();
 
         //! Supply the GeoCoordinationStateAdmin for this session. This method is guaranteed to be called once per thread from PlatformLib::Host::Initialize and never again..
-        DGNPLATFORM_EXPORT virtual GeoCoordinationAdmin& _SupplyGeoCoordinationAdmin();
+        DGNPLATFORM_EXPORT virtual GeoCoordinationAdmin& _SupplyGeoCoordinationAdmin(BeFileName geoCoorAssetPath);
+
+        //! Initialize the GeoCoordinationAdmin on IModel Host Startup
+        DGNPLATFORM_EXPORT void GeoCoordInitialize(BeFileName geoCoordAssetPath);
+
+        //! Terminate the GeoCoordinationAdmin on IModel Host Shutdown
+        DGNPLATFORM_EXPORT void TerminateGeoCoordAdmin(bool onProgramExit);
 
         //! Supply the BRepGeometryAdmin for this session. This method is guaranteed to be called once per thread from PlatformLib::Host::Initialize and never again.
         DGNPLATFORM_EXPORT virtual BRepGeometryAdmin& _SupplyBRepGeometryAdmin();

iModelJsNodeAddon/IModelJsNative.cpp

@@ -2319,6 +2319,18 @@ struct NativeDgnDb : BeObjectWrap<NativeDgnDb>, SQLiteOps<DgnDb>
         return Napi::String::New(info.Env(), asset.GetNameUtf8().c_str());
         }
 
+    static void SetGeoCoordAssetDir(NapiInfoCR info)
+      {
+        BeFileName assetDir = BeFileName(info[0].ToString().Utf8Value().c_str());
+        T_HOST.GeoCoordInitialize(assetDir);
+      }
+
+    static void TerminateGeoCoordAssetDir(NapiInfoCR info)
+      {
+        T_HOST.TerminateGeoCoordAdmin(true);
+        GeoCoordinates::BaseGCS::Shutdown();
+      }
+
     static Napi::Value EnableSharedCache(NapiInfoCR info)
         {
         REQUIRE_ARGUMENT_BOOL(0, enabled);
@@ -2812,6 +2824,8 @@ struct NativeDgnDb : BeObjectWrap<NativeDgnDb>, SQLiteOps<DgnDb>
             InstanceMethod("setNoCaseCollation", &NativeDgnDb::SetNoCaseCollation),
             StaticMethod("enableSharedCache", &NativeDgnDb::EnableSharedCache),
             StaticMethod("getAssetsDir", &NativeDgnDb::GetAssetDir),
+            StaticMethod("setGeoCoordAssetsDir", &NativeDgnDb::SetGeoCoordAssetDir),
+            StaticMethod("terminateGeoCoordAssetsDir", &NativeDgnDb::TerminateGeoCoordAssetDir),
             StaticMethod("zlibCompress", &NativeDgnDb::ZlibCompress),
             StaticMethod("zlibDecompress", &NativeDgnDb::ZlibDecompress),
         });

iModelJsNodeAddon/api_package/ts/src/NativeLibrary.ts

@@ -674,6 +674,8 @@ export declare namespace IModelJsNative {
     public setAutoCheckpointThreshold(frames: number): void;
     public static enableSharedCache(enable: boolean): DbResult;
     public static getAssetsDir(): string;
+    public static setGeoCoordAssetsDir(dir: string): void;
+    public static terminateGeoCoordAssetsDir(): void;
     public static zlibCompress(data: Uint8Array): Uint8Array;
     public static zlibDecompress(data: Uint8Array, actualSize: number): Uint8Array;
   }

iModelJsNodeAddon/api_package/ts/src/test/utils.ts

@@ -36,7 +36,7 @@ export function loadInstalledAddon(): typeof IModelJsNative {
   return NativeLibrary.load();
 }
 
-export function loadLocalBuildOfAddon(): any {
+export function loadLocalBuildOfAddon(): typeof IModelJsNative {
   if (process.env.OutRoot === undefined) {
     throw new Error("You must define 'OutRoot' in your environment");
   }
@@ -71,7 +71,9 @@ export function logTest(msg: string) {
 
 let _addon: undefined | typeof IModelJsNative;
 function loadAddon() {
-  return _addon ??= useLocalBuild ? loadLocalBuildOfAddon() : loadInstalledAddon();
+  _addon ??= useLocalBuild ? loadLocalBuildOfAddon() : loadInstalledAddon();
+  _addon.DgnDb.setGeoCoordAssetsDir("");
+  return _addon;
 }
 
 export const iModelJsNative: typeof IModelJsNative = loadAddon();