geonames_patched 0.2.2

data/geonames_patched.gemspec

@@ -0,0 +1,18 @@
+require 'rubygems' 
+require 'date'
+
+SPEC = Gem::Specification.new do |s| 
+  s.name = "geonames_patched" 
+  s.version = "0.2.2" 
+  s.author = "Calvin Cheung" 
+  s.email = "calvin@presdo.com" 
+  s.date = s.date = Date.today.to_s
+  s.homepage = "http://github.com/calvin681/geonames_patched" 
+  s.platform = Gem::Platform::RUBY 
+  s.summary = "A version of Adam Wisniewksi's geonames gem that includes username/password login." 
+  candidates = Dir.glob("{bin,docs,lib,test}/**/*") 
+  s.files = Dir.glob('**/*')
+  s.require_path = "lib" 
+  s.has_rdoc = true 
+  s.extra_rdoc_files = ["README"]
+end 

data/geonames_patched.gemspec~

@@ -0,0 +1,18 @@
+require 'rubygems' 
+require 'date'
+
+SPEC = Gem::Specification.new do |s| 
+  s.name = "geonames" 
+  s.version = "0.2.2" 
+  s.author = "Calvin Cheung" 
+  s.email = "calvin@presdo.com" 
+  s.date = s.date = Date.today.to_s
+  s.homepage = "http://github.com/calvin681/geonames_patched" 
+  s.platform = Gem::Platform::RUBY 
+  s.summary = "A version of Adam Wisniewksi's geonames gem that includes username/password login." 
+  candidates = Dir.glob("{bin,docs,lib,test}/**/*") 
+  s.files = Dir.glob('**/*')
+  s.require_path = "lib" 
+  s.has_rdoc = true 
+  s.extra_rdoc_files = ["README"]
+end 

data/lib/Rakefile.rb

@@ -0,0 +1,21 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'

data/lib/address.rb

@@ -0,0 +1,25 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+  class Address
+    
+  end
+end
+
+

data/lib/country_subdivision.rb

@@ -0,0 +1,32 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class CountrySubdivision
+        attr :country_code
+        attr :country_name
+        attr :admin_code_1
+        attr :admin_name_1
+        
+        attr_writer :country_code, :country_name
+        attr_writer :admin_name_1, :admin_code_1
+        
+    end
+end
+
+

data/lib/geonames.rb

@@ -0,0 +1,62 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+require 'cgi'
+require 'net/http'
+require 'rexml/document'
+
+require File.dirname(__FILE__) + '/web_service'
+require File.dirname(__FILE__) + '/toponym'
+require File.dirname(__FILE__) + '/toponym_search_result'
+require File.dirname(__FILE__) + '/toponym_search_criteria'
+require File.dirname(__FILE__) + '/postal_code'
+require File.dirname(__FILE__) + '/postal_code_search_criteria'
+require File.dirname(__FILE__) + '/timezone'
+require File.dirname(__FILE__) + '/country_subdivision'
+require File.dirname(__FILE__) + '/wikipedia_article'
+require File.dirname(__FILE__) + '/intersection'
+
+module Geonames
+  
+  GEONAMES_SERVER = "http://ws.geonames.org"
+  GEONAMES_COMMERCIAL_SERVER = "http://ws.geonames.net"
+  USER_AGENT = "geonames ruby webservice client 0.1"
+  
+  @@commercial_username = nil
+  
+  def self.username
+    @@commercial_username
+  end
+  
+  def self.username=(user_name)
+    puts "Using Geonames commercial web service with username='#{user_name}'"
+    @@commercial_username = user_name
+  end
+  
+  def self.build_url(ws_name)
+    unless @@commercial_username.blank?
+      url = GEONAMES_COMMERCIAL_SERVER
+      user_param = "&username=#{@@commercial_username}"
+    else
+      url = GEONAMES_SERVER
+      user_param = ''
+    end
+    url + ws_name + user_param
+  end
+end
+

data/lib/geonames_patched.rb

@@ -0,0 +1 @@
+require 'geonames'

data/lib/intersection.rb

@@ -0,0 +1,42 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class Intersection
+        attr :street_1
+        attr :street_2
+        attr :latitude
+        attr :longitude
+        attr :distance
+        attr :postal_code
+        attr :place_name
+        attr :country_code
+        attr :admin_code_1
+        attr :admin_name_2
+        attr :admin_code_2
+        attr :admin_name_1
+        
+        attr_writer :street_1, :street_2
+        attr_writer :postal_code, :place_name, :country_code
+        attr_writer :latitude, :longitude, :admin_name_1
+        attr_writer :admin_code_1, :admin_name_2, :admin_code_2
+        attr_writer :distance 
+    end
+end
+
+

data/lib/main.rb

@@ -0,0 +1,63 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+# Contributions by Andrew Turner, High Earth Orbit
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+require 'geonames'
+require 'pp'
+
+# get the nearest intersection
+intersection = Geonames::WebService.find_nearest_intersection 40.7574053333333, -73.9734773333333
+puts intersection.street_1 #=> Park Ave
+puts intersection.street_2 #=> E 51st St
+
+# get wikipedia articles by lat / long
+articles_nearby = Geonames::WebService.find_nearby_wikipedia :lat => 43.900120387, :long => -78.882869834
+p articles_nearby
+
+# get wikipedia articles by bounding box
+articles_nearby = Geonames::WebService.find_bounding_box_wikipedia :north => 43.900120387, :east => -78.882869834, :south => 43.82, :west => 79.0
+p articles_nearby
+
+# get list of places near by longitude/longitude location
+places_nearby = Geonames::WebService.find_nearby_place_name 43.900120387, -78.882869834
+p places_nearby
+
+# get timezone for longitude/longitude location
+timezone = Geonames::WebService.timezone 43.900120387, -78.882869834
+p timezone
+
+# get country code for longitude/longitude location
+country_code = Geonames::WebService.country_code 43.900120387, -78.882869834
+p country_code
+
+# get country sub-division info for longitude/longitude location
+country_subdivision = Geonames::WebService.country_subdivision 43.900120387, -78.882869834
+p country_subdivision
+
+# get postal codes for a given location
+postal_code_sc = Geonames::PostalCodeSearchCriteria.new
+postal_code_sc.place_name = "Oshawa"
+postal_codes = Geonames::WebService.postal_code_search postal_code_sc
+p postal_codes
+
+# get nearby postal codes for a place name
+postal_code_sc = Geonames::PostalCodeSearchCriteria.new
+postal_code_sc.place_name = "Oshawa"
+postal_codes_nearby = Geonames::WebService.find_nearby_postal_codes postal_code_sc
+p postal_codes_nearby
+

data/lib/postal_code.rb

@@ -0,0 +1,40 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class PostalCode
+        attr :postal_code
+        attr :place_name
+        attr :country_code
+        attr :latitude
+        attr :longitude
+        attr :admin_name_1
+        attr :admin_code_1
+        attr :admin_name_2
+        attr :admin_code_2
+        attr :distance
+        
+        attr_writer :postal_code, :place_name, :country_code
+        attr_writer :latitude, :longitude, :admin_name_1
+        attr_writer :admin_code_1, :admin_name_2, :admin_code_2
+        attr_writer :distance
+        
+    end
+end
+
+

data/lib/postal_code_search_criteria.rb

@@ -0,0 +1,84 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class PostalCodeSearchCriteria
+
+	attr :postal_code
+        attr :place_name
+        attr :country_code
+        attr :latitude
+        attr :longitude
+        attr :style
+        attr :max_rows
+        attr :is_or_operator
+        attr :radius
+        
+        attr_writer :postal_code, :place_name, :country_code
+        attr_writer :latitude, :longitude, :style
+        attr_writer :max_rows,  :is_or_operator, :radius
+        
+        def initialize
+          @is_or_operator = false
+        end
+
+        def to_query_params_string
+            url = ''
+
+            if !@postal_code.nil? 
+              url = url + "&postalcode=" + CGI::escape( @postal_code )
+            end
+            
+            if !@place_name.nil? 
+              url = url + "&placename=" + CGI::escape( @place_name )
+            end
+            
+            if !@latitude.nil?
+                url = url + "&lat=" + CGI::escape( @latitude )
+            end
+            
+            if !@longitude.nil?
+                url = url + "&lng=" + CGI::escape( @longitude )
+            end
+
+            if !@style.nil?
+                url = url + "&style=" + CGI::escape( @style )
+            end
+            
+            if !@country_code.nil? 
+              url = url + "&country=" + CGI::escape( @country_code )
+            end
+            
+            if !@max_rows.nil? 
+              url = url + "&maxRows=" + CGI::escape( @max_rows )
+            end
+
+            if !@radius.nil? 
+              url = url + "&radius=" + CGI::escape( @radius.to_s )
+            end
+            
+            if @is_or_operator 
+              url = url + "&operator=OR"
+            end
+            
+            url
+        end
+    end
+end
+
+

data/lib/timezone.rb

@@ -0,0 +1,29 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class Timezone
+        attr :timezone_id
+        attr :gmt_offset
+        attr :dst_offset
+        
+        attr_writer :timezone_id, :gmt_offset, :dst_offset
+  end
+end
+
+

data/lib/toponym.rb

@@ -0,0 +1,45 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class Toponym
+
+        attr :geoname_id
+        attr :name
+        attr :alternate_names
+        attr :country_code
+        attr :country_name
+        attr :population
+        attr :elevation
+        attr :feature_class
+        attr :feature_class_name
+        attr :feature_code
+        attr :feature_code_name
+        attr :latitude
+        attr :longitude
+        attr :distance
+
+        attr_writer :geoname_id, :name, :alternate_names, :country_code
+        attr_writer :country_name, :population, :elevation, :feature_class
+        attr_writer :feature_class_name, :feature_code,:feature_code_name
+        attr_writer :latitude, :longitude, :distance
+    
+    end
+end
+
+

data/lib/toponym_search_criteria.rb

@@ -0,0 +1,44 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class ToponymSearchCriteria
+    
+        attr :q
+        attr :country_code
+        attr :name
+        attr :name_equals
+        attr :name_starts_with
+        attr :tag
+        attr :language
+        attr :style
+        attr :feature_class
+        attr :feature_codes
+        attr :admin_code_1
+        attr :max_rows
+        attr :start_row
+
+        attr_writer :q, :country_code, :name, :name_equals
+        attr_writer :name_starts_with, :tag, :language, :style
+        attr_writer :feature_class, :feature_codes, :admin_code_1
+        attr_writer :max_rows, :start_row
+    
+    end
+end
+
+

data/lib/toponym_search_result.rb

@@ -0,0 +1,33 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at 
+#
+#  http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+    class ToponymSearchResult
+        
+        attr :total_results_count
+        attr :toponyms
+    
+        attr_writer :total_results_count, :toponyms
+        
+        def initialize
+            @toponyms = Array.new
+        end
+    end
+end
+
+

data/lib/web_service.rb

@@ -0,0 +1,503 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca>
+# Contributions by Andrew Turner, High Earth Orbit
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+  class WebService
+    def WebService.get_element_child_text( element, child )
+      if !element.elements[child].nil?
+        element.elements[child][0].to_s
+      end
+    end
+
+    def WebService.get_element_child_float( element, child )
+      if !element.elements[child].nil?
+        element.elements[child][0].to_s.to_f
+      end
+    end
+
+    def WebService.get_element_child_int( element, child )
+      if !element.elements[child].nil?
+        element.elements[child][0].to_s.to_i
+      end
+    end
+
+    def WebService.element_to_postal_code ( element )
+      postal_code = PostalCode.new
+
+      postal_code.admin_code_1    = WebService::get_element_child_text( element, 'adminCode1' )
+      postal_code.admin_code_2    = WebService::get_element_child_text( element, 'adminCode2' )
+      postal_code.admin_name_1    = WebService::get_element_child_text( element, 'adminName1' )
+      postal_code.admin_name_2    = WebService::get_element_child_text( element, 'adminName2' )
+      postal_code.country_code    = WebService::get_element_child_text( element, 'countryCode' )
+      postal_code.distance        = WebService::get_element_child_float( element, 'distance' )
+      postal_code.latitude        = WebService::get_element_child_float( element, 'lat' )
+      postal_code.longitude       = WebService::get_element_child_float( element, 'lng' )
+      postal_code.place_name      = WebService::get_element_child_text( element, 'name' )
+      postal_code.postal_code     = WebService::get_element_child_text( element, 'postalcode' )
+
+      return postal_code
+
+    end
+
+    def WebService.element_to_wikipedia_article ( element )
+      article = WikipediaArticle.new
+
+      article.language              = WebService::get_element_child_text( element, 'lang' )
+      article.title                 = WebService::get_element_child_text( element, 'title' )
+      article.summary               = WebService::get_element_child_text( element, 'summary' )
+      article.wikipedia_url         = WebService::get_element_child_text( element, 'wikipediaUrl' )
+      article.feature               = WebService::get_element_child_text( element, 'feature' )
+      article.population            = WebService::get_element_child_text( element, 'population' )
+      article.elevation             = WebService::get_element_child_text( element, 'elevation' )
+      article.latitude              = WebService::get_element_child_float( element, 'lat' )
+      article.longitude             = WebService::get_element_child_float( element, 'lng' )
+      article.thumbnail_img         = WebService::get_element_child_text( element, 'thumbnailImg' )
+      article.distance              = WebService::get_element_child_float( element, 'distance' )
+
+      return article
+
+    end
+
+    def WebService.element_to_toponym ( element )
+      toponym = Toponym.new
+
+      toponym.name                = WebService::get_element_child_text( element, 'name' )
+      toponym.alternate_names     = WebService::get_element_child_text( element, 'alternateNames' )
+      toponym.latitude            = WebService::get_element_child_float( element, 'lat' )
+      toponym.longitude           = WebService::get_element_child_float( element, 'lng' )
+      toponym.geoname_id          = WebService::get_element_child_text( element, 'geonameId' )
+      toponym.country_code        = WebService::get_element_child_text( element, 'countryCode' )
+      toponym.country_name        = WebService::get_element_child_text( element, 'countryName' )
+      toponym.feature_class       = WebService::get_element_child_text( element, 'fcl' )
+      toponym.feature_code        = WebService::get_element_child_text( element, 'fcode' )
+      toponym.feature_class_name  = WebService::get_element_child_text( element, 'fclName' )
+      toponym.feature_code_name   = WebService::get_element_child_text( element, 'fCodeName' )
+      toponym.population          = WebService::get_element_child_int( element, 'population' )
+      toponym.elevation           = WebService::get_element_child_text( element, 'elevation' )
+      toponym.distance            = WebService::get_element_child_float( element, 'distance' )
+
+      return toponym
+
+    end
+
+    def WebService.element_to_intersection ( element )
+      intersection = Intersection.new
+
+      intersection.street_1        = WebService::get_element_child_text( element, 'street1' )
+      intersection.street_2        = WebService::get_element_child_text( element, 'street2' )
+      intersection.admin_code_1    = WebService::get_element_child_text( element, 'adminCode1' )
+      intersection.admin_code_1    = WebService::get_element_child_text( element, 'adminCode1' )
+      intersection.admin_code_2    = WebService::get_element_child_text( element, 'adminCode2' )
+      intersection.admin_name_1    = WebService::get_element_child_text( element, 'adminName1' )
+      intersection.admin_name_2    = WebService::get_element_child_text( element, 'adminName2' )
+      intersection.country_code    = WebService::get_element_child_text( element, 'countryCode' )
+      intersection.distance        = WebService::get_element_child_float( element, 'distance' )
+      intersection.longitude       = WebService::get_element_child_float( element, 'lat' )
+      intersection.latitude        = WebService::get_element_child_float( element, 'lng' )
+      intersection.place_name      = WebService::get_element_child_text( element, 'name' )
+      intersection.postal_code     = WebService::get_element_child_text( element, 'postalcode' )
+
+      return intersection
+
+    end
+
+    def WebService.postal_code_search( postal_code, place_name, country_code )
+      postal_code_sc = PostalCodeSearchCriteria.new
+      postal_code_sc.postal_code = postal_code
+      postal_code_sc.place_name = place_name
+      postal_code_sc.coutry_code = country_code
+
+      WebService.postal_code_search postal_code_sc
+    end
+
+    def WebService.postal_code_search( search_criteria )
+      # postal codes to reutrn
+      postal_codes = Array.new
+
+      url = Geonames.build_url("/postalCodeSearch?a=a")
+      # url = Geonames::GEONAMES_SERVER + "/postalCodeSearch?a=a"
+      url = url + search_criteria.to_query_params_string
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/code") do |element|
+        postal_codes << WebService::element_to_postal_code( element )
+      end
+
+      postal_codes
+
+    end
+
+    def WebService.find_nearby_postal_codes( search_criteria )
+      # postal codes to reutrn
+      postal_codes = Array.new
+
+      url = Geonames.build_url("/findNearbyPostalCodes?a=a")
+      # url = Geonames::GEONAMES_SERVER + "/findNearbyPostalCodes?a=a"
+      url = url + search_criteria.to_query_params_string
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/code") do |element|
+        postal_codes << WebService::element_to_postal_code( element )
+      end
+
+      postal_codes
+
+    end
+
+    def WebService.find_nearby_place_name( lat, long )
+      places = Array.new
+
+      url = Geonames.build_url("/findNearbyPlaceName?a=a")
+      # url = Geonames::GEONAMES_SERVER + "/findNearbyPlaceName?a=a"
+
+      url = url + "&lat=" + lat.to_s
+      url = url + "&lng=" + long.to_s
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/geoname") do |element|
+
+        places << WebService::element_to_toponym( element )
+
+      end
+
+      return places
+
+    end
+
+    def WebService.find_nearest_intersection( lat, long )
+
+      url = Geonames.build_url("/findNearestIntersection?a=a")
+      # url = Geonames::GEONAMES_SERVER + "/findNearestIntersection?a=a"
+
+      url = url + "&lat=" + lat.to_s
+      url = url + "&lng=" + long.to_s
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      intersection = []
+      doc.elements.each("geonames/intersection") do |element|
+
+        intersection = WebService::element_to_intersection( element )
+
+      end
+
+      return intersection
+
+    end
+
+    def WebService.timezone( lat, long )
+      timezone = Timezone.new
+
+      url = Geonames.build_url("/timezone?a=a")
+      # url = Geonames::GEONAMES_SERVER + "/timezone?a=a"
+
+      url = url + "&lat=" + lat.to_s
+      url = url + "&lng=" + long.to_s
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/timezone") do |element|
+        timezone.timezone_id    = WebService::get_element_child_text( element, 'timezoneId' )
+        timezone.gmt_offset     = WebService::get_element_child_float( element, 'gmtOffset' )
+        timezone.dst_offset     = WebService::get_element_child_float( element, 'dstOffset' )
+      end
+
+      return timezone
+
+    end
+
+    def WebService.findNearbyWikipedia( hashes )
+      # here for backwards compatibility
+      WebService.find_nearby_wikipedia( hashes )
+    end
+    
+    def WebService.find_nearby_wikipedia( hashes )
+      articles = Array.new
+
+      lat = hashes[:lat]
+      long = hashes[:long]
+      lang = hashes[:lang]
+      radius = hashes[:radius]
+      max_rows = hashes[:max_rows]
+      country = hashes[:country]
+      postalcode = hashes[:postalcode]
+      q = hashes[:q]
+
+      url = Geonames.build_url("/findNearbyWikipedia?a=a")
+      # url = Geonames::GEONAMES_SERVER + "/findNearbyWikipedia?a=a"
+
+      if !lat.nil? && !long.nil?
+        url = url + "&lat=" + lat.to_s
+        url = url + "&lng=" + long.to_s
+        url = url + "&radius=" + radius.to_s unless radius.nil?
+        url = url + "&max_rows=" + max_rows.to_s unless max_rows.nil?
+
+      elsif !q.nil?
+        url = url + "&q=" + q
+        url = url + "&radius=" + radius.to_s unless radius.nil?
+        url = url + "&max_rows=" + max_rows.to_s unless max_rows.nil?
+      end
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/entry") do |element|
+        articles << WebService::element_to_wikipedia_article( element )
+      end
+
+      return articles
+
+    end
+
+    def WebService.findBoundingBoxWikipedia( hashes )
+      # here for backwards compatibility
+      WebService.find_bounding_box_wikipedia( hashes )
+    end
+    
+    def WebService.find_bounding_box_wikipedia( hashes )
+      articles = Array.new
+
+      north = hashes[:north]
+      east = hashes[:east]
+      south = hashes[:south]
+      west = hashes[:west]
+      lang = hashes[:lang]
+      radius = hashes[:radius]
+      max_rows = hashes[:max_rows]
+      country = hashes[:country]
+      postalcode = hashes[:postalcode]
+      q = hashes[:q]
+
+      url = Geonames.build_url("/wikipediaBoundingBox?a=a")
+      # url = Geonames::GEONAMES_SERVER + "/wikipediaBoundingBox?a=a"
+
+      url = url + "&north=" + north.to_s
+      url = url + "&east=" + east.to_s
+      url = url + "&south=" + south.to_s
+      url = url + "&west=" + west.to_s
+      url = url + "&radius=" + radius.to_s unless radius.nil?
+      url = url + "&max_rows=" + max_rows.to_s unless max_rows.nil?
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/entry") do |element|
+        articles << WebService::element_to_wikipedia_article( element )
+      end
+
+      return articles
+
+    end
+
+    def WebService.country_subdivision ( lat, long )
+      country_subdivision = CountrySubdivision.new
+
+      url = Geonames.build_url("/countrySubdivision?a=a")
+      # url = Geonames::GEONAMES_SERVER + "/countrySubdivision?a=a"
+
+      url = url + "&lat=" + lat.to_s
+      url = url + "&lng=" + long.to_s
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      doc.elements.each("geonames/countrySubdivision") do |element|
+        country_subdivision.country_code    = WebService::get_element_child_text( element, 'countryCode' )
+        country_subdivision.country_name    = WebService::get_element_child_text( element, 'countryName' )
+        country_subdivision.admin_code_1    = WebService::get_element_child_text( element, 'adminCode1' )
+        country_subdivision.admin_name_1    = WebService::get_element_child_text( element, 'adminName1' )
+      end
+
+      return country_subdivision
+
+    end
+
+    def WebService.country_code ( lat, long )
+
+      url = Geonames.build_url("/countrycode?a=a")
+      # url = Geonames::GEONAMES_SERVER + "/countrycode?a=a"
+
+      url = url + "&lat=" + lat.to_s
+      url = url + "&lng=" + long.to_s
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      return res.body.strip
+
+    end
+
+    def WebService.search( search_criteria )
+      #toponym search results to return
+      toponym_sr = ToponymSearchResult.new
+
+      url = Geonames.build_url("/search?a=a")
+      # url = Geonames::GEONAMES_SERVER + "/search?a=a"
+
+      if !search_criteria.q.nil?
+        url = url + "&q=" + CGI::escape( search_criteria.q )
+      end
+
+      if !search_criteria.name_equals.nil?
+        url = url + "&name_equals=" + CGI::escape( search_criteria.name_equals )
+      end
+
+      if !search_criteria.name_starts_with.nil?
+        url = url + "&name_startsWith=" + CGI::escape( search_criteria.name_starts_with )
+      end
+
+      if !search_criteria.name.nil?
+        url = url + "&name=" + CGI::escape( search_criteria.name )
+      end
+
+      if !search_criteria.tag.nil?
+        url = url + "&tag=" + CGI::escape( search_criteria.tag )
+      end
+
+      if !search_criteria.country_code.nil?
+        url = url + "&country=" + CGI::escape( search_criteria.country_code )
+      end
+
+      if !search_criteria.admin_code_1.nil?
+        url = url + "&adminCode1=" + CGI::escape( search_criteria.admin_code_1 )
+      end
+
+      if !search_criteria.language.nil?
+        url = url + "&lang=" + CGI::escape( search_criteria.language )
+      end
+
+      if !search_criteria.feature_class.nil?
+        url = url + "&featureClass=" + CGI::escape( search_criteria.feature_class )
+      end
+
+      if !search_criteria.feature_codes.nil?
+        for feature_code in search_criteria.feature_codes
+          url = url + "&fcode=" + CGI::escape( feature_code )
+        end
+      end
+
+      if !search_criteria.max_rows.nil?
+        url = url + "&maxRows=" + CGI::escape( search_criteria.max_rows )
+      end
+
+      if !search_criteria.start_row.nil?
+        url = url + "&startRow=" + CGI::escape( search_criteria.start_row )
+      end
+
+      if !search_criteria.style.nil?
+        url = url + "&style=" + CGI::escape( search_criteria.style )
+      end
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      toponym_sr.total_results_count = doc.elements["geonames/totalResultsCount"].text
+
+      doc.elements.each("geonames/geoname") do |element|
+
+        toponym_sr.toponyms << WebService::element_to_toponym( element )
+
+      end
+
+      return toponym_sr
+    end
+    
+  end
+end
+
+#alias WebService.find_nearby_wikipedia findNearbyWikipedia
+#alias find_bounding_box_wikipedia findBoundingBoxWikipedia

data/lib/wikipedia_article.rb

@@ -0,0 +1,42 @@
+#=============================================================================
+#
+# Copyright 2007 Adam Wisniewski <adamw@tbcn.ca>
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+#=============================================================================
+
+module Geonames
+  class WikipediaArticle
+
+    attr :language
+    attr :title
+    attr :summary
+    attr :wikipedia_url
+    attr :feature
+    attr :population
+    attr :elevation
+    attr :latitude
+    attr :longitude
+    attr :thumbnail_img
+    attr :distance
+
+    attr_writer :language, :title, :summary
+    attr_writer :wikipedia_url, :feature, :population
+    attr_writer :elevation, :latitude, :longitude
+    attr_writer :thumbnail_img, :distance
+
+  end
+end
+
+

data/nbproject/private/private.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+</project-private>

data/nbproject/project.properties

@@ -0,0 +1,3 @@
+main.file=main.rb
+src.dir=lib
+test.src.dir=test

data/nbproject/project.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ruby.rubyproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/ruby-project/1">
+            <name>geonames</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>

metadata

@@ -0,0 +1,76 @@
+--- !ruby/object:Gem::Specification 
+name: geonames_patched
+version: !ruby/object:Gem::Version 
+  version: 0.2.2
+platform: ruby
+authors: 
+- Calvin Cheung
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-01-11 00:00:00 -08:00
+default_executable: 
+dependencies: []
+
+description: 
+email: calvin@presdo.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+files: 
+- geonames_patched.gemspec
+- geonames_patched.gemspec~
+- lib/address.rb
+- lib/country_subdivision.rb
+- lib/geonames.rb
+- lib/geonames_patched.rb
+- lib/intersection.rb
+- lib/main.rb
+- lib/postal_code.rb
+- lib/postal_code_search_criteria.rb
+- lib/Rakefile.rb
+- lib/timezone.rb
+- lib/toponym.rb
+- lib/toponym_search_criteria.rb
+- lib/toponym_search_result.rb
+- lib/web_service.rb
+- lib/wikipedia_article.rb
+- nbproject/private/private.properties
+- nbproject/private/private.xml
+- nbproject/project.properties
+- nbproject/project.xml
+- README
+has_rdoc: true
+homepage: http://github.com/calvin681/geonames_patched
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: A version of Adam Wisniewksi's geonames gem that includes username/password login.
+test_files: []
+