Merge branch 'develop' into 'master'

Develop

See merge request gtt/redmine_gtt!15

Author: dkastl

init.rb

@@ -5,7 +5,7 @@
   author 'Georepublic'
   author_url 'https://hub.georepublic.net/gtt/redmine_gtt'
   description 'Adds location-based task management and maps'
-  version '0.8.1'
+  version '0.9.0'
 
   requires_redmine :version_or_higher => '3.4.0'
 

lib/redmine_gtt/patches/projects_controller_patch.rb

@@ -6,6 +6,22 @@ def self.apply
         ProjectsController.prepend self unless ProjectsController < self
       end
 
+      # overrides index action to add spatial filtering to projects API listing
+      def index
+        respond_to do |format|
+          format.api {
+            scope = RedmineGtt::SpatialProjectsQuery.new(
+              contains: params[:contains],
+              projects: Project.visible.sorted
+            ).scope
+            @project_count = scope.count
+            @offset, @limit = api_offset_and_limit
+            @projects = scope.offset(@offset).limit(@limit).to_a
+          }
+          format.any { super }
+        end
+      end
+
       def show
         respond_to do |format|
           format.geojson { send_data(

lib/redmine_gtt/spatial_projects_query.rb

@@ -0,0 +1,24 @@
+module RedmineGtt
+  class SpatialProjectsQuery
+    def initialize(contains: nil, projects: Project.active.visible)
+      @contains = contains.presence
+      @projects = projects
+    end
+
+    QUERY_SQL = (<<-SQL
+      #{Project.table_name}.geom IS NOT NULL AND
+      ST_Intersects(#{Project.table_name}.geom, ST_GeomFromText('%s', 4326))
+    SQL
+                ).freeze
+
+    def scope
+      if @contains
+        @projects = @projects.where(
+          Project.send(:sanitize_sql_array, [ QUERY_SQL, @contains ])
+        )
+      end
+      @projects
+    end
+
+  end
+end

test/integration/projects_api_test.rb

@@ -0,0 +1,58 @@
+require_relative '../test_helper'
+
+class ProjectsApiTest < Redmine::IntegrationTest
+  fixtures :users, :email_addresses, :roles, :projects, :members, :member_roles
+
+  setup do
+    User.current = nil
+    @project = Project.find 'ecookbook'
+    @project.enabled_modules.create name: 'gtt'
+  end
+
+  test 'should should filter projects by geometry' do
+    get '/projects.xml'
+    assert_response :success
+    xml = xml_data
+    assert projects = xml.xpath('/projects/project')
+    assert projects.any?
+    assert_equal Project.visible.count, projects.size
+
+    get '/projects.xml', contains: 'POINT(123.271 9.35)'
+    assert_response :success
+    xml = xml_data
+    assert projects = xml.xpath('/projects/project')
+    assert_equal 0, projects.size
+
+    @project.update_attribute :geojson, {
+      'type' => 'Feature',
+      'geometry' => {
+        'type' => 'Polygon',
+        'coordinates' => [
+          [[123.269691,9.305099], [123.279691,9.305099],[123.279691,9.405099],[123.269691,9.405099]]
+        ]
+      }
+    }.to_json
+
+    assert @project.visible?
+
+    get '/projects.xml', contains: 'POINT(123.271 9.55)'
+    assert_response :success
+    xml = xml_data
+    assert projects = xml.xpath('/projects/project')
+    assert_equal 0, projects.size
+
+    get '/projects.xml', contains: 'POINT(123.271 9.35)'
+    assert_response :success
+    xml = xml_data
+    assert projects = xml.xpath('/projects/project')
+    assert_equal 1, projects.size, xml.to_s
+    assert_equal 'ecookbook', projects.xpath('identifier').text
+
+  end
+
+  def xml_data
+    Nokogiri::XML(@response.body)
+  end
+end
+
+

test/test_helper.rb

@@ -3,11 +3,16 @@
 
 class GttTest < ActiveSupport::TestCase
 
+  def test_geojson
+    {'type'=>'Feature','geometry'=>{ 'type'=>'Polygon','coordinates'=> [[[135.22073422241215,34.70569060003112],[135.30227337646488,34.6990600142143],[135.3000417785645,34.670969984370885],[135.25283489990238,34.676052303889435],[135.1942125396729,34.67668404351015],[135.22073422241215,34.70569060003112]]]}}.to_json
+  end
+
   def test_geom
     RedmineGtt::Conversions::WkbToGeom.("01030000000100000006000000C84B374110E76040381DD011545A4140C84B3739ACE96040F07E6DCC7A594140C84B37F199E960403CBC2D58E2554140C84B373917E8604098CBC3E188564140C84B37FD36E66040F24C2E959D564140C84B374110E76040381DD011545A4140")
   end
 
   def assert_geojson(json)
+    json = JSON.parse json if json.is_a?(String)
     assert_equal 'Feature', json['type']
     assert geom = json['geometry']
     assert_equal 'Polygon', geom['type']

test/unit/gtt_map_test.rb

@@ -6,7 +6,7 @@ class GttMapTest < GttTest
     @ts = GttTileSource.create! name: 'test', type: 'ol.source.OSM'
   end
 
-  test 'should compute json from wkb' do
+  test 'should compute json from geom' do
     m = GttMap.new layers: [@ts], geom: test_geom
     assert_geojson m.json
   end

test/unit/issue_test.rb

@@ -6,7 +6,12 @@ class IssueTest < GttTest
   setup do
     @project = Project.find 'ecookbook'
     @issue = @project.issues.last
-    @issue.update_column :geom, test_geom
+    @issue.update_attribute :geojson, test_geojson
+    @issue = Issue.find @issue.id
+  end
+
+  test 'should have geom attribute' do
+    assert @issue.geom.present?
   end
 
   test 'should have geojson attribute' do

test/unit/project_test.rb

@@ -3,27 +3,27 @@
 class ProjectTest < GttTest
   fixtures :projects
 
-  test 'should have geojson attribute' do
-    p = Project.find 'ecookbook'
-    p.update_column :geom, test_geom
+  setup do
+    @p = Project.find 'ecookbook'
+    @p.update_attribute :geojson, test_geojson
+  end
 
-    assert_geojson p.geojson
+  test 'should have geojson and geom attribute' do
+    assert @p.geom.present?
+    assert_geojson @p.geojson
   end
 
   test 'should render properties in as_geojson' do
-    p = Project.find 'ecookbook'
-    p.update_column :geom, test_geom
-
-    j = p.as_geojson include_properties: true
+    j = @p.as_geojson include_properties: true
     assert_geojson j
-    assert_equal p.id, j['properties']['id']
-    assert_equal p.identifier, j['properties']['identifier']
-    assert_equal p.name, j['properties']['name']
+    assert_equal @p.id, j['properties']['id']
+    assert_equal @p.identifier, j['properties']['identifier']
+    assert_equal @p.name, j['properties']['name']
 
-    j = p.as_geojson include_properties: { only: [:id, :identifier] }
+    j = @p.as_geojson include_properties: { only: [:id, :identifier] }
     assert_geojson j
-    assert_equal p.id, j['properties']['id']
-    assert_equal p.identifier, j['properties']['identifier']
+    assert_equal @p.id, j['properties']['id']
+    assert_equal @p.identifier, j['properties']['identifier']
     assert_nil j['properties']['name']
   end
 

test/unit/user_test.rb

@@ -5,7 +5,11 @@ class UserTest < GttTest
 
   setup do
     @user = User.find_by_login 'dlopper'
-    @user.update_column :geom, test_geom
+    @user.update_attribute :geojson, test_geojson
+  end
+
+  test 'should set geom from json' do
+    assert @user.geom.present?
   end
 
   test 'should have geojson attribute' do