spatial_features 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6acc1a46c7687ff927a94e56123507706058d37
-  data.tar.gz: e1f5bf281678659318cb8a809d2c1023248e5a36
+  metadata.gz: 68aa7bdc309d176e516eb2a32156373e0dbaad1c
+  data.tar.gz: 0c1a5d5153cc35ab38d5a37a96a9bafc4c154adc
 SHA512:
-  metadata.gz: f8b977e8bdae0fb80bb20cc72cb12f1b50c879a06106b0238490fc407ce06cc85a77224458c23e94ce716761f8ca8f3caa4423312c34134152518153c421d7c1
-  data.tar.gz: 705ab2d9a20c0e78d61d29220e100654d7fcc412880e2e1689ebe1d56b32e49863619db51b50a0842e01a8fe5b017d9c70209c5e351eac9bf35f6adb55bf5b41
+  metadata.gz: 77bf00cb03c9608d111c8474912d7bcd125746ae5e150fdf6d098cd1b6677ed182b162d3528bbf852c92322a126ea40ae2610a347ebb064d078ac94258f3a96b
+  data.tar.gz: c232858bf11da70cabe5dc7ea468524fed63c949f73e8b8b600fb38f940f7b55a48a8d30fcbd6fc44a85ef612f49081965f4ad86abf1d31e430517eb6da2d95c

data/config/initializers/register_oids.rb

@@ -1,9 +1,11 @@
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
-  def initialize_type_map_with_postgres_oids mapping
-    initialize_type_map_without_postgres_oids mapping
+module PostGISTypes
+  def initialize_type_map(mapping)
+    super
     register_class_with_limit mapping, 'geometry', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
     register_class_with_limit mapping, 'geography', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
   end
+end
 
-  alias_method_chain :initialize_type_map, :postgres_oids
+ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
+  prepend PostGISTypes
 end

data/lib/spatial_features/has_fusion_table_features/api.rb

@@ -3,12 +3,23 @@ module SpatialFeatures
     module API
       extend self
 
-      FEATURE_COLUMNS = {:name => 'STRING', :spatial_model_type => 'STRING', :spatial_model_id => 'NUMBER', :kml_lowres => 'LOCATION', :colour => 'STRING'}
+      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 => '#000000', :stroke_opacity => 0.2 },
         :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
@@ -17,6 +28,7 @@ module SpatialFeatures
         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
 
@@ -46,7 +58,9 @@ module SpatialFeatures
       def features_to_csv(features)
         csv = CSV.generate do |csv|
           features.each do |feature|
-            csv << FEATURE_COLUMNS.keys.collect {|attribute| feature.send(attribute) }
+            csv << FEATURE_COLUMNS.keys.collect do |attribute|
+              render_feature_attribute feature.send(attribute)
+            end
           end
         end
 
@@ -55,6 +69,17 @@ 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
+      end
+
       def colour_features(features, colour)
         case colour
         when Symbol

data/lib/spatial_features/has_fusion_table_features/service.rb

@@ -42,6 +42,15 @@ module SpatialFeatures
         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

data/lib/spatial_features/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rgeo-shapefile
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Adds spatial methods to a model.