diff --git a/components/lazmapviewer/examples/fulldemo_with_addons/main.lfm b/components/lazmapviewer/examples/fulldemo_with_addons/main.lfm
index ea431c69a..aef6b3ef6 100644
--- a/components/lazmapviewer/examples/fulldemo_with_addons/main.lfm
+++ b/components/lazmapviewer/examples/fulldemo_with_addons/main.lfm
@@ -18,6 +18,7 @@ object MainForm: TMainForm
     Top = 0
     Width = 608
     Align = alClient
+    Cyclic = True
     DefaultTrackColor = clBlue
     DefaultTrackWidth = 3
     DownloadEngine = MapView.BuiltInDLE
@@ -36,9 +37,9 @@ object MainForm: TMainForm
     Height = 640
     Top = 0
     Width = 275
-    ActivePage = PgConfig
+    ActivePage = PgData
     Align = alRight
-    TabIndex = 1
+    TabIndex = 0
     TabOrder = 1
     object PgData: TTabSheet
       Caption = 'Data'
@@ -859,6 +860,21 @@ object MainForm: TMainForm
         TabOrder = 9
         Text = 'default'
       end
+      object CbCyclic: TCheckBox
+        AnchorSideLeft.Control = CbZoomToCursor
+        AnchorSideLeft.Side = asrBottom
+        AnchorSideTop.Control = CbZoomToCursor
+        Left = 130
+        Height = 19
+        Top = 150
+        Width = 77
+        BorderSpacing.Left = 24
+        Caption = 'Cyclic view'
+        Checked = True
+        OnChange = CbCyclicChange
+        State = cbChecked
+        TabOrder = 10
+      end
     end
   end
   object GeoNames: TMVGeoNames
diff --git a/components/lazmapviewer/examples/fulldemo_with_addons/main.pas b/components/lazmapviewer/examples/fulldemo_with_addons/main.pas
index eadced45d..4fd65ee29 100644
--- a/components/lazmapviewer/examples/fulldemo_with_addons/main.pas
+++ b/components/lazmapviewer/examples/fulldemo_with_addons/main.pas
@@ -35,6 +35,7 @@ type
     CbShowPOIImage: TCheckBox;
     cbPOITextBgColor: TColorBox;
     CbZoomToCursor: TCheckBox;
+    CbCyclic: TCheckBox;
     FontDialog: TFontDialog;
     GbCenterCoords: TGroupBox;
     GbScreenSize: TGroupBox;
@@ -87,6 +88,7 @@ type
     procedure CbUseThreadsChange(Sender: TObject);
     procedure CbDistanceUnitsChange(Sender: TObject);
     procedure CbZoomToCursorChange(Sender: TObject);
+    procedure CbCyclicChange(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -373,6 +375,12 @@ begin
   MapView.ZoomToCursor := CbZoomToCursor.Checked;
 end;
 
+procedure TMainForm.CbCyclicChange(Sender: TObject);
+begin
+  MapView.Cyclic := CbCyclic.Checked;
+  MapView.Redraw;
+end;
+
 procedure TMainForm.ClearFoundLocations;
 var
   i: Integer;
diff --git a/components/lazmapviewer/examples/fulldemo_with_addons/MapViewer_Demo.lpi b/components/lazmapviewer/examples/fulldemo_with_addons/mapviewer_demo_with_addons.lpi
similarity index 91%
rename from components/lazmapviewer/examples/fulldemo_with_addons/MapViewer_Demo.lpi
rename to components/lazmapviewer/examples/fulldemo_with_addons/mapviewer_demo_with_addons.lpi
index 4e6398d0d..c89a8411c 100644
--- a/components/lazmapviewer/examples/fulldemo_with_addons/MapViewer_Demo.lpi
+++ b/components/lazmapviewer/examples/fulldemo_with_addons/mapviewer_demo_with_addons.lpi
@@ -8,7 +8,7 @@
         <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <Title Value="MapViewer_Demo"/>
+      <Title Value="mapviewer_demo_with_addons"/>
       <Scaled Value="True"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -44,8 +44,9 @@
     </RequiredPackages>
     <Units Count="4">
       <Unit0>
-        <Filename Value="MapViewer_Demo.lpr"/>
+        <Filename Value="mapviewer_demo_with_addons.lpr"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="MapViewer_Demo_with_AddOns"/>
       </Unit0>
       <Unit1>
         <Filename Value="main.pas"/>
@@ -72,7 +73,7 @@
     <Version Value="11"/>
     <PathDelim Value="\"/>
     <Target>
-      <Filename Value="bin\$(TargetCPU)-$(TargetOS)\MapViewer_Demo"/>
+      <Filename Value="bin\$(TargetCPU)-$(TargetOS)\mapviewer_demo_with_addons"/>
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
diff --git a/components/lazmapviewer/examples/fulldemo_with_addons/MapViewer_Demo.lpr b/components/lazmapviewer/examples/fulldemo_with_addons/mapviewer_demo_with_addons.lpr
similarity index 92%
rename from components/lazmapviewer/examples/fulldemo_with_addons/MapViewer_Demo.lpr
rename to components/lazmapviewer/examples/fulldemo_with_addons/mapviewer_demo_with_addons.lpr
index 2aebd7ef3..b16253ab1 100644
--- a/components/lazmapviewer/examples/fulldemo_with_addons/MapViewer_Demo.lpr
+++ b/components/lazmapviewer/examples/fulldemo_with_addons/mapviewer_demo_with_addons.lpr
@@ -1,4 +1,4 @@
-program MapViewer_Demo;
+program MapViewer_Demo_with_AddOns;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/lazmapviewer/lazmapviewer_all.lpg b/components/lazmapviewer/lazmapviewer_all.lpg
new file mode 100644
index 000000000..8b3635eb5
--- /dev/null
+++ b/components/lazmapviewer/lazmapviewer_all.lpg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectGroup FileVersion="2">
+    <Targets>
+      <Target FileName="lazmapviewerpkg.lpk"/>
+      <Target FileName="lazmapviewer_rgbgraphics.lpk"/>
+      <Target FileName="lazmapviewer_bgra.lpk"/>
+      <Target FileName="lazmapviewer_synapse.lpk"/>
+      <Target FileName="examples\colored_tracks\coloredtracks_demo.lpi">
+        <BuildModes>
+          <Mode Name="Default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="examples\trackdemo\track_demo.lpi">
+        <BuildModes>
+          <Mode Name="Default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="examples\fulldemo\MapViewer_Demo.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="examples\fulldemo_with_addons\mapviewer_demo_with_addons.lpi">
+        <BuildModes>
+          <Mode Name="default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="unittests\mapviewer_tests.lpi">
+        <BuildModes>
+          <Mode Name="Default"/>
+        </BuildModes>
+      </Target>
+    </Targets>
+  </ProjectGroup>
+</CONFIG>