gb_mapfish_appserver 0.0.3 → 0.0.4

data/app/models/layer.rb

@@ -23,10 +23,12 @@ class Layer < ActiveRecord::Base
 
   #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)
+    ActiveRecord::Base.silence do
+      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
   end
 
   def self.wms_layer_list(ability, topic, topic_layers)
@@ -105,21 +107,20 @@ EOS
 
   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(',')
+    ([pkey]+ident_fields_for(ability)+[feature_class.extent_field, feature_class.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))  }
+    fields = (ident_fields || pkey).split(',')
+    allowed_fields = fields.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)
+  def query(ability, query_topic, searchgeo)
     if feature_class
       begin
         #query_topic: {... customQueries: {<layername>: <query_method> }
@@ -132,11 +133,14 @@ EOS
         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) 
+          logger.debug "*** Custom query on layer #{name}: #{query_topic.inspect}"
+          feature_class.send(custom_query_method, self, query_topic, searchgeo) 
+        elsif feature_class.respond_to?(:identify_query)
+          logger.debug "*** Custom identify_query on layer #{name}"
+          feature_class.identify_query(searchgeo, searchdistance)
         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
+          logger.debug "*** Identify on layer #{name} with query fields #{query_fields(ability)} at #{searchgeo.inspect}"
+          feature_class.identify_filter(searchgeo, searchdistance).select(query_fields(ability)).all
         end
         logger.debug "Number of features: #{features.size}"
         # calculate bbox of all features
@@ -150,7 +154,7 @@ EOS
         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}"
+        logger.info "Identify error on layer #{name} #{features}"
       end
       [self, features, bbox]
     else

data/app/models/permission.rb

@@ -45,13 +45,15 @@ class Permission < ActiveRecord::Base
     end
 
     def role_can?(role_id, action, resource)
-      can = if has_resource_list?
-        permitted_resources(role_id, action).include?(resource)
-      else
-        permitted?(resource, permissions(role_id, action))
+      ActiveRecord::Base.silence do
+        can = if has_resource_list?
+          permitted_resources(role_id, action).include?(resource)
+        else
+          permitted?(resource, permissions(role_id, action))
+        end
+        #Rails.logger.debug ">>>>>>>>>>>>>>>>>> role_can? role_id: #{role_id}, action: #{action}, resource: #{resource.name} -> #{can}"
+        can
       end
-      Rails.logger.debug ">>>>>>>>>>>>>>>>>> role_can? role_id: #{role_id}, action: #{action}, resource: #{resource.name} -> #{can}"
-      can
     end
 
     def roles_permissions(roles, action, resource = nil)
@@ -69,16 +71,18 @@ class Permission < ActiveRecord::Base
     end
 
     def add_ability(ability, roles)
-      actions.each do |action|
-        if has_resource_list?
-          ids = Rails.cache.fetch("permitted_resource_ids-#{action}-#{@resource_type_name}-roles-#{roles.collect(&:id).join(',')}") do
-            permitted_resource_ids(roles, action)
-          end
-          Rails.logger.debug ">>>>>>>>>>>> permitted_resource_ids with roles #{roles.collect(&:name).join(',')} can? #{action} #{@resource_type_name}: #{ids.inspect}"
-          ability.can(action, @klass, :id => ids) unless ids.empty?
-        else
-          ability.can(action, @klass) do |attr|
-            roles_can?(roles, action, attr)
+      ActiveRecord::Base.silence do
+        actions.each do |action|
+          if has_resource_list?
+            ids = Rails.cache.fetch("permitted_resource_ids-#{action}-#{@resource_type_name}-roles-#{roles.collect(&:id).join(',')}") do
+              permitted_resource_ids(roles, action)
+            end
+            #Rails.logger.debug ">>>>>>>>>>>> permitted_resource_ids with roles #{roles.collect(&:name).join(',')} can? #{action} #{@resource_type_name}: #{ids.inspect}"
+            ability.can(action, @klass, :id => ids) unless ids.empty?
+          else
+            ability.can(action, @klass) do |attr|
+              roles_can?(roles, action, attr)
+            end
           end
         end
       end
@@ -101,8 +105,8 @@ class Permission < ActiveRecord::Base
     #All resource permissionsfor a given role_id + action
     def permitted_resources(role_id, action)
       permissions = permissions(role_id, action)
-      resources.select do
-        |r| permitted?(r, permissions)
+      resources.select do |r|
+        permitted?(r, permissions)
       end
     end
 

data/app/models/search_model.rb

@@ -1,5 +1,4 @@
 class SearchModel < GeoModel
-  establish_connection(GEODB)
 
   LOCATE_MAX_COUNT = 50
 
@@ -23,6 +22,10 @@ class SearchModel < GeoModel
     nil
   end
 
+  def self.selection_scalerange
+    nil
+  end
+
   #Generic location search with one search field
   def self.layer_locate(layer, search_field, locations)
     feature_class = layer.feature_class
@@ -31,7 +34,7 @@ class SearchModel < GeoModel
 
   # "261,AU4998;261,AU4999" -> [["261","AU4998"],["261","AU4999"]]
   def self.search_locations(param)
-    locations = param.split(';')
+    locations = param.split('$')
     locations.collect {|l| l.split(',') }
   end
 

data/app/models/tool.rb

@@ -3,7 +3,7 @@ class Tool
 
   ALL = ['LineMeasureTool', 'AreaMeasureTool',
     'PrevTool', 'NextTool', 'LinkTool', 'PrintTool',
-    'ExportTool'] #, 'EditTool'
+    'ExportTool', 'SelectTool'] #, 'EditTool'
 
   validates_presence_of :topic, :name
 

data/app/models/topic.rb

@@ -38,53 +38,55 @@ class Topic < ActiveRecord::Base
   #Structure for Topic selection
   def self.list(app, current_ability, zone, wms_host)
     topics = []
-    app.gbapplications_categories.includes(:category).each do |gbapplications_category|
-      category = gbapplications_category.category
-      unless category.nil?
-        category_topics = category.topics.accessible_by(current_ability).select(
-          'topics.*,categories_topics.sort AS categories_topics_sort')
-        topics += category_topics.collect do |topic|
-          subtopics = category_topics.select{|t| t.parent_id == topic.id}.collect do |subtopic|
+    ActiveRecord::Base.silence do
+      app.gbapplications_categories.includes(:category).each do |gbapplications_category|
+        category = gbapplications_category.category
+        unless category.nil?
+          category_topics = category.topics.accessible_by(current_ability).select(
+            'topics.*,categories_topics.sort AS categories_topics_sort')
+          topics += category_topics.collect do |topic|
+            subtopics = category_topics.select{|t| t.parent_id == topic.id}.collect do |subtopic|
+              {
+                "subtopicname" => subtopic.name,
+                "subtopictitle" => subtopic.sub_title,
+                "categories_topics_sort" => subtopic['categories_topics_sort'].to_i
+              }
+            end
+            categorysort = gbapplications_category.sort - 1000*gbapplications_category.gbapp_specific rescue nil
+
+            tools = Tool.accessible_tools(topic, current_ability)
+
+            keywords = topic.title.split + (topic.keywords || '').split(',').collect(&:strip)
+
             {
-              "subtopicname" => subtopic.name,
-              "subtopictitle" => subtopic.sub_title,
-              "categories_topics_sort" => subtopic['categories_topics_sort'].to_i
+              "name" => topic.name,
+              "title" => topic.title,
+              "print_title" => topic.print_title,
+              "icon" => "/images/custom/themekl-#{topic.name.downcase}.gif",
+              "organisationtitle" => topic.organisation.try(:title),
+              "organisationsort" => topic.organisation.try(:sort),
+              "categorytitle" => category.title,
+              "gbapp_specific" => gbapplications_category.gbapp_specific,
+              "categorysort" => categorysort,
+              "categories_topics_sort" => topic['categories_topics_sort'].to_i,
+              "keywords" => keywords,
+              "geoliongdd" => topic.geolion_gdd(zone),
+              "parent_id" => topic.parent_id,
+              "hassubtopics" => subtopics.size > 0,
+              "subtopics" => subtopics,
+              "missingpermission" => current_ability.cannot?(:show, topic),
+              "tools" => tools,
+              "ollayer_class" => topic.ollayer_class, #z.B. "WMS"
+              "ollayer_type" => topic.ollayer_args, #z.B. { name: "NASA Global Mosaic", url: "http://wms.jpl.nasa.gov/wms.cgi", params: {layers: "modis,global_mosaic"} }
+              "bg_topic" => topic.bg_topic.try(:name),
+              "overlay_topics" => topic.overlay_topics.collect(&:name),
+              "wms_url" => "#{wms_host}/#{topic.name}",
+              "background_layer" => topic.background_layer,
+              "main_layer" => topic.main_layer,
+              "overlay_layer" => topic.overlay_layer,
+              "minscale" => topic.minscale
             }
           end
-          categorysort = gbapplications_category.sort - 1000*gbapplications_category.gbapp_specific rescue nil
-
-          tools = Tool.accessible_tools(topic, current_ability)
-
-          keywords = topic.title.split + (topic.keywords || '').split(',').collect(&:strip)
-
-          {
-            "name" => topic.name,
-            "title" => topic.title,
-            "print_title" => topic.print_title,
-            "icon" => "/images/custom/themekl-#{topic.name.downcase}.gif",
-            "organisationtitle" => topic.organisation.try(:title),
-            "organisationsort" => topic.organisation.try(:sort),
-            "categorytitle" => category.title,
-            "gbapp_specific" => gbapplications_category.gbapp_specific,
-            "categorysort" => categorysort,
-            "categories_topics_sort" => topic['categories_topics_sort'].to_i,
-            "keywords" => keywords,
-            "geoliongdd" => topic.geolion_gdd(zone),
-            "parent_id" => topic.parent_id,
-            "hassubtopics" => subtopics.size > 0,
-            "subtopics" => subtopics,
-            "missingpermission" => current_ability.cannot?(:show, topic),
-            "tools" => tools,
-            "ollayer_class" => topic.ollayer_class, #z.B. "WMS"
-            "ollayer_type" => topic.ollayer_args, #z.B. { name: "NASA Global Mosaic", url: "http://wms.jpl.nasa.gov/wms.cgi", params: {layers: "modis,global_mosaic"} }
-            "bg_topic" => topic.bg_topic.try(:name),
-            "overlay_topics" => topic.overlay_topics.collect(&:name),
-            "wms_url" => "#{wms_host}/#{topic.name}",
-            "background_layer" => topic.background_layer,
-            "main_layer" => topic.main_layer,
-            "overlay_layer" => topic.overlay_layer,
-            "minscale" => topic.minscale
-          }
         end
       end
     end

data/app/models/topic.rb~

@@ -0,0 +1,182 @@
+require 'acts_as_tree'
+
+# OpenLayers "layer" (WMS, etc.)
+class Topic < ActiveRecord::Base
+  acts_as_tree #parent_id could be replaced with topics_topics relation
+
+  has_many :categories_topics, :dependent => :destroy
+  has_many :categories, :through => :categories_topics
+  belongs_to :bg_topic, :class_name => 'Topic'
+  has_and_belongs_to_many :overlay_topics, :class_name => 'Topic', :association_foreign_key => 'overlay_topic_id'
+  has_many :topics_layers
+  has_many :layers, :through => :topics_layers
+  belongs_to :organisation
+
+  attr_protected []
+
+  accepts_nested_attributes_for :topics_layers, :allow_destroy => true
+  accepts_nested_attributes_for :layers, :allow_destroy => true
+
+  serialize :ollayer_args, JSON
+
+  validates :name, :presence => true, :uniqueness => true
+
+  # Enum for RailsAdmin form
+  def category_enum
+    Category.all.collect {|p| [ p.name, p.id ] }
+  end
+
+  # Enum for RailsAdmin form (causes exception in name search)
+  #def parent_enum
+  #  Topic.all.collect {|p| [ p.name, p.id ] }
+  #end
+
+  def geolion_gdd(site)
+    site == SITE_DEFAULT ? geolion_gdd_internet : geolion_gdd_intranet
+  end
+
+  #Structure for Topic selection
+  def self.list(app, current_ability, zone, wms_host)
+    topics = []
+    ActiveRecord::Base.silence do
+      app.gbapplications_categories.includes(:category).each do |gbapplications_category|
+        category = gbapplications_category.category
+        unless category.nil?
+          category_topics = category.topics.accessible_by(current_ability).select(
+            'topics.*,categories_topics.sort AS categories_topics_sort')
+          topics += category_topics.collect do |topic|
+            subtopics = category_topics.select{|t| t.parent_id == topic.id}.collect do |subtopic|
+              {
+                "subtopicname" => subtopic.name,
+                "subtopictitle" => subtopic.sub_title,
+                "categories_topics_sort" => subtopic['categories_topics_sort'].to_i
+              }
+            end
+            categorysort = gbapplications_category.sort - 1000*gbapplications_category.gbapp_specific rescue nil
+
+            tools = Tool.accessible_tools(topic, current_ability)
+
+            keywords = topic.title.split + (topic.keywords || '').split(',').collect(&:strip)
+
+            {
+              "name" => topic.name,
+              "title" => topic.title,
+              "print_title" => topic.print_title,
+              "icon" => "/images/custom/themekl-#{topic.name.downcase}.gif",
+              "organisationtitle" => topic.organisation.try(:title),
+              "organisationsort" => topic.organisation.try(:sort),
+              "categorytitle" => category.title,
+              "gbapp_specific" => gbapplications_category.gbapp_specific,
+              "categorysort" => categorysort,
+              "categories_topics_sort" => topic['categories_topics_sort'].to_i,
+              "keywords" => keywords,
+              "geoliongdd" => topic.geolion_gdd(zone),
+              "parent_id" => topic.parent_id,
+              "hassubtopics" => subtopics.size > 0,
+              "subtopics" => subtopics,
+              "missingpermission" => current_ability.cannot?(:show, topic),
+              "tools" => tools,
+              "ollayer_class" => topic.ollayer_class, #z.B. "WMS"
+              "ollayer_type" => topic.ollayer_args, #z.B. { name: "NASA Global Mosaic", url: "http://wms.jpl.nasa.gov/wms.cgi", params: {layers: "modis,global_mosaic"} }
+              "bg_topic" => topic.bg_topic.try(:name),
+              "overlay_topics" => topic.overlay_topics.collect(&:name),
+              "wms_url" => "#{wms_host}/#{topic.name}",
+              "background_layer" => topic.background_layer,
+              "main_layer" => topic.main_layer,
+              "overlay_layer" => topic.overlay_layer,
+              "minscale" => topic.minscale
+            }
+          end
+        end
+      end
+    end
+    {
+      "success" => true,
+      #"activeTopic" => {"topicname" => "av", "grouping" => "theme"}, #TODO: from session
+      "gbtopics" => topics,
+      "results" => topics.size
+    }
+  end
+
+  def icon_fname
+    "themekl-#{name.downcase}.gif"
+  end
+
+  #Topic legend collection
+  def legend_fname
+    "_#{name.downcase}_legend.html.erb"
+  end
+
+  def legend_file
+    File.join(Rails.root, 'app', 'views', 'topics', 'custom', legend_fname)
+  end
+
+  def legend_file_auto
+    File.join(Rails.root, 'app', 'views', 'topics', 'custom', 'auto', legend_fname)
+  end
+
+  def legend
+    @legend ||= begin
+      if File.exist?(legend_file)
+        "topics/custom/#{legend_fname[1..-10]}"
+      elsif File.exist?(legend_file_auto)
+        "topics/custom/auto/#{legend_fname[1..-10]}"
+      else
+        nil
+      end
+    end
+  end
+
+  def info_header_fname
+    "_#{name.downcase}_info.html.erb"
+  end
+
+  def info_header_file
+    File.join(Rails.root, 'app', 'views', 'topics', 'custom', info_header_fname)
+  end
+
+  def info_header
+    @info_header ||= File.exist?(info_header_file) ? "topics/custom/#{info_header_fname[1..-10]}" : nil
+  end
+
+  # print disclaimer
+
+  def self.default_print_disclaimer
+    File.open(File.join(Rails.root, 'app', 'views', 'topics', '_print_disclaimer.txt'), 'r') { |f| f.read }
+  end
+
+  def print_disclaimer
+    @disclaimer ||= begin
+      fname = File.join(Rails.root, 'app', 'views', 'topics', 'custom', "_#{name.downcase}_print_disclaimer.txt")
+      if File.exist?(fname)
+        # use custom topic disclaimer if there exists a corresponding text file
+        File.open(fname, 'r') { |f| f.read }
+      else
+        Topic.default_print_disclaimer
+      end
+    end
+  end
+
+  def roles
+    perms = Permission.where(:resource_type => 'Topic', :resource => name).includes(:role)
+    perms.collect(&:role)
+  end
+
+  def query(ability, query_topic, searchbbox)
+    active_layers = query_topic['layers'].split(',')
+    qlayers = query_layers(ability, active_layers)
+    results = []
+    qlayers.each do |layer|
+      result = layer.query(ability, query_topic, searchbbox)
+      results << result unless result.nil?
+    end
+    results
+  end
+
+  def query_layers(ability, active_layers) #TODO: 0.5s
+    layers.accessible_by(ability).where('topics_layers.queryable').order('topics_layers.leg_sort DESC').find_all do |layer|
+      active_layers.include?(layer.name)
+    end
+  end
+
+end

data/app/models/user.rb

@@ -7,7 +7,7 @@ class User < ActiveRecord::Base
          :authentication_keys => [ :login ]
 
   validates :login, :presence => true, :uniqueness => true
-  validates_format_of :login, :with => /\A[A-Za-z][\w-]*\Z/
+  validates_format_of :login, :with => /\A[A-Za-z][.\w-]*\Z/
 
   attr_accessor :requested_group
 
@@ -28,8 +28,20 @@ class User < ActiveRecord::Base
     roles.any? { |role| role.name == rolename.to_s }
   end
 
+  def group_admin?(group)
+    has_role?(:admin) || group.admins.include?(self)
+  end
+
   def add_requested_group
     groups << Group.find(requested_group) if requested_group #with granted => false
   end
 
+  def merge_app_infos(new_app_infos)
+    if app_infos.nil?
+      update_attribute(:app_infos, new_app_infos)
+    else
+      update_attribute(:app_infos, app_infos.merge(new_app_infos))
+    end
+  end
+
 end