Renaming

OpenSmock · Nov 30, 2023 · 0c33db0 · 0c33db0
1 parent 1b66140
commit 0c33db0
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 75 deletions.
diff --git a/GeoView-Tests/GeoSymbologyProviderTest.class.st b/GeoView-Tests/GeoSymbologyProviderTest.class.st
@@ -29,14 +29,16 @@ GeoSymbologyProviderTest class >> image2 [
 
 { #category : #private }
 GeoSymbologyProviderTest >> createSampleImageFiles [
-	| image1 image2 form |
+
+	| directory image1 image2 form |
+	directory := self sampleImageFilesDirectory.
 
-	image1 := self sampleImageFilesDirectory / 'image1.png'.
+	image1 := directory / 'image1.png'.
 	form := Smalltalk compiler evaluate: self class image1.
 	image1 asFileReference binaryWriteStreamDo: [ :out | (PNGReadWriter on: out) nextPutImage: form ].
 	image1 ensureCreateFile.
 
-	image2 := self sampleImageFilesDirectory / 'image2.png'.
+	image2 := directory / 'image2.png'.
 	form := Smalltalk compiler evaluate: self class image2.
 	image2 asFileReference binaryWriteStreamDo: [ :out | (PNGReadWriter on: out) nextPutImage: form ].
 	image2 ensureCreateFile.

diff --git a/GeoView-Tests/GeoViewManagerImplTests.class.st b/GeoView-Tests/GeoViewManagerImplTests.class.st
@@ -61,13 +61,13 @@ GeoViewManagerImplTests >> testLayerServices [
 	layer := geoViewManager getLayer: #layer1.
 	self assert: layer notNil.
 
-	geoViewManager deleteLayer: #layer1.
+	geoViewManager removeLayer: #layer1.
 	self assert: geoViewManager getLayers isEmpty.
 
 	geoViewManager addLayer: (GeoViewTestLayer new layerName: #layer1).
 	self assert: geoViewManager getLayers size equals: 1.
 
-	geoViewManager deleteAllLayers.
+	geoViewManager removeAllLayers.
 	self assert: geoViewManager getLayers isEmpty.
 ]
 
@@ -78,9 +78,9 @@ GeoViewManagerImplTests >> testLayerServicesWithoutLayers [
 	layer := geoViewManager getLayer: #nonExistingLayer.
 	self assert: layer isNil.
 
-	geoViewManager deleteLayer: #nonExistingLayer.
+	geoViewManager removeLayer: #nonExistingLayer.
 	self assert: geoViewManager getLayers isEmpty.
 
-	geoViewManager deleteAllLayers.
+	geoViewManager removeAllLayers.
 	self assert: geoViewManager getLayers isEmpty.
 ]
diff --git a/GeoView-Tests/GeoViewTest.class.st b/GeoView-Tests/GeoViewTest.class.st
@@ -19,11 +19,6 @@ GeoViewTest >> addLayer: aLayer [
 	self layers add: aLayer
 ]
 
-{ #category : #layers }
-GeoViewTest >> deleteLayer: aLayer [
-	self layers remove: aLayer
-]
-
 { #category : #layers }
 GeoViewTest >> getLayers [
 	^self layers
@@ -44,3 +39,8 @@ GeoViewTest >> layers [
 GeoViewTest >> layers: anObject [
 	layers := anObject
 ]
+
+{ #category : #layers }
+GeoViewTest >> removeLayer: aLayer [
+	self layers remove: aLayer
+]
diff --git a/GeoView-Tests/GeoViewUserTestImpl.class.st b/GeoView-Tests/GeoViewUserTestImpl.class.st
@@ -9,6 +9,21 @@ Class {
 	#category : #'GeoView-Tests-Utils'
 }
 
+{ #category : #events }
+GeoViewUserTestImpl >> geoViewLayerAdded: aKey in: aGeoViewManagerKey [
+	self receivedGeoViewLayerEvents at: #layerAddedEvent put: (aKey -> aGeoViewManagerKey).
+]
+
+{ #category : #events }
+GeoViewUserTestImpl >> geoViewLayerRemoved: aKey in: aGeoViewManagerKey [
+	self receivedGeoViewLayerEvents at: #layerDeletedEvent put: (aKey -> aGeoViewManagerKey).
+]
+
+{ #category : #events }
+GeoViewUserTestImpl >> geoViewLayerUpdated: aKey in: aGeoViewManagerKey [
+	self receivedGeoViewLayerEvents at: #layerUpdatedEvent put: (aKey -> aGeoViewManagerKey).
+]
+
 { #category : #'component accessing' }
 GeoViewUserTestImpl >> getGeoViewManagerEventsSubscriber [
 	| eventsSymbol eventsSubscriber itf |
@@ -33,21 +48,6 @@ GeoViewUserTestImpl >> getGeoViewManagerLayerEventsSubscriber [
 	^eventsSubscriber
 ]
 
-{ #category : #events }
-GeoViewUserTestImpl >> layerAdded: aKey view: aGeoViewManagerKey [
-	self receivedGeoViewLayerEvents at: #layerAddedEvent put: (aKey -> aGeoViewManagerKey).
-]
-
-{ #category : #events }
-GeoViewUserTestImpl >> layerDeleted: aKey view: aGeoViewManagerKey [
-	self receivedGeoViewLayerEvents at: #layerDeletedEvent put: (aKey -> aGeoViewManagerKey).
-]
-
-{ #category : #events }
-GeoViewUserTestImpl >> layerUpdated: aKey view: aGeoViewManagerKey [
-	self receivedGeoViewLayerEvents at: #layerUpdatedEvent put: (aKey -> aGeoViewManagerKey).
-]
-
 { #category : #callbacks }
 GeoViewUserTestImpl >> receivedGeoViewLayerEvents [
 	receivedGeoViewLayerEvents ifNil:[receivedGeoViewLayerEvents := Dictionary new].

diff --git a/GeoView/GeoView.trait.st b/GeoView/GeoView.trait.st
@@ -21,11 +21,6 @@ GeoView >> addLayer: aLayer [
 	self explicitRequirement
 ]
 
-{ #category : #layers }
-GeoView >> deleteLayer: aLayer [
-	self explicitRequirement
-]
-
 { #category : #layers }
 GeoView >> getLayers [
 	self explicitRequirement
@@ -46,6 +41,11 @@ GeoView >> removeGeoObjects: aGeoObjectList [
 	self explicitRequirement
 ]
 
+{ #category : #layers }
+GeoView >> removeLayer: aLayer [
+	self explicitRequirement
+]
+
 { #category : #selection }
 GeoView >> selectedGeoObjectKeys: aCollection [
 	self explicitRequirement

diff --git a/GeoView/GeoViewManagerImpl.class.st b/GeoView/GeoViewManagerImpl.class.st
@@ -67,11 +67,11 @@ GeoViewManagerImpl >> addLayer: aLayer [
 	aLayer mapProjection: self getMapProjectionManagerServicesProvider getProjection.
 	aLayer symbologyProvider: self getGeoSymbologyManagerServicesProvider.
 	aLayer isGeoObjectLayer ifTrue:[
-		aLayer processDataChangedCallback: [ :l | self receiveLayerUpdateFrom: l	]. 
+		aLayer whenProcessDatasChangedDo: [ :l | self layerHasBeenUpdated: l	]. 
 	].
 	self view addLayer: aLayer.
 
-	self getGeoViewManagerLayerEventsNotifier layerAdded: aLayer layerName view: self componentName.
+	self getGeoViewManagerLayerEventsNotifier geoViewLayerAdded: aLayer layerName in: self componentName.
 	^aLayer
 ]
 
@@ -157,14 +157,6 @@ GeoViewManagerImpl >> cursorPositionChanged: anAssociation [
 	self getGeoViewManagerCursorEventsNotifier cursor: anAssociation key positionChanged: anAssociation value view: self componentName
 ]
 
-{ #category : #'services - layer deletion' }
-GeoViewManagerImpl >> deleteAllLayers [
-	| layers |
-	layers := self view getLayers.
-	layers do:[ :l | (self view deleteLayer: l) ifNotNil:[ self getGeoViewManagerLayerEventsNotifier layerDeleted: l layerName view: self componentName ]].
-	^layers
-]
-
 { #category : #'event strategy' }
 GeoViewManagerImpl >> deleteEventBehavior: aGeoViewEventBehavior [
 
@@ -183,17 +175,6 @@ GeoViewManagerImpl >> deleteEventBehaviors [
 	stack do:[ :e | e geoViewManager: nil ].
 ]
 
-{ #category : #'services - layer deletion' }
-GeoViewManagerImpl >> deleteLayer: aKey [
-	| layer |
-	aKey ifNil:[^nil].
-	layer := self getLayer: aKey.
-	layer ifNil:[^nil].
-	layer := self view deleteLayer: layer.
-	layer ifNotNil:[self getGeoViewManagerLayerEventsNotifier layerDeleted: aKey view: self componentName].
-	^layer
-]
-
 { #category : #'events handling' }
 GeoViewManagerImpl >> dispatchEvent: anEngineEvent [
 	"Transfert event in input strategy stack to each behavior processors"
@@ -380,6 +361,12 @@ GeoViewManagerImpl >> initializeView [
 	self setScaleInMeters: 1.4816e7.
 ]
 
+{ #category : #events }
+GeoViewManagerImpl >> layerHasBeenUpdated: aLayer [
+
+	self getGeoViewManagerLayerEventsNotifier geoViewLayerUpdated: (aLayer layerName) in: (self componentName).
+]
+
 { #category : #accessing }
 GeoViewManagerImpl >> maxScaleInMeters [
 	^ maxScaleInMeters
@@ -429,10 +416,12 @@ GeoViewManagerImpl >> pickAt: aGlobalPoint radius: aRadiusInPixels [
 	^ pickingResult 
 ]
 
-{ #category : #private }
-GeoViewManagerImpl >> receiveLayerUpdateFrom: aLayer [
-
-	self getGeoViewManagerLayerEventsNotifier layerUpdated: (aLayer layerName) view: (self componentName).
+{ #category : #'services - layer deletion' }
+GeoViewManagerImpl >> removeAllLayers [
+	| layers |
+	layers := self view getLayers.
+	layers do:[ :l | (self view removeLayer: l) ifNotNil:[ self getGeoViewManagerLayerEventsNotifier geoViewLayerRemoved: l layerName in: self componentName ]].
+	^layers
 ]
 
 { #category : #'aggregated components' }
@@ -454,6 +443,17 @@ GeoViewManagerImpl >> removeGeoObjects: aGeoObjectList [
 	self view removeGeoObjects: aGeoObjectList
 ]
 
+{ #category : #'services - layer deletion' }
+GeoViewManagerImpl >> removeLayer: aKey [
+	| layer |
+	aKey ifNil:[^nil].
+	layer := self getLayer: aKey.
+	layer ifNil:[^nil].
+	layer := self view removeLayer: layer.
+	layer ifNotNil:[self getGeoViewManagerLayerEventsNotifier geoViewLayerRemoved: aKey in: self componentName].
+	^layer
+]
+
 { #category : #scale }
 GeoViewManagerImpl >> scaleDown [
 	self flag: 'PLA : faire un fonctionnement par pallier'.

diff --git a/GeoView/GeoViewManagerLayerEvents.trait.st b/GeoView/GeoViewManagerLayerEvents.trait.st
@@ -9,13 +9,13 @@ Trait {
 }
 
 { #category : #events }
-GeoViewManagerLayerEvents >> layerAdded: aKey view: aGeoViewManagerKey [
+GeoViewManagerLayerEvents >> geoViewLayerAdded: aKey in: aGeoViewManagerKey [
 ]
 
 { #category : #events }
-GeoViewManagerLayerEvents >> layerDeleted: aKey view: aGeoViewManagerKey [
+GeoViewManagerLayerEvents >> geoViewLayerRemoved: aKey in: aGeoViewManagerKey [
 ]
 
 { #category : #events }
-GeoViewManagerLayerEvents >> layerUpdated: aKey view: aGeoViewManagerKey [
+GeoViewManagerLayerEvents >> geoViewLayerUpdated: aKey in: aGeoViewManagerKey [
 ]
diff --git a/GeoView/GeoViewManagerLayerServices.trait.st b/GeoView/GeoViewManagerLayerServices.trait.st
@@ -20,14 +20,6 @@ GeoViewManagerLayerServices >> createAndAddGeoObjectLayer: aKey [
 GeoViewManagerLayerServices >> createAndAddGeoObjectLayer: aKey level: anInteger [ 
 ]
 
-{ #category : #'services - layer deletion' }
-GeoViewManagerLayerServices >> deleteAllLayers [
-]
-
-{ #category : #'services - layer deletion' }
-GeoViewManagerLayerServices >> deleteLayer: aKey [
-]
-
 { #category : #'services - layer accessing' }
 GeoViewManagerLayerServices >> getLayer: aKey [
 ]
@@ -40,6 +32,14 @@ GeoViewManagerLayerServices >> getLayerLevel: aKey [
 GeoViewManagerLayerServices >> getLayers [
 ]
 
+{ #category : #'services - layer deletion' }
+GeoViewManagerLayerServices >> removeAllLayers [
+]
+
+{ #category : #'services - layer deletion' }
+GeoViewManagerLayerServices >> removeLayer: aKey [
+]
+
 { #category : #'services - layer configuration' }
 GeoViewManagerLayerServices >> setLevel: anInteger forLayer: aKey [
 ]
diff --git a/GeoView/GeoViewObjectLayer.trait.st b/GeoView/GeoViewObjectLayer.trait.st
@@ -1,13 +1,11 @@
 Trait {
 	#name : #GeoViewObjectLayer,
+	#instVars : [
+		'processDataChangedBlock'
+	],
 	#category : #'GeoView-View & Layer'
 }
 
-{ #category : #'process data' }
-GeoViewObjectLayer >> deleteProcessDataFor: aGeoObjectClass [
-	self explicitRequirement
-]
-
 { #category : #'process data' }
 GeoViewObjectLayer >> getAllProcessData [
 	self explicitRequirement
@@ -23,8 +21,8 @@ GeoViewObjectLayer >> isGeoObjectLayer [
 	^true
 ]
 
-{ #category : #private }
-GeoViewObjectLayer >> processDataChangedCallback: aCallbackBlock [
+{ #category : #'process data' }
+GeoViewObjectLayer >> removeProcessDataFor: aGeoObjectClass [
 	self explicitRequirement
 ]
 
@@ -38,3 +36,9 @@ GeoViewObjectLayer >> setProcessData: aProcessData for: aGeoObjectClass [
 	self explicitRequirement
 
 ]
+
+{ #category : #private }
+GeoViewObjectLayer >> whenProcessDatasChangedDo: aBlock [
+
+	processDataChangedBlock := aBlock
+]