gb_mapfish_appserver 1.0.6 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjcyMGM2NTljZDgyZjdhZmQ3YzA4MzNiYzFmMGFmM2IwZWY0ZmUzYg==
+    ZmFkMTY4MDk4Njg0YTdmNmJlYTU3MjU5NmZkMjI4Mzg5MWI2ZmFiYw==
   data.tar.gz: !binary |-
-    ODFhZGY1NThiOGQ1ODkxMzRhY2U1MDQzZTcyNjUyYjAwYWU5NGFmZA==
+    MDczMjlkNmFiY2VjNjkwNzY3OWViNDNhMTUwMTE2MzI1NzgzZDg1Mg==
 SHA512:
   metadata.gz: !binary |-
-    OThjMDNmNWIwM2FkODMwN2Y0OTQ0NjZiYjFjN2ViZjRmOTZhM2Q2MGNlOTlk
-    M2RjNjliNWYxZDgyYjRjMTRjOTM5NzU1YWMxNDg4YzZhYjg5ZGJhMDFjNWQ5
-    YzZmYzNlMGNmYTI5M2NkNDMyYWY1ZjY1NzczOWI1MDBhNTgzYWY=
+    ZmRhNmNhNGM1YTJjOGI5YmU3MTZkNjg3ZDRjZmRjZmNjMjA5ZGRlYTk5ODIx
+    NDBiMmZlMDllYWFmY2Y1MGE0OWE1YjNhY2E2MjQxNDVmZDFlOTgzNTM5YTA1
+    MzE2MTBmOTAwYWU0YjA4ZDRjN2FiYmQ5NDMzYzEyZmZhNDA4ZjI=
   data.tar.gz: !binary |-
-    MTFjMzlhMzM3MmVlNWQ5NWE5MzFjY2E5OWQ1NmU0NjdiNmIxN2I0MWIyNzkx
-    NzYwMzQ3MjFjZGMzZDhjNjg5NjJmNTVjOWMyMGE0MDFlYjliMTk4NWE1Yzli
-    MmY1YjAyNmIyNTllNmU0YjY1ODc5MzhlN2Y5ZTAwNjgzOGU3ZDM=
+    YTgyYTFmMWNhYWNmMjYyMDkxNDBmNjNkNDg0ZDMzYzE5MDI5ODM5ZDk0ZTZh
+    NjcwYThiNmZlYTM3ZmJhNTcyMzk2ZWFiZjQ3YWU0MzEwOWY4ODZlZTQxYjY0
+    MjY5YmZiZDMxZGYxMjc0NDAyMGRiZjQ4Y2M5MTBhMDE1NTJkN2M=

data/Gemfile

@@ -14,5 +14,7 @@ gemspec
 # gem 'ruby-debug'
 
 gem 'therubyracer', :platforms => :ruby
-gem 'gb_mapfish_print'
 gem 'ruby_mapscript', :platforms => :ruby
+
+# for Mapfish Print standalone
+# gem 'popen4'

data/README.md

@@ -31,12 +31,15 @@ Documentation
 
 For more documentation see the [mapfish-appserver.github.io](http://mapfish-appserver.github.io/)
 
+Note: Mapfish Appserver v1.1.0 or later no longer uses the gb_mapfish_print gem, but uses a
+separately installed Mapfish Print v3 for printing (see documentation)
+
 Authors and License
 -------------------
 
-Primary authors are Pirmin Kalberer and Matthias Walker, Sourcepole,
+Primary authors are Pirmin Kalberer and Mathias Walker, Sourcepole,
 Stefan Zinggeler and Adrian Herzog, Canton of Zurich.
 
 New BSD License
 
-*Copyright (c) 2009-2013 Sourcepole AG & Canton of Zurich*
+*Copyright (c) 2009-2015 Sourcepole AG & Canton of Zurich*

data/app/controllers/print_controller.rb

@@ -1,7 +1,6 @@
 #Mapfish print controller with access control and servlet call
 
 class PrintController < ApplicationController
-  require 'popen4'
   begin
     require 'RMagick'
   rescue LoadError
@@ -15,12 +14,18 @@ class PrintController < ApplicationController
 
   class JavaError < Exception
     def initialize(cmd, message)
-      super(cmd+"\n"+message)
+      super(cmd + "\n\n" + message)
+    end
+  end
+
+  class MapfishError < Exception
+    def initialize(cmd, message)
+      super(cmd + "\n\n" + message)
     end
   end
 
   def initialize
-    @configFile = "#{Rails.root}/config/print.yml"
+    @configFile = "#{Rails.root}/print/config.yaml"
   end
 
   TMP_PREFIX = "#{PRINT_TMP_PATH}/mfPrintTempFile"
@@ -28,44 +33,77 @@ class PrintController < ApplicationController
   TMP_PURGE_SECONDS = 600
 
   OUTPUT_FORMATS = ["pdf", "png", "jpg", "tif", "gif"]
+  MAPFISH_PRINT_OUTPUT_FORMATS = ["pdf", "png", "tif", "gif", "bmp"]
 
   def info
-    #if PRINT_URL.present?
-    #TODO:  call_servlet(request)
-    cmd = baseCmd + " --clientConfig"
-    result = ""
-    errors = ""
-    status = POpen4::popen4(cmd) do |stdout, stderr, stdin, pid|
+    # return v2 print info format for GbPrintPanel
+    info = {}
+    info['createURL'] = url_for(:protocol => request.protocol, :action=>'create') + '.json'
+
+    # add output formats
+    info['outputFormats'] = []
+    OUTPUT_FORMATS.each do |output_format|
+      info['outputFormats'] << {:name => output_format}
+    end
 
-      result = stdout.readlines.join("\n")
-      errors = stderr.readlines.join("\n")
+    # add scales
+    info['scales'] = print_scales.collect do |scale|
+      {:name => "1:#{scale}", :value => scale}
     end
-    if status.nil? || status.exitstatus != 0
-      raise JavaError.new(cmd, errors)
-    else
-      info = ActiveSupport::JSON.decode(result)
-      info['createURL'] = url_for(:protocol => request.protocol, :action=>'create') + '.json'
-      # add output formats
-      info['outputFormats'] = []
-      OUTPUT_FORMATS.each do |output_format|
-        info['outputFormats'] << {:name => output_format}
-      end
 
-      respond_to do |format|
-        format.json do
-          if params[:var]
-            render :text=>"var "+params[:var]+"="+result+";"
-          else
-            render :json=>info
-          end
+    # add dpis
+    info['dpis'] = print_dpis.collect do |dpi|
+      {:name => "#{dpi}", :value => dpi}
+    end
+
+    # NOTE: load templates directly from YAML instead of parsing the Mapfish Print capabilities
+    mapfish_config = YAML.load(File.read(@configFile))
+
+    # parse layouts
+    info['layouts'] = []
+    mapfish_config['templates'].each do |name, template|
+      # skip custom templates
+      next if template['attributes'].has_key?('gb_custom_template')
+
+      map = template['attributes']['map']
+      # skip if no map
+      next if map.nil?
+
+      info['layouts'] << {
+        :name => name,
+        :map => {
+          :width => map['width'],
+          :height => map['height'],
+        },
+        :rotation => true
+      }
+    end
+
+    respond_to do |format|
+      format.json do
+        if params[:var]
+          render :text => "var #{params[:var]} = #{info.to_json};"
+        else
+          render :json => info
         end
       end
     end
   end
 
   def create
+    unless check_permissions
+      head :forbidden
+      return
+    end
+
     cleanupTempFiles
 
+    # remove Rails params
+    controller = request.parameters.delete('controller')
+    request.parameters.delete('action')
+    request.parameters.delete('format')
+    request.parameters.delete(controller) unless controller.nil?
+
     accessible_topics = Topic.accessible_by(current_ability).collect{ |topic| topic.name }
     layers_to_delete = []
     request.parameters["layers"].each do |layer|
@@ -105,7 +143,6 @@ class PrintController < ApplicationController
     # remove inaccessible layers
     request.parameters["layers"] -= layers_to_delete
 
-    scales = []
     request.parameters["pages"].each do |page|
       # round center coordinates
       page["center"].collect! {|coord| (coord * 100.0).round / 100.0  }
@@ -119,55 +156,38 @@ class PrintController < ApplicationController
       # disclaimer
       topic = Topic.accessible_by(current_ability).where(:name => page["topic"]).first
       page["disclaimer"] = topic.nil? ? Topic.default_print_disclaimer : topic.print_disclaimer
-      # scale
-      scales << page["scale"]
     end
 
-    outputFormat = request.parameters["outputFormat"]
-    request.parameters["outputFormat"] = 'pdf'
+    report = request.parameters["layout"]
+    if print_templates.include?(report)
+      # Mapfish
+      print_params = convert_mapfish_v2_params(request.parameters)
+      output_format = print_params["outputFormat"]
 
-    logger.info request.parameters.to_yaml
+      # add any custom params
+      set_custom_print_params(report, print_params)
 
-    if request.parameters["report"]
-      # JasperReport
-      call_report(request)
-    elsif PRINT_URL.present?
-      # MapFish
-      # FIXME: add custom scales to config file
-      call_servlet(request)
-    else
-      # MapFish
-      #print-standalone
-      tempId = SecureRandom.random_number(2**31)
-
-      # use temp config file with added custom scales
-      print_config = File.read(@configFile)
-      print_config.gsub!(/scales:/, "scales:\n#{ scales.collect {|s| "  - #{s.to_s}"}.join("\n") }")
-      config_file = TMP_PREFIX + tempId.to_s + "print.yml"
-      File.open(config_file, "w") { |file| file << print_config }
-
-      temp = TMP_PREFIX + tempId.to_s + TMP_SUFFIX
-      cmd = baseCmd(config_file) + " --output=" + temp
-      result = ""
-      errors = ""
-      status = POpen4::popen4(cmd) do |stdout, stderr, stdin, pid|
-        stdin.puts request.parameters.to_json
-        #body = request.body
-        #FileUtils.copy_stream(body, stdin)
-        #body.close
-        stdin.close
-        result = stdout.readlines.join("\n")
-        errors = stderr.readlines.join("\n")
-      end
-      if status.nil? || status.exitstatus != 0
-        raise JavaError.new(cmd, errors)
-      else
-        convert_and_send_link(temp, tempId, request.parameters["dpi"], outputFormat)
+      # create report
+      temp, temp_id = mapfish_print(print_params)
+
+      # send link to print result
+      respond_to do |format|
+        format.json do
+          render :json => { 'getURL' => url_for(:action => 'show', :id => temp_id) + ".#{output_format}" }
+        end
       end
+    else
+      # JasperReport
+      call_report(request.parameters["report"], request)
     end
   end
 
   def show
+    unless check_permissions
+      head :forbidden
+      return
+    end
+
     output_format = params[:format]
     type = nil
     if OUTPUT_FORMATS.include?(output_format)
@@ -183,24 +203,40 @@ class PrintController < ApplicationController
       when "gif"
         type = 'image/gif'
       end
+    else
+      # invalid format
+      head :bad_request
+      return
     end
     is_mapfish_print_id = (params[:id] =~ /^[0-9]+$/)
     if is_mapfish_print_id
+      # deliver document generated previously by create()
       temp = TMP_PREFIX + params[:id] + ".#{output_format}"
       send_file temp, :type => type, :disposition => 'attachment', :filename => params[:id] + ".#{output_format}"
     else
-      params['report'] = params[:id]
-      result = create_report(request)
-      if result.nil?
-        render :nothing => true, :status => 500
-        return
-      end
-
-      if result.kind_of? Net::HTTPSuccess
-        send_data result.body, :type => type, :disposition => 'attachment', :filename => "#{params[:report]}.pdf"
+      # create document
+      report = params[:id]
+      if custom_print_templates.include?(report)
+        # Mapfish custom report
+
+        # minimal Mapfish print params
+        print_params = params.reject {|p| ['id', 'controller', 'action', 'format'].include?(p) }
+        print_params['layout'] = report
+        print_params['outputFormat'] = output_format
+        print_params['attributes'] = {}
+        print_params['dpi'] = print_params['dpi'] || print_dpis.first
+
+        # add any custom params
+        set_custom_print_params(report, print_params)
+
+        # create report
+        temp, temp_id = mapfish_print(print_params)
+
+        default_filename = "#{report}.#{output_format}"
+        send_custom_report(report, print_params, temp, type, default_filename)
       else
-        logger.info "#{result.code}: #{result.body}"
-        render :nothing => true, :status => result.code
+        # JasperReport
+        create_and_send_jasper_report(report, request, type, "#{report}.pdf")
       end
     end
   end
@@ -240,6 +276,48 @@ class PrintController < ApplicationController
 
   protected
 
+  def print_scales
+    if defined? PRINT_SCALES
+      # from config
+      PRINT_SCALES
+    else
+      # default
+      [500, 1000, 2500, 5000, 10000, 15000, 25000, 50000, 100000, 200000, 500000]
+    end
+  end
+
+  def print_dpis
+    if defined? PRINT_DPIS
+      # from config
+      PRINT_DPIS
+    else
+      # default
+      [150, 300]
+    end
+  end
+
+  def print_templates
+    @print_templates ||= begin
+      # get all templates from Mapfish print config
+      mapfish_config = YAML.load(File.read(@configFile))
+      mapfish_config['templates'].keys
+    end
+  end
+
+  def custom_print_templates
+    @custom_print_templates ||= begin
+      # get custom templates from Mapfish print config
+      mapfish_config = YAML.load(File.read(@configFile))
+      mapfish_config['templates'].keep_if {|k, v| v['attributes'].has_key?('gb_custom_template') }.keys
+    end
+  end
+
+  # check permission for printing, e.g. check params to limit reports to user roles
+  # override in descendant classes
+  def check_permissions
+    true
+  end
+
   def rewrite_wms_uri(url, use_cgi)
     #http://wms.zh.ch/basis -> http://127.0.0.1/cgi-bin/mapserv.fcgi?MAP=/opt/geodata/mapserver/maps/intranet/basis.map&
     out = url
@@ -255,9 +333,128 @@ class PrintController < ApplicationController
     out
   end
 
+  # add custom print params according to report type, e.g. add map and zoom to feature in custom reports
+  # override in descendant classes
+  def set_custom_print_params(report, print_params)
+=begin example
+    case report
+    when "TopicName"
+      # add map and layer
+      layer_url = rewrite_wms_uri("#{wms_host}/TopicName", false)
+      print_params['attributes']['map'] = {
+        :dpi => print_params[:dpi],
+        :bbox => [669242, 223923, 716907, 283315],
+        :projection => 'EPSG:21781',
+        :layers => [
+          {
+            :type => 'WMS',
+            :baseURL => layer_url,
+            :layers => ['Layer1', 'Layer2'],
+            :imageFormat => 'image/png; mode=8bit',
+            :styles => [''],
+            :customParams => {
+              :TRANSPARENT => true,
+              :map_resolution => print_params['dpi']
+            }
+          }
+        ]
+      }
+    end
+=end
+  end
+
+  def mapfish_print(print_params)
+    output_format = print_params["outputFormat"]
+    unless MAPFISH_PRINT_OUTPUT_FORMATS.include?(output_format)
+      # convert to raster from pdf
+      print_params['outputFormat'] = 'pdf'
+    end
+
+    logger.info "Mapfish Print v3: #{print_params.to_yaml}"
+
+    temp_id = SecureRandom.random_number(2**31)
+    temp_mapfish = "#{TMP_PREFIX}#{temp_id.to_s}.#{print_params['outputFormat']}"
+
+    if PRINT_URL.present?
+      # call Mapfish Print servlet
+      data = {
+        :spec => print_params.to_json
+      }
+      response = call_servlet('POST', "buildreport.#{print_params['outputFormat']}", data)
+      File.open(temp_mapfish, 'wb') {|f| f.write(response.body) }
+    else
+      # call Mapfish Print standalone
+      print_standalone(print_params, temp_mapfish)
+    end
+
+    temp = temp_mapfish
+    unless MAPFISH_PRINT_OUTPUT_FORMATS.include?(output_format)
+      # convert PDF to image if not supported by Mapfish Print
+      pdf = Magick::Image.read(temp_mapfish) { self.density = print_params['dpi'] }.first
+      temp_img = "#{TMP_PREFIX}#{temp_id.to_s}.#{output_format}"
+      pdf.write(temp_img)
+      File.delete(temp_mapfish)
+      temp = temp_img
+    end
+
+    return temp, temp_id
+  end
+
+  def call_servlet(method, action, print_params=nil)
+    begin
+      url = URI.parse(URI.decode("#{PRINT_URL}/#{action}"))
+      logger.info "Forward request: #{method} #{url}"
+
+      case method
+      when 'GET'
+        # add params to URL
+        url = URI.parse("#{url}?#{print_params.to_param}") unless print_params.nil?
+        response = Net::HTTP.get_response(url)
+      when 'POST'
+        http = Net::HTTP.new(url.host, url.port)
+        req = Net::HTTP::Post.new(url.path)
+        req.set_form_data(print_params)
+        response = http.request(req)
+      else
+        raise Exception.new("Unsupported method '#{method}'")
+      end
+    rescue => err
+      raise MapfishError.new("#{method} #{url}\n#{print_params.to_json}", "#{err.class}: #{err.message}")
+    end
+
+    if response.code != '200'
+      raise MapfishError.new("#{method} #{url}\n#{print_params.to_json}", response.body)
+    end
+
+    response
+  end
+
   def baseCmd(config_file = nil)
     config = config_file || @configFile
-    "java -cp #{GbMapfishPrint::PRINT_JAR} org.mapfish.print.ShellMapPrinter --config=#{config}"
+    "java -cp '#{PRINT_STANDALONE_JARS}' org.mapfish.print.cli.Main -config #{config} -verbose 0"
+  end
+
+  def print_standalone(print_params, temp_mapfish)
+    require 'popen4'
+
+    cmd = "#{baseCmd} -output #{temp_mapfish}"
+    #result = ""
+    errors = ""
+    status = POpen4::popen4(cmd) do |stdout, stderr, stdin, pid|
+      stdin.puts print_params.to_json
+      stdin.close
+      #result = stdout.readlines.join("")
+      errors = stderr.readlines.join("")
+    end
+    if status.nil? || status.exitstatus != 0
+      raise JavaError.new(cmd + "\n" + print_params.to_json, errors)
+    end
+  end
+
+  # handler for sending custom report file, e.g. to customize filename depending on params
+  # override in descendant classes
+  def send_custom_report(report, print_params, path, type, filename)
+    send_file path, :type => type, :disposition => 'attachment', :filename => filename
   end
 
   def cleanupTempFiles
@@ -271,58 +468,100 @@ class PrintController < ApplicationController
     end
   end
 
-  def call_servlet(request)
-    url = URI.parse(URI.decode(PRINT_URL))
-    logger.info "Forward request: #{PRINT_URL}"
-    printspec = request.parameters.to_json
+  # convert Mapfish Print v2 request params to v3
+  # NOTE: v2 can be used directly (with -v2), but does not support multiple maps
+  # see also mapfish-print/core/src/main/java/org/mapfish/print/servlet/oldapi/OldAPIRequestConverter.java
+  def convert_mapfish_v2_params(print_v2_params)
+    print_params = {
+      'attributes' => {}
+    }
+
+    # report
+    ['layout', 'outputFormat'].each do |k|
+      print_params[k] = print_v2_params[k] if print_v2_params.has_key?(k)
+    end
 
-    response = nil
-    begin
-      http = Net::HTTP.new(url.host, url.port)
-      http.start do
-        case request.method.to_s
-        when 'GET'  then response = http.get(url.path) #, request.headers
-        #when 'POST' then response = http.post(url.path, printspec)
-        when 'POST'  then response = http.get("#{url.path}?spec=#{CGI.escape(printspec)}") #-> GET print.pdf
-        else
-          raise Exception.new("unsupported method `#{request.method}'.")
-        end
+    # map
+    map = {}
+    map['dpi'] = print_v2_params['dpi'] if print_v2_params.has_key?('dpi')
+    map['projection'] = print_v2_params['srs'] if print_v2_params.has_key?('srs')
+
+    page_map_params = ['center', 'scale', 'rotation']
+    print_v2_params['pages'].each do |page|
+      if page.has_key?('center')
+        map['center'] = page['center']
+        # add text param for center
+        print_params['attributes']['center_text'] = page['center']
+      end
+      if page.has_key?('scale')
+        map['scale'] = page['scale']
+        # add text param for scale
+        print_params['attributes']['scale_text'] = page['scale']
+      end
+      map['rotation'] = -page['rotation'] if page.has_key?('rotation')
+
+      # custom params from page
+      page.each do |k, v|
+        print_params['attributes'][k] = v unless page_map_params.include?(k)
       end
-    rescue => err
-      logger.info("#{err.class}: #{err.message}")
-      render :nothing => true, :status => 500
-      return
     end
-    #send_data response.body, :status => response.code, :type=>'application/x-pdf', :disposition=>'attachment', :filename=>'map.pdf'
-    tempId = SecureRandom.random_number(2**31)
-    temp = TMP_PREFIX + tempId.to_s + TMP_SUFFIX
-    File.open(temp, 'wb') {|f| f.write(response.body) }
-    convert_and_send_link(temp, tempId, request.parameters["dpi"], request.parameters["outputFormat"])
-  end
 
-  # optionally convert PDF to image and send link to print result
-  def convert_and_send_link(temp_pdf, temp_id, dpi, output_format)
-    temp_suffix = ".pdf"
+    # layers
+    map['layers'] = []
+    if print_v2_params.has_key?('layers')
+      print_v2_params['layers'].reverse.each do |v2_layer|
+        layer = {}
+
+        case v2_layer['type'].downcase
+        when "wms"
+          # WMS
+          layer['type'] = 'wms'
+          ['customParams', 'imageFormat', 'name', 'layers', 'opacity', 'mergeableParams', 'baseURL', 'styles', 'rasterStyle', 'failOnError', 'useNativeAngle', 'serverType', 'version'].each do |k|
+            layer[k] = v2_layer[k] if v2_layer.has_key?(k)
+          end
+          layer['imageFormat'] = v2_layer['format'] if v2_layer.has_key?('format')
+        when "vector"
+          # vector
+          layer['type'] = 'geojson'
+          ['style', 'name', 'opacity', 'renderAsSvg', 'failOnError', 'geoJson'].each do |k|
+            layer[k] = v2_layer[k] if v2_layer.has_key?(k)
+          end
+          if v2_layer.has_key?('styles')
+            layer['style'] = v2_layer['styles']
+            layer['style'].each do |k, v|
+              if v.has_key?('label')
+                # set default font
+                v['fontFamily'] = 'sans-serif' unless v.has_key?('fontFamily')
+                v['fontSize'] = '12px' unless v.has_key?('fontSize')
+              end
+            end
+            layer['style']['styleProperty'] = v2_layer['styleProperty'] if v2_layer.has_key?('styleProperty')
+            layer['style']['version'] = 1
+          end
+        else
+          logger.info "Layer type not supported: #{v2_layer.to_yaml}"
+          next
+        end
 
-    if output_format != "pdf" && OUTPUT_FORMATS.include?(output_format)
-        # convert PDF to image
-        pdf = Magick::Image.read(temp_pdf) { self.density = dpi }.first
-        temp_suffix = ".#{output_format}"
-        temp_img = TMP_PREFIX + temp_id.to_s + temp_suffix
-        pdf.write(temp_img)
-        File.delete(temp_pdf)
+        map['layers'] << layer
+      end
     end
 
-    respond_to do |format|
-      format.json do
-        render :json=>{ 'getURL' => url_for(:action=>'show', :id=>temp_id) + temp_suffix }
+    print_params['attributes']['map'] = map
+
+    # custom params
+    non_custom_params = ['layout', 'outputFormat', 'units', 'srs', 'dpi', 'layers', 'pages']
+    print_v2_params.each do |k, v|
+      unless non_custom_params.include?(k)
+        print_params['attributes'][k] = v
       end
     end
+
+    print_params
   end
 
   # forward to JasperReport
-  def create_report(request)
-      report = request.parameters["report"]
+  def create_report(report, request)
       call_params = {
         :j_username => JASPER_USER,
         :j_password => JASPER_PASSWORD
@@ -356,18 +595,16 @@ class PrintController < ApplicationController
   end
 
   #Mapfish print compatible report delivery
-  def call_report(request)
-      result = create_report(request)
+  def call_report(report, request)
+      result = create_report(report, request)
       if result.nil?
         render :nothing => true, :status => 500
-        return
-      end
-
-      if result.kind_of? Net::HTTPSuccess
+      elsif result.kind_of? Net::HTTPSuccess
         temp_id = SecureRandom.random_number(2**31)
         temp = TMP_PREFIX + temp_id.to_s + TMP_SUFFIX
         File.open(temp, 'wb') {|f| f.write(result.body) }
 
+        # send link to print result
         render :json=>{ 'getURL' => url_for(:action=> 'show', :id=> temp_id) + ".pdf" }
       else
         logger.info "#{result.code}: #{result.body}"
@@ -375,4 +612,16 @@ class PrintController < ApplicationController
       end
   end
 
+  def create_and_send_jasper_report(report, request, type, filename)
+    result = create_report(report, request)
+    if result.nil?
+      render :nothing => true, :status => 500
+    elsif result.kind_of? Net::HTTPSuccess
+      send_data result.body, :type => type, :disposition => 'attachment', :filename => filename
+    else
+      logger.info "#{result.code}: #{result.body}"
+      render :nothing => true, :status => result.code
+    end
+  end
+
 end

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end

data/lib/generators/mapfish/install/install_generator.rb

@@ -80,15 +80,17 @@ MAPSERV_CGI_URL = '/cgi-bin/mapserv'
 MAPPATH = '#{Rails.root}/mapconfig'
 
 #Internal URL of print servlet (nil: print-standalone)
-PRINT_URL = nil #'http://localhost:8080/print-servlet-1.1/pdf/print.pdf'
+PRINT_URL = nil #'http://localhost:8080/mapfish_print/print/myapp'
+#path to standalone Mapfish Print JARs (if PRINT_URL = nil)
+# PRINT_STANDALONE_JARS = '$PATH_TO/mapfish-print/core/lib/*'
 }
         %w[development test production].each do |env|
           append_to_file("config/environments/#{env}.rb", env_config)
         end
       end
 
-      def add_print_config_template
-        template "print.yml", "config/print.yml"
+      def copy_print_configs
+        directory "print", "print"
       end
 
       def setup_mapconfig

data/lib/generators/mapfish/install/templates/initializer.rb

@@ -22,6 +22,10 @@ LOCAL_WMS = [
 #NOTE: use a shared directory for multi-node setups (e.g. NFS)
 PRINT_TMP_PATH = "/tmp"
 
+# scales and dpis for printing (optional)
+#PRINT_SCALES = [500, 1000, 2500, 5000, 10000, 15000, 25000, 50000, 100000, 200000, 500000]
+#PRINT_DPIS = [150, 300]
+
 DEFAULT_TOPIC = {
   SITE_DEFAULT => (Topic.first rescue nil) #Topic.where(:name => 'MainMap').first
 }

data/lib/generators/mapfish/install/templates/print/A4_portrait.jrxml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.1.0.final using JasperReports Library version 6.1.0  -->
+<!-- 2015-12-02T11:19:59 -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="A4_portrait" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="cbdda6e8-753d-45cb-8017-b2a469eecfe4">
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
+	<parameter name="map_title" class="java.lang.String"/>
+	<parameter name="mapSubReport" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="scalebarSubReport" class="java.lang.String" isForPrompting="false"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<title>
+		<band height="50" splitType="Stretch">
+			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<textField>
+				<reportElement x="0" y="0" width="280" height="30" uuid="0b8cc9a6-5320-419d-876a-9b0f83512251"/>
+				<textElement>
+					<font size="20"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{map_title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<detail>
+		<band height="680" splitType="Stretch">
+			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<subreport>
+				<reportElement x="0" y="0" width="555" height="680" uuid="5e5015ee-5bc7-4c22-bc1d-11b41ada327e"/>
+				<subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression>
+			</subreport>
+		</band>
+	</detail>
+	<pageFooter>
+		<band height="50" splitType="Stretch">
+			<subreport>
+				<reportElement x="435" y="0" width="120" height="20" uuid="3472f694-cbf8-4e07-9964-099c5f0a3043"/>
+				<subreportExpression><![CDATA[$P{scalebarSubReport}]]></subreportExpression>
+			</subreport>
+		</band>
+	</pageFooter>
+</jasperReport>

data/lib/generators/mapfish/install/templates/print/config.yaml

@@ -0,0 +1,24 @@
+# Mapfish Print v3
+throwErrorOnExtraParameters: true
+
+templates:
+
+  #===========================================================================
+  A4 portrait: !template
+  #===========================================================================
+    reportTemplate: A4_portrait.jrxml
+    attributes:
+      map_title: !string {default: "Map Title"}
+      map: !map
+        width: 555
+        height: 680
+        maxDpi: 300
+        dpiSuggestions: [150, 300]
+      scalebar: !scalebar
+        width: 120
+        height: 20
+    processors:
+    - !reportBuilder
+        directory: "."
+    - !createMap {}
+    - !createScalebar {}

data/test/dummy/config/environments/development.rb

@@ -44,4 +44,6 @@ MAPSERV_CGI_URL = '/cgi-bin/mapserv'
 MAPPATH = '/home/pi/code/rails/gb_mapfish_appserver/test/dummy/mapconfig'
 
 #Internal URL of print servlet (nil: print-standalone)
-PRINT_URL = nil #'http://localhost:8080/print-servlet-1.1/pdf/print.pdf'
+PRINT_URL = nil #'http://localhost:8080/mapfish_print/print/myapp'
+#path to standalone Mapfish Print JARs (if PRINT_URL = nil)
+# PRINT_STANDALONE_JARS = '$PATH_TO/mapfish-print/core/lib/*'

data/test/dummy/config/environments/production.rb

@@ -74,4 +74,4 @@ MAPSERV_CGI_URL = '/cgi-bin/mapserv'
 MAPPATH = '/home/pi/code/rails/dummy/mapconfig'
 
 #Internal URL of print servlet (nil: print-standalone)
-PRINT_URL = nil #'http://localhost:8080/print-servlet-1.1/pdf/print.pdf'
+PRINT_URL = nil #'http://localhost:8080/mapfish_print/print/myapp'

data/test/dummy/config/environments/test.rb

@@ -44,4 +44,4 @@ MAPSERV_CGI_URL = '/cgi-bin/mapserv'
 MAPPATH = '/home/pi/code/rails/dummy/mapconfig'
 
 #Internal URL of print servlet (nil: print-standalone)
-PRINT_URL = nil #'http://localhost:8080/print-servlet-1.1/pdf/print.pdf'
+PRINT_URL = nil #'http://localhost:8080/mapfish_print/print/myapp'

data/test/dummy/config/initializers/mapfish.rb

@@ -22,6 +22,10 @@ LOCAL_WMS = [
 #NOTE: use a shared directory for multi-node setups (e.g. NFS)
 PRINT_TMP_PATH = "/tmp"
 
+# scales and dpis for printing (optional)
+#PRINT_SCALES = [500, 1000, 2500, 5000, 10000, 15000, 25000, 50000, 100000, 200000, 500000]
+#PRINT_DPIS = [150, 300]
+
 DEFAULT_TOPIC = {
   SITE_DEFAULT => (Topic.first rescue nil) #Topic.where(:name => 'MainMap').first
 }

data/test/dummy/print/A4_portrait.jrxml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.1.0.final using JasperReports Library version 6.1.0  -->
+<!-- 2015-12-02T11:19:59 -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="A4_portrait" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="cbdda6e8-753d-45cb-8017-b2a469eecfe4">
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
+	<parameter name="map_title" class="java.lang.String"/>
+	<parameter name="mapSubReport" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="scalebarSubReport" class="java.lang.String" isForPrompting="false"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<title>
+		<band height="50" splitType="Stretch">
+			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<textField>
+				<reportElement x="0" y="0" width="280" height="30" uuid="0b8cc9a6-5320-419d-876a-9b0f83512251"/>
+				<textElement>
+					<font size="20"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{map_title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<detail>
+		<band height="680" splitType="Stretch">
+			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+			<subreport>
+				<reportElement x="0" y="0" width="555" height="680" uuid="5e5015ee-5bc7-4c22-bc1d-11b41ada327e"/>
+				<subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression>
+			</subreport>
+		</band>
+	</detail>
+	<pageFooter>
+		<band height="50" splitType="Stretch">
+			<subreport>
+				<reportElement x="435" y="0" width="120" height="20" uuid="3472f694-cbf8-4e07-9964-099c5f0a3043"/>
+				<subreportExpression><![CDATA[$P{scalebarSubReport}]]></subreportExpression>
+			</subreport>
+		</band>
+	</pageFooter>
+</jasperReport>

data/test/dummy/print/config.yaml

@@ -0,0 +1,24 @@
+# Mapfish Print v3
+throwErrorOnExtraParameters: true
+
+templates:
+
+  #===========================================================================
+  A4 portrait: !template
+  #===========================================================================
+    reportTemplate: A4_portrait.jrxml
+    attributes:
+      map_title: !string {default: "Map Title"}
+      map: !map
+        width: 555
+        height: 680
+        maxDpi: 300
+        dpiSuggestions: [150, 300]
+      scalebar: !scalebar
+        width: 120
+        height: 20
+    processors:
+    - !reportBuilder
+        directory: "."
+    - !createMap {}
+    - !createScalebar {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Pirmin Kalberer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -327,7 +327,8 @@ files:
 - lib/generators/mapfish/install/install_generator.rb
 - lib/generators/mapfish/install/templates/geodatabase.yml
 - lib/generators/mapfish/install/templates/initializer.rb
-- lib/generators/mapfish/install/templates/print.yml
+- lib/generators/mapfish/install/templates/print/A4_portrait.jrxml
+- lib/generators/mapfish/install/templates/print/config.yaml
 - lib/generators/mapfish/install/templates/search_rules.rb
 - lib/generators/mapfish/viewer/templates/viewer.html.erb
 - lib/generators/mapfish/viewer/viewer_generator.rb
@@ -375,7 +376,6 @@ files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/config/print.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20131120103839_setup_mapfish_tables.mapfish.rb
 - test/dummy/db/schema.rb
@@ -391,6 +391,8 @@ files:
 - test/dummy/mapconfig/maps.example.com/cascadingwms.map
 - test/dummy/mapconfig/maps.example.com/connection.inc.example
 - test/dummy/mapconfig/maps.example.com/naturalearth.map
+- test/dummy/print/A4_portrait.jrxml
+- test/dummy/print/config.yaml
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -527,7 +529,6 @@ test_files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/config/print.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20131120103839_setup_mapfish_tables.mapfish.rb
 - test/dummy/db/schema.rb
@@ -543,6 +544,8 @@ test_files:
 - test/dummy/mapconfig/maps.example.com/cascadingwms.map
 - test/dummy/mapconfig/maps.example.com/connection.inc.example
 - test/dummy/mapconfig/maps.example.com/naturalearth.map
+- test/dummy/print/A4_portrait.jrxml
+- test/dummy/print/config.yaml
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html

data/lib/generators/mapfish/install/templates/print.yml

@@ -1,76 +0,0 @@
-#===========================================================================
-# allowed DPIs
-#===========================================================================
-dpis:
-  - 254
-  - 190
-#  - 127
-#  - 56
-
-#===========================================================================
-# the allowed scales
-#===========================================================================
-scales:
-  - 25000
-  - 50000
-  - 100000
-  - 200000
-  - 500000
-  - 1000000
-  - 2000000
-  - 4000000
-  - 8000000
-  - 16000000
-  - 32000000
-  - 64000000
-
-#===========================================================================
-# the list of allowed hosts
-#===========================================================================
-
-hosts:
-  - !localMatch
-    dummy: true
-  - !ipMatch
-    ip: demo.mapfish.org
-  - !dnsMatch
-    host: labs.metacarta.com
-    port: 80
-
-
-layouts:
-  #===========================================================================
-  A4 portrait:
-  #===========================================================================
-    mainPage:
-      rotation: true
-      pageSize: A4
-      header:
-        height: 50
-        items:
-          - !text
-            font: Helvetica
-            fontSize: 30
-            align: right
-            text: 'hello first print'
-      items:
-        - !map
-          spacingAfter: 30
-          width: 440
-          height: 483
-        - !text
-          text: 'blablabla'
-          spacingAfter: 30
-      footer:
-        height: 30
-        items:
-          - !columns
-            items:
-              - !text
-                backgroundColor: #FF0000
-                align: left
-                text: little test
-              - !text
-                align: right
-                text: 'Page ${pageNum}'
-

data/test/dummy/config/print.yml

@@ -1,76 +0,0 @@
-#===========================================================================
-# allowed DPIs
-#===========================================================================
-dpis:
-  - 254
-  - 190
-#  - 127
-#  - 56
-
-#===========================================================================
-# the allowed scales
-#===========================================================================
-scales:
-  - 25000
-  - 50000
-  - 100000
-  - 200000
-  - 500000
-  - 1000000
-  - 2000000
-  - 4000000
-  - 8000000
-  - 16000000
-  - 32000000
-  - 64000000
-
-#===========================================================================
-# the list of allowed hosts
-#===========================================================================
-
-hosts:
-  - !localMatch
-    dummy: true
-  - !ipMatch
-    ip: demo.mapfish.org
-  - !dnsMatch
-    host: labs.metacarta.com
-    port: 80
-
-
-layouts:
-  #===========================================================================
-  A4 portrait:
-  #===========================================================================
-    mainPage:
-      rotation: true
-      pageSize: A4
-      header:
-        height: 50
-        items:
-          - !text
-            font: Helvetica
-            fontSize: 30
-            align: right
-            text: 'hello first print'
-      items:
-        - !map
-          spacingAfter: 30
-          width: 440
-          height: 483
-        - !text
-          text: 'blablabla'
-          spacingAfter: 30
-      footer:
-        height: 30
-        items:
-          - !columns
-            items:
-              - !text
-                backgroundColor: #FF0000
-                align: left
-                text: little test
-              - !text
-                align: right
-                text: 'Page ${pageNum}'
-