Changeset 30325 in osm for applications/editors/josm/plugins/smed2/src/panels

Timestamp:

2014-03-16T14:21:57+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/panels

Files:

• PanelMain.java (modified) (1 diff)
• PanelS57.java (modified) (9 diffs)

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

@@ -143 +143 @@
                 Renderer.reRender(g2, Integer.parseInt(zt.getText()), Integer.parseInt(ft.getText()), Smed2Action.map, Smed2Action.rendering);
                 try {
-                        ImageIO.write(img, "png", new File("/Users/mherring/Desktop/export.png"));
+                        ImageIO.write(img, "png", new File(System.getProperty("user.home") + "/Desktop/export.png"));
                 } catch (Exception x) {
                         System.out.println("Exception");

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

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