diff --git a/iModelCore/GeoCoord/BaseGeoCoord/basegeocoord.cpp b/iModelCore/GeoCoord/BaseGeoCoord/basegeocoord.cpp index 6c657fe7dec..045b050fa47 100644 --- a/iModelCore/GeoCoord/BaseGeoCoord/basegeocoord.cpp +++ b/iModelCore/GeoCoord/BaseGeoCoord/basegeocoord.cpp @@ -8921,6 +8921,10 @@ 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 @@ -8953,9 +8957,6 @@ struct GeoCoordWorkspaces { return nullptr; } - static bool s_loadLocalFiles = true; - void BaseGCS::EnableLocalGcsFiles(bool yesNo) { s_loadLocalFiles = yesNo; } - // get the row for a resource for csmap by pathname. Path will include the "assets" prefix. static WorkspaceRow GetRow(Utf8CP path) { WorkspaceRow blank = {0, nullptr}; diff --git a/iModelCore/iModelPlatform/DgnGeoCoord/DgnGeoCoord.cpp b/iModelCore/iModelPlatform/DgnGeoCoord/DgnGeoCoord.cpp index 0f83dcc4ade..68282eb258f 100644 --- a/iModelCore/iModelPlatform/DgnGeoCoord/DgnGeoCoord.cpp +++ b/iModelCore/iModelPlatform/DgnGeoCoord/DgnGeoCoord.cpp @@ -5342,20 +5342,32 @@ DgnGCSP DgnGCS::FromProject(DgnDbR project) StopWatch timer; timer.Start(); + auto msg = DateTime::GetCurrentTime().ToTimestampString() + " | START GCS Load Time"; + Logging::LogMessage("GeoCoord", LOG_INFO, msg.c_str()); auto gcs = FromGeoCoordType66AppData((short const*)buffer.GetData(), project); + msg = DateTime::GetCurrentTime().ToTimestampString() + " | END GCS Load Time"; + Logging::LogMessage("GeoCoord", LOG_INFO, msg.c_str()); timer.Stop(); Logging::LogMessageV("GeoCoord", LOG_INFO, "Time to load gcs: %fs", timer.GetElapsedSeconds()); + msg = DateTime::GetCurrentTime().ToTimestampString() + " | START IF GCS NULL"; + Logging::LogMessage("GeoCoord", LOG_INFO, msg.c_str()); if (NULL == gcs) { project.AddAppData(NotFoundAppData::GetKey(), new NotFoundAppData()); return NULL; } - + msg = DateTime::GetCurrentTime().ToTimestampString() + " | END IF GCS NULL"; + Logging::LogMessage("GeoCoord", LOG_INFO, msg.c_str()); // *** NEEDS WORK: Global origin is not saved, right? I have to get it from the project, don't I? + + msg = DateTime::GetCurrentTime().ToTimestampString() + " | START GetGlobalOrigin"; + Logging::LogMessage("GeoCoord", LOG_INFO, msg.c_str()); gcs->m_globalOrigin = project.GeoLocation().GetGlobalOrigin(); project.AddAppData(DgnGCSAppData::GetKey(), new DgnGCSAppData(*gcs)); + msg = DateTime::GetCurrentTime().ToTimestampString() + " | END GetGlobalOrigin"; + Logging::LogMessage("GeoCoord", LOG_INFO, msg.c_str()); return gcs; }