Changeset 5374 in josm

Timestamp:

Jul 28, 2012 3:19:01 PM (10 months ago)

Author:

Don-vip

Message:

fix #7907 - NPE when rendering way name at low zoom

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (modified) (5 diffs)

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

@@ -403 +403 @@
 
     public void drawTextOnPath(Way way, TextElement text) {
-        if (text == null)
+        if (way == null || text == null)
             return;
         String name = text.getString(way);
-        if (name == null || name.equals(""))
+        if (name == null || name.isEmpty())
             return;
 
@@ -438 +438 @@
         double[] p1 = pointAt(t1, poly, pathLength);
         double[] p2 = pointAt(t2, poly, pathLength);
+        
+        if (p1 == null || p2 == null)
+                return;
 
         double angleOffset;
@@ -462 +465 @@
             double t = tStart + offsetSign * (rect.getX() + rect.getWidth()/2) / pathLength;
             double[] p = pointAt(t, poly, pathLength);
-            AffineTransform trfm = AffineTransform.getTranslateInstance(p[0] - rect.getX(), p[1]);
-            trfm.rotate(p[2]+angleOffset);
-            double off = -rect.getY() - rect.getHeight()/2 + text.yOffset;
-            trfm.translate(-rect.getWidth()/2, off);
-            gv.setGlyphTransform(i, trfm);
+            if (p != null) {
+                    AffineTransform trfm = AffineTransform.getTranslateInstance(p[0] - rect.getX(), p[1]);
+                    trfm.rotate(p[2]+angleOffset);
+                    double off = -rect.getY() - rect.getHeight()/2 + text.yOffset;
+                    trfm.translate(-rect.getWidth()/2, off);
+                    gv.setGlyphTransform(i, trfm);
+            }
         }
         if (text.haloRadius != null) {
@@ -488 +493 @@
         double segLen;
 
-        // Yes, it is ineffecient to iterate from the beginning for each glyph.
+        // Yes, it is inefficient to iterate from the beginning for each glyph.
         // Can be optimized if it turns out to be slow.
         for (int i = 1; i < poly.npoints; ++i) {
@@ -498 +503 @@
                 continue;
             }
-            return new double[] {poly.xpoints[i-1]+(totalLen - curLen)/segLen*dx,
+            return new double[] {
+                        poly.xpoints[i-1]+(totalLen - curLen)/segLen*dx,
                     poly.ypoints[i-1]+(totalLen - curLen)/segLen*dy,
                     Math.atan2(dy, dx)};