Fix bug and considere "user coordinates for device draw mode" (incuba…

…tor)
OpenSmock · Oct 26, 2024 · d24e3c3 · d24e3c3
1 parent 50d3e7a
commit d24e3c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/GeoView/DShapeGeoViewProcessData.class.st b/src/GeoView/DShapeGeoViewProcessData.class.st
@@ -15,14 +15,16 @@ DShapeGeoViewProcessData class >> isAbstract [
 { #category : #computing }
 DShapeGeoViewProcessData >> computePositionFor: aDShape context: aContext [
 
-	| offset |
+	| offset isDeviceCoordinates |
 	aDShape coordinates ifNil: [ ^ aDShape coordinatesDeviceOffset ].
 	self processor ifNil: [ ^ nil ].
 
 	offset := aDShape coordinatesDeviceOffset ifNil: [ 0 @ 0 ].
 
-	(aDShape isComposite not and: [ aDShape isDrawModeDevice ]) ifTrue: [
-		^ aDShape coordinates + offset ].
+	isDeviceCoordinates := aDShape coordinates isPoint.
+	(aDShape isComposite not and: [ aDShape isDrawModeDevice and:[ isDeviceCoordinates ] ] ) ifTrue: [
+		^ aDShape coordinates + offset
+	].
 
 	^ (self processor projection projCartToPixel: (aDShape coordinates))
 	  + offset

diff --git a/src/GeoView/GeoViewDShapesLayer.class.st b/src/GeoView/GeoViewDShapesLayer.class.st
@@ -112,7 +112,7 @@ GeoViewDShapesLayer >> updateDShapes: aDShapeList [
 	self userDataChangesMutex critical: [
 		toUpdate := OrderedCollection new.
 		aDShapeList do: [ :e |
-			(self haveDShapeKey: e key) ifFalse: [
+			(self haveDShapeKey: e key) ifTrue: [
 				self userModel at: e key put: e.
 				toUpdate add: e ] ].
 		super updateDShapes: toUpdate ]