Changeset 30324 in osm for applications/editors/josm/plugins/smed2

Timestamp:

2014-03-14T21:03:15+01:00 (11 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2

Files:

• js57toosm/src/js57toosm/Js57toosm.java (modified) (1 diff)
• src/panels/PanelS57.java (modified) (9 diffs)

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

@@ -167 +167 @@
                 out.println("</osm>\n");
                 out.close();
-                System.out.println("Finished");
+                System.err.println("Finished");
         }
         

applications/editors/josm/plugins/smed2/src/panels/PanelS57.java

@@ -41 +41 @@
         ArrayList<Obj> types = new ArrayList<Obj>();
         S57map map;
-        ArrayList<Long> done = new ArrayList<Long>();
+        HashMap<Long, Long> done = new HashMap<Long, Long>();
         
         public PanelS57() {
@@ -82 +82 @@
                                                         Snode snode;
                                                         while ((snode = map.nodes.get(ref)) != null) {
-                                                                if (!done.contains(ref)) {
-                                                                        Node node = new Node(ref, 1);
+                                                                if (!done.containsKey(ref)) {
+                                                                        Node node = new Node(0, 1);
                                                                         node.setCoor((new LatLon(Math.toDegrees(snode.lat), Math.toDegrees(snode.lon))));
                                                                         data.addPrimitive(node);
                                                                         addKeys(node, feature, type);
-                                                                        done.add(ref);
+                                                                        done.put(ref, node.getUniqueId());
                                                                 }
                                                                 ref++;
@@ -110 +110 @@
                                                                         long ref = git.nextRef();
                                                                         Snode snode = map.nodes.get(ref);
-                                                                        if (!done.contains(ref)) {
-                                                                                Node node = new Node(ref, 1);
+                                                                        if (!done.containsKey(ref)) {
+                                                                                Node node = new Node(0, 1);
                                                                                 node.setCoor((new LatLon(Math.toDegrees(snode.lat), Math.toDegrees(snode.lon))));
                                                                                 data.addPrimitive(node);
-                                                                                done.add(ref);
+                                                                                done.put(ref, node.getUniqueId());
                                                                         }
                                                                 }
@@ -122 +122 @@
                                                 while (git.hasComp()) {
                                                         long edge = git.nextComp();
-                                                        Way way = new Way(edge, 1);
+                                                        Way way = new Way(0, 1);
                                                         data.addPrimitive(way);
                                                         while (git.hasEdge()) {
@@ -128 +128 @@
                                                                 while (git.hasNode()) {
                                                                         long ref = git.nextRef();
-                                                                        way.addNode((Node)data.getPrimitiveById(ref, OsmPrimitiveType.NODE));
+                                                                        way.addNode((Node)data.getPrimitiveById(done.get(ref), OsmPrimitiveType.NODE));
                                                                 }
                                                         }
@@ -142 +142 @@
                                                                         long ref = git.nextRef();
                                                                         Snode snode = map.nodes.get(ref);
-                                                                        if (!done.contains(ref)) {
-                                                                                Node node = new Node(ref, 1);
+                                                                        if (!done.containsKey(ref)) {
+                                                                                Node node = new Node(0, 1);
                                                                                 node.setCoor((new LatLon(Math.toDegrees(snode.lat), Math.toDegrees(snode.lon))));
                                                                                 data.addPrimitive(node);
-                                                                                done.add(ref);
+                                                                                done.put(ref, node.getUniqueId());
                                                                         }
                                                                 }
@@ -154 +154 @@
                                                 while (git.hasComp()) {
                                                         long ref = git.nextComp();
-                                                        Way way = new Way(ref, 1);
+                                                        Way way = new Way(0, 1);
+                                                        done.put(ref, way.getUniqueId());
                                                         data.addPrimitive(way);
                                                         while (git.hasEdge()) {
@@ -160 +161 @@
                                                                 while (git.hasNode()) {
                                                                         ref = git.nextRef();
-                                                                        way.addNode((Node) data.getPrimitiveById(ref, OsmPrimitiveType.NODE));
-                                                                }
-                                                        }
-                                                }
-                                                Relation rel = new Relation(map.ref++, 1);
+                                                                        way.addNode((Node) data.getPrimitiveById(done.get(ref), OsmPrimitiveType.NODE));
+                                                                }
+                                                        }
+                                                }
+                                                Relation rel = new Relation(0, 1);
                                                 data.addPrimitive(rel);
                                                 git = map.new GeomIterator(feature.geom);
@@ -171 +172 @@
                                                         long ref = git.nextComp();
                                                         if (outers-- > 0) {
-                                                                rel.addMember(new RelationMember("outer", (Way) data.getPrimitiveById(ref, OsmPrimitiveType.WAY)));
+                                                                rel.addMember(new RelationMember("outer", (Way) data.getPrimitiveById(done.get(ref), OsmPrimitiveType.WAY)));
                                                         } else {
-                                                                rel.addMember(new RelationMember("inner", (Way) data.getPrimitiveById(ref, OsmPrimitiveType.WAY)));
+                                                                rel.addMember(new RelationMember("inner", (Way) data.getPrimitiveById(done.get(ref), OsmPrimitiveType.WAY)));
                                                         }
                                                 }