matryoshka_view 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9abe733adeec7a0d632b300437a8c83682915b6
-  data.tar.gz: 4d8cd1d651217606ac0530d673053eae7ec0ab70
+  metadata.gz: f44d84344c60d4c94323907e63d5ddeac87651ce
+  data.tar.gz: 8cf78233e816dd675d63f640d0391d3dd93220d5
 SHA512:
-  metadata.gz: fb4f27953d68e3d8017889afa92ea2bb1c8865b0fdfcce5b084b5d70477ea975bf522b532c450446020efc41c45f705c6e534ad0870213478d7bc0197cf25d46
-  data.tar.gz: 05fbc48cbeeb69736d5fdb8f7ef1554b495e144c9b3d9bca7cac3d50ea8716c7055b57ccbea787a7f0988ffb7d6cd290965c1487b4091feb712c507d88d531db
+  metadata.gz: 1687c25e01224c0faad72ef30aa7fc0a4d40c0225a0a07c3e31081899dee9aa7024c691538871932b111f316cde4ba8e99680e45821994156e2784166c3c0770
+  data.tar.gz: 779939e738edc87c4539f8656ea32a84acb968e1f1c6bf0668c3e8d054326768073510e76c92db4b1b2ec8645a586283c50ea35354f10104d9eddca2bd402cd0

data/CHANGELOG

@@ -1,3 +1,9 @@
+2014-10-19 / 0.2.4
+
+* Enhancements
+
+  * Faster - no need for ST_Expand with &&
+
 2014-10-12 / 0.2.3
 
 * Enhancements

data/lib/matryoshka_view/version.rb

@@ -1,3 +1,3 @@
 class MatryoshkaView
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/lib/matryoshka_view.rb

@@ -47,9 +47,9 @@ class MatryoshkaView
   def lookup(geom_source: nil, the_geom_geojson: nil)
     # FIXME move to Record class method
     hit = if geom_source
-      Record.where("ST_Expand(the_geom, 0.00001) && (SELECT the_geom FROM #{geom_source.class.quoted_table_name} WHERE id = #{quote(geom_source.id)}) AND ST_Contains(ST_Buffer(the_geom, 0.00001), (SELECT the_geom FROM #{geom_source.class.quoted_table_name} WHERE id = #{quote(geom_source.id)}))").order("ST_Area(the_geom, false) ASC").first
+      Record.where("the_geom && (SELECT the_geom FROM #{geom_source.class.quoted_table_name} WHERE id = #{quote(geom_source.id)}) AND ST_Contains(ST_Buffer(the_geom, 0.00001), (SELECT the_geom FROM #{geom_source.class.quoted_table_name} WHERE id = #{quote(geom_source.id)}))").order("ST_Area(the_geom, false) ASC").first
     elsif the_geom_geojson
-      Record.where("ST_Expand(the_geom, 0.00001) && ST_SetSRID(ST_GeomFromGeoJSON(#{quote(the_geom_geojson)}), 4326) AND ST_Contains(ST_Buffer(the_geom, 0.00001), ST_SetSRID(ST_GeomFromGeoJSON(#{quote(the_geom_geojson)}), 4326))").order("ST_Area(the_geom, false) ASC").first
+      Record.where("the_geom && ST_SetSRID(ST_GeomFromGeoJSON(#{quote(the_geom_geojson)}), 4326) AND ST_Contains(ST_Buffer(the_geom, 0.00001), ST_SetSRID(ST_GeomFromGeoJSON(#{quote(the_geom_geojson)}), 4326))").order("ST_Area(the_geom, false) ASC").first
     else
       raise "expecting geom_source or the_geom_geojson"
     end

data/matryoshka_view.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "the_geom_geojson"
+  spec.add_development_dependency "the_geom_geojson", '>=0.0.5'
 end

data/spec/matryoshka_view_spec.rb

@@ -22,7 +22,7 @@ describe MatryoshkaView do
 
     it "doesn't auto-create anything" do
       expect(world.lookup(the_geom_geojson: geojson(:burlington_point))).to eq(world)
-      expect(world.lookup(the_geom_geojson: geojson(:barre_point))).to eq(world)
+      expect(world.lookup(the_geom_geojson: geojson(:montpelier_point))).to eq(world)
     end
 
     it "helps you spawn inner views given geojson" do
@@ -46,7 +46,7 @@ describe MatryoshkaView do
       end
 
       it "falls back to original table outside boundaries" do
-        expect(world.lookup(the_geom_geojson: geojson(:montreal))).to eq(world)
+        expect(world.lookup(the_geom_geojson: geojson(:montreal_canada))).to eq(world)
       end
 
       xit "doesn't confuse bases" do
@@ -57,16 +57,16 @@ describe MatryoshkaView do
     describe "non-overlapping matryoshka views" do
       before do
         south_burlington
-        downtown_burlington
+        burlington_downtown
       end
 
       it "chooses the right view" do
         expect(world.lookup(the_geom_geojson: geojson(:south_burlington_point))).to eq(south_burlington)
-        expect(world.lookup(the_geom_geojson: geojson(:downtown_burlington_point))).to eq(downtown_burlington)
+        expect(world.lookup(the_geom_geojson: geojson(:burlington_downtown_point))).to eq(burlington_downtown)
       end
 
       it "falls back to original table outside boundaries" do
-        expect(world.lookup(the_geom_geojson: geojson(:montreal))).to eq(world)
+        expect(world.lookup(the_geom_geojson: geojson(:montreal_canada))).to eq(world)
       end
     end
 
@@ -95,7 +95,7 @@ describe MatryoshkaView do
   describe 'with the_geom_geojson' do
     let(:burlington)          { world.spawn the_geom_geojson: geojson(:burlington) }
     let(:south_burlington)    { world.spawn the_geom_geojson: geojson(:south_burlington) }
-    let(:downtown_burlington) { world.spawn the_geom_geojson: geojson(:downtown_burlington) }
+    let(:burlington_downtown) { world.spawn the_geom_geojson: geojson(:burlington_downtown) }
 
     it_behaves_like 'OK'
   end
@@ -103,7 +103,7 @@ describe MatryoshkaView do
   describe 'with geom_source' do
     let(:burlington)          { world.spawn geom_source: place(:burlington) }
     let(:south_burlington)    { world.spawn geom_source: place(:south_burlington) }
-    let(:downtown_burlington) { world.spawn geom_source: place(:downtown_burlington) }
+    let(:burlington_downtown) { world.spawn geom_source: place(:burlington_downtown) }
 
     it_behaves_like 'OK'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matryoshka_view
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 description: Helps you spawn new inner views and lookup the right one.
 email:
 - seamus@abshere.net
@@ -199,3 +199,4 @@ summary: Maintains a list of inner (subset/nested) views and their geometic boun
 test_files:
 - spec/matryoshka_view_spec.rb
 - spec/spec_helper.rb
+has_rdoc: