spatial_features 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8587f98bdfed1f6729115073db7230737abad60c
-  data.tar.gz: 8559ebfda494aa30f91d7417de20dfa0d8b54055
+  metadata.gz: 03c5e26e1a155abd0c2403c164e8dd32ac3f055d
+  data.tar.gz: 2b99647cea1d277c9fe0dc5f6672c44d29718e60
 SHA512:
-  metadata.gz: 6b7cc30cc9d23061e92a41a131c22c46524fc5d17594b96ce97b70911bc424d9a4f5abde750c3326607a04611b5f7ef052a6b6bf1e972b91e97b7eee65e9ef37
-  data.tar.gz: 692f673fe044720ad66bbf07f9b0629e163e173342a2c0810ed1233d577d193d86b7da53a0e30666ca86c983f6c6930a1d89ea6e8b5ad10bb025556536a86133
+  metadata.gz: a67cfb7b171a90a08c0427d62558c7ba016883909a1bb0bb0f729b1b7ae2ce16a33df64ffee6d57c56a77a85b8ba70327f03ed80df066408318d294b55f42ba7
+  data.tar.gz: e4f55c73c6f2703c09c77554ca8733be9b1d56110beb53893c2b6f2ae265a9b0b8dee7e340730e5856599c201247c43f468bfef31574d908f07302cc92f692ad

data/README.md

@@ -0,0 +1,22 @@
+# Spatial Features
+
+Adds spatial methods to a model.
+
+## Migration
+```ruby
+execute("
+  CREATE TABLE features (
+      id integer NOT NULL,
+      spatial_model_type character varying(255),
+      spatial_model_id integer,
+      name character varying(255),
+      feature_type character varying(255),
+      geog geography,
+      geog_lowres geography(Geometry,4326),
+      geom geometry(Geometry,26910),
+      kml text,
+      kml_lowres text,
+      metadata hstore
+  );
+")
+```

data/lib/spatial_features/import/arcgis_kmz_features.rb

@@ -3,6 +3,7 @@ module ArcGISKmzFeatures
   require 'digest/md5'
 
   def update_features!(options = {})
+    @skip_invalid = options[:skip_invalid]
     @make_valid = options[:make_valid]
     @feature_error_messages = []
     kml_array = []
@@ -49,7 +50,7 @@ module ArcGISKmzFeatures
       self.clear_association_cache # clear_association_cache so after_feature_update knows about the new features
 
       @feature_error_messages.concat new_features.collect {|feature| "Feature #{feature.name}: #{feature.errors.full_messages.to_sentence}" if feature.errors.present? }.compact.flatten
-      if @feature_error_messages.present?
+      if @feature_error_messages.present? && !@skip_invalid
         raise UpdateError, "Error updating #{self.class} #{self.id}. #{@feature_error_messages.to_sentence}"
       end
     end

data/lib/spatial_features/models/feature.rb

@@ -27,14 +27,6 @@ class Feature < ActiveRecord::Base
     where(:feature_type => 'point')
   end
 
-  def self.for_kml(options = {})
-    if options[:simplified]
-      select("features.name, features.kml, features.metadata").where("features.name IS NULL OR features.name NOT IN ('s', 't')")
-    else
-      select("features.name, ST_AsKML(features.geog, 6) AS kml, features.metadata")
-    end
-  end
-
   def self.invalid
     select('features.*, ST_IsValidReason(geog::geometry) AS invalid_geometry_message').where.not('ST_IsValid(geog::geometry)')
   end
@@ -48,14 +40,23 @@ class Feature < ActiveRecord::Base
     return envelope_json.values_at(0,2)
   end
 
-  private
+  def self.cache_derivatives(options = {})
+    options.reverse_merge! :lowres_simplification => 0.0001, :lowres_precision => 5
 
-  def cache_derivatives
-    self.class.connection.execute "UPDATE features SET geog_lowres = ST_SimplifyPreserveTopology(geog::geometry, 0.0001) WHERE id = #{self.id}"
-    self.class.connection.execute "UPDATE features SET geom = ST_Transform(geog::geometry, 26910) WHERE id = #{self.id}"
-    self.class.connection.execute "UPDATE features SET kml = ST_AsKML(geog_lowres::geometry, 5) WHERE id = #{self.id}"
+    update_all("geom        = ST_Transform(geog::geometry, 26910),
+                geog_lowres = ST_SimplifyPreserveTopology(geog::geometry, #{options[:lowres_simplification]})"
+                .squish)
+    update_all("kml         = ST_AsKML(features.geog, 6),
+                kml_lowres  = ST_AsKML(geog_lowres::geometry, #{options[:lowres_precision]})"
+                .squish)
   end
 
+  def cache_derivatives(*args)
+    self.class.where(:id => self.id).cache_derivatives(*args)
+  end
+
+  private
+
   def geometry_is_valid
     if geog?
       instance = self.class.unscoped.invalid.from("(SELECT '#{sanitize_input_for_sql(self.geog)}'::geometry AS geog) #{self.class.table_name}").to_a.first

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.2.9"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -61,7 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - config/initializers/register_oids.rb
 - lib/spatial_features.rb
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Adds spatial methods to a model.

data/README.rdoc

@@ -1,3 +0,0 @@
-= Spatial Features
-
-Adds spatial methods to a model.