Changeset 8289 in josm for trunk/src/org

Timestamp:

2015-04-28T13:04:18+02:00 (9 years ago)

Author:

bastiK

Message:

fixed #11378 - mapcss: fill-area rescales image

Location:

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

Files:

• AreaElemStyle.java (modified) (1 diff)
• MapImage.java (modified) (5 diffs)

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

@@ -41 +41 @@
         IconReference iconRef = c.get(FILL_IMAGE, null, IconReference.class);
         if (iconRef != null) {
-            fillImage = new MapImage(iconRef.iconName, iconRef.source);
+            fillImage = new MapImage(iconRef.iconName, iconRef.source, false);
 
             color = new Color(fillImage.getImage(false).getRGB(

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

@@ -33 +33 @@
     public String name;
     public StyleSource source;
+    public boolean autoRescale;
     public int width = -1;
     public int height = -1;
@@ -42 +43 @@
 
     public MapImage(String name, StyleSource source) {
+        this(name, source, true);
+    }
+
+    public MapImage(String name, StyleSource source, boolean autoRescale) {
         this.name = name;
         this.source = source;
+        this.autoRescale = autoRescale;
     }
 
@@ -199 +205 @@
 
     private boolean mustRescale(Image image) {
-        return ((width  == -1 && image.getWidth(null) > MAX_SIZE)
-             && (height == -1 && image.getHeight(null) > MAX_SIZE));
+        return autoRescale && width  == -1 && image.getWidth(null) > MAX_SIZE
+             && height == -1 && image.getHeight(null) > MAX_SIZE;
     }
 
@@ -212 +218 @@
                 Objects.equals(name, other.name) &&
                 Objects.equals(source, other.source) &&
+                autoRescale == other.autoRescale &&
                 width == other.width &&
                 height == other.height;
@@ -222 +229 @@
         hash = 67 * hash + name.hashCode();
         hash = 67 * hash + source.hashCode();
+        hash = 67 * hash + (autoRescale ? 1 : 0);
         hash = 67 * hash + width;
         hash = 67 * hash + height;