geonames_rails 0.2.0 → 0.2.1

data/lib/generators/geonames_rails/migration_templates/geonames_tables.rb

@@ -41,6 +41,7 @@ class CreateGeonamesTables < ActiveRecord::Migration
     # create cities
     create_table :cities do |t|
       t.integer :country_id, :null => false
+      t.integer :division_id
       # [0] geonameid : integer id of record in geonames database
       t.integer :geonames_id, :null => false
       # [1] name : name of geographical point (utf8) varchar(200)

data/lib/generators/geonames_rails/models_templates/models/city.rb

@@ -1,3 +1,4 @@
 class City < ActiveRecord::Base
   belongs_to :country
+  belongs_to :division
 end

data/lib/generators/geonames_rails/models_templates/models/division.rb

@@ -1,3 +1,4 @@
 class Division < ActiveRecord::Base
   belongs_to :country
+  has_many :cities
 end

data/lib/geonames_rails/loader.rb

@@ -18,8 +18,8 @@ module GeonamesRails
       @puller.pull if @puller # pull geonames files down
       
       load_countries
-      load_cities
       load_divisions
+      load_cities
       
       @puller.cleanup if @puller # cleanup the geonames files
     end

data/lib/geonames_rails/writers/active_record.rb

@@ -64,6 +64,9 @@ module GeonamesRails
                                                  :admin_2_code,
                                                  :admin_3_code,
                                                  :admin_4_code)
+
+            division = Division.find_by_full_code(city.country_iso_code_two_letters+"."+city.admin_1_code )
+            city.division_id = division.id unless division.blank?
           
             city.save!
           end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Marius Andra