Adding org.simantics.district.geotools plugin

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / participants / DNTranslateMode.java

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 27de17e921f0ce9bb765a9f022075eee8504f9d3..9132fa2fd2133b5fc8158a6920ff5a040af9eefc 100644 (file)
--- 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
@@ -14,12 +14,12 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.diagram.elements.ElementTransforms;
 import org.simantics.diagram.elements.ElementTransforms.TransformedObject;
 import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.district.network.ModelledCRS;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
 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 {
 
@@ -29,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
@@ -44,13 +37,27 @@ 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) {
+                            
                             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 lat = ModelledCRS.yToLatitude(y + (dy / at.getScaleY()));
+                                double lon = ModelledCRS.xToLongitude(x + (dx / at.getScaleX()));
+                                
                                 // write to db
-                                double[] coords = new double[] { at.getTranslateX(), at.getTranslateY() };
+                                double[] coords = new double[] { lon, lat };
                                 graph.claimLiteral(res, DIA.HasLocation, coords);
                             } else {
                                 // fallback to normal HasTransforms