Changeset 11760 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-03-21T15:45:26+01:00 (7 years ago)

Author:

michael2402

Message:

See #10176: Make area icon position setable by user.

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• StyleKeys.java (modified) (1 diff)
• styleelement/AreaIconElement.java (modified) (3 diffs)

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

@@ -25 +25 @@
     String ICON_ROTATION = "icon-rotation";
     String ICON_WIDTH = "icon-width";
+    /**
+     * Position of icons on area.
+     */
+    String ICON_POSITION = "icon-position";
     String LINECAP = "linecap";
     String LINEJOIN = "linejoin";

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

@@ -9 +9 @@
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.Environment;
+import org.openstreetmap.josm.gui.mappaint.Keyword;
 import org.openstreetmap.josm.gui.mappaint.styleelement.placement.PartiallyInsideAreaStrategy;
 import org.openstreetmap.josm.gui.mappaint.styleelement.placement.PositionForAreaStrategy;
@@ -32 +33 @@
      * The position of the icon inside the area.
      */
-    private final PositionForAreaStrategy iconPosition = PartiallyInsideAreaStrategy.INSTANCE;
+    private final PositionForAreaStrategy iconPosition;
 
-    protected AreaIconElement(Cascade c, MapImage iconImage, RotationAngle iconImageAngle) {
+    protected AreaIconElement(Cascade c, MapImage iconImage, RotationAngle iconImageAngle, PositionForAreaStrategy iconPosition) {
         super(c, 4.8f);
         this.iconImage = Objects.requireNonNull(iconImage, "iconImage");
         this.iconImageAngle = Objects.requireNonNull(iconImageAngle, "iconImageAngle");
+        this.iconPosition = Objects.requireNonNull(iconPosition, "iconPosition");
     }
 
@@ -59 +61 @@
         if (iconImage != null) {
             RotationAngle rotationAngle = NodeElement.createRotationAngle(env);
+            Keyword positionKeyword = c.get(AreaElement.ICON_POSITION, null, Keyword.class);
+            PositionForAreaStrategy position = PositionForAreaStrategy.forKeyword(positionKeyword, PartiallyInsideAreaStrategy.INSTANCE);
 
-            return new AreaIconElement(c, iconImage, rotationAngle);
+            return new AreaIconElement(c, iconImage, rotationAngle, position);
         } else {
             return null;