use ST_Intersects to also find issues with complex geometries. #51

Author: jkraemer

lib/redmine_gtt/patches/issue_query_patch.rb

@@ -111,17 +111,13 @@ def sql_for_bbox_field(field, operator, value)
         # box = "ST_Polygon(ST_GeomFromText('LINESTRING(#{coordinates})'), 4326)"
         # "#{not_in}ST_Contains(#{box}, ST_SetSRID(#{db_table}.geom, 4326))"
 
+
         # So instead, I came up with this:
-        "#{not_in}ST_MakeEnvelope(#{lng1},#{lat1},#{lng2},#{lat2}, 4326) ~ #{Issue.table_name}.geom"
-        # I am not sure about the implications of using ~ instead of one of
-        # the ST_ functions. Appears that it is a  PostgreSQL geometric
-        # operator, leading to casting the PostGIS values to a PostgreSQL
-        # geometric type. Fact is, this statement does not seem to care
-        # about the SRID (can even leave it out of the MakeEnvelope call).
-        # Doesn't feel right but works for my simple test case and is
-        # probably good enough for this simple case (bbox is a rectangle and
-        # other geometry is a point). We should check if indizes are actually
-        # used though.
+        # "#{not_in}ST_MakeEnvelope(#{lng1},#{lat1},#{lng2},#{lat2}, 4326) ~ #{Issue.table_name}.geom"
+        #
+        # And then with this, which also handles geometries that are not simple
+        # points:
+        "#{not_in} ST_Intersects(#{Issue.table_name}.geom, ST_MakeEnvelope(#{lng1},#{lat1},#{lng2},#{lat2}, 4326))"
       end
 
       private

test/integration/issue_filter_api_test.rb

@@ -48,6 +48,16 @@ class IssueFilterApiTest < Redmine::ApiTest::Base
     }
   }
 
+  POLY_IN = {
+    'type' => 'Feature',
+    'geometry' => {
+      'type' => 'Polygon',
+      'coordinates' => [
+        [[123.269691,9.305099], [123.279691,9.305099],[123.279691,9.405099],[123.269691,9.405099]]
+      ]
+    }
+  }
+
   # x1,y1,x2,y2 (Lng1,Lat1,...)
   BBOX = '123.193645|9.256139|123.331833|9.364216'
 
@@ -204,4 +214,32 @@ class IssueFilterApiTest < Redmine::ApiTest::Base
     assert_equal issue_out.id, data['issues'][0]['id']
   end
 
+
+  test 'should find polygon included in bounding box' do
+
+    get '/projects/ecookbook/issues.json', params: { status_id: 'o' }
+
+    assert_response :success
+    assert data = JSON.parse(response.body)
+    assert_equal 6, data['issues'].size
+
+    issue_in = @project.issues.find 1
+    issue_in.update_attribute :geojson, POLY_IN.to_json
+
+    issue_out = @project.issues.find 2
+    issue_out.update_attribute :geojson, POINT_OUT.to_json
+
+    # find everyting inside the given box
+    # using the shorter API parameter format
+
+    get '/projects/ecookbook/issues.json', params: {
+      status_id: 'o', bbox: "=#{BBOX}"
+    }
+    assert_response :success
+    assert data = JSON.parse(response.body)
+    assert_equal 1, data['issues'].size
+    assert_equal issue_in.id, data['issues'][0]['id']
+  end
+
+
 end