Changeset 11728 in josm for trunk/src/org

Timestamp:

2017-03-13T19:10:48+01:00 (8 years ago)

Author:

michael2402

Message:

Partial revert of [11726]: Committed to much.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• gui/mappaint/styleelement/AreaElement.java (modified) (8 diffs)

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

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

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;
@@ -62 +63 @@
     public Float extentThreshold;
 
-    protected AreaElement(Cascade c, Color color, MapImage fillImage, Float extent, Float extentThreshold, TextLabel text) {
+    /**
+     * 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) {
         super(c, 1f);
         CheckParameterUtil.ensureParameterNotNull(color);
@@ -70 +82 @@
         this.extentThreshold = extentThreshold;
         this.text = text;
+        this.iconImage = iconImage;
+        this.iconImageAngle = iconImageAngle;
     }
 
@@ -105 +119 @@
 
         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) {
@@ -110 +131 @@
             Float extentThreshold = c.get(FILL_EXTENT_THRESHOLD, null, float.class);
 
-            return new AreaElement(c, color, fillImage, extent, extentThreshold, text);
+            return new AreaElement(c, color, fillImage, extent, extentThreshold, text, iconImage, rotationAngle);
         } else {
             return null;
@@ -135 +156 @@
             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));
+        }
     }
 
@@ -147 +173 @@
                 Objects.equals(text, that.text) &&
                 Objects.equals(extent, that.extent) &&
-                Objects.equals(extentThreshold, that.extentThreshold);
+                Objects.equals(extentThreshold, that.extentThreshold) &&
+                Objects.equals(iconImage, that.iconImage) &&
+                Objects.equals(iconImageAngle, that.iconImageAngle);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), color, fillImage, text, extent, extentThreshold);
+        return Objects.hash(super.hashCode(), color, fillImage, text, extent, extentThreshold, iconImage, iconImageAngle);
     }
 
@@ -158 +186 @@
     public String toString() {
         return "AreaElemStyle{" + super.toString() + "color=" + Utils.toString(color) +
-                " fillImage=[" + fillImage + "]}";
+                " fillImage=[" + fillImage + "] iconImage=[" + iconImage + "] iconImageAngle=[" + iconImageAngle + "]}";
     }
 }