Changeset 36 in josm for src/org/openstreetmap/josm/data

Timestamp:

2005-12-29T02:06:38+01:00 (18 years ago)

Author:

imi

Message:

added Mercator projection

Location:

src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (2 diffs)
• osm/LineSegment.java (modified) (2 diffs)
• projection/Mercator.java (added)

src/org/openstreetmap/josm/data/Preferences.java

@@ -19 +19 @@
 import org.jdom.output.XMLOutputter;
 import org.openstreetmap.josm.data.projection.LatitudeLongitude;
+import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.UTM;
@@ -69 +70 @@
          */
         public static final Projection[] allProjections = new Projection[]{
+                new Mercator(),
                 new UTM(),
                 new LatitudeLongitude()

src/org/openstreetmap/josm/data/osm/LineSegment.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data.osm;
 
+import org.openstreetmap.josm.data.GeoPoint;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 
@@ -35 +36 @@
                 visitor.visit(this);
         }
+        
+        /**
+         * @return <code>true</code>, if the <code>ls</code> occupy
+         * exactly the same place as <code>this</code>.
+         */
+        public boolean equalPlace(LineSegment ls) {
+                if (equals(ls))
+                        return true;
+                GeoPoint s1 = start.coor;
+                GeoPoint s2 = ls.start.coor;
+                GeoPoint e1 = end.coor;
+                GeoPoint e2 = ls.end.coor;
+                return ((s1.equalsLatLon(s2) && e1.equalsLatLon(e2)) ||
+                                (s1.equalsLatLon(e2) && e1.equalsLatLon(s2)));
+        }
 }