Changeset 3787 for print

Timestamp:

05/31/11 07:25:07 (12 months ago)

Author:

theuer

Message:

First Commit, Please check this one.
Fixes ticket 632
Multiple applications running with app parameter.

Location:

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

Files:

• Transformer.java (modified) (2 diffs)
• config/Config.java (modified) (6 diffs)
• config/layout/ColumnsBlock.java (modified) (4 diffs)
• config/layout/Layout.java (modified) (1 diff)
• config/layout/LegendsBlock.java (modified) (2 diffs)
• config/layout/MapBlock.java (modified) (6 diffs)
• map/readers/WMSMapReader.java (modified) (2 diffs)
• servlet/BaseMapServlet.java (modified) (6 diffs)
• servlet/MapPrinterServlet.java (modified) (6 diffs)

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

@@ -64 +64 @@
     public float maxGeoY;
     private final int scale;
-    private final int paperWidth;
-    private final int paperHeight;
+    private final float paperWidth;
+    private final float paperHeight;
     private float pixelPerGeoUnit;
     private float paperPosX;
@@ -81 +81 @@
      *            calculator. if null it is assumed that it is non-geodetic
      */
-    public Transformer(float centerX, float centerY, int paperWidth,
-            int paperHeight, int scale, int dpi, DistanceUnit unitEnum,
+    public Transformer(float centerX, float centerY, float paperWidth,
+            float paperHeight, int scale, int dpi, DistanceUnit unitEnum,
             double rotation, String geodeticSRS) {
         this.dpi = dpi;

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

@@ -20 +20 @@
 package org.mapfish.print.config;
 
-import org.apache.commons.httpclient.HostConfiguration;
+//import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethodBase;
@@ -37 +37 @@
 import org.mapfish.print.map.readers.WMSServerInfo;
 import org.mapfish.print.output.OutputFactory;
-import org.mapfish.print.output.OutputFormat;
+//import org.mapfish.print.output.OutputFormat;
 import org.pvalsecc.concurrent.OrderedResultsExecutor;
 
@@ -62 +62 @@
     private TreeSet<Integer> dpis;
     private TreeSet<Integer> scales;
+    private String maxSvgWidth = "";
+    private String maxSvgHeight = "";
+    private double maxSvgW = Double.MAX_VALUE;
+    private double maxSvgH = Double.MAX_VALUE;
+    
+    private List<String> overlayLayers = null;
+    
     private TreeSet<String> fonts = null;
     private List<HostMatcher> hosts = new ArrayList<HostMatcher>();
@@ -87 +94 @@
     private OrderedResultsExecutor<MapTileTask> mapRenderingExecutor = null;
     private MultiThreadedHttpConnectionManager connectionManager;
-    private TreeSet<String> formats;
+    private TreeSet<String> formats; // private int svgMaxWidth = -1; private int svgMaxHeight = -1;
 
     public Config() {
@@ -128 +135 @@
         this.dpis = dpis;
     }
-
+    
+    public void setMaxSvgWidth(String maxSvgWidth) {
+        this.maxSvgWidth = maxSvgWidth;
+        this.maxSvgW = Double.parseDouble(maxSvgWidth);
+    }
+    public String getMaxSvgWidth() {
+        return this.maxSvgWidth;
+    }
+    public void setMaxSvgHeight(String maxSvgHeight) {
+        this.maxSvgHeight = maxSvgHeight;
+        this.maxSvgH = Double.parseDouble(maxSvgHeight);
+    }
+    public String getMaxSvgHeight() {
+        return this.maxSvgHeight;
+    }
+    
+    public double getMaxSvgW() {
+        return this.maxSvgW;
+    }
+    public double getMaxSvgH() {
+        return this.maxSvgH;
+    }
+    
     public TreeSet<Integer> getDpis() {
         return dpis;
@@ -388 +417 @@
         this.formats = formats;
     }
+
+    public void setOverlayLayers(List<String> overlayLayers) {
+      this.overlayLayers = overlayLayers;
+    }
+
+    public List<String> getOverlayLayers() {
+      return overlayLayers;
+    }
 }

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

@@ -39 +39 @@
     private List<Block> items;
     private int[] widths = null;
+    /*
     private int absoluteX = Integer.MIN_VALUE;
     private int absoluteY = Integer.MIN_VALUE;
     private int width = Integer.MIN_VALUE;
+    */
+    private float absoluteX = Float.MIN_VALUE;
+    private float absoluteY = Float.MIN_VALUE;
+    private float width = Float.MIN_VALUE;
     private int nbColumns = Integer.MIN_VALUE;
     private TableConfig config = null;
@@ -84 +89 @@
     }
 
-    public void setAbsoluteX(int absoluteX) {
+    public void setAbsoluteX(float absoluteX) {
         this.absoluteX = absoluteX;
     }
 
-    public void setAbsoluteY(int absoluteY) {
+    public void setAbsoluteY(float absoluteY) {
         this.absoluteY = absoluteY;
     }
 
-    public void setWidth(int width) {
+    public void setWidth(float width) {
         this.width = width;
     }
@@ -101 +106 @@
 
     public boolean isAbsolute() {
-        return absoluteX != Integer.MIN_VALUE &&
-                absoluteY != Integer.MIN_VALUE &&
-                width != Integer.MIN_VALUE;
+        return absoluteX != Float.MIN_VALUE &&
+                absoluteY != Float.MIN_VALUE &&
+                width != Float.MIN_VALUE;
     }
 
@@ -125 +130 @@
         if (items.size() < 1) throw new InvalidValueException("items", "[]");
 
-        if (!((absoluteX != Integer.MIN_VALUE && absoluteY != Integer.MIN_VALUE && width != Integer.MIN_VALUE) ||
-                (absoluteX == Integer.MIN_VALUE && absoluteY == Integer.MIN_VALUE && width == Integer.MIN_VALUE))) {
+        if (!((absoluteX != Float.MIN_VALUE && absoluteY != Float.MIN_VALUE && width != Float.MIN_VALUE) ||
+                (absoluteX == Float.MIN_VALUE && absoluteY == Float.MIN_VALUE && width == Float.MIN_VALUE))) {
             throw new InvalidValueException("absoluteX, absoluteY or width", "all of them must be defined or none");
         }

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

@@ -26 +26 @@
 import org.mapfish.print.RenderingContext;
 import org.mapfish.print.InvalidValueException;
-import org.mapfish.print.config.Config;
 import org.mapfish.print.utils.PJsonArray;
 import org.mapfish.print.utils.PJsonObject;

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

@@ -28 +28 @@
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
-import com.lowagie.text.pdf.PdfTemplate;
 
-import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.gvt.GraphicsNode;
 import org.apache.log4j.Logger;
 import org.mapfish.print.PDFUtils;
@@ -40 +35 @@
 import org.mapfish.print.utils.PJsonArray;
 import org.mapfish.print.utils.PJsonObject;
-import org.w3c.dom.svg.SVGDocument;
 
-import java.awt.Graphics2D;
 import java.io.IOException;
 import java.net.URI;

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

@@ -54 +54 @@
 
         if (isAbsolute()) {
-            final int absX = getAbsoluteX(context, params);
-            final int absY = getAbsoluteY(context, params);
+            final float absX = getAbsoluteX(context, params);
+            final float absY = getAbsoluteY(context, params);
             context.getCustomBlocks().addAbsoluteDrawer(new PDFCustomBlocks.AbsoluteDrawer() {
                 public void render(PdfContentByte dc) {
@@ -90 +90 @@
         final float centerY;
 
-        final int width = getWidth(context, params);
-        final int height = getHeight(context, params);
+        final float width = getWidth(context, params);
+        final float height = getHeight(context, params);
         final PJsonArray center = params.optJSONArray("center");
         if (center != null) {
@@ -146 +146 @@
     }
 
-    public int getHeight(RenderingContext context, PJsonObject params) {
-        return Integer.parseInt(PDFUtils.evalString(context, params, height));
+    public float getHeight(RenderingContext context, PJsonObject params) {
+        return Float.parseFloat(PDFUtils.evalString(context, params, height));
     }
 
@@ -155 +155 @@
     }
 
-    public int getWidth(RenderingContext context, PJsonObject params) {
-        return Integer.parseInt(PDFUtils.evalString(context, params, width));
+    public float getWidth(RenderingContext context, PJsonObject params) {
+        return Float.parseFloat(PDFUtils.evalString(context, params, width));
     }
 
@@ -168 +168 @@
     }
 
-    public int getAbsoluteX(RenderingContext context, PJsonObject params) {
-        return Integer.parseInt(PDFUtils.evalString(context, params, absoluteX));
+    public float getAbsoluteX(RenderingContext context, PJsonObject params) {
+        //return Integer.parseInt(PDFUtils.evalString(context, params, absoluteX));
+      return Float.parseFloat(PDFUtils.evalString(context, params, absoluteX));
     }
 
@@ -176 +177 @@
     }
 
-    public int getAbsoluteY(RenderingContext context, PJsonObject params) {
-        return Integer.parseInt(PDFUtils.evalString(context, params, absoluteY));
+    public float getAbsoluteY(RenderingContext context, PJsonObject params) {
+        return Float.parseFloat(PDFUtils.evalString(context, params, absoluteY));
     }
 

print/trunk/src/main/java/org/mapfish/print/map/readers/WMSMapReader.java

@@ -20 +20 @@
 package org.mapfish.print.map.readers;
 
+import org.apache.batik.bridge.UserAgent;
+import org.apache.batik.bridge.UserAgentAdapter;
 import org.mapfish.print.RenderingContext;
 import org.mapfish.print.Transformer;
@@ -154 +156 @@
         Map<String, List<String>> tileParams = new HashMap<String, List<String>>();
         if (format.equals("image/svg+xml")) {
-            URIUtils.addParamOverride(tileParams, "WIDTH", Long.toString(transformer.getRotatedSvgW()));
-            URIUtils.addParamOverride(tileParams, "HEIGHT", Long.toString(transformer.getRotatedSvgH()));
+                double maxW = context.getConfig().getMaxSvgW(); // config setting in YAML called maxSvgWidth
+                double maxH = context.getConfig().getMaxSvgH(); // config setting in YAML called maxSvgHeight
+                double divisor = 1;
+                double width = transformer.getRotatedSvgW(); // width of the vector map
+                double height = transformer.getRotatedSvgH(); // height of the vector map
+                
+                if (maxW < width || maxH < height) {
+                        /**
+                         *  need to use maxW as divisor, smaller quotient for width means 
+                         *  more constraining factor is max width 
+                         */
+                        if (maxW / maxH < width / height) {
+                                divisor = width / maxW;
+                                width = maxW;
+                                height = height / divisor;
+                        } else {
+                                divisor = height / maxH;
+                                height = maxH;
+                                width = width / divisor;
+                        }
+                }
+            URIUtils.addParamOverride(tileParams, "WIDTH", Long.toString((long) Math.round(width)));
+            URIUtils.addParamOverride(tileParams, "HEIGHT", Long.toString((long) Math.round(height)));
         } else {
             URIUtils.addParamOverride(tileParams, "WIDTH", Long.toString(w));

print/trunk/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java

@@ -27 +27 @@
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
@@ -37 +39 @@
 
     private MapPrinter printer = null;
+    private Map<String, MapPrinter> printers = null;
     private long lastModified = 0L;
+    private Map<String,Long> lastModifieds = null;
 
     /**
@@ -49 +53 @@
      * If the location is a relative path, it's taken from the servlet's root directory.
      */
-    protected synchronized MapPrinter getMapPrinter() throws ServletException {
+    protected synchronized MapPrinter getMapPrinter(String app) throws ServletException {
         String configPath = getInitParameter("config");
         if (configPath == null) {
@@ -55 +59 @@
         }
 
-        File configFile = new File(configPath);
+        File configFile = null;
+        if (app != null) {
+                if (lastModifieds == null) {
+                        lastModifieds = new HashMap<String, Long>();
+                }
+                try {
+                        printer = printers.get(app);
+                } catch (Exception e) {
+                                printer = null;
+                        }
+                configFile = new File(app +".yaml");
+        } else {
+                configFile = new File(configPath);
+        }
         if (!configFile.isAbsolute()) {
-            configFile = new File(getServletContext().getRealPath(configPath));
+                if (app != null) {
+                        configFile = new File(getServletContext().getRealPath(app +".yaml"));
+                } else {
+                        configFile = new File(getServletContext().getRealPath(configPath));
+                }
+        }
+        if (app != null) {
+                try {
+                        lastModified = lastModifieds.get(app);
+                } catch (Exception e) {
+                                lastModified = 0L;
+                        }
         }
 
@@ -63 +91 @@
             //file modified, reload it
             LOGGER.info("Configuration file modified. Reloading...");
-            printer.stop();
+            try {
+                printer.stop();
+            } catch (NullPointerException npe) {
+                LOGGER.info("BaseMapServlet.java: printer was not stopped. This happens when a switch between applications happens.");
+            }
+            
             printer = null;
         }
@@ -72 +105 @@
                 LOGGER.info("Loading configuration file: " + configFile.getAbsolutePath());
                 printer = new MapPrinter(configFile);
+                if (app != null) {
+                        if (printers == null) {
+                                printers = new HashMap<String, MapPrinter>();
+                        }
+                        printers.put(app, printer);
+                        lastModifieds.put(app, lastModified);
+                }
             } catch (FileNotFoundException e) {
                 throw new ServletException("Cannot read configuration file: " + configPath, e);

print/trunk/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java

@@ -51 +51 @@
     protected static final String TEMP_FILE_PREFIX = "mapfish-print";
     private static final String TEMP_FILE_SUFFIX = ".printout";
+    
+    private String app = null;
 
     private static final int TEMP_FILE_PURGE_SECONDS = 10 * 60;
@@ -223 +225 @@
      */
     protected void getInfo(HttpServletRequest req, HttpServletResponse resp, String basePath) throws ServletException, IOException {
-        MapPrinter printer = getMapPrinter();
+        app = req.getParameter("app");
+        //System.out.println("app = "+app);
+        
+        MapPrinter printer = getMapPrinter(app);
         resp.setContentType("application/json; charset=utf-8");
         final PrintWriter writer = resp.getWriter();
@@ -240 +245 @@
                     json.key("printURL").value(basePath + PRINT_URL);
                     json.key("createURL").value(basePath + CREATE_URL);
+                    if (app != null) {
+                        json.key("app").value(app);
+                    }
                 }
                 json.endObject();
@@ -263 +271 @@
 
         PJsonObject specJson = MapPrinter.parseSpec(spec);
+        if (specJson.has("app")) {
+                app = specJson.getString("app");
+        } else {
+                app = null;
+        }
 
         String referer = httpServletRequest.getHeader("Referer");
 
-        final OutputFormat outputFormat = OutputFactory.create(getMapPrinter().getConfig(),specJson);
+        final OutputFormat outputFormat = OutputFactory.create(getMapPrinter(app).getConfig(),specJson);
         //create a temporary file that will contain the PDF
         final File tempJavaFile = File.createTempFile(TEMP_FILE_PREFIX, "."+outputFormat.fileSuffix()+TEMP_FILE_SUFFIX, getTempDir());
@@ -275 +288 @@
             out = new FileOutputStream(tempFile);
 
-            outputFormat.print(getMapPrinter(), specJson, out, referer);
+            outputFormat.print(getMapPrinter(app), specJson, out, referer);
 
             return tempFile;
@@ -302 +315 @@
             httpServletResponse.setContentType(tempFile.contentType());
             if (inline != true) {
-                final String fileName = tempFile.getOutputFileName(getMapPrinter());
+                final String fileName = tempFile.getOutputFileName(getMapPrinter(app));
                 httpServletResponse.setHeader("Content-disposition", "attachment; filename=" + fileName);
             }