Changeset 2668 in josm

Timestamp:

Dec 20, 2009 9:01:25 PM (3 years ago)

Author:

jttt

Message:

Fixed #4207 getCurrentDataSet() returns null after adding new layers (then null pointers exceptions); fixed drawing ways with real width

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/MapPaintVisitor.java (modified) (2 diffs)
• gui/MapView.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java

@@ -250 +250 @@
         }
         if (realWidth > 0 && useRealWidth && !showDirection) {
-            int tmpWidth = (int) (100 /  (float) (circum / realWidth));
-            if (tmpWidth > width) {
-                width = tmpWidth;
-            }
 
             /* if we have a "width" tag, try use it */
@@ -263 +259 @@
             if(widthTag != null) {
                 try {
-                    width = Integer.parseInt(widthTag);
+                    realWidth = Integer.parseInt(widthTag);
                 }
                 catch(NumberFormatException nfe) {
                 }
+            }
+
+            int tmpWidth = (int) (100 /  (float) (circum / realWidth));
+            if (tmpWidth > width) {
+                width = tmpWidth;
             }
         }

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -582 +582 @@
 
     private void setEditLayer() {
-        OsmDataLayer newEditLayer = null;
+        OsmDataLayer newEditLayer = editLayer;
         OsmDataLayer oldEditLayer = editLayer;