bplgeo 0.0.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21c1271a3fb208898888438395ebafbfcf1bd167
-  data.tar.gz: 64bde835593a4f414441b03390dbe1327524b0e6
+  metadata.gz: 13b58c2286e536e0c23e08c3a8cfed3c586e18f2
+  data.tar.gz: 060706f023e34218322856b763c0a7e644b3ac2f
 SHA512:
-  metadata.gz: 2a0254403d3d1a29c63ffbab106133083a3193d7c005716ff432385012a0eda2e0faef78eec927ace1bc931c396c8e434fd24bbfb878b397e128d4b79b78e723
-  data.tar.gz: 1a5382d42fb7f802c12569bdb983921d6335b7fc9b7b5b9f43f9a97c255e5bcfedd911250f191a9df44f983aee9b0750afa30b8b1ed6919c02c278a77e02d8e9
+  metadata.gz: 750cd801123b74916afb4626e0d948efb94940e9ee67fe5bfe7edc9609a9a279fad53b73a05ffc3ff7495416fb6e8de99a6ce835692746e45fa49f5f6c1ab40a
+  data.tar.gz: 6b55b9b1b838e2adedbde4f0c029d1e6c31af4b7685d4187344fdac87b420323d5c6831cf911fca60263dcc27893ab7a57406a30bc6da1dc75d02b1b83c4622c

data/lib/bplgeo.rb

@@ -25,8 +25,33 @@ module Bplgeo
       return_hash = Bplgeo::Parser.parse_google_api(term, parse_term)
     end
 
-    if return_hash.present?
+    if return_hash[:country_part].present?
+      #FIXME
       return_hash[:tgn] = Bplgeo::TGN.tgn_id_from_geo_hash(return_hash)
+
+      if return_hash[:tgn].blank?
+        geo_hash_temp =  Bplgeo::Standardizer.try_with_entered_names(return_hash)
+        return_hash[:tgn] = Bplgeo::TGN.tgn_id_from_geo_hash(geo_hash_temp) if geo_hash_temp.present?
+
+        if return_hash[:tgn].blank? && return_hash[:neighborhood_part].present?
+
+          geo_hash_temp = return_hash.clone
+          geo_hash_temp[:neighborhood_part] = nil
+          geo_hash_temp[:original_string_differs] = true
+          return_hash[:tgn] = Bplgeo::TGN.tgn_id_from_geo_hash(geo_hash_temp)
+          return_hash[:tgn][:original_string_differs] = true if return_hash[:tgn].present?
+        elsif return_hash[:city_part].present? && return_hash[:tgn].blank?
+
+          geo_hash_temp = return_hash.clone
+          geo_hash_temp[:city_part] = nil
+          geo_hash_temp[:original_string_differs] = true
+          return_hash[:tgn] = Bplgeo::TGN.tgn_id_from_geo_hash(geo_hash_temp)
+          return_hash[:tgn][:original_string_differs] = true if return_hash[:tgn].present?
+
+        end
+
+      end
+
       return_hash[:geonames] = Bplgeo::Geonames.geonames_id_from_geo_hash(return_hash)
     end
 

data/lib/bplgeo/geonames.rb

@@ -69,15 +69,19 @@ module Bplgeo
       #Don't do both neighborhood and city!
       if geo_hash[:neighborhood_part].present?
         geonames_search_array << geo_hash[:neighborhood_part]
+        exact_name_term = geo_hash[:neighborhood_part]
       elsif geo_hash[:city_part].present?
         geonames_search_array << geo_hash[:city_part]
+        exact_name_term = geo_hash[:neighborhood_part]
       end
 
       geonames_search_array << geo_hash[:state_part] if geo_hash[:state_part].present?
+      exact_name_term ||= geo_hash[:neighborhood_part]
       geonames_search_array << geo_hash[:country_part] if geo_hash[:country_part].present?
+      exact_name_term ||= geo_hash[:country_part]
       geonames_search_string = geonames_search_array.join(', ')
 
-      match_term =  geonames_search_array.first.to_ascii.downcase.strip
+      exact_name_term =  geonames_search_array.first.strip
 
       begin
         if retry_count > 0
@@ -85,7 +89,7 @@ module Bplgeo
         end
         retry_count = retry_count + 1
 
-        geonames_response = Typhoeus::Request.get("http://api.geonames.org/search?username=#{self.geonames_username}&lang=en&style=FULL&q=" + CGI.escape(geonames_search_string))
+        geonames_response = Typhoeus::Request.get("http://api.geonames.org/search?username=#{self.geonames_username}&lang=en&style=FULL&q=#{CGI.escape(geonames_search_string)}&name_equals=#{CGI.escape(exact_name_term)}&country=#{Country.find_country_by_name(geo_hash[:country_part]).alpha2}")
 
       end until (geonames_response.code != 500 || retry_count == max_retry)
 
@@ -93,43 +97,38 @@ module Bplgeo
 
         parsed_xml = Nokogiri::Slop(geonames_response.body)
 
+        begin
+          raise "geonames status error message of: #{parsed_xml.to_s}" if parsed_xml.geonames.status
+        rescue
+          #Do nothing but FIXME to not use slop
+        end
+
         #This is ugly and needs to be redone to achieve better recursive...
         if parsed_xml.geonames.totalResultsCount.text == '0'
-          if neighborhood_part.present?
-            geo_hash[:neighborhood_part] = nil
-            geo_hash = geonames_id_from_geo_hash(geo_hash)
-          elsif city_part.present?
-            geo_hash[:city_part] = nil
-            geo_hash = geonames_id_from_geo_hash(geo_hash)
+          if geo_hash[:neighborhood_part].present?
+            geo_hash_temp = geo_hash.clone
+            geo_hash_temp[:neighborhood_part] = nil
+            return_hash = geonames_id_from_geo_hash(geo_hash_temp)
+            return return_hash if return_hash.present?
+          elsif geo_hash[:city_part].present?
+            geo_hash_temp = geo_hash.clone
+            geo_hash_temp[:city_part] = nil
+            return_hash = geonames_id_from_geo_hash(geo_hash_temp)
+            return return_hash if return_hash.present?
           end
 
-          return geo_hash
+          return nil
         end
 
-        #Exact Match
-        parsed_xml.geonames.geoname.each do |geoname|
-
-          current_term = geoname.toponymName.text.to_ascii.downcase.strip
-
-          if current_term == match_term  && return_hash.blank?
-            return_hash[:id] = geoname.geonameId.text
-            return_hash[:original_string_differs] = Bplgeo::Standardizer.parsed_and_original_check(geo_hash)
-            break
-          end
-        end
-
-        if return_hash.blank?
-          #Starts With
-          parsed_xml.geonames.geoname.each do |geoname|
-
-            current_term = geoname.toponymName.text.to_ascii.downcase.strip
-
-            if current_term.starts_with?(match_term) && return_hash.blank?
-              return_hash[:id] = geoname.geonameId.text
-              return_hash[:original_string_differs] = Bplgeo::Standardizer.parsed_and_original_check(geo_hash)
-            end
-          end
+        #Exact Match ... FIXME to not use Slop
+        if parsed_xml.geonames.geoname.class == Nokogiri::XML::Element
+          return_hash[:id] = parsed_xml.geonames.geoname.geonameId.text
+          return_hash[:rdf] = "http://sws.geonames.org/#{return_hash[:id]}/about.rdf"
+        elsif parsed_xml.geonames.geoname.class ==Nokogiri::XML::NodeSet
+          return_hash[:id] = parsed_xml.geonames.geoname.first.geonameId.text
+          return_hash[:rdf] = "http://sws.geonames.org/#{return_hash[:id]}/about.rdf"
         end
+        return_hash[:original_string_differs] = Bplgeo::Standardizer.parsed_and_original_check(geo_hash)
 
       end
 

data/lib/bplgeo/parser.rb

@@ -96,7 +96,7 @@ module Bplgeo
       retry_count = 3
 
       #Skip if no bing_key... possibly move this elsewhere?
-      return return_hash if self.bing_key == '<mapquest_key>'
+      return return_hash if self.mapquest_key == '<mapquest_key>'
 
       return_hash[:original_term] = term
 
@@ -199,10 +199,10 @@ module Bplgeo
       if google_api_result.present?
         #Types: street number, route, neighborhood, establishment, transit_station, bus_station
         google_api_result.first.data["address_components"].each do |result|
-          if (result['types'] & ['street number', 'route', 'neighborhood', 'establishment', 'transit_station', 'bus_station']).present?
+          if (result['types'] & ['street number', 'route', 'establishment', 'transit_station', 'bus_station']).present? || (result['types'].include?('neighborhood') && !result['types'].include?('political'))
             #return_hash[:term_differs_from_tgn] = true
             #TODO: Not implemented for Google results right now.
-            return_hash[:street_part] = 'TODO: Not Implemented for Google Results'
+            #return_hash[:street_part] = 'TODO: Not Implemented for Google Results'
             return_hash[:coords] = {:latitude=>google_api_result.first.data['geometry']['location']['lat'].to_s,
                                          :longitude=>google_api_result.first.data['geometry']['location']['lng'].to_s,
                                          :combined=>google_api_result.first.data['geometry']['location']['lat'].to_s + ',' + google_api_result.first.data['geometry']['location']['lng'].to_s}
@@ -212,8 +212,8 @@ module Bplgeo
             return_hash[:state_part] = result['long_name'].to_ascii
           elsif (result['types'] & ['locality']).present?
             return_hash[:city_part] = result['long_name']
-          elsif (result['types'] & ['sublocality', 'political']).length == 2
-            return_hash[:neighborhood_part] = result['long_name']
+          elsif (result['types'] & ['sublocality', 'political']).length == 2 || result['types'].include?('neighborhood')
+              return_hash[:neighborhood_part] = result['long_name']
           end
         end
 

data/lib/bplgeo/standardizer.rb

@@ -12,6 +12,7 @@ module Bplgeo
 
       state_abbr_list = ['Mass']
       state_name_list = []
+      country_name_list = []
 
       #Countries gem of https://github.com/hexorx/countries
       Country.new('US').states.each do |state_abbr, state_names|
@@ -19,10 +20,14 @@ module Bplgeo
         state_name_list << state_names["name"]
       end
 
+      Country.all.each do |country_name_abbr_pair|
+        country_name_list << country_name_abbr_pair.first
+      end
+
       #Parsing a subject geographic term.
       if term.include?('--')
         term.split('--').each_with_index do |split_term, index|
-          if state_name_list.any? { |state| split_term.include? state }
+          if state_name_list.any? { |state| split_term.include? state } || country_name_list.any? { |country| split_term.include? country }
             geo_term = term.split('--')[index..term.split('--').length-1].reverse!.join(',')
           elsif state_abbr_list.any? { |abbr| split_term.include? abbr }
             geo_term = split_term
@@ -32,13 +37,13 @@ module Bplgeo
         #Experimental... example: Palmer (Mass) - history or Stores (retail trade) - Palmer, Mass
       elsif term.include?(' - ')
         term.split(' - ').each do |split_term|
-          if state_name_list.any? { |state| split_term.include? state } || state_abbr_list.any? { |abbr| split_term.include? abbr }
+          if state_name_list.any? { |state| split_term.include? state } || state_abbr_list.any? { |abbr| split_term.include? abbr } || country_name_list.any? { |country| split_term.include? country }
             geo_term = split_term
           end
 
         end
       else
-        if state_name_list.any? { |state| term.include? state } || state_abbr_list.any? { |abbr| term.include? abbr }
+        if state_name_list.any? { |state| term.include? state } || state_abbr_list.any? { |abbr| term.include? abbr } || country_name_list.any? { |country| term.include? country }
           geo_term = term
         end
       end
@@ -57,6 +62,9 @@ module Bplgeo
       #Strip any leading periods or commas from junk terms
       geo_term = geo_term.gsub(/^[\.,]+/, '').strip
 
+      #Replace any four TGN dashes from removing a junk term
+      geo_term = geo_term.gsub('----', '--')
+
       #Replace any semicolons with commas... possible strip them?
       geo_term = geo_term.gsub(';', ',')
 
@@ -211,5 +219,31 @@ module Bplgeo
     def self.utf8Encode(value)
       return HTMLEntities.new.decode(ActionView::Base.full_sanitizer.sanitize(value.to_s.gsub(/\r?\n?\t/, ' ').gsub(/\r?\n/, ' ').gsub(/<br[\s]*\/>/,' '))).strip
     end
+
+
+    def self.try_with_entered_names(geo_hash)
+      geo_hash_local = geo_hash.clone
+      if geo_hash_local[:neighborhood_part].present?
+         orig_string_check = geo_hash_local[:standardized_term].gsub(',', ' ').squish.split(' ').select { |value| value.downcase.to_ascii == geo_hash_local[:neighborhood_part].downcase.to_ascii}
+         geo_hash_local[:neighborhood_part] = orig_string_check.first.strip if orig_string_check.present? && orig_string_check != geo_hash_local[:neighborhood_part]
+         return geo_hash_local
+      end
+
+      if geo_hash_local[:city_part].present?
+        orig_string_check = geo_hash_local[:standardized_term].gsub(',', ' ').squish.split(' ').select { |value| value.downcase.to_ascii == geo_hash_local[:city_part].downcase.to_ascii}
+        geo_hash_local[:city_part] = orig_string_check.first.strip if orig_string_check.present?
+        return geo_hash_local
+      end
+
+
+      if geo_hash_local[:state_part].present?
+        orig_string_check = geo_hash_local[:standardized_term].gsub(',', ' ').squish.split(' ').select { |value| value.downcase.to_ascii == geo_hash_local[:state_part].downcase.to_ascii}
+        geo_hash_local[:state_part] = orig_string_check.first.strip if orig_string_check.present?
+        return geo_hash_local
+      end
+
+      return nil
+    end
+
   end
 end

data/lib/bplgeo/tgn.rb

@@ -7,122 +7,326 @@ module Bplgeo
       @bplgeo_config ||= YAML::load(ERB.new(IO.read(File.join(root, 'config', 'bplgeo.yml'))).result)[env].with_indifferent_access
     end
 
-    def self.getty_username
-      bplgeo_config[:getty_username] || '<username>'
+    def self.tgn_enabled
+      bplgeo_config[:tgn_enabled] || true
     end
 
-    def self.getty_password
-      bplgeo_config[:getty_password] || '<password>'
+=begin
+      81010/nation
+      81175/state
+      81165/region
+      84251/neighborhood
+      83002/inhabited place
+
+      nations
+      <http://vocab.getty.edu/tgn/7012149> <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300128207>
+
+      States (political divisions):
+          <http://vocab.getty.edu/tgn/7007517> <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000776> .
+
+      Counties: (Suffolk - http://vocab.getty.edu/aat/300000771)
+      <http://vocab.getty.edu/tgn/1002923> <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000771> .
+
+      Neighborhood: (Boston)
+      <http://vocab.getty.edu/tgn/7013445> <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300008347> .
+
+
+      Provinces:
+          http://vocab.getty.edu/aat/300000774
+
+      Departments:
+          http://vocab.getty.edu/aat/300000772
+
+      Governates:
+          http://vocab.getty.edu/aat/300235093
+
+      Territories:
+          http://vocab.getty.edu/aat/300135982
+
+      + http://vocab.getty.edu/resource/getty/search?q=territory&luceneIndex=Brief&indexDataset=AAT&_form=%2Fresource%2Fgetty%2Fsearch
+
+      dependent state:
+                    http://vocab.getty.edu/aat/300387176
+
+
+      union territory:
+                http://vocab.getty.edu/aat/300387122
+
+      national district:
+                   http://vocab.getty.edu/aat/300387081
+
+
+Roxbury:
+http://vocab.getty.edu/tgn/7015002.json
+
+
+
+#South Carolina - http://vocab.getty.edu/tgn/7007712
+
+SELECT ?object_identifier
+WHERE
+{
+  ?x <http://purl.org/dc/elements/1.1/identifier> 7007712 .
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> ?parent_country .
+  {
+    SELECT ?parent_country ?identifier_country ?aat_place_id
+    WHERE {
+       ?parent_country <http://purl.org/dc/elements/1.1/identifier> ?identifier_country .
+       ?parent_country <http://vocab.getty.edu/ontology#placeTypePreferred> ?aat_place_id .
+       ?parent_country <http://www.w3.org/2000/01/rdf-schema#label> ?country_label .
+    }
+    GROUP BY ?parent_country
+  }
+}
+GROUP BY ?object_identifier
+
+primary_tgn_response = Typhoeus::Request.get("http://vocab.getty.edu/tgn/#{tgn_id}.json")
+
+
+  when 'http://vocab.getty.edu/ontology#placeTypePreferred'
+    place_type_base[:aat_id] = ntriple['Object']['value']
+  when 'http://www.w3.org/2004/02/skos/core#prefLabel'
+    if ntriple['Object']['xml:lang'].present? &&  ntriple['Object']['xml:lang'] == 'en'
+      place_type_base[:label_en] = ntriple['Object']['value']
+    else if ntriple['Object']['xml:lang'].blank?
+     place_type_base[:label_default] = ntriple['Object']['value']
+
+
+tgn_main_term_info = {}
+broader_place_type_list = ["http://vocab.getty.edu/tgn/"#{tgn_id}]
+
+primary_tgn_response = Typhoeus::Request.get("http://vocab.getty.edu/download/json", :params=>{:uri=>"http://vocab.getty.edu/tgn/#{tgn_id}.json"})
+as_json_tgn_response = JSON.parse(primary_tgn_response.body)
+
+as_json_tgn_response['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_main_term_info[:label_en] = ntriple['Object']['value']
+    elsif ntriple['Object']['xml:lang'].blank?
+     tgn_main_term_info[:label_default] = ntriple['Object']['value']
     end
+  when 'http://vocab.getty.edu/ontology#placeTypePreferred'
+   tgn_main_term_info[:aat_place] = ntriple['Object']['value']
+  when 'http://vocab.getty.edu/ontology#broaderPreferredExtended'
+    broader_place_type_list << ntriple['Object']['value']
+  end
+
+end
+
+query = "SELECT ?identifier_place ?place_label_default ?place_label_en ?aat_pref WHERE {"
+
+broader_place_type_list.each do |place_uri|
+query += %{{<#{place_uri}> <http://purl.org/dc/elements/1.1/identifier> ?identifier_place .
+        OPTIONAL {<#{place_uri}> <http://www.w3.org/2004/02/skos/core#prefLabel> ?place_label_en
+                 FILTER langMatches( lang(?place_label_en), "en" )
+                 }
+        OPTIONAL {<#{place_uri}> <http://www.w3.org/2004/02/skos/core#prefLabel> ?place_label_default
+                 FILTER langMatches( lang(?place_label_default), "" )
+                 }
+        <#{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 ?aat_pref"
+
+tgn_response_for_aat = Typhoeus::Request.get("http://vocab.getty.edu/sparql.json", :params=>{:query=>query})
+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|
+  #aat_response['identifier_place']['value']
+  #aat_response['place_label_default']['value']
+  #....
+end
+
+
+
+
+
+EXAMPLE SPARQL:
+
+    SELECT ?identifier_place ?place_label_default ?place_label_en ?aat_pref
+    WHERE {
+       {<http://vocab.getty.edu/tgn/1000001> <http://purl.org/dc/elements/1.1/identifier> ?identifier_place .
+        OPTIONAL {<http://vocab.getty.edu/tgn/1000001> <http://www.w3.org/2004/02/skos/core#prefLabel> ?place_label_en
+                 FILTER langMatches( lang(?place_label_en), "en" )
+                 }
+        OPTIONAL {<http://vocab.getty.edu/tgn/1000001> <http://www.w3.org/2004/02/skos/core#prefLabel> ?place_label_default
+                 FILTER langMatches( lang(?place_label_default), "" )
+                 }
+        <http://vocab.getty.edu/tgn/1000001> <http://vocab.getty.edu/ontology#placeTypePreferred> ?aat_pref
+       } UNION
+       {<http://vocab.getty.edu/tgn/7012149> <http://purl.org/dc/elements/1.1/identifier> ?identifier_place .
+        OPTIONAL {<http://vocab.getty.edu/tgn/7012149> <http://www.w3.org/2004/02/skos/core#prefLabel> ?place_label_en
+                 FILTER langMatches( lang(?place_label_en), "en" )
+                 }
+        OPTIONAL {<http://vocab.getty.edu/tgn/7012149> <http://www.w3.org/2004/02/skos/core#prefLabel> ?place_label_default
+                 FILTER langMatches( lang(?place_label_default), "" )
+                 }
+       <http://vocab.getty.edu/tgn/7012149> <http://vocab.getty.edu/ontology#placeTypePreferred> ?aat_pref
+       } UNION
+       {<http://vocab.getty.edu/tgn/7029392> <http://purl.org/dc/elements/1.1/identifier> ?identifier_place .
+        OPTIONAL {<http://vocab.getty.edu/tgn/7029392> <http://www.w3.org/2004/02/skos/core#prefLabel> ?place_label_en
+                 FILTER langMatches( lang(?place_label_en), "en" )
+                 }
+        OPTIONAL {<http://vocab.getty.edu/tgn/7029392> <http://www.w3.org/2004/02/skos/core#prefLabel> ?place_label_default
+                 FILTER langMatches( lang(?place_label_default), "" )
+                 }
+       <http://vocab.getty.edu/tgn/7012149> <http://vocab.getty.edu/ontology#placeTypePreferred> ?aat_pref
+       } .
+
+
+    }
+   GROUP BY ?identifier_place ?place_label_default ?place_label_en ?aat_pref
+
+
+
+
+=end
 
-    # retrieve data from Getty TGN to populate <mods:subject auth="tgn">
     def self.get_tgn_data(tgn_id)
-      tgn_response = Typhoeus::Request.get('http://vocabsservices.getty.edu/TGNService.asmx/TGNGetSubject?subjectID=' + tgn_id, userpwd: self.getty_username + ':' + self.getty_password)
-      unless tgn_response.code == 500
-        tgnrec = Nokogiri::XML(tgn_response.body)
-        #puts tgnrec.to_s
-
-        # coordinates
-        if tgnrec.at_xpath("//Coordinates")
-          coords = {}
-          coords[:latitude] = tgnrec.at_xpath("//Latitude/Decimal").children.to_s
-          coords[:longitude] = tgnrec.at_xpath("//Longitude/Decimal").children.to_s
-          coords[:combined] = coords[:latitude] + ',' + coords[:longitude]
-        else
-          coords = nil
+      return nil if Bplgeo::TGN.tgn_enabled != true
+
+      tgn_main_term_info = {}
+      #broader_place_type_list = ["http://vocab.getty.edu/tgn/#{tgn_id}"]
+      broader_place_type_list = []
+
+      primary_tgn_response = Typhoeus::Request.get("http://vocab.getty.edu/download/json", :params=>{:uri=>"http://vocab.getty.edu/tgn/#{tgn_id}.json"})
+
+      return nil if(primary_tgn_response.response_code == 404) #Couldn't find TGN... FIXME: additional check needed if TGN is down?
+
+      as_json_tgn_response = JSON.parse(primary_tgn_response.body)
+
+      as_json_tgn_response['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_main_term_info[:label_en] = ntriple['Object']['value']
+            elsif ntriple['Object']['xml:lang'].blank?
+              tgn_main_term_info[:label_default] = ntriple['Object']['value']
+            end
+          when 'http://vocab.getty.edu/ontology#placeTypePreferred'
+            tgn_main_term_info[:aat_place] = ntriple['Object']['value']
+          when 'http://schema.org/latitude'
+            tgn_main_term_info[:latitude] = ntriple['Object']['value']
+          when 'http://schema.org/longitude'
+            tgn_main_term_info[:longitude] = ntriple['Object']['value']
+          when 'http://vocab.getty.edu/ontology#broaderPreferredExtended'
+            broader_place_type_list << ntriple['Object']['value']
         end
 
-        hier_geo = {}
-
-        #main term
-        if tgnrec.at_xpath("//Terms/Preferred_Term/Term_Text")
-          tgn_term_type = tgnrec.at_xpath("//Preferred_Place_Type/Place_Type_ID").children.to_s
-          pref_term_langs = tgnrec.xpath("//Terms/Preferred_Term/Term_Languages/Term_Language/Language")
-          # if the preferred term is the preferred English form, use that
-          if pref_term_langs.children.to_s.include? "English"
-            tgn_term = tgnrec.at_xpath("//Terms/Preferred_Term/Term_Text").children.to_s
-          else # use the non-preferred term which is the preferred English form
-            if tgnrec.xpath("//Terms/Non-Preferred_Term")
-              non_pref_terms = tgnrec.xpath("//Terms/Non-Preferred_Term")
-              non_pref_terms.each do |non_pref_term|
-                non_pref_term_langs = non_pref_term.children.css("Term_Language")
-                # have to loop through these, as sometimes languages share form
-                non_pref_term_langs.each do |non_pref_term_lang|
-                  if non_pref_term_lang.children.css("Preferred").children.to_s == "Preferred" && non_pref_term_lang.children.css("Language").children.to_s == "English"
-                    tgn_term = non_pref_term.children.css("Term_Text").children.to_s
-                  end
-                end
-              end
+      end
+
+      # coordinates
+      coords = nil
+      if tgn_main_term_info[:latitude].present?
+        coords = {}
+        coords[:latitude] = tgn_main_term_info[:latitude]
+        coords[:longitude] = tgn_main_term_info[:longitude]
+        coords[:combined] = tgn_main_term_info[:latitude] + ',' + tgn_main_term_info[:longitude]
+      end
+
+      hier_geo = {}
+      tgn_term = tgn_main_term_info[:label_en].present? ? tgn_main_term_info[:label_en] : tgn_main_term_info[:label_default]
+      tgn_term_type = tgn_main_term_info[:aat_place].split('/').last
+
+      #Initial Term
+      if tgn_term.present? && tgn_term_type.present?
+        case tgn_term_type
+          when '300128176' #continent
+            hier_geo[:continent] = tgn_term
+          when '300128207' #nations
+            hier_geo[:country] = tgn_term
+          when '300000774' #province
+            hier_geo[:province] = tgn_term
+          when '300236112', '300182722', '300387194', '300387052' #region, union, semi-independent political entity
+            hier_geo[:region] = tgn_term
+          when '300000776', '300000772', '300235093' #state, department, governorate
+            hier_geo[:state] = tgn_term
+          when '300387081' #national district
+            if tgn_term == 'District of Columbia'
+              hier_geo[:state] = tgn_term
+            else
+              hier_geo[:territory] = tgn_term
             end
-          end
-          # if no term is the preferred English form, just use the preferred term
-          tgn_term ||= tgnrec.at_xpath("//Terms/Preferred_Term/Term_Text").children.to_s
+          when '300135982', '300387176', '300387122' #territory, dependent state, union territory
+            hier_geo[:territory] = tgn_term
+          when '300000771' #county
+            hier_geo[:county] = tgn_term
+          when '300008347' #inhabited place
+            hier_geo[:city] = tgn_term
+          when '300000745' #neighborhood
+            hier_geo[:city_section] = tgn_term
+          when '300008791', '300387062' #island
+            hier_geo[:island] = tgn_term
+          when '300387575', '300387346', '300167671', '300387178', '300387082' #'81101/area', '22101/general region', '83210/deserted settlement', '81501/historical region', '81126/national division'
+            hier_geo[:area] = tgn_term
+          else
+            non_hier_geo = tgn_term
+        end
+
+        #Broader places
+
+        query = "SELECT ?identifier_place ?place_label_default ?place_label_en ?aat_pref WHERE {"
+
+        broader_place_type_list.each do |place_uri|
+          query += %{{<#{place_uri}> <http://purl.org/dc/elements/1.1/identifier> ?identifier_place .
+        OPTIONAL {<#{place_uri}> <http://www.w3.org/2004/02/skos/core#prefLabel> ?place_label_en
+                 FILTER langMatches( lang(?place_label_en), "en" )
+                 }
+        OPTIONAL {<#{place_uri}> <http://www.w3.org/2004/02/skos/core#prefLabel> ?place_label_default
+                 FILTER langMatches( lang(?place_label_default), "" )
+                 }
+        <#{place_uri}> <http://vocab.getty.edu/ontology#placeTypePreferred> ?aat_pref
+       } UNION
+     }
         end
-        if tgn_term && tgn_term_type
+
+        query = query[0..-12]
+        query += ". } GROUP BY ?identifier_place ?place_label_default ?place_label_en ?aat_pref"
+
+        tgn_response_for_aat = Typhoeus::Request.get("http://vocab.getty.edu/sparql.json", :params=>{:query=>query})
+        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_type = aat_response['aat_pref']['value'].split('/').last
+          if aat_response['place_label_en'].present? && aat_response['place_label_en']['value'] != '-'
+            tgn_term = aat_response['place_label_en']['value']
+          else
+            tgn_term = aat_response['place_label_default']['value']
+          end
+
           case tgn_term_type
-            when '29000/continent'
+            when '300128176' #continent
               hier_geo[:continent] = tgn_term
-            when '81010/nation'
+            when '300128207' #nation
               hier_geo[:country] = tgn_term
-            when '81161/province'
+            when '300000774' #province
               hier_geo[:province] = tgn_term
-            when '81165/region', '82193/union', '80005/semi-independent political entity'
+            when '300236112', '300182722', '300387194', '300387052' #region, union, semi-independent political entity
               hier_geo[:region] = tgn_term
-            when '81175/state', '81117/department', '82133/governorate'
+            when '300000776', '300000772', '300235093' #state, department, governorate
               hier_geo[:state] = tgn_term
-            when '81125/national district'
+            when '300387081' #national district
               if tgn_term == 'District of Columbia'
                 hier_geo[:state] = tgn_term
               else
                 hier_geo[:territory] = tgn_term
               end
-            when '81181/territory', '81021/dependent state', '81186/union territory'
+            when '300135982', '300387176', '300387122' #territory, dependent state, union territory
               hier_geo[:territory] = tgn_term
-            when '81115/county'
+            when '300000771' #county
               hier_geo[:county] = tgn_term
-            when '83002/inhabited place'
+            when '300008347' #inhabited place
               hier_geo[:city] = tgn_term
-            when '84251/neighborhood'
+            when '300000745' #neighborhood
               hier_geo[:city_section] = tgn_term
-            when '21471/island'
+            when '300008791', '300387062' #island
               hier_geo[:island] = tgn_term
-            when '81101/area', '22101/general region', '83210/deserted settlement', '81501/historical region', '81126/national division'
+            when '300387575', '300387346', '300167671', '300387178', '300387082' #'81101/area', '22101/general region', '83210/deserted settlement', '81501/historical region', '81126/national division'
               hier_geo[:area] = tgn_term
-            else
-              non_hier_geo = tgn_term
-          end
-        end
-
-        # parent data for <mods:hierarchicalGeographic>
-        if tgnrec.at_xpath("//Parent_String")
-          parents = tgnrec.at_xpath("//Parent_String").children.to_s.split('], ')
-          parents.each do |parent|
-            if parent.include? '(continent)'
-              hier_geo[:continent] = parent
-            elsif parent.include? '(nation)'
-              hier_geo[:country] = parent
-            elsif parent.include? '(province)'
-              hier_geo[:province] = parent
-            elsif (parent.include? '(region)') || (parent.include? '(union)') || (parent.include? '(semi-independent political entity)')
-              hier_geo[:region] = parent
-            elsif (parent.include? '(state)') || (parent.include? '(department)') || (parent.include? '(governorate)') || (parent.include?('(national district)') && parent.include?('District of Columbia'))
-              hier_geo[:state] = parent
-            elsif (parent.include? '(territory)') || (parent.include? '(dependent state)') || (parent.include? '(union territory)') || (parent.include? '(national district)')
-              hier_geo[:territory] = parent
-            elsif parent.include? '(county)'
-              hier_geo[:county] = parent
-            elsif parent.include? '(inhabited place)'
-              hier_geo[:city] = parent
-            elsif parent.include? '(neighborhood)'
-              hier_geo[:city_section] = parent
-            elsif parent.include? '(island)'
-              hier_geo[:island] = parent
-            elsif (parent.include? '(area)') || (parent.include? '(general region)') || (parent.include? '(deserted settlement)') || (parent.include? '(historical region)') || (parent.include? '(national division)')
-              hier_geo[:area] = parent
-            end
-          end
-          hier_geo.each do |k,v|
-            hier_geo[k] = v.gsub(/ \(.*/,'')
           end
         end
 
@@ -141,8 +345,9 @@ module Bplgeo
 
     end
 
+
     def self.tgn_id_from_geo_hash(geo_hash)
-      return nil if Bplgeo::TGN.getty_username == '<username>'
+      return nil if Bplgeo::TGN.tgn_enabled != true
 
       geo_hash = geo_hash.clone
 
@@ -166,139 +371,202 @@ module Bplgeo
 
       neighborhood_part = geo_hash[:neighborhood_part]
 
-      top_match_term = ''
-      match_term = nil
+
 
       if city_part.blank? && state_part.blank?
         # Limit to nations
-        place_type = 81010
-        top_match_term = ['']
-        second_top_match_term = ''
-        match_term = country_part.to_ascii.downcase
+        query = %{SELECT ?object_identifier
+WHERE
+{
+  ?x <http://purl.org/dc/elements/1.1/identifier> ?object_identifier .
+  ?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300128207> .
+  ?x <http://www.w3.org/2004/02/skos/core#prefLabel> ?object_label .
+  FILTER regex(?object_label, "^#{country_part}$", "i" )
+}}
       elsif state_part.present? && city_part.blank? && country_code == 7012149
         #Limit to states
-        place_type = 81175
-        top_match_term = ["#{country_part.to_ascii.downcase} (nation)"]
-        second_top_match_term = ["#{country_part.to_ascii.downcase} (nation)"]
-        match_term = state_part.to_ascii.downcase
+        query = %{SELECT ?object_identifier
+WHERE
+{
+  ?x <http://purl.org/dc/elements/1.1/identifier> ?object_identifier .
+  ?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000776> .
+  ?x <http://www.w3.org/2000/01/rdf-schema#label> ?object_label .
+  FILTER regex(?object_label, "^#{state_part}$", "i" )
+
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> <http://vocab.getty.edu/tgn/7012149> .
+}}
       elsif state_part.present? && city_part.blank?
-        #Limit to regions
-        place_type = 81165
-        top_match_term = ["#{country_part.to_ascii.downcase} (nation)"]
-        second_top_match_term = ["#{country_part.to_ascii.downcase} (nation)"]
-        match_term = state_part.to_ascii.downcase
+       #Limit to regions
+
+        query = %{SELECT ?object_identifier
+WHERE
+{
+  ?x <http://purl.org/dc/elements/1.1/identifier> ?object_identifier .
+  {?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000774>} UNION
+  {?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000772>} UNION
+  {?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300235093>} UNION
+  {?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300135982>} UNION
+  {?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300387176>} UNION
+  {?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300387122>} UNION
+  {?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000776>} UNION
+  {?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300236112>} UNION
+  {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300008347>} UNION
+  {?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300387081>} .
+  ?x <http://www.w3.org/2000/01/rdf-schema#label> ?object_label .
+  FILTER regex(?object_label, "^#{state_part}$", "i" )
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> ?parent_country .
+  {
+    SELECT ?parent_country ?identifier_country
+    WHERE {
+       ?parent_country <http://purl.org/dc/elements/1.1/identifier> ?identifier_country .
+       ?parent_country <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300128207> .
+       ?parent_country <http://www.w3.org/2000/01/rdf-schema#label> ?country_label .
+       FILTER regex(?country_label, "^#{country_part}$", "i" )
+    }
+
+  }
+}
+GROUP BY ?object_identifier
+}
+
+        #FIXME Temporary: For Bplgeo.parse('Aknīste (Latvia)', true), seems to be a neighborhood placed in state
+        # {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300008347>} UNION
       elsif state_part.present? && city_part.present? && neighborhood_part.blank?
         #Limited to only inhabited places at the moment...
-        place_type = 83002
-        sp = state_part.to_ascii.downcase
-        top_match_term = ["#{sp} (state)", "#{sp} (department)", "#{sp} (governorate)", "#{sp} (territory)", "#{sp} (dependent state)", "#{sp} (union territory)", "#{sp} (national district)",  "#{sp} (province)"]
-        second_top_match_term = ["#{country_part.to_ascii.downcase} (nation)"]
-        match_term = city_part.to_ascii.downcase
+        query = %{SELECT ?object_identifier
+WHERE
+{
+  ?x <http://purl.org/dc/elements/1.1/identifier> ?object_identifier .
+  ?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300008347> .
+  ?x <http://www.w3.org/2000/01/rdf-schema#label> ?object_label .
+  FILTER regex(?object_label, "^#{city_part}$", "i" )
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> ?parent_country .
+  {
+    SELECT ?parent_country ?identifier_country
+    WHERE {
+       ?parent_country <http://purl.org/dc/elements/1.1/identifier> ?identifier_country .
+       ?parent_country <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300128207> .
+       ?parent_country <http://www.w3.org/2000/01/rdf-schema#label> ?country_label .
+       FILTER regex(?country_label, "^#{country_part}$", "i" )
+    }
+
+  }
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> ?parent_state .
+  {
+    SELECT ?parent_state ?identifier_state
+    WHERE {
+       ?parent_state <http://purl.org/dc/elements/1.1/identifier> ?identifier_state .
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000774>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000772>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300235093>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300135982>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300387176>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300387122>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000776>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300236112>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300008347>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300387081>} .
+       ?parent_state <http://www.w3.org/2000/01/rdf-schema#label> ?state_label .
+       FILTER regex(?state_label, "^#{state_part}$", "i" )
+    }
+
+  }
+
+}
+GROUP BY ?object_identifier
+}
+
+
       elsif state_part.present? && city_part.present? && neighborhood_part.present?
         #Limited to only to neighborhoods currently...
-        place_type = 84251
-        top_match_term = ["#{city_part.to_ascii.downcase} (inhabited place)"]
-        sp = neighborhood_part.to_ascii.downcase
-        second_top_match_term = ["#{sp} (state)", "#{sp} (department)", "#{sp} (governorate)", "#{sp} (territory)", "#{sp} (dependent state)", "#{sp} (union territory)", "#{sp} (national district)",  "#{sp} (province)"]
-        match_term = neighborhood_part.to_ascii.downcase
+        query = %{SELECT ?object_identifier
+WHERE
+{
+  ?x <http://purl.org/dc/elements/1.1/identifier> ?object_identifier .
+  ?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000745> .
+  ?x <http://www.w3.org/2000/01/rdf-schema#label> ?object_label .
+  FILTER regex(?object_label, "^#{neighborhood_part}$", "i" )
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> ?parent_country .
+  {
+    SELECT ?parent_country ?identifier_country
+    WHERE {
+       ?parent_country <http://purl.org/dc/elements/1.1/identifier> ?identifier_country .
+       ?parent_country <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300128207> .
+       ?parent_country <http://www.w3.org/2000/01/rdf-schema#label> ?country_label .
+       FILTER regex(?country_label, "^#{country_part}$", "i" )
+    }
+
+  }
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> ?parent_state .
+  {
+    SELECT ?parent_state ?identifier_state
+    WHERE {
+       ?parent_state <http://purl.org/dc/elements/1.1/identifier> ?identifier_state .
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000774>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000772>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300235093>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300135982>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300387176>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300387122>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000776>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300236112>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300008347>} UNION
+       {?parent_state <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300387081>} .
+       ?parent_state <http://www.w3.org/2000/01/rdf-schema#label> ?state_label .
+       FILTER regex(?state_label, "^#{state_part}$", "i" )
+    }
+
+  }
+
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> ?parent_city .
+  {
+    SELECT ?parent_city ?identifier_city
+    WHERE {
+       ?parent_city <http://purl.org/dc/elements/1.1/identifier> ?identifier_city .
+       ?parent_city <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300008347> .
+       ?parent_city <http://www.w3.org/2000/01/rdf-schema#label> ?city_label .
+       FILTER regex(?city_label, "^#{city_part}$", "i" )
+    }
+
+  }
+
+}
+GROUP BY ?object_identifier
+}
+
+
       else
         return nil
       end
 
       begin
+
         if retry_count > 0
           sleep(sleep_time)
         end
         retry_count = retry_count + 1
 
-        tgn_response = Typhoeus::Request.get("http://vocabsservices.getty.edu/TGNService.asmx/TGNGetTermMatch?placetypeid=#{place_type}&nationid=#{country_code}&name=" + CGI.escape(match_term), userpwd: self.getty_username + ':' + self.getty_password)
-
+       tgn_response = Typhoeus::Request.get("http://vocab.getty.edu/sparql.json", :params=>{:query=>query})
 
       end until (tgn_response.code != 500 || retry_count == max_retry)
 
-      unless tgn_response.code == 500
-        parsed_xml = Nokogiri::Slop(tgn_response.body)
 
-        #This is ugly and needs to be redone to achieve better recursive...
-        if parsed_xml.Vocabulary.Count.text == '0'
-          if neighborhood_part.present?
-            geo_hash[:neighborhood_part] = nil
-            geo_hash = tgn_id_from_geo_hash(geo_hash)
-          elsif city_part.present?
-            geo_hash[:city_part] = nil
-            geo_hash = tgn_id_from_geo_hash(geo_hash)
-          end
-
-          return nil
-        end
-
-        #If only one result, then not array. Otherwise array....
-        if parsed_xml.Vocabulary.Subject.first.blank?
-          subject = parsed_xml.Vocabulary.Subject
-
-          current_term = subject.Preferred_Term.text.gsub(/\(.*\)/, '').to_ascii.downcase.strip
-          alternative_terms = subject.elements.any? { |node| node.name == 'Term' } ? subject.Term : ''
-
-          #FIXME: Term should check for the correct level... temporary fix...
-          if current_term == match_term && top_match_term.any? { |top_match| subject.Preferred_Parent.text.to_ascii.downcase.include? top_match }
-            return_hash[:id] = subject.Subject_ID.text
-          #Check alternative term ids
-          elsif alternative_terms.present? && alternative_terms.children.any? { |alt_term| alt_term.text.to_ascii.downcase.strip == match_term} && top_match_term.any? { |top_match| subject.Preferred_Parent.text.to_ascii.downcase.include? top_match }
-            return_hash[:id] = subject.Subject_ID.text
-          elsif current_term == match_term && second_top_match_term.any? { |top_match| subject.Preferred_Parent.text.to_ascii.downcase.include? top_match }
-            return_hash[:id] = subject.Subject_ID.text
-          elsif alternative_terms.present? && alternative_terms.children.any? { |alt_term| alt_term.text.to_ascii.downcase.strip == match_term} && second_top_match_term.any? { |top_match| subject.Preferred_Parent.text.to_ascii.downcase.include? top_match }
-            return_hash[:id] = subject.Subject_ID.text
-          end
-        else
-         parsed_xml.Vocabulary.Subject.each do |subject|
-
-            current_term = subject.Preferred_Term.text.gsub(/\(.*\)/, '').to_ascii.downcase.strip
-            alternative_terms = subject.elements.any? { |node| node.name == 'Term' } ? subject.Term : ''
-
-            if current_term == match_term && top_match_term.any? { |top_match| subject.Preferred_Parent.text.to_ascii.downcase.include? top_match }
-              return_hash[:id] = subject.Subject_ID.text
-            end
-          end
-
-          if return_hash[:id].blank?
-            parsed_xml.Vocabulary.Subject.each do |subject|
-              current_term = subject.Preferred_Term.text.gsub(/\(.*\)/, '').to_ascii.downcase.strip
-              alternative_terms = subject.elements.any? { |node| node.name == 'Term' } ? subject.Term : ''
-
-              if alternative_terms.present? && alternative_terms.children.any? { |alt_term| alt_term.text.to_ascii.downcase.strip == match_term} && top_match_term.any? { |top_match| subject.Preferred_Parent.text.to_ascii.downcase.include? top_match }
-                return_hash[:id] = subject.Subject_ID.text
-              end
-            end
-          end
 
-          if return_hash[:id].blank?
-            parsed_xml.Vocabulary.Subject.each do |subject|
-              current_term = subject.Preferred_Term.text.gsub(/\(.*\)/, '').to_ascii.downcase.strip
-              alternative_terms = subject.elements.any? { |node| node.name == 'Term' } ? subject.Term : ''
 
-              if current_term == match_term && second_top_match_term.any? { |top_match| subject.Preferred_Parent.text.to_ascii.downcase.include? top_match }
-                return_hash[:id] = subject.Subject_ID.text
-              end
-            end
-          end
-
-          if return_hash[:id].blank?
-            parsed_xml.Vocabulary.Subject.each do |subject|
-              current_term = subject.Preferred_Term.text.gsub(/\(.*\)/, '').to_ascii.downcase.strip
-              alternative_terms = subject.elements.any? { |node| node.name == 'Term' } ? subject.Term : ''
+      unless tgn_response.code == 500
+        as_json = JSON.parse(tgn_response.body)
 
-              if alternative_terms.present? && alternative_terms.children.any? { |alt_term| alt_term.text.to_ascii.downcase.strip == match_term} && second_top_match_term.any? { |top_match| subject.Preferred_Parent.text.to_ascii.downcase.include? top_match }
-                return_hash[:id] = subject.Subject_ID.text
-              end
-            end
-          end
+        #This is ugly and needs to be redone to achieve better recursive...
+        if as_json["results"]["bindings"].present? && as_json["results"]["bindings"].first["object_identifier"].present?
+          return_hash[:id] = as_json["results"]["bindings"].first["object_identifier"]["value"]
+          return_hash[:rdf] = "http://vocab.getty.edu/tgn/#{return_hash[:id]}.rdf"
+        else
+          return nil
         end
-
       end
 
       if tgn_response.code == 500
-        raise 'TGN Server appears to not be responding for Geographic query: ' + term
+        raise 'TGN Server appears to not be responding for Geographic query: ' + query
       end
 
       if return_hash.present?