spatial_features 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee690ccc750978af8db4b018a4564dcad10085cc
-  data.tar.gz: cb9e15cdee984d7c7398f68ec95af49a973a0571
+  metadata.gz: 0fdf60198410db9ef31c7a621c293516c69b5bd4
+  data.tar.gz: 87d7da1814c989804b8fb406346450f9b7df56c3
 SHA512:
-  metadata.gz: d1816cccfc59bb3d8ad6dfd19467a734e0889fd658224d19099e0c7266dd30b16ecc6ff5c305c557649fe4278c3c0dcab9be4ee8f10d5aa1db37103c60a119d1
-  data.tar.gz: 97f3e7e7eff1d3feac000560651944bd391d5533055a3131b29ad39901ee9442d23d70854f2b10c796006129cd38f8e336e2a5f73d53cffbcb642d3ac43ad5ca
+  metadata.gz: 87452c8cdb8b9730de959398e6676ef170233a2c0e191ec1f980f2c5c0a61f9f5202aa96d73cdf732b12c1d8725ec23a9d207807a417ad1f9fb14c9125c12038
+  data.tar.gz: 7438e02baec7504ded90e50b1e44fd2d76671e5308f981088c57ce6099863e40db950ea34e8015c6351a05362b50e47eab3ed62c257fb06a2e72e868109f5fc7

data/app/models/feature.rb

@@ -114,7 +114,7 @@ class Feature < ActiveRecord::Base
     self.geog = ActiveRecord::Base.connection.select_value("SELECT ST_CollectionExtract(ST_MakeValid('#{sanitize}'),3)")
   end
 
-  # Use ST_Force_2D to discard z-coordinates that cause failures later in the process
+  # Use ST_Force2D to discard z-coordinates that cause failures later in the process
   def sanitize
     self.geog = ActiveRecord::Base.connection.select_value("SELECT ST_Force2D('#{geog}')")
   end

data/lib/spatial_features/has_fusion_table_features/api.rb

@@ -0,0 +1,79 @@
+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'}
+      TABLE_STYLE = {
+        :polygon_options => { :fill_color_styler => { :kind => 'fusiontables#fromColumn', :column_name => 'colour' }, :stroke_color => '#000000', :stroke_opacity => 0.2 },
+        :polyline_options => { :stroke_color_styler => { :kind => 'fusiontables#fromColumn', :column_name => 'colour'} }
+      }
+
+      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)
+        return table_id
+      end
+
+      def find_table(name)
+        service.tables.find {|table| table['name'] == name }.try(:fetch, 'tableId')
+      end
+
+      def delete_table(table_id)
+        service.delete_table(table_id)
+      end
+
+      def set_features(table_id, features, colour: nil)
+        colour_features(features, colour)
+        service.replace_rows(table_id, features_to_csv(features))
+      end
+
+      def service
+        @service ||= Service.new(Configuration.service_account_credentials)
+      end
+
+      private
+
+      def features_to_csv(features)
+        csv = CSV.generate do |csv|
+          features.each do |feature|
+            csv << FEATURE_COLUMNS.keys.collect {|attribute| feature.send(attribute) }
+          end
+        end
+
+        file = Tempfile.open
+        file.write(csv)
+        return file
+      end
+
+      def colour_features(features, colour)
+        case colour
+        when Symbol
+          ActiveRecord::Associations::Preloader.new.preload(features, :spatial_model)
+          features.each do |feature|
+            feature.define_singleton_method(:colour) do
+              spatial_model.send(colour)
+            end
+          end
+        when Proc
+          features.each do |feature|
+            feature.define_singleton_method(:colour) do
+              colour.call(feature)
+            end
+          end
+        else
+          features.each do |feature|
+            feature.define_singleton_method(:colour) do
+              colour
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spatial_features/has_fusion_table_features/configuration.rb

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,116 @@
+require 'json'
+
+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 {|t| t['tableId'] }
+      end
+
+      def tables
+        parse_reponse(request(:get, 'https://www.googleapis.com/fusiontables/v2/tables')).fetch('items', [])
+      end
+
+      def create_table(name, columns = [], table_options = {})
+        body = {:name => name, :columns => columns}.merge(:description => "Features", :isExportable => true).merge(table_options).to_json
+        response = request(:post, 'https://www.googleapis.com/fusiontables/v2/tables', :body => body)
+        return parse_reponse(response)['tableId']
+      end
+
+      def select(query)
+        parse_reponse request(:get, "https://www.googleapis.com/fusiontables/v2/query", :params => {:sql => query})
+      end
+
+      def delete_table(table_id)
+        request(:delete, "https://www.googleapis.com/fusiontables/v2/tables/#{table_id}")
+      end
+
+      def style_ids(table_id)
+        styles(table_id).collect {|t| t['styleId'] }
+      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_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 request(method, url, header: {}, body: {}, params: {})
+        headers = @authorization.apply({'Content-Type': 'application/json'})
+        headers.merge!(header)
+        headers.merge!(:params => params)
+        return RestClient::Request.execute(:method => method, :url => url, :headers => headers, :payload => body)
+      rescue RestClient::ExceptionWithResponse => e
+        puts e.response
+        raise e
+      end
+
+      def parse_reponse(response)
+        JSON.parse(response.body)
+      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

data/lib/spatial_features/has_fusion_table_features.rb

@@ -0,0 +1,77 @@
+module SpatialFeatures
+  module FusionTables
+    module ActMethod
+      def has_fusion_table_features(options = {})
+        class_attribute :fusion_table_features_options
+        self.fusion_table_features_options = options
+
+        include InstanceMethods
+        extend ClassMethods
+
+        delegate :update_fusion_table, :delete_fusion_table, :fusion_table_id_cache, :to => self
+      end
+    end
+
+    module ClassMethods
+      def to_fusion_condition
+        sanitize_sql(["spatial_model_id IN (?)", pluck(:id)])
+      end
+
+      def update_fusion_tables
+        fusion_table_groups 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
+        fusion_table_groups do |fusion_table_id, records, group_features|
+          API.delete_table(fusion_table_id)
+        end
+        fusion_table_id_cache.clear
+      end
+
+      def acts_like_fusion_table_features?
+        true
+      end
+
+      def fusion_table_id_cache
+        @fusion_table_id_cache ||= Hash.new do |hash, table_name|
+          hash[table_name] = API.find_or_create_table(table_name)
+        end
+      end
+
+      private
+
+      def fusion_table_groups
+        all.group_by(&:fusion_table_id).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 fusion_table_id
+        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_spatial_features/delayed_feature_import.rb

@@ -1,5 +1,6 @@
 module SpatialFeatures
   module DelayedFeatureImport
+    extend ActiveSupport::Concern
     include FeatureImport
 
     def queue_feature_update!(options = {})

data/lib/spatial_features/has_spatial_features/feature_import.rb

@@ -2,6 +2,13 @@ require 'digest/md5'
 
 module SpatialFeatures
   module FeatureImport
+    extend ActiveSupport::Concern
+
+    included do
+      extend ActiveModel::Callbacks
+      define_model_callbacks :update_features
+    end
+
     def update_features!(skip_invalid: false, options: {})
       options = options.reverse_merge(spatial_features_options).reverse_merge(:import => {})
 
@@ -11,9 +18,11 @@ module SpatialFeatures
 
         return if features_cache_key_matches?(cache_key)
 
-        import_features(imports)
-        validate_features!(imports, skip_invalid)
-        set_features_cache_key(cache_key)
+        run_callbacks :update_features do
+          import_features(imports)
+          validate_features!(imports, skip_invalid)
+          set_features_cache_key(cache_key)
+        end
 
         return true
       end

data/lib/spatial_features/importers/shapefile.rb

@@ -15,7 +15,7 @@ module SpatialFeatures
         proj4 = proj4_from_file(file)
         RGeo::Shapefile::Reader.open(file.path) do |records|
           records.each do |record|
-            yield OpenStruct.new data_from_wkt(record.geometry.as_text, proj4).merge(:metadata => record.attributes)
+            yield OpenStruct.new data_from_wkt(record.geometry.as_text, proj4).merge(:metadata => record.attributes) if record.geometry.present?
           end
         end
       end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/lib/spatial_features.rb

@@ -2,6 +2,10 @@
 require 'rgeo/shapefile'
 require 'nokogiri'
 require 'zip'
+require 'rest-client'
+require 'googleauth'
+require 'google/apis/fusiontables_v2'
+require 'google/apis/drive_v3'
 
 # LIB
 require 'spatial_features/caching'
@@ -14,6 +18,11 @@ require 'spatial_features/has_spatial_features'
 require 'spatial_features/has_spatial_features/feature_import'
 require 'spatial_features/has_spatial_features/delayed_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'
@@ -34,6 +43,7 @@ end
 
 # 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,6 +81,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !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: pg
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +170,10 @@ 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/delayed_feature_import.rb
 - lib/spatial_features/has_spatial_features/feature_import.rb