Merge branch 'develop' into 'master'

Develop

See merge request gtt/redmine_gtt!17

Author: dkastl

Gemfile

@@ -5,5 +5,5 @@ gem 'immutable-struct'
 gem "rgeo"
 gem "rgeo-geojson"
 gem "rgeo-activerecord"
-gem "pg"
+gem "pg", "~> 0.15" # make sure we use a version compatible with AR
 gem 'activerecord-postgis-adapter', '~> 3.1'

app/views/issues/index.api.rsb

@@ -21,7 +21,7 @@ api.array :issues, api_meta(:total_count => @issue_count, :offset => @offset, :l
       api.estimated_hours issue.estimated_hours
 
       if issue.geom
-        api.geojson issue.geojson
+        api.geojson issue.geojson.to_json
       else
         api.geojson ""
       end

app/views/projects/index.api.rsb

@@ -9,10 +9,12 @@ api.array :projects, api_meta(:total_count => @project_count, :offset => @offset
       api.status      project.status
       api.is_public   project.is_public?
 
-      if project.geom
-        api.geojson project.geojson
-      else
-        api.geojson ""
+      if @include_geometry
+        if project.geom
+          api.geojson project.geojson.to_json
+        else
+          api.geojson ""
+        end
       end
 
       render_api_custom_values project.visible_custom_field_values, api

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.9.1'
+  version '1.0.0'
 
   requires_redmine :version_or_higher => '3.4.0'
 

lib/redmine_gtt/conversions.rb

@@ -48,6 +48,14 @@ def call(wkb)
       end
     end
 
+    def self.to_feature(geometry, properties: {})
+      geometry = JSON.parse geometry if geometry.is_a?(String)
+      {
+        'type' => 'Feature',
+        'geometry' => geometry,
+        'properties' => properties
+      }
+    end
 
     # Turns database WKB into geometry attribute string
     def self.wkb_to_json(wkb, id: nil, properties: nil)

lib/redmine_gtt/patches/geojson_attribute.rb

@@ -7,18 +7,26 @@ module GeojsonAttribute
       def self.prepended(base)
         base.extend ClassMethods
         base.class_eval do
+          # if this wouldnt break count, this would be really nice:
+          #default_scope ->{ select "#{table_name}.*, ST_AsGeoJson(#{table_name}.geom) as geojson" }
           scope :geojson, ->(include_properties: false){
             data = []
             where.not(geom: nil).
-              find_in_batches.each{|group| group.each{|o|
+              select("#{table_name}.*, #{geojson_attribute_select}").
+              find_each{|o|
                 data << o.geojson_params(include_properties)
-              }}
+              }
             Conversions::GeomToJson.new.collection_to_json data
           }
         end
       end
 
       module ClassMethods
+
+        def geojson_attribute_select
+          "ST_AsGeoJson(#{table_name}.geom) as db_geojson"
+        end
+
         def array_to_geojson(array, include_properties: false)
           Conversions::GeomToJson.new.collection_to_json(
             array.map{ |o|
@@ -47,9 +55,12 @@ def geojson_additional_properties(include_properties = false)
 
       # returns the geojson attribute for reading / writing to the DB
       def geojson
-        @geojson ||= if geom.present?
-          Conversions.geom_to_json geom
-        end
+        @geojson ||= if respond_to?(:db_geojson) && db_geojson.present?
+                       # use the value returned by ST_AsGeoJson
+                       Conversions.to_feature db_geojson
+                     elsif geom.present?
+                       Conversions.geom_to_json geom
+                     end
       end
 
       # sets the geojson attribute for reading / writing to the DB

lib/redmine_gtt/patches/issue_patch.rb

@@ -7,13 +7,15 @@ def self.apply
         unless Issue < self
           Issue.prepend self
           Issue.prepend GeojsonAttribute
+          Issue.extend ClassMethods
           Issue.class_eval do
             attr_reader :distance
             safe_attributes "geojson",
               if: ->(issue, user){
                 perm = issue.new_record? ? :add_issues : :edit_issues
                 user.allowed_to? perm, issue.project
               }
+
           end
         end
       end
@@ -24,6 +26,23 @@ def map
           bounds: (new_record? ? project.map.json : json)
       end
 
+      module ClassMethods
+        def load_geojson(issues)
+          if issues.any?
+            geometries_by_id = Hash[
+              Issue.
+              where(id: issues.map(&:id)).
+              pluck(:id, Issue.geojson_attribute_select)
+            ]
+            issues.each do |issue|
+              issue.instance_variable_set(
+                "@geojson", Conversions.to_feature(geometries_by_id[issue.id])
+              )
+            end
+          end
+        end
+      end
+
     end
 
   end

lib/redmine_gtt/patches/issue_query_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RedmineGtt
   module Patches
     module IssueQueryPatch
@@ -13,6 +15,9 @@ def self.prepended(base)
 
       def issues(*_)
         super.tap do |issues|
+          if load_geojson? || has_column?(:geom)
+            Issue.load_geojson(issues)
+          end
           if center = find_center_point
             load_distances(issues, center)
           end
@@ -21,6 +26,13 @@ def issues(*_)
         raise ::Query::StatementInvalid.new(e.message)
       end
 
+      def load_geojson
+        @load_geojson = true
+      end
+      def load_geojson?
+        !!@load_geojson
+      end
+
       def available_columns
         return @available_columns if @available_columns
 
@@ -75,7 +87,7 @@ def sql_for_distance_field(field, operator, value)
           # or ['meters_min', 'meters_max', 'lng', 'lat'] if op == '><'
           lng, lat = value.last(2).map(&:to_f)
           distance = value.first.to_i
-          sql = "ST_Distance_Sphere(#{Issue.table_name}.geom, ST_GeomFromText('POINT(#{lng} #{lat})',4326))"
+          sql = +"ST_Distance_Sphere(#{Issue.table_name}.geom, ST_GeomFromText('POINT(#{lng} #{lat})',4326))"
           if operator == '><'
             distance_max = value[1].to_i
             sql << " BETWEEN #{distance} AND #{distance_max}"

lib/redmine_gtt/patches/issues_controller_patch.rb

@@ -22,6 +22,11 @@ def show
         end
       end
 
+      def retrieve_query(*_)
+        return @query if @query
+        super
+      end
+      private :retrieve_query
 
       def index
         retrieve_query
@@ -36,6 +41,7 @@ def index
                 :filename => "issues.geojson"
               )
             }
+            format.api { @query.load_geojson; super }
             format.any { super }
           end
         else

lib/redmine_gtt/patches/projects_controller_patch.rb

@@ -10,11 +10,14 @@ def self.apply
       def index
         respond_to do |format|
           format.api {
-            scope = RedmineGtt::SpatialProjectsQuery.new(
+            @include_geometry = params[:include] == 'geometry'
+            query = RedmineGtt::SpatialProjectsQuery.new(
               contains: params[:contains],
+              geometry: @include_geometry,
               projects: Project.visible.sorted
-            ).scope
-            @project_count = scope.count
+            )
+            scope = query.scope
+            @project_count = query.count
             @offset, @limit = api_offset_and_limit
             @projects = scope.offset(@offset).limit(@limit).to_a
           }