From f3098589fcdb36524919c5e65cf74a2d5db1a51f Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Wed, 1 May 2019 15:40:15 +0000 Subject: [PATCH] lazmapviewer: Fix download of HERE maps with fphttpclient. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6888 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../lazmapviewer/example/MapViewer_Demo.lpi | 9 ++-- components/lazmapviewer/example/main.lfm | 6 +-- components/lazmapviewer/example/main.pas | 3 +- components/lazmapviewer/source/mvengine.pas | 49 +++++++------------ 4 files changed, 24 insertions(+), 43 deletions(-) diff --git a/components/lazmapviewer/example/MapViewer_Demo.lpi b/components/lazmapviewer/example/MapViewer_Demo.lpi index d82e34e8e..cfca6c097 100644 --- a/components/lazmapviewer/example/MapViewer_Demo.lpi +++ b/components/lazmapviewer/example/MapViewer_Demo.lpi @@ -26,16 +26,13 @@ - + - + - - - - + diff --git a/components/lazmapviewer/example/main.lfm b/components/lazmapviewer/example/main.lfm index eee53c3a0..7cae215a7 100644 --- a/components/lazmapviewer/example/main.lfm +++ b/components/lazmapviewer/example/main.lfm @@ -617,7 +617,7 @@ object MainForm: TMainForm Align = alClient CacheOnDisk = True CachePath = 'cache/' - DownloadEngine = MVDESynapse1 + DownloadEngine = MapView.BuiltIn InactiveColor = clWhite MapProvider = 'OpenStreetMap Mapnik' UseThreads = True @@ -634,8 +634,4 @@ object MainForm: TMainForm left = 328 top = 224 end - object MVDESynapse1: TMVDESynapse - left = 347 - top = 131 - end end diff --git a/components/lazmapviewer/example/main.pas b/components/lazmapviewer/example/main.pas index 1b9fbca19..81f4ab4a5 100644 --- a/components/lazmapviewer/example/main.pas +++ b/components/lazmapviewer/example/main.pas @@ -7,7 +7,7 @@ interface uses Classes, SysUtils, Types, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, ComCtrls, Buttons, - mvGeoNames, mvMapViewer, mvTypes, mvGpsObj, mvDLESynapse; + mvGeoNames, mvMapViewer, mvTypes, mvGpsObj; type @@ -49,7 +49,6 @@ type ControlPanel: TPanel; BtnLoadMapProviders: TSpeedButton; BtnSaveMapProviders: TSpeedButton; - MVDESynapse1: TMVDESynapse; ZoomTrackBar: TTrackBar; procedure BtnGoToClick(Sender: TObject); procedure BtnSearchClick(Sender: TObject); diff --git a/components/lazmapviewer/source/mvengine.pas b/components/lazmapviewer/source/mvengine.pas index 5a4f52d30..d095d9cf7 100644 --- a/components/lazmapviewer/source/mvengine.pas +++ b/components/lazmapviewer/source/mvengine.pas @@ -846,6 +846,8 @@ begin end; procedure TMapViewerEngine.RegisterProviders; +var + HERE1, HERE2: String; begin // AddMapProvider('Aucun','',0,30, 0); ??? @@ -892,7 +894,7 @@ begin 'http://a%serv%.ortho.tiles.virtualearth.net/tiles/a%x%.jpg?g=72&shading=hill', 1, 19, 4, nil, @GetQuadKey); AddMapProvider('Virtual Earth Hybrid', - 'https://h%serv%.ortho.tiles.virtualearth.net/tiles/h%x%.jpg?g=72&shading=hill', + 'http://h%serv%.ortho.tiles.virtualearth.net/tiles/h%x%.jpg?g=72&shading=hill', 1, 19, 4, nil, @GetQuadKey); if (HERE_AppID <> '') and (HERE_AppCode <> '') then begin @@ -901,35 +903,22 @@ begin // Store the APP_ID and APP_CODE obtained after registration in the // ini file of the demo under key [HERE] as items APP_ID and APP_CODE and // restart the demo. - AddMapProvider('Here Maps', - 'https://%serv%.base.maps.api.here.com/maptile/2.1/maptile/newest/normal.day/%z%/%x%/%y%/256/png8' + - '?app_id=' + HERE_AppID + '&app_code=' + HERE_AppCode, - 1, 19, 4, nil); - AddMapProvider('Here Maps Grey', - 'https://%serv%.base.maps.api.here.com/maptile/2.1/maptile/newest/normal.day.grey/%z%/%x%/%y%/256/png8' + - '?app_id=' + HERE_AppID + '&app_code=' + HERE_AppCode, - 1, 19, 4, nil); - AddMapProvider('Here Maps Reduced', - 'https://%serv%.base.maps.api.here.com/maptile/2.1/maptile/newest/reduced.day/%z%/%x%/%y%/256/png8' + - '?app_id=' + HERE_AppID + '&app_code=' + HERE_AppCode, - 1, 19, 4, nil); - AddMapProvider('Here Maps Transit', - 'https://%serv%.base.maps.api.here.com/maptile/2.1/maptile/newest/normal.day.transit/%z%/%x%/%y%/256/png8' + - '?app_id=' + HERE_AppID + '&app_code=' + HERE_AppCode, - 1, 19, 4, nil); - AddMapProvider('Here POI Maps', - 'https://%serv%.base.maps.api.here.com/maptile/2.1/maptile/newest/normal.day/%z%/%x%/%y%/256/png8' + - '?app_id=' + HERE_AppID + '&app_code=' + HERE_AppCode + '&pois', - 1, 19, 4, nil); - AddMapProvider('Here Pedestrian Maps', - 'https://%serv%.base.maps.api.here.com/maptile/2.1/maptile/newest/pedestrian.day/%z%/%x%/%y%/256/png8'+ - '?app_id=' + HERE_AppID + '&app_code=' + HERE_AppCode, - 1, 19, 4, nil); -{ AddMapProvider('Here DreamWorks Maps', Format(url, ['normal.day']) + '&style=dreamworks', - 1, 19, 4, nil); - AddMapProvider('Here Pedestrian Maps', Format(url, ['pededrian.day']), - 1, 19, 4, nil); - } + HERE1 := 'http://%serv%.base.maps.api.here.com/maptile/2.1/maptile/newest/'; + HERE2 := '/%z%/%x%/%y%/256/png8?app_id=' + HERE_AppID + '&app_code=' + HERE_AppCode; + AddMapProvider('Here Maps', HERE1 + 'normal.day' + HERE2, + 1, 19, 4, @GetYahooSvr); + AddMapProvider('Here Maps Grey', HERE1 + 'normal.day.grey' + HERE2, + 1, 19, 4, @GetYahooSvr); + AddMapProvider('Here Maps Reduced', HERE1 + 'reduced.day' + HERE2, + 1, 19, 4, @GetYahooSvr); + AddMapProvider('Here Maps Transit', HERE1 + 'normal.day.transit' + HERE2, + 1, 19, 4, @GetYahooSvr); + AddMapProvider('Here POI Maps', HERE1 + 'normal.day' + HERE2 + '&pois', + 1, 19, 4, @GetYahooSvr); + AddMapProvider('Here Pedestrian Maps', HERE1 + 'pedestrian.day' + HERE2, + 1, 19, 4, @GetYahooSvr); + AddMapProvider('Here DreamWorks Maps', HERE1 + 'normal.day' + HERE2 + '&style=dreamworks', + 1, 19, 4, @GetYahooSvr); end; { The Ovi Maps (former Nokia maps) are no longer available.