# HG changeset patch # User Sascha L. Teichmann # Date 1335439977 0 # Node ID 7e077899e259224edac8e6454cdb883efc3e1789 # Parent d0066abb025c810ae6f039ac8a8fdeda42650bcf Added dependency to MapFish Print flys-client/trunk@4309 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r d0066abb025c -r 7e077899e259 flys-client/ChangeLog --- a/flys-client/ChangeLog Thu Apr 26 09:52:17 2012 +0000 +++ b/flys-client/ChangeLog Thu Apr 26 11:32:57 2012 +0000 @@ -1,3 +1,13 @@ +2012-04-20 Sascha L. Teichmann + + * pom.xml: Added dependency to MapFish Print (http://www.mapfish.org/doc/print/) + License GPLv3. (This is okay, because we only use it via out-of-process calls). + + * src/main/webapp/WEB-INF/web.xml: Added servlet and servlet mapping. + + * src/main/webapp/WEB-INF/config.yaml: New. Just copied from MapFish config examples. + TODO: Adjust for out use case. + 2012-04-26 Felix Wolfsteller * src/main/java/de/intevation/flys/client/client/FLYSConstants.java, diff -r d0066abb025c -r 7e077899e259 flys-client/pom.xml --- a/flys-client/pom.xml Thu Apr 26 09:52:17 2012 +0000 +++ b/flys-client/pom.xml Thu Apr 26 11:32:57 2012 +0000 @@ -89,6 +89,11 @@ log4j 1.2.14 + + org.mapfish.print + print-lib + 1.2-SNAPSHOT + @@ -186,6 +191,10 @@ SmartGWT http://www.smartclient.com/maven2 + + org.mapfish + http://dev.mapfish.org/maven/repository + diff -r d0066abb025c -r 7e077899e259 flys-client/src/main/webapp/WEB-INF/config.yaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-client/src/main/webapp/WEB-INF/config.yaml Thu Apr 26 11:32:57 2012 +0000 @@ -0,0 +1,190 @@ +#=========================================================================== +# allowed DPIs +#=========================================================================== +dpis: [254, 190, 127, 56] + +#=========================================================================== +# allowed Formats +#=========================================================================== +formats: ['*'] + +#=========================================================================== +# the allowed scales +#=========================================================================== +scales: + - 25000 + - 50000 + - 100000 + - 200000 + - 500000 + - 1000000 + - 2000000 + - 4000000 + +outputFilename: 'pigma-${date}.pdf' + +#=========================================================================== +# the list of allowed hosts +#=========================================================================== +hosts: + - !localMatch + dummy: true + - !ipMatch + ip: www.camptocamp.org + - !dnsMatch + host: labs.metacarta.com + port: 80 + - !dnsMatch + host: terraservice.net + port: 80 + - !dnsMatch + host: tile.openstreetmap.org + port: 80 + +security: + - !basicAuth + matcher: !dnsMatch + host: c2cpc61.camptocamp.com + port:80 + username: xyz + password: yxz + preemptive: true + + +layouts: + #=========================================================================== + A4 portrait: + #=========================================================================== + metaData: + title: '${title}' + author: 'MapFish print module' + subject: 'Simple layout' + keywords: 'map,print' + creator: 'MapFish' + + titlePage: + pageSize: A4 + items: + - !text + spacingAfter: 150 + - !text + font: Helvetica + fontSize: 40 + spacingAfter: 100 + align: center + text: '${title}' + - !image + maxWidth: 160 + maxHeight: 160 + spacingAfter: 100 + align: center + url: http://trac.mapfish.org/trac/mapfish/attachment/ticket/3/logo_v8_sphere.svg?format=raw + - !image + maxWidth: 160 + maxHeight: 160 + spacingAfter: 100 + align: center + url: 'file://${configDir}/logo-camptocamp-transparent.png' + - !text + font: Helvetica + fontSize: 14 + align: left + text: | + Two layers are asked by the client: + - a base layer from Metacarta + - a transparent layer from Camptocamp.org (routes) + . + Some text is added over the map, just to demonstrate the absolute positionning. + footer: &commonFooter + height: 30 + items: + - !columns + config: + cells: + - paddingBottom: 5 + items: + - !image + maxWidth: 40 + backgroundColor: #FF0000 + align: left + url: '${configDir}/small-logo-camptocamp.png' + - !text + backgroundColor: #FF0000 + text: ©Camptocamp SA + - !text + align: right + text: 'Page ${pageNum}' + + #------------------------------------------------------------------------- + mainPage: + pageSize: A4 + rotation: true + header: + height: 50 + items: + - !text + font: Helvetica + fontSize: 30 + align: right + text: '${mapTitle}' + items: + - !map + spacingAfter: 30 + width: 440 + height: 483 + - !columns + # columns can have an absolute position. In that case, they need the 3 following fields: + absoluteX: 410 + absoluteY: 310 + width: 100 + items: + - !scalebar + type: bar + maxSize: 100 + barBgColor: white + fontSize: 8 + align: right + - !text + text: '${comment}' + spacingAfter: 30 + - !attributes + source: data + spacingAfter: 30 + columnDefs: + id: + columnWeight: 2 + header: !text + text: ID + backgroundColor: #A0A0A0 + cell: !text + text: '${id}' + name: + columnWeight: 5 + header: !text + text: Name + backgroundColor: #A0A0A0 + cell: !columns + config: + cells: + - backgroundColor: '${nameBackgroundColor}' + borderWidth: 1 + borderColor: '${nameBorderColor}' + items: + - !text + text: '${name}' + icon: + columnWeight: 2 + header: !text + text: Symbol + backgroundColor: #A0A0A0 + cell: !image + align: center + maxWidth: 15 + maxHeight: 15 + url: 'http://www.mapfish.org/svn/mapfish/framework/client/trunk/mfbase/mapfish/img/${icon}.png' + - !text + font: Helvetica + fontSize: 9 + align: right + text: '1:${scale} ${now MM.dd.yyyy}' + footer: *commonFooter diff -r d0066abb025c -r 7e077899e259 flys-client/src/main/webapp/WEB-INF/web.xml --- a/flys-client/src/main/webapp/WEB-INF/web.xml Thu Apr 26 09:52:17 2012 +0000 +++ b/flys-client/src/main/webapp/WEB-INF/web.xml Thu Apr 26 11:32:57 2012 +0000 @@ -423,6 +423,20 @@ /flys/fileupload + + mapfish.print + org.mapfish.print.servlet.MapPrinterServlet + + config + config.yaml + + + + + mapfish.print + /flys/map-print + + FLYS.html