geonames_rails 0.1.3 → 0.1.5

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

@@ -46,7 +46,9 @@ class CreateGeonamesTables < ActiveRecord::Migration
       # [1] name : name of geographical point (utf8) varchar(200)
       t.string :name, :null => false
       # [2] asciiname : name of geographical point in plain ascii characters, varchar(200)
+      t.string :asciiname
       # [3] alternatenames : alternatenames, comma separated varchar(4000)
+      t.text :alternatenames
       # [4] latitude : latitude in decimal degrees (wgs84)
       t.decimal :latitude, :precision => 14, :scale => 8, :null => false
       # [5] longitude : longitude in decimal degrees (wgs84)

data/lib/geonames_rails/writers/active_record.rb

@@ -13,8 +13,12 @@ module GeonamesRails
                                              :iso_number,
                                              :name,
                                              :capital,
+                                             :population,
                                              :continent,
-                                             :geonames_id)
+                                             :currency_name,
+                                             :currency_code,
+                                             :geonames_id,
+                                             :population)
         c.save!
         
         "#{created_or_updating} db record for #{iso_code}"
@@ -25,23 +29,26 @@ module GeonamesRails
       def write_cities(country_code, city_mappings)    
         country = Country.find_by_iso_code_two_letter(country_code)
         
-        #puts country
-        #puts city_mappings
-        
-        city_mappings.each do |city_mapping|
-          city = City.find_or_initialize_by_geonames_id(city_mapping[:geonames_id])
-          city.country_id = country.id
-        
-          city.attributes = city_mapping.slice(:name,
-                                               :latitude,
-                                               :longitude,
-                                               :country_iso_code_two_letters,
-                                               :geonames_timezone_id)
-        
-          city.save!
+        unless country.nil?
+          city_mappings.each do |city_mapping|
+            city = City.find_or_initialize_by_geonames_id(city_mapping[:geonames_id])
+            city.country_id = country.id
+          
+            city.attributes = city_mapping.slice(:name,
+                                                 :asciiname,
+                                                 :alternatenames,
+                                                 :latitude,
+                                                 :longitude,
+                                                 :country_iso_code_two_letters,
+                                                 :population,
+                                                 :geonames_timezone_id,
+                                                 :geonames_id)
+          
+            city.save!
+          end
+          
+          "Processed #{country.name}(#{country_code}) with #{city_mappings.length} cities"
         end
-        
-        "Processed #{country.name}(#{country_code}) with #{city_mappings.length} cities"
       end
 
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Marius Andra