pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

LazMapViewer: Disable creating the cache directory at designtime. Partial sync with main full_demo project.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8840 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2023-06-20 10:45:59 +00:00
parent 839adfaf80
commit 71a45035c5
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/lazmapviewer/examples/fulldemo_with_addons/main.pas
View File

@ -151,7 +151,6 @@ type
const
MAX_LOCATIONS_HISTORY = 50;
HOMEDIR = '../../../../../'; // share the cache in both fulldemo projects
MAP_PROVIDER_FILENAME = 'map-providers.xml';
USE_DMS = true;
@ -409,6 +408,8 @@ end;
procedure TMainForm.FormCreate(Sender: TObject);
var
fn: String;
homeDir: String;
cacheDir: String;
begin
cInputQueryEditSizePercents := 0;
@ -424,8 +425,14 @@ begin
POIImage.LoadFromFile(fn);
end;
ForceDirectories(HOMEDIR + 'cache/');
MapView.CachePath := HOMEDIR + 'cache/';
homeDir := Application.Location + '../../../'; // this should be the "examples" folder
cacheDir := homeDir + 'cache/';
if not ForceDirectories(cacheDir) then
begin
cacheDir := GetAppConfigDir(false) + 'cache/';
ForceDirectories(cacheDir);
end;
MapView.CachePath := cacheDir;
MapView.GetMapProviders(CbProviders.Items);
CbProviders.ItemIndex := CbProviders.Items.IndexOf(MapView.MapProvider);
MapView.DoubleBuffered := true;
@ -593,9 +600,11 @@ begin
HERE_AppID := ini.ReadString('HERE', 'APP_ID', '');
HERE_AppCode := ini.ReadString('HERE', 'APP_CODE', '');
OpenWeatherMap_ApiKey := ini.ReadString('OpenWeatherMap', 'API_Key', '');
ThunderForest_ApiKey := ini.ReadString('ThunderForest', 'API_Key', '');
if ((HERE_AppID <> '') and (HERE_AppCode <> '')) or
(OpenWeatherMap_ApiKey <> '') then
(OpenWeatherMap_ApiKey <> '') or
(ThunderForest_ApiKey <> '') then
begin
MapView.Engine.ClearMapProviders;
MapView.Engine.RegisterProviders;
@ -766,6 +775,9 @@ begin
if OpenWeatherMap_ApiKey <> '' then
ini.WriteString('OpenWeatherMap', 'API_Key', OpenWeatherMap_ApiKey);
if ThunderForest_ApiKey <> '' then
ini.WriteString('ThunderForest', 'API_Key', ThunderForest_ApiKey);
ini.EraseSection('Locations');
for i := 0 to CbLocations.Items.Count-1 do
ini.WriteString('Locations', 'Item'+IntToStr(i), CbLocations.Items[i]);