spatial_features 2.12.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '035228e67c042788f246694fb215346e72303a7eebe7052cec11a01db0b26ab7'
-  data.tar.gz: 4361a0cf3ffa83dfddbe54a35717b2dd31633245fc28438dace60675a2058147
+  metadata.gz: 0aa9e8be0d78cabc65695247e3000bcc2d69ce75aeffe1333b0dd5ce423eb562
+  data.tar.gz: 587dc7a4be41c38acd66de43864ed3b8b51f22186996fcdd2c906c01ee97102e
 SHA512:
-  metadata.gz: c0e3d96ed8f19a968fbb1ff9fb583091cd7a6565a86d288977baf87eeea6be0412ee52321a24a911baaeb5326d1aa32bf65c176a992d1357e0055c06ad580bb5
-  data.tar.gz: 796f292feae7681fd6e4f6b3785421932d9a0a00585b17a5506c25f6399047cb04119e2bcae4db48f1418cace52267821a898fcbd84c1460026bb3dd8cabae26
+  metadata.gz: 75293b351a8bfa078b1eac5c02a7d5dcce3e6eaa15a1779e660d0ca1c8a1cf93be2ad30190946e8934f51301c8535cfda4a75d0af2d86d051ffdd79646f170eb
+  data.tar.gz: a725a65315d15a5885bd475dc6575969823cac93bc865f4dca3f583e602342a7b40a1afef2478264e74f29a79d44be8fb3528648144b10fe9d4c0a3d8f5858ab

data/app/models/abstract_feature.rb

@@ -17,7 +17,8 @@ class AbstractFeature < ActiveRecord::Base
   after_save :cache_derivatives, :if => :saved_change_to_geog?
 
   def self.cache_key
-    "#{maximum(:id)}-#{count}"
+    result = connection.select_one(all.select('max(id) AS max, count(*) AS count').to_sql)
+    "#{result['max']}-#{result['count']}"
   end
 
   def self.with_metadata(k, v)
@@ -148,10 +149,6 @@ class AbstractFeature < ActiveRecord::Base
     @make_valid
   end
 
-  def wkt
-    ActiveRecord::Base.connection.select_value("SELECT ST_ASEWKT('#{geom}')")
-  end
-
   private
 
   def make_valid

data/config/initializers/register_oids.rb

@@ -1,8 +1,8 @@
 module PostGISTypes
-  def initialize_type_map(mapping)
+  def initialize_type_map(m = type_map)
     super
-    register_class_with_limit mapping, 'geometry', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
-    register_class_with_limit mapping, 'geography', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
+    register_class_with_limit m, 'geometry', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
+    register_class_with_limit m, 'geography', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
   end
 end
 

data/lib/spatial_features.rb

@@ -3,9 +3,6 @@ require 'delayed_job_active_record'
 require 'rgeo/shapefile'
 require 'nokogiri'
 require 'zip'
-require 'googleauth'
-require 'google/apis/fusiontables_v2'
-require 'google/apis/drive_v3'
 
 # LIB
 require 'spatial_features/caching'
@@ -20,11 +17,6 @@ require 'spatial_features/has_spatial_features'
 require 'spatial_features/has_spatial_features/queued_spatial_processing'
 require 'spatial_features/has_spatial_features/feature_import'
 
-require 'spatial_features/has_fusion_table_features'
-require 'spatial_features/has_fusion_table_features/api'
-require 'spatial_features/has_fusion_table_features/configuration'
-require 'spatial_features/has_fusion_table_features/service'
-
 require 'spatial_features/importers/base'
 require 'spatial_features/importers/file'
 require 'spatial_features/importers/kml'
@@ -38,7 +30,6 @@ require 'spatial_features/engine'
 
 # Load the act method
 ActiveRecord::Base.send :extend, SpatialFeatures::ActMethod
-ActiveRecord::Base.send :extend, SpatialFeatures::FusionTables::ActMethod
 
 # Suppress date warnings when unzipping KMZ saved by Google Earth, see https://github.com/rubyzip/rubyzip/issues/112
 Zip.warn_invalid_date = false

data/lib/spatial_features/has_spatial_features.rb

@@ -36,12 +36,8 @@ module SpatialFeatures
       true
     end
 
-    # Add methods to generate cache keys for a record or all records of this class
-    # NOTE: features are never updated, only deleted and created, therefore we can
-    # tell if they have changed by finding the maximum id and count instead of needing timestamps
     def features_cache_key
-      # Do two separate queries because it is much faster for some reason
-      "#{name}/#{features.cache_key}"
+      "#{name}/#{aggregate_features.cache_key}"
     end
 
     def intersecting(other, options = {})
@@ -172,7 +168,7 @@ module SpatialFeatures
     end
 
     def features_cache_key
-      "#{self.class.name}/#{self.id}-#{features.cache_key}"
+      "#{self.class.name}/#{id}-#{has_spatial_features_hash? ? features_hash : aggregate_feature.cache_key}"
     end
 
     def polygons?
@@ -188,7 +184,11 @@ module SpatialFeatures
     end
 
     def features?
-      features.present?
+      if features.loaded?
+        features.present?
+      else
+        features.exists?
+      end
     end
 
     def intersects?(other)

data/lib/spatial_features/importers/kml.rb

@@ -14,10 +14,14 @@ module SpatialFeatures
             else
               metadata = {}
             end
-    
+
             next if blank_feature?(feature)
 
-            yield OpenStruct.new(:feature_type => sql_type, :geog => geom_from_kml(feature), :name => name, :metadata => metadata)
+            geog = geom_from_kml(feature)
+
+            next if geog.blank?
+
+            yield OpenStruct.new(:feature_type => sql_type, :geog => geog, :name => name, :metadata => metadata)
           end
         end
       end
@@ -27,7 +31,16 @@ module SpatialFeatures
       end
 
       def geom_from_kml(kml)
-        ActiveRecord::Base.connection.select_value("SELECT ST_GeomFromKML(#{ActiveRecord::Base.connection.quote(kml.to_s)})")
+        geom = nil
+
+        # Do query in a new thread so we use a new connection (if the query fails it will poison the transaction of the current connection)
+        Thread.new do
+          geom = ActiveRecord::Base.connection.select_value("SELECT ST_GeomFromKML(#{ActiveRecord::Base.connection.quote(kml.to_s)})")
+        rescue ActiveRecord::StatementInvalid => e # Discard Invalid KML features
+          geom = nil
+        end.join
+
+        return geom
       end
 
       def extract_metadata(placemark)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.12.0"
+  VERSION = "2.14.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,7 +20,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -87,34 +87,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: googleauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: google-api-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: chroma
   requirement: !ruby/object:Gem::Requirement
@@ -180,10 +152,6 @@ files:
 - lib/spatial_features/controller_helpers/spatial_extensions.rb
 - lib/spatial_features/download.rb
 - lib/spatial_features/engine.rb
-- lib/spatial_features/has_fusion_table_features.rb
-- lib/spatial_features/has_fusion_table_features/api.rb
-- lib/spatial_features/has_fusion_table_features/configuration.rb
-- lib/spatial_features/has_fusion_table_features/service.rb
 - lib/spatial_features/has_spatial_features.rb
 - lib/spatial_features/has_spatial_features/feature_import.rb
 - lib/spatial_features/has_spatial_features/queued_spatial_processing.rb
@@ -220,8 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Adds spatial methods to a model.

data/lib/spatial_features/has_fusion_table_features.rb

@@ -1,95 +0,0 @@
-module SpatialFeatures
-  module FusionTables
-    module ActMethod
-      def has_fusion_table_features(options = {})
-        class_attribute :fusion_table_features_options
-        self.fusion_table_features_options = options
-
-        after_update_features :expire_fusion_table
-
-        include InstanceMethods
-        extend ClassMethods
-      end
-    end
-
-    module ClassMethods
-      def to_fusion_condition
-        sanitize_sql(["spatial_model_id IN (?)", pluck(:id)])
-      end
-
-      def update_fusion_tables(group_options = {})
-        fusion_table_groups(group_options) do |fusion_table_id, records, group_features|
-          API.set_features(fusion_table_id, group_features, :colour => fusion_table_features_options[:colour])
-        end
-      end
-
-      def delete_fusion_tables(group_options = {})
-        fusion_table_groups(group_options) do |fusion_table_id, records, group_features|
-          API.delete_table(fusion_table_id)
-        end
-        @fusion_table_id_cache = nil
-      end
-
-      def acts_like_fusion_table_features?
-        true
-      end
-
-      def fusion_table_id_cache
-        @fusion_table_id_cache ||= Hash.new {|hash, table_name| hash[table_name] = API.find_or_create_table(table_name) }
-          .merge(API.tables.collect {|table| [table.name, table.table_id] }.to_h) # Warm the cache
-      end
-
-      private
-
-      def fusion_table_groups(only: [], except: [])
-        groups = all.group_by(&:fusion_table_id)
-        groups.select! {|fusion_table_id, _| Array.wrap(only).include?(fusion_table_id) } if only.present?
-        groups.select! {|fusion_table_id, _| !Array.wrap(except).include?(fusion_table_id) } if except.present?
-        groups.each do |fusion_table_id, records|
-          yield fusion_table_id, records, features.where(:spatial_model_id => records)
-        end
-      end
-    end
-
-    module InstanceMethods
-      def acts_like_fusion_table_features?
-        true
-      end
-
-      def stale_fusion_table?
-        @stale_fusion_table
-      end
-
-      def expire_fusion_table
-        @stale_fusion_table = true
-      end
-
-      def update_fusion_table
-        self.class.update_fusion_tables(only: fusion_table_id)
-      end
-
-      def delete_fusion_table
-        self.class.delete_fusion_tables(only: fusion_table_id)
-      end
-
-      def fusion_table_id
-        self.class.fusion_table_id_cache[fusion_table_name]
-      end
-
-      def fusion_table_name
-        case fusion_table_features_options[:table_name]
-        when Symbol
-          send(fusion_table_features_options[:table_name])
-        when String
-          fusion_table_features_options[:table_name]
-        else
-          self.class.table_name
-        end
-      end
-
-      def to_fusion_condition
-        self.class.where(:id => self).to_fusion_condition
-      end
-    end
-  end
-end

data/lib/spatial_features/has_fusion_table_features/api.rb

@@ -1,111 +0,0 @@
-module SpatialFeatures
-  module FusionTables
-    module API
-      extend self
-
-      FEATURE_COLUMNS = {
-        :name => 'STRING',
-        :spatial_model_type => 'STRING',
-        :spatial_model_id => 'NUMBER',
-        :kml_lowres => 'LOCATION',
-        :colour => 'STRING',
-        :metadata => 'STRING'
-      }
-      TABLE_STYLE = {
-        :polygon_options => { :fill_color_styler => { :kind => 'fusiontables#fromColumn', :column_name => 'colour' },
-                              :stroke_color_styler => { :kind => 'fusiontables#fromColumn', :column_name => 'colour' },
-                              :stroke_weight => 1
-                            },
-        :polyline_options => { :stroke_color_styler => { :kind => 'fusiontables#fromColumn', :column_name => 'colour'} }
-      }
-
-      TABLE_TEMPLATE = {
-        :body => "<h3>{name}</h3>{metadata}"
-      }
-
-      def find_or_create_table(name)
-        find_table(name) || create_table(name)
-      end
-
-      def create_table(name)
-        table_id = service.create_table(name, FEATURE_COLUMNS.collect {|name, type| {:name => name, :type => type} })
-        service.share_table(table_id)
-        service.insert_style(table_id, TABLE_STYLE)
-        service.insert_template(table_id, TABLE_TEMPLATE)
-        return table_id
-      end
-
-      def find_table(name)
-        service.tables.find {|table| table.name == name }.try(:table_id)
-      end
-
-      def delete_table(table_id)
-        service.delete_table(table_id)
-      end
-
-      def tables
-        service.tables
-      end
-
-      def set_features(table_id, features, colour: nil)
-        service.replace_rows(table_id, features_to_csv(features, colour))
-      end
-
-      def set_style(table_id, style)
-        service.style_ids(table_id).each do |style_id|
-          service.delete_style(table_id, style_id)
-        end
-        service.insert_style(table_id, style)
-      end
-
-      def service
-        @service ||= Service.new(Configuration.service_account_credentials)
-      end
-
-      private
-
-      def features_to_csv(features, colour)
-        ActiveRecord::Associations::Preloader.new.preload(features, :spatial_model) if colour.is_a?(Symbol)
-
-        csv = CSV.generate do |csv|
-          features.each do |feature|
-            csv << FEATURE_COLUMNS.keys.collect do |attribute|
-              case attribute
-              when :colour
-                render_feature_colour(feature, colour)
-              when :metadata
-                render_feature_metadata(feature)
-              else
-                feature.send(attribute)
-              end
-            end
-          end
-        end
-
-        file = Tempfile.new('features')
-        file.write(csv)
-        return file
-      end
-
-      def render_feature_metadata(feature)
-        feature.metadata.collect do |name, val|
-          "<b>#{name}:</b> #{val}"
-        end.join('<br/>')
-      end
-
-      def render_feature_colour(feature, colour)
-        case colour
-        when Symbol
-          feature.spatial_model.send(colour)
-        when Proc
-          colour.call(feature)
-        else
-          colour
-        end.paint.to_ft_hex
-
-      rescue Chroma::Errors::UnrecognizedColor
-        nil
-      end
-    end
-  end
-end

data/lib/spatial_features/has_fusion_table_features/configuration.rb

@@ -1,15 +0,0 @@
-module SpatialFeatures
-  module FusionTables
-    def self.config
-      if block_given?
-        yield Configuration
-      else
-        Configuration
-      end
-    end
-
-    module Configuration
-      mattr_accessor :service_account_credentials
-    end
-  end
-end

data/lib/spatial_features/has_fusion_table_features/service.rb

@@ -1,104 +0,0 @@
-module SpatialFeatures
-  module FusionTables
-    class Service
-      APPLICATION_NAME = 'Fusion Tables + Spatial Features'
-      GOOGLE_AUTH_SCOPES = %w(https://www.googleapis.com/auth/fusiontables https://www.googleapis.com/auth/drive)
-
-      def initialize(service_account_credentials_path)
-        @authorization = get_authorization(service_account_credentials_path, GOOGLE_AUTH_SCOPES)
-      end
-
-      def table_ids
-        tables.collect(&:table_id)
-      end
-
-      def tables
-        fusion_tables_service.list_tables(max_results: 10000).items || []
-      end
-
-      def create_table(name, columns = [], table_options = {})
-        table_object = {:name => name, :columns => columns, :is_exportable => true}.merge(table_options)
-        fusion_tables_service.insert_table(table_object, :fields => 'table_id').table_id
-      end
-
-      def delete_table(table_id)
-        fusion_tables_service.delete_table(table_id)
-      end
-
-      def style_ids(table_id)
-        styles(table_id).collect(&:style_id)
-      end
-
-      def styles(table_id)
-        fusion_tables_service.list_styles(table_id).items
-      end
-
-      def delete_style(table_id, style_id)
-        fusion_tables_service.delete_style(table_id, style_id, :fields => nil)
-      end
-
-      def insert_style(table_id, style)
-        style.reverse_merge! 'name' => 'default_table_style', 'isDefaultForTable' => true
-        fusion_tables_service.insert_style(table_id, style, :fields => 'styleId')
-      end
-
-      def delete_template(table_id, template_id)
-        fusion_tables_service.delete_template(table_id, template_id, :fields => nil)
-      end
-
-      def insert_template(table_id, template)
-        template.reverse_merge! 'name' => 'default_table_template'
-        fusion_tables_service.insert_template(table_id, template, :fields => 'templateId')
-      end
-
-      def delete_row(table_id, row_id)
-        fusion_tables_service.sql_query("DELETE FROM #{table_id} WHERE ROWID = #{row_id}")
-      end
-
-      def row_ids(table_id, conditions = {})
-        clause = conditions.collect {|column, value| ActiveRecord::Base.send(:sanitize_sql_array, ["? IN (?)", column, value]) }.join(' AND ')
-        where = "WHERE #{clause}" if clause.present?
-        return fusion_tables_service.sql_query_get("SELECT rowid FROM #{table_id} #{where}}").rows.flatten
-      end
-
-      # Process mutliple commands in a single HTTP request
-      def bulk(&block)
-        fusion_tables_service.batch do
-          block.call(self)
-        end
-      end
-
-      def replace_rows(table_id, csv)
-        fusion_tables_service.replace_table_rows(table_id, :upload_source => csv, :options => {:open_timeout_sec => 1.hour})
-      end
-
-      def upload_rows(table_id, csv)
-        fusion_tables_service.import_rows(table_id, :upload_source => csv, :options => {:open_timeout_sec => 1.hour})
-      end
-
-      def share_table(table_id)
-        permission = {:type => 'anyone', :role => 'reader', :withLink => true}
-        drive_service.create_permission(table_id, permission, :fields => 'id')
-      end
-
-      def fusion_tables_service
-        @fusion_tables_service ||= Google::Apis::FusiontablesV2::FusiontablesService.new.tap do |service|
-          service.client_options.application_name = APPLICATION_NAME
-          service.authorization = @authorization
-        end
-      end
-
-      def drive_service
-        @drive_service ||= Google::Apis::DriveV3::DriveService.new.tap do |drive|
-          drive.client_options.application_name = APPLICATION_NAME
-          drive.authorization = @authorization
-        end
-      end
-
-      def get_authorization(service_account_credentials_path, scopes)
-        ENV['GOOGLE_APPLICATION_CREDENTIALS'] = service_account_credentials_path
-        return Google::Auth.get_application_default(scopes)
-      end
-    end
-  end
-end