From 70b015fd81387c5ab196a396ed1025f0a0cca524 Mon Sep 17 00:00:00 2001
From: Tristan Marlow <tristan@abitsystems.com.au>
Date: Mon, 7 Apr 2025 07:38:22 +0800
Subject: [PATCH] New WaitUntilInitialized procedure that can raise event
 OnViewerReadyWait to prompt user to continue waiting. ShowMap will not check
 FInitComplete has been set and call InitMap if not. This is because Loaded is
 not called when TEdgeGoogleMapViewer is created at runtime. Demo application
 for RunTime creation

---
 Demo/Runtime/GoogleMapsRuntimeTest.dpr   |  17 +
 Demo/Runtime/GoogleMapsRuntimeTest.dproj | 926 +++++++++++++++++++++++
 Demo/Runtime/GoogleMapsTest_Icon.ico     | Bin 0 -> 12862 bytes
 Demo/Runtime/MainForm.dfm                | 276 +++++++
 Demo/Runtime/MainForm.pas                | 330 ++++++++
 Source/Vcl.GoogleMap.pas                 |  50 +-
 6 files changed, 1593 insertions(+), 6 deletions(-)
 create mode 100644 Demo/Runtime/GoogleMapsRuntimeTest.dpr
 create mode 100644 Demo/Runtime/GoogleMapsRuntimeTest.dproj
 create mode 100644 Demo/Runtime/GoogleMapsTest_Icon.ico
 create mode 100644 Demo/Runtime/MainForm.dfm
 create mode 100644 Demo/Runtime/MainForm.pas

diff --git a/Demo/Runtime/GoogleMapsRuntimeTest.dpr b/Demo/Runtime/GoogleMapsRuntimeTest.dpr
new file mode 100644
index 0000000..e73d174
--- /dev/null
+++ b/Demo/Runtime/GoogleMapsRuntimeTest.dpr
@@ -0,0 +1,17 @@
+program GoogleMapsRuntimeTest;
+
+uses
+  Forms,
+  MIdasLib,
+  MainForm in 'MainForm.pas' {formMain},
+  Vcl.GoogleMap in '..\..\Source\Vcl.GoogleMap.pas';
+
+{$R *.res}
+
+begin
+  Application.Initialize;
+  Application.Title := 'Delphi with Edge Google Maps Viewer Component Demo';
+  Application.MainFormOnTaskbar := True;
+  Application.CreateForm(TformMain, formMain);
+  Application.Run;
+end.
diff --git a/Demo/Runtime/GoogleMapsRuntimeTest.dproj b/Demo/Runtime/GoogleMapsRuntimeTest.dproj
new file mode 100644
index 0000000..455eb7e
--- /dev/null
+++ b/Demo/Runtime/GoogleMapsRuntimeTest.dproj
@@ -0,0 +1,926 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{89b008d3-2b9c-414e-8323-2a1b0e524f1c}</ProjectGuid>
+        <MainSource>GoogleMapsRuntimeTest.dpr</MainSource>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+        <DCC_DependencyCheckOutputName>GoogleMapsTest.exe</DCC_DependencyCheckOutputName>
+        <ProjectVersion>20.1</ProjectVersion>
+        <Config Condition="'$(Config)'==''">Debug</Config>
+        <Base>True</Base>
+        <TargetedPlatforms>3</TargetedPlatforms>
+        <AppType>Application</AppType>
+        <FrameworkType>VCL</FrameworkType>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">GoogleMapsTest</ProjectName>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+        <Base_Win32>true</Base_Win32>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+        <Base_Win64>true</Base_Win64>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+        <Cfg_1>true</Cfg_1>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+        <Cfg_1_Win32>true</Cfg_1_Win32>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
+        <Cfg_1_Win64>true</Cfg_1_Win64>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+        <Cfg_2>true</Cfg_2>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+        <Cfg_2_Win32>true</Cfg_2_Win32>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
+        <Cfg_2_Win64>true</Cfg_2_Win64>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base)'!=''">
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
+        <SanitizedProjectName>GoogleMapsRuntimeTest</SanitizedProjectName>
+        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=Edge GoogleMap Viewer Demo;FileVersion=1.0.0.0;InternalName=;LegalCopyright=CopyRight (c) 2021 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0;Comments=</VerInfo_Keys>
+        <DCC_DependencyCheckOutputName>GoogleMapsTest.exe</DCC_DependencyCheckOutputName>
+        <DCC_UnitSearchPath>..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_ExeOutput>.\Bin\$(Platform)</DCC_ExeOutput>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <DCC_DcuOutput>.\Dcu\$(Platform)</DCC_DcuOutput>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win32)'!=''">
+        <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+        <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+        <Icon_MainIcon>GoogleMapsTest_Icon.ico</Icon_MainIcon>
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
+        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win64)'!=''">
+        <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+        <Icon_MainIcon>GoogleMapsTest_Icon.ico</Icon_MainIcon>
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
+        <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
+        <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
+        <BT_BuildType>Debug</BT_BuildType>
+        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=Edge GoogleMap Viewer Demo;FileVersion=1.0.0.0;InternalName=;LegalCopyright=CopyRight (c) 2021 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProgramID=;ProductName=;ProductVersion=1.0;Comments=</VerInfo_Keys>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1)'!=''">
+        <Version>7.0</Version>
+        <DCC_DebugInformation>0</DCC_DebugInformation>
+        <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+        <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+        <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <BT_BuildType>Debug</BT_BuildType>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=Edge GoogleMap Viewer Demo;FileVersion=1.0.0.0;InternalName=;LegalCopyright=CopyRight (c) 2021 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProgramID=;ProductName=;ProductVersion=1.0;Comments=</VerInfo_Keys>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2)'!=''">
+        <DCC_DebugDCUs>true</DCC_DebugDCUs>
+        <Version>7.0</Version>
+        <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+        <BT_BuildType>Debug</BT_BuildType>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=Edge GoogleMap Viewer Demo;FileVersion=1.0.0.0;InternalName=;LegalCopyright=CopyRight (c) 2021 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProgramID=;ProductName=;ProductVersion=1.0;Comments=</VerInfo_Keys>
+    </PropertyGroup>
+    <ProjectExtensions>
+        <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+        <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+        <BorlandProject>
+            <Delphi.Personality>
+                <Parameters>
+                    <Parameters Name="UseLauncher">False</Parameters>
+                    <Parameters Name="LoadAllSymbols">True</Parameters>
+                    <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+                </Parameters>
+                <VersionInfo>
+                    <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+                    <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+                    <VersionInfo Name="MajorVer">1</VersionInfo>
+                    <VersionInfo Name="MinorVer">0</VersionInfo>
+                    <VersionInfo Name="Release">0</VersionInfo>
+                    <VersionInfo Name="Build">0</VersionInfo>
+                    <VersionInfo Name="Debug">False</VersionInfo>
+                    <VersionInfo Name="PreRelease">False</VersionInfo>
+                    <VersionInfo Name="Special">False</VersionInfo>
+                    <VersionInfo Name="Private">False</VersionInfo>
+                    <VersionInfo Name="DLL">False</VersionInfo>
+                    <VersionInfo Name="Locale">13322</VersionInfo>
+                    <VersionInfo Name="CodePage">1252</VersionInfo>
+                </VersionInfo>
+                <VersionInfoKeys>
+                    <VersionInfoKeys Name="CompanyName"/>
+                    <VersionInfoKeys Name="FileDescription"/>
+                    <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="InternalName"/>
+                    <VersionInfoKeys Name="LegalCopyright"/>
+                    <VersionInfoKeys Name="LegalTrademarks"/>
+                    <VersionInfoKeys Name="OriginalFilename"/>
+                    <VersionInfoKeys Name="ProductName"/>
+                    <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="Comments"/>
+                </VersionInfoKeys>
+                <Source>
+                    <Source Name="MainSource">GoogleMapsRuntimeTest.dpr</Source>
+                </Source>
+                <Excluded_Packages/>
+            </Delphi.Personality>
+            <Platforms>
+                <Platform value="Win32">True</Platform>
+                <Platform value="Win64">True</Platform>
+            </Platforms>
+            <Deployment Version="4">
+                <DeployFile LocalName="Bin\Win32\GoogleMapsRuntimeTest.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>GoogleMapsRuntimeTest.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployClass Name="AdditionalDebugSymbols">
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidClasses">
+                    <Platform Name="Android">
+                        <RemoteDir>classes</RemoteDir>
+                        <Operation>64</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>classes</RemoteDir>
+                        <Operation>64</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidFileProvider">
+                    <Platform Name="Android">
+                        <RemoteDir>res\xml</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\xml</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidGDBServer">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidLibnativeArmeabiFile">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidLibnativeArmeabiv7aFile">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidLibnativeMipsFile">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\mips</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\mips</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidServiceOutput">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\arm64-v8a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidServiceOutput_Android32">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidSplashImageDef">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidSplashStyles">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV21">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_Colors">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_DefaultAppIcon">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon144">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon192">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon36">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-ldpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-ldpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon48">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon72">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon96">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon24">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon36">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon48">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon72">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon96">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage426">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-small</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-small</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage470">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-normal</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-normal</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage640">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-large</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-large</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage960">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xlarge</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xlarge</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_Strings">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="DebugSymbols">
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="DependencyFramework">
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                        <Extensions>.framework</Extensions>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <Operation>1</Operation>
+                        <Extensions>.framework</Extensions>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <Operation>1</Operation>
+                        <Extensions>.framework</Extensions>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Required="true" Name="DependencyPackage">
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.bpl</Extensions>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="File">
+                    <Platform Name="Android">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectAndroidManifest">
+                    <Platform Name="Android">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXDebug"/>
+                <DeployClass Name="ProjectOSXEntitlements"/>
+                <DeployClass Name="ProjectOSXInfoPList"/>
+                <DeployClass Name="ProjectOSXResource">
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\Resources</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\Resources</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\Resources</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Required="true" Name="ProjectOutput">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\arm64-v8a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Linux64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOutput_Android32">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectUWPManifest">
+                    <Platform Name="Win32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSDeviceDebug">
+                    <Platform Name="iOSDevice32">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSEntitlements"/>
+                <DeployClass Name="ProjectiOSInfoPList"/>
+                <DeployClass Name="ProjectiOSLaunchScreen"/>
+                <DeployClass Name="ProjectiOSResource">
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="UWP_DelphiLogo150">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="UWP_DelphiLogo44">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iOS_AppStore1024">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_AppIcon152">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_AppIcon167">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Launch2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_LaunchDark2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Notification40">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Setting58">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_SpotLight80">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_AppIcon120">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_AppIcon180">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Launch2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Launch3x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_LaunchDark2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_LaunchDark3x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Notification40">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Notification60">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Setting58">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Setting87">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Spotlight120">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Spotlight80">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimARM64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="iOSSimARM64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+            </Deployment>
+        </BorlandProject>
+        <ProjectFileVersion>12</ProjectFileVersion>
+    </ProjectExtensions>
+    <ItemGroup>
+        <DelphiCompile Include="$(MainSource)">
+            <MainSource>MainSource</MainSource>
+        </DelphiCompile>
+        <DCCReference Include="MainForm.pas">
+            <Form>formMain</Form>
+        </DCCReference>
+        <DCCReference Include="..\..\Source\Vcl.GoogleMap.pas"/>
+        <BuildConfiguration Include="Base">
+            <Key>Base</Key>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Release">
+            <Key>Cfg_1</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Debug">
+            <Key>Cfg_2</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+    </ItemGroup>
+    <ItemGroup/>
+    <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
+    <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
+    <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
+</Project>
diff --git a/Demo/Runtime/GoogleMapsTest_Icon.ico b/Demo/Runtime/GoogleMapsTest_Icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..18f949f99ba791138370f669a981ed7cd0ba9f25
GIT binary patch
literal 12862
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

literal 0
HcmV?d00001

diff --git a/Demo/Runtime/MainForm.dfm b/Demo/Runtime/MainForm.dfm
new file mode 100644
index 0000000..774f695
--- /dev/null
+++ b/Demo/Runtime/MainForm.dfm
@@ -0,0 +1,276 @@
+object formMain: TformMain
+  Left = 427
+  Top = 268
+  Caption = 
+    'Delphi with Edge Google Maps Viewer Component Demo - Copyright (' +
+    'c) Ethea S.r.l.'
+  ClientHeight = 729
+  ClientWidth = 1445
+  Color = clBtnFace
+  Constraints.MinHeight = 550
+  Constraints.MinWidth = 890
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
+  Position = poScreenCenter
+  Visible = True
+  WindowState = wsMaximized
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
+  OnShow = FormShow
+  TextHeight = 13
+  object PanelHeader: TPanel
+    Left = 0
+    Top = 0
+    Width = 1445
+    Height = 209
+    Align = alTop
+    TabOrder = 0
+    ExplicitWidth = 1441
+    object gbMapAttributes: TGroupBox
+      Left = 1
+      Top = 1
+      Width = 198
+      Height = 207
+      Align = alLeft
+      Caption = 'Map Attributes'
+      TabOrder = 0
+      object lbZoom: TLabel
+        Left = 135
+        Top = 16
+        Width = 26
+        Height = 13
+        Caption = 'Zoom'
+      end
+      object Label5: TLabel
+        Left = 6
+        Top = 16
+        Width = 51
+        Height = 13
+        Caption = 'View Mode'
+      end
+      object Zoom: TSpinEdit
+        Left = 135
+        Top = 32
+        Width = 57
+        Height = 22
+        MaxValue = 0
+        MinValue = 0
+        TabOrder = 1
+        Value = 15
+        OnChange = ZoomChange
+      end
+      object MapTypeIdComboBox: TComboBox
+        Left = 6
+        Top = 32
+        Width = 126
+        Height = 22
+        Style = csOwnerDrawFixed
+        ItemIndex = 0
+        TabOrder = 0
+        Text = 'ROADMAP'
+        OnChange = MapTypeIdComboBoxChange
+        Items.Strings = (
+          'ROADMAP'
+          'SATELLITE'
+          #39'HYBRID'
+          'TERRAIN')
+      end
+      object cbCenterOnClick: TCheckBox
+        Left = 6
+        Top = 60
+        Width = 100
+        Height = 17
+        Caption = 'Center on click'
+        TabOrder = 2
+        OnClick = CheckBoxStreeViewClick
+      end
+      object mapControlGroupBox: TGroupBox
+        Left = -1
+        Top = 79
+        Width = 196
+        Height = 99
+        Caption = 'Map Controls'
+        TabOrder = 3
+        object CheckBoxTraffic: TCheckBox
+          Left = 7
+          Top = 17
+          Width = 90
+          Height = 17
+          Caption = 'Traffic'
+          TabOrder = 0
+          OnClick = CheckBoxTrafficClick
+        end
+        object CheckBoxBicycling: TCheckBox
+          Left = 102
+          Top = 17
+          Width = 90
+          Height = 17
+          Caption = 'Bicycling'
+          TabOrder = 1
+          OnClick = CheckBoxBicyclingClick
+        end
+        object CheckBoxStreeView: TCheckBox
+          Left = 7
+          Top = 40
+          Width = 90
+          Height = 17
+          Caption = 'Street View'
+          TabOrder = 2
+          OnClick = CheckBoxStreeViewClick
+        end
+        object CheckBoxFullScreen: TCheckBox
+          Left = 7
+          Top = 63
+          Width = 90
+          Height = 17
+          Caption = 'Full Screen'
+          TabOrder = 4
+          OnClick = CheckBoxFullScreenClick
+        end
+        object CheckBoxZoom: TCheckBox
+          Left = 102
+          Top = 40
+          Width = 90
+          Height = 17
+          Caption = 'Zoom'
+          TabOrder = 3
+          OnClick = CheckBoxZoomClick
+        end
+        object CheckBoxMapType: TCheckBox
+          Left = 102
+          Top = 63
+          Width = 90
+          Height = 17
+          Caption = 'Map Type'
+          TabOrder = 5
+          OnClick = CheckBoxMapTypeClick
+        end
+      end
+    end
+    object GroupBox1: TGroupBox
+      Left = 199
+      Top = 1
+      Width = 302
+      Height = 207
+      Align = alLeft
+      Caption = 'Location'
+      TabOrder = 1
+      object LabelLongitude: TLabel
+        Left = 30
+        Top = 109
+        Width = 47
+        Height = 13
+        Alignment = taRightJustify
+        Caption = 'Longitude'
+      end
+      object LabelAddress: TLabel
+        Left = 10
+        Top = 14
+        Width = 39
+        Height = 13
+        Caption = 'Address'
+      end
+      object LabelLatitude: TLabel
+        Left = 38
+        Top = 79
+        Width = 39
+        Height = 13
+        Alignment = taRightJustify
+        Caption = 'Latitude'
+      end
+      object MemoAddress: TMemo
+        Left = 10
+        Top = 29
+        Width = 163
+        Height = 44
+        Lines.Strings = (
+          '')
+        TabOrder = 0
+      end
+      object ButtonGotoLocation: TButton
+        Left = 177
+        Top = 79
+        Width = 99
+        Height = 48
+        Caption = 'Go to Latitude Lngitude'
+        TabOrder = 3
+        WordWrap = True
+        OnClick = ButtonGotoLocationClick
+      end
+      object Longitude: TEdit
+        Left = 83
+        Top = 106
+        Width = 90
+        Height = 21
+        TabOrder = 4
+      end
+      object ButtonGotoAddress: TButton
+        Left = 178
+        Top = 29
+        Width = 99
+        Height = 44
+        Caption = 'Go to Address'
+        TabOrder = 1
+        OnClick = ButtonGotoAddressClick
+      end
+      object Latitude: TEdit
+        Left = 83
+        Top = 79
+        Width = 90
+        Height = 21
+        TabOrder = 2
+      end
+    end
+    object BottomPanel: TPanel
+      Left = 1292
+      Top = 1
+      Width = 152
+      Height = 207
+      Align = alRight
+      TabOrder = 2
+      object ShowPrintUIButton: TButton
+        AlignWithMargins = True
+        Left = 4
+        Top = 66
+        Width = 144
+        Height = 25
+        Align = alTop
+        Caption = 'Show Print UI'
+        TabOrder = 2
+        OnClick = ShowPrintUIButtonClick
+        ExplicitWidth = 564
+      end
+      object ShowMapButton: TButton
+        AlignWithMargins = True
+        Left = 4
+        Top = 35
+        Width = 144
+        Height = 25
+        Align = alTop
+        Caption = 'Show Map'
+        TabOrder = 1
+        OnClick = ShowMapButtonClick
+        ExplicitWidth = 564
+      end
+      object HideMapButton: TButton
+        AlignWithMargins = True
+        Left = 4
+        Top = 4
+        Width = 144
+        Height = 25
+        Align = alTop
+        Caption = 'Hide map'
+        TabOrder = 0
+        OnClick = HideMapButtonClick
+        ExplicitWidth = 564
+      end
+    end
+  end
+  object PopupMenu: TPopupMenu
+    Left = 416
+    Top = 264
+  end
+end
diff --git a/Demo/Runtime/MainForm.pas b/Demo/Runtime/MainForm.pas
new file mode 100644
index 0000000..c310578
--- /dev/null
+++ b/Demo/Runtime/MainForm.pas
@@ -0,0 +1,330 @@
+{ ****************************************************************************** }
+{ }
+{ Delphi Google Map Viewer Demo }
+{ }
+{ Copyright (c) 2021-2024 (Ethea S.r.l.) }
+{ Author: Carlo Barazzetta }
+{ Contributors: }
+{ littleearth (https://github.com/littleearth) }
+{ chaupero (https://github.com/chaupero) }
+{ }
+{ https://github.com/EtheaDev/DelphiGoogleMap }
+{ }
+{ ****************************************************************************** }
+{ }
+{ Licensed under the Apache License, Version 2.0 (the "License"); }
+{ you may not use this file except in compliance with the License. }
+{ You may obtain a copy of the License at }
+{ }
+{ http://www.apache.org/licenses/LICENSE-2.0 }
+{ }
+{ Unless required by applicable law or agreed to in writing, software }
+{ distributed under the License is distributed on an "AS IS" BASIS, }
+{ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. }
+{ See the License for the specific language governing permissions and }
+{ limitations under the License. }
+{ }
+{ ****************************************************************************** }
+unit MainForm;
+
+interface
+
+uses
+  WebView2, System.SysUtils, Winapi.ActiveX, Vcl.Forms,
+  Vcl.GoogleMap, Vcl.Edge, Data.DB, Datasnap.DBClient, Vcl.Menus, Vcl.ExtCtrls,
+  Vcl.DBCtrls, Vcl.Grids, Vcl.DBGrids, Vcl.StdCtrls, Vcl.Samples.Spin,
+  Vcl.Controls, System.Classes, Vcl.Mask, Vcl.ComCtrls, Vcl.Buttons;
+
+type
+  TformMain = class(TForm)
+    PanelHeader: TPanel;
+    PopupMenu: TPopupMenu;
+    gbMapAttributes: TGroupBox;
+    lbZoom: TLabel;
+    Zoom: TSpinEdit;
+    Label5: TLabel;
+    GroupBox1: TGroupBox;
+    MemoAddress: TMemo;
+    ButtonGotoLocation: TButton;
+    Longitude: TEdit;
+    LabelLongitude: TLabel;
+    LabelAddress: TLabel;
+    ButtonGotoAddress: TButton;
+    LabelLatitude: TLabel;
+    Latitude: TEdit;
+    MapTypeIdComboBox: TComboBox;
+    cbCenterOnClick: TCheckBox;
+    mapControlGroupBox: TGroupBox;
+    CheckBoxTraffic: TCheckBox;
+    CheckBoxBicycling: TCheckBox;
+    CheckBoxStreeView: TCheckBox;
+    CheckBoxFullScreen: TCheckBox;
+    CheckBoxZoom: TCheckBox;
+    CheckBoxMapType: TCheckBox;
+    BottomPanel: TPanel;
+    ShowPrintUIButton: TButton;
+    ShowMapButton: TButton;
+    HideMapButton: TButton;
+    procedure FormCreate(Sender: TObject);
+    procedure ButtonGotoAddressClick(Sender: TObject);
+    procedure ButtonGotoLocationClick(Sender: TObject);
+    procedure CheckBoxTrafficClick(Sender: TObject);
+    procedure CheckBoxBicyclingClick(Sender: TObject);
+    procedure CheckBoxStreeViewClick(Sender: TObject);
+    procedure ButtonClearMarkersClick(Sender: TObject);
+    procedure ZoomChange(Sender: TObject);
+    procedure ShowPrintUIButtonClick(Sender: TObject);
+    procedure ShowMapButtonClick(Sender: TObject);
+    procedure HideMapButtonClick(Sender: TObject);
+    procedure MapTypeIdComboBoxChange(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure EdgeGoogleMapViewerBeforeShowMap(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure mnuAddMarkerClick(Sender: TObject);
+    procedure CheckBoxFullScreenClick(Sender: TObject);
+    procedure CheckBoxZoomClick(Sender: TObject);
+    procedure EdgeGoogleMapViewerContainsFullScreenElementChanged(
+      Sender: TCustomEdgeBrowser;
+      ContainsFullScreenElement: Boolean);
+    procedure CheckBoxMapTypeClick(Sender: TObject);
+    procedure btnClearCirclesClick(Sender: TObject);
+    procedure btnClearPolylinesClick(Sender: TObject);
+    procedure btnClearPolygonsClick(Sender: TObject);
+    procedure EdgeGoogleMapViewerViewerReadyWait(ASender : TObject; var AWait : boolean);
+  private
+    EdgeGoogleMapViewer: TEdgeGoogleMapViewer;
+    FRighClickLatLng: TLatLng;
+    procedure OnMapClick(
+      ASender: TObject;
+      ALatLng: TLatLng);
+    procedure OnMapRightClick(
+      ASender: TObject;
+      ALatLng: TLatLng);
+    procedure OnMapZoom(
+      ASender: TObject;
+      AZoom: integer);
+  public
+    { Public declarations }
+  end;
+
+var
+  formMain: TformMain;
+
+implementation
+
+uses
+  System.IOUtils, Vcl.Dialogs, System.UITypes;
+
+{$R *.dfm}
+
+function B2S(value: Boolean): string;
+begin
+  if value then
+    Result := 'true'
+  else
+    Result := 'false';
+end;
+
+procedure TformMain.FormCreate(Sender: TObject);
+begin
+  EdgeGoogleMapViewer := TEdgeGoogleMapViewer.Create(Self);
+  EdgeGoogleMapViewer.Parent := Self;
+  EdgeGoogleMapViewer.Align := alClient;
+  EdgeGoogleMapViewer.OnContainsFullScreenElementChanged :=
+    EdgeGoogleMapViewerContainsFullScreenElementChanged;
+  EdgeGoogleMapViewer.BeforeShowMap := EdgeGoogleMapViewerBeforeShowMap;
+  EdgeGoogleMapViewer.OnViewerReadyWait := EdgeGoogleMapViewerViewerReadyWait;
+
+  Zoom.value := EdgeGoogleMapViewer.MapZoom;
+
+  EdgeGoogleMapViewer.MapAddress := 'Via Santa Cecilia 4, Carugate, Milano';
+  EdgeGoogleMapViewer.MapLatitude := 25.767314;
+  EdgeGoogleMapViewer.MapLongitude := -80.135694;
+
+  // Init checkboxes based on Component Proprerties
+  CheckBoxTraffic.Checked := EdgeGoogleMapViewer.MapShowTrafficLayer;
+  CheckBoxBicycling.Checked := EdgeGoogleMapViewer.MapShowBicyclingLayer;
+  CheckBoxStreeView.Checked := EdgeGoogleMapViewer.MapShowStreetViewControl;
+  CheckBoxFullScreen.Checked := EdgeGoogleMapViewer.MapShowFullScreenControl;
+  CheckBoxZoom.Checked := EdgeGoogleMapViewer.MapShowZoomControl;
+  CheckBoxMapType.Checked := EdgeGoogleMapViewer.MapShowTypeControl;
+
+  MemoAddress.Lines.Text := EdgeGoogleMapViewer.MapAddress;
+  Latitude.Text := TEdgeGoogleMapViewer.CoordToText
+    (EdgeGoogleMapViewer.MapLatitude);
+  Longitude.Text := TEdgeGoogleMapViewer.CoordToText
+    (EdgeGoogleMapViewer.MapLongitude);
+  MapTypeIdComboBox.ItemIndex := Ord(EdgeGoogleMapViewer.MapTypeId);
+  EdgeGoogleMapViewer.OnMapClick := OnMapClick;
+  EdgeGoogleMapViewer.OnMapRightClick := OnMapRightClick;
+  EdgeGoogleMapViewer.OnMapZoom := OnMapZoom;
+end;
+
+procedure TformMain.OnMapClick(
+  ASender: TObject;
+  ALatLng: TLatLng);
+begin
+  if cbCenterOnClick.Checked then
+  begin
+    EdgeGoogleMapViewer.GotoLocation(ALatLng, False)
+  end;
+end;
+
+procedure TformMain.OnMapRightClick(
+  ASender: TObject;
+  ALatLng: TLatLng);
+begin
+  FRighClickLatLng.Latitude := ALatLng.Latitude;
+  FRighClickLatLng.Longitude := ALatLng.Longitude;
+  PopupMenu.Popup(Mouse.CursorPos.X, Mouse.CursorPos.Y);
+end;
+
+procedure TformMain.OnMapZoom(
+  ASender: TObject;
+  AZoom: integer);
+begin
+  Zoom.value := AZoom;
+end;
+
+procedure TformMain.FormDestroy(Sender: TObject);
+begin
+  activeoleControl := nil;
+end;
+
+procedure TformMain.FormShow(Sender: TObject);
+begin
+  ButtonGotoAddressClick(Sender);
+end;
+
+procedure TformMain.HideMapButtonClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.HideMap;
+end;
+
+procedure TformMain.MapTypeIdComboBoxChange(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.MapTypeId :=
+    TGoogleMapTypeId(MapTypeIdComboBox.ItemIndex);
+end;
+
+procedure TformMain.mnuAddMarkerClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.PutMarker(FRighClickLatLng,
+    'Added from right click menu');
+end;
+
+procedure TformMain.ShowPrintUIButtonClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.ShowPrintUI;
+end;
+
+procedure TformMain.ShowMapButtonClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.GotoAddress(MemoAddress.Lines.Text);
+end;
+
+procedure TformMain.ZoomChange(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.MapZoom := Zoom.value;
+end;
+
+procedure TformMain.ButtonGotoLocationClick(Sender: TObject);
+var
+  Location: TLatLng;
+begin
+  Location.Latitude := TEdgeGoogleMapViewer.TextToCoord(Latitude.Text);
+  Location.Longitude := TEdgeGoogleMapViewer.TextToCoord(Longitude.Text);
+  EdgeGoogleMapViewer.GotoLocation(Location);
+end;
+
+procedure TformMain.CheckBoxFullScreenClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.MapShowFullScreenControl := CheckBoxFullScreen.Checked;
+end;
+
+procedure TformMain.CheckBoxMapTypeClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.MapShowTypeControl := CheckBoxMapType.Checked;
+end;
+
+procedure TformMain.CheckBoxZoomClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.MapShowZoomControl := CheckBoxZoom.Checked;
+end;
+
+procedure TformMain.btnClearCirclesClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.ClearCircles;
+end;
+
+procedure TformMain.btnClearPolygonsClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.ClearPolygons;
+end;
+
+procedure TformMain.btnClearPolylinesClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.ClearPolylines;
+end;
+
+procedure TformMain.ButtonClearMarkersClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.ClearMarkers;
+end;
+
+procedure TformMain.ButtonGotoAddressClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.GotoAddress(MemoAddress.Lines.Text);
+end;
+
+procedure TformMain.CheckBoxStreeViewClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.ShowStreetViewControl(CheckBoxStreeView.Checked);
+end;
+
+procedure TformMain.CheckBoxBicyclingClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.ShowBicycling(CheckBoxBicycling.Checked);
+end;
+
+procedure TformMain.CheckBoxTrafficClick(Sender: TObject);
+begin
+  EdgeGoogleMapViewer.ShowTraffic(CheckBoxTraffic.Checked);
+end;
+
+procedure TformMain.EdgeGoogleMapViewerBeforeShowMap(Sender: TObject);
+begin
+  if TEdgeGoogleMapViewer.ApiKey = '' then
+  begin
+    MessageDlg
+      ('Error: you must put your Google API Key into TEdgeGoogleMapViewer: change initialization section!',
+      TMsgDlgType.mtError, [TMsgDlgBtn.mbOK], 0);
+  end;
+end;
+
+procedure TformMain.EdgeGoogleMapViewerContainsFullScreenElementChanged(
+  Sender: TCustomEdgeBrowser;
+  ContainsFullScreenElement: Boolean);
+begin
+  PanelHeader.Visible := not ContainsFullScreenElement;
+  BottomPanel.Visible := not ContainsFullScreenElement;
+end;
+
+procedure TformMain.EdgeGoogleMapViewerViewerReadyWait(ASender: TObject;
+  var AWait: boolean);
+begin
+ AWait := MessageDlg('Edge browser is not ready, continue to wait.',TMsgDlgType.mtCustom,[TMsgDlgBtn.mbYes,TMsgDlgBtn.mbNo],0) = mrYes;
+end;
+
+initialization
+
+// Setup UserDataFolder for Temp files
+TEdgeGoogleMapViewer.RegisterUserDataFolder(System.IOUtils.TPath.GetTempPath +
+  ExtractFileName(ParamStr(0)));
+// If you have a Google API Key it's time to setup
+// TEdgeGoogleMapViewer.RegisterGoogleMapsApiKey('xyz');
+
+{$WARN SYMBOL_PLATFORM OFF}
+ReportMemoryLeaksOnShutdown := DebugHook <> 0;
+
+end.
diff --git a/Source/Vcl.GoogleMap.pas b/Source/Vcl.GoogleMap.pas
index 691111c..0b2d75e 100644
--- a/Source/Vcl.GoogleMap.pas
+++ b/Source/Vcl.GoogleMap.pas
@@ -96,6 +96,7 @@   TLatLng = record
   TEdgeGoogleMapViewJavascript = procedure(ASender : TObject; var AJavascript : string) of object;
   TEdgeGoogleMapViewMapClick = procedure(ASender : TObject;  ALatLng : TLatLng) of object;
   TEdgeGoogleMapViewZoomChanged = procedure(ASender : TObject;  AZoom : integer) of object;
+  TEdgeGoogleMapViewerReadyWait =procedure(ASender : TObject; var AWait : boolean) of object;
 
   { TEdgeGoogleMapViewer }
   [ComponentPlatforms(pidWin32 or pidWin64)]
@@ -105,6 +106,7 @@   TEdgeGoogleMapViewer = class(TCustomEdgeBrowser)
     class var FUserDataFolder: string;
   private
     FMapIsBusy: boolean;
+    FInitComplete : boolean;
     FViewerReady: boolean;
     FAddress: string;
     FOverviewMapControl: boolean;
@@ -137,7 +139,7 @@   TEdgeGoogleMapViewer = class(TCustomEdgeBrowser)
     FOnMapClick: TEdgeGoogleMapViewMapClick;
     FOnMapRightClick: TEdgeGoogleMapViewMapClick;
     FOnMapZoom: TEdgeGoogleMapViewZoomChanged;
-
+    FOnViewerReadyWait: TEdgeGoogleMapViewerReadyWait;
     //variables for result functions
     FDistance: Variant;
 
@@ -185,6 +187,8 @@   TEdgeGoogleMapViewer = class(TCustomEdgeBrowser)
     procedure SetOnMapClick(const Value: TEdgeGoogleMapViewMapClick);
     procedure SetOnMapRightClick(const Value: TEdgeGoogleMapViewMapClick);
     procedure SetOnMapZoom(const Value: TEdgeGoogleMapViewZoomChanged);
+    procedure WaitUntilInitialized;
+    procedure SetOnViewerReadyWait(const Value: TEdgeGoogleMapViewerReadyWait);
   protected
     procedure Loaded; override;
     procedure ShowMap(AMapCenter: TLatLng; const AAddress: string = ''); overload;
@@ -338,6 +342,7 @@   TEdgeGoogleMapViewer = class(TCustomEdgeBrowser)
     property OnMapClick : TEdgeGoogleMapViewMapClick read FOnMapClick write SetOnMapClick;
     property OnMapRightClick : TEdgeGoogleMapViewMapClick read FOnMapRightClick write SetOnMapRightClick;
     property OnMapZoom : TEdgeGoogleMapViewZoomChanged read FOnMapZoom write SetOnMapZoom;
+    property OnViewerReadyWait : TEdgeGoogleMapViewerReadyWait read FOnViewerReadyWait write SetOnViewerReadyWait;
   end;
 
 implementation
@@ -492,6 +497,7 @@ constructor TEdgeGoogleMapViewer.Create(AOwner: TComponent);
   Self.UserDataFolder := FUserDataFolder;
   if WebViewCreated then
     DefaultScriptDialogsEnabled := False;
+  FInitComplete := false;
   FMapVisible := false;
   FPanControl := true;
   FZoomControl := true;
@@ -871,7 +877,33 @@ function TEdgeGoogleMapViewer.GetHTMLScript : string;
 end;
 
 
+procedure TEdgeGoogleMapViewer.WaitUntilInitialized;
+var
+  LLoop: integer;
+  LWait : boolean;
+begin
+  Sleep(1000);
+  LLoop := 0;
+  while (not FViewerReady) and (LLoop < 1000) do
+  begin
+    sleep(10);
+    Application.ProcessMessages;
+    Inc(LLoop);
+  end;
 
+  if not FViewerReady then
+  begin
+     LWait := False;
+     if Assigned(FOnViewerReadyWait) then
+     begin
+      FOnViewerReadyWait(Self,LWait)
+     end;
+     if LWait then
+     begin
+        WaitUntilInitialized;
+     end;
+  end;
+end;
 
 procedure TEdgeGoogleMapViewer.ShowMap(AMapCenter: TLatLng; const AAddress: string = '');
 var
@@ -882,11 +914,10 @@ procedure TEdgeGoogleMapViewer.ShowMap(AMapCenter: TLatLng; const AAddress: stri
   if csDesigning in ComponentState then
     Exit;
 
-  while not FViewerReady do
-  begin
-    application.ProcessMessages;
-    Sleep(10);
-  end;
+  if not FInitComplete then
+    InitMap;
+
+  WaitUntilInitialized;
 
   if Assigned(FBeforeShowMap) then
     FBeforeShowMap(Self);
@@ -1064,6 +1095,7 @@ procedure TEdgeGoogleMapViewer.InitMap;
 
   Self.UserDataFolder := FUserDataFolder;
   Self.Navigate(ABOUT_BLANK_PAGE);
+  FInitComplete := True;
 end;
 
 procedure TEdgeGoogleMapViewer.Loaded;
@@ -1226,6 +1258,12 @@ procedure TEdgeGoogleMapViewer.SetOnMapZoom(
   FOnMapZoom := Value;
 end;
 
+procedure TEdgeGoogleMapViewer.SetOnViewerReadyWait(
+  const Value: TEdgeGoogleMapViewerReadyWait);
+begin
+  FOnViewerReadyWait := Value;
+end;
+
 procedure TEdgeGoogleMapViewer.SetOnWebUnhandledMessageReceived(
   const Value: TWebMessageReceivedEvent);
 begin