gb_mapfish_appserver 0.0.2 → 0.0.3

data/README.md

@@ -29,7 +29,7 @@ Mapfish Appserver comes with the following out-of-the box features:
 Documentation
 -------------
 
-For more documentation see the [github.io/gb_mapfish_appserver](http://pka.github.io/gb_mapfish_appserver/)
+For more documentation see the [mapfish-appserver.github.io](http://mapfish-appserver.github.io/)
 
 Authors and License
 -------------------

data/app/controllers/apps_controller.rb

@@ -52,7 +52,7 @@ class AppsController < ApplicationController
 
     session[:map_ts] = Time.now # Used for checking access to non-public WMS
 
-    render :layout => false
+    render :action => @app, :layout => false
   end
 
 end

data/app/controllers/print_controller.rb

@@ -177,7 +177,7 @@ class PrintController < ApplicationController
   end
 
   def baseCmd
-    "java -cp #{File.dirname(__FILE__)}/../../lib/print/print-standalone.jar org.mapfish.print.ShellMapPrinter --config=#{@configFile}"
+    "java -cp #{GbMapfishPrint::PRINT_JAR} org.mapfish.print.ShellMapPrinter --config=#{@configFile}"
   end
 
   def cleanupTempFiles

data/app/controllers/print_controller.rb~

@@ -0,0 +1,243 @@
+#Mapfish print controller with access control and servlet call
+
+class PrintController < ApplicationController
+  require 'popen4'
+  begin
+    require 'RMagick'
+  rescue LoadError
+    ActionController::Base.logger.info "Couldn't find RMagick. Image export not supported"
+  end
+
+  skip_before_filter :verify_authenticity_token, :only => :create # allow /print/create with POST
+
+  caches_action :info
+
+  class JavaError < Exception
+    def initialize(cmd, message)
+      super(cmd+"\n"+message)
+    end
+  end
+
+  def initialize
+    @configFile = "#{Rails.root}/config/print.yml"
+  end
+
+  TMP_PREFIX = "/opt/geodata/tmp/mfPrintTempFile" #WARNING: use NFS for multi-node setups! TODO: external config
+  TMP_SUFFIX = ".pdf"
+  TMP_PURGE_SECONDS = 600
+
+  OUTPUT_FORMATS = ["pdf", "png", "jpg", "tif", "gif"]
+
+  def info
+    #if PRINT_URL.present?
+    #TODO:  call_servlet(request)
+    cmd = baseCmd + " --clientConfig"
+    result = ""
+    errors = ""
+    status = POpen4::popen4(cmd) do |stdout, stderr, stdin, pid|
+
+      result = stdout.readlines.join("\n")
+      errors = stderr.readlines.join("\n")
+    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
+        end
+      end
+    end
+  end
+
+  def create
+    cleanupTempFiles
+
+    accessible_topics = Topic.accessible_by(current_ability).collect{ |topic| topic.name }
+    layers_to_delete = []
+    request.parameters["layers"].each do |layer|
+      if layer["baseURL"] # WMS layers
+        topic = File.basename(URI.parse(layer["baseURL"]).path)
+        if accessible_topics.include?(topic)
+          # rewrite URL for local WMS, use CGI if layer filter is used
+          use_cgi = !layer["customParams"].nil? && layer["customParams"].any? { |param, value| param =~ LAYER_FILTER_REGEX }
+          layer["baseURL"] = rewrite_wms_uri(layer["baseURL"], use_cgi)
+          if layer["customParams"] #Set map_resolution for mapserver (MapFish print bug?)
+            layer["customParams"].delete("DPI")
+            layer["customParams"]["map_resolution"] = request.parameters["dpi"]
+          end
+          # For permission check in WMS controller: pass session as WMS request parameter
+          #layer["customParams"]["session"] =
+        else
+          # collect inaccessible layers for later removal
+          layers_to_delete << layer
+        end
+      end
+
+      if layer["baseURL"].nil? && layer["styles"] #Vector layers
+        layer["styles"].each_value do |style| #NoMethodError (undefined method `each_value' for [""]:Array):
+          if style["externalGraphic"]
+            style["externalGraphic"].gsub!(LOCAL_GRAPHICS_HOST, '127.0.0.1')
+            style["externalGraphic"].gsub!(/^https:/, 'http:')
+          end
+        end
+      end
+    end
+    # remove inaccessible layers
+    request.parameters["layers"] -= layers_to_delete
+
+    request.parameters["pages"].each do |page|
+      # round center coordinates
+      page["center"].collect! {|coord| (coord * 100.0).round / 100.0  }
+      # add blank user strings if missing
+      page["user_title"] = " " if page["user_title"].blank?
+      page["user_comment"] = " " if page["user_comment"].blank?
+      # base url
+      page["base_url"] = "#{request.protocol}#{request.host}"
+      # disclaimer
+      topic = Topic.accessible_by(current_ability).where(:name => page["topic"]).first
+      page["disclaimer"] = topic.nil? ? Topic.default_print_disclaimer : topic.print_disclaimer
+    end
+
+    logger.info request.parameters.to_yaml
+
+    if PRINT_URL.present?
+      call_servlet(request)
+    else
+      #print-standalone
+      tempId = SecureRandom.random_number(2**31)
+      temp = TMP_PREFIX + tempId.to_s + TMP_SUFFIX
+      cmd = baseCmd + " --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"], request.parameters["outputFormat"])
+      end
+    end
+  end
+
+  def show
+    output_format = params[:format]
+    if OUTPUT_FORMATS.include?(output_format)
+      temp = TMP_PREFIX + params[:id] + ".#{output_format}"
+      case output_format
+      when "pdf"
+        type = 'application/x-pdf'
+      when "png"
+        type = 'image/png'
+      when "jpg"
+        type = 'image/jpeg'
+      when "tif"
+        type = 'image/tiff'
+      when "gif"
+        type = 'image/gif'
+      end
+      send_file temp, :type => type, :disposition => 'attachment', :filename => params[:id] + ".#{output_format}"
+    end
+  end
+
+  protected
+
+  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
+    # get topic from layer URL
+    uri = URI.parse(url)
+    localwms = LOCAL_WMS.any? { |ref| uri.host =~ ref }
+    if localwms
+      topic = File.basename(uri.path)
+      localhost = (@zone == ZONE_INTRANET) ? '127.0.0.1' : 'localhost'
+      out = "http://#{localhost}#{use_cgi ? MAPSERV_CGI_URL :  MAPSERV_URL}?MAP=#{MAPPATH}/#{@zone}/#{topic}.map&"
+      #out = "http://#{localhost}:#{request.port}/wms/#{topic}"
+    end
+    out
+  end
+
+  def baseCmd
+    "java -cp #{GbMapfishPrint::PRINT_JAR} org.mapfish.print.ShellMapPrinter --config=#{@configFile}"
+  end
+
+  def cleanupTempFiles
+    minTime = Time.now - TMP_PURGE_SECONDS;
+    OUTPUT_FORMATS.each do |output_format|
+      Dir.glob(TMP_PREFIX + "*." + output_format).each do |path|
+        if File.mtime(path) < minTime
+          File.delete(path)
+        end
+      end
+    end
+  end
+
+  def call_servlet(request)
+    url = URI.parse(URI.decode(PRINT_URL))
+    logger.info "Forward request: #{PRINT_URL}"
+    printspec = request.parameters.to_json
+
+    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
+      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, 'w') {|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"
+
+    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)
+    end
+
+    respond_to do |format|
+      format.json do
+        render :json=>{ 'getURL' => url_for(:action=>'show', :id=>temp_id) + temp_suffix }
+      end
+    end
+  end
+
+end

data/app/controllers/topics_controller.rb

@@ -6,8 +6,12 @@ class TopicsController < ApplicationController
   }
 
   def index
-    params[:gbapp] = 'gbzh' if params[:gbapp] == 'default' #FIXME
     @app = Gbapplication.find_by_name(params[:gbapp]) if params[:gbapp]
+    if @app.nil?
+      logger.error "Gbapplication '#{params[:gbapp]}' not found"
+      head :bad_request
+      return
+    end
 
     respond_to do |format|
       format.json do

data/app/models/geo_model.rb

@@ -41,7 +41,7 @@ class GeoModel < ActiveRecord::Base
   end
 
   def bbox
-    envelope = GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(extent).envelope
+    envelope = GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(extent).envelope #TODO: replace with rgeo
     [envelope.lower_corner.x, envelope.lower_corner.y, envelope.upper_corner.x, envelope.upper_corner.y]
   end
 

data/app/models/layer.rb

@@ -12,6 +12,10 @@ class Layer < ActiveRecord::Base
   scope :defaultorder, order(:topic_name, :name)
   scope :unused, includes(:topics_layers).where('topics_layers.layer_id IS NULL')
 
+  #Namespace for run-time geo classes
+  module Geo
+  end
+
   # Enum for RailsAdmin form (causes exception in name search)
   #def sublayer_group_enum
   #  SublayerGroup.all.collect {|p| [ p.name, p.id ] }

data/app/models/layer.rb~

@@ -0,0 +1,283 @@
+class Layer < ActiveRecord::Base
+  has_many :topics_layers, :dependent => :destroy
+  has_many :topics, :through => :topics_layers
+  belongs_to :sublayer_group
+
+  attr_protected []
+
+  validates :name, :presence => true, :uniqueness => {:scope => :topic_name}
+  validates_format_of :name, :with => /\A[A-Za-z][\w-]*\Z/
+  validates_format_of :topic_name, :with => /\A[\w-]+\Z/
+
+  scope :defaultorder, order(:topic_name, :name)
+  scope :unused, includes(:topics_layers).where('topics_layers.layer_id IS NULL')
+
+  #Namespace for run-time geo classes
+  module Geo
+  end
+
+  # Enum for RailsAdmin form (causes exception in name search)
+  #def sublayer_group_enum
+  #  SublayerGroup.all.collect {|p| [ p.name, p.id ] }
+  #end
+
+  #Structure for Topic selection
+  def self.list(ability, layer_type, topic_name)
+    topic = Topic.accessible_by(ability).includes(:layers).where(:name => topic_name).first
+    layers = topic.nil? ? [] : topic.layers.accessible_by(ability).all
+    topic_layers = topic.nil? ? [] : topic.topics_layers.select {|tl| layers.include?(tl.layer) }
+    wms_layer_list(ability, topic, topic_layers)
+  end
+
+  def self.wms_layer_list(ability, topic, topic_layers)
+    wms_layers = topic_layers.collect do |topic_layer|
+      layer = topic_layer.layer
+      {
+        "id" => topic_layer.id,
+        "layername"=> layer.name,
+        "topic"=> topic.name,
+        "groupname" => layer.sublayer_group.try(:name),
+        "toclayertitle"=> layer.title,
+        "leglayertitle"=> layer.title,
+        "showscale"=> "true",
+        "minscale"=> layer.minscale,
+        "maxscale"=> layer.maxscale,
+        "wms_sort"=> topic_layer.wms_sort, # MapServer layer order
+        #"leg_sort"=> topic_layer.leg_sort, # Not used client side (Legend sort is in defined in HTML). Query result order. 
+        #"query_sort"=> topic_layer.leg_sort, # deprecated
+        "toc_sort"=> topic_layer.toc_sort, # Layer tree order
+        "wms"=> "false",
+        "visini"=> topic_layer.visini,
+        "visuser"=> topic_layer.visini, #User visibility is in request_state
+        "showtoc"=> "true",
+        "editeable"=> ability.can?(:edit, layer)
+      }
+    end
+    {
+      "success" => true,
+      "messageProperty"=> {"topic"=> topic.name, "legendtitle"=> "Legende", "legendraster"=> "true"},
+      "results"=> wms_layers.size,
+      "wmslayers"=> wms_layers
+    }
+  end
+
+  def full_name
+    "#{topic_name}-#{name}".downcase
+  end
+
+  def feature_class
+    fc = "Geo::#{feature_class_name}".constantize rescue nil #Geo.const_defined?(feature_class_name) seems not to work here
+    fc ||= Geo.module_eval <<EOS
+      class #{feature_class_name} < GeoModel
+        self.table_name = '#{table}'
+        self.primary_key = '#{pkey}'
+
+        self
+      end
+EOS
+  end
+
+  def feature_class_name
+    table.camelize.singularize
+  end
+
+  def geometry_column
+    feature_class.try(:geometry_column)
+  end
+
+  def attribute(name)
+    if feature_class.nil?
+      ::Attribute.new(self, name)
+    else
+      @attrs ||= feature_class.columns.inject({}) do |h, c|
+        #logger.info "************************* feature_class column c #{c.inspect}"
+        h[c.name] = ::Attribute.new(self, c.name)
+        h
+      end
+      @attrs[name] ||= ::Attribute.new(self, name) #Add ad-hoc Attr. for calculated columns (e.g. custom SQL in query fields)
+    end
+    #logger.info "************************* Attribute for name '#{name}': #{@attrs[name].inspect}"
+  end
+
+  #def filtered(ability)
+  #  feature_class.where(ability.resource_access_filter(self))
+  #end
+
+  def query_fields(ability)
+    return '' if feature_class.nil?
+    area_field = "ST_Area(#{geometry_column.name}) AS area"
+    #TODO: measure -> Measure(geometry_column, lat, lon)
+    ([pkey]+ident_fields_for(ability)+[feature_class.extent_field, area_field]).join(',')
+  end
+
+  def ident_fields_for(ability)
+    #attributes.accessible_by(ability) & fields
+    #logger.info "************************* fields layer #{name}: #{ident_fields}"
+    #logger.info "************************* roles: #{ability.roles.collect(&:name).join(',')}"
+    allowed_fields = ident_fields.split(',').select { |f| ability.can?(:show, attribute(f))  }
+    #logger.info "************************* ident_fields layer #{name}: #{allowed_fields.inspect}"
+    allowed_fields
+  end
+
+  def query(ability, query_topic, searchbbox)
+    if feature_class
+      begin
+        #query_topic: {... customQueries: {<layername>: <query_method> }
+        #e.g.
+        #{"queryTopics":[{
+        #   "level":"main","topic":"Lageklassen2011ZH","divCls":"legmain","layers":"seen,lageklassen-2011-flaechen,grenzen,gemeindegrenzen,bezirkslabels"
+        #   customQueries: {'seen': 'tiefen_statistik'},
+        #   customParams: {'tiefe': 25}
+        #  }]}
+        custom_query_method = query_topic['customQueries'][name] rescue nil
+        logger.debug "******** #{feature_class} ***************************************************"
+        features = if custom_query_method
+          logger.debug "Custom query on layer #{name}: #{query_topic.inspect}"
+          feature_class.send(custom_query_method, self, query_topic, searchbbox) 
+        else
+          logger.debug "Identify on layer #{name} with query fields #{query_fields(ability)} at #{searchbbox.inspect}"
+          feature_class.identify_filter(searchbbox, searchdistance).select(query_fields(ability)).all
+        end
+        logger.debug "Number of features: #{features.size}"
+        # calculate bbox of all features
+        unless features.empty?
+          envelope = GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(features.first['extent']).envelope
+          features.each do |feature|
+            next if feature == features.first
+            envelope.extend!(GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(feature['extent']).envelope)
+          end
+          bbox = [envelope.lower_corner.x, envelope.lower_corner.y, envelope.upper_corner.x, envelope.upper_corner.y]
+        end
+      rescue Exception => e
+        features = "Table: <b>#{table}</b><br/>Exception: #{e}<br/>query fields: #{query_fields(ability)}<br/>db fields: #{feature_class.column_names.join(',')}<br/>missing: <font color='red'>#{(query_fields(ability).split(',') - feature_class.column_names).join(', ')}</font><br/><br/>"
+        logger.info "Identfy error on layer #{name} #{features}"
+      end
+      [self, features, bbox]
+    else
+      logger.warn "Table for layer #{name} not found. (Table name: '#{table}')"
+      nil
+    end
+  end
+
+  # Partial for identify result
+  def info_fname
+    "_#{name}_info.html.erb"
+  end
+
+  def info_file
+    File.join(Rails.root, 'app', 'views', 'layers', 'custom', topic_name.downcase, info_fname)
+  end
+
+  def info_file_auto
+    File.join(Rails.root, 'app', 'views', 'layers', 'custom', topic_name.downcase, 'auto', info_fname)
+  end
+
+  # ignore auto file if empty file exists
+  def info_file_empty
+    File.join(Rails.root, 'app', 'views', 'layers', 'custom', topic_name.downcase, "_#{name}_info_leer.html.erb")
+  end
+
+  def info
+    @info ||= begin
+      if File.exist?(info_file)
+        "layers/custom/#{topic_name.downcase}/#{info_fname[1..-10]}"
+      elsif !File.exist?(info_file_empty) && File.exist?(info_file_auto)
+        "layers/custom/#{topic_name.downcase}/auto/#{info_fname[1..-10]}"
+      else
+        nil
+      end
+    end
+  end
+
+  def infotext(count)
+    count > 0 ? "resultcount_p" : "resultcount_s"
+  end
+
+  def infotab
+    #  INFOLAYOUT=0^1^2^3^4^5^6^7  *** Wenn der Parameter = 1 ist, wird ein leerer String �bergeben.
+    #                              *** Wenn der Parameter = 0 ist, wird der entsprechende Teil weggelassen wenn m�glich
+    #
+    #  LayoutString(0) = "Im Umkreis von <EM>xUmkreisx</EM> Meter(n) wurde <EM>xAnzahlx</EM> Datensatz gefunden.<br><br>"
+    #  LayoutString(1) = "Im Umkreis von <EM>xUmkreisx</EM> Meter(n) wurden <EM>xAnzahlx</EM> Datens&aumltze gefunden.<br><br>"
+    #  LayoutString(2) = "layer"
+    #  LayoutString(3) = "infotext"
+    #  LayoutString(4) = "infotab"
+    #  LayoutString(5) = "tabtitle"
+    #  LayoutString(6) = "tabcell"
+    #  LayoutString(7) = "2"  ( If = "" Then 1 Tabellenzeile pro Record [z.B. "1" oder ""], else [z.B. "2"] 1 Zeile pro Feld)
+
+    "infotable_horizontal"
+  end
+
+  def legend_fname
+    "_#{name}_legend.html.erb"
+  end
+
+  def legend_file
+    File.join(Rails.root, 'app', 'views', 'layers', 'custom', topic_name.downcase, legend_fname)
+  end
+
+  def legend_file_auto
+    File.join(Rails.root, 'app', 'views', 'layers', 'custom', topic_name.downcase, 'auto', legend_fname)
+  end
+
+  def legend
+    @legend ||= begin
+      if File.exist?(legend_file)
+        "layers/custom/#{topic_name.downcase}/#{legend_fname[1..-10]}"
+      elsif File.exist?(legend_file_auto)
+        "layers/custom/#{topic_name.downcase}/auto/#{legend_fname[1..-10]}"
+      else
+        nil
+      end
+    end
+  end
+
+  def quoted_wms_layers
+    wms_layers.split(',').collect {|l| %Q<"#{l}"> }.join(',')
+  end
+
+  DEFAULT_SELECTION_STYLE = {
+    'POLYGON' =>
+      '<PolygonSymbolizer>'+
+        '<Fill>'+
+          '<CssParameter name="fill">#ff0090</CssParameter>'+
+          '<CssParameter name="fill-opacity">0.6</CssParameter>'+
+        '</Fill>'+
+        '<Stroke>'+
+          '<CssParameter name="stroke">#ff0090</CssParameter>'+
+          '<CssParameter name="stroke-width">2.00</CssParameter>'+
+        '</Stroke>'+
+      '</PolygonSymbolizer>',
+    'LINESTRING' =>
+      '<LineSymbolizer>'+
+        '<Stroke>'+
+          '<CssParameter name="stroke">#ff0090</CssParameter>'+
+          '<CssParameter name="stroke-width">10.00</CssParameter>'+
+        '</Stroke>'+
+      '</LineSymbolizer>',
+    'POINT' =>
+      '<PointSymbolizer>'+
+         '<Graphic>'+
+           '<Mark>'+
+             '<WellKnownName>circle</WellKnownName>'+
+             '<Fill>'+
+               '<CssParameter name="fill">#ff0090</CssParameter>'+
+             '</Fill>'+
+           '</Mark>'+
+           '<Size>45.0</Size>'+
+         '</Graphic>'+
+       '</PointSymbolizer>'
+  }
+
+  def selection_symbolizer
+    if selection_style.blank?
+      gtyp = feature_class.geometry_type.sub(/^MULTI/, '').sub(/M$/, '') #MULTIPOINTM -> POINT 
+      logger.error "Unsupported selection geometry type #{feature_class.geometry_type}" unless DEFAULT_SELECTION_STYLE.has_key?(gtyp)
+      DEFAULT_SELECTION_STYLE[gtyp] || ''
+    else
+      selection_style
+    end
+  end
+
+end

data/config/initializers/rgeo.rb

@@ -1 +1,3 @@
-#::RGeo::ActiveRecord::GeometryMixin.set_json_generator(:geojson)
+require 'rgeo-activerecord' # required by activerecord-postgis-adapter
+
+::RGeo::ActiveRecord::GeometryMixin.set_json_generator(:geojson)

data/lib/gb_mapfish_appserver/engine.rb

@@ -7,3 +7,8 @@ module GbMapfishAppserver
     engine_name "mapfish"
   end
 end
+
+SearchRule = Struct.new(:model, :fields, :alias_fields)
+
+LocateRule = Struct.new(:model, :layer, :search_field)
+

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

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

@@ -37,7 +37,7 @@ module Mapfish
           ENV['DEFAULT_SITE'] = options["default-site-name"]
           ENV['ADMIN_PWD'] = SecureRandom.hex(4)
           begin
-            MapfishAppserver::Engine.load_seed
+            GbMapfishAppserver::Engine.load_seed
             puts "Generated user for administraton"
             puts "User: 'admin' - Password: '#{ENV['ADMIN_PWD']}'"
           rescue
@@ -56,6 +56,16 @@ module Mapfish
         end
       end
 
+      def add_search_rules_initializer
+        path = "#{Rails.root}/config/initializers/search_rules.rb"
+        if File.exists?(path)
+          puts "Skipping config/initializers/search_rules.rb creation, as file already exists!"
+        else
+          puts "Adding search_rules initializer (config/initializers/search_rules.rb)..."
+          template "search_rules.rb", path
+        end
+      end
+
       def rm_application_controller
         remove_file "#{Rails.root}/app/controllers/application_controller.rb"
       end

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

@@ -23,8 +23,3 @@ DEFAULT_Y = 252000
 
 # regex for WMS parameters to detect if layer filter is used
 LAYER_FILTER_REGEX = /^filter_.+$/i
-
-#Load models in models/geo/ (why not automatically loaded?)
-Dir[File.join(Rails.root, "app", "models", "geo", "*.rb")].each do |geomodel|
-  require_dependency geomodel
-end

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

@@ -0,0 +1,5 @@
+SEARCHRULES = {
+}
+
+LOCATERULES = {
+}

data/lib/tasks/mapfile.rake

@@ -3,15 +3,16 @@ namespace :mapfile do
   require 'rubygems'
   require 'iconv'
 
-  desc "Create a topic from a mapfile. MAPFILE=file SITE=host"
+  desc "Create a topic from a mapfile. MAPFILE=file SITE=host DBONLY=false"
   task :import_topic => :environment do
     mapfile = ENV['MAPFILE']
     site = ENV['SITE'] || SITE_DEFAULT #Use empty string for unpublished map
+    dbonly = ENV['DBONLY'] || false
     if mapfile.nil?
       puts "Error: Missing argument MAPFILE"
     else
       import = MapfileImport.new(mapfile, site)
-      import.import
+      import.import(dbonly)
     end
   end
 
@@ -40,7 +41,7 @@ namespace :mapfile do
       @ic = Iconv.new('UTF-8','LATIN1')
     end
 
-    def import
+    def import(dbonly = false)
       topic = Topic.find_or_create_by_name(@map.name)
       topic.title = @map.web.metadata['ows_title'] || @map.web.metadata['wms_title']
       puts "Importing topic '#{topic.name}' with title '#{topic.title}'"
@@ -133,73 +134,75 @@ namespace :mapfile do
 
         layer.save!
 
-        #Info & Legend
-        mkdir_p File.dirname(layer.info_file_auto)
+        unless dbonly
+          #Info & Legend
+          mkdir_p File.dirname(layer.info_file_auto)
 
-        if queryable
-          if mlayer.type == MS_LAYER_RASTER || mlayer.type == MS_LAYER_ANNOTATION
-            puts "Warning: Raster/Anntotation layer '#{layer.name}' is queryable (TEMPLATE #{mlayer.template})"
-          end
-          #puts "Creating #{layer.info_file_auto}"
-          fields = layer.ident_fields.split(',') rescue []
-          aliases = if fields.empty?
-            puts "Warning: Query layer '#{layer.name}' has no attribute definition (wms_include_items)"
-            []
-          else
-            layer.alias_fields.split(',')
-          end
-          infotab_template = "_infotable_auto"
-          template = File.open(File.join(File.dirname(__FILE__), 'templates', "#{infotab_template}.html.erb")).read
-          template = ERB.new(template, nil, '<>')
-          File.open(layer.info_file_auto, 'w') do |file|
-            file << template.result(binding)
+          if queryable
+            if mlayer.type == MS_LAYER_RASTER || mlayer.type == MS_LAYER_ANNOTATION
+              puts "Warning: Raster/Anntotation layer '#{layer.name}' is queryable (TEMPLATE #{mlayer.template})"
+            end
+            #puts "Creating #{layer.info_file_auto}"
+            fields = layer.ident_fields.split(',') rescue []
+            aliases = if fields.empty?
+              puts "Warning: Query layer '#{layer.name}' has no attribute definition (wms_include_items)"
+              []
+            else
+              layer.alias_fields.split(',')
+            end
+            infotab_template = "_infotable_auto"
+            template = File.open(File.join(File.dirname(__FILE__), 'templates', "#{infotab_template}.html.erb")).read
+            template = ERB.new(template, nil, '<>')
+            File.open(layer.info_file_auto, 'w') do |file|
+              file << template.result(binding)
+            end
           end
-        end
 
-        # Layer legend
-        legend_icon_path = File.join(Rails.root, 'public', 'images', 'custom', topic_name.downcase)
-        mkdir_p legend_icon_path
-        if mlayer.type != MS_LAYER_RASTER && mlayer.type != MS_LAYER_ANNOTATION
-          #puts "Creating #{layer.legend_file_auto}"
-          File.open(layer.legend_file_auto, 'w') do |file|
-            file << "<table class='legtab'>\n"
-            mlayer.classes.each_with_index do |lclass, i|
-              #Symbol size for Polygon and Line layers
-              width = 23
-              height = 13
-              filename = nil
-              if mlayer.type == MS_LAYER_POINT
-                style = lclass.styles.first
-                if style.nil?
-                  puts "Warning: Missing style in layer '#{layer.name}'"
-                else
-                  symbol = @map.symbolset.symbols[style.symbol]
-                  if style.size > 0
-                    width = height = style.size.to_i+1
-                  end
-                  if symbol.imagepath
-                    filename = symbol.imagepath
+          # Layer legend
+          legend_icon_path = File.join(Rails.root, 'public', 'images', 'custom', topic_name.downcase)
+          mkdir_p legend_icon_path
+          if mlayer.type != MS_LAYER_RASTER && mlayer.type != MS_LAYER_ANNOTATION
+            #puts "Creating #{layer.legend_file_auto}"
+            File.open(layer.legend_file_auto, 'w') do |file|
+              file << "<table class='legtab'>\n"
+              mlayer.classes.each_with_index do |lclass, i|
+                #Symbol size for Polygon and Line layers
+                width = 23
+                height = 13
+                filename = nil
+                if mlayer.type == MS_LAYER_POINT
+                  style = lclass.styles.first
+                  if style.nil?
+                    puts "Warning: Missing style in layer '#{layer.name}'"
+                  else
+                    symbol = @map.symbolset.symbols[style.symbol]
+                    if style.size > 0
+                      width = height = style.size.to_i+1
+                    end
+                    if symbol.imagepath
+                      filename = symbol.imagepath
+                    end
                   end
                 end
-              end
-              if filename.nil?
-                begin
-                  icon = lclass.createLegendIcon(@map, mlayer, width, height)
-                  filename = "#{layer.name}#{i}.png"
-                  icon.save(File.join(legend_icon_path, filename))
-                rescue Exception => e
-                  puts "Warning: createLegendIcon for class '#{lclass.name}' failed: #{e}"
+                if filename.nil?
+                  begin
+                    icon = lclass.createLegendIcon(@map, mlayer, width, height)
+                    filename = "#{layer.name}#{i}.png"
+                    icon.save(File.join(legend_icon_path, filename))
+                  rescue Exception => e
+                    puts "Warning: createLegendIcon for class '#{lclass.name}' failed: #{e}"
+                  end
+                else
+                  symfile = File.join(@map.mappath, filename)
+                  filename = File.basename(filename)
+                  cp(symfile, File.join(legend_icon_path, filename))
                 end
-              else
-                symfile = File.join(@map.mappath, filename)
-                filename = File.basename(filename)
-                cp(symfile, File.join(legend_icon_path, filename))
+                sympath ="/images/custom/#{topic_name.downcase}/#{filename}"
+                legtext = lclass.name.force_encoding('utf-8').encode || lclass.getExpressionString
+                file << "  <%= leg_tab_row('#{legtext}', '#{sympath}') %>\n"
               end
-              sympath ="/images/custom/#{topic_name.downcase}/#{filename}"
-              legtext = lclass.name || lclass.getExpressionString
-              file << "  <%= leg_tab_row('#{legtext}', '#{sympath}') %>\n"
+              file << "</table>\n"
             end
-            file << "</table>\n"
           end
         end
 
@@ -213,20 +216,22 @@ namespace :mapfile do
         tl.save!
       end
 
-      #Legend Template
-      mkdir_p File.dirname(topic.legend_file_auto)
-      MapfileImport.gen_topic_legend(topic)
+      unless dbonly
+        #Legend Template
+        mkdir_p File.dirname(topic.legend_file_auto)
+        MapfileImport.gen_topic_legend(topic)
 
-      #Info Header Template
-      #puts "Creating #{topic.info_header_file}"
-      touch(topic.info_header_file)
+        #Info Header Template
+        #puts "Creating #{topic.info_header_file}"
+        touch(topic.info_header_file)
 
-      #Topic icon
-      topic_icon = File.join(Rails.root, 'public', 'images', 'custom', topic.icon_fname)
-      unless File.exist?(topic_icon)
-        mkdir_p File.dirname(topic_icon)
-        cp(File.join(File.dirname(__FILE__), 'templates', 'themekl-default.gif'),
-          topic_icon)
+        #Topic icon
+        topic_icon = File.join(Rails.root, 'public', 'images', 'custom', topic.icon_fname)
+        unless File.exist?(topic_icon)
+          mkdir_p File.dirname(topic_icon)
+          cp(File.join(File.dirname(__FILE__), 'templates', 'themekl-default.gif'),
+            topic_icon)
+        end
       end
 
       unless @site.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17509680 !ruby/object:Gem::Requirement
+  requirement: &23143380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *17509680
+  version_requirements: *23143380
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17509260 !ruby/object:Gem::Requirement
+  requirement: &23142780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17509260
+  version_requirements: *23142780
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: &17508720 !ruby/object:Gem::Requirement
+  requirement: &23139880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *17508720
+  version_requirements: *23139880
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &17508220 !ruby/object:Gem::Requirement
+  requirement: &23139360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *17508220
+  version_requirements: *23139360
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &17507760 !ruby/object:Gem::Requirement
+  requirement: &23138860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *17507760
+  version_requirements: *23138860
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &17523680 !ruby/object:Gem::Requirement
+  requirement: &23154640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *17523680
+  version_requirements: *23154640
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &17523300 !ruby/object:Gem::Requirement
+  requirement: &23154220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17523300
+  version_requirements: *23154220
+- !ruby/object:Gem::Dependency
+  name: GeoRuby
+  requirement: &23153320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *23153320
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &17522760 !ruby/object:Gem::Requirement
+  requirement: &23152540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +109,10 @@ dependencies:
         version: 0.3.20
   type: :runtime
   prerelease: false
-  version_requirements: *17522760
+  version_requirements: *23152540
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: &17522260 !ruby/object:Gem::Requirement
+  requirement: &23152040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +120,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *17522260
+  version_requirements: *23152040
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &17521800 !ruby/object:Gem::Requirement
+  requirement: &23151580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +131,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *17521800
+  version_requirements: *23151580
 - !ruby/object:Gem::Dependency
   name: activerecord-postgis-adapter
-  requirement: &17521340 !ruby/object:Gem::Requirement
+  requirement: &23151060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,7 +142,7 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *17521340
+  version_requirements: *23151060
 description: Mapfish Appserver is a framework for web mapping applications using OGC
   standards and the Mapfish protocol.
 email:
@@ -168,9 +179,9 @@ files:
 - app/views/groups_users/_form.html.erb
 - app/views/groups_users/show.html.erb
 - app/views/apps/_request_state.html.erb
-- app/views/apps/show.html.erb
 - app/views/layouts/embedded.html.erb
 - app/views/layouts/application.html.erb
+- app/controllers/print_controller.rb~
 - app/controllers/registrations_controller.rb
 - app/controllers/categories_controller.rb
 - app/controllers/application_controller.rb
@@ -196,6 +207,7 @@ files:
 - app/models/gbapplication.rb
 - app/models/geo_model.rb
 - app/models/category.rb
+- app/models/layer.rb~
 - app/models/wfs.rb
 - app/models/group.rb
 - app/models/user.rb
@@ -222,7 +234,6 @@ files:
 - config/initializers/devise.rb
 - config/initializers/geodb.rb
 - config/initializers/rails_admin.rb
-- config/initializers/search_rules.rb
 - config/initializers/rgeo.rb
 - config/routes.rb
 - db/seeds.rb
@@ -240,6 +251,7 @@ files:
 - lib/generators/mapfish/viewer/templates/viewer.html.erb
 - lib/generators/mapfish/install/install_generator.rb
 - lib/generators/mapfish/install/templates/print.yml
+- lib/generators/mapfish/install/templates/search_rules.rb
 - lib/generators/mapfish/install/templates/sencha/workspace/sencha.cfg
 - lib/generators/mapfish/install/templates/sencha/workspace/plugin.xml
 - lib/generators/mapfish/install/templates/geodatabase.yml
@@ -4656,12 +4668,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1722996203916667069
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1722996203916667069
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11

data/app/views/apps/show.html.erb

@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>GIS-Browser</title>
-    <base href="<%= request.protocol %><%= request.host %><%= request.port_string %>/apps/<%= @app %>/" />
-    <link rel="stylesheet" type="text/css" href="resources/css/cdzh/app.css"/>
-    <link rel="stylesheet" type="text/css" href="/lib/GbZh/css/gbzh.css"/>
-    <link rel="stylesheet" type="text/css" href="/lib/GbZh/css/general.css"/>
-    <script type="text/javascript" src="lib/openlayers/OpenLayers.js"></script>
-    <script type="text/javascript" src="all-classes.js"></script>
-    <%= render :partial => 'request_state' %>
-    <script type="text/javascript" src="/lib/openlayers/lib/OpenLayers/Control/ArcIntersection.js"></script>
-    <script type="text/javascript" src="/lib/openlayers/lib/OpenLayers/Control/OrthogonalLines.js"></script>
-    <script type="text/javascript" src="/lib/proj4js/lib/proj4js-compressed.js"></script>
-    <script type="text/javascript" src="/lib/proj4js/lib/defs/EPSG21781.js"></script>
-    <script type="text/javascript" src="locale/gb41-lang-<%= I18n.locale %>.js"></script>
-    <%= csrf_meta_tags %>
-</head>
-<body>
-<noscript>Bitte aktivieren Sie Javascript und Cookies, um diese Applikation zu nutzen!</noscript>
-</body>
-</html>

data/config/initializers/search_rules.rb

@@ -1,3 +0,0 @@
-SearchRule = Struct.new(:model, :fields, :alias_fields)
-
-LocateRule = Struct.new(:model, :layer, :search_field)