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

Timestamp:

2014-02-15T13:01:07+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

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

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

@@ -316 +316 @@
                                 feature.geom.refs.add(comp);
                                 ListIterator<S57map.Prim> ite = feature.geom.elems.listIterator();
+                                long first = 0;
                                 while (ite.hasNext()) {
                                         Prim prim = ite.next();
-                                        if (prim.outer) {
-                                                comp.size++;
-                                                
+                                        Edge edge = edges.get(prim.id);
+                                        if (!prim.outer) {
+                                                if (first == 0) {
+                                                        feature.geom.inners++;
+                                                        comp = new Comp(ref++, 0);
+                                                        feature.geom.refs.add(comp);
+                                                        first = edge.first;
+                                                } else {
+                                                        if (edge.last == first) {
+                                                                first = 0;
+                                                        }
+                                                }
                                         }
+                                        comp.size++;
                                 }
                         }
@@ -609 +620 @@
                 }
                 
-                public long nextRef() {
+                public long nextRef(boolean all) {
                         long ref = eit.nextRef();
-                        if (ref == lastref) {
+                        if (!all && (ref == lastref)) {
                                 ref = eit.nextRef();
                         }
                         lastref = ref;
                         return ref;
+                }
+                
+                public long nextRef() {
+                        return nextRef(false);
                 }