Changeset 3828

Timestamp:

07/01/11 08:48:49 (11 months ago)

Author:

jeichar

Message:

fix for rotated scaling. closes #642 a=alex r=jeichar

Location:

print/trunk/src/main/java/org/mapfish/print

Files:

• config/layout/MapBlock.java (modified) (1 diff)
• utils/PJsonObject.java (modified) (1 diff)

print/trunk/src/main/java/org/mapfish/print/config/layout/MapBlock.java

@@ -115 +115 @@
             centerX = (minX + maxX) / 2.0F;
             centerY = (minY + maxY) / 2.0F;
+            
+            double rotation = params.optDouble("rotation", 0.0);
+            rotation *= Math.PI / 180;
+            float projWidth  = (maxX - minX) * (float)Math.abs(Math.cos(rotation)) +
+                               (maxY - minY) * (float)Math.abs(Math.sin(rotation));
+            float projHeight = (maxY - minY) * (float)Math.abs(Math.cos(rotation)) +
+                               (maxX - minX) * (float)Math.abs(Math.sin(rotation));
             scale = context.getConfig().getBestScale(Math.max(
-                    (maxX - minX) / (DistanceUnit.PT.convertTo(width, unitEnum)),
-                    (maxY - minY) / (DistanceUnit.PT.convertTo(height, unitEnum))));
+                    projWidth  / (DistanceUnit.PT.convertTo(width, unitEnum)),
+                    projHeight / (DistanceUnit.PT.convertTo(height, unitEnum))));
+            // if the rotation is 0:
+            // scale = context.getConfig().getBestScale(Math.max(
+            //         (maxX - minX) / (DistanceUnit.PT.convertTo(width, unitEnum)),
+            //         (maxY - minY) / (DistanceUnit.PT.convertTo(height, unitEnum))));
         }
 

print/trunk/src/main/java/org/mapfish/print/utils/PJsonObject.java

@@ -82 +82 @@
         }
         return result;
+    }
+
+    public double optDouble(String key, double defaultValue) {
+        return obj.optDouble(key, defaultValue);
     }