spatial_features 2.9.3 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 060dca976eac8a7cbff438221861b8b60cf559d5c8edae033bf1cd35f1b1ed84
-  data.tar.gz: ca965a8dbaa21d63f4c226517a7229d573ceec923e97a03b0906da028605b4c0
+  metadata.gz: ea21f56e0a79abcbf3f5da215067d6940e015303f8513d429ca4e6993930cc4a
+  data.tar.gz: f9af513209d24e7733e988cbf7348b5bde675348e34537924ea8e04132a684a8
 SHA512:
-  metadata.gz: 2deace5489bb06708d816d16673bd23b2259b604bc592f7c33e6e29eb1055a1ba6992e11312148f76bb885d20c449a35a8ee0be5c0ff9d3725d0d68ebecec633
-  data.tar.gz: 1738c4c0665b974aff7ebbf3774d031e444d64a2362f32ede6baae7ca8e7afef47a2c247b8dabf82e1adfabce975138e06bb4e52156344030526c30246180335
+  metadata.gz: 04e52b66630bd3092f6c56ea7da6265c844c3c037644f6fe611fa6b1507a286daca147f9b14498272da0d2c6d18bb9355a1da96ddd63346c4a7eadbdeff52684
+  data.tar.gz: 0ce4e3fa042d6129429bf1cc7aa7a70e3af3e4e9671f78a6380aea4f7aca9c9be5642e4a66d4f79944ad9bbd58e3e97cd14e24768ca0fe6a8694ea1cf2c21c10

data/app/models/aggregate_feature.rb

@@ -7,24 +7,17 @@ class AggregateFeature < AbstractFeature
   def refresh
     feature_array_sql = <<~SQL
       ARRAY[
-        (#{features.select('ST_Multi(ST_Union(ST_CollectionExtract(geog::geometry, 1)))').to_sql}),
-        (#{features.select('ST_Multi(ST_Union(ST_CollectionExtract(geog::geometry, 2)))').to_sql}),
-        (#{features.select('ST_Multi(ST_Union(ST_CollectionExtract(geog::geometry, 3)))').to_sql})
+        (#{features.select('ST_UNION(ST_CollectionExtract(geog::geometry, 1))').to_sql}),
+        (#{features.select('ST_UNION(ST_CollectionExtract(geog::geometry, 2))').to_sql}),
+        (#{features.select('ST_UNION(ST_CollectionExtract(geog::geometry, 3))').to_sql})
       ]
     SQL
 
     # Remove empty features so ST_COLLECT doesn't choke. This seems to be a difference between PostGIS 2.x and 3.x
-    compacted_feature_array_sql = <<~SQL
-      array_remove(
-        array_remove(
-          array_remove(#{feature_array_sql},
-          ST_GeomFromText('MultiPoint EMPTY')),
-        ST_GeomFromText('MultiLinestring EMPTY')),
-      ST_GeomFromText('MultiPolygon EMPTY'))
-    SQL
-
     self.geog = ActiveRecord::Base.connection.select_value <<~SQL
-      SELECT ST_Collect(#{compacted_feature_array_sql})::geography
+      SELECT ST_Collect(unnest)::geography
+      FROM (SELECT unnest(#{feature_array_sql})) AS features
+      WHERE NOT ST_IsEmpty(unnest)
     SQL
     self.save!
   end

data/lib/spatial_features/importers/kml.rb

@@ -8,12 +8,7 @@ module SpatialFeatures
       def each_record(&block)
         Nokogiri::XML(@data).css('Placemark').each do |placemark|
           name = placemark.css('name').text
-          metadata = { :description => placemark.css('description').text }
-          placemark.css('ExtendedData SimpleData').each do |node|
-            metadata[node['name']] = node.text
-          end
-          metadata.delete_if {|key, value| value.blank? }
-
+          metadata = extract_metadata(placemark)
 
           {'Polygon' => 'POLYGON', 'LineString' => 'LINE', 'Point' => 'POINT'}.each do |kml_type, sql_type|
             placemark.css(kml_type).each do |placemark|
@@ -32,6 +27,34 @@ module SpatialFeatures
       def geom_from_kml(kml)
         ActiveRecord::Base.connection.select_value("SELECT ST_GeomFromKML(#{ActiveRecord::Base.connection.quote(kml.to_s)})")
       end
+
+      def extract_metadata(placemark)
+        metadata = {}
+        metadata.merge! extract_table(placemark)
+        metadata.merge! extract_extended_data(placemark)
+        metadata.merge! :description => placemark.css('description').text if metadata.empty?
+        metadata.delete_if {|key, value| value.blank? }
+
+        return metadata
+      end
+
+      def extract_extended_data(placemark)
+        metadata = {}
+        placemark.css('ExtendedData SimpleData').each do |node|
+          metadata[node['name']] = node.text
+        end
+        return metadata
+      end
+
+      def extract_table(placemark)
+        metadata = {}
+        placemark.css('description').each do |description|
+          Nokogiri::XML(description.text).css('html table table td').each_slice(2) do |key, value|
+            metadata[key.text] = value.text
+          end
+        end
+        return metadata
+      end
     end
   end
 end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.9.3"
+  VERSION = "2.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.9.3
+  version: 2.10.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails