Changeset 31731 in osm for applications/editors/josm/plugins/seachart/src/s57/S57map.java

Timestamp:

2015-11-05T13:43:10+01:00 (10 years ago)

Author:

malcolmh

Message:

[seachart] updates

File:

• applications/editors/josm/plugins/seachart/src/s57/S57map.java (modified) (15 diffs)

applications/editors/josm/plugins/seachart/src/s57/S57map.java

@@ -47 +47 @@
                 public double lon;      // Longitude in radians
                 public Nflag flg;               // Role of node
+                public double val;      // Optional value
 
                 public Snode() {
@@ -52 +53 @@
                         lat = 0;
                         lon = 0;
+                        val = 0;
                 }
                 public Snode(double ilat, double ilon) {
@@ -57 +59 @@
                         lat = ilat;
                         lon = ilon;
+                        val = 0;
                 }
                 public Snode(double ilat, double ilon, Nflag iflg) {
@@ -62 +65 @@
                         lon = ilon;
                         flg = iflg;
-                }
-        }
-
-        public class Dnode extends Snode {      // All depth soundings
-                public double val;      // Sounding value
-
-                public Dnode() {
-                        flg = Nflag.DPTH;
-                        lat = 0;
-                        lon = 0;
                         val = 0;
                 }
-                public Dnode(double ilat, double ilon, double ival) {
+                public Snode(double ilat, double ilon, double ival) {
                         flg = Nflag.DPTH;
                         lat = ilat;
@@ -81 +74 @@
                 }
         }
-        
+
         public class Edge {             // A polyline segment
                 public long first;      // First CONN node
@@ -207 +200 @@
         
         public class Feature {
+                public long id;                         // Ref for this feature
                 public Rflag reln;              // Relationship status
                 public Geom geom;                       // Geometry data
@@ -215 +209 @@
 
                 Feature() {
+                        id = 0;
                         reln = Rflag.UNKN;
                         geom = new Geom(Pflag.NOSP);
@@ -261 +256 @@
 
         public void newNode(long id, double lat, double lon, double depth) {
-                nodes.put(id, new Dnode(Math.toRadians(lat), Math.toRadians(lon), depth));
+                nodes.put(id, new Snode(Math.toRadians(lat), Math.toRadians(lon), depth));
         }
 
@@ -271 +266 @@
                 if (obj == Obj.BOYWTW)
                         obj = Obj.BOYLAT;
-                if (obj == Obj.C_AGGR)
-                        feature.reln = Rflag.UNKN;
                 feature.geom = new Geom(p);
                 feature.type = obj;
                 if (obj != Obj.UNKOBJ) {
                         index.put(id, feature);
+                        feature.id = id;
                 }
         }
@@ -378 +372 @@
                 nodes.put(id, node);
                 feature = new Feature();
+                feature.id = id;
                 feature.reln = Rflag.UNKN;
                 feature.geom.prim = Pflag.POINT;
@@ -387 +382 @@
         public void addEdge(long id) {
                 feature = new Feature();
+                feature.id = id;
                 feature.reln = Rflag.UNKN;
                 feature.geom.prim = Pflag.LINE;
@@ -408 +404 @@
         public void addArea(long id) {
                 feature = new Feature();
+                feature.id = id;
                 feature.reln = Rflag.UNKN;
                 feature.geom.prim = Pflag.AREA;
@@ -445 +442 @@
                                 }
                                 AttVal<?> attval = S57val.convertValue(val, att);
-                                if (attval.val != null)
+                                if (attval.val != null) {
+                                        if (att == Att.VALSOU) {
+                                                Snode node = nodes.get(feature.geom.elems.get(0).id);
+                                                node.val = (double) attval.val;
+                                        }
                                         atts.put(att, attval);
+                                }
                         } else {
                                 if (subkeys[1].equals("type")) {
@@ -461 +463 @@
                                                 objs.put(0, atts);
                                         }
+                                        if ((obj == Obj.SOUNDG) && (feature.geom.prim == Pflag.POINT)) {
+                                                Snode node = nodes.get(feature.geom.elems.get(0).id);
+                                                node.flg = Nflag.DPTH;
+                                        }
                                 } else {
                                         Att att = S57att.enumAttribute(subkeys[1], Obj.UNKOBJ);
@@ -485 +491 @@
                 case POINT:
                         Snode node = nodes.get(id);
-                        if (node.flg != Nflag.CONN) {
+                        if ((node.flg != Nflag.CONN) && (node.flg != Nflag.DPTH) && (!feature.objs.isEmpty())) {
                                 node.flg = Nflag.ISOL;
                         }