spatial_features 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2502710a77234436e9df31b696307aec48406c4c
-  data.tar.gz: 256709db267694b3313f8b848f4b8273e0d1ae40
+  metadata.gz: 53382056faffc16249a7d7787da478f0c5304642
+  data.tar.gz: b28b4a4c8048dc8e25714bd3e8b9a05c6b148962
 SHA512:
-  metadata.gz: def0c22906ea9400a2b5985e53af034bb83b23f1d554cedc1400e0ca3e39265ea7900c8f10366d44bf1a2f29a26fe879f5230a3b06638ef1157faf61cc8f745d
-  data.tar.gz: cdf4ca117eee31b4885fda6a1267b1284ebaed3efbc29202ceeacaef2e679c49e079c203df09af6af1446c201f9e9d7d86cc23ce84a439dd3489046d83645298
+  metadata.gz: 80d53442af20766b25679809a8f0ceddad23ec8f2ca97362392b4002cfd6653f4be70aea30e97314be84a863268b28c622bd33af3d326e7c655c402c0e12f182
+  data.tar.gz: bde880afe16008e1060563432b73daf032af42d6c4bca901435f81fc0e430eecc9ff0023ebc07db214ab12dc695a9407edf1df73476e26f807dac13ae13beb3c

data/lib/spatial_features.rb

@@ -11,6 +11,8 @@ require 'spatial_features/models/feature'
 require 'spatial_features/models/spatial_cache'
 require 'spatial_features/models/spatial_proximity'
 
+require 'spatial_features/workers/arcgis_update_features_job'
+
 require 'spatial_features/engine'
 
 module SpatialFeatures

data/lib/spatial_features/controller_helpers/spatial_extensions.rb

@@ -1,6 +1,24 @@
 module SpatialExtensions
   private
 
+  def abstract_refresh_geometry_action(model, cache_classes)
+    queue = "#{model.class}/#{model.id}/update_features"
+
+    # Destroy old failed jobs
+    Delayed::Job.where(:queue => queue).where.not(:failed_at => nil).destroy_all
+
+    Delayed::Job.enqueue(
+      ArcGISUpdateFeaturesJob.new(
+        :spatial_model_type => model.class,
+        :spatial_model_id => model.id,
+        :cache_classes => cache_classes
+      ),
+      :queue => queue
+    )
+
+    redirect_to :back
+  end
+
   def abstract_proximity_action(scope, target, distance, &block)
     @nearby_records = scope_for_search(scope).within_buffer(target, distance, :distance => true, :intersection_area => true).order('distance_in_meters ASC, intersection_area_in_square_meters DESC, id ASC')
     @target = target

data/lib/spatial_features/import/arcgis_kmz_features.rb

@@ -28,6 +28,14 @@ module ArcGISKmzFeatures
     return true
   end
 
+  def updating_features?
+    Delayed::Job.where(queue: "#{self.class}/#{self.id}/update_features", failed_at: nil).exists?
+  end
+
+  def feature_update_error
+    (Delayed::Job.where(queue: "#{self.class}/#{self.id}/update_features").where.not(failed_at: nil).first.try(:last_error) || '').split("\n").first
+  end
+
   private
 
   def replace_features(kml_array)

data/lib/spatial_features/venn_polygons.rb

@@ -29,7 +29,7 @@ module SpatialFeatures
     if options[:target]
       sql <<
         "INNER JOIN features
-          ON features.spatial_model_type = '#{options[:target].class}' AND features.spatial_model_id = #{options[:target].id} AND ST_Intersects(features.geom, venn_polygons.geom)"
+          ON features.spatial_model_type = '#{options[:target].class}' AND features.spatial_model_id = #{options[:target].id} AND ST_Intersects(features.geom, venn_polygons.geom) "
     end
 
     # Join with the original polygons so we can determine which original polygons each venn polygon came from

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/lib/spatial_features/workers/arcgis_update_features_job.rb

@@ -0,0 +1,39 @@
+class ArcGISUpdateFeaturesJob < Struct.new(:options)
+  def perform
+    model = options[:spatial_model_type].find(options[:spatial_model_id])
+
+    if model.update_features!
+      options[:cache_classes].each {|klass| SpatialFeatures.cache_record_proximity(model, klass) }
+    end
+  rescue => e
+    raise "Can't refresh geometry: #{normalize_message(e.message)}"
+  end
+
+  private
+
+  def normalize_message(message)
+    if message =~ /\Agetaddrinfo/
+      "ArcGIS Server is not responding."
+    elsif message =~ /invalid KML representation/
+      invalid_kml_reason(message) || "invalid KML being generated by ArcGIS."
+    elsif message =~ /Self-intersection/
+      message.scan(/\[(\d+(?:\.\d+)?) (\d+(?:\.\d+)?)\]/).each do |lng, lat|
+        "Self-intersection at #{lng},#{lat}"
+      end.join(', ')
+    else
+      message
+    end
+  end
+
+  NUMBER_REGEX = /-?\d+\.\d+/
+  COORDINATE_REGEX = /<LinearRing><coordinates>\s*((?:#{NUMBER_REGEX},#{NUMBER_REGEX},#{NUMBER_REGEX}\s*)+)<\/coordinates><\/LinearRing>/
+  def invalid_kml_reason(message)
+    message.scan(COORDINATE_REGEX) do |match|
+      coords = match[0].split(/(?:,0\.0+)?\s+/).chunk {|c| c }.map(&:first)
+
+      return "KML ring doesn't have enough points #{coords.first}" if coords.length < 4
+    end
+
+    return nil
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: delayed_job_active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +75,7 @@ files:
 - lib/spatial_features/models/spatial_proximity.rb
 - lib/spatial_features/venn_polygons.rb
 - lib/spatial_features/version.rb
+- lib/spatial_features/workers/arcgis_update_features_job.rb
 - lib/tasks/spatial_features_tasks.rake
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
@@ -117,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Adds spatial methods to a model.