X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fparticipants%2FDNTranslateMode.java;h=fdc333b2fb82f88d64da9894f8111d0be0f27812;hb=96d2122ccc3a7d3503d0bf2ab121eb8fd2186323;hp=12caba477724d4af843abc1e43413ab1536d0698;hpb=1bc60c2213f9b3fc7b4d935ba9afda2b767290e5;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNTranslateMode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNTranslateMode.java
index 12caba47..fdc333b2 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNTranslateMode.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNTranslateMode.java
@@ -20,7 +20,6 @@ import org.simantics.g2d.canvas.Hints;
 import org.simantics.g2d.diagram.participant.pointertool.TranslateMode;
 import org.simantics.g2d.element.ElementUtils;
 import org.simantics.g2d.element.IElement;
-import org.simantics.g2d.element.handler.Move;
 
 public class DNTranslateMode extends TranslateMode {
 
@@ -30,13 +29,6 @@ public class DNTranslateMode extends TranslateMode {
     
     @Override
     protected boolean commit() {
-        for (IElement el : elementsToReallyTranslate) {
-            Move move = el.getElementClass().getAtMostOneItemOfClass(Move.class);
-            if (move != null) {
-                Point2D oldPos = move.getPosition(el);
-                move.moveTo(el, oldPos.getX() + dx, oldPos.getY() + dy);
-            }
-        }
         try {
             Simantics.getSession().syncRequest(new WriteRequest() {
                 @Override
@@ -45,18 +37,24 @@ public class DNTranslateMode extends TranslateMode {
                     DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
                     DiagramResource DIA = DiagramResource.getInstance(graph);
                     for (IElement e : elementsToReallyTranslate) {
+                        
+                        
                         Object obj = ElementUtils.getObject(e);
-                        if (obj instanceof Resource) {
+                        if (obj instanceof Resource && graph.isInstanceOf((Resource) obj, DN.Vertex)) {
+                            
                             Resource res = (Resource) obj;
+                            
+                            // Read current location from graph
+                            double[] currentCoords = graph.getRelatedValue2(res, DIA.HasLocation);
+                            
+                            double x = ModelledCRS.longitudeToX(currentCoords[0]);
+                            double y = ModelledCRS.latitudeToY(currentCoords[1]);
+                                    
                             AffineTransform at = ElementUtils.getLocalTransform(e, new AffineTransform());
                             if (graph.isInstanceOf(res, DN.Vertex)) {
                                 
-                                double x = at.getTranslateX();
-                                double y = at.getTranslateY();
-                                // TODO: Fix scale!
-                                double scale = 100000;
-                                double lat = ModelledCRS.yToLatitude(y / scale);
-                                double lon = ModelledCRS.xToLongitude(x / scale);
+                                double lat = ModelledCRS.yToLatitude(y + (-dy / at.getScaleY()));
+                                double lon = ModelledCRS.xToLongitude(x + (dx / at.getScaleX()));
                                 
                                 // write to db
                                 double[] coords = new double[] { lon, lat };
@@ -75,7 +73,7 @@ public class DNTranslateMode extends TranslateMode {
                         CommentMetadata cm = graph.getMetadata(CommentMetadata.class);
                         graph.addMetadata(cm.add("Translated " + transformed.size() + " "
                                 + (transformed.size() == 1 ? "element" : "elements")
-                                + " by (" + dx + "," + dy + ") mm."));
+                                + " by (" + dx + "," + -dy + ") mm."));
                     }
                 }
             });