gb_mapfish_appserver 0.0.3 → 0.0.4

data/app/controllers/apps_controller.rb

@@ -1,7 +1,8 @@
 class AppsController < ApplicationController
 
   def show
-    logger.debug "Site: '#{@zone}'"
+    @current_roles = current_roles.roles.collect(&:name)
+
     @topic_name = params['topic'] || DEFAULT_TOPIC[@zone].name
     @main_default_topic = DEFAULT_TOPIC[@zone].name
     @offlayers = params['offlayers'].blank? ? [] : params['offlayers'].split(',')
@@ -16,6 +17,9 @@ class AppsController < ApplicationController
     @selvalues = params['selvalues'].nil? ? [] : params['selvalues'].split('$')
 
     @redlining = params['redlining'].blank? ? nil : params['redlining']
+    @centermarker = params['centermarker']
+
+    @markers = params['markers']
 
     if params['locate']
       rule = LOCATERULES[params['locate']]
@@ -27,6 +31,7 @@ class AppsController < ApplicationController
           @seltopic = model.selection_topic
           @sellayer = model.selection_layer
           @selproperty = model.primary_key
+          @selscalerange = model.selection_scalerange
           search_locs = model.search_locations(params['locations'])
           model.locate(search_locs)
         else
@@ -34,6 +39,7 @@ class AppsController < ApplicationController
           @seltopic = @topic_name
           @sellayer = layer.name
           @selproperty = layer.feature_class.primary_key
+          @selscalerange = model.selection_scalerange
           search_locs = params['locations'].split(',')
           model.layer_locate(layer, rule.search_field, search_locs)
         end
@@ -43,6 +49,8 @@ class AppsController < ApplicationController
           #Selection
           @selbbox = model.bbox(features)
           @selvalues = features.collect {|f| f.send(model.primary_key) }
+        else
+          logger.info "no features found."
         end
       end
     end

data/app/controllers/apps_controller.rb~

@@ -0,0 +1,66 @@
+class AppsController < ApplicationController
+
+  def show
+    logger.debug "Site: '#{@zone}'"
+    @current_roles = current_roles.roles.collect(&:name)
+    @topic_name = params['topic'] || DEFAULT_TOPIC[@zone].name
+    @main_default_topic = DEFAULT_TOPIC[@zone].name
+    @offlayers = params['offlayers'].blank? ? [] : params['offlayers'].split(',')
+
+    @scale = params['scale'].nil? ? DEFAULT_SCALE : params['scale'].to_i
+    @x = params['x'].nil? ? DEFAULT_X : params['x'].to_f
+    @y = params['y'].nil? ? DEFAULT_Y : params['y'].to_f
+
+    @seltopic = params['seltopic']
+    @sellayer = params['sellayer']
+    @selproperty = params['selproperty']
+    @selvalues = params['selvalues'].nil? ? [] : params['selvalues'].split('$')
+
+    @redlining = params['redlining'].blank? ? nil : params['redlining']
+    @centermarker = params['centermarker']
+
+    @markers = params['markers']
+
+    if params['locate']
+      rule = LOCATERULES[params['locate']]
+      if rule.nil?
+        logger.info "Locate rule not found: {params['locate']}"
+      else
+        model = rule.model.constantize
+        features = if rule.layer.nil?
+          @seltopic = model.selection_topic
+          @sellayer = model.selection_layer
+          @selproperty = model.primary_key
+          @selscalerange = model.selection_scalerange
+          search_locs = model.search_locations(params['locations'])
+          model.locate(search_locs)
+        else
+          layer = Layer.find_by_name(rule.layer)
+          @seltopic = @topic_name
+          @sellayer = layer.name
+          @selproperty = layer.feature_class.primary_key
+          @selscalerange = model.selection_scalerange
+          search_locs = params['locations'].split(',')
+          model.layer_locate(layer, rule.search_field, search_locs)
+        end
+        if features.present?
+          @x, @y, scale = model.map_center(features)
+          @scale = params['scale'].nil? ? scale : params['scale'].to_i
+          #Selection
+          @selbbox = model.bbox(features)
+          @selvalues = features.collect {|f| f.send(model.primary_key) }
+        else
+          logger.info "no features found."
+        end
+      end
+    end
+
+    @selection_valid = !(@seltopic.nil? || @sellayer.nil? || @selproperty.nil? || @selvalues.empty?)
+    @app = params[:app]
+
+    session[:map_ts] = Time.now # Used for checking access to non-public WMS
+
+    render :action => @app, :layout => false
+  end
+
+end

data/app/controllers/groups_users_controller.rb

@@ -1,11 +1,14 @@
+# encoding: UTF-8
 class GroupsUsersController < ApplicationController
   #authorize_resource
+  before_filter :authenticate_user!
   before_filter :accessible_groups
 
   # GET /groups_users
   # GET /groups_users.json
   def index
-    @groups_users = GroupsUser.where(:group_id => @groups)
+    @groups = admin_groups(@groups)
+    @groups_users = GroupsUser.where(:group_id => @groups).joins(:group, :user).order('groups.name,users.login')
     respond_to do |format|
       format.html # index.html.erb
       format.json { render :json => @groups_users }
@@ -15,6 +18,7 @@ class GroupsUsersController < ApplicationController
   # GET /groups_users/1
   # GET /groups_users/1.json
   def show
+    @groups = admin_groups(@groups)
     @groups_user = GroupsUser.where(:group_id => @groups).find(params[:id])
 
     respond_to do |format|
@@ -26,7 +30,9 @@ class GroupsUsersController < ApplicationController
   # GET /groups_users/new
   # GET /groups_users/new.json
   def new
-    @groups_user = GroupsUser.new
+    @group = @groups.find(params[:group])
+    raise CanCan::AccessDenied.new("Permission error") unless current_user.group_admin?(@group)
+    @groups_user = GroupsUser.new(:group => @group)
 
     respond_to do |format|
       format.html # new.html.erb
@@ -38,7 +44,9 @@ class GroupsUsersController < ApplicationController
 
   # GET /groups_users/1/edit
   def edit
+    @groups = admin_groups(@groups)
     @groups_user = GroupsUser.where(:group_id => @groups).find(params[:id])
+    @mail_body = mail_body
   rescue
     raise CanCan::AccessDenied.new("Permission error")
   end
@@ -46,22 +54,39 @@ class GroupsUsersController < ApplicationController
   # POST /groups_users
   # POST /groups_users.json
   def create
-    #@groups_user = GroupsUser.new(params[:groups_user])
-    #
-    #respond_to do |format|
-    #  if @groups_user.save
-    #    format.html { redirect_to groups_users_url, :notice => 'Groups user was successfully created.' }
-    #    format.json { render :json => @groups_user, :status => :created, :location => @groups_user }
-    #  else
-    #    format.html { render :action => "new" }
-    #    format.json { render :json => @groups_user.errors, :status => :unprocessable_entity }
-    #  end
-    #end
+    @group = @groups.find(params[:groups_user][:group_id])
+    raise CanCan::AccessDenied.new("Permission error") unless current_user.group_admin?(@group)
+    @groups_user = GroupsUser.new(params[:groups_user])
+
+    user = User.find_by_email(params[:user_email])
+    if user.nil?
+      flash[:error] = "Kein Benutzer mit dieser E-Mail gefunden"
+      render :action => "new"
+      return
+    elsif @group.groups_users.where("groups_users.user_id = ?", user.id).any?
+      flash[:error] = "Benutzer gehört schon zu dieser Gruppe"
+      render :action => "new"
+      return
+    end
+
+    @groups_user.user = user
+    @groups_user.granted = true
+
+    respond_to do |format|
+      if @groups_user.save
+        format.html { redirect_to groups_users_url, :notice => 'Benutzer wurde erfolgreich zur Gruppe hinzugefügt.' }
+        format.json { render :json => @groups_user, :status => :created, :location => @groups_user }
+      else
+        format.html { render :action => "new" }
+        format.json { render :json => @groups_user.errors, :status => :unprocessable_entity }
+      end
+    end
   end
 
   # PUT /groups_users/1
   # PUT /groups_users/1.json
   def update
+    @groups = admin_groups(@groups)
     @groups_user = GroupsUser.where(:group_id => @groups).find(params[:id])
 
     respond_to do |format|
@@ -78,6 +103,7 @@ class GroupsUsersController < ApplicationController
   # DELETE /groups_users/1
   # DELETE /groups_users/1.json
   def destroy
+    @groups = admin_groups(@groups)
     @groups_user = GroupsUser.where(:group_id => @groups).find(params[:id])
     @groups_user.destroy
 
@@ -87,10 +113,43 @@ class GroupsUsersController < ApplicationController
     end
   end
 
+  # registration of existing user from signup page
+  def register
+    @group = Group.find(params[:group][:requested_group]) if params[:group][:requested_group]
+    @groups_user = GroupsUser.where(:group_id => @group.id, :user_id => current_user.id).first_or_create
+
+    unless params[:group][:app_infos].blank?
+      # merge non-empty app_infos
+      new_app_infos = params[:group][:app_infos].reject {|key, value| value.blank? }
+      current_user.merge_app_infos(new_app_infos)
+    end
+
+    # send mail to group admins
+    Registrations.group_user_registration_email(
+      @group, current_user, edit_groups_user_url(@groups_user)
+    ).deliver
+
+    redirect_to user_confirm_path
+  end
+
   private
 
   def accessible_groups
-    @groups = Group.accessible_by(current_ability)
+    @groups = Group.accessible_by(current_ability).order(:name)
+  end
+
+  # return groups where user is admin
+  def admin_groups(groups)
+    groups.reject {|g| !current_user.group_admin?(g)}
+  end
+
+  def mail_body
+    mail_body_file = File.join(Rails.root, 'app', 'views', 'groups_users', 'mails', "_#{@groups_user.group.name}.html.erb")
+    if File.exist?(mail_body_file)
+      "groups_users/mails/#{@groups_user.group.name}"
+    else
+      'groups_users/mails/default'
+    end
   end
 
 end

data/app/controllers/print_controller.rb

@@ -22,7 +22,7 @@ class PrintController < ApplicationController
     @configFile = "#{Rails.root}/config/print.yml"
   end
 
-  TMP_PREFIX = "/opt/geodata/tmp/mfPrintTempFile" #WARNING: use NFS for multi-node setups! TODO: external config
+  TMP_PREFIX = "#{PRINT_TMP_PATH}/mfPrintTempFile"
   TMP_SUFFIX = ".pdf"
   TMP_PURGE_SECONDS = 600
 
@@ -91,6 +91,7 @@ class PrintController < ApplicationController
           if style["externalGraphic"]
             style["externalGraphic"].gsub!(LOCAL_GRAPHICS_HOST, '127.0.0.1')
             style["externalGraphic"].gsub!(/^https:/, 'http:')
+            style["externalGraphic"].gsub!(/^\//, 'http://127.0.0.1/')
           end
         end
       end
@@ -98,9 +99,12 @@ 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  }
+      # round extent coordinates
+      page["extent"].collect! {|coord| (coord * 100.0).round / 100.0  } unless page["extent"].nil?
       # add blank user strings if missing
       page["user_title"] = " " if page["user_title"].blank?
       page["user_comment"] = " " if page["user_comment"].blank?
@@ -109,15 +113,30 @@ 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
 
     logger.info request.parameters.to_yaml
 
-    if PRINT_URL.present?
+    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.yaml"
+      File.open(config_file, "w") { |file| file << print_config }
+
       temp = TMP_PREFIX + tempId.to_s + TMP_SUFFIX
       cmd = baseCmd + " --output=" + temp
       result = ""
@@ -141,8 +160,8 @@ class PrintController < ApplicationController
 
   def show
     output_format = params[:format]
+    type = nil
     if OUTPUT_FORMATS.include?(output_format)
-      temp = TMP_PREFIX + params[:id] + ".#{output_format}"
       case output_format
       when "pdf"
         type = 'application/x-pdf'
@@ -155,7 +174,25 @@ class PrintController < ApplicationController
       when "gif"
         type = 'image/gif'
       end
+    end
+    is_mapfish_print_id = (params[:id] =~ /^[0-9]+$/)
+    if is_mapfish_print_id
+      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"
+      else
+        logger.info "#{result.code}: #{result.body}"
+        render :nothing => true, :status => result.code
+      end
     end
   end
 
@@ -169,7 +206,7 @@ class PrintController < ApplicationController
     localwms = LOCAL_WMS.any? { |ref| uri.host =~ ref }
     if localwms
       topic = File.basename(uri.path)
-      localhost = (@zone == ZONE_INTRANET) ? '127.0.0.1' : 'localhost'
+      localhost = 'localhost' #TODO: site specific configuration
       out = "http://#{localhost}#{use_cgi ? MAPSERV_CGI_URL :  MAPSERV_URL}?MAP=#{MAPPATH}/#{@zone}/#{topic}.map&"
       #out = "http://#{localhost}:#{request.port}/wms/#{topic}"
     end
@@ -182,7 +219,7 @@ class PrintController < ApplicationController
 
   def cleanupTempFiles
     minTime = Time.now - TMP_PURGE_SECONDS;
-    OUTPUT_FORMATS.each do |output_format|
+    (OUTPUT_FORMATS + ["yaml"]).each do |output_format|
       Dir.glob(TMP_PREFIX + "*." + output_format).each do |path|
         if File.mtime(path) < minTime
           File.delete(path)
@@ -240,4 +277,59 @@ class PrintController < ApplicationController
     end
   end
 
+  # forward to JasperReport
+  def create_report(request)
+      report = request.parameters["report"]
+      call_params = {
+        :j_username => JASPER_USER,
+        :j_password => JASPER_PASSWORD
+      }
+      if request.parameters["pages"]
+        page = request.parameters["pages"].first
+        %w(scale rotation base_url user_title user_comment).each do |mfparam|
+          call_params[mfparam.upcase] = page[mfparam]
+        end
+        call_params[:MAP_BBOX] = page["extent"].join(',')
+        call_params[:MAP_CENTER] = page["center"].join(',')
+      end
+      request.parameters.each do |name, val|
+        if name =~ /^REP_/
+          call_params[name] = val
+        end
+      end
+      pdfid = Time.now.strftime("%Y%m%d%H%M%S") + rand.to_s[2..4] 
+      call_params['REP_PDFID'] = pdfid
+      report_url = "#{JASPER_URL}/#{report}.pdf?#{ call_params.to_param }"
+
+      begin
+        logger.info "Forward request: #{report_url}"
+        result = Net::HTTP.get_response(URI.parse(URI.decode(report_url)))
+        result["pdfid"] = pdfid
+     rescue => err
+        logger.info("#{err.class}: #{err.message}")
+        return nil
+      end
+     result
+  end
+
+  #Mapfish print comaptible report delivery
+  def call_report(request)
+      result = create_report(request)
+      if result.nil?
+        render :nothing => true, :status => 500
+        return
+      end
+
+      if result.kind_of? Net::HTTPSuccess
+        temp_id = SecureRandom.random_number(2**31)
+        temp = TMP_PREFIX + temp_id.to_s + TMP_SUFFIX
+        File.open(temp, 'w') {|f| f.write(result.body) }
+
+        render :json=>{ 'getURL' => url_for(:action=> 'show', :id=> temp_id) + ".pdf" }
+      else
+        logger.info "#{result.code}: #{result.body}"
+        render :nothing => true, :status => result.code
+      end
+  end
+
 end

data/app/controllers/print_controller.rb~

@@ -91,6 +91,7 @@ class PrintController < ApplicationController
           if style["externalGraphic"]
             style["externalGraphic"].gsub!(LOCAL_GRAPHICS_HOST, '127.0.0.1')
             style["externalGraphic"].gsub!(/^https:/, 'http:')
+            style["externalGraphic"].gsub!(/^\//, 'http://127.0.0.1/')
           end
         end
       end
@@ -98,9 +99,12 @@ 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  }
+      # round extent coordinates
+      page["extent"].collect! {|coord| (coord * 100.0).round / 100.0  } unless page["extent"].nil?
       # add blank user strings if missing
       page["user_title"] = " " if page["user_title"].blank?
       page["user_comment"] = " " if page["user_comment"].blank?
@@ -109,15 +113,30 @@ 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
 
     logger.info request.parameters.to_yaml
 
-    if PRINT_URL.present?
+    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.yaml"
+      File.open(config_file, "w") { |file| file << print_config }
+
       temp = TMP_PREFIX + tempId.to_s + TMP_SUFFIX
       cmd = baseCmd + " --output=" + temp
       result = ""
@@ -141,8 +160,8 @@ class PrintController < ApplicationController
 
   def show
     output_format = params[:format]
+    type = nil
     if OUTPUT_FORMATS.include?(output_format)
-      temp = TMP_PREFIX + params[:id] + ".#{output_format}"
       case output_format
       when "pdf"
         type = 'application/x-pdf'
@@ -155,7 +174,25 @@ class PrintController < ApplicationController
       when "gif"
         type = 'image/gif'
       end
+    end
+    is_mapfish_print_id = (params[:id] =~ /^[0-9]+$/)
+    if is_mapfish_print_id
+      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"
+      else
+        logger.info "#{result.code}: #{result.body}"
+        render :nothing => true, :status => result.code
+      end
     end
   end
 
@@ -182,7 +219,7 @@ class PrintController < ApplicationController
 
   def cleanupTempFiles
     minTime = Time.now - TMP_PURGE_SECONDS;
-    OUTPUT_FORMATS.each do |output_format|
+    (OUTPUT_FORMATS + ["yaml"]).each do |output_format|
       Dir.glob(TMP_PREFIX + "*." + output_format).each do |path|
         if File.mtime(path) < minTime
           File.delete(path)
@@ -240,4 +277,59 @@ class PrintController < ApplicationController
     end
   end
 
+  # forward to JasperReport
+  def create_report(request)
+      report = request.parameters["report"]
+      call_params = {
+        :j_username => JASPER_USER,
+        :j_password => JASPER_PASSWORD
+      }
+      if request.parameters["pages"]
+        page = request.parameters["pages"].first
+        %w(scale rotation base_url user_title user_comment).each do |mfparam|
+          call_params[mfparam.upcase] = page[mfparam]
+        end
+        call_params[:MAP_BBOX] = page["extent"].join(',')
+        call_params[:MAP_CENTER] = page["center"].join(',')
+      end
+      request.parameters.each do |name, val|
+        if name =~ /^REP_/
+          call_params[name] = val
+        end
+      end
+      pdfid = Time.now.strftime("%Y%m%d%H%M%S") + rand.to_s[2..4] 
+      call_params['REP_PDFID'] = pdfid
+      report_url = "#{JASPER_URL}/#{report}.pdf?#{ call_params.to_param }"
+
+      begin
+        logger.info "Forward request: #{report_url}"
+        result = Net::HTTP.get_response(URI.parse(URI.decode(report_url)))
+        result["pdfid"] = pdfid
+     rescue => err
+        logger.info("#{err.class}: #{err.message}")
+        return nil
+      end
+     result
+  end
+
+  #Mapfish print comaptible report delivery
+  def call_report(request)
+      result = create_report(request)
+      if result.nil?
+        render :nothing => true, :status => 500
+        return
+      end
+
+      if result.kind_of? Net::HTTPSuccess
+        temp_id = SecureRandom.random_number(2**31)
+        temp = TMP_PREFIX + temp_id.to_s + TMP_SUFFIX
+        File.open(temp, 'w') {|f| f.write(result.body) }
+
+        render :json=>{ 'getURL' => url_for(:action=> 'show', :id=> temp_id) + ".pdf" }
+      else
+        logger.info "#{result.code}: #{result.body}"
+        render :nothing => true, :status => result.code
+      end
+  end
+
 end