gb_mapfish_appserver 0.0.7 → 0.8.0

data/app/models/layer.rb

@@ -181,13 +181,13 @@ EOS
       "BBOX=#{x1},#{y1},#{x1+dist},#{y1+dist}",
       "WIDTH=100",
       "HEIGHT=100",
-      "X=0",
-      "Y=99"
+      "X=0", "I=0",
+      "Y=99", "J=99"
     ]
     url = "#{table}&#{params.join('&')}"
     logger.debug "*** Cascaded GetFeatureInfo: #{url}"
     uri = URI.parse(url)
-    http = Net::HTTP::new(uri.host, uri.port)
+    http = Net::HTTP::new(uri.host, uri.port, nil, CASCADED_PROXY_PORT, CASCADED_PROXY_USER, CASCADED_PROXY_PASS)
     response = http.request(Net::HTTP::Get.new(uri.request_uri))
     #logger.debug response.body
     info_features = parse_ogc_gml(response.body)

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "0.0.7"
+  VERSION = "0.8.0"
 end

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

@@ -29,3 +29,10 @@ DEFAULT_Y = 252000
 
 # regex for WMS parameters to detect if layer filter is used
 LAYER_FILTER_REGEX = /^filter_.+$/i
+
+# Proxy for cascaded WMS Feature requests
+# See also http://www.ruby-doc.org/stdlib-1.9.3/libdoc/net/http/rdoc/Net/HTTP.html#method-c-Proxy
+CASCADED_PROXY_ADDR = nil #Ruby 2.0 supports :ENV for using http_proxy environment variable
+CASCADED_PROXY_PORT = nil
+CASCADED_PROXY_USER = nil
+CASCADED_PROXY_PASS = nil

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

@@ -29,3 +29,10 @@ DEFAULT_Y = 252000
 
 # regex for WMS parameters to detect if layer filter is used
 LAYER_FILTER_REGEX = /^filter_.+$/i
+
+# Proxy for cascaded WMS Feature requests
+# See also http://www.ruby-doc.org/stdlib-1.9.3/libdoc/net/http/rdoc/Net/HTTP.html#method-c-Proxy
+CASCADED_PROXY_ADDR = nil #Ruby 2.0 supports :ENV for using http_proxy environment variable
+CASCADED_PROXY_PORT = nil
+CASCADED_PROXY_USER = nil
+CASCADED_PROXY_PASS = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &18404660 !ruby/object:Gem::Requirement
+  requirement: &11560700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *18404660
+  version_requirements: *11560700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &18404240 !ruby/object:Gem::Requirement
+  requirement: &11560280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18404240
+  version_requirements: *11560280
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: &18403600 !ruby/object:Gem::Requirement
+  requirement: &11559640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *18403600
+  version_requirements: *11559640
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &18419260 !ruby/object:Gem::Requirement
+  requirement: &11575340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *18419260
+  version_requirements: *11575340
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &18417360 !ruby/object:Gem::Requirement
+  requirement: &11573460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *18417360
+  version_requirements: *11573460
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &18416340 !ruby/object:Gem::Requirement
+  requirement: &11572440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *18416340
+  version_requirements: *11572440
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &18415800 !ruby/object:Gem::Requirement
+  requirement: &11571900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18415800
+  version_requirements: *11571900
 - !ruby/object:Gem::Dependency
   name: GeoRuby
-  requirement: &18415240 !ruby/object:Gem::Requirement
+  requirement: &11571320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *18415240
+  version_requirements: *11571320
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &18414680 !ruby/object:Gem::Requirement
+  requirement: &11570760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 0.3.20
   type: :runtime
   prerelease: false
-  version_requirements: *18414680
+  version_requirements: *11570760
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: &18414000 !ruby/object:Gem::Requirement
+  requirement: &11570080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *18414000
+  version_requirements: *11570080
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &18413540 !ruby/object:Gem::Requirement
+  requirement: &11569620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18413540
+  version_requirements: *11569620
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &18412980 !ruby/object:Gem::Requirement
+  requirement: &11569060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,10 +142,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *18412980
+  version_requirements: *11569060
 - !ruby/object:Gem::Dependency
   name: activerecord-postgis-adapter
-  requirement: &18412480 !ruby/object:Gem::Requirement
+  requirement: &11568560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -153,7 +153,7 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *18412480
+  version_requirements: *11568560
 description: Mapfish Appserver is a framework for web mapping applications using OGC
   standards and the Mapfish protocol.
 email:
@@ -418,7 +418,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 846968108135594134
+      hash: -4350569390926622826
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -427,7 +427,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 846968108135594134
+      hash: -4350569390926622826
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11