LazMapViewer: refactor finding of point groups in TMarkerSelectAndDragPlugin

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9693 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/MarkerSelectAndDrag_Demo.lpi

@@ -59,8 +59,12 @@
     <Linking>
       <Debugging>
         <DebugInfoType Value="dsDwarf3"/>
-        <UseHeaptrc Value="True"/>
       </Debugging>
+      <Options>
+        <Win32>
+          <GraphicApplication Value="True"/>
+        </Win32>
+      </Options>
     </Linking>
   </CompilerOptions>
   <Debugging>

components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/main.pas

@@ -155,14 +155,7 @@ var
   i: Integer;
 begin
   MapView.Active := true;
-  (*
+
-  AddGPSMarker(   0.0000000, 51.4825766, 'Greenwich');
-  AddGPSMarker(   2.2945500, 48.8582300, 'Tour d´Eiffel, Paris');
-  AddGPSMarker( -79.3884000, 43.6439500, 'CN Tower, Toronto');
-  AddMapMarker(-157.7739800, 21.2716900, 'Kahala Avenue, Honolulu');
-  AddMapMarker( 114.1497900, 22.2708100, 'The Peak, Hong Kong');
-  AddMapMarker(  13.377778,  52.5163890, 'Brandenburger Tor, Berlin');
-    *)
   AddGPSMarker(RealPoint(51.4825766,    0.000000), 'Greenwich');
   AddGPSMarker(RealPoint(48.8582300,    2.294550), 'Tour d´Eiffel, Paris');
   AddGPSMarker(RealPoint(43.6439500,  -79.388400), 'CN Tower, Toronto');
@@ -205,9 +198,11 @@ begin
 end;
 
 procedure TMainForm.btnConvertToTrackClick(Sender: TObject);
+const
+  counter: Integer = 0;
 begin
   case rgGpsObjOrMapItem.ItemIndex of
-    0: with Plugin.ConvertSelectedPointsToGPSTrack(MapView, 2000) do
+    0: with Plugin.ConvertSelectedPointsToGPSTrack(MapView, 2000 + counter) do
        begin
          LineColor := clGreen;
          lineWidth := 1.0;
@@ -218,12 +213,15 @@ begin
          LineWidth := 1.0;
       end;
   end;
+  inc(counter);
 end;
 
 procedure TMainForm.btnConvertToAreaClick(Sender: TObject);
+var
+  counter: Integer = 0;
 begin
   case rgGpsObjOrMapItem.ItemIndex of
-    0: with Plugin.ConvertSelectedPointsToGPSArea(MapView, 2001) do
+    0: with Plugin.ConvertSelectedPointsToGPSArea(MapView, 3000 + counter) do
        begin
          FillColor := clGray;
          LineColor := clBlack;
@@ -236,6 +234,7 @@ begin
          Opacity := 0.5;
        end;
   end;
+  inc(counter);
 end;
 
 procedure TMainForm.cbMultiSelectChange(Sender: TObject);

components/lazmapviewer/source/addons/plugins/markers/mvmarkerplugins.pas

@@ -119,6 +119,8 @@ type
     procedure DrawPoint(AMapView: TMapView; ADrawingEngine: TMvCustomDrawingEngine;
       AGpsPoint: TGPSPoint; AScreenPoint: TPoint; AMarkerSize: Integer);
     procedure DrawSelection(AMapView: TMapView);
+    procedure FindContainerOfPoint(AMapView: TMapView; APoint: TGPSPoint; var AContainer: TGPSObj; var AIndex: Integer);
+    procedure FindMapCollection(AMapView: TMapView; APoint: TGPSPoint; var ACollection: TMapCollectionBase; var AIndex: Integer);
     procedure MoveSelectionBy(AMapView: TMapView; dx, dy: Integer);
     procedure ToggleSelected(AMapView: TMapView; APoint: TGPSPoint);
   protected
@@ -522,92 +524,27 @@ end;
 procedure TMarkerSelectAndDragPlugin.DeleteFromList(AMapView: TMapView;
   APoint: TGPSPoint);
 var
-  i, j, k: Integer;
+  gpsObj: TGPSObj;
-  gpsLayer: TGPSObjectList;
+  collection: TMapCollectionBase = nil;
-  gpsPolyline: TGPSPolyLine;
+  idx: Integer = -1;
-  item: TGPSObj;
-  p: TMapPoint;
-  mapLayer: TMapLayer;
-  mapTrack: TMapTrack;
-  mapArea: TMapArea;
-
-  function IsSamePoint(AItem: TGPSObj): Boolean;
-  begin
-    Result := (AItem is TGPSPoint) and TGPSPoint(AItem).RealPoint.Equal(APoint.RealPoint);
-  end;
-
 begin
-  // Check the 10 layers of GPSItems
+  // Find the point in the GPS lists
-  for i := 0 to 9 do
+  FindContainerOfPoint(AMapView, APoint, gpsObj, idx);
+  if (gpsObj is TGPSObjectList) then
   begin
-    gpsLayer := AMapView.GPSLayer[i];
+    TGPSObjectList(gpsObj).Delete(APoint);
-    for j := 0 to gpsLayer.Count-1 do
+    exit;
-    begin
+  end else
-      item := gpsLayer[j];
+  if (gpsObj is TGPSPolyLine) then
-      if IsSamePoint(item) then
+  begin
-      begin
+    TGPSPolyLine(gpsObj).Points.Delete(idx);
-        gpsLayer.Delete(item);
+    exit;
-        exit;
-      end;
-      if (item is TGPSPolyline) then
-      begin
-        gpsPolyLine := TGPSPolyLine(item);
-        for k := 0 to gpsPolyLine.Points.Count-1 do
-        begin
-          item := gpsPolyLine.Points[k];
-          if IsSamePoint(item) then
-          begin
-            gpsPolyLine.Points.Delete(k);
-            exit;
-          end;
-        end;
-      end;
-    end;
   end;
 
-  // Check the map layers
+  // Find the point in the map collections
-  for i := 0 to AMapView.Layers.Count-1 do
+  FindMapCollection(AMapView, APoint, collection, idx);
-  begin
+  if collection <> nil then
-    mapLayer := AMapView.Layers[i];
+    collection.Delete(idx);
-    // Points of interest?
-    for j := 0 to mapLayer.PointsOfInterest.Count-1 do
-    begin
-      p := mapLayer.PointsOfInterest[j];
-      if IsSamePoint(p.GPSObj) then
-      begin
-        mapLayer.PointsOfInterest.Delete(j);
-        exit;
-      end;
-    end;
-    // Tracks?
-    for j := 0 to mapLayer.Tracks.Count-1 do
-    begin
-      mapTrack := mapLayer.Tracks[j];
-      for k := 0 to mapTrack.Points.Count-1 do
-      begin
-        p := mapTrack.Points[k];
-        if IsSamePoint(p.GPSObj) then
-        begin
-          mapTrack.Points.Delete(k);
-          exit;
-        end;
-      end;
-    end;
-    // Areas?
-    for j := 0 to mapLayer.Areas.Count-1 do
-    begin
-      mapArea := mapLayer.Areas[j];
-      for k := 0 to mapArea.Points.Count-1 do
-      begin
-        p := mapArea.Points[k];
-        if IsSamePoint(p.GPSObj) then
-        begin
-          mapArea.Points.Delete(k);
-          exit;
-        end;
-      end;
-    end;
-  end;
 end;
 
 procedure TMarkerSelectAndDragPlugin.DeleteSelectedPoints(AMapView: TMapView);
@@ -714,6 +651,125 @@ begin
   end;
 end;
 
+procedure TMarkerSelectAndDragPlugin.FindContainerOfPoint(AMapView: TMapView;
+  APoint: TGPSPoint; var AContainer: TGPSObj; var AIndex: Integer);
+var
+  i, j, k: Integer;
+  gpsLayer: TGPSObjectList;
+  gpsPolyline: TGPSPolyLine;
+  item: TGPSObj;
+
+  function IsSamePoint(AItem: TGPSObj): Boolean;
+  begin
+    Result := (AItem is TGPSPoint) and TGPSPoint(AItem).RealPoint.Equal(APoint.RealPoint);
+  end;
+
+begin
+  // Iterate over the 10 layers of GPSItems
+  for i := 0 to 9 do
+  begin
+    gpsLayer := AMapView.GPSLayer[i];
+    for j := 0 to gpsLayer.Count-1 do
+    begin
+      item := gpsLayer[j];
+      if IsSamePoint(item) then
+      begin
+        AContainer := gpsLayer;
+        AIndex := j;
+        exit;
+      end;
+
+      if (item is TGPSPolyline) then
+      begin
+        gpsPolyLine := TGPSPolyLine(item);
+        for k := 0 to gpsPolyLine.Points.Count-1 do
+        begin
+          item := gpsPolyLine.Points[k];
+          if IsSamePoint(item) then
+          begin
+            AContainer := gpsPolyLine;
+            AIndex := k;
+            exit;
+          end;
+        end;
+      end;
+    end;
+  end;
+
+  // If we get here the point has not been found.
+  AContainer := nil;
+  AIndex := -1;
+end;
+
+{ Tries to find the point in one of the map-type collections of all layers.
+  If found, returns the collection and the index of the point in the collection.
+  Otherwise, nil and -1 are returned, respectively. }
+procedure TMarkerSelectAndDragPlugin.FindMapCollection(AMapView: TMapView;
+  APoint: TGPSPoint; var ACollection: TMapCollectionBase; var AIndex: Integer);
+var
+  i, j, k: Integer;
+  p: TMapPoint;
+  mapLayer: TMapLayer;
+  mapTrack: TMapTrack;
+  mapArea: TMapArea;
+
+  function IsSamePoint(AItem: TGPSObj): Boolean;
+  begin
+    Result := (AItem is TGPSPoint) and TGPSPoint(AItem).RealPoint.Equal(APoint.RealPoint);
+  end;
+
+begin
+  // Iterate over all map-layers
+  for i := 0 to AMapView.Layers.Count-1 do
+  begin
+    mapLayer := AMapView.Layers[i];
+    // Points of interest?
+    for j := 0 to mapLayer.PointsOfInterest.Count-1 do
+    begin
+      p := mapLayer.PointsOfInterest[j];
+      if IsSamePoint(p.GPSObj) then
+      begin
+        ACollection := mapLayer.PointsOfInterest;
+        AIndex := j;
+        exit;
+      end;
+    end;
+    // Tracks?
+    for j := 0 to mapLayer.Tracks.Count-1 do
+    begin
+      mapTrack := mapLayer.Tracks[j];
+      for k := 0 to mapTrack.Points.Count-1 do
+      begin
+        p := mapTrack.Points[k];
+        if IsSamePoint(p.GPSObj) then
+        begin
+          ACollection := mapTrack.Points;
+          AIndex := k;
+          exit;
+        end;
+      end;
+    end;
+    // Areas?
+    for j := 0 to mapLayer.Areas.Count-1 do
+    begin
+      mapArea := mapLayer.Areas[j];
+      for k := 0 to mapArea.Points.Count-1 do
+      begin
+        p := mapArea.Points[k];
+        if IsSamePoint(p.GPSObj) then
+        begin
+          ACollection := mapArea.Points;
+          AIndex := k;
+          exit;
+        end;
+      end;
+    end;
+  end;
+  // When we get here, the point has not been found.
+  ACollection := nil;
+  AIndex := -1;
+end;
+
 procedure TMarkerSelectAndDragPlugin.MoveSelectionBy(AMapView: TMapView; dx, dy: Integer);
 var
   i: Integer;
@@ -791,20 +847,13 @@ end;
 procedure TMarkerSelectAndDragPlugin.SelectAllPointsOfShape(AMapView: TMapView;
   APoint: TGPSPoint);
 var
-  i, j, k, L: Integer;
+  obj: TGPSObj = nil;
-  gpsLayer: TGPSObjectList;
+  collection: TMapCollectionBase = nil;
-  gpsPOI: TGPSPointOfInterest;
+  idx: Integer = -1;
+  i: Integer;
   gpsPolyline: TGPSPolyLine;
   item: TGPSObj;
   p: TMapPoint;
-  mapLayer: TMapLayer;
-  mapTrack: TMapTrack;
-  mapArea: TMapArea;
-
-  function IsSamePoint(AItem: TGPSObj): Boolean;
-  begin
-    Result := (AItem is TGPSPoint) and TGPSPoint(AItem).RealPoint.Equal(APoint.RealPoint);
-  end;
 
   procedure Finished;
   begin
@@ -814,98 +863,45 @@ var
   end;
 
 begin
-  // Check the 10 layers of GPSItems
+  // Find point in gpsObj-type of containers
-  for i := 0 to 9 do
+  FindContainerOfPoint(AMapView, APoint, obj, idx);
+  // Is is a point of interest?
+  if obj is TGPSObjectList then
   begin
-    gpsLayer := AMapView.GPSLayer[i];
+    item := TGPSObjectList(obj).Items[idx];
-    for j := 0 to gpsLayer.Count-1 do
+    AddToSelection(AMapView, TGPSPoint(item));
+    Finished;
+    exit;
+  end else
+  // ... or a track / layer?
+  if obj is TGPSPolyLine then
+  begin
+    gpsPolyLine := TGPSPolyLine(obj);
+    for i := 0 to gpsPolyLine.Points.Count-1 do
     begin
-      item := gpsLayer[j];
+      item := TGPSPoint(gpsPolyLine.Points[i]);
-      if (item is TGPSPointOfInterest) then
+      AddToSelection(AMapView, TGPSPoint(item));
-      begin
-        gpsPOI := TGPSPointOfInterest(item);
-        if gpsPOI.RealPoint.Equal(APoint.RealPoint) then
-        begin
-          AddToSelection(AMapView, TGPSPoint(item));
-          Finished;
-          Exit;
-        end;
-      end;
-      if (item is TGPSPolyline) then
-      begin
-        gpsPolyLine := TGPSPolyLine(item);
-        for k := 0 to gpsPolyLine.Points.Count-1 do
-        begin
-          item := gpsPolyLine.Points[k];
-          if IsSamePoint(item) then
-          begin
-            for L := 0 to GPSPolyLine.Points.Count-1 do
-            begin
-              item := gpsPolyLine.Points[L];
-              AddToSelection(AMapView, TGPSPoint(item));
-            end;
-            Finished;
-            exit;
-          end;
-        end;
-      end;
     end;
+    Finished;
+    exit;
   end;
 
-  // Check the map layers
+  // Find point in map-type collections
-  for i := 0 to AMapView.Layers.Count-1 do
+  FindMapCollection(AMapView, APoint, collection, idx);
+  if collection is TMapPointsOfInterest then
   begin
-    mapLayer := AMapView.Layers[i];
+    p := collection.Items[idx] as TMapPoint;
-    // Points of interest?
+    AddToSelection(AMapView, TGPSPoint(p.GPSObj));
-    for j := 0 to mapLayer.PointsOfInterest.Count-1 do
+  end else
+  if collection <> nil then
+  begin
+    for i := 0 to collection.Count-1 do
     begin
-      p := mapLayer.PointsOfInterest[j];
+      p := collection.Items[i] as TMapPoint;
-      if IsSamePoint(p.GPSObj) then
+      AddToSelection(AMapView, TGPSPoint(p.GPSObj));
-      begin
-        AddToSelection(AMapView, TGPSPoint(p.GPSObj));
-        Finished;
-        Exit;
-      end;
-    end;
-    // Tracks?
-    for j := 0 to mapLayer.Tracks.Count-1 do
-    begin
-      mapTrack := mapLayer.Tracks[j];
-      for k := 0 to mapTrack.Points.Count-1 do
-      begin
-        p := mapTrack.Points[k];
-        if IsSamePoint(p.GPSObj) then
-        begin
-          for L := 0 to mapTrack.Points.Count-1 do
-          begin
-            p := mapTrack.Points[L];
-            AddToSelection(AMapView, TGPSPoint(p.GPSObj));
-          end;
-          Finished;
-          exit;
-        end;
-      end;
-    end;
-    // Areas?
-    for j := 0 to mapLayer.Areas.Count-1 do
-    begin
-      mapArea := mapLayer.Areas[j];
-      for k := 0 to mapArea.Points.Count-1 do
-      begin
-        p := mapArea.Points[k];
-        if IsSamePoint(p.GPSObj) then
-        begin
-          for L := 0 to mapArea.Points.Count-1 do
-          begin
-            p := mapArea.Points[L];
-            AddToSelection(AMapView, TGPSPoint(p.GPSObj));
-          end;
-          Finished;
-          exit;
-        end;
-      end;
     end;
   end;
+  Finished;
 end;
 
 procedure TMarkerSelectAndDragPlugin.SetMultiSelect(AValue: Boolean);