gb_mapfish_appserver 1.0.0 → 1.0.1

data/app/controllers/apps_controller.rb

@@ -1,5 +1,7 @@
 class AppsController < ApplicationController
 
+  before_filter :redirect_to_https_if_signed_in
+
   def show
     @current_roles = current_roles.roles.collect(&:name)
 
@@ -63,4 +65,15 @@ class AppsController < ApplicationController
     render :action => @app, :layout => false
   end
 
+  private
+
+  def redirect_to_https_if_signed_in
+    if REDIRECT_APP_TO_HTTPS_IF_SIGNED_IN && user_signed_in?
+      # redirect to HTTPS if user is logged in
+      unless request.ssl?
+        redirect_to :protocol => 'https://', :status => :temporary_redirect
+      end
+    end
+  end
+
 end

data/app/controllers/topics_controller.rb

@@ -31,8 +31,9 @@ class TopicsController < ApplicationController
   end
 
   def query
-    # optional parameter (default = false) to return only the feature nearest to the center of the search geometry, if no custom layer query is used
-    nearest = params['nearest'] == 'true'
+    # optional parameter to return only the feature nearest to the center of the search geometry, if no custom layer query is used
+    # use layer setting by default
+    nearest = params['nearest'].nil? ? nil : params['nearest'] == 'true'
 
     @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"}]

data/app/models/geo_model.rb

@@ -61,8 +61,18 @@ class GeoModel < ActiveRecord::Base
 
     if nearest
       logger.debug "*** query nearest ***"
-      # get the feature nearest to the center of the search geometry
-      filter = filter.order("ST_Distance(#{table_name}.#{geometry_column_name}, #{center})").limit(1)
+      min_dist = filter.select("Min(ST_Distance(#{table_name}.#{geometry_column_name}, #{center})) AS min_dist").first
+      unless min_dist.nil?
+        logger.debug "*** min_dist = #{min_dist.min_dist} ***"
+        if min_dist.min_dist.to_f == 0
+          # center of the search geometry is within a feature (may be overlapping features)
+          filter = filter.where("ST_Within(#{center}, #{table_name}.#{geometry_column_name})")
+        else
+          # get the feature nearest to the center of the search geometry
+          filter = filter.order("ST_Distance(#{table_name}.#{geometry_column_name}, #{center})").limit(1)
+        end
+      end
+      # else no features in filter
     end
 
     filter

data/app/models/layer.rb

@@ -118,7 +118,10 @@ EOS
     allowed_fields
   end
 
-  def query(ability, query_topic, searchgeo, nearest=false)
+  def query(ability, query_topic, searchgeo, nearest=nil)
+    # use layer setting by default
+    nearest = search_nearest if nearest.nil?
+
     if table =~ /^https?:/
       features = get_feature_info(searchgeo)
       [self, features, searchgeo.split(',')]
@@ -141,7 +144,7 @@ EOS
           feature_class.identify_query(searchgeo, searchdistance)
         else
           logger.debug "*** Identify on layer #{name} with query fields #{query_fields(ability)} at #{searchgeo.inspect}"
-          feature_class.identify_filter(searchgeo, searchdistance, nearest).select(query_fields(ability)).all
+          feature_class.identify_filter(searchgeo, searchdistance, nearest).where(where_filter).select(query_fields(ability)).all
         end
         logger.debug "Number of features: #{features.size}"
         # calculate bbox of all features
@@ -296,7 +299,7 @@ EOS
     wms_layers.split(',').collect {|l| %Q<"#{l}"> }.join(',')
   end
 
-  DEFAULT_SELECTION_STYLE = {
+  @@default_selection_styles = {
     'POLYGON' =>
       '<PolygonSymbolizer>'+
         '<Fill>'+
@@ -329,11 +332,19 @@ EOS
        '</PointSymbolizer>'
   }
 
+  def self.set_default_selection_styles(styles)
+    @@default_selection_styles = styles
+  end
+
+  def self.default_selection_styles
+    @@default_selection_styles
+  end
+
   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] || ''
+      logger.error "Unsupported selection geometry type #{feature_class.geometry_type}" unless self.class.default_selection_styles.has_key?(gtyp)
+      self.class.default_selection_styles[gtyp] || ''
     else
       selection_style
     end

data/app/models/topic.rb

@@ -179,7 +179,7 @@ class Topic < ActiveRecord::Base
     perms.collect(&:role)
   end
 
-  def query(ability, query_topic, searchbbox, nearest=false)
+  def query(ability, query_topic, searchbbox, nearest=nil)
     active_layers = query_topic['layers'].split(',')
     qlayers = query_layers(ability, active_layers)
     results = []

data/app/models/wms.rb

@@ -17,23 +17,22 @@ class Wms
     sld <<    "<UserStyle>"
     sld <<      "<Name>default</Name>"
     sld <<      "<FeatureTypeStyle>"
-
+    sld <<        "<Rule>"
+    sld <<          "<Name>show-selection</Name>"
+    sld <<          '<ogc:Filter>'
+    sld <<            '<ogc:Or>' if filter_values.size > 1
     filter_values.each do |value|
-      # NOTE: use a separate rule for each value as workaround, as combined filter with <ogc:Or> does not work as expected
-      sld <<      "<Rule>"
-      sld <<        "<Name>show-#{value}</Name>"
-      sld <<        '<ogc:Filter>'
       sld <<          "<ogc:PropertyIsEqualTo>"
       sld <<            "<ogc:PropertyName>#{filter_property}</ogc:PropertyName>"
       sld <<            "<ogc:Literal>#{value}</ogc:Literal>"
       sld <<          "</ogc:PropertyIsEqualTo>"
-      sld <<        "</ogc:Filter>"
-      sld << layer.selection_symbolizer
-      sld <<        "<MinScaleDenominator>0</MinScaleDenominator>"
-      sld <<        "<MaxScaleDenominator>999999999</MaxScaleDenominator>"
-      sld <<      "</Rule>"
     end
-
+    sld <<          '</ogc:Or>' if filter_values.size > 1
+    sld <<          "</ogc:Filter>"
+    sld << layer.selection_symbolizer
+    sld <<          "<MinScaleDenominator>0</MinScaleDenominator>"
+    sld <<          "<MaxScaleDenominator>999999999</MaxScaleDenominator>"
+    sld <<        "</Rule>"
     sld <<      "</FeatureTypeStyle>"
     sld <<    "</UserStyle>"
     sld <<  "</NamedLayer>"

data/db/migrate/20141009135720_add_where_filter_to_layers.rb

@@ -0,0 +1,5 @@
+class AddWhereFilterToLayers < ActiveRecord::Migration
+  def change
+    add_column :layers, :where_filter, :string
+  end
+end

data/db/migrate/20141212103049_add_search_nearest_to_layer.rb

@@ -0,0 +1,5 @@
+class AddSearchNearestToLayer < ActiveRecord::Migration
+  def change
+    add_column :layers, :search_nearest, :boolean, :default => false
+  end
+end

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

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

@@ -5,6 +5,9 @@ HOST_ZONE = {
 }
 HOST_ZONE.default = SITE_DEFAULT
 
+# redirect app to HTTPS if user is logged in
+REDIRECT_APP_TO_HTTPS_IF_SIGNED_IN = false
+
 #Hostnames in image links (e.g. identify symbol) which should be replaced by 127.0.0.1 for printing
 LOCAL_GRAPHICS_HOST = /<%= options["default-site-name"] %>/
 

data/lib/tasks/mapfile.rake

@@ -104,6 +104,24 @@ namespace :mapfile do
           puts "Warning: Couldn't extract table name of layer '#{layer.name}' from data '#{mlayer.data}'" if layer.table.blank?
           mlayer.data =~ /UNIQUE (\w+)/i
           layer.pkey = $1 || 'oid'
+          #extract where statement -if exists
+          mlayer.data =~ /WHERE (.*)?/i
+          tmp_where = $1  #return nil if nothing found
+          if !tmp_where.nil? && !tmp_where.strip.empty?
+              tmp_where = tmp_where.split(/AS/i)[0].split(/USING/i)[0].strip
+              if tmp_where.count("\"").odd?
+                tmp_where = tmp_where.gsub(/^["]/,'').gsub(/["]$/,'') #trim (") at start/end of string 
+              end
+              if tmp_where.count("(") != tmp_where.count(")")
+                  if tmp_where.count("(") < tmp_where.count(")")
+                    tmp_where = tmp_where.gsub(/[)]$/,'') #trim ")" at end of string 
+                  else
+                    tmp_where = tmp_where.gsub(/^[(]/,'') #trim "(" at start of string 
+                  end
+              end
+              puts "Info: Found where filter for layer '#{layer.name}' from data '#{mlayer.data}': '#{tmp_where}'"
+              layer.where_filter = tmp_where
+          end
         elsif mlayer.connectiontype == MS_WMS
           url = mlayer.getWMSFeatureInfoURL(@map, 0, 0, 10, "text/xml")
           #extract necessary params

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

@@ -5,6 +5,9 @@ HOST_ZONE = {
 }
 HOST_ZONE.default = SITE_DEFAULT
 
+# redirect app to HTTPS if user is logged in
+REDIRECT_APP_TO_HTTPS_IF_SIGNED_IN = false
+
 #Hostnames in image links (e.g. identify symbol) which should be replaced by 127.0.0.1 for printing
 LOCAL_GRAPHICS_HOST = /maps.example.com/
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19441660 !ruby/object:Gem::Requirement
+  requirement: &12844980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *19441660
+  version_requirements: *12844980
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &19441160 !ruby/object:Gem::Requirement
+  requirement: &12844480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19441160
+  version_requirements: *12844480
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: &19440540 !ruby/object:Gem::Requirement
+  requirement: &12843860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *19440540
+  version_requirements: *12843860
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &19440020 !ruby/object:Gem::Requirement
+  requirement: &12843340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *19440020
+  version_requirements: *12843340
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &19439500 !ruby/object:Gem::Requirement
+  requirement: &12842820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *19439500
+  version_requirements: *12842820
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &19438840 !ruby/object:Gem::Requirement
+  requirement: &12842140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.9
   type: :runtime
   prerelease: false
-  version_requirements: *19438840
+  version_requirements: *12842140
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &19438360 !ruby/object:Gem::Requirement
+  requirement: &12841660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19438360
+  version_requirements: *12841660
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &19437700 !ruby/object:Gem::Requirement
+  requirement: &12841000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *19437700
+  version_requirements: *12841000
 - !ruby/object:Gem::Dependency
   name: GeoRuby
-  requirement: &19437100 !ruby/object:Gem::Requirement
+  requirement: &12856820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *19437100
+  version_requirements: *12856820
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &19452980 !ruby/object:Gem::Requirement
+  requirement: &12856280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.3.20
   type: :runtime
   prerelease: false
-  version_requirements: *19452980
+  version_requirements: *12856280
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: &19452460 !ruby/object:Gem::Requirement
+  requirement: &12855780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *19452460
+  version_requirements: *12855780
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &19451900 !ruby/object:Gem::Requirement
+  requirement: &12855220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19451900
+  version_requirements: *12855220
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &19451320 !ruby/object:Gem::Requirement
+  requirement: &12854620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *19451320
+  version_requirements: *12854620
 - !ruby/object:Gem::Dependency
   name: activerecord-postgis-adapter
-  requirement: &19450720 !ruby/object:Gem::Requirement
+  requirement: &12854060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,7 +164,7 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *19450720
+  version_requirements: *12854060
 description: Mapfish Appserver is a framework for web mapping applications using OGC
   standards and the Mapfish protocol.
 email:
@@ -272,6 +272,8 @@ files:
 - config/initializers/rgeo.rb
 - config/routes.rb
 - db/migrate/20130118151946_setup_mapfish_tables.rb
+- db/migrate/20141009135720_add_where_filter_to_layers.rb
+- db/migrate/20141212103049_add_search_nearest_to_layer.rb
 - db/seeds.rb
 - gb_mapfish_appserver.gemspec
 - lib/gb_mapfish_appserver.rb