Changeset 28415 in osm for applications/editors

Timestamp:

2012-05-30T04:39:19+02:00 (12 years ago)

Author:

joshdoe

Message:

Support EastNorth and LatLon for coordinates, and rename converter class

File:

• applications/editors/josm/plugins/jts/src/org/openstreetmap/josm/plugins/jts/JTSConverter.java (moved) (moved from applications/editors/josm/plugins/jts/src/org/openstreetmap/josm/plugins/jts/JTSUtils.java ) (3 diffs)

applications/editors/josm/plugins/jts/src/org/openstreetmap/josm/plugins/jts/JTSConverter.java

@@ -4 +4 @@
 import com.vividsolutions.jts.geom.impl.CoordinateArraySequence;
 import java.util.List;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -13 +12 @@
  * Methods to convert JOSM geometry to JTS geometry
  */
-public final class JTSUtils {
+public class JTSConverter {
+    private PrecisionModel precisionModel;
+    private GeometryFactory geometryFactory;
+    private boolean useEastNorth;
+    /**
+     * Conversions will use latitude/longitude for coordinates
+     */
+    public JTSConverter() {
+        this(false);
+    }
 
-    public final OsmPrecisionModel osmPrecisionModel = new OsmPrecisionModel();
-    public final GeometryFactory osmGeometryFactory = new GeometryFactory(getPrecisionModel());
+    /**
+     * Conversions will use LatLon if useEastNorth is false, otherwise EastNorth
+     * (the currently selected projection) will be used for coordinates.
+     * @param useEastNorth
+     */
+    public JTSConverter(boolean useEastNorth) {
+        this.useEastNorth = useEastNorth;
+        if (useEastNorth)
+            precisionModel = new PrecisionModel();
+        else
+            precisionModel = new OsmPrecisionModel();
+        geometryFactory = new GeometryFactory(precisionModel);
+    }
 
-    public OsmPrecisionModel getPrecisionModel() {
-        return osmPrecisionModel;
+    public PrecisionModel getPrecisionModel() {
+        return precisionModel;
     }
 
     public GeometryFactory getGeometryFactory() {
-        return osmGeometryFactory;
+        return geometryFactory;
     }
 
@@ -38 +57 @@
 
     public Coordinate convertNodeToCoordinate(Node node) {
-        LatLon ll = node.getCoor();
-        return new Coordinate(ll.lon(), ll.lat());
+        if (useEastNorth)
+            return new Coordinate(node.getEastNorth().getX(), node.getEastNorth().getY());
+        else
+            return new Coordinate(node.getCoor().getX(), node.getCoor().getY());
     }