matryoshka_view 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd3641abdb255955bfd8e0b78b13e84edadf7b2
-  data.tar.gz: 679ada03ad403621c94785d2104ae357ea52b789
+  metadata.gz: 476ae7b97b8e58275a75bf20579bd1b4ccfc2dfb
+  data.tar.gz: cebc94aadd756d91487a6dac9a876ab8f7b4689c
 SHA512:
-  metadata.gz: 93a02dad73d62071868513a23a7ab3178800a0bb10ec76ffdd4ce952f780a8b6b8ed7b94fc396a3b8459f4c462f6fe80d26b865f4f64ecb0a201043f5a4bf175
-  data.tar.gz: dbc9b7e721f1a6696a2f88a087514b942b9d2c2ae0febf6d409ddcec46cc424850c273777ff8ccaf05c7c8c552cadd4805be9a3e3f7ece46aa55fc58a06a73aa
+  metadata.gz: 3626af9dc3a4925a637770f4f5de89c0c6b2523ff667cea8d1bcd196b0428e742864fca5a4ca88c519678ecc27a13deae1f630e426a9394f2c2900913848a8d7
+  data.tar.gz: 7991ff9f1db8b738d5ee2274e7c0d4d85e2b9228a699b9dda9362b2173bc1865cb01390bb7c4078822aa00156dedd86cb23cb28e01cfcebfc08e6f0d66286a6f

data/CHANGELOG

@@ -1,3 +1,9 @@
+2014-10-10 / 0.2.2
+
+* Enhancements
+
+  * Speed things up with an explicit bbox check followed by the buffer query
+
 2014-10-09 / 0.2.1
 
 * Bug fixes

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_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("ST_Contains(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
     elsif the_geom_geojson
-      Record.where("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("ST_Contains(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
     else
       raise "expecting geom_source or the_geom_geojson"
     end

data/lib/matryoshka_view/version.rb

@@ -1,3 +1,3 @@
 class MatryoshkaView
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matryoshka_view
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Seamus Abshere