--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearMetrics.java	Tue Dec 15 15:58:58 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearMetrics.java	Tue Dec 15 22:25:53 2009 +0000
@@ -1,9 +1,6 @@
 package de.intevation.gnv.math;
 
-import java.awt.geom.Point2D;
-
-import de.intevation.gnv.math.LinearToMap.Metrics;
-import de.intevation.gnv.math.LinearToMap.Interpolator;
+import com.vividsolutions.jts.geom.Coordinate;
 
 /**
  *  @author Sascha L. Teichmann
@@ -22,7 +19,7 @@
         private double my;
         private double by;
 
-        public LinearInterpolator(Point2D p1, Point2D p2) {
+        public LinearInterpolator(Coordinate p1, Coordinate p2) {
 
             /*
              I) p1.x = 0*m + bx
@@ -35,28 +32,27 @@
             mx = p2.x - p1.x
             */
 
-            bx = p1.getX();
-            mx = p2.getX() - bx;
+            bx = p1.x;
+            mx = p2.x - bx;
 
-            by = p1.getY();
-            my = p2.getY() - by;
+            by = p1.y;
+            my = p2.y - by;
         }
 
-        public void interpolate(double t, Point2D v) {
-            double x = t*mx + bx;
-            double y = t*my + by;
-            v.setLocation(x, y);
+        public void interpolate(double t, Coordinate v) {
+            v.x = t*mx + bx;
+            v.y = t*my + by;
         }
     } // class LinearInterpolator
 
     private LinearMetrics() {
     }
 
-    public double distance(Point2D p1, Point2D p2) {
+    public double distance(Coordinate p1, Coordinate p2) {
         return p1.distance(p2);
     }
 
-    public Interpolator getInterpolator(Point2D p1, Point2D p2) {
+    public Interpolator getInterpolator(Coordinate p1, Coordinate p2) {
         return new LinearInterpolator(p1, p2);
     }
 }