Changeset 29202 in osm for applications/editors/josm/plugins/smed2/src/smed2

Timestamp:

2013-01-17T12:08:28+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• MapImage.java (modified) (1 diff)
• Smed2Action.java (modified) (2 diffs)

applications/editors/josm/plugins/smed2/src/smed2/MapImage.java

@@ -64 +64 @@
         public void paint(Graphics2D g2, MapView mv, Bounds bb) {
                 Rectangle rect = Main.map.mapView.getBounds();
-                g2.setBackground(new Color(0xb5d0d0));
-                g2.clearRect(rect.x, rect.y, rect.width, rect.height);
+//              g2.setBackground(new Color(0xb5d0d0));
+//              g2.clearRect(rect.x, rect.y, rect.width, rect.height);
                 g2.setPaint(Color.black);
                 g2.setFont(new Font("Arial", Font.BOLD, 20));

applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java

@@ -207 +207 @@
                 if (data != null) {
                         for (OsmPrimitive osm : data) {
-                                if ((osm instanceof Node) || (osm instanceof Way)) {
-                                        if (osm instanceof Node) {
-                                                map.addNode(((Node) osm).getUniqueId(), ((Node) osm).getCoor().lat(), ((Node) osm).getCoor().lon());
-                                        } else {
-                                                map.addWay(((Way) osm).getUniqueId());
-                                                for (Node node : ((Way) osm).getNodes()) {
-                                                        map.addToWay((node.getUniqueId()));
-                                                }
-                                        }
-                                        for (Entry<String, String> entry : osm.getKeys().entrySet()) {
-                                                map.addTag(entry.getKey(), entry.getValue());
-                                        }
-                                        map.tagsDone(osm.getUniqueId());
+                                if (osm instanceof Node) {
+                                        map.addNode(((Node) osm).getUniqueId(), ((Node) osm).getCoor().lat(), ((Node) osm).getCoor().lon());
+                                } else if (osm instanceof Way) {
+                                        map.addWay(((Way) osm).getUniqueId());
+                                        for (Node node : ((Way) osm).getNodes()) {
+                                                map.addToWay((node.getUniqueId()));
+                                        }
                                 } else if ((osm instanceof Relation) && ((Relation) osm).isMultipolygon()) {
                                         map.addMpoly(((Relation) osm).getUniqueId());
@@ -227 +221 @@
                                         }
                                 }
+                                for (Entry<String, String> entry : osm.getKeys().entrySet()) {
+                                        map.addTag(entry.getKey(), entry.getValue());
+                                }
+                                map.tagsDone(osm.getUniqueId());
                         }
                 }