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

Timestamp:

2013-08-05T11:15:02+02:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

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

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

@@ -163 +163 @@
                 public AttMap atts;
                 public ObjMap objs;
-                public long area;
+                public double area;
+                public double length;
                 public Snode centre;
 
@@ -173 +174 @@
                         objs = new ObjMap();
                         area = 0;
+                        length = 0;
                         centre = new Snode();
                 }
@@ -377 +379 @@
                                 node.flg = Nflag.ISOL;
                         }
+                        feature.length = 0;
+                        feature.area = 0;
                         break;
                 case LINE:
@@ -382 +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));
+                        feature.length = calcLength(ebound);
                         if (edge.first == edge.last) {
                                 feature.flag = Fflag.AREA;
                                 Area area = new Area();
-                                area.add(new Bound(new Side(edge, edge.forward), true));
+                                area.add(ebound);
+                                feature.area = calcArea(ebound);
                                 areas.put(id, area);
+                        } else {
+                                feature.area = 0;
                         }
                         break;
                 case AREA:
+                        Bound bound = null;
                         Area area = new Area();
                         ArrayList<Long> role = outers;
@@ -397 +407 @@
                                         long node1 = edge.first;
                                         long node2 = edge.last;
-                                        Bound bound = new Bound(new Side(edge, edge.forward), (role == outers));
+                                        bound = new Bound(new Side(edge, edge.forward), (role == outers));
                                         if (node1 != node2) {
                                                 for (ListIterator<Long> it = role.listIterator(0); it.hasNext();) {
@@ -417 +427 @@
                                 }
                                 if (role == outers) {
+                                        feature.length = calcLength(bound);
+                                        feature.area = calcArea(bound);
                                         role = inners;
                                 } else {
@@ -435 +447 @@
         }
 
-        public double signedArea(Bound bound) {
+        double signedArea(Bound bound) {
                 Snode node;
                 double lat, lon, llon, llat;
@@ -449 +461 @@
                         sigma += (lon * Math.sin(llat)) - (llon * Math.sin(lat));
                 }
-                return sigma;
+                return sigma / 2.0;
         }
 
@@ -457 +469 @@
 
         public double calcArea(Bound bound) {
-                return Math.abs(signedArea(bound)) * 3444 * 3444 / 2.0;
+                return Math.abs(signedArea(bound)) * 3444 * 3444;
+        }
+
+        public double calcLength(Bound bound) {
+                Snode node;
+                double lat, lon, llon, llat;
+                lat = lon = llon = llat = 0;
+                double sigma = 0;
+                BoundIterator it = new BoundIterator(bound);
+                if (it.hasNext()) {
+                        node = it.next();
+                        lat = node.lat;
+                        lon = node.lon;
+                        while (it.hasNext()) {
+                                llon = lon;
+                                llat = lat;
+                                node = it.next();
+                                lat = node.lat;
+                                lon = node.lon;
+                                sigma += Math.acos(Math.sin(lat) * Math.sin(llat) + Math.cos(lat) * Math.cos(llat) * Math.cos(llon - lon));
+                        }
+                }
+                return sigma * 3444;
         }