Changeset 11726 in josm

Timestamp:

2017-03-13T18:54:20+01:00 (8 years ago)

Author:

michael2402

Message:

Don't use null to indicate a rotation of 0 degrees, simply set the rotation to 0.

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/paint/RenderBenchmarkCollector.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java (modified) (8 diffs)
• src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/util/RotationAngle.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java (modified) (2 diffs)

trunk/.classpath

@@ -21 +21 @@
         <classpathentry kind="lib" path="test/lib/system-rules-1.16.1.jar"/>
         <classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.6.jar"/>
+        <classpathentry kind="lib" path="pja.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1532 +1532 @@
         settingsMap.keySet().stream()
                 .filter(key -> key.startsWith("color."))
-                .flatMap(key -> {
+                .map(key -> {
                     final String newKey = ColorProperty.getColorKey(key.substring("color.".length()));
-                    return key.equals(newKey) || settingsMap.containsKey(newKey)
-                            ? Stream.empty()
-                            : Stream.of(new AbstractMap.SimpleImmutableEntry<>(key, newKey));
+                    return new AbstractMap.SimpleImmutableEntry<>(key, newKey);
+                })
+                .filter(entry -> {
+                    return !entry.getKey().equals(entry.getValue()) && !settingsMap.containsKey(entry.getValue());
                 })
                 .collect(Collectors.toList()) // to avoid ConcurrentModificationException

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

@@ -37 +37 @@
     /**
      * Notified when the renderer method starts drawing
-     * @param allStyleElems All the elements that are painted.
+     * @param allStyleElems All the elements that are painted. Unsorted
      * @return <code>true</code> if the renderer should continue to render
      */

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
-import org.openstreetmap.josm.gui.util.RotationAngle;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
@@ -63 +62 @@
     public Float extentThreshold;
 
-    /**
-     * The icon that is displayed on the center of the area.
-     */
-    private final MapImage iconImage;
-
-    /**
-     * The rotation of the {@link #iconImageAngle}
-     */
-    private final RotationAngle iconImageAngle;
-
-    protected AreaElement(Cascade c, Color color, MapImage fillImage, Float extent,
-            Float extentThreshold, TextLabel text, MapImage iconImage, RotationAngle iconImageAngle) {
+    protected AreaElement(Cascade c, Color color, MapImage fillImage, Float extent, Float extentThreshold, TextLabel text) {
         super(c, 1f);
         CheckParameterUtil.ensureParameterNotNull(color);
@@ -82 +70 @@
         this.extentThreshold = extentThreshold;
         this.text = text;
-        this.iconImage = iconImage;
-        this.iconImageAngle = iconImageAngle;
     }
 
@@ -119 +105 @@
 
         TextLabel text = null; // <- text is handled by TextElement
-        MapImage iconImage = NodeElement.createIcon(env);
-        RotationAngle rotationAngle = NodeElement.createRotationAngle(env);
-
-        if (iconImage != null) {
-            // fake a transparent color.
-            color = new Color(0, 0, 0, 0);
-        }
 
         if (color != null) {
@@ -131 +110 @@
             Float extentThreshold = c.get(FILL_EXTENT_THRESHOLD, null, float.class);
 
-            return new AreaElement(c, color, fillImage, extent, extentThreshold, text, iconImage, rotationAngle);
+            return new AreaElement(c, color, fillImage, extent, extentThreshold, text);
         } else {
             return null;
@@ -156 +135 @@
             painter.drawArea((Relation) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled(), text);
         }
-
-        if (iconImage != null && painter.isShowIcons()) {
-            painter.drawAreaIcon(osm, iconImage, painter.isInactiveMode() || osm.isDisabled(), selected, member,
-                    iconImageAngle == null ? 0.0 : iconImageAngle.getRotationAngle(osm));
-        }
     }
 
@@ -173 +147 @@
                 Objects.equals(text, that.text) &&
                 Objects.equals(extent, that.extent) &&
-                Objects.equals(extentThreshold, that.extentThreshold) &&
-                Objects.equals(iconImage, that.iconImage) &&
-                Objects.equals(iconImageAngle, that.iconImageAngle);
+                Objects.equals(extentThreshold, that.extentThreshold);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), color, fillImage, text, extent, extentThreshold, iconImage, iconImageAngle);
+        return Objects.hash(super.hashCode(), color, fillImage, text, extent, extentThreshold);
     }
 
@@ -186 +158 @@
     public String toString() {
         return "AreaElemStyle{" + super.toString() + "color=" + Utils.toString(color) +
-                " fillImage=[" + fillImage + "] iconImage=[" + iconImage + "] iconImageAngle=[" + iconImageAngle + "]}";
+                " fillImage=[" + fillImage + "]}";
     }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java

@@ -66 +66 @@
         this.mapImage = mapImage;
         this.symbol = symbol;
-        this.mapImageAngle = rotationAngle;
+        this.mapImageAngle = Objects.requireNonNull(rotationAngle, "rotationAngle");
     }
 
@@ -106 +106 @@
         Cascade c = env.mc.getCascade(env.layer);
 
-        RotationAngle rotationAngle = null;
+        RotationAngle rotationAngle = RotationAngle.NO_ROTATION;
         final Float angle = c.get(ICON_ROTATION, null, Float.class, true);
         if (angle != null) {

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

@@ -116 +116 @@
         }
     }
+
+    /**
+     * A no-rotation angle that always returns 0.
+     * @since 11726
+     */
+    static RotationAngle NO_ROTATION = new StaticRotationAngle(0);
 
     /**

trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java

@@ -98 +98 @@
                 new TestConfig("area-fill-image", AREA_DEFAULT),
 
+                /** Tests area label drawing/placement */
+                new TestConfig("area-text", AREA_DEFAULT),
+
                 /** Tests if all styles are sorted correctly. Tests {@link StyleRecord#compareTo(StyleRecord)} */
                 new TestConfig("order", AREA_DEFAULT)

trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

@@ -48 +48 @@
             Layer layer = new OsmDataLayer(ds, null, null);
             Main.getLayerManager().addLayer(layer);
-            // FIXME enable this test after we fix the bug. Test disabled for now
-            // try {
-            //     new JoinAreasAction().join(ds.getWays());
-            // } finally {
-            // Ensure we clean the place before leaving, even if test fails.
-            Main.getLayerManager().removeLayer(layer);
-            // }
+            try {
+                new JoinAreasAction().join(ds.getWays());
+            } finally {
+                // Ensure we clean the place before leaving, even if test fails.
+                Main.getLayerManager().removeLayer(layer);
+            }
         }
     }
@@ -77 +76 @@
                 Main.main.menu.joinAreas.join(Utils.filteredCollection(found, Way.class));
 
-                Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:way ref="+ref, SearchAction.SearchMode.replace);
+                Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:relation ref="+ref, SearchAction.SearchMode.replace);
                 assertEquals(1, found2.size());
                 System.out.println(" ==> OK");