Fix position computing and refactoring

src/GeoView/DShapeGeoViewProcessData.class.st

@@ -15,18 +15,17 @@ DShapeGeoViewProcessData class >> isAbstract [
 { #category : #computing }
 DShapeGeoViewProcessData >> computePositionFor: aDShape context: aContext [
 
-	| offset isDeviceCoordinates |
+	| offset |
 	aDShape coordinates ifNil: [ ^ aDShape coordinatesDeviceOffset ].
 	self processor ifNil: [ ^ nil ].
 
 	offset := aDShape coordinatesDeviceOffset ifNil: [ 0 @ 0 ].
 
-	isDeviceCoordinates := aDShape coordinates isPoint.
-	(aDShape isComposite not and: [ aDShape isDrawModeDevice and:[ isDeviceCoordinates ] ] ) ifTrue: [
-		^ aDShape coordinates + offset
-	].
+	"Return device coordinates only for draw mode device and position not managed by the parent"
+	(aDShape isDrawModeDevice and: [ aDShape isTranslatedByParent ])
+		ifTrue: [ ^ aDShape coordinates + offset ].
 
-	^ (self processor projection projCartToPixel: (aDShape coordinates))
+	^ (self processor projection projCartToPixel: aDShape coordinates)
 	  + offset
 ]
 

src/GeoView/GeoViewDShapesLayer.class.st

@@ -123,10 +123,7 @@ GeoViewDShapesLayer >> updateModel: aContext [
 
 	| dShapes |
 	self userDataChangesMutex critical: [
-		dShapes := self userModel select: [ :e |
-			          e isComposite
-				          ifTrue: [ e isDrawModeUser or:[ e hasDrawModeUserChildren ] ]
-				          ifFalse: [ e isDrawModeUser ] ].
+		dShapes := self userModel select: [ :e | e hasUserComputing ].
 
 		super updateDShapes: dShapes ]
 ]

src/GeoView/GeoViewDomainObjectsLayer.class.st

@@ -187,9 +187,7 @@ GeoViewDomainObjectsLayer >> updateModel: aContext [
 	| dShapes |
 	self userDataChangesMutex critical: [
 		dShapes := self displayModel getDatas select: [ :e |
-			          e isComposite
-				          ifTrue: [ e isDrawModeUser or:[ e hasDrawModeUserChildren ] ]
-				          ifFalse: [ e isDrawModeUser ] ].
+			           e hasUserComputing ].
 
 		self updateDShapes: dShapes ]
 ]