gb_mapfish_appserver 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2VlMzQ0NmQzYjJhMTA0ZmYwMWY4OGE4MmUzMTI4ZGFlMDJmZmVhOQ==
+    ZjcyMGM2NTljZDgyZjdhZmQ3YzA4MzNiYzFmMGFmM2IwZWY0ZmUzYg==
   data.tar.gz: !binary |-
-    NmIxZmI0NGNjMzU5ZDVlOGE3ODE1MTU1ZDNhZmVlMTU3YjU2NWQ2Zg==
+    ODFhZGY1NThiOGQ1ODkxMzRhY2U1MDQzZTcyNjUyYjAwYWU5NGFmZA==
 SHA512:
   metadata.gz: !binary |-
-    ZDRiOGFiYzU5Y2I5NGQ4ZGY4NDdjNDllMWViZDAzMGU2MTI0YjJiNzhmOTU3
-    M2UzNWZlMzc5NGNmZWRiYjdmYTUwNjUzMjBlZDc3ZTAwZjJhYjZlYTkwNWQ2
-    NjJmMDVlZDdkNDk3ZWExZTdlMWZkM2EyYWZlY2IxNDkxMzkxYTQ=
+    OThjMDNmNWIwM2FkODMwN2Y0OTQ0NjZiYjFjN2ViZjRmOTZhM2Q2MGNlOTlk
+    M2RjNjliNWYxZDgyYjRjMTRjOTM5NzU1YWMxNDg4YzZhYjg5ZGJhMDFjNWQ5
+    YzZmYzNlMGNmYTI5M2NkNDMyYWY1ZjY1NzczOWI1MDBhNTgzYWY=
   data.tar.gz: !binary |-
-    YWRmNTBmNjIxMWZhYzk4ZWM2YWE3MWQ4NDc4MmIxY2U4MDYxMWFmMzAxNDg1
-    MTFlYjM1ZTliM2RmYzYyZmVhNzgwOTE2NGFiMDlhNDQyYzQ2NmY0ZjQyMTdh
-    MGIwY2Y1NGNlNzExZTE1ZTA5OGM5ZmUwOGM5MjgxNmY1ZDY4MzU=
+    MTFjMzlhMzM3MmVlNWQ5NWE5MzFjY2E5OWQ1NmU0NjdiNmIxN2I0MWIyNzkx
+    NzYwMzQ3MjFjZGMzZDhjNjg5NjJmNTVjOWMyMGE0MDFlYjliMTk4NWE1Yzli
+    MmY1YjAyNmIyNTllNmU0YjY1ODc5MzhlN2Y5ZTAwNjgzOGU3ZDM=

data/app/controllers/geo_controller.rb

@@ -46,6 +46,7 @@ class GeoController < ApplicationController
         @features << new_feature
       else
         head :unprocessable_entity
+        return
       end
     end
 
@@ -53,18 +54,16 @@ class GeoController < ApplicationController
   end
 
   def update
-    feature = geo_model.geojson_decode(request.raw_post)
+    # NOTE: user_filter checks if model is editable
+    feature = geo_model.user_filter(current_ability).geojson_decode(request.raw_post)
     if feature.nil?
       head :bad_request
       return
     end
 
     if feature.feature_id.is_a? Integer
-      @feature = geo_model.user_filter(current_ability).find_by_id(feature.feature_id)
-    end
-    if @feature.nil?
-      head :not_found
-      return
+      # NOTE: user_filter may limit editable features; find raises RecordNotFound if feature cannot be found
+      @feature = geo_model.user_filter(current_ability).find(feature.feature_id)
     end
 
     if @feature.update_attributes_from_geojson_feature(feature, current_user)

data/app/models/geo_model.rb

@@ -84,14 +84,21 @@ class GeoModel < ActiveRecord::Base
   #end
 
   def bbox
-    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
-    ]
+    if respond_to?('extent')
+      # use extent from select(extent_field)
+      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]
+    else
+      # get Box2D for this feature
+      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
   end
 
   # based on mapfish_filter

data/app/models/layer.rb

@@ -76,6 +76,16 @@ class Layer < ActiveRecord::Base
         self.table_name = '#{table}'
         self.primary_key = '#{pkey}'
 
+        if self.primary_key == 'oid'
+          # include oid in attributes
+          default_scope select("*").select(self.primary_key)
+
+          # return oid as id
+          def id
+            read_attribute(self.class.primary_key)
+          end
+        end
+
         self
       end
 EOS

data/lib/gb_mapfish_appserver/version.rb

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

metadata

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