LazMapViewer: Set version number 0.2.1. Change license to "LGPL 2 or later" instead of "GLP 2 or later" - see forum discussion https://forum.lazarus.freepascal.org/index.php/topic,34297.msg354142.html#msg354142.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7340 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-03-23 23:01:18 +00:00
parent daa694fc2e
commit 7c43c78f0c
7 changed files with 71 additions and 71 deletions

View File

@ -13,7 +13,7 @@
</SearchPaths> </SearchPaths>
</CompilerOptions> </CompilerOptions>
<Description Value="Add-on to LazMapViewer: Contains the drawing engine based on the BGRABitmap library."/> <Description Value="Add-on to LazMapViewer: Contains the drawing engine based on the BGRABitmap library."/>
<Version Minor="2"/> <Version Minor="2" Release="1"/>
<Files> <Files>
<Item> <Item>
<Filename Value="source\addons\bgra_drawingengine\mvde_bgra.pas"/> <Filename Value="source\addons\bgra_drawingengine\mvde_bgra.pas"/>

View File

@ -14,25 +14,25 @@
</SearchPaths> </SearchPaths>
</CompilerOptions> </CompilerOptions>
<Description Value="Add-on to LazMapViewer: Contains the drawing engine based on the RGBGraphics package."/> <Description Value="Add-on to LazMapViewer: Contains the drawing engine based on the RGBGraphics package."/>
<License Value="GPL2 or later"/> <License Value="LGPL 2 or later"/>
<Version Minor="2"/> <Version Minor="2" Release="1"/>
<Files Count="1"> <Files>
<Item1> <Item>
<Filename Value="source\addons\rgbgraphics_drawingengine\mvde_rgbgraphics.pas"/> <Filename Value="source\addons\rgbgraphics_drawingengine\mvde_rgbgraphics.pas"/>
<HasRegisterProc Value="True"/> <HasRegisterProc Value="True"/>
<UnitName Value="mvDE_RGBGraphics"/> <UnitName Value="mvDE_RGBGraphics"/>
</Item1> </Item>
</Files> </Files>
<RequiredPkgs Count="3"> <RequiredPkgs>
<Item1> <Item>
<PackageName Value="lazMapViewerPkg"/> <PackageName Value="lazMapViewerPkg"/>
</Item1> </Item>
<Item2> <Item>
<PackageName Value="rgb_graphics"/> <PackageName Value="rgb_graphics"/>
</Item2> </Item>
<Item3> <Item>
<PackageName Value="FCL"/> <PackageName Value="FCL"/>
</Item3> </Item>
</RequiredPkgs> </RequiredPkgs>
<UsageOptions> <UsageOptions>
<UnitPath Value="$(PkgOutDir)"/> <UnitPath Value="$(PkgOutDir)"/>

View File

@ -14,25 +14,25 @@
</SearchPaths> </SearchPaths>
</CompilerOptions> </CompilerOptions>
<Description Value="Add-on to LazMapViewer: Contains the download engine based on the Synapse library."/> <Description Value="Add-on to LazMapViewer: Contains the download engine based on the Synapse library."/>
<License Value="GPL2 or later"/> <License Value="LGPL 2 or later"/>
<Version Minor="2"/> <Version Minor="2" Release="1"/>
<Files Count="1"> <Files>
<Item1> <Item>
<Filename Value="source\addons\synapse_downloadengine\mvdlesynapse.pas"/> <Filename Value="source\addons\synapse_downloadengine\mvdlesynapse.pas"/>
<HasRegisterProc Value="True"/> <HasRegisterProc Value="True"/>
<UnitName Value="mvDLESynapse"/> <UnitName Value="mvDLESynapse"/>
</Item1> </Item>
</Files> </Files>
<RequiredPkgs Count="3"> <RequiredPkgs>
<Item1> <Item>
<PackageName Value="lazMapViewerPkg"/> <PackageName Value="lazMapViewerPkg"/>
</Item1> </Item>
<Item2> <Item>
<PackageName Value="laz_synapse"/> <PackageName Value="laz_synapse"/>
</Item2> </Item>
<Item3> <Item>
<PackageName Value="FCL"/> <PackageName Value="FCL"/>
</Item3> </Item>
</RequiredPkgs> </RequiredPkgs>
<UsageOptions> <UsageOptions>
<UnitPath Value="$(PkgOutDir)"/> <UnitPath Value="$(PkgOutDir)"/>

View File

@ -13,87 +13,87 @@
</CompilerOptions> </CompilerOptions>
<Description Value="Component for viewing maps (Google, OpenStreetMap, etc). <Description Value="Component for viewing maps (Google, OpenStreetMap, etc).
This is a fork of MapViewer by ti_dic (https://sourceforge.net/p/roadbook/code/ci/master/tree/mapviewer/) which itself is based on the MapViewer by Maciej Kaczkowski (https://github.com/maciejkaczkowski/mapviewer)."/> This is a fork of MapViewer by ti_dic (https://sourceforge.net/p/roadbook/code/ci/master/tree/mapviewer/) which itself is based on the MapViewer by Maciej Kaczkowski (https://github.com/maciejkaczkowski/mapviewer)."/>
<License Value="GPL2 or later"/> <License Value="LGPL 2 or later"/>
<Version Minor="2"/> <Version Minor="2" Release="1"/>
<Files Count="18"> <Files>
<Item1> <Item>
<Filename Value="source/mvcache.pas"/> <Filename Value="source/mvcache.pas"/>
<UnitName Value="mvCache"/> <UnitName Value="mvCache"/>
</Item1> </Item>
<Item2> <Item>
<Filename Value="source/mvdownloadengine.pas"/> <Filename Value="source/mvdownloadengine.pas"/>
<UnitName Value="mvDownloadEngine"/> <UnitName Value="mvDownloadEngine"/>
</Item2> </Item>
<Item3> <Item>
<Filename Value="source/mvdragobj.pas"/> <Filename Value="source/mvdragobj.pas"/>
<UnitName Value="mvDragObj"/> <UnitName Value="mvDragObj"/>
</Item3> </Item>
<Item4> <Item>
<Filename Value="source/mvengine.pas"/> <Filename Value="source/mvengine.pas"/>
<UnitName Value="mvEngine"/> <UnitName Value="mvEngine"/>
</Item4> </Item>
<Item5> <Item>
<Filename Value="source/mvgeonames.pas"/> <Filename Value="source/mvgeonames.pas"/>
<UnitName Value="mvGeoNames"/> <UnitName Value="mvGeoNames"/>
</Item5> </Item>
<Item6> <Item>
<Filename Value="source/mvgpsobj.pas"/> <Filename Value="source/mvgpsobj.pas"/>
<UnitName Value="mvGpsObj"/> <UnitName Value="mvGpsObj"/>
</Item6> </Item>
<Item7> <Item>
<Filename Value="source/mvjobqueue.pas"/> <Filename Value="source/mvjobqueue.pas"/>
<UnitName Value="mvJobQueue"/> <UnitName Value="mvJobQueue"/>
</Item7> </Item>
<Item8> <Item>
<Filename Value="source/mvjobs.pas"/> <Filename Value="source/mvjobs.pas"/>
<UnitName Value="mvJobs"/> <UnitName Value="mvJobs"/>
</Item8> </Item>
<Item9> <Item>
<Filename Value="source/mvmapprovider.pas"/> <Filename Value="source/mvmapprovider.pas"/>
<UnitName Value="mvMapProvider"/> <UnitName Value="mvMapProvider"/>
</Item9> </Item>
<Item10> <Item>
<Filename Value="source/mvtypes.pas"/> <Filename Value="source/mvtypes.pas"/>
<UnitName Value="mvTypes"/> <UnitName Value="mvTypes"/>
</Item10> </Item>
<Item11> <Item>
<Filename Value="source/mvmapviewer.pas"/> <Filename Value="source/mvmapviewer.pas"/>
<UnitName Value="mvMapViewer"/> <UnitName Value="mvMapViewer"/>
</Item11> </Item>
<Item12> <Item>
<Filename Value="source/mvextradata.pas"/> <Filename Value="source/mvextradata.pas"/>
<UnitName Value="mvExtraData"/> <UnitName Value="mvExtraData"/>
</Item12> </Item>
<Item13> <Item>
<Filename Value="source/mvdlefpc.pas"/> <Filename Value="source/mvdlefpc.pas"/>
<UnitName Value="mvDLEFpc"/> <UnitName Value="mvDLEFpc"/>
</Item13> </Item>
<Item14> <Item>
<Filename Value="source/mvmapviewerreg.pas"/> <Filename Value="source/mvmapviewerreg.pas"/>
<HasRegisterProc Value="True"/> <HasRegisterProc Value="True"/>
<UnitName Value="mvMapViewerReg"/> <UnitName Value="mvMapViewerReg"/>
</Item14> </Item>
<Item15> <Item>
<Filename Value="source/mvgpx.pas"/> <Filename Value="source/mvgpx.pas"/>
<UnitName Value="mvGPX"/> <UnitName Value="mvGPX"/>
</Item15> </Item>
<Item16> <Item>
<Filename Value="source/mvdrawingengine.pas"/> <Filename Value="source/mvdrawingengine.pas"/>
<UnitName Value="mvDrawingEngine"/> <UnitName Value="mvDrawingEngine"/>
</Item16> </Item>
<Item17> <Item>
<Filename Value="source/mvde_intfgraphics.pas"/> <Filename Value="source/mvde_intfgraphics.pas"/>
<UnitName Value="mvDE_IntfGraphics"/> <UnitName Value="mvDE_IntfGraphics"/>
</Item17> </Item>
<Item18> <Item>
<Filename Value="source/mvde_lcl.pas"/> <Filename Value="source/mvde_lcl.pas"/>
<UnitName Value="mvDE_LCL"/> <UnitName Value="mvDE_LCL"/>
</Item18> </Item>
</Files> </Files>
<RequiredPkgs Count="1"> <RequiredPkgs>
<Item1> <Item>
<PackageName Value="LCLBase"/> <PackageName Value="LCLBase"/>
</Item1> </Item>
</RequiredPkgs> </RequiredPkgs>
<UsageOptions> <UsageOptions>
<UnitPath Value="$(PkgOutDir)"/> <UnitPath Value="$(PkgOutDir)"/>

View File

@ -831,7 +831,7 @@ procedure TMapViewerEngine.Redraw(const aWin: TmapWindow);
var var
TilesVis: TArea; TilesVis: TArea;
x, y : Integer; //int64; x, y : Integer; //int64;
Tiles: TTileIdArray; Tiles: TTileIdArray = nil;
iTile: Integer; iTile: Integer;
begin begin
if not(Active) then if not(Active) then
@ -1238,7 +1238,7 @@ var
mins, secs: Double; mins, secs: Double;
i, j, len: Integer; i, j, len: Integer;
n: Integer; n: Integer;
s: String; s: String = '';
res: Integer; res: Integer;
sgn: Double; sgn: Double;
begin begin

View File

@ -199,7 +199,7 @@ end;
function TMVGeoNames.Search(ALocationName: String; function TMVGeoNames.Search(ALocationName: String;
ADownloadEngine: TMvCustomDownloadEngine): TRealPoint; ADownloadEngine: TMvCustomDownloadEngine): TRealPoint;
var var
s: string; s: string = '';
function gs(id: string; Start: integer): string; function gs(id: string; Start: integer): string;
var var

View File

@ -504,7 +504,7 @@ var
DelLst: TGPSObjList; DelLst: TGPSObjList;
begin begin
DelLst := nil; DelLst := nil;
SetLength(NotFound, 0); SetLength(NotFound{%H-}, 0);
SetLength(Found, 0); SetLength(Found, 0);
Lock; Lock;
try try