From: jsimomaa <jani.simomaa@gmail.com>
Date: Wed, 24 Jul 2019 06:50:00 +0000 (+0300)
Subject: Remove erroneus fix made in previous commit for district CSV import
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=fb0dd7165edb185c63412bea85f8a253fd5dc3f2;p=simantics%2Fdistrict.git

Remove erroneus fix made in previous commit for district CSV import

gitlab #56
APROS-15523

Change-Id: I2a3ce1e55609b55605252907817dc25267524468
---

diff --git a/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java b/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java
index 139b63e8..7e2a0e1e 100644
--- a/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java
+++ b/org.simantics.district.imports/src/org/simantics/district/imports/DistrictImportUtils.java
@@ -519,7 +519,8 @@ public class DistrictImportUtils {
                     }
                     graph.claimLiteral(subject, relation, Double.parseDouble(stringValue), Bindings.DOUBLE);
                 } catch (NumberFormatException e) {
-                    throw new DatabaseException(e);
+                    LOGGER.error("Could not parse {} {} {} {}", row, index, subject, relation, e);
+                    //throw new DatabaseException(e);
                 }
             }
         }
@@ -554,7 +555,7 @@ public class DistrictImportUtils {
                     double y = Double.parseDouble(p[1]);
                     if (actualTransform != null) {
                         DirectPosition2D targetPos = new DirectPosition2D();
-                        DirectPosition2D sourcePos = new DirectPosition2D(x, y);
+                        DirectPosition2D sourcePos = new DirectPosition2D(y, x);
                         DirectPosition res = actualTransform.transform(sourcePos, targetPos);
                         double[] coords = res.getCoordinate();
                         x = coords[1];