spatial_features 2.4.3 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68aa7bdc309d176e516eb2a32156373e0dbaad1c
-  data.tar.gz: 0c1a5d5153cc35ab38d5a37a96a9bafc4c154adc
+  metadata.gz: 3f9a2d017923b7bb6f058501fa83c871a9d215f3
+  data.tar.gz: 9e54295de270f2aaa04404bd2aec8ce71dc9b1dc
 SHA512:
-  metadata.gz: 77bf00cb03c9608d111c8474912d7bcd125746ae5e150fdf6d098cd1b6677ed182b162d3528bbf852c92322a126ea40ae2610a347ebb064d078ac94258f3a96b
-  data.tar.gz: c232858bf11da70cabe5dc7ea468524fed63c949f73e8b8b600fb38f940f7b55a48a8d30fcbd6fc44a85ef612f49081965f4ad86abf1d31e430517eb6da2d95c
+  metadata.gz: 61d4a13e97fa049f174e06d8fae41b5620db491c00e6a7e45eb5ae41cc0916771163e4e29d1732cb78a100ecdb3734ff392d214297b73aea0388b06d5ee25958
+  data.tar.gz: dc79046fb16d330cc7025cbfa30e12234cccff8f1f94293924064e1b7985a5df915f3b05ed0c9397f78bd2dd08e2d89f4e52d2a127bbd3f530fa24a79c6077f2

data/config/initializers/chroma_serializers.rb

@@ -0,0 +1,15 @@
+module Chroma
+  class Color
+    module Serializers
+      # Google's Fusion Table colouring expects the alpha value in the last position, not the first
+      def to_ft_hex
+        [
+         to_2char_hex(@rgb.r),
+         to_2char_hex(@rgb.g),
+         to_2char_hex(@rgb.b),
+         to_2char_hex(alpha * 255)
+        ].join('')
+      end
+    end
+  end
+end

data/lib/spatial_features/has_fusion_table_features/api.rb

@@ -12,8 +12,10 @@ module SpatialFeatures
         :metadata => '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'} }
+        :polygon_options => { :fill_color_styler => { :kind => 'fusiontables#fromColumn', :column_name => 'colour' },
+                              :stroke_color => { :kind => 'fusiontables#fromColumn', :column_name => 'colour' },
+                              :stroke_opacity => 0.5 },
+        :polyline_options => { :stroke_color_styler => { :kind => 'fusiontables#fromColumn', :column_name => 'stroke_colour'} }
       }
 
       TABLE_TEMPLATE = {
@@ -45,8 +47,7 @@ module SpatialFeatures
       end
 
       def set_features(table_id, features, colour: nil)
-        colour_features(features, colour)
-        service.replace_rows(table_id, features_to_csv(features))
+        service.replace_rows(table_id, features_to_csv(features, colour))
       end
 
       def service
@@ -55,11 +56,20 @@ module SpatialFeatures
 
       private
 
-      def features_to_csv(features)
+      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|
-              render_feature_attribute feature.send(attribute)
+              case attribute
+              when :colour
+                render_feature_colour(feature, colour)
+              when :metadata
+                render_feature_metadata(feature)
+              else
+                feature.send(attribute)
+              end
             end
           end
         end
@@ -69,39 +79,24 @@ module SpatialFeatures
         return file
       end
 
-      def render_feature_attribute(value)
-        case value
-        when Hash
-          value.collect do |name, val|
-            "<b>#{name}:</b> #{val}"
-          end.join('<br/>')
-        else
-          value
-        end
+      def render_feature_metadata(feature)
+        feature.metadata.collect do |name, val|
+          "<b>#{name}:</b> #{val}"
+        end.join('<br/>')
       end
 
-      def colour_features(features, colour)
+      def render_feature_colour(feature, 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
+          feature.spatial_model.send(colour)
         when Proc
-          features.each do |feature|
-            feature.define_singleton_method(:colour) do
-              colour.call(feature)
-            end
-          end
+          colour.call(feature)
         else
-          features.each do |feature|
-            feature.define_singleton_method(:colour) do
-              colour
-            end
-          end
-        end
+          colour
+        end.paint.to_ft_hex
+
+      rescue Chroma::Errors::UnrecognizedColor
+        nil
       end
     end
   end

data/lib/spatial_features/has_fusion_table_features.rb

@@ -5,6 +5,8 @@ module SpatialFeatures
         class_attribute :fusion_table_features_options
         self.fusion_table_features_options = options
 
+        after_update_features :expire_fusion_table
+
         include InstanceMethods
         extend ClassMethods
       end
@@ -54,6 +56,14 @@ module SpatialFeatures
         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

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.4.3"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.5.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: chroma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,7 @@ files:
 - app/models/feature.rb
 - app/models/spatial_cache.rb
 - app/models/spatial_proximity.rb
+- config/initializers/chroma_serializers.rb
 - config/initializers/register_oids.rb
 - lib/spatial_features.rb
 - lib/spatial_features/caching.rb