open_places 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ec524fc7eed7c33638c7c6021d2f02a04e6288d
-  data.tar.gz: 397e1c0c9fd649e3ae5ee1f2438afcb2adfc0f5c
+  metadata.gz: 7d93a62f2c504af60fb46b0765deae1a8502a128
+  data.tar.gz: 45d9b533fcd6d3f0ddc45dec78abf033a3233b36
 SHA512:
-  metadata.gz: eda323608724ab9c9b470acffaf3c99e2699de8c8429a6d2e432ccea05044312cd8c2579a545faceff52027337d910e3a0916c4cea638579f4053448b15da509
-  data.tar.gz: 66bdee81e7c2e4d3bbe481c36b5a5afb83bdfdafd8c9d31efd88d6fa23cf719f7fc2ab6180d4733ff8fd4f1983099381672a24208c1d5a6232d16919d74134f9
+  metadata.gz: dac0aaf4a8913923dd5593f59d2d5d11d9780e205e5a72c970989b4c43c3277420f3ee6e8e560458d398d0cb6b5dd0bb5f762734a92a5292e8845f75d0e82e58
+  data.tar.gz: 3b2ae299d52d015ca46c51eae5b3541eab48e857add24aec1783f33038f463c050ab494d238af4b4fd31f96e8881df1e752609d0a60cee7640675b2d5146ce2c

data/app/controllers/open_places/autocomplete_controller.rb

@@ -13,7 +13,18 @@ module OpenPlaces
       @results = @results.near(params[:near]) if params[:near].present?
       @results = @results.order('scalerank ASC')
       @results = @results.limit(params[:limit])
-      
+
+      if @results.empty?
+        OpenPlaces::Geo.transaction do
+          @result = OpenPlaces::Geo.create(long_name: query_string)
+          if @result.id.present?
+            @results = OpenPlaces::Geo.where(id: @result.id)
+          else
+            @results = OpenPlaces::Geo.where(slug: @result.slug)
+          end
+        end
+      end
+
       respond_to do |format|
         format.json do
           render json: @results.to_json(except: OpenPlaces::Geo.GEO_FIELDS), root: false, status: 200, :callback => params['callback']

data/app/models/open_places/geo.rb

@@ -5,7 +5,34 @@ module OpenPlaces
     self.primary_key = :id
     self.inheritance_column = 'geotype'
 
-    include Concerns::ReadOnlyModel
+    validates :name, presence: { scope: [:latitude, :longitude]}
+    validates :long_name, :slug, :path,  presence: true, uniqueness: true
+    validates :name, presence: true, uniqueness: { scope: [:province_name, :country_name ]}
+
+    before_validation :geocode_record
+    before_validation :validate_country_name
+    before_validation :validate_province_name
+    before_validation :set_postgres_columns
+
+    geocoded_by :long_name do |obj,results|
+      if geo = results.first
+        parse_geocode_results(obj, geo)
+      end
+    end
+
+    reverse_geocoded_by :latitude, :longitude do |obj,results|
+      if geo = results.first
+        parse_geocode_results(obj, geo, false)
+      end
+    end
+
+    def geocode_record
+      if latitude_changed? && longitude_changed?
+        reverse_geocode
+      elsif long_name_changed?
+        geocode
+      end
+    end 
 
     def self.FIELDS
       @fields ||= ["id","geotype", "subtype", "scalerank", "code", "name", "short_name", "long_name",
@@ -60,5 +87,76 @@ module OpenPlaces
         )  As fc;)
       )
     }
+
+    protected
+
+    def self.parse_geocode_results(obj, geo, latlng=true)
+      ['latitude', 'longitude'].each do |k|
+        obj[k] = geo.send(k) if geo.respond_to?(k)
+      end if !!(latlng)
+      obj['country_name'] = geo.send('country')
+      obj['country_code'] = geo.send('country_code')
+      obj['province_name'] = geo.send('state')
+      obj['province_code'] = geo.send('state_code')
+      city_components = [
+        geo.address_components_of_type('point_of_interest'),
+        geo.address_components_of_type('establishment'),
+        geo.address_components_of_type('locality'),
+        geo.address_components_of_type('political')
+      ]
+      city = city_components.try(:flatten).try(:first)["long_name"] rescue nil
+      obj['name'] =  city || geo.send('city') || obj['province_name'] || obj['country_name']
+      obj['short_name'] = obj['country_code'] == 'US' ? [obj['name'],obj['province_name']].join(", ") : [obj['name'],obj['country_name']].join(", ")
+      obj['scalerank'] ||= 12
+      obj['geotype'] ||= 'OpenPlaces::Place'
+      obj['subtype'] ||= 'Town'
+      return obj
+    end
+
+    def validate_country_name
+      country = Country.autocomplete(country_name)
+      if country.empty?
+        raise "Country #{country_name} not found"
+      else
+        country = country.first
+        self.country_name = country.name
+        self.country_code = country.code
+        self.continent  = country.continent
+        self.region_un = country.region_un
+        self.subregion = country.subregion
+        self.region_wb = country.region_wb
+      end
+    end
+
+    def validate_province_name
+      province = Province.autocomplete(province_name)
+      if province.empty?
+        raise "Province #{province_name} not found"
+      else
+        province = province.first
+        self.province_name = province.name
+        self.province_code = province.code
+      end
+    end
+
+    def set_postgres_columns
+      results = ActiveRecord::Base.connection.execute(%(
+        SELECT ST_SetSRID(ST_Point(#{latitude}, #{longitude}),4326) AS latlng, 
+        ST_Expand(ST_SetSRID(ST_Point(#{longitude}, #{latitude}),4326), .1) AS geom,
+        ST_Envelope(ST_Expand(ST_SetSRID(ST_Point(#{longitude}, #{latitude}),4326), .1)) AS bbox,
+        ST_XMin(ST_Expand(ST_SetSRID(ST_Point(#{longitude}, #{latitude}),4326), .1)) AS x_min, 
+        ST_YMin(ST_Expand(ST_SetSRID(ST_Point(#{longitude}, #{latitude}),4326), .1)) AS y_min,
+        ST_XMax(ST_Expand(ST_SetSRID(ST_Point(#{longitude}, #{latitude}),4326), .1)) AS x_max,
+        ST_YMax(ST_Expand(ST_SetSRID(ST_Point(#{longitude}, #{latitude}),4326), .1)) AS y_max,
+        ST_Area(ST_Expand(ST_SetSRID(ST_Point(#{longitude}, #{latitude}),4326), .1)) AS area,
+        concat_ws(' ', concat_ws(', ', '#{name}', '#{province_name}'), '#{country_name}') AS long_name,
+        setweight(to_tsvector('#{name}'), 'A') || setweight(to_tsvector('#{province_name}'), 'B') || setweight(to_tsvector('#{country_name}'), 'C') AS tsvector,
+        regexp_replace(trim(regexp_replace(lower(concat_ws('-', '#{name}', '#{province_name}', '#{country_name}')), '[^0-9a-z/]+', ' ', 'g')), '[ ]+', '-', 'g') AS slug,
+        regexp_replace(trim(regexp_replace(lower(concat_ws('/', '#{country_name}', '#{province_name}', '#{name}')), '[^0-9a-z/]+', ' ', 'g')), '[ ]+', '-', 'g') AS path
+      ))
+      results.first.each do |k,v|
+        self.send("#{k}=", v)
+      end if results.try(:first)
+    end
   end
 end

data/app/views/open_places/demo/index.html.erb

@@ -29,10 +29,11 @@
 
 <% content_for(:javascript) do %>
 $(document).ready(function(){
-
-		L.mapbox.accessToken = '<%= ENV['MAPBOX_ID']%>';
-		window["map"] = L.mapbox.map('map', 'mapbox.streets')
+    <% if ENV['MAPBOX_ID'].present? %>
+	    L.mapbox.accessToken = '<%= ENV['MAPBOX_ID']%>';
+		  window["map"] = L.mapbox.map('map', 'mapbox.streets')
 		    .setView([0,0], 2);
+    <% end %>
 
     $( "#location" ).autocomplete({
       source: function( request, response ) {

data/lib/open_places/version.rb

@@ -1,3 +1,3 @@
 module OpenPlaces
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_places
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ty Rauber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: geocoder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Imports Natural Earth geospatial data and provides a mountable JSON/GeoJSON
   API endpoint.
 email: