From c3c6ce12238b6ab33860e01a430141abb76c0984 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Fri, 21 Mar 2025 13:27:50 +0000 Subject: [PATCH] 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 --- .../MarkerSelectAndDrag_Demo.lpi | 6 +- .../markerselectdrag_demo/main.pas | 19 +- .../plugins/markers/mvmarkerplugins.pas | 348 +++++++++--------- 3 files changed, 186 insertions(+), 187 deletions(-) diff --git a/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/MarkerSelectAndDrag_Demo.lpi b/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/MarkerSelectAndDrag_Demo.lpi index c5d7062b7..5b8cbb10b 100644 --- a/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/MarkerSelectAndDrag_Demo.lpi +++ b/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/MarkerSelectAndDrag_Demo.lpi @@ -59,8 +59,12 @@ - + + + + + diff --git a/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/main.pas b/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/main.pas index 7663d0cfb..0042a5ccf 100644 --- a/components/lazmapviewer/examples/plugin_demos/markerselectdrag_demo/main.pas +++ b/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); diff --git a/components/lazmapviewer/source/addons/plugins/markers/mvmarkerplugins.pas b/components/lazmapviewer/source/addons/plugins/markers/mvmarkerplugins.pas index 8b5bec70d..41f666eb9 100644 --- a/components/lazmapviewer/source/addons/plugins/markers/mvmarkerplugins.pas +++ b/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; - gpsLayer: TGPSObjectList; - 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; - + gpsObj: TGPSObj; + collection: TMapCollectionBase = nil; + idx: Integer = -1; begin - // Check the 10 layers of GPSItems - for i := 0 to 9 do + // Find the point in the GPS lists + FindContainerOfPoint(AMapView, APoint, gpsObj, idx); + if (gpsObj is TGPSObjectList) then begin - gpsLayer := AMapView.GPSLayer[i]; - for j := 0 to gpsLayer.Count-1 do - begin - item := gpsLayer[j]; - if IsSamePoint(item) then - begin - gpsLayer.Delete(item); - 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; + TGPSObjectList(gpsObj).Delete(APoint); + exit; + end else + if (gpsObj is TGPSPolyLine) then + begin + TGPSPolyLine(gpsObj).Points.Delete(idx); + exit; end; - // Check the 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 - 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; + // Find the point in the map collections + FindMapCollection(AMapView, APoint, collection, idx); + if collection <> nil then + collection.Delete(idx); 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; - gpsLayer: TGPSObjectList; - gpsPOI: TGPSPointOfInterest; + obj: TGPSObj = nil; + collection: TMapCollectionBase = nil; + 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 - for i := 0 to 9 do + // Find point in gpsObj-type of containers + FindContainerOfPoint(AMapView, APoint, obj, idx); + // Is is a point of interest? + if obj is TGPSObjectList then begin - gpsLayer := AMapView.GPSLayer[i]; - for j := 0 to gpsLayer.Count-1 do + item := TGPSObjectList(obj).Items[idx]; + 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]; - if (item is TGPSPointOfInterest) then - 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; + item := TGPSPoint(gpsPolyLine.Points[i]); + AddToSelection(AMapView, TGPSPoint(item)); end; + Finished; + exit; end; - // Check the map layers - for i := 0 to AMapView.Layers.Count-1 do + // Find point in map-type collections + FindMapCollection(AMapView, APoint, collection, idx); + if collection is TMapPointsOfInterest then begin - mapLayer := AMapView.Layers[i]; - // Points of interest? - for j := 0 to mapLayer.PointsOfInterest.Count-1 do + p := collection.Items[idx] as TMapPoint; + AddToSelection(AMapView, TGPSPoint(p.GPSObj)); + end else + if collection <> nil then + begin + for i := 0 to collection.Count-1 do begin - p := mapLayer.PointsOfInterest[j]; - if IsSamePoint(p.GPSObj) then - 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; + p := collection.Items[i] as TMapPoint; + AddToSelection(AMapView, TGPSPoint(p.GPSObj)); end; end; + Finished; end; procedure TMarkerSelectAndDragPlugin.SetMultiSelect(AValue: Boolean);