spatial_features 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53382056faffc16249a7d7787da478f0c5304642
-  data.tar.gz: b28b4a4c8048dc8e25714bd3e8b9a05c6b148962
+  metadata.gz: 0496bf44b507cc71cd17d396571571b0e570d186
+  data.tar.gz: 84fd524df708b02980322ed4e25099f1a161953c
 SHA512:
-  metadata.gz: 80d53442af20766b25679809a8f0ceddad23ec8f2ca97362392b4002cfd6653f4be70aea30e97314be84a863268b28c622bd33af3d326e7c655c402c0e12f182
-  data.tar.gz: bde880afe16008e1060563432b73daf032af42d6c4bca901435f81fc0e430eecc9ff0023ebc07db214ab12dc695a9407edf1df73476e26f807dac13ae13beb3c
+  metadata.gz: 6657cbe49b10cd0e4ecbc4111f4a37392d7ab6f1d1d1ce766707cd666cdb7556f1bbf4abacb0921ad5cf49bc280a6ebdfc502de895058b7e64fcb13220434779
+  data.tar.gz: e3fca9eeb653a4d4467417e77357fcee65180f0c97c66e05d7173f9a9f5368fae970fe2da02e4b2c4ca812ffaf0a7fafee954a9b0610e123b1729d2ed4661f94

data/lib/spatial_features/version.rb

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

data/lib/spatial_features/workers/arcgis_update_features_job.rb

@@ -11,29 +11,36 @@ class ArcGISUpdateFeaturesJob < Struct.new(:options)
 
   private
 
+  NUMBER_REGEX = /-?\d+\.\d+/
+
   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|
+    normalized_messages = []
+
+    normalized_messages << "ArcGIS Server is not responding." if message =~ /\Agetaddrinfo/
+
+    if message =~ /invalid KML representation/
+      normalized_messages += invalid_kml_reason(message).presence || ["invalid KML being generated by ArcGIS."]
+    end
+
+    if message =~ /Self-intersection/
+      normalized_messages += message.scan(/\[(#{NUMBER_REGEX}) (#{NUMBER_REGEX})\]/).collect do |lng, lat|
         "Self-intersection at #{lng},#{lat}"
-      end.join(', ')
+      end
+    end
+
+    if normalized_messages.present?
+      return '<ul><li>' + normalized_messages.join('</li><li>') + '</li></ul>'
     else
-      message
+      return 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|
+    message.scan(COORDINATE_REGEX).collect 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
+      "Sliver polygon detected at #{coords.first}" if coords.length < 4
+    end.compact
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails