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

Timestamp:

2014-02-15T16:22:45+01:00 (11 years ago)

Author:

malcolmh

Message:

save

File:

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

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

@@ -33 +33 @@
         public static void main(String[] args) throws IOException {
 
-                in = new FileInputStream("/Users/mherring/boatsw/oseam/josm/plugins/smed2/js57toosm/tst.000");
+                if (args.length < 1) {
+                        System.err.println("Usage: java -jar js57toosm.jar S57_filename [types_filename]");
+                        System.exit(-1);
+                }
+                in = new FileInputStream(args[0]);
                 out = System.out;
+                ArrayList<Obj> types = new ArrayList<Obj>();
+                if (args.length == 2) {
+                        Scanner tin = new Scanner(new FileInputStream(args[1]));
+                        while (tin.hasNext()) {
+                                types.add(S57obj.enumType(tin.next()));
+                        }
+                        tin.close();
+                }
+                
                 map = new S57map();
-
                 S57dat.rnum = 0;
 
@@ -57 +69 @@
                 double minlat = 90, minlon = 180, maxlat = -90, maxlon = -180;
                 
-                HashMap<Long, Boolean> done = new HashMap<Long, Boolean>();
+                ArrayList<Long> done = new ArrayList<Long>();
 
                 while (in.read(leader) == 24) {
@@ -221 +233 @@
                         Feature feature = map.index.get(id);
                         String type = S57obj.stringType(feature.type);
-                        if (!type.isEmpty()) {
+                        if (!type.isEmpty() && (types.isEmpty() || types.contains(feature.type))) {
                                 if (feature.reln == Rflag.MASTER) {
                                         if (feature.geom.prim == Pflag.POINT) {
@@ -228 +240 @@
                                                         Snode node;
                                                         while ((node = map.nodes.get(ref)) != null) {
-                                                                if (!done.containsKey(ref)) {
+                                                                if (!done.contains(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);
@@ -235 +247 @@
                                                                         writeAtts(feature, type);
                                                                         out.format("  </node>%n");
-                                                                        done.put(ref, true);
+                                                                        done.add(ref);
                                                                 }
                                                                 ref++;
@@ -247 +259 @@
                         Feature feature = map.index.get(id);
                         String type = S57obj.stringType(feature.type);
-                        if (!type.isEmpty()) {
+                        if (!type.isEmpty() && (types.isEmpty() || types.contains(feature.type))) {
                                 if (feature.reln == Rflag.MASTER) {
                                         if (feature.geom.prim == Pflag.LINE) {
@@ -258 +270 @@
                                                                         long ref = git.nextRef();
                                                                         Snode node = map.nodes.get(ref);
-                                                                        if (!done.containsKey(ref)) {
+                                                                        if (!done.contains(ref)) {
                                                                                 out.format("  <node id='%d' lat='%.8f' lon='%.8f' version='1'/>%n", -ref, Math.toDegrees(node.lat), Math.toDegrees(node.lon));
-                                                                                done.put(ref, true);
+                                                                                done.add(ref);
                                                                         }
                                                                 }
@@ -279 +291 @@
                                                         }
                                                         out.format("  </way>%n");
-                                                        done.put(way, true);
+                                                        done.add(way);
                                                 }
                                         } else if (feature.geom.prim == Pflag.AREA) {
@@ -290 +302 @@
                                                                         long ref = git.nextRef();
                                                                         Snode node = map.nodes.get(ref);
-                                                                        if (!done.containsKey(ref)) {
+                                                                        if (!done.contains(ref)) {
                                                                                 out.format("  <node id='%d' lat='%.8f' lon='%.8f' version='1'/>%n", -ref, Math.toDegrees(node.lat), Math.toDegrees(node.lon));
-                                                                                done.put(ref, true);
+                                                                                done.add(ref);
                                                                         }
                                                                 }
@@ -302 +314 @@
                                                         while (git.hasEdge()) {
                                                                 long way = git.nextEdge();
-                                                                if (!done.containsKey(way)) {
+                                                                if (!done.contains(way)) {
                                                                         out.format("  <way id='%d' version='1'>%n", -way);
                                                                         while (git.hasNode()) {
@@ -309 +321 @@
                                                                         }
                                                                         out.format("  </way>%n");
-                                                                        done.put(way, true);
+                                                                        done.add(way);
                                                                 }
                                                         }
@@ -317 +329 @@
                                                 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();