geonames_local 0.2.1 → 0.3.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = Geonames Local
 
-Download and store in tokyo or postgresql Geonames.org data.
+Download and store Geonames.org data.
 Making every Geoname API operation possible on your servers.
 No hit limit, fast as possible.
 
@@ -85,7 +85,7 @@ Default PG migration:
     add_index :cities, :province_id
     add_index :cities, :geom, :spatial => true
     add_index :provinces, :name
-    add_index :provinces, :abbrg
+    add_index :provinces, :abbr
     add_index :provinces, :gid
     add_index :provinces, :country_id
 

data/Rakefile

@@ -10,8 +10,10 @@ begin
     gem.email = "x@nofxx.com"
     gem.homepage = "http://github.com/nofxx/geonames_local"
     gem.authors = ["Marcos Piccinini"]
+
+    gem.add_dependency "nofxx-georuby",     ">= 1.7.1"
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "nofxx-georuby", ">= 1.7.1"
+
     gem.post_install_message = <<-POST_INSTALL_MESSAGE
 
 Geonames Local

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/geonames.yml

@@ -0,0 +1,14 @@
+#
+# Geonames Local Config Example
+#
+:store: mongodb
+:codes: [br]
+:level: city
+:mapping:
+  :name: name
+  :geom: true
+:db:
+  :host: localhost
+  :dbname: rtrac_development
+  :user: postgres
+  :password:

data/geonames_local.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geonames_local}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-03-19}
+  s.date = %q{2010-03-20}
   s.default_executable = %q{geonames}
   s.description = %q{Dump and feed a tokyo cabinet for local geonames search}
   s.email = %q{x@nofxx.com}
@@ -26,35 +26,41 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/geonames",
+     "geonames.yml",
      "geonames_local.gemspec",
+     "lib/geonames_ext.rb",
      "lib/geonames_local.rb",
      "lib/geonames_local/adapters/mongodb.rb",
      "lib/geonames_local/adapters/postgres.rb",
      "lib/geonames_local/adapters/tokyo.rb",
      "lib/geonames_local/cli.rb",
      "lib/geonames_local/config/codes.yml",
+     "lib/geonames_local/config/geonames.sql",
      "lib/geonames_local/config/geonames.yml",
-     "lib/geonames_local/data/cache.rb",
-     "lib/geonames_local/data/geoquery.rb",
+     "lib/geonames_local/data/dump.rb",
+     "lib/geonames_local/data/export.rb",
      "lib/geonames_local/data/shp.rb",
-     "lib/geonames_local/dump.rb",
-     "lib/geonames_local/export.rb",
-     "lib/geonames_local/features/city.rb",
-     "lib/geonames_local/features/country.rb",
-     "lib/geonames_local/features/province.rb",
      "lib/geonames_local/features/road.rb",
      "lib/geonames_local/features/spot.rb",
      "lib/geonames_local/features/zone.rb",
+     "lib/geonames_local/geonames.rb",
+     "lib/geonames_local/model/city.rb",
+     "lib/geonames_local/model/conn.rb",
+     "lib/geonames_local/model/country.rb",
+     "lib/geonames_local/model/province.rb",
+     "spec/geonames_local/adapters/mongodb_spec.rb",
+     "spec/geonames_local/adapters/postgres_spec.rb",
+     "spec/geonames_local/adapters/tokyo_spec.rb",
      "spec/geonames_local/cli_spec.rb",
      "spec/geonames_local/data/cache_spec.rb",
-     "spec/geonames_local/data/postgres_spec.rb",
      "spec/geonames_local/data/shp_spec.rb",
-     "spec/geonames_local/data/tokyo_spec.rb",
      "spec/geonames_local/features/road_spec.rb",
      "spec/geonames_local/features/spot_spec.rb",
      "spec/geonames_local/features/zone_spec.rb",
+     "spec/geonames_local/model/city_spec.rb",
      "spec/geonames_local_spec.rb",
      "spec/spec.opts",
+     "spec/spec_ext_helper.rb",
      "spec/spec_helper.rb",
      "task/benchmark.rb",
      "task/benchmark_cabinet.rb"
@@ -90,14 +96,17 @@ Have fun because:
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/geonames_local/data/shp_spec.rb",
-     "spec/geonames_local/data/postgres_spec.rb",
-     "spec/geonames_local/data/tokyo_spec.rb",
      "spec/geonames_local/data/cache_spec.rb",
+     "spec/geonames_local/model/city_spec.rb",
      "spec/geonames_local/cli_spec.rb",
+     "spec/geonames_local/adapters/postgres_spec.rb",
+     "spec/geonames_local/adapters/tokyo_spec.rb",
+     "spec/geonames_local/adapters/mongodb_spec.rb",
      "spec/geonames_local/features/spot_spec.rb",
      "spec/geonames_local/features/zone_spec.rb",
      "spec/geonames_local/features/road_spec.rb",
-     "spec/geonames_local_spec.rb"
+     "spec/geonames_local_spec.rb",
+     "spec/spec_ext_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -105,15 +114,15 @@ Have fun because:
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_runtime_dependency(%q<nofxx-georuby>, [">= 1.7.1"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<nofxx-georuby>, [">= 1.7.1"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<nofxx-georuby>, [">= 1.7.1"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end
 

data/lib/geonames_ext.rb

@@ -0,0 +1,15 @@
+#
+# Geonames Extension
+#
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+# Require Libs
+require 'geonames_local/geonames'
+
+require 'geonames_local/model/conn'
+require 'geonames_local/model/country'
+require 'geonames_local/model/province'
+require 'geonames_local/model/city'
+#require 'geonames_local/data/shp'
+

data/lib/geonames_local/adapters/mongodb.rb

@@ -5,28 +5,77 @@ module Geonames
 
     RESOURCES = ["countries", "provinces", "cities"]
 
-    def initialize(params)
-      port = params[:port] || 27017
-      @conn = Mongo::Connection.new(params[:host], port)
-      @db = @conn.db(params[:dbname])
-      purge
+    def initialize(params={})
+      host, port = params[:host] || "localhost", params[:port] || 27017
+      @conn = Mongo::Connection.new(host, port)
+      @db = @conn.db(params[:dbname] || "geonames")
+      #purge
       setup
     end
 
     def setup
       for re in RESOURCES
         coll = @db.collection(re)
-        coll.create_index(["id", Mongo::ASCENDING])
-        coll.create_index(["geom", Mongo::GEO2D], :min => 0, :max => 180)
+        coll.create_index(["id", Mongo::ASCENDING], ["gid", Mongo::ASCENDING])
+
+        # Geometric index, more info:
+        # http://www.mongodb.org/display/DOCS/Geospatial+Indexing
+        coll.create_index([["geom", Mongo::GEO2D]], :min => -180, :max => 180)
       end
     end
 
+    def all(resource, limit=nil, skip=0)
+      @db.collection(resource.to_s).find().to_a
+    end
+
     def find(resource, id, name=nil)
-      @db.collection(resource.to_s).find("id" => id).to_a.first
+      @db.collection(resource.to_s).find_one("id" => id)
+    end
+
+    def find_by_name(resource, name)
+      do_find(resource, "name" => /#{name}/)
+    end
+
+    def find_by_zip(resource, zip)
+      do_find(resource, "zip" => /#{zip}/)
+    end
+
+    def do_find(resource, hsh)
+      @db.collection(resource.to_s).find(hsh).to_a
     end
 
     def insert(resource, spot)
-      @db.collection(resource.to_s).insert(spot.to_hash)
+      hsh = spot.to_hash
+      hsh["geom"][0] = sin_proj(hsh["geom"])[0] if hsh["geom"]
+      @db.collection(resource.to_s).insert(hsh)
+    end
+
+    def count(resource)
+      @db.collection(resource).count
+    end
+
+    def find_near(resource, x, y, limit=nil, skip=0)
+      coll = @db.collection(resource.to_s).find("geom" => { "$near" => { "x" => x, "y" => y }}).skip(skip)
+      coll.limit(limit) if limit
+      coll.to_a
+    end
+
+    # +1.3.4
+    def find_within(resource, geom, limit=nil)
+      op = geom[1].kind_of?(Numeric) ? "$center" : "$box"
+      coll = @db.collection(resource.to_s).find("geom" => { "$within" => { op => geom }})
+      coll.limit(limit) if limit
+      coll.to_a
+    end
+
+    # getNear command returns distance too
+    # <1.9 needs OrderedHash
+    def near(resource, x, y, limit=nil)
+      cmd = OrderedHash.new
+      cmd["geoNear"] = resource
+      cmd["near"] = sin_proj(x,y)
+      cmd["num"] = limit if limit
+      @db.command(cmd)["results"].to_a
     end
 
     def purge
@@ -35,5 +84,15 @@ module Geonames
       end
     end
 
+    def index_info(resource)
+      @db.collection(resource).index_information
+    end
+
+    private
+
+    def sin_proj(x,y=nil)
+      x,y = x unless y
+      [x * Math.cos(y * Math::PI/180), y]
+    end
   end
 end

data/lib/geonames_local/adapters/tokyo.rb

@@ -83,3 +83,27 @@ module Geonames
   end
 
 end
+
+    # def self.point(tdb, x, y)
+    #         qry = TDBQRY::new(tdb)
+    #   qry.addcond("x", TDBQRY::QCNUMGE, minx.to_s())
+    #   qry.addcond("x", TDBQRY::QCNUMLE, maxx.to_s())
+    #   qry.addcond("y", TDBQRY::QCNUMGE, miny.to_s())
+    #   qry.addcond("y", TDBQRY::QCNUMLE, maxy.to_s())
+    #   qry.setorder("x", TDBQRY::QONUMASC)
+    #   qry.setlimit(80)
+    # end
+
+
+    # def self.area(tdb, minx, maxx, miny, maxy)
+    #   qry = TDBQRY::new(tdb)
+    #   qry.addcond("x", TDBQRY::QCNUMGE, minx.to_s())
+    #   qry.addcond("x", TDBQRY::QCNUMLE, maxx.to_s())
+    #   qry.addcond("y", TDBQRY::QCNUMGE, miny.to_s())
+    #   qry.addcond("y", TDBQRY::QCNUMLE, maxy.to_s())
+    #   qry.setorder("x", TDBQRY::QONUMASC)
+
+    #   res = qry.search
+    #   info res.length # number of results found
+    #   return res
+    # end

data/lib/geonames_local/config/geonames.sql

@@ -0,0 +1,331 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Started on 2010-03-19 05:44:38 BRT
+
+SET statement_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = off;
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+SET escape_string_warning = off;
+
+SET search_path = public, pg_catalog;
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- TOC entry 2245 (class 1259 OID 21665)
+-- Dependencies: 2544 2545 2546 3 992
+-- Name: cities; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE cities (
+    id integer NOT NULL,
+    country_id integer NOT NULL,
+    province_id integer,
+    name character varying(255) NOT NULL,
+    gid integer,
+    zip 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))),
+    CONSTRAINT enforce_srid_geom CHECK ((st_srid(geom) = 4326))
+);
+
+
+--
+-- TOC entry 2244 (class 1259 OID 21663)
+-- Dependencies: 3 2245
+-- Name: cities_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE cities_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- TOC entry 2557 (class 0 OID 0)
+-- Dependencies: 2244
+-- Name: cities_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE cities_id_seq OWNED BY cities.id;
+
+
+--
+-- TOC entry 2543 (class 2604 OID 21668)
+-- Dependencies: 2245 2244 2245
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE cities ALTER COLUMN id SET DEFAULT nextval('cities_id_seq'::regclass);
+
+
+--
+-- TOC entry 2548 (class 2606 OID 21670)
+-- Dependencies: 2245 2245
+-- Name: cities_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY cities
+    ADD CONSTRAINT cities_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 2549 (class 1259 OID 21697)
+-- Dependencies: 2245
+-- Name: index_cities_on_country_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_cities_on_country_id ON cities USING btree (country_id);
+
+
+--
+-- TOC entry 2550 (class 1259 OID 21699)
+-- Dependencies: 2245 1869
+-- Name: index_cities_on_geom; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_cities_on_geom ON cities USING gist (geom);
+
+
+--
+-- TOC entry 2551 (class 1259 OID 21695)
+-- Dependencies: 2245
+-- Name: index_cities_on_gid; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_cities_on_gid ON cities USING btree (gid);
+
+
+--
+-- TOC entry 2552 (class 1259 OID 21694)
+-- Dependencies: 2245
+-- Name: index_cities_on_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_cities_on_name ON cities USING btree (name);
+
+
+--
+-- TOC entry 2553 (class 1259 OID 21698)
+-- Dependencies: 2245
+-- Name: index_cities_on_province_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_cities_on_province_id ON cities USING btree (province_id);
+
+
+--
+-- TOC entry 2554 (class 1259 OID 21696)
+-- Dependencies: 2245
+-- Name: index_cities_on_zip; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_cities_on_zip ON cities USING btree (zip);
+
+
+--
+-- PostgreSQL database dump
+--
+
+-- Started on 2010-03-19 05:45:05 BRT
+
+SET statement_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = off;
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+SET escape_string_warning = off;
+
+SET search_path = public, pg_catalog;
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- TOC entry 2249 (class 1259 OID 21688)
+-- Dependencies: 3
+-- Name: countries; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE countries (
+    id integer NOT NULL,
+    name character varying(30) NOT NULL,
+    abbr character varying(2) NOT NULL
+);
+
+
+--
+-- TOC entry 2248 (class 1259 OID 21686)
+-- Dependencies: 3 2249
+-- Name: countries_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE countries_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- TOC entry 2548 (class 0 OID 0)
+-- Dependencies: 2248
+-- Name: countries_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE countries_id_seq OWNED BY countries.id;
+
+
+--
+-- TOC entry 2543 (class 2604 OID 21691)
+-- Dependencies: 2249 2248 2249
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE countries ALTER COLUMN id SET DEFAULT nextval('countries_id_seq'::regclass);
+
+
+--
+-- TOC entry 2545 (class 2606 OID 21693)
+-- Dependencies: 2249 2249
+-- Name: countries_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY countries
+    ADD CONSTRAINT countries_pkey PRIMARY KEY (id);
+
+
+--
+-- PostgreSQL database dump
+--
+
+-- Started on 2010-03-19 05:45:19 BRT
+
+SET statement_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = off;
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+SET escape_string_warning = off;
+
+SET search_path = public, pg_catalog;
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- TOC entry 2247 (class 1259 OID 21680)
+-- Dependencies: 3
+-- Name: provinces; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE provinces (
+    id integer NOT NULL,
+    country_id integer NOT NULL,
+    name character varying(255) NOT NULL,
+    abbr character varying(2) NOT NULL,
+    gid integer
+);
+
+
+--
+-- TOC entry 2246 (class 1259 OID 21678)
+-- Dependencies: 3 2247
+-- Name: provinces_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE provinces_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+--
+-- TOC entry 2552 (class 0 OID 0)
+-- Dependencies: 2246
+-- Name: provinces_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE provinces_id_seq OWNED BY provinces.id;
+
+
+--
+-- TOC entry 2543 (class 2604 OID 21683)
+-- Dependencies: 2246 2247 2247
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE provinces ALTER COLUMN id SET DEFAULT nextval('provinces_id_seq'::regclass);
+
+
+--
+-- TOC entry 2549 (class 2606 OID 21685)
+-- Dependencies: 2247 2247
+-- Name: provinces_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY provinces
+    ADD CONSTRAINT provinces_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 2544 (class 1259 OID 21701)
+-- Dependencies: 2247
+-- Name: index_provinces_on_abbr; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_provinces_on_abbr ON provinces USING btree (abbr);
+
+
+--
+-- TOC entry 2545 (class 1259 OID 21703)
+-- Dependencies: 2247
+-- Name: index_provinces_on_country_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_provinces_on_country_id ON provinces USING btree (country_id);
+
+
+--
+-- TOC entry 2546 (class 1259 OID 21702)
+-- Dependencies: 2247
+-- Name: index_provinces_on_gid; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_provinces_on_gid ON provinces USING btree (gid);
+
+
+--
+-- TOC entry 2547 (class 1259 OID 21700)
+-- Dependencies: 2247
+-- Name: index_provinces_on_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_provinces_on_name ON provinces USING btree (name);
+
+
+-- Completed on 2010-03-19 05:45:19 BRT
+
+--
+-- PostgreSQL database dump complete
+--
+
+
+
+
+

data/lib/geonames_local/features/spot.rb

@@ -1,7 +1,7 @@
 module Geonames
   class Spot
     attr_accessor :gid, :name, :ascii, :lat, :lon, :country, :kind,
-                  :code,  :pop, :tz, :geom, :province, :zip, :abbr
+                  :code,  :pop, :tz, :geom, :province, :zip, :abbr, :id
     alias :x :lon
     alias :y :lat
     alias :geoname_id :gid
@@ -11,10 +11,10 @@ module Geonames
     # = Geonames Spot
     #
     # Every geoname type will be parsed as a spot
-    def initialize(params, k)
+    def initialize(params=nil, k=nil)
       return unless params.instance_of? String
       k == :zip ? parse_zip(params) :  parse(params)
-      if @kind == :provinces
+      if @kind == :province
         @name.gsub!(/Estado d\w\s/, "")
         @abbr = get_abbr
       end
@@ -75,16 +75,49 @@ module Geonames
     def to_hash
       { "id" => @geoname_id, "gid" => @geoname_id.to_s, "kind" => @kind.to_s,
         "name" => @name, "ascii" => @ascii, "country" => @country,
-        "geom" => {"y" => @lat.to_s, "x" => @lon.to_s}, "tz" => @tz }
+        "geom" => [@geom.x, @geom.y], "tz" => @tz }
     end
 
-
     def human_code(code)
       case code
-        when 'ADM1' then :provinces
-        when 'ADM2' then :cities
+        when 'ADM1' then :province
+        when 'ADM2' then :city
         else :other
       end
     end
+
+    class << self
+
+    def all
+      Adapter.all(@coll)
+    end
+
+    def find(id)
+      Adapter.find(@coll, id)
+    end
+
+    def find_by_name(name)
+      Adapter.find_by_name(@coll, name).map { |hsh| from_hash(hsh) }
+    end
+
+    def nearest(x,y)
+      from_hash(Adapter.find_near(@coll, x, y, 1)[0])
+    end
+
+    def from_hash(hsh)
+      spot = self.new
+      hsh.each { |key, val| spot.instance_variable_set("@"+key, val) }
+      spot.geom = GeoRuby::SimpleFeatures::Point.from_x_y(*spot.geom)
+      spot
+    end
+
+    def set_coll(name)
+      @coll = name
+    end
+
+    def collection
+      @coll
+    end
+    end
   end
 end

data/lib/geonames_local/geonames.rb

@@ -0,0 +1,20 @@
+require 'rubygems'
+require 'logger'
+require 'yaml'
+
+require 'geonames_local/features/spot'
+require 'geonames_local/features/road'
+require 'geonames_local/features/zone'
+
+module Geonames
+  Opt = {}
+  Cache = {:dump => [], :zip => [], :roads => [], :zones => []}
+  Codes = YAML.load(File.read(File.join(File.dirname(__FILE__), 'config', 'codes.yml')))
+  VERSION =  File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION'))
+
+  def info(txt)
+    if Opt[:verbose]
+      puts(txt)
+    end
+  end
+end

data/lib/geonames_local/model/city.rb

@@ -0,0 +1,7 @@
+class City < Geonames::Spot
+
+  set_coll "cities"
+
+
+
+end

data/lib/geonames_local/model/conn.rb

@@ -0,0 +1,7 @@
+require 'geonames_local/adapters/mongodb'
+
+module Geonames
+
+  Adapter = Geonames::Mongodb.new
+
+end

data/lib/geonames_local.rb

@@ -1,28 +1,13 @@
+#
+# Geonames Local
+#
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'rubygems'
-require 'logger'
-require 'yaml'
-require 'geonames_local/features/spot'
-require 'geonames_local/features/country'
-require 'geonames_local/features/city'
-require 'geonames_local/features/road'
-require 'geonames_local/features/zone'
-require 'geonames_local/data/shp'
+# Require CLI Stuff
+require 'geonames_local/geonames'
 require 'geonames_local/cli'
-require 'geonames_local/dump'
-require 'geonames_local/export'
-
-module Geonames
-  Opt = {}
-  Cache = {:dump => [], :zip => [], :roads => [], :zones => []}
-  Codes = YAML.load(File.read(File.join(File.dirname(__FILE__), 'geonames_local', 'config', 'codes.yml')))
-  VERSION =  File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
+require 'geonames_local/data/shp'
+require 'geonames_local/data/dump'
+require 'geonames_local/data/export'
 
-  def info(txt)
-    if Opt[:verbose]
-      puts(txt)
-    end
-  end
-end

data/spec/geonames_local/adapters/mongodb_spec.rb

@@ -0,0 +1,105 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/geonames_local/adapters/mongodb')
+
+describe Mongodb do
+
+  SPECDB = "geonames_spec"
+
+  before(:all) do
+    Mongodb.new({:dbname => SPECDB}).purge
+    @mong = Mongodb.new({:dbname => SPECDB})
+  end
+
+  def mock_spot(name)
+    Spot.new("1\t#{name}\t#{name}\t\t-5.46874226086957\t-35.3565714695652\tA\tADM2\tBR\t22\t2407500\t6593\t\t12\t\t\t\tAmerica/Recife\t2006-12-17", :dump)
+  end
+
+  describe "Parsing Dump" do
+    before do
+      @mock_spot = mock("Spot")
+    end
+
+    it "should find all" do
+     @mong.all("cities").each { |c| p c["geom"]} #should eql([])
+    end
+
+    it "should store something" do
+      @mock_spot.should_receive(:to_hash).and_return({"id" => 7, "name" => "Sao Tome", "geom" => [5,5]})
+      @mong.insert("cities", @mock_spot)
+      @mong.count("cities").should eql(1)
+    end
+
+    it "should store a spot" do
+      @mong.insert("cities", mock_spot("Loco"))
+      @mong.find("cities", 1)["name"].should eql("Loco")
+    end
+
+    it "should store geom with sinusoidal projection" do
+      @mock_spot.should_receive(:to_hash).and_return({"id" => 8, "name" => "Sao Tome", "geom" => [5,8]})
+      @mong.insert("cities", @mock_spot)
+      @mong.find("cities", 8)["geom"][0].should be_close(4.95, 0.1)
+      @mong.find("cities", 8)["geom"][1].should eql(8)
+    end
+
+    it "should have some indexes" do
+      @mong.index_info("cities").to_a.length.should eql(3)
+    end
+
+    describe "Finds" do
+
+      before(:all) do
+        @mong.insert("cities", {"id" => 9, "name" => "Sao Paulo", "geom" => [15,15]})
+        @mong.insert("cities", {"id" => 10, "name" => "Sao Tome", "geom" => [-7,-34]})
+        @mong.insert("cities", {"id" => 11, "name" => "Sao Benedito", "geom" => [-9,-39]})
+      end
+
+      it "should make sure it's on the collection" do
+        @mong.count("cities").should eql(3)
+      end
+
+      it "should find geo" do
+        @mong.find_near("cities", -5, -35).first["name"].should eql("Sao Tome")
+        @mong.find_near("cities", -5, -35).first["geom"][0].should be_close(-5.80, 0.1)
+        @mong.find_near("cities", -5, -35).first["geom"][1].should eql(-34)
+      end
+
+      it "should find geo limited" do
+        @mong.find_near("cities", -5, -35, 1).length.should eql(1)
+      end
+
+      it "should find within box" do
+        @mong.find_within("cities", [[10, 10],[20, 20]]).length.should eql(1)
+        @mong.find_within("cities", [[10, 10],[20, 20]]).first["name"].should eql("Sao Paulo")
+      end
+
+      it "should find within radius" do
+        @mong.find_within("cities", [[-6, -36], 2]).length.should eql(1)
+      end
+
+      it "should find within wider radius" do
+        @mong.find_within("cities", [[-6, -36], 5]).length.should eql(2)
+      end
+
+      it "should find within wider radius limited" do
+        @mong.find_within("cities", [[-6, -36], 5], 1).length.should eql(1)
+      end
+
+      it "should find geoNear" do
+        @mong.near("cities", -5, -35).first["dis"].should be_close(1.97, 0.01)
+        @mong.near("cities", -5, -35).first["obj"]["name"].should eql("Sao Tome")
+      end
+
+      it "should find geoNear" do
+        @mong.near("cities", -5, -35).first["dis"].should be_close(1.97, 0.01)
+        @mong.near("cities", -5, -35).first["obj"]["name"].should eql("Sao Tome")
+      end
+
+      it "should find geoNear limited" do
+        @mong.near("cities", -5, -35, 1).length.should eql(1)
+      end
+
+    end
+
+  end
+
+end

data/spec/geonames_local/{data → adapters}/postgres_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/geonames_local/adapters/postgres')
 
 describe Postgres do
 

data/spec/geonames_local/data/shp_spec.rb

@@ -10,6 +10,7 @@ describe SHP do
   Opt[:type] = "road"
 
   it "should merge two records linestrings" do
+    pending
     @s = SHP.new(nil)
     r = @s.reduce!
     r.length.should eql(1)

data/spec/geonames_local/features/spot_spec.rb

@@ -35,7 +35,7 @@ describe Spot do
     end
 
     it "should parse spot kind" do
-      @spot.kind.should eql(:cities)
+      @spot.kind.should eql(:city)
     end
 
     it "should parse spot country" do
@@ -97,7 +97,7 @@ describe Spot do
     end
 
     it "should be kind of province" do
-      @spot.kind.should eql(:provinces)
+      @spot.kind.should eql(:province)
     end
 
     it "should parse geoid" do
@@ -132,7 +132,7 @@ describe Spot do
   describe "Parsing Zip" do
 
     before do
-      @spot =  Geonames::Spot.new("BR\t76375-000\tHidrolina\tGoias\t29\t\t5209804\t\t-14.7574\t-49.3596\t\n", :zip)
+      @spot = Geonames::Spot.new("BR\t76375-000\tHidrolina\tGoias\t29\t\t5209804\t\t-14.7574\t-49.3596\t\n", :zip)
     end
 
     it "should parse zip oO" do
@@ -163,6 +163,39 @@ describe Spot do
 
   end
 
+  describe "From Hash" do
+
+    before do
+      @spot = Spot.from_hash({"id" => 9, "name" => "Sao Rock", "geom" => [15,15], "kind" => "cities", "country" => "BR", "gid" => 13232, "tz" => "America/Foo", "ascii" => "Rock"})
+    end
+
+    it "should be an spot" do
+      @spot.should be_instance_of Spot
+    end
+
+    it "should set the name" do
+      @spot.name.should eql("Sao Rock")
+    end
+
+    it "should set the geom" do
+      @spot.geom.should be_instance_of(GeoRuby::SimpleFeatures::Point)
+      @spot.geom.x.should eql(15)
+    end
+
+    it "should set the tz" do
+      @spot.tz.should eql("America/Foo")
+    end
+
+    it "should set the ascii" do
+      @spot.ascii.should eql("Rock")
+    end
+
+    it "should set the country abbr" do
+      @spot.country.should eql("BR")
+    end
+
+  end
+
 end
 
 # 6319037 Maxaranguape  Maxaranguape    -5.46874226086957 -35.3565714695652 A ADM2  BR    22  2407500     6593    12  America/Recife  2006-12-17
@@ -189,3 +222,4 @@ end
 # "3165361\tToscana\tToscana\tTaskana,Toscan-a,Toscana,Toscane,Toscann-a,Toskana,Toskania,Toskanio,Toskansko,Toskánsko,Toskāna,Toszkana,Toszkána,Tuscany,Tuschena,Tuschèna,Tuscia,toseukana ju,tosukana zhou,tuo si ka na,twsqnh,Таскана,Тоскана,טוסקנה,تسکانہ,ტოსკანა,トスカーナ州,托斯卡纳,토스카나 주\t43.4166667\t11.0\tA\tADM1\tIT\t\t16\t\t\t\t3718210\t\t249\tEurope/Rome\t2010-01-17\n"
 # "3169778\tRegione Puglia\tRegione Puglia\tApulia,Apulie,Apulien,Apulië,Pouilles,Puglia\t41.25\t16.25\tA\tADM1\tIT\t\t13\t\t\t\t4021957\t\t95\tEurope/Rome\t2009-03-11\n"
 # "3170831\tRegione Piemonte\tRegione Piemonte\tPedemons,Pedemontium,Piamonte,Piedmont,Piemont,Piemonte,Piémont,Piëmont,Regione Piemonte\t45.0\t8.0\tA\tADM1\tIT\t\t12\t\t\t\t4294081\t\t185\tEurope/Rome\t2008-08-18\n"
+

data/spec/geonames_local/model/city_spec.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_ext_helper')
+require "geo_ruby"
+
+describe City do
+
+  before(:all) do
+    Adapter.insert("cities", {"id" => 9, "name" => "Sao Paulo", "geom" => [15,15]})
+    Adapter.insert("cities", {"id" => 66, "name" => "Rock City", "geom" => [2,3]})
+  end
+
+  after(:all) do
+    Mongodb.new({:dbname => "geonames"}).purge
+  end
+
+  it "should set a collection name" do
+    City.collection.should eql("cities")
+  end
+
+  it "should find all cities" do
+    City.all.should_not be_empty
+  end
+
+  it "should be a city instance" do
+    City.nearest(1,1).should be_instance_of(City)
+  end
+
+  it "should find city nearest point" do
+    City.nearest(1,1).name.should eql("Rock City")
+  end
+
+  it "should find by name" do
+    City.find_by_name("Rock")[0].name.should eql("Rock City")
+  end
+end

data/spec/spec_ext_helper.rb

@@ -0,0 +1,5 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'geonames_ext'
+require 'spec'
+require 'spec/autorun'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 -03:00
+date: 2010-03-20 00:00:00 -03:00
 default_executable: geonames
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: nofxx-georuby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -26,13 +26,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
+        - 7
+        - 1
+        version: 1.7.1
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: nofxx-georuby
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -40,10 +40,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 7
-        - 1
-        version: 1.7.1
-  type: :runtime
+        - 2
+        - 9
+        version: 1.2.9
+  type: :development
   version_requirements: *id002
 description: Dump and feed a tokyo cabinet for local geonames search
 email: x@nofxx.com
@@ -62,35 +62,41 @@ files:
 - Rakefile
 - VERSION
 - bin/geonames
+- geonames.yml
 - geonames_local.gemspec
+- lib/geonames_ext.rb
 - lib/geonames_local.rb
 - lib/geonames_local/adapters/mongodb.rb
 - lib/geonames_local/adapters/postgres.rb
 - lib/geonames_local/adapters/tokyo.rb
 - lib/geonames_local/cli.rb
 - lib/geonames_local/config/codes.yml
+- lib/geonames_local/config/geonames.sql
 - lib/geonames_local/config/geonames.yml
-- lib/geonames_local/data/cache.rb
-- lib/geonames_local/data/geoquery.rb
+- lib/geonames_local/data/dump.rb
+- lib/geonames_local/data/export.rb
 - lib/geonames_local/data/shp.rb
-- lib/geonames_local/dump.rb
-- lib/geonames_local/export.rb
-- lib/geonames_local/features/city.rb
-- lib/geonames_local/features/country.rb
-- lib/geonames_local/features/province.rb
 - lib/geonames_local/features/road.rb
 - lib/geonames_local/features/spot.rb
 - lib/geonames_local/features/zone.rb
+- lib/geonames_local/geonames.rb
+- lib/geonames_local/model/city.rb
+- lib/geonames_local/model/conn.rb
+- lib/geonames_local/model/country.rb
+- lib/geonames_local/model/province.rb
+- spec/geonames_local/adapters/mongodb_spec.rb
+- spec/geonames_local/adapters/postgres_spec.rb
+- spec/geonames_local/adapters/tokyo_spec.rb
 - spec/geonames_local/cli_spec.rb
 - spec/geonames_local/data/cache_spec.rb
-- spec/geonames_local/data/postgres_spec.rb
 - spec/geonames_local/data/shp_spec.rb
-- spec/geonames_local/data/tokyo_spec.rb
 - spec/geonames_local/features/road_spec.rb
 - spec/geonames_local/features/spot_spec.rb
 - spec/geonames_local/features/zone_spec.rb
+- spec/geonames_local/model/city_spec.rb
 - spec/geonames_local_spec.rb
 - spec/spec.opts
+- spec/spec_ext_helper.rb
 - spec/spec_helper.rb
 - task/benchmark.rb
 - task/benchmark_cabinet.rb
@@ -150,11 +156,14 @@ summary: Dump and feed a tokyo local geonames db
 test_files: 
 - spec/spec_helper.rb
 - spec/geonames_local/data/shp_spec.rb
-- spec/geonames_local/data/postgres_spec.rb
-- spec/geonames_local/data/tokyo_spec.rb
 - spec/geonames_local/data/cache_spec.rb
+- spec/geonames_local/model/city_spec.rb
 - spec/geonames_local/cli_spec.rb
+- spec/geonames_local/adapters/postgres_spec.rb
+- spec/geonames_local/adapters/tokyo_spec.rb
+- spec/geonames_local/adapters/mongodb_spec.rb
 - spec/geonames_local/features/spot_spec.rb
 - spec/geonames_local/features/zone_spec.rb
 - spec/geonames_local/features/road_spec.rb
 - spec/geonames_local_spec.rb
+- spec/spec_ext_helper.rb

data/lib/geonames_local/data/cache.rb

@@ -1,5 +0,0 @@
-# module Geonames
-#   class Cache
-
-#   end
-# end

data/lib/geonames_local/data/geoquery.rb

@@ -1,31 +0,0 @@
-module Geonames
-  class Geoquery
-    R = 1
-
-    def self.point(tdb, x, y)
-            qry = TDBQRY::new(tdb)
-      qry.addcond("x", TDBQRY::QCNUMGE, minx.to_s())
-      qry.addcond("x", TDBQRY::QCNUMLE, maxx.to_s())
-      qry.addcond("y", TDBQRY::QCNUMGE, miny.to_s())
-      qry.addcond("y", TDBQRY::QCNUMLE, maxy.to_s())
-      qry.setorder("x", TDBQRY::QONUMASC)
-      qry.setlimit(80)
-    end
-
-
-    def self.area(tdb, minx, maxx, miny, maxy)
-      qry = TDBQRY::new(tdb)
-      qry.addcond("x", TDBQRY::QCNUMGE, minx.to_s())
-      qry.addcond("x", TDBQRY::QCNUMLE, maxx.to_s())
-      qry.addcond("y", TDBQRY::QCNUMGE, miny.to_s())
-      qry.addcond("y", TDBQRY::QCNUMLE, maxy.to_s())
-      qry.setorder("x", TDBQRY::QONUMASC)
-
-      res = qry.search
-      info res.length # number of results found
-      return res
-    end
-
-
-  end
-end

data/lib/geonames_local/features/city.rb

@@ -1,9 +0,0 @@
-class City
-  attr_accessor :country, :province, :name
-
-  def self.all
-    qry.addcond(QCSTREQ, 'city')
-  end
-  
-  
-end