Merge pull request #137 from ThalesGroup/devSelectionFilter

Add selectionFilterBlock on InteractionsStrategy and use it for selec…

Author: LANDAISB

src/GeoView-Tests/GeoViewElementTest.class.st

@@ -315,7 +315,17 @@ GeoViewElementTest >> testInteractionsStrategyDefaultValues [
 
 	self assert: geoView interactionsStrategy allowMapMoving.
 	self assert: geoView interactionsStrategy allowMapScaling.
-	self assert: geoView interactionsStrategy isMultipleSelection
+	self assert: geoView interactionsStrategy isMultipleSelection.
+	self assert: geoView interactionsStrategy selectionFilterBlock equals: nil
+]
+
+{ #category : #tests }
+GeoViewElementTest >> testInteractionsStrategySelectionFilter [
+
+	self assert: geoView interactionsStrategy selectionFilterBlock equals: nil.
+	geoView interactionsStrategy selectionFilterBlock: [ :e | ].
+	self assert: geoView interactionsStrategy selectionFilterBlock notNil.
+	
 ]
 
 { #category : #tests }

src/GeoView/GeoViewInteractionsStrategy.class.st

@@ -12,7 +12,8 @@ Class {
 		'mouseDownPosition',
 		'pickingRadius',
 		'lastMouseMoveEventTimestamp',
-		'isMultipleSelection'
+		'isMultipleSelection',
+		'selectionFilterBlock'
 	],
 	#category : #'GeoView-Events'
 }
@@ -203,6 +204,9 @@ GeoViewInteractionsStrategy >> primaryClickEvent: anEvent [
 	point := anEvent position.
 
 	pickingResult := element pickAt: point radius: self pickingRadius.
+	self selectionFilterBlock ifNotNil:[
+		pickingResult := pickingResult applyFilter: self selectionFilterBlock
+	].
 
 	"send picking event"
 	event := GeoViewPickingEvent new.
@@ -251,6 +255,18 @@ GeoViewInteractionsStrategy >> pulsePeriodInMs [
 	^ 15 milliSecond
 ]
 
+{ #category : #accessing }
+GeoViewInteractionsStrategy >> selectionFilterBlock [
+
+	^ selectionFilterBlock
+]
+
+{ #category : #accessing }
+GeoViewInteractionsStrategy >> selectionFilterBlock: aSelectFilterBlock [
+
+	selectionFilterBlock := aSelectFilterBlock 
+]
+
 { #category : #'events - processing' }
 GeoViewInteractionsStrategy >> sendMouseCoordinatesChanged: anEvent [