Changeset 8238 in josm for trunk/src/org

Timestamp:

2015-04-19T22:46:20+02:00 (10 years ago)

Author:

simon04

Message:

see #10217 - Fix reset/flickering/cache issue wrt rotated MapCSS icons

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/NodeElemStyle.java (modified) (3 diffs)
• util/RotationAngle.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

@@ -359 +359 @@
         hash = 17 * hash + (mapImage != null ? mapImage.hashCode() : 0);
         hash = 17 * hash + (symbol != null ? symbol.hashCode() : 0);
+        hash = 17 * hash + (mapImageAngle != null ? mapImageAngle.hashCode() : 0);
         return hash;
     }
@@ -374 +375 @@
             return false;
         if (!Objects.equals(symbol, other.symbol))
+            return false;
+        if (!Objects.equals(mapImageAngle, other.mapImageAngle))
             return false;
         return true;
@@ -388 +391 @@
             s.append(" symbol=[" + symbol + "]");
         }
+        if (mapImageAngle != null) {
+            s.append(" mapImageAngle=[" + mapImageAngle + "]");
+        }
         s.append('}');
         return s.toString();

trunk/src/org/openstreetmap/josm/gui/util/RotationAngle.java

@@ -28 +28 @@
             public double getRotationAngle(OsmPrimitive p) {
                 return angle;
+            }
+
+            @Override
+            public String toString() {
+                return angle + "rad";
             }
         };
@@ -116 +121 @@
                 }
             }
+
+            @Override
+            public String toString() {
+                return "way-direction";
+            }
         };
     }