Changeset 2708 in osm for applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java

Timestamp:

2007-05-01T23:02:45+02:00 (18 years ago)

Author:

damians

Message:

Larger update:

• removed images folder
• created style named standard
• pushed elemstyles into standard
• pushed images into standard
• if exists $home/.josm/plugins/mappaint/icons folder, icons will be taken from there
• minor updates to elemstyles.xml

Prepering for customized styles for mappaint

File:

• applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java (modified) (3 diffs)

applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java

@@ -35 +35 @@
         // Altered from SimplePaintVisitor
         @Override public void visit(Node n) {
-                if (!n.shown) {
-                        ElemStyle nodeStyle = MapPaintPlugin.elemStyles.getStyle(n);
-                        if(nodeStyle!=null && Main.map.mapView.zoom()>=nodeStyle.getMinZoom()){
-                                if(nodeStyle instanceof IconElemStyle) {
-                                        drawNode(n, ((IconElemStyle)nodeStyle).getIcon());
-                                } else {
-                                        // throw some sort of exception
-                                }
+                ElemStyle nodeStyle = MapPaintPlugin.elemStyles.getStyle(n);
+                if(nodeStyle!=null && Main.map.mapView.zoom()>=nodeStyle.getMinZoom()){
+                        if(nodeStyle instanceof IconElemStyle) {
+                                drawNode(n, ((IconElemStyle)nodeStyle).getIcon());
                         } else {
-                                drawNode(n, n.selected ? getPreferencesColor("selected",
-                                                                                Color.YELLOW)
-                                        : getPreferencesColor("node", Color.RED));
-                        }
+                                // throw some sort of exception
+                        }
+                } else {
+                        drawNode(n, n.selected ? getPreferencesColor("selected",
+                                                                        Color.YELLOW)
+                                : getPreferencesColor("node", Color.RED));
                 }
         }
@@ -135 +133 @@
         // NEW
         protected void drawNode(Node n, ImageIcon icon) {
-                if (n.shown) return;
-                n.shown=true;
                 Point p = nc.getPoint(n.eastNorth);
                 if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
@@ -221 +217 @@
                                 osm.shown=false;
 
-                for (final OsmPrimitive osm : data.nodes)
-                        if (!osm.deleted)
-                                osm.shown=false;
-                                
                 for (final OsmPrimitive osm : data.ways)
                         if (!osm.deleted && MapPaintPlugin.elemStyles.isArea(osm))