gb_mapfish_appserver 0.9.0 → 0.9.1

data/app/controllers/geo_controller.rb

@@ -7,7 +7,8 @@ class GeoController < ApplicationController
   end
 
   def index
-    @features = geo_model.bbox_filter(params).user_filter(current_ability)
+    @features = geo_model.bbox_filter(params)
+    @features = @features.user_filter(current_ability)
     respond_to do |format|
       # NOTE: return GeoJSON by default (OpenLayers.Protocol.HTTP PUT does not work with '.json' format selection)
       format.html {

data/app/controllers/print_controller.rb

@@ -69,8 +69,8 @@ class PrintController < ApplicationController
     layers_to_delete = []
     request.parameters["layers"].each do |layer|
       if layer["baseURL"] # WMS layers
-        topic = File.basename(URI.parse(layer["baseURL"]).path)
-        if accessible_topics.include?(topic)
+        topic_name = File.basename(URI.parse(layer["baseURL"]).path)
+        if accessible_topics.include?(topic_name)
           # rewrite URL for local WMS, use CGI if layer filter is used
           use_cgi = !layer["customParams"].nil? && layer["customParams"].any? { |param, value| param =~ LAYER_FILTER_REGEX }
           layer["baseURL"] = rewrite_wms_uri(layer["baseURL"], use_cgi)
@@ -330,7 +330,7 @@ class PrintController < ApplicationController
       }
       if request.parameters["pages"]
         page = request.parameters["pages"].first
-        %w(scale rotation base_url user_title user_comment).each do |mfparam|
+        %w(scale rotation base_url user_title user_comment topics2print withlegend).each do |mfparam|
           call_params[mfparam.upcase] = page[mfparam]
         end
         call_params[:MAP_BBOX] = page["extent"].join(',')

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &23267300 !ruby/object:Gem::Requirement
+  requirement: &26064120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *23267300
+  version_requirements: *26064120
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &23281540 !ruby/object:Gem::Requirement
+  requirement: &26063700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23281540
+  version_requirements: *26063700
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: &23280980 !ruby/object:Gem::Requirement
+  requirement: &26062900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *23280980
+  version_requirements: *26062900
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &23280440 !ruby/object:Gem::Requirement
+  requirement: &26062100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *23280440
+  version_requirements: *26062100
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &23279720 !ruby/object:Gem::Requirement
+  requirement: &26061160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *23279720
+  version_requirements: *26061160
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &23279060 !ruby/object:Gem::Requirement
+  requirement: &26060420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *23279060
+  version_requirements: *26060420
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &23278480 !ruby/object:Gem::Requirement
+  requirement: &26060000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23278480
+  version_requirements: *26060000
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &23277660 !ruby/object:Gem::Requirement
+  requirement: &26059400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *23277660
+  version_requirements: *26059400
 - !ruby/object:Gem::Dependency
   name: GeoRuby
-  requirement: &23276940 !ruby/object:Gem::Requirement
+  requirement: &26066080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *23276940
+  version_requirements: *26066080
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &23276220 !ruby/object:Gem::Requirement
+  requirement: &26065380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.3.20
   type: :runtime
   prerelease: false
-  version_requirements: *23276220
+  version_requirements: *26065380
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: &23275540 !ruby/object:Gem::Requirement
+  requirement: &26064380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *23275540
+  version_requirements: *26064380
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &23274960 !ruby/object:Gem::Requirement
+  requirement: &26063840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23274960
+  version_requirements: *26063840
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &23290800 !ruby/object:Gem::Requirement
+  requirement: &26062800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *23290800
+  version_requirements: *26062800
 - !ruby/object:Gem::Dependency
   name: activerecord-postgis-adapter
-  requirement: &23290300 !ruby/object:Gem::Requirement
+  requirement: &26061400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,7 +164,7 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *23290300
+  version_requirements: *26061400
 description: Mapfish Appserver is a framework for web mapping applications using OGC
   standards and the Mapfish protocol.
 email: