geonames_local 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d899c1e90546accbce85fa372b534d862f81d16
-  data.tar.gz: b0978645a9ae924f268bb8783a82e2de3564a733
+  metadata.gz: 0ba4f5b249b265786ed141a7cb788ecbbdb8d972
+  data.tar.gz: 5c72a80db053d42786b373207892e353ccac08d9
 SHA512:
-  metadata.gz: d907b4d932d092bae9b440b31226e12d8c68d8b54e5806076dde56c7b68569f5087352903d97db250d7dc603f14418499527758823a6428f20485d8cc2bee8ab
-  data.tar.gz: fa3189ca4d1c1ae453dcd1c7e6cd8d9fc227fd2524fbff07f87e6584e1858295a5b72ec40812b27e1353c448113af571466cc581fd82647ab34ccfccd2597489
+  metadata.gz: 5be133df0fde1cc8b007d7b4369d497b2b1e012fe234d7a2ae7c250433b98dfea5fdec5fd434c91c7ab1da33983ee46f5d1b58775eed08907a18ec3404f9c6c4
+  data.tar.gz: cf0e1a0d83460d355a70b7edf7fdd95c9c13c700502a5c08404d7cca4afcbfb637a3e9d014b0f5df55ba7880cd129788a99ece4bc8701b1382df698a914371b9

data/Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 gemspec # Specify  gem's dependencies in mongoid_geospatial.gemspec
 
 gem 'rake'
+gem 'pry'
 gem 'dbf'
 
 platforms :ruby do
@@ -9,10 +10,7 @@ platforms :ruby do
 end
 
 gem 'georuby'
-
-gem 'mongoid'
 gem 'mongoid_geospatial'
 
-gem 'pry'
 gem 'rspec'
 gem 'guard-rspec'

data/README.md

@@ -27,22 +27,16 @@ Create a config yml file:
 
     geonames init
 
-Will generate a "geonames.yml" file on your folder.
+Will generate a `geonames.yml` file on your folder.
 The file is self explanatory.
 
-Geonames splits the nations/countries database from the rest, so:
+Geonames *splits the nations/countries database* from the rest, so:
+It'll also populate the nations collection automatically: `252` nations.
 
 
-To populate the nations database for the first time use:
-
-    geonames -c geoconfig.yml nations
-
-
-Then you can run geonames to populate regions/cities...
-
     geonames -c geonames.yml
 
-To run it. Use -v for verbose.
+To run it. Use `-v` for verbose.
 
 
 If you are not sure your country/nation code, use:
@@ -50,25 +44,20 @@ If you are not sure your country/nation code, use:
     geonames list <search>
 
 
+Mongoid
+-------
 
-Adapters
---------
+Using **http://github.com/fireho/geopolitical** models:
 
-So, supposing Mongoid, something like this is possible:
 
-  City.first.province.country.abbr
+  City.first.region.nation.abbr
   => "BR"
 
 
-== Postgis
-
-TBD (by someone else)
-Be sure to use a database based on the PostGIS template.
-
-
-
 
 Next
 ----
 
 - IP Geonames? http://ipinfodb.com
+- Hoods? ftp://geoftp.ibge.gov.br/malhas_digitais/censo_2010/setores_censitarios/
+- ActiveRecord/PostGIS - someone else

data/Rakefile

@@ -1,22 +1,14 @@
 #!/usr/bin/env rake
 require 'bundler/gem_tasks'
 
-require 'rspec/core'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+RSpec::Core::RakeTask.new
+RuboCop::RakeTask.new
 
 task default: :spec
 
-require 'yard'
-
 #
 # Tokyo Tyrant rake tasks
 #

data/geonames_local.gemspec

@@ -1,33 +1,33 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path('../lib/geonames_local/version', __FILE__)
 
-Gem::Specification.new do |gem|
-  gem.name = 'geonames_local'
-  gem.version = Geonames::VERSION
-  gem.homepage = 'http://github.com/nofxx/geonames_local'
-
-  gem.authors = ['Marcos Piccinini']
-  gem.default_executable = 'geonames'
-  gem.description = 'Dumps geonames data to feed a local db'
-  gem.email = 'x@nofxx.com'
-  gem.license = 'MIT'
-
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = 'geonames_local'
-  gem.require_paths = ['lib']
-  gem.summary = 'Dumps geonames data for local usage'
-
-  gem.extra_rdoc_files = [
+Gem::Specification.new do |s|
+  s.name = 'geonames_local'
+  s.version = Geonames::VERSION
+  s.homepage = 'http://github.com/nofxx/geonames_local'
+
+  s.authors = ['Marcos Piccinini']
+  s.default_executable = 'geonames'
+  s.description = 'Dumps geonames data to feed a local db'
+  s.email = 'x@nofxx.com'
+  s.license = 'MIT'
+
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.name          = 'geonames_local'
+  s.require_paths = ['lib']
+  s.summary = 'Dumps geonames data for local usage'
+
+  s.extra_rdoc_files = [
     'MIT-LICENSE',
     'README.md'
   ]
 
-  gem.add_dependency('mongoid', ['> 3.0.0'])
-  gem.add_dependency('geopolitical', ['> 0.8.1'])
+  s.add_dependency('mongoid', ['>= 4.0.0'])
+  s.add_dependency('geopolitical', ['> 0.8.4'])
 
-  gem.post_install_message = '
+  s.post_install_message = '
 Geonames Local
 --------------
 

data/lib/geonames_local/cli.rb

@@ -95,7 +95,7 @@ module Geonames
         info "\nPopulating 'regions' and 'cities' database..."
         zip = Geonames::Dump.new(Opt[:nations], :zip).data
         dump = Geonames::Dump.new(Opt[:nations], :dump).data
-        info "\n---\nTotal #{dump.size} parsed. #{zip.size} zip codes."
+        info "\n---\nTotal #{dump.size} parsed. #{zip.size} postal codes."
 
         info 'Join dump << zip'
         dump = unify!(dump, zip).group_by(&:kind)
@@ -156,8 +156,8 @@ module Geonames
         load_adapter(Opt[:store])
         info "Using adapter #{Opt[:store]}.."
         wrapper.clean if Opt[:clean]
-        Benchmark.measure { work_nations } unless wrapper.nations_populated?
-        Benchmark.measure { work_spots }
+        puts Benchmark.measure { work_nations } unless wrapper.nations_populated?
+        puts Benchmark.measure { work_spots }
       end
 
       def load_adapter(name)

data/lib/geonames_local/config/geonames.sql

@@ -29,7 +29,7 @@ CREATE TABLE cities (
     region_id integer,
     name character varying(255) NOT NULL,
     gid integer,
-    zip integer,
+    postal integer,
     geom geometry,
     CONSTRAINT enforce_dims_geom CHECK ((st_ndims(geom) = 2)),
     CONSTRAINT enforce_geotype_geom CHECK (((geometrytype(geom) = 'POINT'::text) OR (geom IS NULL))),
@@ -127,10 +127,10 @@ CREATE INDEX index_cities_on_region_id ON cities USING btree (region_id);
 --
 -- TOC entry 2554 (class 1259 OID 21696)
 -- Dependencies: 2245
--- Name: index_cities_on_zip; Type: INDEX; Schema: public; Owner: -; Tablespace:
+-- Name: index_cities_on_postal; Type: INDEX; Schema: public; Owner: -; Tablespace:
 --
 
-CREATE INDEX index_cities_on_zip ON cities USING btree (zip);
+CREATE INDEX index_cities_on_postal ON cities USING btree (postal);
 
 
 --

data/lib/geonames_local/features/spot.rb

@@ -20,20 +20,7 @@ module Geonames
       kind == :zip ? parse_zip(params) : parse(params)
       if @kind == :region
         @name.gsub!(/Estado d\w\s/, '')
-        @abbr = get_abbr
-      end
-    end
-
-    #
-    # Geonames does not have region/state abbr..#fail!
-    # This works 75% of the time in brazil heh
-    #
-    def get_abbr
-      s = @name.split(' ')
-      if s.length > 1
-        [s[0][0].chr, s[-1][0].chr].map(&:upcase).join
-      else
-        s[0][0..1].upcase
+        @name.gsub!(/Federal District/, 'Distrito Federal')
       end
     end
 
@@ -41,13 +28,16 @@ module Geonames
     # Parse Geonames Dump Export
     #
     def parse(row)
-      gid, @name, @ascii, @alternates, lat, lon, feat, kind,
+      gid, name, @ascii, @alternates, lat, lon, feat, kind,
       @nation, _cc2, @region, @code, _adm3, _adm4, @pop, @ele,
       @gtop, @tz, @up = row.split(/\t/)
 
+      @name = name #name.encode(Encoding::ISO_8859_1)
       @gid = @geoname_id = gid.to_i
       @kind = human_code(kind)
 
+      @abbr = @alternates.split(',').find { |n| n =~ /^[A-Z]{2,3}$/ }
+
       parse_geom(lat, lon)
       # puts "#{@kind} - #{@code} - #{@region}"
     end

data/lib/geonames_local/models/mongodb.rb

@@ -62,7 +62,7 @@ module Geonames
           # info "------------------------"
           {
             name_translations: translate(name),
-            zip: pos_code, cash: cur_code, gid: gid,
+            postal: pos_code, cash: cur_code, gid: gid,
             abbr: abbr, slug: name.downcase, code: iso3, lang: langs
           }
         end
@@ -85,22 +85,14 @@ module Geonames
         #
         def parse_city(s)
           region = Region.find_by(code: s.region)
-          slug = City.new(slug: s.ascii).slug
-          attempt = slug.dup
-          try = 1
-          until City.where(slug: attempt.downcase).first.nil?
-            attempt = "#{slug}-#{region.abbr}-#{try}"
-            try += 1
-            break if try > 7
-          end
           # ---
           # info s.inspect
-          info "City: #{s.zip} | #{slug} - #{s.name} / #{region.try(:abbr)}"
+          info "City: #{s.zip} | #{s.name} / #{region.try(:abbr)}"
           {
             name_translations: translate(s.name),
-            slug: attempt, gid: s.gid, code: s.code,
+            gid: s.gid, code: s.code,
             souls: s.pop, geom: [s.lon, s.lat],
-            region: region, zip: s.zip # tz
+            region: region, postal: s.zip # tz
           }
         end
       end

data/lib/geonames_local/models/postgis.rb

@@ -63,7 +63,7 @@ end
 #       t.references :province
 #       t.string  :name,   :null => false
 #       t.point   :geom,   :srid => 4326
-#       t.integer :gid, :zip
+#       t.integer :gid, :postal
 #     end
 
 #     create_table :provinces do |t|
@@ -79,7 +79,7 @@ end
 #     end
 
 #     add_index :cities, :name
-#     add_index :cities, :zip
+#     add_index :cities, :postal
 #     add_index :cities, :country_id
 #     add_index :cities, :province_id
 #     add_index :cities, :gid,  :unique  => true

data/lib/geonames_local/regions/abbr.rb

@@ -0,0 +1,24 @@
+module Geonames
+  module Regions
+
+    #
+    # Geonames does not have region/state abbr..#fail!
+    # This works 75% of the time in brazil heh
+    def self.abbr(name)
+      table = { # exceptions
+        'Amapá'       => 'AP',
+        'Mato Grosso' => 'MT',
+        'Paraíba'     => 'PB',
+        'Paraná'      => 'PR',
+        'Roraima'     => 'RR'
+      }[name]
+      return table if table
+      s = name.split(' ')
+      if s.length > 1 # Foo Bar -> 'FB'
+        [s[0][0].chr, s[-1][0].chr].map(&:upcase).join
+      else  # Foobar -> 'FO'
+        s[0][0..1].upcase
+      end
+    end
+  end
+end

data/lib/geonames_local/version.rb

@@ -1,3 +1,3 @@
 module Geonames
-  VERSION = '3.3.3'
+  VERSION = '3.3.4'
 end

data/lib/geonames_local.rb

@@ -12,5 +12,8 @@ require 'geonames_local/features/spot'
 require 'geonames_local/features/road'
 require 'geonames_local/features/zone'
 
+# Require Data
+require 'geonames_local/regions/abbr'
+
 # Require Main
 require 'geonames_local/geonames'

data/spec/spec_ar_helper.rb

@@ -61,7 +61,7 @@
 
 #   add_index :cities, :name
 #   add_index :cities, :gid
-#   add_index :cities, :zip
+#   add_index :cities, :postal
 #   add_index :cities, :country_id
 #   add_index :cities, :region_id
 #   add_index :cities, :geom, :spatial => true

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: geonames_local
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: geopolitical
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.4
 description: Dumps geonames data to feed a local db
 email: x@nofxx.com
 executables:
@@ -71,6 +71,7 @@ files:
 - lib/geonames_local/models/mongodb.rb
 - lib/geonames_local/models/postgis.rb
 - lib/geonames_local/models/tokyo.rb
+- lib/geonames_local/regions/abbr.rb
 - lib/geonames_local/version.rb
 - spec/geonames_local/cli_spec.rb
 - spec/geonames_local/data/cache_spec.rb
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Dumps geonames data for local usage
@@ -134,4 +135,3 @@ test_files:
 - spec/geonames_local_spec.rb
 - spec/spec_ar_helper.rb
 - spec/spec_helper.rb
-has_rdoc: