gb_mapfish_appserver 0.0.3 → 0.0.4

data/app/controllers/registrations_controller.rb

@@ -25,12 +25,21 @@ class RegistrationsController < Devise::RegistrationsController
     super
   end
 
+  # show confirmation for registration of existing users
+  def confirm
+  end
+
   def login
     # redirected to here after AJAX login
     if user_signed_in?
       render :json => {
         :success => true,
-        :user => { :login => current_user.login, :email => current_user.email},
+        :user => {
+          :login => current_user.login,
+          :email => current_user.email,
+          :name => current_user.name,
+          :app_infos => current_user.app_infos
+        },
         :roles => current_roles.roles.collect(&:name)
       }
     else
@@ -53,4 +62,4 @@ class RegistrationsController < Devise::RegistrationsController
   def application_layout
     params[:layout] || "application"
   end
-end
+end

data/app/controllers/topics_controller.rb

@@ -37,9 +37,60 @@ class TopicsController < ApplicationController
       topic = Topic.where(:name => query_topic['topic']).first
       authorize! :show, topic
       query_topic['topicobj'] = topic
-      query_topic['results'] = topic.query(current_ability, query_topic, params['bbox'])
+      if params['bbox']
+        query_topic['results'] = topic.query(current_ability, query_topic, params['bbox'])
+      elsif params['rect']
+        x1, y1, x2, y2 = params['rect'].split(',').collect(&:to_f)
+        rect = "POLYGON((#{x1} #{y1}, #{x1} #{y2}, #{x2} #{y2}, #{x2} #{y1} ,#{x1} #{y1}))"
+        query_topic['results'] = topic.query(current_ability, query_topic, rect)
+      elsif params['circle']
+        query_topic['results'] = topic.query(current_ability, query_topic, params['circle'])
+      elsif params['poly']
+        query_topic['results'] = topic.query(current_ability, query_topic, params['poly'])
+      else
+        # problem
+      end
     end
-    render :layout => false
+    if params['bbox']
+      x1, y1, x2, y2 = (params['bbox']).split(',').collect(&:to_f)
+      @xx = (x1 + x2) / 2.0
+      @yy = (y1 + y2) / 2.0
+      @height = Dtm.getHeight(params['bbox'])
+    else
+      @xx = 0
+      @yy = 0
+      @height = 0
+    end
+
+    respond_to do |format|
+      format.html { render :layout => false }
+
+      format.json do
+         render :json => prepJson
+      end
+      format.jsonp do
+        render :json => prepJson, :callback => params[:callback]
+      end
+    end
+  end
+
+  def prepJson
+    query_results = {}
+    @query_topics.each do |query_topic|
+      layer_results = {}
+      query_topic['results'].each do |result|
+        layer_results[result[0][:name]] = result
+      end
+      query_results[query_topic['topicobj'].name] = layer_results
+    end
+
+    {  
+      :results => query_results,
+      :height => @height,
+      :x => @xx,
+      :y => @yy
+    }.to_json
+
   end
 
   def legend

data/app/controllers/topics_controller.rb~

@@ -0,0 +1,133 @@
+class TopicsController < ApplicationController
+
+  #cache topics.json
+  caches_action :index, :cache_path => Proc.new {
+    {:ssl => request.ssl?, :app => params[:gbapp], :roles => current_roles.roles}
+  }
+
+  def index
+    @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
+        render :json => Topic.list(@app, current_ability, host_zone(request.host), wms_host)
+      end
+    end
+  end
+
+  def show #TODO: obsolete?
+    @topic = Topic.includes(:layers).find(params[:id])
+
+    respond_to do |format|
+      format.json do
+        render :json => @topic.to_json(:include => :layers)
+      end
+    end
+  end
+
+=begin
+  def query0
+    @query_topics = ActiveSupport::JSON.decode(params[:infoQuery])['queryTopics']
+    #e.g. [{"layers"=>"lk25,grenzen,gemeindegrenzen,seen,wald,haltestellen", "divCls"=>"legmain", "level"=>"main", "topic"=>"BASISKARTEZH"}, {"layers"=>"", "divCls"=>"legover", "level"=>"over", "topic"=>"AVParzOverlayZH"}]
+    @query_topics.each do |query_topic|
+      topic = Topic.where(:name => query_topic['topic']).first
+      authorize! :show, topic
+      query_topic['topicobj'] = topic
+      query_topic['results'] = topic.query(current_ability, query_topic, params['bbox'])
+    end
+    x1, y1, x2, y2 = (params['bbox']).split(',').collect(&:to_f)
+    @xx = (x1 + x2) / 2.0
+    @yy = (y1 + y2) / 2.0
+    @height = Dtm.getHeight(params['bbox'])
+
+
+    respond_to do |format|
+      format.html { render :layout => false }
+
+      format.json do
+         render :json => prepJson
+      end
+      format.jsonp do
+        render :json => prepJson, :callback => params[:callback]
+      end
+    end
+  end
+=end
+
+  def query
+    @query_topics = ActiveSupport::JSON.decode(params[:infoQuery])['queryTopics']
+    #e.g. [{"layers"=>"lk25,grenzen,gemeindegrenzen,seen,wald,haltestellen", "divCls"=>"legmain", "level"=>"main", "topic"=>"BASISKARTEZH"}, {"layers"=>"", "divCls"=>"legover", "level"=>"over", "topic"=>"AVParzOverlayZH"}]
+    @query_topics.each do |query_topic|
+      topic = Topic.where(:name => query_topic['topic']).first
+      authorize! :show, topic
+      query_topic['topicobj'] = topic
+      if params['bbox']
+        query_topic['results'] = topic.query(current_ability, query_topic, params['bbox'])
+      elsif params['rect']
+        x1, y1, x2, y2 = params['rect'].split(',').collect(&:to_f)
+        rect = "POLYGON((#{x1} #{y1}, #{x1} #{y2}, #{x2} #{y2}, #{x2} #{y1} ,#{x1} #{y1}))"
+        query_topic['results'] = topic.query(current_ability, query_topic, rect)
+      elsif params['circle']
+        query_topic['results'] = topic.query(current_ability, query_topic, params['circle'])
+      elsif params['poly']
+        query_topic['results'] = topic.query(current_ability, query_topic, params['poly'])
+      else
+        # problem
+      end
+    end
+    if params['bbox']
+      x1, y1, x2, y2 = (params['bbox']).split(',').collect(&:to_f)
+      @xx = (x1 + x2) / 2.0
+      @yy = (y1 + y2) / 2.0
+      @height = Dtm.getHeight(params['bbox'])
+    else
+      @xx = 0
+      @yy = 0
+      @height = 0
+    end
+
+    respond_to do |format|
+      format.html { render :layout => false }
+
+      format.json do
+         render :json => prepJson
+      end
+      format.jsonp do
+        render :json => prepJson, :callback => params[:callback]
+      end
+    end
+  end
+
+  def prepJson
+    query_results = {}
+    @query_topics.each do |query_topic|
+      layer_results = {}
+      query_topic['results'].each do |result|
+        layer_results[result[0][:name]] = result
+      end
+      query_results[query_topic['topicobj'].name] = layer_results
+    end
+
+    {  
+      :results => query_results,
+      :height => @height,
+      :x => @xx,
+      :y => @yy
+    }.to_json
+
+  end
+
+  def legend
+    #TODO: -> show?mode=legend
+    @topic = Topic.includes(:layers).where(:name => params[:id]).first
+    @topic ||= Topic.includes(:layers).find(params[:id])
+    authorize! :show, @topic
+    render :layout => false
+  end
+
+end

data/app/controllers/wms_controller.rb

@@ -4,7 +4,7 @@ require 'uri'
 class WmsController < ApplicationController
 
   def show
-    logger.info "----> WMS call with user '#{current_user.try(:login)}'"
+    logger.debug "----> WMS call with user '#{current_user.try(:login)}'"
 
     topic = Topic.where(:name => params[:service]).first
     add_sld_body(topic)

data/app/models/ability.rb

@@ -108,15 +108,26 @@ class Ability
         end
       else
         if layer == '*'
-          #resource_object.topics.detect { |t| t.name == topic }
-          resource_object.topics.where(:name => topic)
+          layer_topics_lookup[resource_object.id].include?(topic)
         else
-          #resource_object.name == layer && resource_object.topics.detect { |t| t.name == topic }
-          resource_object.name == layer && resource_object.topics.where(:name => topic)
+          resource_object.name == layer && layer_topics_lookup[resource_object.id].include?(topic)
         end
       end
     end
 
+    private
+
+    def layer_topics_lookup
+      #Build a lookup hash for all layer -> topic relations
+      @layer_topics ||= begin
+        layer_topics = resources.all.inject({}) {|hsh,l| hsh[l.id] = []; hsh }        
+        # layer_topics = resources.inject({}) {|hsh,l| hsh[l.id] = []; hsh }
+        all_topics = Topic.select("topics.id,topics.name,layers.id,layers.name").includes(:layers)
+        all_topics.each {|t| t.layers.each {|l| layer_topics[l.id] << t.name} }
+        layer_topics
+      end
+    end
+
   end
 
   # ----------
@@ -265,8 +276,6 @@ class Ability
     else
       #can :change_password, User, _id => @user.id #TODO: allow edit password
 
-      Rails.logger.info "Loading permissions for roles #{roles.collect(&:name).join('+')}"
-
       #Topic permissions
       TopicResourceType.new.add_ability(self, roles)
 

data/app/models/geo_model.rb

@@ -34,12 +34,35 @@ class GeoModel < ActiveRecord::Base
     "ST_Envelope(#{table_name}.#{geometry_column_name}) AS extent"
   end
 
-  def self.identify_filter(bbox, radius)
-    x1, y1, x2, y2 = bbox.split(',').collect(&:to_f)
-    center = "ST_GeomFromText('POINT(#{x1+(x2-x1)/2} #{y1+(y2-y1)/2})', #{srid})"
-    scoped.where("ST_DWithin(#{table_name}.#{geometry_column_name}, #{center}, #{radius})")
+  def self.area_field
+    "ST_Area(#{table_name}.#{geometry_column.name}) AS area"
   end
 
+  def self.identify_filter(searchgeo, radius)
+    if searchgeo[0..3] == "POLY"
+      logger.debug "*** POLY-query: #{searchgeo} ***"
+      polygon = "ST_GeomFromText('#{searchgeo}', #{srid})"
+      scoped.where("ST_DWithin(#{table_name}.#{geometry_column_name}, #{polygon}, #{radius})")
+    else
+      if searchgeo.split(',').length == 3
+        logger.debug "*** CIRCLE-query: #{searchgeo} ***"
+        x1, y1, r  = searchgeo.split(',').collect(&:to_f)
+        center = "ST_GeomFromText('POINT(#{x1} #{y1})', #{srid})"
+        scoped.where("ST_DWithin(#{table_name}.#{geometry_column_name}, #{center}, #{r})")
+      else
+        logger.debug "*** BBOX-query: #{searchgeo} ***"
+        x1, y1, x2, y2 = searchgeo.split(',').collect(&:to_f)
+        center = "ST_GeomFromText('POINT(#{x1+(x2-x1)/2} #{y1+(y2-y1)/2})', #{srid})"
+        scoped.where("ST_DWithin(#{table_name}.#{geometry_column_name}, #{center}, #{radius})")
+      end
+    end
+  end
+
+  #Custom identify query
+  #def self.identify_query(bbox, radius)
+  #  scoped.select().where()....
+  #end
+
   def bbox
     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]

data/app/models/geo_model.rb~

@@ -0,0 +1,183 @@
+class GeoModel < ActiveRecord::Base
+  establish_connection(GEODB)
+
+  self.abstract_class = true
+
+  attr_protected []
+
+  def self.geometry_column_info
+    #spatial_column_info returns key/value list with geometry_column name as key
+    #value example: {:srid=>21781, :type=>"MULTIPOLYGON", :dimension=>2, :has_z=>false, :has_m=>false, :name=>"the_geom"}
+    #We take the first matching entry
+    @geometry_column_info ||= connection.spatial_column_info(table_name).values.first
+  end
+
+  def self.geometry_column_name
+    geometry_column_info[:name]
+  end
+
+  def self.geometry_type
+    geometry_column_info[:type]
+  end
+
+  def self.srid
+    geometry_column_info[:srid]
+  end
+
+  def self.geometry_column
+    col = columns_hash[geometry_column_name]
+    col.instance_eval { @srid = srid }
+    col
+  end
+
+  def self.extent_field
+    "ST_Envelope(#{table_name}.#{geometry_column_name}) AS extent"
+  end
+
+  def self.area_field
+    "ST_Area(#{table_name}.#{geometry_column.name}) AS area"
+  end
+
+  def self.identify_filter(searchgeo, radius)
+    if searchgeo[0..3] == "POLY"
+      logger.debug "*** POLY-query: #{searchgeo} ***"
+      polygon = "ST_GeomFromText('#{searchgeo}', #{srid})"
+      scoped.where("ST_DWithin(#{table_name}.#{geometry_column_name}, #{polygon}, #{radius})")
+#      self.identify_filter_polygon(searchgeo, radius)
+    else
+      if searchgeo.split(',').length == 3
+        logger.debug "*** CIRCLE-query: #{searchgeo} ***"
+        x1, y1, r  = searchgeo.split(',').collect(&:to_f)
+        center = "ST_GeomFromText('POINT(#{x1} #{y1})', #{srid})"
+        scoped.where("ST_DWithin(#{table_name}.#{geometry_column_name}, #{center}, #{r})")
+      else
+        logger.debug "*** BBOX-query: #{searchgeo} ***"
+        x1, y1, x2, y2 = searchgeo.split(',').collect(&:to_f)
+        center = "ST_GeomFromText('POINT(#{x1+(x2-x1)/2} #{y1+(y2-y1)/2})', #{srid})"
+        scoped.where("ST_DWithin(#{table_name}.#{geometry_column_name}, #{center}, #{radius})")
+      end
+    end
+  end
+
+  #Custom identify query
+  #def self.identify_query(bbox, radius)
+  #  scoped.select().where()....
+  #end
+
+  def bbox
+    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
+
+  # based on mapfish_filter
+  def self.bbox_filter(params)
+    filter = scoped
+
+    if params['bbox']
+      x1, y1, x2, y2 = params['bbox'].split(',').collect(&:to_f)
+      box = [[x1, y1], [x2, y2]]
+      filter_geom = "'BOX3D(#{box[0].join(" ")},#{box[1].join(" ")})'::box3d"
+    elsif params['polygon']
+      filter_geom = "ST_GeomFromText('#{params['polygon']}')"
+    end
+
+    if filter_geom
+      filter = filter.where("ST_Intersects(#{table_name}.#{connection.quote_column_name(geometry_column_name)}, ST_SetSRID(#{filter_geom}, #{srid}))")
+    end
+
+    filter
+  end
+
+  def self.geojson_decode(json)
+    RGeo::GeoJSON.decode(json, :json_parser => :json, :geo_factory => geo_factory)
+  end
+
+  def to_geojson(options = {})
+    only = options.delete(:only)
+    geoson = { :type => 'Feature' }
+    geoson[:properties] = attributes.delete_if do |name, value|
+      # TODO: support for multiple geometry columns
+      if name == self.class.geometry_column_name
+        geoson[:geometry] = value
+        true
+      elsif name == self.class.primary_key then
+        geoson[:id] = value
+        true
+      elsif only
+        !only.include?(name.to_sym)
+      end
+    end
+    geoson.to_json
+  end
+
+  def update_attributes_from_geojson_feature(feature, user)
+    attr = feature.properties
+    attr[self.class.geometry_column_name] = feature.geometry
+    ok = update_attributes(attr)
+    modified_by(user)
+    ok
+  end
+
+  # update modification attributes (changed_by, etc.)
+  # Override in descendant classes
+  def modified_by(user)
+    #none by default
+  end
+
+  def self.can_edit?(ability)
+    @@layers ||= Layer.where(:table => self.table_name).all
+    can_edit = false
+    @@layers.each do |layer|
+      # check if any layer with this table is editable
+      if ability.can?(:edit, layer)
+        can_edit = true
+        break
+      end
+    end
+    can_edit
+  end
+
+  # apply user filter for editing
+  # Override in descendant classes
+  def self.user_filter(ability)
+    if ability.nil?
+      forbidden(ability)
+    elsif can_edit?(ability)
+      scoped #No filter
+    else
+      forbidden(ability)
+    end
+  end
+
+  def self.forbidden(ability)
+    if ability.nil?
+      logger.info "----> Edit access forbidden without login"
+    else
+      logger.info "----> Edit access forbidden with roles #{ability.roles.collect(&:name).join('+')}!"
+    end
+    where('1=0') # No access
+  end
+
+  # header for CSV export
+  def csv_header
+    #empty by default
+    []
+  end
+
+  # row values for CSV export
+  def csv_row
+    #empty by default
+    []
+  end
+
+  def self.geo_factory
+    if self.rgeo_factory_generator == RGeo::ActiveRecord::DEFAULT_FACTORY_GENERATOR
+      self.rgeo_factory_generator = RGeo::Geos.factory_generator
+      rgeo_factory_settings.set_column_factory(table_name, geometry_column_name,
+        RGeo::Cartesian.factory(:srid => 21781, :proj4 => '+proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 +k_0=1 +x_0=600000 +y_0=200000 +ellps=bessel +towgs84=674.4,15.1,405.3,0,0,0,0 +units=m +no_defs')
+      )
+    end
+    rgeo_factory_for_column(geometry_column_name)
+  end
+
+end