gb_mapfish_appserver 0.8.5 → 0.8.6

data/app/controllers/wms_controller.rb

@@ -99,7 +99,7 @@ class WmsController < ApplicationController
       post_params += url.query.split(/&|=/) if url.query
       data = Hash[*post_params]
       data.merge!(params)
-      data.merge!('SLD_BODY' => request.query_string.split(/SLD_BODY=/)[-1]) if request.query_string.include?('SLD_BODY=')
+      data.merge!('SLD_BODY' => URI.unescape(request.query_string.split(/SLD_BODY=/)[-1])) if request.query_string.include?('SLD_BODY=')
       logger.info "WMS POST with #{data.inspect}"
       req.set_form_data(data)
       result = http.request(req)
@@ -114,11 +114,12 @@ class WmsController < ApplicationController
         logger.info "Selection layer '#{params[:SELECTION][:LAYER]}' not found in topic '#{topic.name}'"
         return
       end
-      #Remove non-WMS params
-      request.env["QUERY_STRING"].gsub!(/&SELECTION.+?(?=&)/, '')
       # add serverside SLD for selection
       request.env["QUERY_STRING"] += "&SLD_BODY=" + URI.escape(
         sld_selection(layer, params[:SELECTION][:PROPERTY], params[:SELECTION][:VALUES].split(',')))
+      # Remove non-WMS params
+      request.env["QUERY_STRING"].gsub!(/&SELECTION.+?(?=&)/, '')
+      params.delete[:SELECTION]
     end
   end
 

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10191320 !ruby/object:Gem::Requirement
+  requirement: &17068080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *10191320
+  version_requirements: *17068080
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10190900 !ruby/object:Gem::Requirement
+  requirement: &17067660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10190900
+  version_requirements: *17067660
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: &10190360 !ruby/object:Gem::Requirement
+  requirement: &17067120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *10190360
+  version_requirements: *17067120
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &10189860 !ruby/object:Gem::Requirement
+  requirement: &17066620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *10189860
+  version_requirements: *17066620
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &10189400 !ruby/object:Gem::Requirement
+  requirement: &17066160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *10189400
+  version_requirements: *17066160
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &8516900 !ruby/object:Gem::Requirement
+  requirement: &17065700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *8516900
+  version_requirements: *17065700
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &8516240 !ruby/object:Gem::Requirement
+  requirement: &17065320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8516240
+  version_requirements: *17065320
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &8514440 !ruby/object:Gem::Requirement
+  requirement: &17064780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *8514440
+  version_requirements: *17064780
 - !ruby/object:Gem::Dependency
   name: GeoRuby
-  requirement: &8513800 !ruby/object:Gem::Requirement
+  requirement: &17064280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *8513800
+  version_requirements: *17064280
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &8513120 !ruby/object:Gem::Requirement
+  requirement: &17063820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 0.3.20
   type: :runtime
   prerelease: false
-  version_requirements: *8513120
+  version_requirements: *17063820
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: &8512260 !ruby/object:Gem::Requirement
+  requirement: &14277180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,10 +131,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *8512260
+  version_requirements: *14277180
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &8511780 !ruby/object:Gem::Requirement
+  requirement: &14275860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8511780
+  version_requirements: *14275860
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &8510600 !ruby/object:Gem::Requirement
+  requirement: &14274280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -153,10 +153,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *8510600
+  version_requirements: *14274280
 - !ruby/object:Gem::Dependency
   name: activerecord-postgis-adapter
-  requirement: &10221660 !ruby/object:Gem::Requirement
+  requirement: &14273000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,7 +164,7 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *10221660
+  version_requirements: *14273000
 description: Mapfish Appserver is a framework for web mapping applications using OGC
   standards and the Mapfish protocol.
 email: