paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LazMapViewer: Rename map provider "OpenStreetMap Mapnik" to "OpenStreetMap Standard", issue #39098. Adjust sample projects to the new provider name.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9607 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2025-01-28 10:21:55 +00:00
parent 5c33ac9769
commit 46e39361c5
24 changed files with 94 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/lazmapviewer/examples/colored_tracks/main.lfm
View File

@ -18,7 +18,7 @@ object MainForm: TMainForm
DrawingEngine = MapView.BuiltInDE
Layers = <>
Font.Color = clBlack
MapProvider = 'OpenStreetMap Mapnik'
MapProvider = 'OpenStreetMap Standard'
OnZoomChange = MapViewZoomChange
end
object ParamsPanel: TPanel
@ -114,12 +114,12 @@ object MainForm: TMainForm
ItemHeight = 15
ItemIndex = 0
Items.Strings = (
'OpenStreetMap Mapnik'
'OpenStreetMap Standard'
'Open Topo Map'
)
Style = csDropDownList
TabOrder = 3
Text = 'OpenStreetMap Mapnik'
Text = 'OpenStreetMap Standard'
OnChange = cbProvidersChange
end
object lblProviders: TLabel

44
components/lazmapviewer/examples/flights/main.lfm
View File

@ -39,17 +39,23 @@ object MainForm: TMainForm
Caption = 'Chicago O''Hare Intl'
Longitude = -87.9081497
Latitude = 41.9769403
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 1
end
item
Caption = 'Shanghai Pudong Int''l'
Longitude = 121.792367
Latitude = 31.142797
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 0
end
item
Caption = 'CSN436'
Visible = False
ImageAnchorX = 0.5
ImageAnchorY = 1
end>
Areas = <>
Tracks = <
@ -5860,16 +5866,22 @@ object MainForm: TMainForm
Visible = False
Longitude = -87.9081497
Latitude = 41.9769403
ImageAnchorX = 0.5
ImageAnchorY = 1
end
item
Caption = 'Minneapolis/St Paul Intl'
Longitude = -93.2217778
Latitude = 44.8819722
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 0
end
item
Caption = 'UAL3755'
Visible = False
ImageAnchorX = 0.5
ImageAnchorY = 1
end>
Areas = <>
Tracks = <
@ -6883,6 +6895,8 @@ object MainForm: TMainForm
Caption = 'John F Kennedy Intl'
Longitude = -73.7786922
Latitude = 40.6399281
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 1
end
item
@ -6890,11 +6904,15 @@ object MainForm: TMainForm
Visible = False
Longitude = -118.4080486
Latitude = 33.9424964
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 0
end
item
Caption = 'DAL773'
Visible = False
ImageAnchorX = 0.5
ImageAnchorY = 1
end>
Areas = <>
Tracks = <
@ -11409,15 +11427,21 @@ object MainForm: TMainForm
Visible = False
Longitude = -73.7786922
Latitude = 40.6399281
ImageAnchorX = 0.5
ImageAnchorY = 1
end
item
Caption = 'Orlando Intl'
Longitude = -81.309
Latitude = 28.4293889
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 0
end
item
Caption = 'DAL2049'
ImageAnchorX = 0.5
ImageAnchorY = 1
end>
Areas = <>
Tracks = <
@ -13649,16 +13673,22 @@ object MainForm: TMainForm
Caption = 'Houston Bush Int''ctl'
Longitude = -95.3414425
Latitude = 29.9844353
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 1
end
item
Caption = 'Frankfurt Int''l'
Longitude = 8.543125
Latitude = 50.026421
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 0
end
item
Caption = 'DLH441'
ImageAnchorX = 0.5
ImageAnchorY = 1
end>
Areas = <>
Tracks = <
@ -19138,16 +19168,22 @@ object MainForm: TMainForm
Caption = 'Comodoro Arturo Merino Benitez Int'
Longitude = -70.785803
Latitude = -33.392975
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 1
end
item
Caption = 'Sydney'
Longitude = 151.177222
Latitude = -33.946111
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 0
end
item
Caption = 'QFA28'
ImageAnchorX = 0.5
ImageAnchorY = 1
end>
Areas = <>
Tracks = <
@ -21618,16 +21654,22 @@ object MainForm: TMainForm
Caption = 'Melbourne Tullamarine'
Longitude = 144.843333
Latitude = -37.673333
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 1
end
item
Caption = 'Los Angeles Intl'
Longitude = -118.4080486
Latitude = 33.9424964
ImageAnchorX = 0.5
ImageAnchorY = 1
ImageIndex = 0
end
item
Caption = 'QFA95'
ImageAnchorX = 0.5
ImageAnchorY = 1
end>
Areas = <>
Tracks = <
@ -27828,7 +27870,7 @@ object MainForm: TMainForm
end>
Font.Color = clBlack
InactiveColor = clSkyBlue
MapProvider = 'OpenStreetMap Mapnik'
MapProvider = 'OpenStreetMap Standard'
MapCenter.Longitude = -87.9081388888889
MapCenter.Latitude = 41.9769444444444
POIImage.Data = {

9
components/lazmapviewer/examples/fulldemo/main.lfm
View File

@ -25,12 +25,11 @@ object MainForm: TMainForm
DrawingEngine = MapView.BuiltInDE
Layers = <>
Font.Color = clBlack
MapProvider = 'OpenStreetMap Mapnik'
MapProvider = 'OpenStreetMap Standard'
POIImages = POIImages
UseThreads = True
ZoomToCursor = False
OnZoomChange = MapViewZoomChange
OnChange = MapViewChange
OnZoomChange = MapViewZoomChange
OnMouseLeave = MapViewMouseLeave
OnMouseMove = MapViewMouseMove
OnMouseUp = MapViewMouseUp
@ -632,7 +631,7 @@ object MainForm: TMainForm
MinSize = 8
MaxSize = 166
Title.Caption = 'Provider'
Width = 166
Width = 154
end>
Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll, goRowHighlight]
RowCount = 11
@ -643,7 +642,7 @@ object MainForm: TMainForm
ColWidths = (
30
54
166
154
)
Cells = (
11

8
components/lazmapviewer/examples/fulldemo/mapviewer_demo.lpi
View File

@ -39,7 +39,7 @@
<PackageName Value="LCL"/>
</Item3>
</RequiredPackages>
<Units Count="7">
<Units Count="6">
<Unit0>
<Filename Value="mapviewer_demo.lpr"/>
<IsPartOfProject Value="True"/>
@ -72,17 +72,13 @@
<ResourceBaseClass Value="Form"/>
</Unit4>
<Unit5>
<Filename Value="..\..\source\mvengine_mapreg.inc"/>
<IsPartOfProject Value="True"/>
</Unit5>
<Unit6>
<Filename Value="configframe.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="CfgFrame"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Frame"/>
<UnitName Value="ConfigFrame"/>
</Unit6>
</Unit5>
</Units>
</ProjectOptions>
<CompilerOptions>

2
components/lazmapviewer/examples/gpstilelayer_demo/main.pas
View File

@ -39,7 +39,7 @@ var
layer: TGPSTileLayer;
begin
// Prepare the MapView
MapView.MapProvider := 'OpenStreetMap Mapnik';
MapView.MapProvider := 'OpenStreetMap Standard';
MapView.Zoom := 5;
MapView.MapCenter.Longitude := 10;
MapView.MapCenter.Latitude := 49;

5
components/lazmapviewer/examples/plugin_demos/areaselection_demo/main.lfm
View File

@ -6,21 +6,20 @@ object Form1: TForm1
Caption = 'Form1'
ClientHeight = 323
ClientWidth = 429
LCLVersion = '4.99.0.0'
OnCreate = FormCreate
LCLVersion = '3.6.0.0'
object MapView1: TMapView
Left = 0
Height = 288
Top = 0
Width = 429
Active = True
Align = alClient
Cyclic = True
DownloadEngine = MapView1.BuiltInDLE
DrawingEngine = MapView1.BuiltInDE
Layers = <>
Font.Color = clBlack
MapProvider = 'OpenStreetMap Mapnik'
MapProvider = 'OpenStreetMap Standard'
PluginManager = MvPluginManager1
end
object Panel1: TPanel

1
components/lazmapviewer/examples/plugin_demos/areaselection_demo/main.pas
View File

@ -38,6 +38,7 @@ implementation
{ TForm1 }
procedure TForm1.FormCreate(Sender: TObject);
begin
MapView1.Active := true;
FAreaSelectionPlugin := TAreaSelectionPlugin.Create(MvPluginManager1);
FAreaSelectionPlugin.MapView := MapView1;
FAreaSelectionPlugin.OnSelectedAreaChanged:= @OnSelectedAreaChanged;

2
components/lazmapviewer/examples/plugin_demos/legalnotice_demo/main.pas
View File

@ -61,7 +61,7 @@ begin
FMapView1 := TMapView.Create(self);
FMapView1.Align := alClient;
FMapView1.Parent := LeftPanel;
FMapView1.MapProvider := 'OpenStreetMap Mapnik';
FMapView1.MapProvider := 'OpenStreetMap Standard';
FMapView1.UseThreads := true;
FMapView1.Zoom := 9;
FMapView1.MapCenter.Longitude := 11;

4
components/lazmapviewer/examples/plugin_demos/linkedmaps_demo/main.lfm
View File

@ -35,7 +35,7 @@ object MainForm: TMainForm
DrawingEngine = MapView1.BuiltInDE
Layers = <>
Font.Color = clBlack
MapProvider = 'OpenStreetMap Mapnik'
MapProvider = 'OpenStreetMap Standard'
PluginManager = PluginManager
ZoomToCursor = False
OnZoomChange = MapView1ZoomChange
@ -93,7 +93,7 @@ object MainForm: TMainForm
Align = alBottom
Alignment = taCenter
BorderSpacing.Around = 8
Caption = 'Zoom or move one map, and the other map will follow.'
Caption = 'Zoom or drag one map, and the other map will follow.'
end
object PluginManager: TMvPluginManager
Left = 424

3
components/lazmapviewer/examples/plugin_demos/mousepaintorder_demo/main.lfm
View File

@ -13,13 +13,12 @@ object Form1: TForm1
Height = 297
Top = 0
Width = 429
Active = True
Align = alClient
DownloadEngine = MapView1.BuiltInDLE
DrawingEngine = MapView1.BuiltInDE
Layers = <>
Font.Color = clBlack
MapProvider = 'OpenStreetMap Mapnik'
MapProvider = 'OpenStreetMap Standard'
PluginManager = MvPluginManager1
end
object Panel1: TPanel

2
components/lazmapviewer/examples/plugin_demos/mousepaintorder_demo/main.pas
View File

@ -41,6 +41,8 @@ var
lDragColoredItemPlugin : TDragColoredItemPlugin;
i: Integer;
begin
MapView1.Active := true;
for i := 0 to High(PluginColors) do
begin
lDragColoredItemPlugin := TDragColoredItemPlugin.Create(Self);

3
components/lazmapviewer/examples/plugin_demos/reorderplugins_demo/main.lfm
View File

@ -13,13 +13,12 @@ object Form1: TForm1
Height = 372
Top = 0
Width = 482
Active = True
Align = alClient
DownloadEngine = MapView1.BuiltInDLE
DrawingEngine = MapView1.BuiltInDE
Layers = <>
Font.Color = clBlack
MapProvider = 'OpenStreetMap Mapnik'
MapProvider = 'OpenStreetMap Standard'
PluginManager = MvPluginManager1
end
object Panel1: TPanel

1
components/lazmapviewer/examples/plugin_demos/reorderplugins_demo/main.pas
View File

@ -68,6 +68,7 @@ procedure TForm1.FormCreate(Sender: TObject);
var
i: Integer;
begin
MapView1.Active := true;
Combobox1.Items.Clear;
for i := 0 to MvPluginManager1.PluginList.Count-1 do
Combobox1.Items.Add(TLegalNoticePlugin(MvPluginManager1.PluginList[i]).LegalNotice);

2
components/lazmapviewer/examples/plugin_demos/spreadmarker_demo/main.lfm
View File

@ -19,7 +19,7 @@ object MainForm: TMainForm
DrawingEngine = MapView.BuiltInDE
Layers = <>
Font.Color = clBlack
MapProvider = 'OpenStreetMap Mapnik'
MapProvider = 'OpenStreetMap Standard'
PluginManager = PluginManager
end
object Panel1: TPanel

2
components/lazmapviewer/examples/plugin_demos/userdefined_demo/main.lfm
View File

@ -18,7 +18,7 @@ object MainForm: TMainForm
DrawingEngine = MapView.BuiltInDE
Layers = <>
Font.Color = clBlack
MapProvider = 'OpenStreetMap Mapnik'
MapProvider = 'OpenStreetMap Standard'
PluginManager = PluginManager
end
object InfoPanel: TPanel

1
components/lazmapviewer/examples/point_of_interest_markers/main.lfm
View File

@ -13,7 +13,6 @@ object MainForm: TMainForm
Height = 400
Top = 0
Width = 865
Active = True
Align = alClient
Cyclic = True
DownloadEngine = MapView.BuiltInDLE

1
components/lazmapviewer/examples/point_of_interest_markers/main.pas
View File

@ -36,6 +36,7 @@ var
L: TMapLayer;
P: TMapPointOfInterest;
begin
MapView.Active := true;
L := MapView.Layers.Add as TMapLayer;
P := L.PointsOfInterest.Add as TMapPointOfInterest;

1
components/lazmapviewer/examples/restricted_zoom_pan/RestrictedZoomPan_Demo.lpi
View File

@ -15,7 +15,6 @@
<XPManifest>
<DpiAware Value="True"/>
</XPManifest>
<Icon Value="0"/>
</General>
<BuildModes Count="1">
<Item1 Name="Default" Default="True"/>

4
components/lazmapviewer/examples/restricted_zoom_pan/main.lfm
View File

@ -13,15 +13,13 @@ object Form1: TForm1
Height = 511
Top = 69
Width = 686
Active = True
Align = alClient
Cyclic = True
DebugTiles = True
DownloadEngine = MapView1.BuiltInDLE
DrawingEngine = MapView1.BuiltInDE
Layers = <>
Font.Color = clBlack
MapProvider = 'Google Maps'
MapProvider = 'OpenStreetMap Standard'
OnChange = MapView1Change
end
object StatusBar1: TStatusBar

1
components/lazmapviewer/examples/restricted_zoom_pan/main.pas
View File

@ -40,6 +40,7 @@ implementation
procedure TForm1.FormCreate(Sender: TObject);
begin
MapView1.Active := true;
rgCenterClick(nil);
MapView1Change(nil);
end;

7
components/lazmapviewer/lazmapviewerpkg.lpk
View File

@ -7,6 +7,7 @@
<CompilerOptions>
<Version Value="11"/>
<SearchPaths>
<IncludeFiles Value="source"/>
<OtherUnitFiles Value="source;source/addons/plugins;source/addons/plugins/spreadmarkers;source/addons/plugins/grids;source/addons/plugins/scale"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
@ -22,7 +23,7 @@
FPC 3.2.0 or newer required."/>
<License Value="Modified LGPL with linking exception, like FreePascal RTL/FCL and Lazarus LCL"/>
<Version Minor="2" Release="7"/>
<Files Count="32">
<Files Count="33">
<Item1>
<Filename Value="source/mvcache.pas"/>
<UnitName Value="mvCache"/>
@ -152,6 +153,10 @@ FPC 3.2.0 or newer required."/>
<Filename Value="source/addons/plugins/scale/mvmapscaleplugin.pas"/>
<UnitName Value="mvMapScalePlugin"/>
</Item32>
<Item33>
<Filename Value="source/mvengine_mapreg.inc"/>
<Type Value="Include"/>
</Item33>
</Files>
<CompatibilityMode Value="True"/>
<RequiredPkgs Count="2">

6
components/lazmapviewer/source/mvengine.pas
View File

@ -165,6 +165,7 @@ type
function ScreenToLatLon(aPt: TPoint): TRealPoint;
function ScreenToLonLat(aPt: TPoint): TRealPoint; deprecated 'Use ScreenToLatLon';
procedure SetSize(aWidth, aHeight: integer);
function ValidProvider(const AProvider: String): Boolean;
function WorldScreenToLatLon(aPt: TPoint): TRealPoint;
function WorldScreenToLonLat(aPt: TPoint): TRealPoint; deprecated 'Use WorldScreenToLatLon';
procedure WriteProvidersToXML(AFileName: String);
@ -1457,6 +1458,11 @@ begin
end;
end;
function TMapViewerEngine.ValidProvider(const AProvider: String): Boolean;
begin
Result := lstProvider.IndexOf(AProvider) > -1;
end;
function TMapViewerEngine.WorldScreenToLatLon(aPt: TPoint): TRealPoint;
begin
aPt.X := aPt.X - MapWin.X;

2
components/lazmapviewer/source/mvengine_mapreg.inc
View File

@ -23,7 +23,7 @@ Some providers submitted by
}
// OpenStreetMap section
MapWin.MapProvider := AddMapProvider('OpenStreetMap Mapnik', ptEPSG3857, 'http://%serv%.tile.openstreetmap.org/%z%/%x%/%y%.png', 0, 19, 3, @GetSvrLetter);
MapWin.MapProvider := AddMapProvider('OpenStreetMap Standard', ptEPSG3857, 'http://%serv%.tile.openstreetmap.org/%z%/%x%/%y%.png', 0, 19, 3, @GetSvrLetter);
// OSM Wikipedia no longer available for services outside Wikimedia projects.
// AddMapProvider('OpenStreetMap Wikipedia', ptEPSG3857, 'https://maps.wikimedia.org/osm-intl/%z%/%x%/%y%.png', 0, 19, 3, @GetSvrLetter);
// OSM Sputnik is no longer available. Keeping it here for reference only...

12
components/lazmapviewer/source/mvmapviewer.pas
View File

@ -2530,9 +2530,21 @@ begin
end;
procedure TMapView.SetMapProvider(AValue: String);
var
msg: String;
begin
//if AValue = '' then
// raise EArgumentException.Create('Empty map provider is not allowed.');
if (AValue <> '') and not Engine.ValidProvider(AValue) then
begin
Active := false;
msg := Format('Map provider "%s" is not registered.', [AValue]);
if AValue = 'OpenStreetMap Mapnik' then
msg := msg + LineEnding + 'Use "OpenStreetMap Standard" instead.';
Application.MessageBox(PChar(msg), PChar('Error'));
exit;
end;
Engine.MapProvider := AValue;
if AValue = '' then
Active := False;