diff --git a/components/lazmapviewer/examples/fulldemo/main.pas b/components/lazmapviewer/examples/fulldemo/main.pas
index d4c4d8dc3..351e2fbb6 100644
--- a/components/lazmapviewer/examples/fulldemo/main.pas
+++ b/components/lazmapviewer/examples/fulldemo/main.pas
@@ -8,14 +8,14 @@
 unit Main;
 
 {$mode objfpc}{$H+}
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 interface
 
 uses
   Classes, SysUtils, Types, Forms, Controls, Graphics, Dialogs, ExtCtrls,
   StdCtrls, ComCtrls, Buttons, IntfGraphics, PrintersDlgs,
   Grids, ExtDlgs,
-  mvGeoMath, mvGeoNames, mvMapViewer, mvTypes, mvGpsObj, mvDrawingEngine,
+  mvMapViewer, mvTypes, mvGpsObj, mvGeoNames, mvDrawingEngine,
   {$IFDEF WITH_ADDONS}ConfigFrame_with_Addons{$ELSE}ConfigFrame{$ENDIF};
 
 type
@@ -125,7 +125,7 @@ implementation
 uses
   LCLType, IniFiles, Math, FPCanvas, FPImage, GraphType,
   Printers, OSPrinters,
-  mvEngine, mvGPX,
+  mvEngine, mvGPX, mvGeoMath,
   globals, gpsPtForm, gpslistform;
 
 type
diff --git a/components/lazmapviewer/source/mvmapviewer.pas b/components/lazmapviewer/source/mvmapviewer.pas
index a9f26e624..1f1a69e36 100644
--- a/components/lazmapviewer/source/mvmapviewer.pas
+++ b/components/lazmapviewer/source/mvmapviewer.pas
@@ -705,8 +705,10 @@ type
       function LatLonToScreen(aPt: TRealPoint): TPoint;
       function LatLonToScreen(Lat, Lon: Double): TPoint; overload;
       function LonLatToScreen(aPt: TRealPoint): TPoint; deprecated 'Use LatLonToScreen';
-      function ObjsAtScreenPt(X, Y: Integer; ATolerance: Integer = -1): TGPSObjArray;
-      function VisibleObjsAtScreenPt(X, Y: Integer; ATolerance: Integer = -1): TGPSObjArray;
+      function ObjsAtScreenPt(X, Y: Integer; ATolerance: Integer = -1;
+        AClass: TGPSObjClass = nil): TGPSObjArray;
+      function VisibleObjsAtScreenPt(X, Y: Integer; ATolerance: Integer = -1;
+        AClass: TGPSObjClass = nil): TGPSObjArray;
       procedure SaveToFile(AClass: TRasterImageClass; const AFileName: String);
       function SaveToImage(AClass: TRasterImageClass): TRasterImage;
       procedure SaveToStream(AClass: TRasterImageClass; AStream: TStream);
@@ -3962,18 +3964,20 @@ begin
   end;
 end;
 
-function TMapView.ObjsAtScreenPt(X, Y: Integer; ATolerance: Integer = -1): TGPSObjArray;
+function TMapView.ObjsAtScreenPt(X, Y: Integer; ATolerance: Integer = -1;
+  AClass: TGPSObjClass = nil): TGPSObjArray;
 begin
   if ATolerance = -1 then
     ATolerance := POINT_DELTA;
-  Result := FindObjsAtScreenPt(X, Y, ATolerance, false);
+  Result := FindObjsAtScreenPt(X, Y, ATolerance, false, AClass);
 end;
 
-function TMapView.VisibleObjsAtScreenPt(X, Y: Integer; ATolerance: Integer = -1): TGPSObjArray;
+function TMapView.VisibleObjsAtScreenPt(X, Y: Integer; ATolerance: Integer = -1;
+  AClass: TGPSObjClass = nil): TGPSObjArray;
 begin
   if ATolerance = -1 then
     ATolerance := POINT_DELTA;
-  Result := FindObjsAtScreenPt(X, Y, ATolerance, true);
+  Result := FindObjsAtScreenPt(X, Y, ATolerance, true, AClass);
 end;
 
 procedure TMapView.CenterOnArea(const aArea: TRealArea);