Merge pull request #166 from ThalesGroup/dev-pla

Fix BlSpace management in GeoViewElement and continue refactoring

Author: LabordePierre

src/GeoView-Tests/GeoViewInfosTest.class.st

@@ -21,14 +21,14 @@ AbstractGeoViewLayer class >> isAbstract [
 AbstractGeoViewLayer >> addedToScene: anObject [
 	"call when the geoview is added to a scene graph"
 
-	self addedToSceneGraph 
+	"override me to implement behavior"
 ]
 
 { #category : #private }
 AbstractGeoViewLayer >> addedToSceneGraph [
 	"call when the geoview is added to a scene graph"
 
-	self deprecated:'used addedToScene:'.
+	self deprecated: 'used addedToScene:'
 ]
 
 { #category : #drawing }
@@ -141,14 +141,14 @@ AbstractGeoViewLayer >> name: anObject [
 AbstractGeoViewLayer >> removedFromScene: anObject [
 	"call when the geoview is removed from a scene graph"
 
-	self removedFromSceneGraph 
+	"override me to implement behavior"
 ]
 
 { #category : #private }
 AbstractGeoViewLayer >> removedFromSceneGraph [
 	"call when the geoview is removed from a scene graph"
 
-	self deprecated:'used removedFromScene:'.
+	self deprecated: 'used removedFromScene:'
 ]
 
 { #category : #private }

src/GeoView/AbstractGeoViewLayer.class.st

@@ -162,6 +162,16 @@ GeoViewAbstractElement >> applyDisplayFilterToAllLayers: aDisplayFilter [
 		thenDo: [ :l | l displayFilter: aDisplayFilter ]
 ]
 
+{ #category : #'api - space' }
+GeoViewAbstractElement >> attachSpace [
+
+	super attachSpace.
+
+	"send message to all layers"
+	self layerListMutex criticalReleasingOnError: [
+		self layers do: [ :e | e addedToScene: self ] ]
+]
+
 { #category : #'API -- scale and center' }
 GeoViewAbstractElement >> centerOnGlobalPoint: aGlobalPoint [
 	"Center the map on a global point"
@@ -232,6 +242,16 @@ GeoViewAbstractElement >> defaultScale [
 	^ self normalizeScale: self class defaultScale
 ]
 
+{ #category : #'api - space' }
+GeoViewAbstractElement >> detachSpace [
+
+	super detachSpace.
+
+	"send message to all layers"
+	self layerListMutex criticalReleasingOnError: [
+		self layers do: [ :e | e removedFromScene: self ] ]
+]
+
 { #category : #'API -- filters' }
 GeoViewAbstractElement >> displayFilter [
 
@@ -351,6 +371,8 @@ GeoViewAbstractElement >> initialize [
 
 	super initialize.
 
+	layers := OrderedCollection new.
+	
 	"Initialize default projection systems"
 	self mapProjection: GeoViewWebMercatorProjection new.
 	self displayToGraphicProjection: GeoView2DProjection new.
@@ -406,7 +428,7 @@ GeoViewAbstractElement >> layerProcessDataChanged: anEvent [
 { #category : #accessing }
 GeoViewAbstractElement >> layers [
 
-	^ layers ifNil: [ layers := OrderedCollection new ]
+	^ layers 
 ]
 
 { #category : #'API -- coordinates transformations' }
@@ -542,24 +564,6 @@ GeoViewAbstractElement >> objectIndexAccessor: aSymbol [
 	objectIndexAccessor := aSymbol
 ]
 
-{ #category : #'hooks - children' }
-GeoViewAbstractElement >> onAddedToSceneGraph [
-
-	super onAddedToSceneGraph.
-
-	"send message to all layers"
-	self layers do: [ :e | e addedToScene: self ]
-]
-
-{ #category : #'hooks - children' }
-GeoViewAbstractElement >> onRemovedFromSceneGraph [
-
-	super onRemovedFromSceneGraph.
-	
-	"send message to all layers"
-	self layers do: [ :e | e removedFromScene: self ]
-]
-
 { #category : #'API -- picking' }
 GeoViewAbstractElement >> pickAt: aGlobalPoint [
 	"Return all objects under a global point"

src/GeoView/GeoViewAbstractElement.class.st

@@ -107,7 +107,7 @@ GeoViewElement >> initializeLayerListElement [
 
 	layerListElement layers: self layers.
 
-	self addChildFirst: layerListElement
+	self inUIProcessDo: [ self addChildFirst: layerListElement ]
 ]
 
 { #category : #'strategy management' }