Changeset 30183 in osm for applications/editors/josm/plugins/smed2/src/s57/S57map.java

Timestamp:

2014-01-05T14:28:30+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/s57/S57map.java (modified) (9 diffs)

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

@@ -13 +13 @@
 
 import s57.S57att;
-import s57.S57val.AttVal;
 import s57.S57att.*;
 import s57.S57obj;
@@ -25 +24 @@
                 ANON,   // Edge inner nodes
                 ISOL,   // Node not part of Edge
-                CONN    // Edge first and last nodes
+                CONN,   // Edge first and last nodes
+                DPTH    // Sounding nodes
         }
 
@@ -50 +50 @@
         }
 
+        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) {
+                        flg = Nflag.DPTH;
+                        lat = ilat;
+                        lon = ilon;
+                        val = ival;
+                }
+        }
+        
         public class Edge {             // A polyline segment
                 public long first;      // First CONN node
@@ -157 +174 @@
         public class Feature {
                 public Fflag flag;
-                public long refs;
+                public long id;
                 public Obj type;
                 public AttMap atts;
@@ -167 +184 @@
                 Feature() {
                         flag = Fflag.UNKN;
-                        refs = 0;
+                        id = 0;
                         type = Obj.UNKOBJ;
                         atts = new AttMap();
@@ -287 +304 @@
                 nodes.put(id, new Snode(Math.toRadians(lat), Math.toRadians(lon)));
                 feature = new Feature();
-                feature.refs = id;
+                feature.id = id;
                 feature.flag = Fflag.POINT;
                 edge = null;
         }
 
+        public void addNode(long id, double lat, double lon, double depth) {
+                nodes.put(id, new Dnode(Math.toRadians(lat), Math.toRadians(lon), depth));
+                feature = new Feature();
+                feature.id = id;
+                feature.flag = Fflag.POINT;
+                edge = null;
+        }
+
         public void addEdge(long id) {
                 feature = new Feature();
-                feature.refs = id;
+                feature.id = id;
                 feature.flag = Fflag.LINE;
                 edge = new Edge();
@@ -312 +337 @@
         public void addArea(long id) {
                 feature = new Feature();
-                feature.refs = id;
+                feature.id = id;
                 feature.flag = Fflag.AREA;
                 outers = new ArrayList<Long>();
@@ -505 +530 @@
                 switch (feature.flag) {
                 case POINT:
-                        return nodes.get(feature.refs);
+                        return nodes.get(feature.id);
                 case LINE:
-                        Edge edge = edges.get(feature.refs);
+                        Edge edge = edges.get(feature.id);
                         EdgeIterator eit = new EdgeIterator(edge, true);
                         while (eit.hasNext()) {
@@ -542 +567 @@
                         return new Snode(llat + ((lat - llat) * harc / sarc), llon + ((lon - llon) * harc / sarc));
                 case AREA:
-                        Bound bound = areas.get(feature.refs).get(0);
+                        Bound bound = areas.get(feature.id).get(0);
                         BoundIterator bit = new BoundIterator(bound);
                         while (bit.hasNext()) {