spatial_features 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb5268adbbf2c9b9019512e4d3617fc97c587497913202bf95c3dd35332497e8
-  data.tar.gz: 37928531494a21c1934425bb222759accdbfae763c7eb2e7f5570e8e17c69e42
+  metadata.gz: 6c14269424ac2b30935b7f291f51080271e0932c400036bf5156223325ead8ba
+  data.tar.gz: d715d47e9dfa87eee07e01bc71b03dc9af5ceb6415552f24663eef9a8d81bda6
 SHA512:
-  metadata.gz: d995ebde69133a39e99885ce694551d5bd64fb08a67b8e658d86138f56673b78a27f101f65cb86027e864d3fa0a3e2c05f43d944a3c55b2fac1a3e53a304715b
-  data.tar.gz: 99be0f11815754302e8b3f1cf50fa31964993fa43d2a1cc5a68e688eacb03d0d2116cea1ff71c7c7c8c2c99a7c7ae76c2dc83c0f6bef34ec525434bb990be2e1
+  metadata.gz: 2b7fef2ae89493b544b46896136bddcd59afc470db34be530c2763cede9dca82082c695056583aa7665f03dab0c21f87d16429cc37d74682cf9ac984956c83cb
+  data.tar.gz: 16bc0f99d7249a85f0c48e07f0b9dd5b02058fa307c4eea20142dedf6e695b9c035528d26b26c22dc9ec420247d36a4f8476f8e5b5a0fe865bac68650d64ecfb

data/app/models/abstract_feature.rb

@@ -148,10 +148,6 @@ class AbstractFeature < ActiveRecord::Base
     @make_valid
   end
 
-  def wkt
-    ActiveRecord::Base.connection.select_value("SELECT ST_ASEWKT('#{geom}')")
-  end
-
   private
 
   def make_valid

data/lib/spatial_features/has_spatial_features.rb

@@ -81,15 +81,6 @@ module SpatialFeatures
       end
     end
 
-    def aggregate_features
-      type = base_class.to_s # Rails stores polymorphic foreign keys as the base class
-      if all == unscoped
-        AggregateFeature.where(:spatial_model_type => type)
-      else
-        AggregateFeature.where(:spatial_model_type => type, :spatial_model_id => all.unscope(:select))
-      end
-    end
-
     # Returns true if the model stores a hash of the features so we don't need to process the features if they haven't changed
     def has_spatial_features_hash?
       column_names.include? 'features_hash'

data/lib/spatial_features/importers/kml.rb

@@ -6,22 +6,24 @@ module SpatialFeatures
       private
 
       def each_record(&block)
-        Nokogiri::XML(@data).css('Placemark').each do |placemark|
-          name = placemark.css('name').text
-          metadata = extract_metadata(placemark)
-
-          {'Polygon' => 'POLYGON', 'LineString' => 'LINE', 'Point' => 'POINT'}.each do |kml_type, sql_type|
-            placemark.css(kml_type).each do |placemark|
-              next if blank_placemark?(placemark)
-
-              yield OpenStruct.new(:feature_type => sql_type, :geog => geom_from_kml(placemark), :name => name, :metadata => metadata)
+        {'Polygon' => 'POLYGON', 'LineString' => 'LINE', 'Point' => 'POINT'}.each do |kml_type, sql_type|
+          Nokogiri::XML(@data).css(kml_type).each do |feature|
+            if placemark = feature.ancestors('Placemark').first
+              name = placemark.css('name').text
+              metadata = extract_metadata(placemark)
+            else
+              metadata = {}
             end
+    
+            next if blank_feature?(feature)
+
+            yield OpenStruct.new(:feature_type => sql_type, :geog => geom_from_kml(feature), :name => name, :metadata => metadata)
           end
         end
       end
 
-      def blank_placemark?(placemark)
-        placemark.css('coordinates').text.blank?
+      def blank_feature?(feature)
+        feature.css('coordinates').text.blank?
       end
 
       def geom_from_kml(kml)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.11.0"
+  VERSION = "2.11.1"
 end

metadata

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