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

Timestamp:

2014-01-06T16:26:41+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

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

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

@@ -174 +174 @@
         public class Feature {
                 public Fflag flag;
-                public long id;
+                public long refs;
                 public Obj type;
                 public AttMap atts;
@@ -184 +184 @@
                 Feature() {
                         flag = Fflag.UNKN;
-                        id = 0;
+                        refs = 0;
                         type = Obj.UNKOBJ;
                         atts = new AttMap();
@@ -304 +304 @@
                 nodes.put(id, new Snode(Math.toRadians(lat), Math.toRadians(lon)));
                 feature = new Feature();
-                feature.id = id;
+                feature.refs = id;
                 feature.flag = Fflag.POINT;
                 edge = null;
         }
 
-        public void addNode(long id, double lat, double lon, double depth) {
+        public void newNode(long id, double lat, double lon, Nflag flag) {
+                nodes.put(id, new Snode(Math.toRadians(lat), Math.toRadians(lon), flag));
+                if (flag == Nflag.ANON) {
+                        edge.nodes.add(id);
+                }
+        }
+
+        public void newNode(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 newEdge(long id) {
+                edge = new Edge();
+                edges.put(id, edge);
+        }
+
+        public void addConn(long id, int topi) {
+                if (topi == 1) {
+                        edge.first = id;
+                } else {
+                        edge.last = id;
+                }
         }
 
         public void addEdge(long id) {
                 feature = new Feature();
-                feature.id = id;
+                feature.refs = id;
                 feature.flag = Fflag.LINE;
                 edge = new Edge();
@@ -337 +353 @@
         public void addArea(long id) {
                 feature = new Feature();
-                feature.id = id;
+                feature.refs = id;
                 feature.flag = Fflag.AREA;
                 outers = new ArrayList<Long>();
@@ -530 +546 @@
                 switch (feature.flag) {
                 case POINT:
-                        return nodes.get(feature.id);
+                        return nodes.get(feature.refs);
                 case LINE:
-                        Edge edge = edges.get(feature.id);
+                        Edge edge = edges.get(feature.refs);
                         EdgeIterator eit = new EdgeIterator(edge, true);
                         while (eit.hasNext()) {
@@ -567 +583 @@
                         return new Snode(llat + ((lat - llat) * harc / sarc), llon + ((lon - llon) * harc / sarc));
                 case AREA:
-                        Bound bound = areas.get(feature.id).get(0);
+                        Bound bound = areas.get(feature.refs).get(0);
                         BoundIterator bit = new BoundIterator(bound);
                         while (bit.hasNext()) {