Changeset 3433

Timestamp:

03/23/10 16:20:40 (2 years ago)

Author:

yves

Message:

Added label support to vector layers (thx Cédric) (closes #561)

Location:

print/trunk

Files:

• samples/configVector.yaml (added)
• samples/specVector.json (added)
• src/main/java/org/mapfish/print/PDFUtils.java (modified) (2 diffs)
• src/main/java/org/mapfish/print/map/renderers/vector/PointRenderer.java (modified) (4 diffs)

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

@@ -21 +21 @@
 
 import com.lowagie.text.*;
+import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfPCell;
@@ -384 +385 @@
         return image;
     }
+    
+        public static BaseFont getBaseFont(String fontFamily, String fontSize,
+                        String fontWeight) {
+                int myFontValue;
+                float myFontSize;
+                int myFontWeight;
+                if (fontFamily.toUpperCase().contains("COURIER")) {
+                        myFontValue = Font.COURIER;
+                } else if (fontFamily.toUpperCase().contains("HELVETICA")) {
+                        myFontValue = Font.HELVETICA;
+                } else if (fontFamily.toUpperCase().contains("ROMAN")) {
+                        myFontValue = Font.TIMES_ROMAN;
+                } else {
+                        myFontValue = Font.HELVETICA;
+                }
+                myFontSize = (float) Double.parseDouble(fontSize.toLowerCase()
+                                .replaceAll("px", ""));
+                if (fontWeight.toUpperCase().contains("NORMAL")) {
+                        myFontWeight = Font.NORMAL;
+                } else if (fontWeight.toUpperCase().contains("BOLD")) {
+                        myFontWeight = Font.BOLD;
+                } else if (fontWeight.toUpperCase().contains("ITALIC")) {
+                        myFontWeight = Font.ITALIC;
+                } else {
+                        myFontWeight = Font.NORMAL;
+                }
+                Font pdfFont = new Font(myFontValue, myFontSize, myFontWeight);
+                BaseFont bf = pdfFont.getCalculatedBaseFont(false);
+                return bf;
+        }
+        
+        public static int getHorizontalAlignment(String labelAlign) {
+                /* Valid values for horizontal alignment: "l"=left, "c"=center, "r"=right. */
+                int myAlignment = PdfContentByte.ALIGN_LEFT;
+                if (labelAlign.toUpperCase().contains("L")) {
+                        myAlignment = PdfContentByte.ALIGN_LEFT;
+                }
+                if (labelAlign.toUpperCase().contains("C")) {
+                        myAlignment = PdfContentByte.ALIGN_CENTER;
+                }
+                if (labelAlign.toUpperCase().contains("R")) {
+                        myAlignment = PdfContentByte.ALIGN_RIGHT;
+                }
+                return myAlignment;
+        }
+        
+        public static float getVerticalOffset(String labelAlign, float fontHeight) {
+                /* Valid values for vertical alignment: "t"=top, "m"=middle, "b"=bottom. */
+                float myOffset = (float) 0.0;
+                if (labelAlign.toUpperCase().contains("T")) {
+                        myOffset = fontHeight;
+                }
+                if (labelAlign.toUpperCase().contains("M")) {
+                        myOffset = fontHeight/2;
+                }
+                if (labelAlign.toUpperCase().contains("B")) {
+                        myOffset = (float) 0.0;
+                }
+                return myOffset;
+        }
 }

print/trunk/src/main/java/org/mapfish/print/map/renderers/vector/PointRenderer.java

@@ -22 +22 @@
 import com.vividsolutions.jts.geom.Point;
 import com.vividsolutions.jts.geom.Coordinate;
+import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfGState;
@@ -30 +31 @@
 import org.mapfish.print.PDFUtils;
 import org.mapfish.print.InvalidValueException;
+import org.mapfish.print.config.ColorWrapper;
 import org.mapfish.print.utils.PJsonObject;
 
@@ -90 +92 @@
         float offsetX = style.optFloat("graphicXOffset", -width / 2.0f);
         float offsetY = style.optFloat("graphicYOffset", -height / 2.0f);
+                // See Feature/Vector.js for more information about labels
+                String label = style.optString("label");
+                String labelAlign = style.optString("labelAlign", "lb");
+                /*
+                 * Valid values for horizontal alignment: "l"=left, "c"=center, "r"=right. 
+                 * Valid values for vertical alignment: "t"=top, "m"=middle, "b"=bottom.
+                 */
+                float labelXOffset = style.optFloat("labelXOffset", (float) 0.0);
+                float labelYOffset = style.optFloat("labelYOffset", (float) 0.0);
+                String fontColor = style.optString("fontColor", "#000000");
+                /* Supported itext fonts: COURIER, HELVETICA, TIMES_ROMAN */
+                String fontFamily = style.optString("fontFamily", "HELVETICA");
+                String fontSize = style.optString("fontSize", "12");
+                String fontWeight = style.optString("fontWeight", "normal");
 
         if (style.optString("externalGraphic") != null) {
@@ -124 +140 @@
             dc.fillStroke();
 
-        } else {
+        } else if (label != null && label.length() > 0) {
+                        BaseFont bf = PDFUtils.getBaseFont(fontFamily, fontSize, fontWeight);
+                        float fontHeight = (float) Double.parseDouble(fontSize.toLowerCase().replaceAll("px", "")) * f;
+                        dc.setFontAndSize(bf, fontHeight);
+                        dc.setColorFill(ColorWrapper.convertColor(fontColor));
+                        state.setFillOpacity((float) 1.0);
+                        dc.setGState(state);
+                        dc.beginText();
+                        dc.setTextMatrix((float) coordinate.x + labelXOffset * f, (float) coordinate.y + labelYOffset * f);
+                        dc.setGState(state);
+                        dc.showTextAligned(PDFUtils.getHorizontalAlignment(labelAlign), label, (float) coordinate.x + labelXOffset * f, (float) coordinate.y + labelYOffset * f - PDFUtils.getVerticalOffset(labelAlign, fontHeight), 0);
+                        dc.endText();
+                } else {
             PolygonRenderer.applyStyle(context, dc, style, state);
             dc.setGState(state);