gb_mapfish_appserver 1.1.1 → 2.0.0

data/app/models/group.rb

@@ -1,7 +1,7 @@
 class Group < ActiveRecord::Base
   has_and_belongs_to_many :roles
   has_many :groups_users
-  has_many :users, :through => :groups_users, :conditions => {'groups_users.granted' => true}
+  has_many :users, :through => :groups_users, :conditions => ["groups_users.granted = true"]
 
   attr_protected []
 

data/app/models/layer.rb

@@ -113,9 +113,9 @@ EOS
     #logger.info "************************* Attribute for name '#{name}': #{@attrs[name].inspect}"
   end
 
-  def query_fields(ability)
+  def query_fields(ability, client_srid)
     return '' if feature_class.nil?
-    ([pkey]+ident_fields_for(ability)+[feature_class.extent_field, feature_class.area_field]).join(',')
+    ([pkey]+ident_fields_for(ability)+[feature_class.extent_field(client_srid), feature_class.area_field(client_srid)]).join(',')
   end
 
   def ident_fields_for(ability)
@@ -128,7 +128,7 @@ EOS
     allowed_fields
   end
 
-  def query(ability, query_topic, searchgeo, nearest=nil, user=nil)
+  def query(ability, query_topic, searchgeo, nearest=nil, user=nil, client_srid=nil)
     # use layer setting by default
     nearest = search_nearest if nearest.nil?
 
@@ -151,16 +151,16 @@ EOS
         logger.debug "******** query_topic: #{query_topic} ***************************************************"
         features = if custom_query_method
           logger.debug "*** Custom query on layer #{name}: #{query_topic.inspect}"
-          feature_class.send(custom_query_method, self, query_topic, searchgeo)
+          feature_class.send(custom_query_method, self, query_topic, searchgeo, client_srid)
         elsif feature_class.respond_to?(:identify_query)
           logger.debug "*** Custom identify_query on layer #{name}"
-          feature_class.identify_query(self, query_topic, searchgeo, ability, user)
+          feature_class.identify_query(self, query_topic, searchgeo, ability, user, client_srid)
         else
-          logger.debug "*** Identify on layer #{name} with query fields #{query_fields(ability)} at #{searchgeo.inspect}"
-          feature_class.identify_filter(searchgeo, searchdistance, nearest).where(where_filter).select(query_fields(ability)).all
+          logger.debug "*** Identify on layer #{name} with query fields #{query_fields(ability, client_srid)} at #{searchgeo.inspect}"
+          feature_class.identify_filter(searchgeo, searchdistance, nearest, client_srid).where(where_filter).select(query_fields(ability, client_srid)).all
         end
         logger.debug "Number of features: #{features.size}"
-        # calculate bbox of all features
+        # calculate bbox of all features (in client_srid)
         unless features.empty?
           envelope = GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(features.first['extent']).envelope
           features.each do |feature|
@@ -170,7 +170,7 @@ EOS
           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/>"
+        features = "Table: <b>#{table}</b><br/>Exception: #{e}<br/>query fields: #{query_fields(ability, client_srid)}<br/>db fields: #{feature_class.column_names.join(',')}<br/>missing: <font color='red'>#{(query_fields(ability, client_srid).split(',') - feature_class.column_names).join(', ')}</font><br/><br/>"
         logger.info "Identify error on layer #{name} #{features}"
       end
       [self, features, bbox]

data/app/models/locate_rule.rb

@@ -8,7 +8,7 @@ class LocateRule
   end
 
   # get selection and extent for located features
-  def locate(locations)
+  def locate(locations, client_srid=nil)
     features = if layer.nil?
       # user defined model
       seltopic = model.selection_topic
@@ -16,7 +16,7 @@ class LocateRule
       selproperty = model.primary_key
       selscalerange = model.selection_scalerange
       search_locs = model.search_locations(locations)
-      model.locate(search_locs)
+      model.locate(search_locs, client_srid)
     else
       # generic SearchModel
       layer_obj = Layer.find_by_name(layer)
@@ -25,7 +25,7 @@ class LocateRule
       selproperty = layer_obj.feature_class.primary_key
       selscalerange = model.selection_scalerange
       search_locs = locations.split(',')
-      model.layer_locate(layer_obj, search_field, search_locs)
+      model.layer_locate(layer_obj, search_field, search_locs, client_srid)
     end
     if features.present?
       x, y, scale = model.map_center(features)

data/app/models/search_model.rb

@@ -10,7 +10,7 @@ class SearchModel < GeoModel
     raise NotImplementedError.new
   end
 
-  def self.locate(locations)
+  def self.locate(locations, client_srid=nil)
     #return {:features => []}
     raise NotImplementedError.new
   end
@@ -28,9 +28,9 @@ class SearchModel < GeoModel
   end
 
   #Generic location search with one search field
-  def self.layer_locate(layer, search_field, locations)
+  def self.layer_locate(layer, search_field, locations, client_srid=nil)
     feature_class = layer.feature_class
-    feature_class.where(search_field => locations).select(feature_class.primary_key).select(feature_class.extent_field).limit(LOCATE_MAX_COUNT).all
+    feature_class.where(search_field => locations).select(feature_class.primary_key).select(feature_class.extent_field(client_srid)).limit(LOCATE_MAX_COUNT).all
   end
 
   # "261,AU4998$261,AU4999" -> [["261","AU4998"],["261","AU4999"]]

data/app/models/topic.rb

@@ -179,12 +179,12 @@ class Topic < ActiveRecord::Base
     perms.collect(&:role)
   end
 
-  def query(ability, query_topic, searchbbox, nearest=nil, user=nil)
+  def query(ability, query_topic, search_geom, nearest=nil, user=nil, client_srid=nil)
     active_layers = query_topic['layers'].split(',')
     qlayers = query_layers(ability, active_layers)
     results = []
     qlayers.each do |layer|
-      result = layer.query(ability, query_topic, searchbbox, nearest, user)
+      result = layer.query(ability, query_topic, search_geom, nearest, user, client_srid)
       results << result unless result.nil?
     end
     results

data/app/models/user.rb

@@ -14,13 +14,13 @@ class User < ActiveRecord::Base
   has_and_belongs_to_many :roles
 
   has_many :groups_users, :dependent => :destroy
-  has_many :groups, :through => :groups_users, :conditions => {'groups_users.granted' => true}
+  has_many :groups, :through => :groups_users, :conditions => ["groups_users.granted = true"]
 
   accepts_nested_attributes_for :groups_users
 
   serialize :app_infos, JSON
 
-  attr_accessible :login, :name, :email, :password, :password_confirmation, :remember_me, :requested_group, :groups_users_attributes, :app_infos
+  attr_accessible :login, :name, :email, :password, :password_confirmation, :remember_me, :requested_group, :group_ids, :groups_users_attributes, :app_infos
 
   before_create :add_requested_group
 

data/app/views/groups_users/show_group.html.erb

@@ -54,7 +54,7 @@
               <% unless groups_user.user.app_infos.nil? %>
                 <dl class="dl-horizontal">
                   <% groups_user.user.app_infos.sort.each do |key, value| %>
-                    <dt><%= key %></dt>
+                    <dt title="<%= key %>"><%= key %></dt>
                     <dd><%= value %></dd>
                   <% end %>
                 </dl>

data/config/initializers/devise.rb

@@ -102,8 +102,6 @@ Devise.setup do |config|
   # config.confirmation_keys = [ :email ]
 
   # ==> Configuration for :rememberable
-  
-  config.use_salt_as_remember_token = true
 
   # The time the user will be remembered without asking for credentials again.
   # config.remember_for = 2.weeks

data/gb_mapfish_appserver.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files  = s.files.grep(%r{^(test|spec|features)/})
 
+  s.required_ruby_version = '>= 2.3'
+
   s.add_dependency "rails", "~> 3.2.13"
   s.add_dependency "json"
   s.add_dependency "acts_as_tree", "0.2.0"
@@ -25,15 +27,17 @@ Gem::Specification.new do |s|
   s.add_dependency "rails_admin", "~> 0.4.9"
 
   s.add_dependency "fastercsv" # required for rails_admin and Ruby <= 1.8
-  s.add_dependency "sass", "~> 3.2.12" # rails_admin 0.0.5 does not work with sass >=3.3
 
-  s.add_dependency "GeoRuby", ">= 0.1.4" #used for reading envelope, e.g. in GeoModel#bbox
+  # bootstrap-sass 2.3.2.2 throws 'NoMethodError: undefined method `load_paths' for Sass:Module'
+  s.add_dependency "bootstrap-sass", "2.2.2.0"
+
+  s.add_dependency "georuby" #"~- 0.1.4" #used for reading envelope, e.g. in GeoModel#bbox
 
   s.add_dependency "rgeo", "~> 0.3.20"
   s.add_dependency "rgeo-geojson", "~> 0.2.3"
 
   s.add_dependency "hpricot" # Cascaded WMS FeatureInfo parsing
 
-  s.add_dependency "pg", "~> 0.14.0"
+  s.add_dependency "pg", ">= 0.18.0"
   s.add_dependency "activerecord-postgis-adapter", "0.4.1"
 end

data/lib/gb_mapfish_appserver/core_extensions.rb

@@ -21,9 +21,30 @@ module GbMapfishAppserver
   module Array
 
     def to_geojson(options = {})
+      # get CRS from first feature
+      if any? && first.respond_to?('geojson_srid')
+        crs = first.geojson_srid
+        # skip GeoJSON CRS in features
+        options.merge!({:skip_feature_crs => true})
+      end
+
       geojson = '{"type": "FeatureCollection", "features": ['
       geojson << collect {|e| e.to_geojson(options) }.join(',')
-      geojson << ']}'
+      geojson << ']'
+
+      unless crs.blank?
+        # add top level GeoJSON CRS
+        geojson << ', "crs": '
+        geojson << {
+          :type => 'name',
+          :properties => {
+            :name => crs
+          }
+        }.to_json
+      end
+
+      geojson << '}'
+
       geojson
     end
 

data/lib/gb_mapfish_appserver/engine.rb

@@ -1,5 +1,26 @@
 require 'cancan'
 require 'devise'
+
+# workaround for using safe_yaml < 1.0.4 with Psych instead of syck to avoid side-effects on YAML behaviour of other gems
+# see also https://github.com/dtao/safe_yaml/commit/25e2e156371f8846e7e1918a9e216e89473c57f8
+require 'yaml'
+if !defined?(YAML::ENGINE) && defined?(Psych) && YAML == Psych
+  module YAML
+    # define temporary dummy YAML::ENGINE.yamler to init SafeYAML::YAML_ENGINE with 'psych'
+    # see also https://github.com/dtao/safe_yaml/blob/0.9.7/lib/safe_yaml.rb#L6
+    class DummyEngine
+      def self.yamler
+        "psych"
+      end
+    end
+    ENGINE = DummyEngine
+    require 'safe_yaml'
+
+    # remove YAML::ENGINE
+    remove_const :ENGINE
+  end
+end
+
 require 'rails_admin'
 
 module GbMapfishAppserver

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "1.1.1"
+  VERSION = "2.0.0"
 end

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

@@ -1,3 +1,5 @@
+# NOTE: add '*' around geometry column names, so it will be transformed to the client srid in the query, e.g. "Box2d(*geom*)"
+
 SEARCHRULES = {
 }
 

data/test/dummy/config/environments/development.rb

@@ -42,6 +42,7 @@ MAPSERV_SERVER = 'http://localhost' #nil for current application server
 MAPSERV_URL = '/cgi-bin/mapserv'
 MAPSERV_CGI_URL = '/cgi-bin/mapserv'
 MAPPATH = '/home/pi/code/rails/gb_mapfish_appserver/test/dummy/mapconfig'
+MAPSERV_REDIRECT = true  # Redirect public WMS to MAPSERV_SERVER URL
 
 #Internal URL of print servlet (nil: print-standalone)
 PRINT_URL = nil #'http://localhost:8080/mapfish_print/print/myapp'

data/test/dummy/config/environments/production.rb

@@ -72,6 +72,7 @@ MAPSERV_SERVER = 'http://localhost' #nil for current application server
 MAPSERV_URL = '/cgi-bin/mapserv.fcgi'
 MAPSERV_CGI_URL = '/cgi-bin/mapserv'
 MAPPATH = '/home/pi/code/rails/dummy/mapconfig'
+MAPSERV_REDIRECT = true  # Redirect public WMS to MAPSERV_SERVER URL
 
 #Internal URL of print servlet (nil: print-standalone)
 PRINT_URL = nil #'http://localhost:8080/mapfish_print/print/myapp'

data/test/dummy/config/environments/test.rb

@@ -42,6 +42,7 @@ MAPSERV_SERVER = 'http://localhost' #nil for current application server
 MAPSERV_URL = '/cgi-bin/mapserv.fcgi'
 MAPSERV_CGI_URL = '/cgi-bin/mapserv'
 MAPPATH = '/home/pi/code/rails/dummy/mapconfig'
+MAPSERV_REDIRECT = true  # Redirect public WMS to MAPSERV_SERVER URL
 
 #Internal URL of print servlet (nil: print-standalone)
 PRINT_URL = nil #'http://localhost:8080/mapfish_print/print/myapp'

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

@@ -30,6 +30,11 @@ DEFAULT_TOPIC = {
   SITE_DEFAULT => (Topic.first rescue nil) #Topic.where(:name => 'MainMap').first
 }
 
+# set default spatial reference system of database for geo factory
+GeoModel.set_default_rgeo_factory(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'))
+# set default spatial reference system for client requests
+GeoModel.set_default_client_srid(21781)
+
 DEFAULT_SCALE = 310000
 DEFAULT_X = 692000
 DEFAULT_Y = 252000

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

@@ -1,3 +1,5 @@
+# NOTE: add '*' around geometry column names, so it will be transformed to the client srid in the query, e.g. "Box2d(*geom*)"
+
 SEARCHRULES = {
 }
 

metadata

@@ -1,170 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Pirmin Kalberer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &4624460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *4624460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &4623660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4623660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: &4622600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *4622600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &4621780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *4621780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &4621180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *4621180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &4620360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.9
   type: :runtime
   prerelease: false
-  version_requirements: *4620360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &4618960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4618960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &4633360 !ruby/object:Gem::Requirement
-    none: false
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 2.2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *4633360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.2.0
 - !ruby/object:Gem::Dependency
-  name: GeoRuby
-  requirement: &4631940 !ruby/object:Gem::Requirement
-    none: false
+  name: georuby
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4631940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &4631200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.20
   type: :runtime
   prerelease: false
-  version_requirements: *4631200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: &4630040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *4630040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &4629180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4629180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &4627780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
-  version_requirements: *4627780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: activerecord-postgis-adapter
-  requirement: &4626740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *4626740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 description: Mapfish Appserver is a framework for web mapping applications using OGC
   standards and the Mapfish protocol.
 email:
@@ -173,7 +214,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -429,27 +470,26 @@ files:
 - test/test_helper.rb
 homepage: http://mapfish-appserver.github.io/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mapfish application server.
 test_files:
 - test/dummy/README.rdoc