Changeset 30282 in osm for applications/editors/josm/plugins/smed2/js57toosm/src

Timestamp:

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

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/js57toosm/src/js57toosm/Js57toosm.java (modified) (8 diffs)

applications/editors/josm/plugins/smed2/js57toosm/src/js57toosm/Js57toosm.java

@@ -11 +11 @@
 
 import java.io.*;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 
 import s57.S57map.Prim;
 import s57.S57obj;
+import s57.S57obj.*;
 import s57.S57att;
-import s57.S57obj.Obj;
 import s57.S57att.*;
 import s57.S57val;
@@ -57 +56 @@
                 long objl = 0;
                 double minlat = 90, minlon = 180, maxlat = -90, maxlon = -180;
+                
+                HashMap<Long, Boolean> done = new HashMap<Long, Boolean>();
 
                 while (in.read(leader) == 24) {
@@ -113 +114 @@
                                                         long attl = (long) S57dat.getSubf(S57subf.ATTL);
                                                         String atvl = (String) S57dat.getSubf(S57subf.ATVL);
-                                                        map.newAtt(attl, atvl);
+                                                        if (!atvl.isEmpty()) {
+                                                                map.newAtt(attl, atvl);
+                                                        }
                                                 } while (S57dat.more());
                                                 break;
@@ -225 +228 @@
                                                         Snode node;
                                                         while ((node = map.nodes.get(ref)) != null) {
-                                                                out.format("  <node id='%d' lat='%.8f' lon='%.8f' version='1'>%n", -ref, Math.toDegrees(node.lat), Math.toDegrees(node.lon));
-                                                                out.format("    <tag k='seamark:type' v=\"%s\"/>%n", type);
-                                                                if ((feature.type == Obj.SOUNDG) && (node.flg == S57map.Nflag.DPTH))
-                                                                        out.format("    <tag k='seamark:sounding:depth' v='%.1f'/>%n", ((Dnode) node).val);
-                                                                writeAtts(feature, type);
-                                                                out.format("  </node>%n");
-                                                                map.nodes.remove(ref++);
+                                                                if (!done.containsKey(ref)) {
+                                                                        out.format("  <node id='%d' lat='%.8f' lon='%.8f' version='1'>%n", -ref, Math.toDegrees(node.lat), Math.toDegrees(node.lon));
+                                                                        out.format("    <tag k='seamark:type' v=\"%s\"/>%n", type);
+                                                                        if ((feature.type == Obj.SOUNDG) && (node.flg == S57map.Nflag.DPTH))
+                                                                                out.format("    <tag k='seamark:sounding:depth' v='%.1f'/>%n", ((Dnode) node).val);
+                                                                        writeAtts(feature, type);
+                                                                        out.format("  </node>%n");
+                                                                        done.put(ref, true);
+                                                                }
+                                                                ref++;
                                                         }
                                                 }
@@ -252 +258 @@
                                                                         long ref = git.nextRef();
                                                                         Snode node = map.nodes.get(ref);
-                                                                        if (node != null) {
+                                                                        if (!done.containsKey(ref)) {
                                                                                 out.format("  <node id='%d' lat='%.8f' lon='%.8f' version='1'/>%n", -ref, Math.toDegrees(node.lat), Math.toDegrees(node.lon));
-                                                                                map.nodes.remove(ref);
+                                                                                done.put(ref, true);
                                                                         }
                                                                 }
@@ -273 +279 @@
                                                         }
                                                         out.format("  </way>%n");
+                                                        done.put(way, true);
                                                 }
                                         } else if (feature.geom.prim == Pflag.AREA) {
@@ -283 +290 @@
                                                                         long ref = git.nextRef();
                                                                         Snode node = map.nodes.get(ref);
-                                                                        if (node != null) {
+                                                                        if (!done.containsKey(ref)) {
                                                                                 out.format("  <node id='%d' lat='%.8f' lon='%.8f' version='1'/>%n", -ref, Math.toDegrees(node.lat), Math.toDegrees(node.lon));
-                                                                                map.nodes.remove(ref);
+                                                                                done.put(ref, true);
                                                                         }
                                                                 }
@@ -292 +299 @@
                                                 git = map.new GeomIterator(feature.geom);
                                                 while (git.hasComp()) {
-                                                        long way = git.nextComp();
-                                                        out.format("  <way id='%d' version='1'>%n", -way);
-                                                        while (git.hasEdge()) {
-                                                                git.nextEdge();
-                                                                while (git.hasNode()) {
-                                                                        long ref = git.nextRef();
-                                                                        out.format("    <nd ref='%d'/>%n", -ref);
-                                                                }
-                                                        }
-                                                        out.format("  </way>%n");
+                                                        git.nextComp();
+                                                        while (git.hasEdge()) {
+                                                                long way = git.nextEdge();
+                                                                if (!done.containsKey(way)) {
+                                                                        out.format("  <way id='%d' version='1'>%n", -way);
+                                                                        while (git.hasNode()) {
+                                                                                long ref = git.nextRef(true);
+                                                                                out.format("    <nd ref='%d'/>%n", -ref);
+                                                                        }
+                                                                        out.format("  </way>%n");
+                                                                        done.put(way, true);
+                                                                }
+                                                        }
                                                 }
                                                 out.format("  <relation id='%d' version='1'>%n", -map.ref++);
                                                 out.format("    <tag k='type' v='multipolygon'/>%n");
-                                                int i = 0;
-                                                for (Comp comp : feature.geom.refs) {
-                                                        if (i++ < feature.geom.outers) {
-                                                                out.format("    <member type='way' ref='%d' role='outer'/>%n", -comp.ref);
-                                                        } else {
-                                                                out.format("    <member type='way' ref='%d' role='inner'/>%n", -comp.ref);
+                                                git = map.new GeomIterator(feature.geom);
+                                                int outers = feature.geom.refs.get(0).size;
+if (feature.geom.inners != 0){
+        int x=0;
+}
+                                                while (git.hasComp()) {
+                                                        git.nextComp();
+                                                        while (git.hasEdge()) {
+                                                                long way = git.nextEdge();
+                                                                if (outers-- > 0) {
+                                                                        out.format("    <member type='way' ref='%d' role='outer'/>%n", -way);
+                                                                } else {
+                                                                        out.format("    <member type='way' ref='%d' role='inner'/>%n", -way);
+                                                                }
                                                         }
                                                 }