Changeset 3858

Timestamp:

11/02/11 23:20:25 (7 months ago)

Author:

theuer

Message:

svgFactor fix, more sensible formula, but only if integerSvg: true, otherwise svgFactor is not needed and defaults to 1.0, improves performance; r=jeichar (closes #648)

Location:

print/trunk

Files:

• . (modified) (1 prop)
• docs/configuration.txt (modified) (1 diff)
• src/main/java/org/mapfish/print/Transformer.java (modified) (18 diffs)
• src/main/java/org/mapfish/print/config/Config.java (modified) (2 diffs)
• src/main/java/org/mapfish/print/config/layout/MapBlock.java (modified) (1 diff)
• src/main/java/org/mapfish/print/map/renderers/SVGTileRenderer.java (modified) (1 diff)
• src/main/webapp (modified) (1 prop)

print/trunk

@@ -3 +3 @@
 build
 target
+.project
+.classpath
+.git
+deploy.sh
+build_and_deploy.sh
+lib
+build.sh
+bin
+.settings
+

@@ -3 +3 @@
 build
 target
+.project
+.classpath
+.git
+deploy.sh
+build_and_deploy.sh
+lib
+build.sh
+bin
+.settings
+

print/trunk/docs/configuration.txt

@@ -12 +12 @@
     - 190
     {...}
+
+  ?maxSvgWidth: 2048 # set the maximum dimensions to 2048 points, this is useful when using MapServer and a maximum dimension is there
+  ?maxSvgHeight: 2048
+  ?integerSvg: false # the library in MapServer <= 5.6 does not support floating point values in the SVG coordinate space, set this to true if using a WMS that does not support floating point values in SVG coordinates
+
   ?outputFormats:
     - pdf

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

@@ -35 +35 @@
  */
 public class Transformer implements Cloneable {
-        private static final String GOOGLE_WKT = "PROJCS[\"Google Mercator\","
-                + "GEOGCS[\"WGS 84\","
-                + "DATUM[\"World Geodetic System 1984\","
-                + "SPHEROID[\"WGS 84\", 6378137.0, 298.257223563, AUTHORITY[\"EPSG\",\"7030\"]],"
-                + "AUTHORITY[\"EPSG\",\"6326\"]],"
-                + "PRIMEM[\"Greenwich\", 0.0, AUTHORITY[\"EPSG\",\"8901\"]],"
-                + "UNIT[\"degree\", 0.017453292519943295],"
-                + "AXIS[\"Geodetic latitude\", NORTH],"
-                + "AXIS[\"Geodetic longitude\", EAST],"
-                + "AUTHORITY[\"EPSG\",\"4326\"]],"
-                + "PROJECTION[\"Mercator_1SP\"],"
-                + "PARAMETER[\"semi_minor\", 6378137.0],"
-                + "PARAMETER[\"latitude_of_origin\", 0.0],"
-                + "PARAMETER[\"central_meridian\", 0.0],"
-                + "PARAMETER[\"scale_factor\", 1.0],"
-                + "PARAMETER[\"false_easting\", 0.0],"
-                + "PARAMETER[\"false_northing\", 0.0],"
-                + "UNIT[\"m\", 1.0]," + "AXIS[\"Easting\", EAST],"
-                + "AXIS[\"Northing\", NORTH],"
-                + "AUTHORITY[\"EPSG\",\"900913\"]]";
-
-        
-        
-    private int svgFactor;
+    private static final String GOOGLE_WKT = "PROJCS[\"Google Mercator\","
+            + "GEOGCS[\"WGS 84\","
+            + "DATUM[\"World Geodetic System 1984\","
+            + "SPHEROID[\"WGS 84\", 6378137.0, 298.257223563, AUTHORITY[\"EPSG\",\"7030\"]],"
+            + "AUTHORITY[\"EPSG\",\"6326\"]],"
+            + "PRIMEM[\"Greenwich\", 0.0, AUTHORITY[\"EPSG\",\"8901\"]],"
+            + "UNIT[\"degree\", 0.017453292519943295],"
+            + "AXIS[\"Geodetic latitude\", NORTH],"
+            + "AXIS[\"Geodetic longitude\", EAST],"
+            + "AUTHORITY[\"EPSG\",\"4326\"]],"
+            + "PROJECTION[\"Mercator_1SP\"],"
+            + "PARAMETER[\"semi_minor\", 6378137.0],"
+            + "PARAMETER[\"latitude_of_origin\", 0.0],"
+            + "PARAMETER[\"central_meridian\", 0.0],"
+            + "PARAMETER[\"scale_factor\", 1.0],"
+            + "PARAMETER[\"false_easting\", 0.0],"
+            + "PARAMETER[\"false_northing\", 0.0]," + "UNIT[\"m\", 1.0],"
+            + "AXIS[\"Easting\", EAST]," + "AXIS[\"Northing\", NORTH],"
+            + "AUTHORITY[\"EPSG\",\"900913\"]]";
+
+    private float svgFactor = 1.0f;
     public float minGeoX;
     public float minGeoY;
@@ -77 +74 @@
 
     /**
+     * @param centerX
+     *            geographic center in projection - x
+     * @param centerY
+     *            geographic center in projection - y
+     * @param paperWidth
+     *            e.g. map width in pt on the PDF
+     * @param paperHeight
+     *            e.g. map height in pt on the PDF
+     * @param scale
+     *            e.g. 10000 if scale is 1:10,000
+     * @param dpi
+     *            as selected in request
+     * @param unitEnum
+     *            the distance unit of the map e.g. DistanceUnit.M for meters
+     * @param rotation
+     *            the rotation of the map per the request
      * @param geodeticSRS
      *            if not null then it is a the srs to use with the geodetic
@@ -83 +96 @@
     public Transformer(float centerX, float centerY, float paperWidth,
             float paperHeight, int scale, int dpi, DistanceUnit unitEnum,
-            double rotation, String geodeticSRS) {
+            double rotation, String geodeticSRS, RenderingContext context) {
         this.dpi = dpi;
         pixelPerGeoUnit = (float) (unitEnum.convertTo(dpi, DistanceUnit.IN) / scale);
@@ -90 +103 @@
         float geoHeight = paperHeight * dpi / 72.0f / pixelPerGeoUnit;
 
-        //target at least 600DPI for the SVG precision
-        svgFactor = Math.max((600 + dpi - 1) / dpi, 1);
+        /**
+         * The following code has been changed due to the fact that it seems
+         * wrong. However, I'm not sure if my "correction" solves the problem
+         * for the better. So, please review.
+         * 
+         * The ('wrong') code below can be reformed: (600 + dpi - 1) / dpi = 1 +
+         * 599/dpi and is never smaller than 1, since dpi>1. Also, it does not
+         * make sense, as this factor gets smaller with increasing values for
+         * dpi.
+         */
+        // target at least 600DPI for the SVG precision
+        // svgFactor = Math.max((600 + dpi - 1) / dpi, 1);
+
+        /**
+         * svgFactor seems to not matter so much so we set it to 1 (above) needs
+         * to get bigger if DPI increases and at standard 72 DPI needs to be 1.0
+         */
+        if (context.getConfig().getIntegerSvg()) { // integerSvg: true # in yaml
+                                                   // config file
+            if (dpi < 600) { // target at least 600 DPI, this is a hack and only
+                             // needed for MapServer <= 5.6 where integers
+                             // are put into SVG
+                svgFactor = 600f / 72.0f;
+                /**
+                 * = 8.33 so almost 9 as before with svgFactor being (600 + dpi
+                 * -1)/dpi = ~9 if dpi = 72
+                 */
+            } else {
+                svgFactor = dpi / 72.0f; // gets greater than 8.33
+            }
+        } // else defaults to 1.0 as it should with MapServer >= 6 and CAIRO SVG
+          // rendering with floating point values
 
         this.paperWidth = paperWidth;
@@ -97 +140 @@
         this.scale = scale;
         this.rotation = rotation;
-        
+
         if (geodeticSRS != null) {
             computeGeodeticBBox(geoWidth, geoHeight, centerX, centerY, dpi,
@@ -163 +206 @@
         if (rotation != 0.0) {
             double height = getStraightBitmapH();
-            width = Math.abs(width * Math.cos(rotation)) + Math.abs(height * Math.sin(rotation));
+            width = Math.abs(width * Math.cos(rotation))
+                    + Math.abs(height * Math.sin(rotation));
         }
         return Math.round(width);
@@ -172 +216 @@
         if (rotation != 0.0) {
             double width = getStraightBitmapW();
-            height = Math.abs(height * Math.cos(rotation)) + Math.abs(width * Math.sin(rotation));
+            height = Math.abs(height * Math.cos(rotation))
+                    + Math.abs(width * Math.sin(rotation));
         }
         return Math.round(height);
@@ -181 +226 @@
         if (rotation != 0.0) {
             float height = getGeoH();
-            width = (float) (Math.abs(width * Math.cos(rotation)) + Math.abs(height * Math.sin(rotation)));
+            width = (float) (Math.abs(width * Math.cos(rotation)) + Math
+                    .abs(height * Math.sin(rotation)));
         }
         return width;
@@ -190 +236 @@
         if (rotation != 0.0) {
             float width = getGeoW();
-            height = (float) (Math.abs(height * Math.cos(rotation)) + Math.abs(width * Math.sin(rotation)));
+            height = (float) (Math.abs(height * Math.cos(rotation)) + Math
+                    .abs(width * Math.sin(rotation)));
         }
         return height;
@@ -199 +246 @@
         if (rotation != 0.0) {
             float height = getPaperH();
-            width = (float) (Math.abs(width * Math.cos(rotation)) + Math.abs(height * Math.sin(rotation)));
+            width = (float) (Math.abs(width * Math.cos(rotation)) + Math
+                    .abs(height * Math.sin(rotation)));
         }
         return width;
@@ -208 +256 @@
         if (rotation != 0.0) {
             float width = getPaperW();
-            height = (float) (Math.abs(height * Math.cos(rotation)) + Math.abs(width * Math.sin(rotation)));
+            height = (float) (Math.abs(height * Math.cos(rotation)) + Math
+                    .abs(width * Math.sin(rotation)));
         }
         return height;
@@ -230 +279 @@
 
     public long getRotatedSvgW() {
-        return getRotatedBitmapW() * svgFactor;
+        return (long) (getRotatedBitmapW() * svgFactor);
     }
 
     public long getRotatedSvgH() {
-        return getRotatedBitmapH() * svgFactor;
+        return (long) (getRotatedBitmapH() * svgFactor);
     }
 
@@ -271 +320 @@
      */
     public AffineTransform getBaseTransform() {
-        final AffineTransform result = AffineTransform.getTranslateInstance(paperPosX, paperPosY);
+        final AffineTransform result = AffineTransform.getTranslateInstance(
+                paperPosX, paperPosY);
         if (rotation != 0.0F) {
             result.translate(getPaperW() / 2, getPaperH() / 2);
@@ -281 +331 @@
 
     /**
-     * @param reverseRotation True to do the rotation in the other direction
-     * @return The affine transformation to go from geographic coordinated to paper coordinates
+     * @param reverseRotation
+     *            True to do the rotation in the other direction
+     * @return The affine transformation to go from geographic coordinated to
+     *         paper coordinates
      */
     public AffineTransform getGeoTransform(boolean reverseRotation) {
-        final AffineTransform result = AffineTransform.getTranslateInstance(paperPosX, paperPosY);
+        final AffineTransform result = AffineTransform.getTranslateInstance(
+                paperPosX, paperPosY);
         if (rotation != 0.0F) {
-            result.rotate((reverseRotation ? -1 : 1) * rotation, getPaperW() / 2, getPaperH() / 2);
+            result.rotate((reverseRotation ? -1 : 1) * rotation,
+                    getPaperW() / 2, getPaperH() / 2);
         }
         result.scale(getPaperW() / getGeoW(), getPaperH() / getGeoH());
@@ -296 +350 @@
     public AffineTransform getSvgTransform() {
         final AffineTransform result = getBaseTransform();
-        result.scale(getPaperW() / getStraightSvgW(), getPaperH() / getStraightSvgH());
+        result.scale(getPaperW() / getStraightSvgW(), getPaperH()
+                / getStraightSvgH());
         return result;
     }
@@ -302 +357 @@
     public AffineTransform getPdfTransform() {
         final AffineTransform result = getBaseTransform();
-        result.scale(getPaperW() / getStraightBitmapW(), getPaperH() / getStraightBitmapH());
+        result.scale(getPaperW() / getStraightBitmapW(), getPaperH()
+                / getStraightBitmapH());
         return result;
     }
@@ -318 +374 @@
         float destH = mainTransformer.getGeoH() / factor;
 
-        //fix aspect ratio
+        // fix aspect ratio
         if (destW / destH > getGeoW() / getGeoH()) {
             destH = getGeoH() * destW / getGeoW();
@@ -358 +414 @@
     }
 
-    public int getSvgFactor() {
+    public float getSvgFactor() {
         return svgFactor;
     }

print/trunk/src/main/java/org/mapfish/print/config/Config.java

@@ -68 +68 @@
     private double maxSvgH = Double.MAX_VALUE;
     
+    private boolean integerSvg = true;
+    
     private List<String> overlayLayers = null;
     
@@ -428 +430 @@
       return overlayLayers;
     }
+
+        /**
+         * @return the integerSvg true if for example MapServer 5.6 or earlier is used where integers are put into the SVG
+         */
+        public boolean getIntegerSvg() {
+                return integerSvg;
+        }
+
+        /**
+         * @param integerSvg the integerSvg to set
+         */
+        public void setIntegerSvg(boolean integerSvg) {
+                this.integerSvg = integerSvg;
+        }
 }

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

@@ -149 +149 @@
         double rotation = params.optFloat("rotation", 0.0F) * Math.PI / 180.0;
         return new Transformer(centerX, centerY, width, height, scale, dpi,
-                unitEnum, rotation, srs);
+                unitEnum, rotation, srs, context);
     }
 

print/trunk/src/main/java/org/mapfish/print/map/renderers/SVGTileRenderer.java

@@ -142 +142 @@
     private TranscoderInput getTranscoderInput(URL url, Transformer transformer, RenderingContext context) {
         final float zoomFactor = transformer.getSvgFactor() * context.getStyleFactor();
+        //final float zoomFactor = context.getStyleFactor();
         if (svgZoomOut != null && zoomFactor != 1.0f) {
                 javax.xml.transform.Transformer xslt = null;

@@ -3 +3 @@
 build
 target
+.project
+.classpath
+.git
+deploy.sh
+build_and_deploy.sh
+lib
+build.sh
+bin
+.settings
+