gb_mapfish_appserver 1.0.4 → 1.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDkwNmRiMzFiNzAxNzU0MDQzYTlmYzg4MTQ0YTY3Y2U1ODgwYWJiNA==
+    Y2VlMzQ0NmQzYjJhMTA0ZmYwMWY4OGE4MmUzMTI4ZGFlMDJmZmVhOQ==
   data.tar.gz: !binary |-
-    ODMzNjQyNzA1MzdlYTlhYWU4MWNhY2NkODI1M2I3NDM5NDliYjMxYQ==
+    NmIxZmI0NGNjMzU5ZDVlOGE3ODE1MTU1ZDNhZmVlMTU3YjU2NWQ2Zg==
 SHA512:
   metadata.gz: !binary |-
-    MmZkZjUwMDFjNWE4NWFmNGY1ZDUwNTBlMjUyYzZmMjNjNWJmNDZmYTQwOTcw
-    OTNlM2Y0NWU0YjJjYTVhZjllODBmNjgwODYxNzJhZmE5MGVhNzhkMmRkNWY0
-    OWEwMTI1YzQ5NzEyYzMwMTE1YWMwMTYxNjViYWEyMjUwODNhMDU=
+    ZDRiOGFiYzU5Y2I5NGQ4ZGY4NDdjNDllMWViZDAzMGU2MTI0YjJiNzhmOTU3
+    M2UzNWZlMzc5NGNmZWRiYjdmYTUwNjUzMjBlZDc3ZTAwZjJhYjZlYTkwNWQ2
+    NjJmMDVlZDdkNDk3ZWExZTdlMWZkM2EyYWZlY2IxNDkxMzkxYTQ=
   data.tar.gz: !binary |-
-    ZWJiNmZlZGVmYjZkMDZlOGQ2NmZlODE4MjQ0MGQyYWRhNTU2MzJmNGU5OGFl
-    NDE1NGI3ZTZhMWJmZDIxNzRjMGZmMjIyN2NhNDA2ZjAyODFlZDMwODZlYmUx
-    NDA5NzVlZTA4ZGM3MDJhZGEzNGQ3ODBmY2U3NGRhYTljNDRkOWE=
+    YWRmNTBmNjIxMWZhYzk4ZWM2YWE3MWQ4NDc4MmIxY2U4MDYxMWFmMzAxNDg1
+    MTFlYjM1ZTliM2RmYzYyZmVhNzgwOTE2NGFiMDlhNDQyYzQ2NmY0ZjQyMTdh
+    MGIwY2Y1NGNlNzExZTE1ZTA5OGM5ZmUwOGM5MjgxNmY1ZDY4MzU=

data/app/controllers/geo_controller.rb

@@ -53,14 +53,14 @@ class GeoController < ApplicationController
   end
 
   def update
-    feature = geo_model.user_filter(current_ability).geojson_decode(request.raw_post)
+    feature = geo_model.geojson_decode(request.raw_post)
     if feature.nil?
       head :bad_request
       return
     end
 
     if feature.feature_id.is_a? Integer
-      @feature = geo_model.find(feature.feature_id)
+      @feature = geo_model.user_filter(current_ability).find_by_id(feature.feature_id)
     end
     if @feature.nil?
       head :not_found

data/app/models/geo_model.rb

@@ -84,8 +84,14 @@ class GeoModel < ActiveRecord::Base
   #end
 
   def bbox
-    envelope = GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(extent).envelope #TODO: replace with rgeo
-    [envelope.lower_corner.x, envelope.lower_corner.y, envelope.upper_corner.x, envelope.upper_corner.y]
+    box_query = "Box2D(#{connection.quote_column_name(self.class.geometry_column_name)})"
+    extent = self.class.select("ST_XMin(#{box_query}), ST_YMin(#{box_query}), ST_XMax(#{box_query}), ST_Ymax(#{box_query})").find(id)
+    [
+      extent.st_xmin.to_f,
+      extent.st_ymin.to_f,
+      extent.st_xmax.to_f,
+      extent.st_ymax.to_f
+    ]
   end
 
   # based on mapfish_filter

data/app/models/user.rb

@@ -25,7 +25,15 @@ class User < ActiveRecord::Base
   before_create :add_requested_group
 
   def has_role?(rolename)
-    roles.any? { |role| role.name == rolename.to_s }
+    has_role = roles.any? { |role| role.name == rolename.to_s }
+    unless has_role
+      # check roles from groups
+      groups.each do |group|
+        has_role = group.roles.any? { |role| role.name == rolename.to_s }
+        break if has_role
+      end
+    end
+    has_role
   end
 
   def group_admin?(group)

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Pirmin Kalberer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails