geomash 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f517ba6fcc94becafdbd6e43ae35ce833b69f728
-  data.tar.gz: fcc4f7d3194c8203e87bbf0a1b1192cf2e55804a
+  metadata.gz: a9fa71cc1b19bda8494204564e612606ffe8f6e6
+  data.tar.gz: 92febff016bf79bc87751a8de84d692590d95470
 SHA512:
-  metadata.gz: ee9bb319b8a8014ff077957c38f27521ff61a37836140bc389a25d3acd659ecec91cd3602ab59c96f14589d61d32c6e35d74825f421c3dd82aa273e93e85d2bc
-  data.tar.gz: 0cfd23abf1dd9c6f9f71dc7a4cd96da271e6e8ecb379980875a4b7d291fa336499ab9735e35e97d562204948b337d40addb5845b8c27ed55b4ac4d7489715318
+  metadata.gz: 468e826603bf98ebf5ebcbe941174352ced6d5a1e222713678a716f895ebf79d369990c8c1bc950d8f27f25cd061ab26993d328fc68c0b3226e1ee01103cb763
+  data.tar.gz: 0452c64e9256ace6629475a9417709dcabcf7bf15dc2fff4ce26138edb5917131a97ff60d32e370760392b0052123664112f6bc1c36f7465369156847cd1f8a1

data/lib/geomash/parser.rb

@@ -289,6 +289,11 @@ module Geomash
         return_hash[:term_differs_from_tgn] ||= google_api_result[best_match_index].data['partial_match'] unless google_api_result[best_match_index].data['partial_match'].blank?
       end
 
+      #This changed in Google... need a better way to handle this
+      if return_hash[:state_part] == 'Nord-Pas-de-Calais Picardie'
+        return_hash[:state_part] = 'Picardy'
+      end
+
       #FIXME: Google free API rate limit is 5 requests / 1 second now (used to be 10). Need a better way to handle this.
       sleep(0.1)
 

data/lib/geomash/tgn.rb

@@ -404,22 +404,20 @@ EXAMPLE SPARQL:
         OPTIONAL {<#{place_uri}> <http://www.w3.org/2004/02/skos/core#prefLabel> ?place_label_latn_pinyin
                  FILTER langMatches( lang(?place_label_latn_pinyin), "zh-latn-pinyin" )
                  }
-        OPTIONAL {<#{place_uri}> <http://www.w3.org/2004/02/skos/core#altLabel> ?place_label_alt
-                 FILTER langMatches( lang(?place_label_alt), "en" )
-                 }
         <#{place_uri}> <http://vocab.getty.edu/ontology#placeTypePreferred> ?aat_pref
        } UNION
      }
           end
 
           query = query[0..-12]
-          query += ". } GROUP BY ?identifier_place ?place_label_default ?place_label_en ?place_label_latn_pinyin ?place_label_alt ?aat_pref"
+          query += ". } GROUP BY ?identifier_place ?place_label_default ?place_label_en ?place_label_latn_pinyin ?aat_pref"
           query = query.squish
 
           tgn_response_for_aat = Typhoeus::Request.post("http://vocab.getty.edu/sparql.json", :body=>{:query=>query}, :timeout=>500)
           as_json_tgn_response_for_aat = JSON.parse(tgn_response_for_aat.body)
 
           as_json_tgn_response_for_aat["results"]["bindings"].each do |aat_response|
+            tgn_term = nil
             tgn_term_type = aat_response['aat_pref']['value'].split('/').last
 
             if aat_response['place_label_en'].present? && aat_response['place_label_en']['value'] != '-'
@@ -430,10 +428,24 @@ EXAMPLE SPARQL:
               tgn_term = aat_response['place_label_latn_pinyin']['value']
             elsif aat_response['place_label_latn_notone'].present? && aat_response['place_label_latn_notone']['value'] != '-'
               tgn_term = aat_response['place_label_latn_notone']['value']
-            elsif aat_response['place_label_alt'].present? && aat_response['place_label_alt']['value'] != '-'
-              tgn_term = aat_response['place_label_alt']['value']
             else
-              raise "Could not find a label for: #{tgn_id}"
+              #Just take the first prefLabel... could perhaps do some preference eventually... see 7002883 for an example of only a french prefLabel
+              default_label_response = Typhoeus::Request.get("http://vocab.getty.edu/download/json", :params=>{:uri=>"http://vocab.getty.edu/tgn/#{aat_response['identifier_place']}.json"}, :timeout=>500)
+              JSON.parse(default_label_response.body)['results']['bindings'].each do |ntriple|
+                case ntriple['Predicate']['value']
+                  when 'http://www.w3.org/2004/02/skos/core#prefLabel'
+                    if ntriple['Object']['xml:lang'].present? &&  ntriple['Object']['xml:lang'] == 'en'
+                      tgn_term = ntriple['Object']['value']
+                    else
+                      tgn_term ||= ntriple['Object']['value']
+                    end
+                end
+              end
+
+              if tgn_term.blank?
+                raise "Could not find a label for broader: #{place_uri} of base term: #{tgn_id}"
+              end
+
             end
 
             case tgn_term_type

data/lib/geomash/version.rb

@@ -1,3 +1,3 @@
 module Geomash
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/tgn_test.rb

@@ -26,6 +26,17 @@ class TGNTest < ActiveSupport::TestCase
        assert_equal 'Asia', result[:hier_geo][:continent]
        assert_equal 'Harbin', result[:non_hier_geo][:value]
        assert_nil result[:non_hier_geo][:qualifier]
+
+       result = Geomash::TGN.get_tgn_data('7008038')
+       assert_equal '48.866667', result[:coords][:latitude]
+       assert_equal '2.333333', result[:coords][:longitude]
+       assert_equal '48.866667,2.333333', result[:coords][:combined]
+       assert_equal 'Paris', result[:hier_geo][:city]
+       assert_equal 'Île-de-France', result[:hier_geo][:province]
+       assert_equal 'France', result[:hier_geo][:country]
+       assert_equal 'Europe', result[:hier_geo][:continent]
+       assert_equal nil, result[:non_hier_geo][:value]
+       assert_nil result[:non_hier_geo][:qualifier]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geomash
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Boston Public Library
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport