diff --git a/components/lazmapviewer/example/main.lfm b/components/lazmapviewer/example/main.lfm
index 77818ca71..293b0b073 100644
--- a/components/lazmapviewer/example/main.lfm
+++ b/components/lazmapviewer/example/main.lfm
@@ -18,7 +18,7 @@ object MainForm: TMainForm
     Align = alRight
     ClientHeight = 545
     ClientWidth = 237
-    TabOrder = 0
+    TabOrder = 1
     object CbProviders: TComboBox
       AnchorSideLeft.Control = LblProviders
       AnchorSideLeft.Side = asrBottom
diff --git a/components/lazmapviewer/example/main.pas b/components/lazmapviewer/example/main.pas
index e9e4119a0..943ffa2c2 100644
--- a/components/lazmapviewer/example/main.pas
+++ b/components/lazmapviewer/example/main.pas
@@ -197,8 +197,6 @@ begin
   MapView.Zoom := 1;
   CbUseThreads.Checked := MapView.UseThreads;
   CbDoubleBuffer.Checked := MapView.DoubleBuffered;
-//  GeoNames.LocationName := 'New York';
-//  MapView.Center := GeoNames.Search('New York', MapView.DownloadEngine);
 
   ReadFromIni;
 end;
diff --git a/components/lazmapviewer/source/mvengine.pas b/components/lazmapviewer/source/mvengine.pas
index 952e56599..6f707a36b 100644
--- a/components/lazmapviewer/source/mvengine.pas
+++ b/components/lazmapviewer/source/mvengine.pas
@@ -44,6 +44,7 @@ Type
   TTileIdArray = Array of TTileId;
 
   { TMapWindow }
+
   TMapWindow = Record
     MapProvider: TMapProvider;
     X: Int64;
@@ -71,7 +72,6 @@ Type
       lstProvider : TStringList;
       Queue : TJobQueue;
       MapWin : TMapWindow;
-      procedure ConstraintZoom(var aWin: TMapWindow);
       function GetCacheOnDisk: Boolean;
       function GetCachePath: String;
       function GetCenter: TRealPoint;
@@ -94,13 +94,14 @@ Type
       procedure SetZoom(AValue: integer);
       function LonLatToMapWin(const aWin: TMapWindow; aPt: TRealPoint): TPoint;
       Function MapWinToLonLat(const aWin: TMapWindow; aPt : TPoint) : TRealPoint;
-      Procedure CalculateWin(var aWin : TMapWindow);
-      Procedure Redraw(const aWin : TmapWindow);
-      function CalculateVisibleTiles(const aWin : TMapWindow) : TArea;
-      function IsCurrentWin(const aWin : TMapWindow) : boolean;
+      Procedure CalculateWin(var aWin: TMapWindow);
+      Procedure Redraw(const aWin: TmapWindow);
+      function CalculateVisibleTiles(const aWin: TMapWindow) : TArea;
+      function IsCurrentWin(const aWin: TMapWindow) : boolean;
     protected
-      function GetTileName(const Id : TTileId) : String;
-      procedure evDownload(Data : TObject;Job : TJob);
+      procedure ConstraintZoom(var aWin: TMapWindow);
+      function GetTileName(const Id: TTileId) : String;
+      procedure evDownload(Data: TObject;Job : TJob);
       procedure TileDownloaded(Data: PtrInt);
       Procedure RegisterProviders;
       Procedure DrawTile(const TileId : TTileId;X,Y : integer;TileImg : TLazIntfImage);
@@ -116,17 +117,18 @@ Type
       constructor Create(aOwner : TComponent);override;
       destructor Destroy; override;
 
+      function AddMapProvider(OpeName: String; Url: String;
+        MinZoom, MaxZoom, NbSvr: integer; GetSvrStr: TGetSvrStr = nil;
+        GetXStr: TGetValStr = nil; GetYStr: TGetValStr = nil;
+        GetZStr: TGetValStr = nil): TMapProvider;
       procedure CancelCurrentDrawing;
-      procedure Redraw;
-      function AddMapProvider(OpeName: String; Url: String;   MinZoom : integer;MaxZoom : integer;NbSvr: integer; GetSvrStr: TGetSvrStr =nil; GetXStr: TGetValStr =nil; GetYStr: TGetValStr =nil; GetZStr: TGetValStr =nil) :  TMapProvider;
-      procedure GetMapProviders(lst: TStrings);
-
-      function ScreenToLonLat(aPt: TPoint): TRealPoint;
+      procedure GetMapProviders(AList: TStrings);
       function LonLatToScreen(aPt: TRealPoint): TPoint;
-      function WorldScreenToLonLat(aPt: TPoint): TRealPoint;
       function LonLatToWorldScreen(aPt: TRealPoint): TPoint;
-
+      procedure Redraw;
+      function ScreenToLonLat(aPt: TPoint): TRealPoint;
       procedure SetSize(aWidth, aHeight: integer);
+      function WorldScreenToLonLat(aPt: TPoint): TRealPoint;
 
       procedure DblClick(Sender: TObject);
       procedure MouseDown(Sender: TObject; Button: TMouseButton;
@@ -136,27 +138,27 @@ Type
         Shift: TShiftState; X, Y: Integer);
       procedure MouseWheel(Sender: TObject; Shift: TShiftState; WheelDelta: Integer;
         MousePos: TPoint; var Handled: Boolean);
-      procedure ZoomOnArea(const aArea : TRealArea);
+      procedure ZoomOnArea(const aArea: TRealArea);
 
-      property Center : TRealPoint read GetCenter write SetCenter;
+      property Center: TRealPoint read GetCenter write SetCenter;
 
     published
-      property Active : boolean read FActive write SetActive default false;
-      property CacheOnDisk : Boolean read GetCacheOnDisk write SetCacheOnDisk;
-      property CachePath : String read GetCachePath write SetCachePath;
-      property DownloadEngine : TMvCustomDownloadEngine read FDownloadEngine write SetDownloadEngine;
-      property DrawTitleInGuiThread : boolean read FDrawTitleInGuiThread write FDrawTitleInGuiThread;
-      property Height : integer read GetHeight write SetHeight;
-      property MapProvider : String read GetMapProvider write SetMapProvider;
-      property UseThreads : Boolean read GetUseThreads write SetUseThreads;
-      property Width : integer read GetWidth write SetWidth;
-      property Zoom : integer read GetZoom write SetZoom;
+      property Active: Boolean read FActive write SetActive default false;
+      property CacheOnDisk: Boolean read GetCacheOnDisk write SetCacheOnDisk;
+      property CachePath: String read GetCachePath write SetCachePath;
+      property DownloadEngine: TMvCustomDownloadEngine read FDownloadEngine write SetDownloadEngine;
+      property DrawTitleInGuiThread: boolean read FDrawTitleInGuiThread write FDrawTitleInGuiThread;
+      property Height: integer read GetHeight write SetHeight;
+      property JobQueue: TJobQueue read Queue;
+      property MapProvider: String read GetMapProvider write SetMapProvider;
+      property UseThreads: Boolean read GetUseThreads write SetUseThreads;
+      property Width: integer read GetWidth write SetWidth;
+      property Zoom: integer read GetZoom write SetZoom;
 
-      property OnDrawTile :TDrawTileEvent read FOnDrawTile write FOnDrawTile;
-      property OnCenterMove : TNotifyEvent read FOnCenterMove write FOnCenterMove;
-      property OnZoomChange : TNotifyEvent read FOnZoomChange write FOnZoomChange;
-      property Jobqueue : TJobQueue read Queue;
-      property OnChange : TNotifyEvent Read FOnChange write FOnchange; //called when visiable area change
+      property OnCenterMove: TNotifyEvent read FOnCenterMove write FOnCenterMove;
+      property OnChange: TNotifyEvent Read FOnChange write FOnchange; //called when visiable area change
+      property OnDrawTile: TDrawTileEvent read FOnDrawTile write FOnDrawTile;
+      property OnZoomChange: TNotifyEvent read FOnZoomChange write FOnZoomChange;
   end;
 
 implementation
@@ -171,748 +173,136 @@ type
 
   TLaunchDownloadJob = Class(TJob)
   private
-    AllRun : boolean;
-    Win : TMapWindow;
-    Engine : TMapViewerEngine;
-    FRunning : boolean;
-    FTiles : TTileIdArray;
-    FStates : Array of integer;
+    AllRun: boolean;
+    Win: TMapWindow;
+    Engine: TMapViewerEngine;
+    FRunning: boolean;
+    FTiles: TTileIdArray;
+    FStates: Array of integer;
   protected
-    function pGetTask : integer;override;
+    function pGetTask: integer;override;
     procedure pTaskStarted(aTask: integer);override;
-    procedure pTaskEnded(aTask : integer;aExcept : Exception);override;
+    procedure pTaskEnded(aTask: integer; aExcept: Exception);override;
   public
-    procedure ExecuteTask(aTask : integer;FromWaiting : boolean);override;
-    function Running : boolean;override;
+    procedure ExecuteTask(aTask: integer; FromWaiting: boolean);override;
+    function Running: boolean;override;
   public
-    Constructor Create(Eng : TMapViewerEngine;const Tiles : TTileIdArray;const aWin : TMapWindow);
+    Constructor Create(Eng: TMapViewerEngine; const Tiles: TTileIdArray; const aWin: TMapWindow);
   end;
 
 
-{ TEnvTile }
+  { TEnvTile }
+
+  TEnvTile = Class
+  private
+    Tile: TTileId;
+    Win: TMapWindow;
+  public
+    constructor Create(const aTile: TTileId; const aWin: TMapWindow);
+  end;
+
+
+  { TMemObj }
+
+  TMemObj = Class
+  private
+    FWin: TMapWindow;
+  public
+    constructor Create(const aWin: TMapWindow);
+  end;
+
+  constructor TMemObj.Create(const aWin: TMapWindow);
+  begin
+    FWin := aWin;
+  end;
 
- TEnvTile = Class
-     private
-       Tile : TTileId;
-       Win : TMapWindow;
-     public
-       constructor Create(const aTile : TTileId;Const aWin : TMapWindow);
-     End;
 
 { TLaunchDownloadJob }
 
 function TLaunchDownloadJob.pGetTask: integer;
-var i : integer;
+var
+  i: integer;
 begin
-  if not(AllRun) and not(Cancelled) then
-  Begin
-    For i:=low(FStates) to high(FStates) do
-        if FStates[i]=0 then
-        Begin
-          result:=i+1;
-          Exit;
-        end;
-    AllRun:=True;
-  end;
-  Result:=ALL_TASK_COMPLETED;
-  For i:=low(FStates) to high(FStates) do
-      if FStates[i]=1 then
-      Begin
-          Result:=NO_MORE_TASK;
-          Exit;
+  if not AllRun and not Cancelled then
+  begin
+    for i:=Low(FStates) to High(FStates) do
+      if FStates[i] = 0 then
+      begin
+        Result := i + 1;
+        Exit;
       end;
+    AllRun := True;
+  end;
+  Result := ALL_TASK_COMPLETED;
+  for i := Low(FStates) to High(FStates) do
+    if FStates[i] = 1 then
+    begin
+      Result := NO_MORE_TASK;
+      Exit;
+    end;
 end;
 
 procedure TLaunchDownloadJob.pTaskStarted(aTask: integer);
 begin
-  FRunning:=True;
-  FStates[aTask-1]:=1;
+  FRunning := True;
+  FStates[aTask-1] := 1;
 end;
 
 procedure TLaunchDownloadJob.pTaskEnded(aTask: integer; aExcept: Exception);
 begin
   if Assigned(aExcept) then
-    FStates[aTask-1]:=3
+    FStates[aTask - 1] := 3
   Else
-    FStates[aTask-1]:=2;
+    FStates[aTask - 1] := 2;
 end;
 
 procedure TLaunchDownloadJob.ExecuteTask(aTask: integer; FromWaiting: boolean);
 var iTile : integer;
 begin
-  iTile:=aTask-1;
-  Queue.AddUniqueJob(TEventJob.Create(@Engine.evDownload,TEnvTile.Create(FTiles[iTile],Win),false,Engine.GetTileName(FTiles[iTile])),Launcher);
+  iTile := aTask - 1;
+  Queue.AddUniqueJob(TEventJob.Create
+    (
+      @Engine.evDownload,
+      TEnvTile.Create(FTiles[iTile], Win),
+      false,
+      Engine.GetTileName(FTiles[iTile])
+    ),
+    Launcher
+  );
 end;
 
 function TLaunchDownloadJob.Running: boolean;
 begin
-  Result:=FRunning;
+  Result := FRunning;
 end;
 
-constructor TLaunchDownloadJob.Create(Eng : TMapViewerEngine;const Tiles: TTileIdArray;const aWin : TMapWindow);
-var i : integer;
+constructor TLaunchDownloadJob.Create(Eng: TMapViewerEngine;
+  const Tiles: TTileIdArray; const aWin: TMapWindow);
+var
+  i: integer;
 begin
-  Engine:=Eng;
-  SetLength(FTiles,Length(Tiles));
-  For i:=low(FTiles) to high(FTiles) do
-   FTiles[i]:=Tiles[i];
-  SetLength(FStates,length(Tiles));
-  AllRun:=false;
-  Name:='LaunchDownload';
-  Win:=aWin;
+  Engine := Eng;
+  SetLength(FTiles, Length(Tiles));
+  For i:=Low(FTiles) to High(FTiles) do
+    FTiles[i] := Tiles[i];
+  SetLength(FStates, Length(Tiles));
+  AllRun := false;
+  Name := 'LaunchDownload';
+  Win := aWin;
 end;
 
+
 { TEnvTile }
 
 constructor TEnvTile.Create(const aTile : TTileId;Const aWin : TMapWindow);
 begin
-  Tile:=aTile;
-  Win:=aWin;
+  Tile := aTile;
+  Win := aWin;
 end;
 
 
 { TMapViewerEngine }
 
-procedure TMapViewerEngine.SetZoom(AValue: integer);
-begin
-  if MapWin.Zoom=AValue then Exit;
-  MapWin.Zoom:=AValue;
-  ConstraintZoom(MapWin);
-  CalculateWin(MapWin);
-  Redraw(MapWin);
-  if assigned(OnZoomChange) then
-      OnZoomChange(Self);
-  if Assigned(OnChange) then
-    OnChange(Self);
-end;
-
-procedure TMapViewerEngine.SetWidth(AValue: integer);
-begin
-  if MapWin.Width=AValue then Exit;
-  MapWin.Width:=AValue;
-  CalculateWin(MapWin);
-  Redraw(MapWin);
-end;
-
-procedure TMapViewerEngine.SetHeight(AValue: integer);
-begin
-  if MapWin.Height=AValue then Exit;
-  MapWin.Height:=AValue;
-  CalculateWin(MapWin);
-  Redraw(MapWin);
-end;
-
-procedure TMapViewerEngine.ConstraintZoom(var aWin : TMapWindow);
-var zMin,zMax :integer;
-Begin
-    if Assigned(aWin.MapProvider) then
-    Begin
-      aWin.MapProvider.GetZoomInfos(zMin,zMax);
-      if aWin.Zoom<zMin then
-        aWin.Zoom:=zMin;
-      if aWin.Zoom>zMax then
-        aWin.Zoom:=zMax;
-     End;
-end;
-
-procedure TMapViewerEngine.SetMapProvider(AValue: String);
-var idx : integer;
-    zMin,zMax : integer;
-begin
-  idx:=lstProvider.IndexOf(aValue);
-  if not((aValue='') or (idx<>-1)) then
-    Raise Exception.Create('Unknow Provider : '+aValue);
-  if Assigned(MapWin.MapProvider) and (MapWin.MapProvider.Name=AValue) then Exit;
-  if idx<>-1 then
-  Begin
-    MapWin.MapProvider:=TMapProvider(lstProvider.Objects[idx]);
-    ConstraintZoom(MapWin);
-  end
-  else
-    MapWin.MapProvider:=nil;
-  if Assigned(MapWin.MapProvider) then
-    Redraw(MapWin);
-end;
-
-
-procedure TMapViewerEngine.SetUseThreads(AValue: Boolean);
-begin
-  if Queue.UseThreads=AValue then Exit;
-  Queue.UseThreads:=AValue;
-  Cache.UseThreads:=AValue;
-end;
-
-function TMapViewerEngine.GetZoom: integer;
-begin
-  Result:=MapWin.zoom;
-end;
-
-procedure TMapViewerEngine.SetCacheOnDisk(AValue: Boolean);
-begin
-  if Cache.UseDisk=AValue then Exit;
-  Cache.UseDisk:=AValue;
-end;
-
-procedure TMapViewerEngine.SetCachePath(AValue: String);
-begin
-  Cache.BasePath := aValue;
-end;
-
-procedure TMapViewerEngine.SetDownloadEngine(AValue: TMvCustomDownloadEngine);
-begin
-  if FDownloadEngine=AValue then Exit;
-  FDownloadEngine:=AValue;
-  if Assigned(FDownloadEngine) then
-    FDownloadEngine.FreeNotification(self);
-end;
-
-
-function TMapViewerEngine.GetHeight: integer;
-begin
-  Result:=MapWin.Height
-end;
-
-function TMapViewerEngine.GetCacheOnDisk: Boolean;
-begin
-  Result:=Cache.UseDisk;
-end;
-
-function TMapViewerEngine.GetCachePath: String;
-begin
-  Result:=Cache.BasePath;
-end;
-
-function TMapViewerEngine.GetCenter: TRealPoint;
-begin
-  Result:=MapWin.Center;
-end;
-
-function TMapViewerEngine.GetMapProvider: String;
-begin
-  if Assigned(MapWin.MapProvider) then
-    Result:=MapWin.MapProvider.Name
-  else
-    Result:='';
-end;
-
-function TMapViewerEngine.GetUseThreads: Boolean;
-begin
-  Result:=Queue.UseThreads;
-end;
-
-function TMapViewerEngine.GetWidth: integer;
-begin
-  Result := MapWin.Width
-end;
-
-function TMapViewerEngine.ScreenToLonLat(aPt: TPoint): TRealPoint;
-begin
-  Result:=MapWinToLonLat(MapWin,aPt);
-end;
-
-function TMapViewerEngine.LonLatToScreen(aPt: TRealPoint): TPoint;
-Begin
-  Result:=LonLatToMapWin(MapWin,aPt);
-end;
-
-function TMapViewerEngine.WorldScreenToLonLat(aPt: TPoint): TRealPoint;
-begin
-  aPt.X:=aPt.X-MapWin.X;
-  aPt.Y:=aPt.Y-MapWin.Y;
-  Result:=ScreenToLonLat(aPt);
-end;
-
-function TMapViewerEngine.LonLatToWorldScreen(aPt: TRealPoint): TPoint;
-begin
-  Result:=LonLatToScreen(aPt);
-  Result.X:=Result.X+MapWin.X;
-  Result.Y:=Result.Y+MapWin.Y;
-end;
-
-procedure TMapViewerEngine.SetSize(aWidth, aHeight: integer);
-begin
-  if (MapWin.Width=aWidth) and (MapWin.Height=aHeight) then Exit;
-  CancelCurrentDrawing;
-  MapWin.Width:=aWidth;
-  MapWin.Height:=aHeight;
-  CalculateWin(MapWin);
-  Redraw(MapWin);
-  if Assigned(Onchange) then
-    OnChange(Self);
-end;
-
-procedure TMapViewerEngine.MouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; X, Y: Integer);
-begin
-  if Button=mbLeft then
-    DragObj.MouseDown(self,X,Y);
-end;
-
-procedure TMapViewerEngine.MouseUp(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; X, Y: Integer);
-begin
-  if Button=mbLeft then
-    DragObj.MouseUp(X,Y);
-end;
-
-procedure TMapViewerEngine.MouseMove(Sender: TObject; Shift: TShiftState; X,
-  Y: Integer);
-begin
-  DragObj.MouseMove(X,Y);
-end;
-
-procedure TMapViewerEngine.DblClick(Sender: TObject);
-var pt: TPoint;
-begin
-  pt.X:=DragObj.MouseX;
-  pt.Y:=DragObj.MouseY;
-  SetCenter(ScreenToLonLat(pt));
-end;
-
-procedure TMapViewerEngine.MouseWheel(Sender: TObject;
-  Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint;
-  var Handled: Boolean);
-var Val : Integer;
-    nZoom : integer;
-begin
-  Val:=0;
-  if WheelDelta>0 then
-    Val:=1;
-  if WheelDelta<0 then
-    Val:=-1;
-  nZoom:=Zoom+Val;
-  if (nZoom>0) and (nZoom<20) then
-    Zoom:=nZoom;
-  Handled:=true;
-end;
-
-procedure TMapViewerEngine.SetCenter(aCenter: TRealPoint);
-begin
-  if (MapWin.Center.lon<>aCenter.Lon) and (MapWin.Center.lat<>aCenter.Lat) then
-  Begin
-    Mapwin.center:=aCenter;
-    CalculateWin(MapWin);
-    Redraw(MapWin);
-    if assigned(OnCenterMove) then
-      OnCenterMove(Self);
-    if Assigned(OnChange) then
-      OnChange(Self);
-  end;
-end;
-
-procedure TMapViewerEngine.ZoomOnArea(const aArea: TRealArea);
-var tmpWin : TMapWindow;
-    visArea : TRealArea;
-    TopLeft,BottomRight : TPoint;
-begin
-  tmpWin:=MapWin;
-  tmpWin.Center.Lon:=(aArea.TopLeft.Lon+aArea.BottomRight.Lon)/2;
-  tmpWin.Center.Lat:=(aArea.TopLeft.Lat+aArea.BottomRight.Lat)/2;
-  tmpWin.Zoom:=15;
-  TopLeft.X:=0;
-  TopLeft.Y:=0;
-  BottomRight.X:=tmpWin.Width;
-  BottomRight.Y:=tmpWin.Height;
-  Repeat
-    CalculateWin(tmpWin);
-    visArea.TopLeft:=MapWinToLonLat(tmpWin,TopLeft);
-    visArea.BottomRight:=MapWinToLonLat(tmpWin,BottomRight);
-    if (AreaInsideArea(aArea,visArea)) then
-    begin
-      break;
-    end;
-    Dec(tmpWin.Zoom);
-  until (tmpWin.Zoom=2);
-  MapWin:=tmpWin;
-  Redraw(MapWin);
-end;
-
-procedure TMapViewerEngine.GetMapProviders(lst: TStrings);
-begin
-  lst.Assign(lstProvider);
-end;
-
-function TMapViewerEngine.LonLatToMapWin(const aWin : TMapWindow;aPt: TRealPoint): TPoint;
-var
-  tiles: Int64;
-  circumference: Int64;
-  lat: Extended;
-  res: Extended;
-  tmpX,tmpY : Double;
-begin
-  tiles := 1 shl aWin.Zoom;
-  circumference := tiles * TILE_SIZE;
-  tmpX := ((aPt.Lon+ 180.0)*circumference)/360.0;
-
-  res := (2 * pi * EARTH_RADIUS) / circumference;
-
-
-  tmpY := -aPt.Lat;
-  tmpY := ln(tan((degToRad(tmpY) + pi / 2.0) / 2)) *180 / pi;
-  tmpY:= (((tmpY /180.0)*SHIFT)+SHIFT)/res;
-
-  tmpX := tmpX + aWin.X;
-  tmpY := tmpY + aWin.Y;
-  Result.X:=trunc(tmpX);
-  Result.Y:=trunc(tmpY);
-End;
-
-function TMapViewerEngine.MapWinToLonLat(const aWin: TMapWindow; aPt: TPoint): TRealPoint;
-var
-  tiles: Int64;
-  circumference: Int64;
-  lat: Extended;
-  res: Extended;
-  mPoint : TPoint;
-begin
-  tiles := 1 shl aWin.Zoom;
-  circumference := tiles * TILE_SIZE;
-
-  mPoint.X := aPt.X - aWin.X;
-  mPoint.Y := aPt.Y - aWin.Y;
-
-  if mPoint.X < 0 then
-    mPoint.X := 0
-  else
-  if mPoint.X > circumference then
-    mPoint.X := circumference;
-
-  if mPoint.Y < 0 then
-    mPoint.Y := 0
-  else
-  if mPoint.Y > circumference then
-    mPoint.Y := circumference;
-
-
-  Result.Lon := ((mPoint.X * 360.0) / circumference) - 180.0;
-
-  res := (2 * pi * EARTH_RADIUS) / circumference;
-  lat := ((mPoint.Y * res - SHIFT) / SHIFT) * 180.0;
-
-  lat := radtodeg (2 * arctan( exp( lat * pi / 180.0)) - pi / 2.0);
-  Result.Lat := -lat;
-
-  if Result.Lat > MAX_LATITUDE then
-    Result.Lat := MAX_LATITUDE
-  else
-  if Result.Lat < MIN_LATITUDE then
-    Result.Lat := MIN_LATITUDE;
-
-  if Result.Lon > MAX_LONGITUDE then
-    Result.Lon := MAX_LONGITUDE
-  else
-  if Result.Lon < MIN_LONGITUDE then
-    Result.Lon := MIN_LONGITUDE;
-end;
-
-procedure TMapViewerEngine.CalculateWin(var aWin: TMapWindow);
-var
-  mx, my: Extended;
-  res: Extended;
-  px, py: Int64;
-
-Begin
-
-  mx := aWin.Center.Lon * SHIFT / 180.0;
-  my := ln( tan((90 - aWin.Center.Lat) * pi / 360.0 )) / (pi / 180.0);
-
-  my := my * SHIFT / 180.0;
-
-  res := (2 * pi * EARTH_RADIUS) / (TILE_SIZE * (1 shl aWin.Zoom));
-  px := Round((mx + shift) / res);
-  py := Round((my + shift) / res);
-
-  aWin.X := aWin.Width div 2 - px;
-  aWin.Y := aWin.Height div 2 - py;
-
-end;
-
-function TMapViewerEngine.IsValidTile(const aWin: TMapWindow;const aTile : TTIleId) : boolean;
-var tiles : int64;
-begin
-  tiles := 1 shl aWin.Zoom;
-  Result:=(aTile.X>=0) and (aTile.X<=tiles-1) and (aTile.Y>=0) and (aTile.Y<=tiles-1);
-end;
-
-
-procedure TMapViewerEngine.Redraw(const aWin: TmapWindow);
-var TilesVis : TArea;
-    x,y : Integer; //int64;
-    Tiles : TTileIdArray;
-    iTile : Integer;
-begin
-  if not(Active) then
-     Exit;
-  Queue.CancelAllJob(self);
-  TilesVis:=CalculateVisibleTiles(aWin);
-  SetLength(Tiles,(TilesVis.Bottom-TilesVis.top+1)*(TilesVis.Right-TilesVis.Left+1));
-  iTile:=low(Tiles);
-  For y:=TilesVis.top to TilesVis.Bottom do
-    For X:=TilesVis.Left to TilesVis.Right do
-      Begin
-        Tiles[iTile].X:=X;
-        Tiles[iTile].Y:=Y;
-        Tiles[iTile].Z:=aWin.Zoom;
-        if IsValidTile(aWin,Tiles[iTile]) then
-          iTile+=1;
-      end;
-  SetLength(Tiles,iTile);
-  if length(Tiles)>0 then
-  Begin
-    Queue.AddJob(TLaunchDownloadJob.Create(self,Tiles,aWin),self);
-  end;
-end;
-
-function TMapViewerEngine.CalculateVisibleTiles(const aWin: TMapWindow): TArea;
-var MaxX,MAxY,Startx,StartY : int64;
-begin
-  MaxX := (aWin.Width div TILE_SIZE) + 1;
-  MaxY := (aWin.Height div TILE_SIZE) + 1;
-  startX := (-(aWin.X)) div TILE_SIZE;
-  startY := (-(aWin.Y)) div TILE_SIZE;
-  Result.Left := startX;
-  Result.right := startX + MaxX;
-  Result.top := startY;
-  Result.bottom := startY + MaxY;
-end;
-
-function TMapViewerEngine.IsCurrentWin(const aWin: TMapWindow): boolean;
-begin
-  Result:=(aWin.Zoom=MapWin.Zoom) and (aWin.Center.Lat=MapWin.Center.Lat) and (aWin.Center.Lon=MapWin.Center.Lon) and (aWin.Width=MapWin.Width) and (aWin.Height=MapWin.Height);
-end;
-
-function TMapViewerEngine.GetTileName(const Id: TTileId): String;
-begin
-  Result:=Inttostr(Id.X)+'.'+inttostr(Id.Y)+'.'+inttostr(Id.Z);
-end;
-
-procedure TMapViewerEngine.evDownload(Data: TObject; Job: TJob);
-var
-  Id: TTileId;
-  Url: String;
-  Env: TEnvTile;
-  MapO: TMapProvider;
-  lStream: TMemoryStream;
-begin
-  Env := TEnvTile(Data);
-  Id := Env.Tile;
-  MapO := Env.Win.MapProvider;
-  if Assigned(MapO) then
-  begin
-    if not Cache.InCache(MapO, Id) then
-    begin
-      if Assigned(FDownloadEngine) then
-      begin
-        Url := MapO.GetUrlForTile(Id);
-        if Url<>'' then
-        begin
-          lStream := TMemoryStream.Create;
-          try
-            try
-              FDownloadEngine.DownloadFile(Url, lStream);
-              Cache.Add(MapO, Id, lStream);
-            except
-            end;
-          finally
-            FreeAndNil(lStream);
-          end;
-        end;
-      end;
-    end;
-  end;
-
-  if Job.Cancelled then
-    Exit;
-
-  if DrawTitleInGuiThread then
-    Queue.QueueAsyncCall(@TileDownloaded, PtrInt(Env))
-  else
-    TileDownloaded(PtrInt(Env));
-end;
-
-procedure TMapViewerEngine.TileDownloaded(Data: PtrInt);
-var EnvTile : TEnvTile;
-    img : TLazIntfImage;
-    X,Y : integer;
-begin
-  EnvTile:=TEnvTile(Data);
-  Try
-    if IsCurrentWin(EnvTile.Win)then
-    Begin
-       Cache.GetFromCache(EnvTile.Win.MapProvider,EnvTile.Tile,img);
-       X := EnvTile.Win.X + EnvTile.Tile.X * TILE_SIZE; // begin of X
-       Y := EnvTile.Win.Y + EnvTile.Tile.Y * TILE_SIZE; // begin of X
-       DrawTile(EnvTile.Tile,X,Y,img);
-    end;
-  finally
-    FreeAndNil(EnvTile);
-  end;
-end;
-
-function TMapViewerEngine.GetLetterSvr(id: integer): String;
-Begin
-  Result:=Char(Ord('a')+id);
-end;
-
-function TMapViewerEngine.GetYahooSvr(id: integer): String;
-Begin
-  Result := IntToStr(id+1);
-end;
-
-function TMapViewerEngine.GetYahooY(const Tile : TTileId): string;
-Begin
-    Result := IntToStr( -(Tile.Y - (1 shl Tile.Z) div 2) - 1);
-end;
-
-function TMapViewerEngine.GetYahooZ(const Tile : TTileId): string;
-Begin
-  result := IntToStr(Tile.Z+1);
-end;
-
-function TMapViewerEngine.GetQuadKey(const Tile : TTileId): string;
-var
-  i, d, m: Longword;
-begin
-  {
-    Bing Maps Tile System
-    http://msdn.microsoft.com/en-us/library/bb259689.aspx
-  }
-  Result := '';
-  for i := Tile.Z downto 1 do
-  begin
-    d := 0;
-    m := 1 shl (i - 1);
-    if (Tile.x and m) <> 0 then
-      Inc(d, 1);
-    if (Tile.y and m) <> 0 then
-      Inc(d, 2);
-    Result := Result + IntToStr(d);
-  end;
-end;
-
-{ TMemObj }
-
-type
-  TMemObj = Class
-    private
-      FWin : TMapWindow;
-    public
-      constructor Create(const aWin : TMapWindow);
-    end;
-
-constructor TMemObj.Create(const aWin: TMapWindow);
-begin
-  FWin := aWin;
-end;
-
-
-procedure TMapViewerEngine.MoveMapCenter(Sender: TDragObj);
-var
-  old: TMemObj;
-  nCenter: TRealPoint;
-  Job: TJob;
-  aPt: TPoint;
-Begin
-  if Sender.LnkObj=nil then
-  begin
-    Sender.LnkObj := TMemObj.Create(MapWin);
-  end;
-  old := TMemObj(Sender.LnkObj);
-  aPt.X := old.FWin.Width DIV 2-Sender.OfsX;
-  aPt.Y := old.FWin.Height DIV 2-Sender.OfsY;
-  nCenter := MapWinToLonLat(old.FWin,aPt);
-  SetCenter(nCenter);
-end;
-
-procedure TMapViewerEngine.SetActive(AValue: boolean);
-begin
-  if FActive=AValue then Exit;
-  FActive:=AValue;
-  if not(FActive) then
-     Queue.CancelAllJob(self)
-  else begin
-    if Cache.UseDisk then ForceDirectories(Cache.BasePath);
-    Redraw(MapWin);
-  end;
-end;
-
-procedure TMapViewerEngine.DoDrag(Sender: TDragObj);
-begin
-   if Sender.DragSrc = self then
-     MoveMapCenter(Sender);
-end;
-
-procedure TMapViewerEngine.CancelCurrentDrawing;
-var
-  Jobs: TJobArray;
-begin
-  Jobs := Queue.CancelAllJob(self);
-  Queue.WaitForTerminate(Jobs);
-end;
-
-procedure TMapViewerEngine.Redraw;
-begin
-  Redraw(MapWin);
-end;
-
-function TMapViewerEngine.AddMapProvider(OpeName: String; Url: String;
-  MinZoom : integer;MaxZoom : integer;
-  NbSvr: integer; GetSvrStr: TGetSvrStr; GetXStr: TGetValStr;
-  GetYStr: TGetValStr; GetZStr: TGetValStr) : TMapProvider;
-var idx :integer;
-Begin
-  idx := lstProvider.IndexOf(OpeName);
-  if idx = -1 then
-  begin
-    Result := TMapProvider.Create(OpeName);
-    lstProvider.AddObject(OpeName, Result);
-  end
-  else
-    Result := TMapProvider(lstProvider.Objects[idx]);
-  Result.AddUrl(Url, NbSvr, MinZoom, MaxZoom, GetSvrStr, GetXStr, GetYStr, GetZStr);
-end;
-
-procedure TMapViewerEngine.RegisterProviders;
-begin
- AddMapProvider('Aucun','',0,30, 0);
- {
-  AddMapProvider('Google Satellite','http://khm%d.google.com/kh/v=82&x=%x%&y=%y%&z=%z%&s=Ga',4);
-  AddMapProvider('Google Hybrid','http://khm%d.google.com/kh/v=82&x=%x%&y=%y%&z=%z%&s=Ga',4);
-  AddMapProvider('Google Hybrid','http://mt%d.google.com/vt/lyrs=h@145&v=w2.104&x=%d&y=%d&z=%z%',4);
-  AddMapProvider('Google physical','http://mt%d.google.com/vt/lyrs=t@145&v=w2.104&x=%d&y=%d&z=%z%',4);
-  AddMapProvider('Google Physical Hybrid','http://mt%d.google.com/vt/lyrs=t@145&v=w2.104&x=%x%&y=%y%&z=%z%',4);
-  AddMapProvider('Google Physical Hybrid','http://mt%d.google.com/vt/lyrs=h@145&v=w2.104&x=%x%&y=%y%&z=%z%',4);}
-  //AddMapProvider('OpenStreetMap Osmarender','http://%serv%.tah.openstreetmap.org/Tiles/tile/%z%/%x%/%y%.png',0,20,3, @getLetterSvr); // [Char(Ord('a')+Random(3)), Z, X, Y]));
-  //AddMapProvider('Yahoo Normal','http://maps%serv%.yimg.com/hx/tl?b=1&v=4.3&.intl=en&x=%x%&y=%y%d&z=%d&r=1'        , 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //(Z+1]));
-  //AddMapProvider('Yahoo Satellite','http://maps%serv%.yimg.com/ae/ximg?v=1.9&t=a&s=256&.intl=en&x=%d&y=%d&z=%d&r=1', 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
-  //AddMapProvider('Yahoo Hybrid','http://maps%serv%.yimg.com/ae/ximg?v=1.9&t=a&s=256&.intl=en&x=%x%&y=%y%&z=%z%&r=1', 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
-  //AddMapProvider('Yahoo Hybrid','http://maps%serv%.yimg.com/hx/tl?b=1&v=4.3&t=h&.intl=en&x=%x%&y=%y%&z=%z%&r=1'    , 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
-
-  MapWin.MapProvider := AddMapProvider('OpenStreetMap Mapnik','http://%serv%.tile.openstreetmap.org/%z%/%x%/%y%.png',0,19, 3, @getLetterSvr);
-  AddMapProvider('Open Cycle Map','http://%serv%.tile.opencyclemap.org/cycle/%z%/%x%/%y%.png',0,18,3, @getLetterSvr);
-  AddMapProvider('Virtual Earth Bing','http://ecn.t%serv%.tiles.virtualearth.net/tiles/r%x%?g=671&mkt=en-us&lbl=l1&stl=h&shading=hill',1,19,8,nil,@GetQuadKey);
-  AddMapProvider('Virtual Earth Road','http://r%serv%.ortho.tiles.virtualearth.net/tiles/r%x%.png?g=72&shading=hill',1,19,4,nil,@getQuadKey);
-  AddMapProvider('Virtual Earth Aerial','http://a%serv%.ortho.tiles.virtualearth.net/tiles/a%x%.jpg?g=72&shading=hill',1,19,4,nil,@getQuadKey);
-  AddMapProvider('Virtual Earth Hybrid','http://h%serv%.ortho.tiles.virtualearth.net/tiles/h%x%.jpg?g=72&shading=hill',1,19,4,nil,@getQuadKey);
-  AddMapProvider('Ovi Normal', 'http://%serv%.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/normal.day/%z%/%x%/%y%/256/png8', 0,20,5,@getLetterSvr);
-  AddMapProvider('Ovi Satellite','http://%serv%.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/satellite.day/%z%/%x%/%y%/256/png8', 0,20,5,@getLetterSvr);
-  AddMapProvider('Ovi Hybrid','http://%serv%.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/hybrid.day/%z%/%x%/%y%/256/png8', 0,20,5,@getLetterSvr);
-  AddMapProvider('Ovi Physical','http://%serv%.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/terrain.day/%z%/%x%/%y%/256/png8', 0,20,5,@getLetterSvr);
-  {
-  AddMapProvider('Yahoo Normal','http://maps%serv%.yimg.com/hx/tl?b=1&v=4.3&.intl=en&x=%x%&y=%y%d&z=%d&r=1'        , 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //(Z+1]));
-  AddMapProvider('Yahoo Satellite','http://maps%serv%.yimg.com/ae/ximg?v=1.9&t=a&s=256&.intl=en&x=%d&y=%d&z=%d&r=1', 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
-  AddMapProvider('Yahoo Hybrid','http://maps%serv%.yimg.com/ae/ximg?v=1.9&t=a&s=256&.intl=en&x=%x%&y=%y%&z=%z%&r=1', 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
-  AddMapProvider('Yahoo Hybrid','http://maps%serv%.yimg.com/hx/tl?b=1&v=4.3&t=h&.intl=en&x=%x%&y=%y%&z=%z%&r=1'    , 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
-  }
-end;
-
-procedure TMapViewerEngine.DrawTile(const TileId: TTileId; X, Y: integer;
-  TileImg: TLazIntfImage);
-begin
-  if Assigned(FOnDrawTile) then
-    FOnDrawTile(TileId, X, Y, TileImg);
-end;
-
 constructor TMapViewerEngine.Create(aOwner: TComponent);
 begin
   DrawTitleInGuiThread := true;
@@ -943,5 +333,658 @@ begin
   inherited Destroy;
 end;
 
+function TMapViewerEngine.AddMapProvider(OpeName: String; Url: String;
+  MinZoom, MaxZoom, NbSvr: integer; GetSvrStr: TGetSvrStr; GetXStr: TGetValStr;
+  GetYStr: TGetValStr; GetZStr: TGetValStr) : TMapProvider;
+var
+  idx :integer;
+Begin
+  idx := lstProvider.IndexOf(OpeName);
+  if idx = -1 then
+  begin
+    Result := TMapProvider.Create(OpeName);
+    lstProvider.AddObject(OpeName, Result);
+  end
+  else
+    Result := TMapProvider(lstProvider.Objects[idx]);
+  Result.AddUrl(Url, NbSvr, MinZoom, MaxZoom, GetSvrStr, GetXStr, GetYStr, GetZStr);
+end;
+
+function TMapViewerEngine.CalculateVisibleTiles(const aWin: TMapWindow): TArea;
+var
+  MaxX, MaxY, startX, startY: int64;
+begin
+  MaxX := (aWin.Width div TILE_SIZE) + 1;
+  MaxY := (aWin.Height div TILE_SIZE) + 1;
+  startX := (-(aWin.X)) div TILE_SIZE;
+  startY := (-(aWin.Y)) div TILE_SIZE;
+  Result.Left := startX;
+  Result.Right := startX + MaxX;
+  Result.Top := startY;
+  Result.Bottom := startY + MaxY;
+end;
+
+procedure TMapViewerEngine.CalculateWin(var aWin: TMapWindow);
+var
+  mx, my: Extended;
+  res: Extended;
+  px, py: Int64;
+begin
+  mx := aWin.Center.Lon * SHIFT / 180.0;
+  my := ln( tan((90 - aWin.Center.Lat) * pi / 360.0 )) / (pi / 180.0);
+  my := my * SHIFT / 180.0;
+
+  res := (2 * pi * EARTH_RADIUS) / (TILE_SIZE * (1 shl aWin.Zoom));
+  px := Round((mx + shift) / res);
+  py := Round((my + shift) / res);
+
+  aWin.X := aWin.Width div 2 - px;
+  aWin.Y := aWin.Height div 2 - py;
+end;
+
+procedure TMapViewerEngine.CancelCurrentDrawing;
+var
+  Jobs: TJobArray;
+begin
+  Jobs := Queue.CancelAllJob(self);
+  Queue.WaitForTerminate(Jobs);
+end;
+
+procedure TMapViewerEngine.ConstraintZoom(var aWin: TMapWindow);
+var
+  zMin, zMax: integer;
+begin
+  if Assigned(aWin.MapProvider) then
+  begin
+    aWin.MapProvider.GetZoomInfos(zMin, zMax);
+    if aWin.Zoom < zMin then
+      aWin.Zoom := zMin;
+    if aWin.Zoom > zMax then
+      aWin.Zoom := zMax;
+  end;
+end;
+
+procedure TMapViewerEngine.DblClick(Sender: TObject);
+var
+  pt: TPoint;
+begin
+  pt.X := DragObj.MouseX;
+  pt.Y := DragObj.MouseY;
+  SetCenter(ScreenToLonLat(pt));
+end;
+
+procedure TMapViewerEngine.DoDrag(Sender: TDragObj);
+begin
+  if Sender.DragSrc = self then
+    MoveMapCenter(Sender);
+end;
+
+procedure TMapViewerEngine.DrawTile(const TileId: TTileId; X, Y: integer;
+  TileImg: TLazIntfImage);
+begin
+  if Assigned(FOnDrawTile) then
+    FOnDrawTile(TileId, X, Y, TileImg);
+end;
+
+procedure TMapViewerEngine.evDownload(Data: TObject; Job: TJob);
+var
+  Id: TTileId;
+  Url: String;
+  Env: TEnvTile;
+  MapO: TMapProvider;
+  lStream: TMemoryStream;
+begin
+  Env := TEnvTile(Data);
+  Id := Env.Tile;
+  MapO := Env.Win.MapProvider;
+  if Assigned(MapO) then
+  begin
+    if not Cache.InCache(MapO, Id) then
+    begin
+      if Assigned(FDownloadEngine) then
+      begin
+        Url := MapO.GetUrlForTile(Id);
+        if Url <> '' then
+        begin
+          lStream := TMemoryStream.Create;
+          try
+            try
+              FDownloadEngine.DownloadFile(Url, lStream);
+              Cache.Add(MapO, Id, lStream);
+            except
+            end;
+          finally
+            FreeAndNil(lStream);
+          end;
+        end;
+      end;
+    end;
+  end;
+
+  if Job.Cancelled then
+    Exit;
+
+  if DrawTitleInGuiThread then
+    Queue.QueueAsyncCall(@TileDownloaded, PtrInt(Env))
+  else
+    TileDownloaded(PtrInt(Env));
+end;
+
+function TMapViewerEngine.GetCacheOnDisk: Boolean;
+begin
+  Result := Cache.UseDisk;
+end;
+
+function TMapViewerEngine.GetCachePath: String;
+begin
+  Result := Cache.BasePath;
+end;
+
+function TMapViewerEngine.GetCenter: TRealPoint;
+begin
+  Result := MapWin.Center;
+end;
+
+function TMapViewerEngine.GetHeight: integer;
+begin
+  Result := MapWin.Height
+end;
+
+function TMapViewerEngine.GetMapProvider: String;
+begin
+  if Assigned(MapWin.MapProvider) then
+    Result := MapWin.MapProvider.Name
+  else
+    Result := '';
+end;
+
+function TMapViewerEngine.GetLetterSvr(id: integer): String;
+begin
+  Result := Char(Ord('a') + id);
+end;
+
+procedure TMapViewerEngine.GetMapProviders(AList: TStrings);
+begin
+  AList.Assign(lstProvider);
+end;
+
+function TMapViewerEngine.GetQuadKey(const Tile : TTileId): string;
+var
+  i, d, m: Longword;
+begin
+  {
+    Bing Maps Tile System
+    http://msdn.microsoft.com/en-us/library/bb259689.aspx
+  }
+  Result := '';
+  for i := Tile.Z downto 1 do
+  begin
+    d := 0;
+    m := 1 shl (i - 1);
+    if (Tile.x and m) <> 0 then
+      Inc(d, 1);
+    if (Tile.y and m) <> 0 then
+      Inc(d, 2);
+    Result := Result + IntToStr(d);
+  end;
+end;
+
+function TMapViewerEngine.GetTileName(const Id: TTileId): String;
+begin
+  Result := IntToStr(Id.X) + '.' + IntToStr(Id.Y) + '.' + IntToStr(Id.Z);
+end;
+
+function TMapViewerEngine.GetUseThreads: Boolean;
+begin
+  Result := Queue.UseThreads;
+end;
+
+function TMapViewerEngine.GetWidth: integer;
+begin
+  Result := MapWin.Width;
+end;
+
+function TMapViewerEngine.GetYahooSvr(id: integer): String;
+Begin
+  Result := IntToStr(id + 1);
+end;
+
+function TMapViewerEngine.GetYahooY(const Tile : TTileId): string;
+begin
+  Result := IntToStr( -(Tile.Y - (1 shl Tile.Z) div 2) - 1);
+end;
+
+function TMapViewerEngine.GetYahooZ(const Tile : TTileId): string;
+Begin
+  result := IntToStr(Tile.Z + 1);
+end;
+
+function TMapViewerEngine.GetZoom: integer;
+begin
+  Result := MapWin.Zoom;
+end;
+
+function TMapViewerEngine.IsCurrentWin(const aWin: TMapWindow): boolean;
+begin
+  Result := (aWin.Zoom = MapWin.Zoom) and
+            (aWin.Center.Lat = MapWin.Center.Lat) and
+            (aWin.Center.Lon = MapWin.Center.Lon) and
+            (aWin.Width = MapWin.Width) and
+            (aWin.Height = MapWin.Height);
+end;
+
+function TMapViewerEngine.IsValidTile(const aWin: TMapWindow;
+  const aTile: TTileId): boolean;
+var
+  tiles: int64;
+begin
+  tiles := 1 shl aWin.Zoom;
+  Result := (aTile.X >= 0) and (aTile.X <= tiles-1) and
+            (aTile.Y >= 0) and (aTile.Y <= tiles-1);
+end;
+
+function TMapViewerEngine.LonLatToMapWin(const aWin: TMapWindow;
+  aPt: TRealPoint): TPoint;
+var
+  tiles: Int64;
+  circumference: Int64;
+  lat: Extended;
+  res: Extended;
+  tmpX,tmpY : Double;
+begin
+  tiles := 1 shl aWin.Zoom;
+  circumference := tiles * TILE_SIZE;
+  tmpX := ((aPt.Lon+ 180.0)*circumference)/360.0;
+
+  res := (2 * pi * EARTH_RADIUS) / circumference;
+
+  tmpY := -aPt.Lat;
+  tmpY := ln(tan((degToRad(tmpY) + pi / 2.0) / 2)) *180 / pi;
+  tmpY:= (((tmpY / 180.0) * SHIFT) + SHIFT) / res;
+
+  tmpX := tmpX + aWin.X;
+  tmpY := tmpY + aWin.Y;
+  Result.X := trunc(tmpX);
+  Result.Y := trunc(tmpY);
+end;
+
+function TMapViewerEngine.LonLatToScreen(aPt: TRealPoint): TPoint;
+Begin
+  Result := LonLatToMapWin(MapWin, aPt);
+end;
+
+function TMapViewerEngine.LonLatToWorldScreen(aPt: TRealPoint): TPoint;
+begin
+  Result := LonLatToScreen(aPt);
+  Result.X := Result.X + MapWin.X;
+  Result.Y := Result.Y + MapWin.Y;
+end;
+
+function TMapViewerEngine.MapWinToLonLat(const aWin: TMapWindow;
+  aPt: TPoint): TRealPoint;
+var
+  tiles: Int64;
+  circumference: Int64;
+  lat: Extended;
+  res: Extended;
+  mPoint : TPoint;
+begin
+  tiles := 1 shl aWin.Zoom;
+  circumference := tiles * TILE_SIZE;
+
+  mPoint.X := aPt.X - aWin.X;
+  mPoint.Y := aPt.Y - aWin.Y;
+
+  if mPoint.X < 0 then
+    mPoint.X := 0
+  else
+  if mPoint.X > circumference then
+    mPoint.X := circumference;
+
+  if mPoint.Y < 0 then
+    mPoint.Y := 0
+  else
+  if mPoint.Y > circumference then
+    mPoint.Y := circumference;
+
+  Result.Lon := ((mPoint.X * 360.0) / circumference) - 180.0;
+
+  res := (2 * pi * EARTH_RADIUS) / circumference;
+  lat := ((mPoint.Y * res - SHIFT) / SHIFT) * 180.0;
+
+  lat := radtodeg (2 * arctan( exp( lat * pi / 180.0)) - pi / 2.0);
+  Result.Lat := -lat;
+
+  if Result.Lat > MAX_LATITUDE then
+    Result.Lat := MAX_LATITUDE
+  else
+  if Result.Lat < MIN_LATITUDE then
+    Result.Lat := MIN_LATITUDE;
+
+  if Result.Lon > MAX_LONGITUDE then
+    Result.Lon := MAX_LONGITUDE
+  else
+  if Result.Lon < MIN_LONGITUDE then
+    Result.Lon := MIN_LONGITUDE;
+end;
+
+procedure TMapViewerEngine.MouseDown(Sender: TObject; Button: TMouseButton;
+  Shift: TShiftState; X, Y: Integer);
+begin
+  if Button = mbLeft then
+    DragObj.MouseDown(self,X,Y);
+end;
+
+procedure TMapViewerEngine.MouseMove(Sender: TObject; Shift: TShiftState;
+  X, Y: Integer);
+begin
+  DragObj.MouseMove(X,Y);
+end;
+
+procedure TMapViewerEngine.MouseUp(Sender: TObject; Button: TMouseButton;
+  Shift: TShiftState; X, Y: Integer);
+begin
+  if Button = mbLeft then
+    DragObj.MouseUp(X,Y);
+end;
+
+procedure TMapViewerEngine.MouseWheel(Sender: TObject;
+  Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint;
+  var Handled: Boolean);
+var
+  Val: Integer;
+  nZoom: integer;
+begin
+  Val := 0;
+  if WheelDelta > 0 then
+    Val := 1;
+  if WheelDelta < 0 then
+    Val := -1;
+  nZoom := Zoom + Val;
+  if (nZoom > 0) and (nZoom < 20) then
+    Zoom := nZoom;
+  Handled := true;
+end;
+
+procedure TMapViewerEngine.MoveMapCenter(Sender: TDragObj);
+var
+  old: TMemObj;
+  nCenter: TRealPoint;
+  Job: TJob;
+  aPt: TPoint;
+Begin
+  if Sender.LnkObj=nil then
+  begin
+    Sender.LnkObj := TMemObj.Create(MapWin);
+  end;
+  old := TMemObj(Sender.LnkObj);
+  aPt.X := old.FWin.Width DIV 2-Sender.OfsX;
+  aPt.Y := old.FWin.Height DIV 2-Sender.OfsY;
+  nCenter := MapWinToLonLat(old.FWin,aPt);
+  SetCenter(nCenter);
+end;
+
+procedure TMapViewerEngine.Redraw;
+begin
+  Redraw(MapWin);
+end;
+
+procedure TMapViewerEngine.Redraw(const aWin: TmapWindow);
+var
+  TilesVis: TArea;
+  x, y : Integer; //int64;
+  Tiles: TTileIdArray;
+  iTile: Integer;
+begin
+  if not(Active) then
+    Exit;
+  Queue.CancelAllJob(self);
+  TilesVis := CalculateVisibleTiles(aWin);
+  SetLength(Tiles, (TilesVis.Bottom - TilesVis.Top + 1) * (TilesVis.Right - TilesVis.Left + 1));
+  iTile := Low(Tiles);
+  for y := TilesVis.Top to TilesVis.Bottom do
+    for X := TilesVis.Left to TilesVis.Right do
+    begin
+      Tiles[iTile].X := X;
+      Tiles[iTile].Y := Y;
+      Tiles[iTile].Z := aWin.Zoom;
+      if IsValidTile(aWin, Tiles[iTile]) then
+        iTile += 1;
+    end;
+  SetLength(Tiles, iTile);
+  if Length(Tiles) > 0 then
+    Queue.AddJob(TLaunchDownloadJob.Create(self, Tiles, aWin), self);
+end;
+
+procedure TMapViewerEngine.RegisterProviders;
+begin
+ AddMapProvider('Aucun','',0,30, 0);
+ {
+  AddMapProvider('Google Satellite','http://khm%d.google.com/kh/v=82&x=%x%&y=%y%&z=%z%&s=Ga',4);
+  AddMapProvider('Google Hybrid','http://khm%d.google.com/kh/v=82&x=%x%&y=%y%&z=%z%&s=Ga',4);
+  AddMapProvider('Google Hybrid','http://mt%d.google.com/vt/lyrs=h@145&v=w2.104&x=%d&y=%d&z=%z%',4);
+  AddMapProvider('Google physical','http://mt%d.google.com/vt/lyrs=t@145&v=w2.104&x=%d&y=%d&z=%z%',4);
+  AddMapProvider('Google Physical Hybrid','http://mt%d.google.com/vt/lyrs=t@145&v=w2.104&x=%x%&y=%y%&z=%z%',4);
+  AddMapProvider('Google Physical Hybrid','http://mt%d.google.com/vt/lyrs=h@145&v=w2.104&x=%x%&y=%y%&z=%z%',4);}
+  //AddMapProvider('OpenStreetMap Osmarender','http://%serv%.tah.openstreetmap.org/Tiles/tile/%z%/%x%/%y%.png',0,20,3, @getLetterSvr); // [Char(Ord('a')+Random(3)), Z, X, Y]));
+  //AddMapProvider('Yahoo Normal','http://maps%serv%.yimg.com/hx/tl?b=1&v=4.3&.intl=en&x=%x%&y=%y%d&z=%d&r=1'        , 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //(Z+1]));
+  //AddMapProvider('Yahoo Satellite','http://maps%serv%.yimg.com/ae/ximg?v=1.9&t=a&s=256&.intl=en&x=%d&y=%d&z=%d&r=1', 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
+  //AddMapProvider('Yahoo Hybrid','http://maps%serv%.yimg.com/ae/ximg?v=1.9&t=a&s=256&.intl=en&x=%x%&y=%y%&z=%z%&r=1', 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
+  //AddMapProvider('Yahoo Hybrid','http://maps%serv%.yimg.com/hx/tl?b=1&v=4.3&t=h&.intl=en&x=%x%&y=%y%&z=%z%&r=1'    , 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
+
+                                       // opeName, Url, MinZoom, MaxZoom, NbSvr, GetSvrStr, GetXStr, GetYStr, GetZStr
+  MapWin.MapProvider := AddMapProvider('OpenStreetMap Mapnik',
+    'http://%serv%.tile.openstreetmap.org/%z%/%x%/%y%.png',
+    0, 19, 3, @GetLetterSvr);
+  AddMapProvider('Open Cycle Map',
+    'http://%serv%.tile.opencyclemap.org/cycle/%z%/%x%/%y%.png',
+    0, 18, 3, @getLetterSvr);
+  AddMapProvider('Virtual Earth Bing',
+    'http://ecn.t%serv%.tiles.virtualearth.net/tiles/r%x%?g=671&mkt=en-us&lbl=l1&stl=h&shading=hill',
+    1, 19, 8, nil, @GetQuadKey);
+  AddMapProvider('Virtual Earth Road',
+    'http://r%serv%.ortho.tiles.virtualearth.net/tiles/r%x%.png?g=72&shading=hill',
+    1, 19, 4, nil, @GetQuadKey);
+  AddMapProvider('Virtual Earth Aerial',
+    'http://a%serv%.ortho.tiles.virtualearth.net/tiles/a%x%.jpg?g=72&shading=hill',
+    1, 19, 4, nil, @GetQuadKey);
+  AddMapProvider('Virtual Earth Hybrid',
+    'http://h%serv%.ortho.tiles.virtualearth.net/tiles/h%x%.jpg?g=72&shading=hill',
+    1, 19, 4, nil, @GetQuadKey);
+  AddMapProvider('Ovi Normal',
+    'http://%serv%.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/normal.day/%z%/%x%/%y%/256/png8',
+    0, 20, 5, @GetLetterSvr);
+  AddMapProvider('Ovi Satellite',
+    'http://%serv%.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/satellite.day/%z%/%x%/%y%/256/png8',
+    0, 20, 5, @GetLetterSvr);
+  AddMapProvider('Ovi Hybrid',
+    'http://%serv%.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/hybrid.day/%z%/%x%/%y%/256/png8',
+    0, 20, 5, @GetLetterSvr);
+  AddMapProvider('Ovi Physical',
+    'http://%serv%.maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/terrain.day/%z%/%x%/%y%/256/png8',
+    0, 20, 5, @GetLetterSvr);
+//  AddMapProvider('Google Normal', 'http://mt%d.google.com/vt/lyrs=m@145&v=w2.104&x=%d&y=%d&z=%d', [Random(4), X, Y, Z]));
+
+
+  {
+  AddMapProvider('Yahoo Normal','http://maps%serv%.yimg.com/hx/tl?b=1&v=4.3&.intl=en&x=%x%&y=%y%d&z=%d&r=1'        , 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //(Z+1]));
+  AddMapProvider('Yahoo Satellite','http://maps%serv%.yimg.com/ae/ximg?v=1.9&t=a&s=256&.intl=en&x=%d&y=%d&z=%d&r=1', 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
+  AddMapProvider('Yahoo Hybrid','http://maps%serv%.yimg.com/ae/ximg?v=1.9&t=a&s=256&.intl=en&x=%x%&y=%y%&z=%z%&r=1', 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
+  AddMapProvider('Yahoo Hybrid','http://maps%serv%.yimg.com/hx/tl?b=1&v=4.3&t=h&.intl=en&x=%x%&y=%y%&z=%z%&r=1'    , 0,20,3,@GetYahooSvr, nil, @getYahooY, @GetYahooZ); //[Random(3)+1, X, YahooY(Y), Z+1]));
+  }
+end;
+
+function TMapViewerEngine.ScreenToLonLat(aPt: TPoint): TRealPoint;
+begin
+  Result := MapWinToLonLat(MapWin, aPt);
+end;
+
+procedure TMapViewerEngine.SetActive(AValue: boolean);
+begin
+  if FActive = AValue then Exit;
+  FActive := AValue;
+  if not(FActive) then
+    Queue.CancelAllJob(self)
+  else begin
+    if Cache.UseDisk then ForceDirectories(Cache.BasePath);
+    Redraw(MapWin);
+  end;
+end;
+
+procedure TMapViewerEngine.SetCacheOnDisk(AValue: Boolean);
+begin
+  if Cache.UseDisk = AValue then Exit;
+  Cache.UseDisk := AValue;
+end;
+
+procedure TMapViewerEngine.SetCachePath(AValue: String);
+begin
+  Cache.BasePath := aValue;
+end;
+
+procedure TMapViewerEngine.SetCenter(aCenter: TRealPoint);
+begin
+  if (MapWin.Center.Lon <> aCenter.Lon) and (MapWin.Center.Lat <> aCenter.Lat) then
+  begin
+    Mapwin.Center := aCenter;
+    CalculateWin(MapWin);
+    Redraw(MapWin);
+    if assigned(OnCenterMove) then
+      OnCenterMove(Self);
+    if Assigned(OnChange) then
+      OnChange(Self);
+  end;
+end;
+
+procedure TMapViewerEngine.SetDownloadEngine(AValue: TMvCustomDownloadEngine);
+begin
+  if FDownloadEngine = AValue then Exit;
+  FDownloadEngine := AValue;
+  if Assigned(FDownloadEngine) then
+    FDownloadEngine.FreeNotification(self);
+end;
+
+procedure TMapViewerEngine.SetHeight(AValue: integer);
+begin
+  if MapWin.Height = AValue then Exit;
+  MapWin.Height := AValue;
+  CalculateWin(MapWin);
+  Redraw(MapWin);
+end;
+
+procedure TMapViewerEngine.SetMapProvider(AValue: String);
+var
+  idx: integer;
+  zMin, zMax: integer;
+begin
+  idx := lstProvider.IndexOf(aValue);
+  if not ((aValue = '') or (idx <> -1)) then
+    raise Exception.Create('Unknow Provider : ' + aValue);
+  if Assigned(MapWin.MapProvider) and (MapWin.MapProvider.Name = AValue) then Exit;
+  if idx <> -1 then
+  begin
+    MapWin.MapProvider := TMapProvider(lstProvider.Objects[idx]);
+    ConstraintZoom(MapWin);
+  end
+  else
+    MapWin.MapProvider := nil;
+  if Assigned(MapWin.MapProvider) then
+    Redraw(MapWin);
+end;
+
+procedure TMapViewerEngine.SetSize(aWidth, aHeight: integer);
+begin
+  if (MapWin.Width = aWidth) and (MapWin.Height = aHeight) then Exit;
+  CancelCurrentDrawing;
+  MapWin.Width := aWidth;
+  MapWin.Height := aHeight;
+  CalculateWin(MapWin);
+  Redraw(MapWin);
+  if Assigned(OnChange) then
+    OnChange(Self);
+end;
+
+procedure TMapViewerEngine.SetUseThreads(AValue: Boolean);
+begin
+  if Queue.UseThreads = AValue then Exit;
+  Queue.UseThreads := AValue;
+  Cache.UseThreads := AValue;
+end;
+
+procedure TMapViewerEngine.SetWidth(AValue: integer);
+begin
+  if MapWin.Width = AValue then Exit;
+  MapWin.Width := AValue;
+  CalculateWin(MapWin);
+  Redraw(MapWin);
+end;
+
+procedure TMapViewerEngine.SetZoom(AValue: integer);
+begin
+  if MapWin.Zoom = AValue then Exit;
+  MapWin.Zoom := AValue;
+  ConstraintZoom(MapWin);
+  CalculateWin(MapWin);
+  Redraw(MapWin);
+  if Assigned(OnZoomChange) then
+    OnZoomChange(Self);
+  if Assigned(OnChange) then
+    OnChange(Self);
+end;
+
+procedure TMapViewerEngine.TileDownloaded(Data: PtrInt);
+var
+  EnvTile: TEnvTile;
+  img: TLazIntfImage;
+  X, Y: integer;
+begin
+  EnvTile := TEnvTile(Data);
+  try
+    if IsCurrentWin(EnvTile.Win)then
+    begin
+       Cache.GetFromCache(EnvTile.Win.MapProvider, EnvTile.Tile, img);
+       X := EnvTile.Win.X + EnvTile.Tile.X * TILE_SIZE; // begin of X
+       Y := EnvTile.Win.Y + EnvTile.Tile.Y * TILE_SIZE; // begin of X
+       DrawTile(EnvTile.Tile, X, Y, img);
+    end;
+  finally
+    FreeAndNil(EnvTile);
+  end;
+end;
+
+function TMapViewerEngine.WorldScreenToLonLat(aPt: TPoint): TRealPoint;
+begin
+  aPt.X := aPt.X - MapWin.X;
+  aPt.Y := aPt.Y - MapWin.Y;
+  Result := ScreenToLonLat(aPt);
+end;
+
+procedure TMapViewerEngine.ZoomOnArea(const aArea: TRealArea);
+var
+  tmpWin: TMapWindow;
+  visArea: TRealArea;
+  TopLeft, BottomRight: TPoint;
+begin
+  tmpWin := MapWin;
+  tmpWin.Center.Lon := (aArea.TopLeft.Lon + aArea.BottomRight.Lon) / 2;
+  tmpWin.Center.Lat := (aArea.TopLeft.Lat + aArea.BottomRight.Lat) / 2;
+  tmpWin.Zoom := 15;
+  TopLeft.X := 0;
+  TopLeft.Y := 0;
+  BottomRight.X := tmpWin.Width;
+  BottomRight.Y := tmpWin.Height;
+  Repeat
+    CalculateWin(tmpWin);
+    visArea.TopLeft := MapWinToLonLat(tmpWin, TopLeft);
+    visArea.BottomRight := MapWinToLonLat(tmpWin, BottomRight);
+    if AreaInsideArea(aArea, visArea) then
+      break;
+    dec(tmpWin.Zoom);
+  until (tmpWin.Zoom = 2);
+  MapWin := tmpWin;
+  Redraw(MapWin);
+end;
+
+
 end.
 
diff --git a/components/lazmapviewer/source/mvmapprovider.pas b/components/lazmapviewer/source/mvmapprovider.pas
index 9c9657469..c008542b3 100644
--- a/components/lazmapviewer/source/mvmapprovider.pas
+++ b/components/lazmapviewer/source/mvmapprovider.pas
@@ -38,29 +38,31 @@ Type
 
   TMapProvider = Class
     private
-      FLayer : integer;
-      idServer : Array of Integer;
-      FName : String;
-      FUrl : Array of string;
-      FNbSvr : Array of integer;
-      FGetSvrStr : Array of TGetSvrStr;
-      FGetXStr : Array of TGetValStr;
-      FGetYStr : Array of TGetValStr;
-      FGetZStr : Array of TGetValStr;
-      FMinZoom : Array of integer;
-      FMaxZoom : Array of integer;
-      function getLayerCount: integer;
+      FLayer: integer;
+      idServer: Array of Integer;
+      FName: String;
+      FUrl: Array of string;
+      FNbSvr: Array of integer;
+      FGetSvrStr: Array of TGetSvrStr;
+      FGetXStr: Array of TGetValStr;
+      FGetYStr: Array of TGetValStr;
+      FGetZStr: Array of TGetValStr;
+      FMinZoom: Array of integer;
+      FMaxZoom: Array of integer;
+      function GetLayerCount: integer;
       procedure SetLayer(AValue: integer);
 
     public
-      constructor Create(aName : String);
+      constructor Create(AName: String);
       destructor Destroy; override;
-      procedure AddURL(Url: String; NbSvr: integer;aMinZoom : integer;aMaxZoom : integer; GetSvrStr: TGetSvrStr; GetXStr: TGetValStr; GetYStr: TGetValStr; GetZStr: TGetValStr);
-      procedure GetZoomInfos(out zMin:integer;out zMax : integer);
-      Function GetUrlForTile(id : TTileId) : String;
-      property Name : String read FName;
-      property LayerCount : integer read getLayerCount;
-      property Layer : integer read FLayer write SetLayer;
+      procedure AddURL(Url: String; NbSvr, aMinZoom, aMaxZoom: integer;
+        GetSvrStr: TGetSvrStr; GetXStr: TGetValStr; GetYStr: TGetValStr;
+        GetZStr: TGetValStr);
+      procedure GetZoomInfos(out AZoomMin, AZoomMax: integer);
+      Function GetUrlForTile(id: TTileId): String;
+      property Name: String read FName;
+      property LayerCount: integer read GetLayerCount;
+      property Layer: integer read FLayer write SetLayer;
   end;
 
 
@@ -131,41 +133,42 @@ begin
   FLayer:=low(FUrl);
 end;
 
-procedure TMapProvider.GetZoomInfos(out zMin: integer; out zMax: integer);
+procedure TMapProvider.GetZoomInfos(out AZoomMin, AZoomMax: integer);
 begin
-  zMin:=FMinZoom[layer];
-  zMax:=FMaxZoom[layer];
+  AZoomMin := FMinZoom[layer];
+  AZoomMax := FMaxZoom[layer];
 end;
 
 function TMapProvider.GetUrlForTile(id: TTileId): String;
-var i : integer;
-    XVal,yVal,zVal,SvrVal : String;
-    idsvr: integer;
+var
+  i: integer;
+  XVal, yVal, zVal, SvrVal: String;
+  idsvr: integer;
 begin
-  Result:='';
-  i:=layer;
-  if (i>high(idServer)) or (i<low(idServer)) or (FNbSvr[i]=0) then
+  Result := '';
+  i := layer;
+  if (i > High(idServer)) or (i < Low(idServer)) or (FNbSvr[i] = 0) then
     exit;
 
-  idsvr:=idServer[i] mod FNbSvr[i];
-  idServer[i]+=1;
+  idsvr := idServer[i] mod FNbSvr[i];
+  idServer[i] += 1;
 
-  SvrVal:=inttostr(idsvr);
-  XVal:=inttostr(id.X);
-  YVal:=inttostr(id.Y);
-  ZVal:=inttostr(id.Z);
+  SvrVal := IntToStr(idsvr);
+  XVal := IntToStr(id.X);
+  YVal := IntToStr(id.Y);
+  ZVal := IntToStr(id.Z);
   if Assigned(FGetSvrStr[i]) then
-     SvrVal:=FGetSvrStr[i](idsvr);
+    SvrVal := FGetSvrStr[i](idsvr);
   if Assigned(FGetXStr[i]) then
-     XVal:=FGetXStr[i](id);
+    XVal := FGetXStr[i](id);
   if Assigned(FGetYStr[i]) then
-     YVal:=FGetYStr[i](id);
+    YVal := FGetYStr[i](id);
   if Assigned(FGetZStr[i]) then
-     ZVal:=FGetZStr[i](id);
-  Result:=StringReplace(FUrl[i],'%serv%',SvrVal,[rfreplaceall]);
-  Result:=StringReplace(Result,'%x%',XVal,[rfreplaceall]);
-  Result:=StringReplace(Result,'%y%',YVal,[rfreplaceall]);
-  Result:=StringReplace(Result,'%z%',ZVal,[rfreplaceall]);
+    ZVal := FGetZStr[i](id);
+  Result := StringReplace(FUrl[i], '%serv%', SvrVal, [rfreplaceall]);
+  Result := StringReplace(Result, '%x%', XVal, [rfreplaceall]);
+  Result := StringReplace(Result, '%y%', YVal, [rfreplaceall]);
+  Result := StringReplace(Result, '%z%', ZVal, [rfreplaceall]);
 end;
 
 end.