geonames_dump 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc115251aa28974fac9fe99f92236985c653bd4e
-  data.tar.gz: c7b8681ac3b297589e0ce06f186084d3ed595379
+  metadata.gz: 449ac0186316849284960960df5200fa5830053c
+  data.tar.gz: 647d2b017b3c9cdc5ef44c4fde827e74b3492ebd
 SHA512:
-  metadata.gz: 8739f5f56f7de5d139fd129bfc59557e3c7c4fb4fca6c96c53257a12e2dfc0a81cbb8423a5d54a8097d44f30d4c0adb7855fc5e1540d81e1b9571b53ece95488
-  data.tar.gz: b3ed7c49f56aeb4bd994daed17e497a14773814730666eff58ef95a719b3fd759b4fda4ededb0856508c749a1a66b14ed64105a4639457dc203a484141aef720
+  metadata.gz: df1f520a053206501c209a3b23a9b1cd9385ac18dbc05d91f3176c533dd355853b733aa066e3f9d1afd6f07da856fc2d5a3455797d5027bfe0fd123e939591ef
+  data.tar.gz: 1e3a7f6ed3f2b63dcc83565a532fdad2bb4cb3e70a56006c87e9097a963cedb61e5e26bbc9491cfc6caa37289f54652460a0990e4dbd3dfafdf340594da34dbe

data/README.md

@@ -1,80 +1,129 @@
 # GeonamesDump
 
-GeonamesDump import geographic data from geonames project into your application, avoiding to use external service like google maps.
-It's a "gem" version of the application [brownbeagle/geonames](https://github.com/brownbeagle/geonames).
-Now you only need to include the dependency into your Gemfile and your project will include geonames.
+GeonamesDump import geographic data from geonames project into your
+application, avoiding to use external service like google maps.  It's a "gem"
+version of the
+application [brownbeagle/geonames](https://github.com/brownbeagle/geonames).
+Now you only need to include the dependency into your Gemfile and your project
+will include geonames.
 
-You're free to use [geocoder](https://github.com/alexreisner/geocoder) or [geokit](https://github.com/imajes/geokit) or any other geocoding solution.
+You're free to use [geocoder](https://github.com/alexreisner/geocoder) or
+[geokit](https://github.com/imajes/geokit) or any other geocoding solution.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'geonames_dump'
+```
+gem 'geonames_dump'
+```
 
 And then execute:
 
-    $ bundle install
+```
+bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install geonames_dump
+```
+gem install geonames_dump
+```
 
 ## Usage
 
 Create models and migration files
 
-    $ rails generate geonames_dump:install
-
-Import data (takes a loonnnng time!), it will download data, import countries and many features (Countries, Cities, Admin1 (first administrative subdivision), Admin2 (second level administrative subdivision))
-
-    $ rake geonames_dump:install
-
-If you need more fine grained control over the installation process you can run individual geoname rake tasks instead of the all-in-one install :
-
-    $ rake -T | grep geonames_dump
-    
-    rake geonames_dump:import:all          # Import ALL geonames data.
-    rake geonames_dump:import:many         # Import most of geonames data.
-    
-    rake geonames_dump:import:admin1       # Import admin1 codes
-    rake geonames_dump:import:admin2       # Import admin2 codes
-    rake geonames_dump:import:cities       # Import all cities, regardless of population.
-    rake geonames_dump:import:cities1000   # Import cities with population greater than 1000
-    rake geonames_dump:import:cities15000  # Import cities with population greater than 15000
-    rake geonames_dump:import:cities5000   # Import cities with population greater than 5000
-    rake geonames_dump:import:countries    # Import countries informations
-    rake geonames_dump:import:features     # Import feature data.
-    
-    rake geonames_dump:truncate:all        # Truncate all geonames data.
-    rake geonames_dump:truncate:countries  # Truncate countries informations
-    rake geonames_dump:truncate:admin1     # Truncate admin1 codes
-    rake geonames_dump:truncate:admin2     # Truncate admin2 codes
-    rake geonames_dump:truncate:cities     # Truncate cities informations
-    rake geonames_dump:truncate:features   # Truncate features informations
+```
+rails generate geonames_dump:install
+```
+
+Import data (takes a loonnnng time!), it will download data, import countries
+and many features (Countries, Cities having more than 15000 people, Admin1
+(first administrative subdivision), Admin2 (second level administrative
+subdivision))
+
+```
+rake geonames_dump:install
+```
+
+If you need more fine grained control over the installation process you can run
+individual geoname rake tasks instead of the all-in-one install :
+
+```
+$ rake -T | grep geonames_dump
+
+rake geonames_dump:import:all               # Import ALL geonames data.
+rake geonames_dump:import:many              # Import most of geonames data.
+
+rake geonames_dump:import:admin1            # Import admin1 codes
+rake geonames_dump:import:admin2            # Import admin2 codes
+rake geonames_dump:import:cities            # Import all cities, regardless of population.
+rake geonames_dump:import:cities1000        # Import cities with population greater than 1000
+rake geonames_dump:import:cities15000       # Import cities with population greater than 15000
+rake geonames_dump:import:cities5000        # Import cities with population greater than 5000
+rake geonames_dump:import:countries         # Import countries informations
+rake geonames_dump:import:features          # Import feature data.
+rake geonames_dump:import:alternate_names   # Import alternate names
+
+rake geonames_dump:truncate:all             # Truncate all geonames data.
+rake geonames_dump:truncate:countries       # Truncate countries informations
+rake geonames_dump:truncate:admin1          # Truncate admin1 codes
+rake geonames_dump:truncate:admin2          # Truncate admin2 codes
+rake geonames_dump:truncate:cities          # Truncate cities informations
+rake geonames_dump:truncate:features        # Truncate features informations
+rake geonames_dump:truncate:alternate_names # Import alternate names
+```
 
 ## Geonames data usage
 
-The above commands will import geonames data in your Rails application, in other words, this will create models and fill database with place/city/country informations.
+The above commands will import geonames data in your Rails application, in
+other words, this will create models and fill database with place/city/country
+informations.
+
+A convenient way to search for data is to use GeonamesDump search accessor
+`GeonamesDump.search`. This method interate on data types to find a result.
+Search order is the following :
+
+1. Cities
+2. Alternate names (names in non-latin alphabets)
+3. First level admin subdivisions
+4. Second level admin subdivisions
+5. Countries
+6. Features (lakes, montains and others various features)
+
 Now to find a city for example :
 
-    GeonamesFeature.search('paris')
+```
+GeonamesDump.search('paris')
+```
 
-If your request is ambiguous, like not searching Dublin in Ireland but Dublin in the USA, you may specify country :
+If your request is ambiguous, like not searching Dublin in Ireland but Dublin
+in the USA, you may specify country :
 
-    GeonamesFeature.search('dublin, us')
+```
+GeonamesDump.search('dublin').first.country_code
+=> 'IE'
+GeonamesDump.search('dublin, us').first.country_code
+=> 'US'
+```
 
-Models available allows to specify the type of place you want to search for :
+If needed, requested type may be specified too :
 
-- GeonamesAdmin1, for first level of adminstrative subdivision
-- GeonamesAdmin2, for second level of adminstrative subdivision
-- GeonamesCity, for city names
-- GeonamesFeature, for generic names including all the above
-- GeonamesCountry, for country names
+```
+GeonamesDump.search('dublin', type: :city)
+GeonamesDump.search('dublin, us', type: :city)
+GeonamesDump.search('paris', type: :feature)
+```
 
-Searching for a city like dublin may be done using :
+The following types are available :
 
-    GeonamesCity.search('dublin')
+- admin1, for first level of adminstrative subdivision
+- admin2, for second level of adminstrative subdivision
+- city, for city names
+- feature, for generic names including all the above
+- alternate_name, for names in non-latin alphabets
+- country, for country names
 
 ## Contributing
 

data/lib/generators/geonames_dump/install_generator.rb

@@ -9,15 +9,15 @@ Description:
     Create Geonames initial migrations files and Geonames model files in your application
 DESC
       def copy_migrations_files
-        #template File.join('app', 'models', 'geonames_country.rb', 'config/initializers/piktur_config.rb'
-        %w(create_geonames_countries create_geonames_features).each do |file|
+        Dir.glob(File.join(File.expand_path(File.join('..', 'templates', 'db', 'migrate'), __FILE__), '*')).each do |full_path|
+          file = File.basename(full_path, File.extname(full_path))
           migration_template File.join('db', 'migrate', "#{file}.rb")
         end
       end
 
       def copy_models_files
-        #template File.join('app', 'models', 'geonames_country.rb', 'config/initializers/piktur_config.rb'
-        %w(geonames_admin1 geonames_admin2 geonames_city geonames_country geonames_feature).each do |file|
+        Dir.glob(File.join(File.expand_path(File.join('..', 'templates', 'app', 'models'), __FILE__), '*')).each do |full_path|
+          file = File.basename(full_path, File.extname(full_path))
           copy_file File.join('app', 'models', "#{file}.rb")
         end
       end

data/lib/generators/geonames_dump/templates/app/models/geonames_alternate_name.rb

@@ -0,0 +1,52 @@
+class GeonamesAlternateName < ActiveRecord::Base
+  validates_uniqueness_of :alternate_name_id
+  validates_uniqueness_of :geonameid
+  before_save :set_alternate_name_first_letters
+
+  ##
+  # default search (by alternate name)
+  #
+  scope :search, lambda { |q|
+    by_alternate_name(q)
+  }
+
+  ##
+  # search by isolanguage code
+  #
+  scope :by_isolanguage, lambda { |q|
+    where("isolanguage = ?", q)
+  }
+
+  ##
+  # search prefered names
+  #
+  scope :prefered, lambda {
+    where(is_preferred_name: true)
+  }
+
+  ##
+  # search by name
+  #
+  scope :by_alternate_name, lambda { |q|
+    ret = self.scoped
+    ret = ret.where("alternate_name_first_letters = ?", q[0...3].downcase)
+    ret = ret.where("alternate_name LIKE ?", "#{q}%")
+  }
+
+  ##
+  # Get associated feature
+  #
+  def feature
+    GeonamesFeature.where(geonameid: self.geonameid)  
+  end
+
+  protected
+
+  ##
+  # Set first letters of name into index column
+  #
+  def set_alternate_name_first_letters
+    self.alternate_name_first_letters = self.alternate_name[0...3].downcase unless self.alternate_name.nil?
+  end
+
+end

data/lib/generators/geonames_dump/templates/app/models/geonames_feature.rb

@@ -5,7 +5,7 @@ class GeonamesFeature < ActiveRecord::Base
   ##
   # Search for feature, searches might include country (separated by ',')
   #
-  scope :search, lambda { |query| 
+  scope :search, lambda { |query|
     virgule = query.include? ','
 
     splited = virgule ? query.split(',') : [query]
@@ -19,7 +19,7 @@ class GeonamesFeature < ActiveRecord::Base
 
     unless country.nil?
       geonames_country = GeonamesCountry.search(country).first
-      ret = ret.where(:country => geonames_country.iso) unless geonames_country.nil?
+      ret = ret.where(:country_code => geonames_country.iso) unless geonames_country.nil?
     end
 
     ret
@@ -39,6 +39,13 @@ class GeonamesFeature < ActiveRecord::Base
     ret
   }
 
+  def alternate_names
+    GeonamesAlternateName.where(geonameid: self.geonameid)
+  end
+
+
+  protected
+
   ##
   # Set first letters of name into index column
   #

data/lib/generators/geonames_dump/templates/db/migrate/create_geonames_alternate_names.rb

@@ -0,0 +1,32 @@
+class CreateGeonamesAlternateNames < ActiveRecord::Migration
+  # http://download.geonames.org/export/dump/countryInfo.txt
+  # alternateNameId   : the id of this alternate name, int
+  # geonameid         : geonameId referring to id in table 'geoname', int
+  # isolanguage       : iso 639 language code 2- or 3-characters; 4-characters 'post' for postal codes and 'iata','icao' and faac for airport codes, fr_1793 for French Revolution names,  abbr for abbreviation, link for a website, varchar(7)
+  # alternate name    : alternate name or name variant, varchar(200)
+  # isPreferredName   : '1', if this alternate name is an official/preferred name
+  # isShortName       : '1', if this is a short name like 'California' for 'State of California'
+  # isColloquial      : '1', if this alternate name is a colloquial or slang term
+  # isHistoric        : '1', if this alternate name is historic and was used in the past
+  def change
+    create_table :geonames_alternate_names do |t|
+      t.integer :alternate_name_id
+      t.integer :geonameid
+      t.string :isolanguage, length: 7
+      t.string :alternate_name, length: 200
+      t.boolean :is_preferred_name
+      t.boolean :is_short_name
+      t.boolean :is_colloquial
+      t.boolean :is_historic
+
+      t.string :alternate_name_first_letters
+
+      t.timestamps
+    end
+
+    add_index :geonames_alternate_names, :alternate_name_id
+    add_index :geonames_alternate_names, :geonameid
+    add_index :geonames_alternate_names, :isolanguage
+    add_index :geonames_alternate_names, :alternate_name_first_letters
+  end
+end

data/lib/generators/geonames_dump/templates/db/migrate/create_geonames_countries.rb

@@ -1,9 +1,6 @@
-
-# http://download.geonames.org/export/dump/countryInfo.txt
-
 class CreateGeonamesCountries < ActiveRecord::Migration
-
-  def self.up
+  # http://download.geonames.org/export/dump/countryInfo.txt
+  def change
     create_table :geonames_countries do |t|
       t.string :iso
       t.string :iso3
@@ -29,10 +26,5 @@ class CreateGeonamesCountries < ActiveRecord::Migration
     end
 
     add_index :geonames_countries, :geonameid
-    add_index :geonames_countries, :country
-  end
-
-  def self.down
-    drop_table :geonames_countries
   end
 end

data/lib/generators/geonames_dump/templates/db/migrate/create_geonames_features.rb

@@ -1,5 +1,5 @@
 class CreateGeonamesFeatures < ActiveRecord::Migration
-
+  # http://download.geonames.org/export/dump/readme.txt
   # geonameid         : integer id of record in geonames database
   # name              : name of geographical point (utf8) varchar(200)
   # asciiname         : name of geographical point in plain ascii characters, varchar(200)
@@ -11,54 +11,49 @@ class CreateGeonamesFeatures < ActiveRecord::Migration
   # country code      : ISO-3166 2-letter country code, 2 characters
   # cc2               : alternate country codes, comma separated, ISO-3166 2-letter country code, 60 characters
   # admin1 code       : fipscode (subject to change to iso code), isocode for the us and ch, see file admin1Codes.txt for display names of this code; varchar(20)
-  # admin2 code       : code for the second administrative division, a county in the US, see file admin2Codes.txt; varchar(80) 
+  # admin2 code       : code for the second administrative division, a county in the US, see file admin2Codes.txt; varchar(80)
   # admin3 code       : code for third level administrative division, varchar(20)
   # admin4 code       : code for fourth level administrative division, varchar(20)
-  # population        : bigint (4 byte int) 
+  # population        : bigint (4 byte int)
   # elevation         : in meters, integer
-  # gtopo30           : average elevation of 30'x30' (ca 900mx900m) area in meters, integer
+  # dem               : digital elevation model, srtm3 or gtopo30, average elevation of 3''x3'' (ca 90mx90m) or 30''x30'' (ca 900mx900m) area in meters, integer. srtm processed by cgiar/ciat.
   # timezone          : the timezone id (see file timeZone.txt)
   # modification date : date of last modification in yyyy-MM-dd format
-  def self.up
+  def change
     create_table :geonames_features do |t|
       t.integer :geonameid
-      t.string :name
-      t.string :asciiname
-      t.string :alternatenames
+      t.string :name, length: 200
+      t.string :asciiname, length: 200
+      t.string :alternatenames, length: 5000
       t.float :latitude
       t.float :longitude
       t.string :feature_class
-      t.string :feature
-      t.string :country
-      t.string :cc2
-      t.string :admin1
-      t.string :admin2
-      t.string :admin3
-      t.string :admin4
+      t.string :feature_code, length: 10
+      t.string :country_code
+      t.string :cc2, length: 60
+      t.string :admin1_code, length: 20
+      t.string :admin2_code, length: 80
+      t.string :admin3_code, length: 20
+      t.string :admin4_code, length: 20
       t.integer :population
       t.integer :elevation
-      t.integer :gtopo30
-      t.string :timezone
+      t.integer :dem
+      t.string :timezone, length: 40
       t.timestamp :modification
+
       t.string :type
-      # OPTIMIZE: create another table for all names (alternate names)
       t.string :asciiname_first_letters
 
-
       t.timestamps
     end
 
     add_index :geonames_features, :geonameid
     add_index :geonames_features, :name
     add_index :geonames_features, :asciiname
-    add_index :geonames_features, :country
+    add_index :geonames_features, :country_code
     add_index :geonames_features, :population
-    add_index :geonames_features, :admin1
+    add_index :geonames_features, :admin1_code
     add_index :geonames_features, :type
     add_index :geonames_features, :asciiname_first_letters
   end
-
-  def self.down
-    drop_table :geonames_features
-  end
 end

data/lib/generators/geonames_dump/templates/db/migrate/create_geonames_iso_languagecodes.rb

@@ -0,0 +1,17 @@
+class CreateGeonamesIsoLanguagecodes < ActiveRecord::Migration
+  # http://download.geonames.org/export/dump/iso-languagecodes.txt
+  # iso_639_3 : ISO 639-3 language code
+  # iso_639_2 : ISO 639-2 language code
+  # iso_639_1 : ISO 639-1 language code
+  # language_name : language name
+  def change
+    create_table :geonames_iso_languagecodes do |t|
+      t.string :iso_639_3, length: 4
+      t.string :iso_639_2, length: 4
+      t.string :iso_639_1, length: 4
+      t.string :language_name, length: 80
+
+      t.timestamps
+    end
+  end
+end

data/lib/geonames_dump.rb

@@ -5,4 +5,35 @@ require "geonames_dump/railtie" #if defined?(Rails)
 module GeonamesDump
   # TODO: remove this logger
   #ActiveRecord::Base.logger = Logger.new(STDOUT) if Rails.env.development? && !ENV['SILENT']
+
+  def self.search(query, options = {})
+    ret = nil
+
+    type = options[:type] || :auto
+    begin
+      case type
+      when :auto
+        # city name
+        ret = GeonamesCity.search(query)
+        # alternate name
+        ret = GeonamesAlternateName.search(query) if ret.blank?
+        # admin1
+        ret = GeonamesAdmin1.search(query) if ret.blank?
+        # admin2
+        ret = GeonamesAdmin2.search(query) if ret.blank?
+        # country
+        ret = GeonamesCountry.search(query) if ret.blank?
+        # feature
+        ret = GeonamesFeature.search(query) if ret.blank?
+      else
+        model = "geonames_#{type.to_s}".camelcase.constantize
+        ret = model.search(query)
+      end
+    rescue NameError => e
+      Rails.logger.error "Unknown type for GeonamesDump : #{e}"
+      #raise
+    end
+
+    ret
+  end
 end

data/lib/geonames_dump/version.rb

@@ -1,3 +1,3 @@
 module GeonamesDump
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/tasks/import.rake

@@ -8,9 +8,14 @@ namespace :geonames_dump do
     CACHE_DIR = "#{Rails.root}/db/geonames_cache"
 
     GEONAMES_FEATURES_COL_NAME = [
-        :geonameid, :name, :asciiname, :alternatenames, :latitude, :longitude, :feature_class,
-        :feature, :country, :cc2, :admin1, :admin2, :admin3, :admin4, :population, :elevation,
-        :gtopo30, :timezone, :modification
+        :geonameid, :name, :asciiname, :alternatenames, :latitude, :longitude,
+        :feature_class, :feature_code, :country_code, :cc2, :admin1_code,
+        :admin2_code, :admin3_code, :admin4_code, :population, :elevation,
+        :dem, :timezone, :modification
+      ]
+    GEONAMES_ALTERNATE_NAMES_COL_NAME = [
+        :alternate_name_id, :geonameid, :isolanguage, :alternate_name,
+        :is_preferred_name, :is_short_name, :is_colloquial, :is_historic
       ]
     GEONAMES_COUNTRIES_COL_NAME = [
         :iso, :iso3, :iso_numeric, :fips, :country, :capital, :area, :population, :continent,
@@ -30,7 +35,7 @@ namespace :geonames_dump do
     task :all => [:many, :features]
 
     desc 'Import most of geonames data. Recommended after a clean install.'
-    task :many => [:prepare, :countries, :cities, :admin1, :admin2]
+    task :many => [:prepare, :countries, :cities15000, :admin1, :admin2]
 
     desc 'Import all cities, regardless of population.'
     task :cities => [:prepare, :cities15000, :cities5000, :cities1000]
@@ -44,8 +49,6 @@ namespace :geonames_dump do
 
       # Import into the database.
       File.open(txt_file) do |f|
-        #VALID_FEATURES = %w[ADMIN1]
-        #feature_attrs = VALID_FEATURES & ENV.keys
         # TODO: add feature selection
         insert_data(f, GEONAMES_FEATURES_COL_NAME, GeonamesCity, :title => "Features")
       end
@@ -58,7 +61,6 @@ namespace :geonames_dump do
 
         txt_file = get_or_download("http://download.geonames.org/export/dump/cities#{population}.zip")
 
-        # Import into the database.
         File.open(txt_file) do |f|
           insert_data(f, GEONAMES_FEATURES_COL_NAME, GeonamesCity, :title => "cities of #{population}")
         end
@@ -66,10 +68,29 @@ namespace :geonames_dump do
     end
 
     desc 'Import countries informations'
-    task :countries => :environment do
+    task :countries => [:prepare, :environment] do
       txt_file = get_or_download('http://download.geonames.org/export/dump/countryInfo.txt')
 
-      # Import into the database.
+      File.open(txt_file) do |f|
+        insert_data(f, GEONAMES_COUNTRIES_COL_NAME, GeonamesCountry, :title => "Countries")
+      end
+    end
+
+    desc 'Import alternate names'
+    task :alternate_names => [:prepare, :environment] do
+      txt_file = get_or_download('http://download.geonames.org/export/dump/alternateNames.zip',
+                                 txt_file: 'alternateNames.txt')
+
+      File.open(txt_file) do |f|
+        insert_data(f, GEONAMES_ALTERNATE_NAMES_COL_NAME, GeonamesAlternateName, :title => "Alternate names", :buffer => 10000)
+      end
+    end
+
+    desc 'Import iso language codes'
+    task :language_codes => [:prepare, :environment] do
+      txt_file = get_or_download('http://download.geonames.org/export/dump/alternateNames.zip',
+                                 txt_file: 'iso-languagecodes.txt')
+
       File.open(txt_file) do |f|
         insert_data(f, GEONAMES_COUNTRIES_COL_NAME, GeonamesCountry, :title => "Countries")
       end
@@ -79,15 +100,14 @@ namespace :geonames_dump do
     task :admin1 => [:prepare, :environment] do
       txt_file = get_or_download('http://download.geonames.org/export/dump/admin1CodesASCII.txt')
 
-      # Import into the database.
       File.open(txt_file) do |f|
         insert_data(f, GEONAMES_ADMINS_COL_NAME, GeonamesAdmin1, :title => "Admin1 subdivisions") do |klass, attributes, col_value, idx|
           col_value.gsub!('(general)', '')
           col_value.strip!
           if idx == 0
             country, admin1 = col_value.split('.')
-            attributes[:country] = country.strip
-            attributes[:admin1] = admin1.strip rescue nil
+            attributes[:country_code] = country.strip
+            attributes[:admin1_code] = admin1.strip rescue nil
           else
             attributes[GEONAMES_ADMINS_COL_NAME[idx]] = col_value
           end
@@ -99,15 +119,14 @@ namespace :geonames_dump do
     task :admin2 => [:prepare, :environment] do
       txt_file = get_or_download('http://download.geonames.org/export/dump/admin2Codes.txt')
 
-      # Import into the database.
       File.open(txt_file) do |f|
         insert_data(f, GEONAMES_ADMINS_COL_NAME, GeonamesAdmin2, :title => "Admin2 subdivisions") do |klass, attributes, col_value, idx|
           col_value.gsub!('(general)', '')
           if idx == 0
             country, admin1, admin2 = col_value.split('.')
-            attributes[:country] = country.strip
-            attributes[:admin1] = admin1.strip #rescue nil
-            attributes[:admin2] = admin2.strip #rescue nil
+            attributes[:country_code] = country.strip
+            attributes[:admin1_code] = admin1.strip #rescue nil
+            attributes[:admin2_code] = admin2.strip #rescue nil
           else
             attributes[GEONAMES_ADMINS_COL_NAME[idx]] = col_value
           end
@@ -179,6 +198,7 @@ namespace :geonames_dump do
       # Setup nice progress output.
       file_size = file_fd.stat.size
       title = options[:title] || 'Feature Import'
+      buffer = options[:buffer] || 1000
       progress_bar = ProgressBar.create(:title => title, :total => file_size, :format => '%a |%b>%i| %p%% %t')
 
       # create block array
@@ -223,7 +243,7 @@ namespace :geonames_dump do
         end
 
         # increase import speed by performing insert using transaction
-        if line_counter % 1000 == 0
+        if line_counter % buffer == 0
           ActiveRecord::Base.transaction do
             blocks.call_and_reset
           end

data/lib/tasks/install.rake

@@ -1,4 +1,4 @@
 namespace :geonames_dump do
-  desc 'Truncate and install most of geonames data (country, admin1, admin2, cities)'
+  desc 'Truncate and install most of geonames data (country, admin1, admin2, cities15000)'
   task :install => ['truncate:all', 'import:many']
 end

data/lib/tasks/truncate.rake

@@ -23,18 +23,21 @@ namespace :geonames_dump do
     task :cities => :environment do
       GeonamesCity.delete_all #&& GeonamesCity.reset_pk_sequence
     end
-    
+
     desc 'Truncate countries informations'
     task :countries => :environment do
       GeonamesCountry.delete_all && GeonamesCountry.reset_pk_sequence
     end
-    
+
     desc 'Truncate features informations'
     task :features => :environment do
       GeonamesFeature.delete_all && GeonamesFeature.reset_pk_sequence
     end
-    
-#    private
+
+    desc 'Truncate alternate names'
+    task :alternate_names => :environment do
+      GeonamesAlternateName.delete_all && GeonamesAlternateName.reset_pk_sequence
+    end
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geonames_dump
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alex Pooley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
@@ -70,11 +70,14 @@ files:
 - lib/generators/geonames_dump/install_generator.rb
 - lib/generators/geonames_dump/templates/app/models/geonames_admin1.rb
 - lib/generators/geonames_dump/templates/app/models/geonames_admin2.rb
+- lib/generators/geonames_dump/templates/app/models/geonames_alternate_name.rb
 - lib/generators/geonames_dump/templates/app/models/geonames_city.rb
 - lib/generators/geonames_dump/templates/app/models/geonames_country.rb
 - lib/generators/geonames_dump/templates/app/models/geonames_feature.rb
+- lib/generators/geonames_dump/templates/db/migrate/create_geonames_alternate_names.rb
 - lib/generators/geonames_dump/templates/db/migrate/create_geonames_countries.rb
 - lib/generators/geonames_dump/templates/db/migrate/create_geonames_features.rb
+- lib/generators/geonames_dump/templates/db/migrate/create_geonames_iso_languagecodes.rb
 - lib/generators/geonames_dump/templates/piktur_config.rb
 - lib/geonames_dump.rb
 - lib/geonames_dump/blocks.rb