Enhancements to district functionalities and code

[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 7d8af3d67f1103c4bca0db0765f374f19bca101f..7bec07dc138507ae14f4b344081e8d5b5c9c4fcf 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
@@ -11,8 +11,10 @@ import org.simantics.db.WriteGraph;
 import org.simantics.db.common.CommentMetadata;
 import org.simantics.db.common.request.WriteRequest;
 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;
@@ -46,24 +48,35 @@ public class DNTranslateMode extends TranslateMode {
                         Object obj = ElementUtils.getObject(e);
                         if (obj instanceof Resource) {
                             Resource res = (Resource) obj;
+                            AffineTransform at = ElementUtils.getLocalTransform(e, new AffineTransform());
                             if (graph.isInstanceOf(res, DN.Vertex)) {
-                                AffineTransform at = ElementUtils.getLocalTransform(e, new AffineTransform());
-                                transformed.add( new TransformedObject((Resource) obj, at) );
                                 
+                                double x = at.getTranslateX();
+                                double y = at.getTranslateY();
+                                // TODO: Fix scale!
+                                double scale = 100000;
+//                                double scale = 1;
+                                double lat = ModelledCRS.yToLatitude(y / scale);
+                                double lon = ModelledCRS.xToLongitude(x / scale);
                                 
                                 // 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
+                                transformed.add( new TransformedObject((Resource) obj, at) );
                             }
                         }
                     }
-                    
                     if (!transformed.isEmpty()) {
+                        graph.markUndoPoint();
+                        // Normal transforms
+                        ElementTransforms.setTransformRequest(transformed).perform(graph);
+                        
                         CommentMetadata cm = graph.getMetadata(CommentMetadata.class);
                         graph.addMetadata(cm.add("Translated " + transformed.size() + " "
                                 + (transformed.size() == 1 ? "element" : "elements")
                                 + " by (" + dx + "," + dy + ") mm."));
-                        graph.markUndoPoint();
                     }
                 }
             });