Changeset 29215 in osm for applications/editors/josm/plugins/smed2/src/seamap

Timestamp:

2013-01-29T21:49:08+01:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/seamap

Files:

• Renderer.java (modified) (2 diffs)
• SeaMap.java (modified) (2 diffs)

applications/editors/josm/plugins/smed2/src/seamap/Renderer.java

@@ -71 +71 @@
         }
 
-        public static double calcArea(Feature feature) {
+        public static double signedArea(Feature feature) {
           if (feature.flag == Fflag.AREA) {
                         ArrayList<Long> way;
@@ -91 +91 @@
                                 llat = lat;
             }
-            return Math.abs(sigma) * 3444 * 3444 / 2.0;
+            return sigma;
           }
-          return 0.0;
+          return 0;
+        }
+
+        public boolean handOfArea(Feature feature) {
+                return (signedArea(feature) < 0);
+        }
+        
+        public static double calcArea(Feature feature) {
+          return Math.abs(signedArea(feature)) * 3444 * 3444 / 2.0;
         }
 

applications/editors/josm/plugins/smed2/src/seamap/SeaMap.java

@@ -26 +26 @@
                 UNKN, NODE, LINE, AREA
         }
+        
+        public enum Nflag {
+                ANON, ISOL, CONN
+        }
+
+        public class Coord {
+                public double lat;
+                public double lon;
+                public Nflag flg;
+
+                public Coord(double ilat, double ilon) {
+                        lat = ilat;
+                        lon = ilon;
+                        flg = Nflag.ANON;
+                }
+                public Coord(double ilat, double ilon, Nflag iflg) {
+                        lat = ilat;
+                        lon = ilon;
+                        flg = iflg;
+                }
+        }
 
         public class AttItem {
@@ -98 +119 @@
                         atts = new AttMap();
                         objs = new ObjMap();
-                }
-        }
-
-        public class Coord {
-                public double lat;
-                public double lon;
-
-                public Coord(double ilat, double ilon) {
-                        lat = ilat;
-                        lon = ilon;
                 }
         }