Index: /applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java
===================================================================
--- /applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java	(revision 3592)
+++ /applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java	(revision 3593)
@@ -21,4 +21,5 @@
 	int curLineWidth = 1;
 	int curLineRealWidth = 0;
+	boolean curLineDashed = false;
     Color curLineColour = null;
     Color curAreaColour = null;
@@ -86,4 +87,6 @@
 										else if (atts.getQName(count).equals("realwidth"))
 												curLineRealWidth=Integer.parseInt(atts.getValue(count));
+										else if (atts.getQName(count).equals("dashed"))
+												curLineDashed=Boolean.parseBoolean(atts.getValue(count));
                 }
             }
@@ -139,9 +142,10 @@
 			if(curLineWidth != -1)
 			{
-            	newStyle = new LineElemStyle(curLineWidth, curLineRealWidth, curLineColour,
-										curScaleMax);
+            	newStyle = new LineElemStyle(curLineWidth, curLineRealWidth, curLineColour, 
+										curLineDashed, curScaleMax);
             	styles.add (curKey, curValue, newStyle);
 				curLineWidth	= 1;
 				curLineRealWidth= 0;
+				curLineDashed   = false;
 				curLineColour 	= null;
 			}
Index: /applications/editors/josm/plugins/mappaint/src/mappaint/LineElemStyle.java
===================================================================
--- /applications/editors/josm/plugins/mappaint/src/mappaint/LineElemStyle.java	(revision 3592)
+++ /applications/editors/josm/plugins/mappaint/src/mappaint/LineElemStyle.java	(revision 3593)
@@ -7,10 +7,12 @@
 	int realWidth = 0; //the real width of this line in meter
 	Color colour;
+	boolean dashed = false;
 
-	public LineElemStyle (int width, int realWidth, Color colour, int minZoom)
+	public LineElemStyle (int width, int realWidth, Color colour, boolean dashed, int minZoom)
 	{
 		this.width = width;
 		this.realWidth = realWidth;
 		this.colour = colour;
+		this.dashed = dashed;
 		this.minZoom = minZoom;
 	}
@@ -33,5 +35,5 @@
 	@Override public String toString()
 	{
-		return "LineElemStyle:  width= " + width +  " colour=" + colour;
+		return "LineElemStyle:  width= " + width + "realWidth= " + realWidth +  " colour=" + colour + " dashed=" + dashed;
 	}
 }
Index: /applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java
===================================================================
--- /applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java	(revision 3592)
+++ /applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java	(revision 3593)
@@ -66,5 +66,5 @@
 			if(nodeStyle instanceof IconElemStyle) {
 				if(isZoomOk(nodeStyle)) {
-					drawNode(n, ((IconElemStyle)nodeStyle).getIcon());
+					drawNode(n, ((IconElemStyle)nodeStyle).getIcon(), ((IconElemStyle)nodeStyle).doAnnotate());
 				}
 			} else {
@@ -102,4 +102,5 @@
 		int width = 2;
 		int realWidth = 0; //the real width of the element in meters 
+		boolean dashed = false;
 		boolean area=false;
 		ElemStyle wayStyle = MapPaintPlugin.elemStyles.getStyle(w);
@@ -116,4 +117,5 @@
 				width = ((LineElemStyle)wayStyle).getWidth();
 				realWidth = ((LineElemStyle)wayStyle).getRealWidth();	
+				dashed = ((LineElemStyle)wayStyle).dashed;
 			}
 			else if (wayStyle instanceof AreaElemStyle)
@@ -143,5 +145,5 @@
 						}
 
-						drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : colour,showDirection, width,false);
+						drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : colour,showDirection, width,dashed);
 				if (!ls.incomplete && Main.pref.getBoolean("draw.segment.order_number"))
 				{
@@ -182,5 +184,5 @@
 
 	// NEW
-	protected void drawNode(Node n, ImageIcon icon) {
+	protected void drawNode(Node n, ImageIcon icon, boolean annotate) {
 		Point p = nc.getPoint(n.eastNorth);
 		if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
@@ -188,5 +190,5 @@
 		icon.paintIcon ( Main.map.mapView, g, p.x-w/2, p.y-h/2 );
 		String name = (n.keys==null) ? null : n.keys.get("name");
-		if (name!=null)
+		if (name!=null && annotate)
 		{
 			g.setColor( getPreferencesColor ("text", Color.WHITE));