Changeset 2807 in osm for applications/editors/josm

Timestamp:

2007-05-06T23:59:34+02:00 (18 years ago)

Author:

damians

Message:

added military danger_area
direction arows only when selected
roads with round ending

Location:

applications/editors/josm/plugins/mappaint

Files:

• src/mappaint/ElemStyleHandler.java (modified) (1 diff)
• src/mappaint/MapPaintVisitor.java (modified) (4 diffs)
• styles/standard/elemstyles.xml (modified) (1 diff)

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

@@ -107 +107 @@
                                 curIcon = new ImageIcon(imageFile);
                                                                                                 } else {
+                                                                                                        try {
+                                                                                                                URL path = getClass().getResource("/standard/icons/"+atts.getValue(count));
+                                                                                                                curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+                                                                                                        }
+                                                                                                        catch (Exception e){
                                                                                                                 URL path = getClass().getResource("/standard/icons/amenity.png");
                                                                                                                 curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+
+                                                                                                        }
                                                                                                 }
                     } else if (atts.getQName(count).equals("annotate"))

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

@@ -65 +65 @@
         @Override public void visit(Way w) {
                 double circum = Main.map.mapView.getScale()*100*Main.proj.scaleFactor()*40041455; // circumference of the earth in meter
+                boolean showDirection = Main.pref.getBoolean("draw.segment.direction") ;
+                if (Main.pref.getBoolean("mappaint.useRealWidth",false) && showDirection && !w.selected) showDirection = false;
                 Color colour = getPreferencesColor("untagged",Color.GRAY);
                 int width = 2;
@@ -94 +96 @@
                                 if (area && fillAreas)
                                         //Draw segments in a different colour so direction arrows show against the fill
-                                        drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : getPreferencesColor("untagged",Color.GRAY),Main.pref.getBoolean("draw.segment.direction"), width,true);
+                                        drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : getPreferencesColor("untagged",Color.GRAY),showDirection, width,true);
                                 else
                                         if (area)
-                                                drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : colour,Main.pref.getBoolean("draw.segment.direction"), width,true);
+                                                drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : colour,showDirection, width,true);
                                         else
-                                                if (realWidth > 0 && Main.pref.getBoolean("mappaint.useRealWidth",false)){
+                                                if (realWidth > 0 && Main.pref.getBoolean("mappaint.useRealWidth",false) && !showDirection){
                                                         int tmpWidth = (int) (100 /  (float) (circum / realWidth));
                                                         if (tmpWidth > width) width = tmpWidth;
                                                 }
 
-                                                drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : colour,Main.pref.getBoolean("draw.segment.direction"), width,false);
+                                                drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : colour,showDirection, width,false);
                                 if (!ls.incomplete && Main.pref.getBoolean("draw.segment.order_number"))
                                 {
@@ -169 +171 @@
         // Altered - now specify width
         @Override protected void drawSegment(Segment ls, Color col,boolean showDirection) {
+                        if (Main.pref.getBoolean("mappaint.useRealWidth",false) && showDirection && !ls.selected) showDirection = false;
                         drawSegment(ls,col,showDirection,1,false);
         }
@@ -188 +191 @@
                         g2d.setStroke(new BasicStroke(width,BasicStroke.CAP_BUTT,BasicStroke.JOIN_ROUND,0,new float[] {9},0));
                 else 
-                        g2d.setStroke(new BasicStroke(width));
+                        g2d.setStroke(new BasicStroke(width,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND));
+                        //g2d.setStroke(new BasicStroke(width));
 
                 Point p1 = nc.getPoint(ls.from.eastNorth);

applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml

@@ -235 +235 @@
 </rule>
 
+<rule>
+<condition k="military" v="danger_area" />
+        <area colour="#b62c2c"/>
+</rule>
 
 <rule>