[Dive4elements-commits] [PATCH 5 of 5] Update Layout and add basic UTF-8 support that is still broken

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1365764518 -7200
# Node ID 57803a199856169b77a4f2803dd721f989ca2b03
# Parent  413798463dfe823f3c2c6cb028178207f45d9344
Update Layout and add basic UTF-8 support that is still broken
for data values in the attributes table

diff -r 413798463dfe -r 57803a199856 contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Fri Apr 12 12:58:46 2013 +0200
+++ b/contrib/make_flys_release/make_release.sh	Fri Apr 12 13:01:58 2013 +0200
@@ -200,6 +200,9 @@
 find $FLYS_SOURCE_DIR/flys/ -name \*.properties -o -name \*.xsl |  \
     xargs sed -i "s at https://flys-intern.intevation.de@${WIKI_URL}@g";
 
+sed -i -e "s@/usr/share/fonts/truetype/freefont@${FONT_PATH}@g" \
+    $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/config.yaml
+
 if [ ! -f $FLYS_SOURCE_DIR/OpenLayers-2.11.tar.gz ]; then
     echo "INFO: download OpenLayers-2.11 for client"
     cd $FLYS_SOURCE_DIR
diff -r 413798463dfe -r 57803a199856 flys-client/src/main/webapp/WEB-INF/config.yaml
--- a/flys-client/src/main/webapp/WEB-INF/config.yaml	Fri Apr 12 12:58:46 2013 +0200
+++ b/flys-client/src/main/webapp/WEB-INF/config.yaml	Fri Apr 12 13:01:58 2013 +0200
@@ -94,6 +94,11 @@
     host: geoportal.bafg.de
     port: 80
 
+# We need a font with unicode support the defaults only
+# have latin1
+fonts:
+  - /usr/share/fonts/truetype/freefont/FreeSans.ttf
+
 layouts:
   #===========================================================================
   A4 landscape:
@@ -124,8 +129,8 @@
           spacingAfter: 0
         #Flys and BFG Logo
         - !columns
-          absoluteX: 747
-          absoluteY: 100
+          absoluteX: 750
+          absoluteY: 110
           width: 60
           items:
             - !image
@@ -133,8 +138,8 @@
               maxHeight: 60
               url: '${configDir}/../images/FLYS_Logo.png'
         - !columns
-          absoluteX: 732
-          absoluteY: 160
+          absoluteX: 630
+          absoluteY: 110
           width: 90
           items:
             - !image
@@ -144,49 +149,62 @@
         # Legend header, a bit hackish with the border
         # but I don't know how to put two rows in a column and I don't want to
         # use tables
+#        - !columns
+#          absoluteX: 612
+#          absoluteY: 575
+#          width: 200
+#          items:
+#            - !text
+#              text: "Legende:"
+#              align: center
+#          config:
+#            borderWidthLeft: 1
+#            borderWidthRight: 1
+#            borderWidthTop: 1
+#            borderWidthBottom: 0
+        # Scalebar
+        - !columns
+          absoluteX: 620
+          absoluteY: 35
+          width: 200
+          items:
+            - !scalebar
+              type: bar
+              maxSize: 200
+              barSize: 5
+              barBgColor: white
+              fontSize: 8
+
+        # The legend
         - !columns
           absoluteX: 612
           absoluteY: 575
           width: 200
           items:
-            - !text
-              text: "Legende:"
-              align: center
-          config:
-            borderWidthLeft: 1
-            borderWidthRight: 1
-            borderWidthTop: 1
-            borderWidthBottom: 0
-        # The legend
-        - !columns
-          absoluteX: 612
-          absoluteY: 564
-          width: 200
-          items:
             - !legends
-              maxHeight: 400
+              maxHeight: 305
               maxWidth: 0
               maxIconHeight: 0
               inline: false
               classIndentation: 10
               layerSpace: 5
               classSpace: 2
-              layerFont: Helvetica
               layerFontSize: 0
-              classFont: Helvetica
               classFontSize: 0
-              fontEncoding: Cp1252
+              fontEncoding: Identity-H
+              classFont: FreeSans
+              layerFont: FreeSans
               columnMargin: 2
               defaultScale: 0.7
           config:
             borderWidthLeft: 1
             borderWidthRight: 1
-            borderWidthTop: 0
+            borderWidthTop: 1
             borderWidthBottom: 1
         # The Stamp
         - !columns
           absoluteX: 612
-          absoluteY: 200
+          absoluteY: 270
           width: 200
           config:
             borderWidthLeft: 1
@@ -196,25 +214,51 @@
           items:
             - !attributes
               source: data
-              spacingAfter: 30
+              spacingAfter: 0
               columnDefs:
                 info:
-                  columnWeight: 2
+                  columnWeight: 7
                   header: !text
-                    text: Info
-                    backgroundColor: #A0A0A0
-                  cell: !text
-                    text: '${info}'
-                value:
-                  columnWeight: 5
-                  header: !text
-                    text: value
-                    backgroundColor: #A0A0A0
+                    text: info
+                    fontSize: 0
                   cell: !columns
                     config:
                       cells:
                         - borderWidth: 1
+                          padding: 5
+                    items:
+                      - !text
+                        text: '${info}'
+                        fontSize: 10
+                    backgroundColor: #FFFFFF
+                value:
+                  columnWeight: 15
+                  header: !text
+                    text: value
+                    fontSize: 0
+                  cell: !columns
+                    config:
+                      cells:
+                        - borderWidth: 1
+                          padding: 5
                     items:
                       - !text
                         text: '${value}'
-
+                        fontEncoding: Identity-H
+                        font: FreeSans
+                        fontSize: 10
+                    backgroundColor: #FFFFFF
+        # The scale text
+        - !columns
+          absoluteX: 617
+          absoluteY: 55
+          width: 200
+          items:
+            - !text
+              fontSize: 10
+              text: 'Maßstab: 1:${scale}'
+              fontEncoding: Identity-H
+              font: FreeSans
+          config:
+            cells:
+              - padding: 5