Changeset 30119 in osm for applications/editors/josm/plugins/smed2/src/seamap/SeaMap.java

Timestamp:

2013-12-08T20:52:05+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/seamap/SeaMap.java (modified) (11 diffs)

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

@@ -22 +22 @@
 
         public enum Nflag {
-                ANON, ISOL, CONN
-        }
-
-        public class Snode {
-                public double lat;
-                public double lon;
-                public Nflag flg;
+                ANON,   // Edge inner nodes
+                ISOL,   // Node not part of Edge
+                CONN    // Edge first and last nodes
+        }
+
+        public class Snode {    // All coordinates in map
+                public double lat;      // Latitude
+                public double lon;      // Longitude
+                public Nflag flg;               // Role of node
 
                 public Snode() {
@@ -35 +37 @@
                         lon = 0;
                 }
-
                 public Snode(double ilat, double ilon) {
                         flg = Nflag.ANON;
@@ -41 +42 @@
                         lon = ilon;
                 }
-
                 public Snode(double ilat, double ilon, Nflag iflg) {
                         lat = ilat;
@@ -49 +49 @@
         }
 
-        public class Edge {
-                public boolean forward;
-                public long first;
-                public long last;
-                public ArrayList<Long> nodes;
+        public class Edge {             // A polyline segment
+                public long first;      // First CONN node
+                public long last;               // Last CONN node
+                public ArrayList<Long> nodes; // Inner ANON nodes
 
                 public Edge() {
-                        forward = true;
                         first = 0;
                         last = 0;
@@ -63 +61 @@
         }
 
-        public class Side {
-                Edge edge;
-                boolean forward;
+        public class Side {     // An edge as used in a line or area feature
+                Edge edge;                              // Side is formed by this Edge...
+                boolean forward;        // ... in this direction
 
                 public Side(Edge iedge, boolean ifwd) {
@@ -73 +71 @@
         }
 
-        public class Bound {
-                public boolean outer;
-                ArrayList<Side> sides;
+        public class Bound { // A single closed area
+                public boolean outer;           // Role
+                ArrayList<Side> sides;  // Sides that make up this area
 
                 public Bound() {
@@ -81 +79 @@
                         sides = new ArrayList<Side>();
                 }
-
                 public Bound(Side iside, boolean irole) {
                         outer = irole;
@@ -89 +86 @@
         }
 
-        public class Area extends ArrayList<Bound> {
+        public class Area extends ArrayList<Bound> {    // The collection of bounds for an area.
                 public Area() {
                         super();
@@ -389 +386 @@
                         nodes.get(edge.first).flg = Nflag.CONN;
                         nodes.get(edge.last).flg = Nflag.CONN;
-                        Bound ebound = (new Bound(new Side(edge, edge.forward), true));
+                        Bound ebound = (new Bound(new Side(edge, true), true));
                         feature.length = calcLength(ebound);
                         if (edge.first == edge.last) {
@@ -410 +407 @@
                                         long node1 = edge.first;
                                         long node2 = edge.last;
-                                        bound = new Bound(new Side(edge, edge.forward), (role == outers));
+                                        bound = new Bound(new Side(edge, true), (role == outers));
                                         if (node1 != node2) {
                                                 for (ListIterator<Long> it = role.listIterator(0); it.hasNext();) {
@@ -551 +548 @@
                                 } else {
                                         double arc = (Math.acos(Math.cos(lon - llon) * Math.cos(lat - llat)));
-                                        slat += (lat * arc);
-                                        slon += (lon * arc);
+                                        slat += ((lat + llat) / 2 * arc);
+                                        slon += ((lon + llon) / 2 * arc);
                                         sarc += arc;
                                 }