gb_mapfish_appserver 1.1.0 → 1.1.1

data/app/controllers/geo_controller.rb

@@ -81,24 +81,18 @@ class GeoController < ApplicationController
 
   private
 
-  # http://blog.plataformatec.com.br/2009/09/exporting-data-to-csv-and-excel-in-your-rails-app/
-  BOM = "\377\376" #Byte Order Mark
-
   def send_csv_excel(features)
     require 'csv'
-    require 'iconv'
-    export = StringIO.new
-    if features.size > 0
-      CSV::Writer.generate(export, "\t") do |csv|
-        csv << features.first.csv_header
-        features.each do |obj|
-          csv << obj.csv_row
-        end
+
+    # add byte order mark and use CRLF row breaks for Excel
+    bom = "\xEF\xBB\xBF"
+    csv_data = CSV.generate(bom, {:write_headers => true, :col_sep => ";", :row_sep => "\r\n"}) do |csv|
+      csv << features.first.csv_header unless features.empty?
+      features.each do |adresse|
+        csv << adresse.csv_row
       end
-      export.rewind
     end
-    csv_data = export.read
-    csv_data = BOM + Iconv.conv("utf-16le", "utf-8", csv_data)
+
     send_data(csv_data, :filename => "features_#{geo_model.table_name}.csv", :type => 'text/csv; header=present')
   end
 

data/app/controllers/print_controller.rb

@@ -476,8 +476,8 @@ class PrintController < ApplicationController
       'attributes' => {}
     }
 
-    # report
-    ['layout', 'outputFormat'].each do |k|
+    # report (NOTE: keep dpi for possible image conversion)
+    ['layout', 'outputFormat', 'dpi'].each do |k|
       print_params[k] = print_v2_params[k] if print_v2_params.has_key?(k)
     end
 

data/app/controllers/topics_controller.rb

@@ -42,15 +42,15 @@ class TopicsController < ApplicationController
       authorize! :show, topic
       query_topic['topicobj'] = topic
       if params['bbox']
-        query_topic['results'] = topic.query(current_ability, query_topic, params['bbox'], nearest)
+        query_topic['results'] = topic.query(current_ability, query_topic, params['bbox'], nearest, current_user)
       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, nearest)
+        query_topic['results'] = topic.query(current_ability, query_topic, rect, nearest, current_user)
       elsif params['circle']
-        query_topic['results'] = topic.query(current_ability, query_topic, params['circle'], nearest)
+        query_topic['results'] = topic.query(current_ability, query_topic, params['circle'], nearest, current_user)
       elsif params['poly']
-        query_topic['results'] = topic.query(current_ability, query_topic, params['poly'], nearest)
+        query_topic['results'] = topic.query(current_ability, query_topic, params['poly'], nearest, current_user)
       else
         # problem
       end

data/app/models/layer.rb

@@ -128,7 +128,7 @@ EOS
     allowed_fields
   end
 
-  def query(ability, query_topic, searchgeo, nearest=nil)
+  def query(ability, query_topic, searchgeo, nearest=nil, user=nil)
     # use layer setting by default
     nearest = search_nearest if nearest.nil?
 
@@ -154,7 +154,7 @@ EOS
           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)
+          feature_class.identify_query(self, query_topic, searchgeo, ability, user)
         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

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)
+  def query(ability, query_topic, searchbbox, nearest=nil, user=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)
+      result = layer.query(ability, query_topic, searchbbox, nearest, user)
       results << result unless result.nil?
     end
     results

data/lib/gb_mapfish_appserver/version.rb

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

metadata

@@ -1,211 +1,170 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
+  prerelease: 
 platform: ruby
 authors:
 - Pirmin Kalberer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4624460 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.13
+  version_requirements: *4624460
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4623660 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *4623660
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4622600 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+  version_requirements: *4622600
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4621780 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
+  version_requirements: *4621780
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4621180 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.8
+  version_requirements: *4621180
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4620360 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.9
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.9
+  version_requirements: *4620360
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4618960 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *4618960
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4633360 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.12
+  version_requirements: *4633360
 - !ruby/object:Gem::Dependency
   name: GeoRuby
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4631940 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.4
+  version_requirements: *4631940
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4631200 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.20
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.20
+  version_requirements: *4631200
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4630040 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.3
+  version_requirements: *4630040
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4629180 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *4629180
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4627780 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.0
+  version_requirements: *4627780
 - !ruby/object:Gem::Dependency
   name: activerecord-postgis-adapter
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4626740 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+  version_requirements: *4626740
 description: Mapfish Appserver is a framework for web mapping applications using OGC
   standards and the Mapfish protocol.
 email:
@@ -470,26 +429,27 @@ 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Mapfish application server.
 test_files:
 - test/dummy/README.rdoc
@@ -621,4 +581,3 @@ test_files:
 - test/gb_mapfish_appserver_test.rb
 - test/integration/navigation_test.rb
 - test/test_helper.rb
-has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmFkMTY4MDk4Njg0YTdmNmJlYTU3MjU5NmZkMjI4Mzg5MWI2ZmFiYw==
-  data.tar.gz: !binary |-
-    MDczMjlkNmFiY2VjNjkwNzY3OWViNDNhMTUwMTE2MzI1NzgzZDg1Mg==
-SHA512:
-  metadata.gz: !binary |-
-    ZmRhNmNhNGM1YTJjOGI5YmU3MTZkNjg3ZDRjZmRjZmNjMjA5ZGRlYTk5ODIx
-    NDBiMmZlMDllYWFmY2Y1MGE0OWE1YjNhY2E2MjQxNDVmZDFlOTgzNTM5YTA1
-    MzE2MTBmOTAwYWU0YjA4ZDRjN2FiYmQ5NDMzYzEyZmZhNDA4ZjI=
-  data.tar.gz: !binary |-
-    YTgyYTFmMWNhYWNmMjYyMDkxNDBmNjNkNDg0ZDMzYzE5MDI5ODM5ZDk0ZTZh
-    NjcwYThiNmZlYTM3ZmJhNTcyMzk2ZWFiZjQ3YWU0MzEwOWY4ODZlZTQxYjY0
-    MjY5YmZiZDMxZGYxMjc0NDAyMGRiZjQ4Y2M5MTBhMDE1NTJkN2M=