the_geom_geojson 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dc66a9e2f982e061c64880c64a0dcac61c3fc6e
-  data.tar.gz: 58a42e2156d1a7e56305fb917c718c86d471f360
+  metadata.gz: fff860aa315c7be49742c15cb2721b987c60a767
+  data.tar.gz: 78f1b9205edcbaa42bc10762fe9fbcdce91ee66d
 SHA512:
-  metadata.gz: 029b1cca09c0a13b708bf2ec8a8148a87e2c6727e70eec4459394045d89c5d50c8344cc86fb45a31bd3deeac7de8159159a54496cc0d5fce9dffafb25fc65b43
-  data.tar.gz: 7dd1bfa7f2d6e5ca96f1588647282e9b387d3567aba7a4d78a1b761bd8b8c12f2012fff61813d4a0278d18961a76ca032919274b7b995829367a5f885b58867e
+  metadata.gz: fc6fd10e4092e17d8060410eef982a4ccd09ab869fc4e951a234d28a4e23c77a43ea70d62c523c98d1f04f020747ac10c340c6e8d91e48a1ab6ef9020bca30f7
+  data.tar.gz: 20a5680eaee7bbfaaa2ae14f59c95664942a6c1e90b8c50b1e4a2869cb6dce1a6e111dabac4519395f01e66bb1a9bebfbc6067f532ed7319b6c322b0cec2cf2b

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
   - 2.1.2
-  - 1.9.3
 addons:
   postgresql: "9.3"

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.1.3 / 2015-02-16
+
+* Enhancements
+
+  * add simplify: option to #the_geom_geojson getter
+
 0.1.2 / 2014-11-07
 
 * Enhancements

data/lib/the_geom_geojson/active_record.rb

@@ -45,14 +45,19 @@ module TheGeomGeoJSON
     end
 
     
-    def the_geom_geojson
+    def the_geom_geojson(simplify: nil)
       if @the_geom_geojson_dirty
-        @the_geom_geojson_change
-      elsif preselected = read_attribute(:the_geom_geojson)
+        simplify ? raise("can't get simplified the_geom_geojson until you save") : @the_geom_geojson_change
+      elsif !simplify and (preselected = read_attribute(:the_geom_geojson))
         preselected
       elsif the_geom
         self.class.connection_pool.with_connection do |c|
-          c.select_value "SELECT ST_AsGeoJSON(the_geom) FROM #{self.class.quoted_table_name} WHERE #{self.class.quoted_primary_key} = #{c.quote(id)} LIMIT 1"
+          sql = if simplify
+            "SELECT ST_AsGeoJSON(ST_Simplify(the_geom, #{c.quote(simplify)}::float)) FROM #{self.class.quoted_table_name} WHERE #{self.class.quoted_primary_key} = #{c.quote(id)} LIMIT 1"
+          else
+            "SELECT ST_AsGeoJSON(the_geom) FROM #{self.class.quoted_table_name} WHERE #{self.class.quoted_primary_key} = #{c.quote(id)} LIMIT 1"
+          end
+          c.select_value sql
         end
       end
     end

data/lib/the_geom_geojson/version.rb

@@ -1,3 +1,3 @@
 module TheGeomGeoJSON
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'pry'
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'the_geom_geojson'
 require 'the_geom_geojson/examples'

data/spec/the_geom_geojson/active_record_spec.rb

@@ -18,10 +18,6 @@ require 'securerandom'
 
 ActiveRecord::Base.establish_connection "postgresql://127.0.0.1/#{dbname}"
 
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.tap do |klass|
-  klass::OID.register_type('geometry', klass::OID::Identity.new)
-end
-
 require 'the_geom_geojson/active_record'
 
 class Pet < ActiveRecord::Base
@@ -61,19 +57,8 @@ end
 
 describe TheGeomGeoJSON do
   describe 'ActiveRecord' do
-    # # SELECT ST_SetSRID(ST_GeomFromGeoJSON('{"type":"Point","coordinates":[-73.193,44.477]}'), 4326);
-    #                      st_setsrid
-    # ----------------------------------------------------
-    #  0101000020E61000003108AC1C5A4C52C0931804560E3D4640
-    # (1 row)
-    let(:the_geom_expected) { '0101000020E61000003108AC1C5A4C52C0931804560E3D4640' }
-
-    # # SELECT ST_Transform(ST_SetSRID(ST_GeomFromGeoJSON('{"type":"Point","coordinates":[-73.193,44.477]}'), 4326), 3857);
-    #                     st_transform
-    # ----------------------------------------------------
-    #  0101000020110F0000C22156DFD7145FC10858288EB9215541
-    # (1 row)
-    let(:the_geom_webmercator_expected) { '0101000020110F0000C22156DFD7145FC10858288EB9215541' }
+    let(:the_geom_expected) { '0103000020E6100000010000000600000083C0CAA1454E52C0022B8716D93E46406DE7FBA9F14A52C01F85EB51B83E4640D34D6210584952C0F0A7C64B373946402FDD2406814D52C0D578E926313846402DB29DEFA74E52C04260E5D0223B464083C0CAA1454E52C0022B8716D93E4640' }
+    let(:the_geom_webmercator_expected) { '0103000020110F00000100000006000000213FC2C41A185FC1B8ACA6A9DB2355417F507E9D73125FC1B31193A6B4235541B0E24EDEBB0F5FC1CCA725C4271D5541FACC63CFCC165FC16AE385ECEF1B5541337871BFC1185FC1F8C0EA95701F5541213FC2C41A185FC1B8ACA6A9DB235541' }
 
     before do
       Pet.delete_all
@@ -87,20 +72,23 @@ describe TheGeomGeoJSON do
         expect(@pet.the_geom_webmercator).to eq(the_geom_webmercator_expected)
       end
       it "lets you access the_geom_geojson" do
-        expect(@pet.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington_point])
+        expect(@pet.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington])
+      end
+      it "lets you access a simplified the_geom_geojson" do
+        expect(@pet.the_geom_geojson(simplify: 0.03).length).to be < @pet.the_geom_geojson.length
       end
       it "can be loaded from db" do
         if @pet.persisted?
           reloaded = pet_model.find @pet.id
           expect(reloaded.the_geom).to eq(the_geom_expected)
           expect(reloaded.the_geom_webmercator).to eq(the_geom_webmercator_expected)
-          expect(reloaded.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington_point])
+          expect(reloaded.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington])
         end
       end
       it "can be loaded with .with_geojson scope" do
         if @pet.persisted?
           reloaded = pet_model.with_geojson.find @pet.id
-          expect(reloaded.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington_point])
+          expect(reloaded.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington])
         end
       end
     end
@@ -108,14 +96,14 @@ describe TheGeomGeoJSON do
     shared_examples 'different states of persistence' do
       describe "creating" do
         before do
-          @pet = create_pet the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington_point]
+          @pet = create_pet the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington]
         end
         it_behaves_like 'the_geom_geojson=(geojson)'
       end
 
       describe "building and saving" do
         before do
-          @pet = build_pet the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington_point]
+          @pet = build_pet the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington]
           @pet.save!
         end
         it_behaves_like 'the_geom_geojson=(geojson)'
@@ -124,7 +112,7 @@ describe TheGeomGeoJSON do
       describe "modifying" do
         before do
           @pet = create_pet
-          @pet.the_geom_geojson = TheGeomGeoJSON::EXAMPLES[:burlington_point]
+          @pet.the_geom_geojson = TheGeomGeoJSON::EXAMPLES[:burlington]
           @pet.save!
         end
         it_behaves_like 'the_geom_geojson=(geojson)'
@@ -132,7 +120,7 @@ describe TheGeomGeoJSON do
 
       describe "building (without saving)" do
         before do
-          @pet = build_pet the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington_point]
+          @pet = build_pet the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington]
         end
         it "raises exception if you try to access the_geom" do
           expect{@pet.the_geom}.to raise_error(TheGeomGeoJSON::Dirty)
@@ -141,7 +129,7 @@ describe TheGeomGeoJSON do
           expect{@pet.the_geom_webmercator}.to raise_error(TheGeomGeoJSON::Dirty)
         end
         it "lets you access the_geom_geojson" do
-          expect(@pet.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington_point])
+          expect(@pet.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington])
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_geom_geojson
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord