Fixed regressions in box selection and element color function validation

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / nodes / NetworkDrawingNode.java

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/NetworkDrawingNode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/NetworkDrawingNode.java
index 1ccde2c7b18db0c459648af546428b57c3205428..71ccb781a1f1a0b0bf74df1d14430a5937a6e6db 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/NetworkDrawingNode.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/NetworkDrawingNode.java
@@ -134,9 +134,13 @@ public class NetworkDrawingNode extends G2DNode {
             while (nodeIter.hasNext()) {
                 if (end == null) {
                     start = nodeIter.next();
+                    if (!nodeIter.hasNext()) {
+                        break;
+                    }
                 } else {
                     start = end;
                 }
+                
                 end = nodeIter.next();
                 
                 createEdge(start, end);
@@ -166,10 +170,10 @@ public class NetworkDrawingNode extends G2DNode {
         double scaleY = getTransform().getScaleY();
         double scaleX = getTransform().getScaleX();
         
-        double startLat = ModelledCRS.yToLatitude(start.getY() / scaleY);
+        double startLat = ModelledCRS.yToLatitude(-start.getY() / scaleY);
         double startLon = ModelledCRS.xToLongitude(start.getX() / scaleX);
         
-        double endLat = ModelledCRS.yToLatitude(end.getY() / scaleY);
+        double endLat = ModelledCRS.yToLatitude(-end.getY() / scaleY);
         double endLon = ModelledCRS.xToLongitude(end.getX() / scaleX);
         
         double[] startCoords = new double[] { startLon, startLat };