geomash 0.2.1 → 0.3.1

data/lib/geomash/tgn.rb

@@ -3,7 +3,8 @@ module Geomash
   class TGN
 
     def self.tgn_enabled
-      Geomash.config[:tgn_enabled] || true
+      return Geomash.config[:tgn_enabled] unless Geomash.config[:tgn_enabled].nil?
+      return true
     end
 
 =begin
@@ -189,7 +190,7 @@ EXAMPLE SPARQL:
       tgn_main_term_info = {}
       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"})
+      primary_tgn_response = Typhoeus::Request.get("http://vocab.getty.edu/download/json", :params=>{:uri=>"http://vocab.getty.edu/tgn/#{tgn_id}.json"}, :timeout=>500)
 
       return nil if(primary_tgn_response.response_code == 404) #Couldn't find TGN... FIXME: additional check needed if TGN is down?
 
@@ -243,36 +244,32 @@ EXAMPLE SPARQL:
 
         query = query.squish
 
-        primary_tgn_response = Typhoeus::Request.post("http://vocab.getty.edu/sparql.json", :body=>{:query=>query})
+        primary_tgn_response = Typhoeus::Request.get("http://vocab.getty.edu/sparql.json", :body=>{:query=>query}, :timeout=>500)
         as_json_tgn_response = JSON.parse(primary_tgn_response.body)
       end
 
-      #FIXME: Temporary hack to determine more cases of non-blank/english place name conflicts that require resolution.
-      label_remaining_check = false
-
       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']
+              tgn_main_term_info[:label_en] ||= ntriple['Object']['value']
             elsif  ntriple['Object']['xml:lang'].present? &&  ntriple['Object']['xml:lang'] == 'zh-latn-pinyin'
-              tgn_main_term_info[:label_other] = ntriple['Object']['value']
+              tgn_main_term_info[:label_other] ||= ntriple['Object']['value']
             elsif ntriple['Object']['xml:lang'].blank?
-              tgn_main_term_info[:label_default] = ntriple['Object']['value']
+              tgn_main_term_info[:label_default] ||= ntriple['Object']['value']
             else
-              label_remaining_check = true if tgn_main_term_info[:label_remaining].present?
-              tgn_main_term_info[:label_remaining] = ntriple['Object']['value']
+              tgn_main_term_info[:label_remaining] ||= ntriple['Object']['value']
             end
           when 'http://www.w3.org/2004/02/skos/core#altLabel'
             if ntriple['Object']['xml:lang'].present? &&  ntriple['Object']['xml:lang'] == 'en'
-              tgn_main_term_info[:label_alt] = ntriple['Object']['value']
+              tgn_main_term_info[:label_alt] ||= ntriple['Object']['value']
             end
           when 'http://vocab.getty.edu/ontology#placeTypePreferred'
-            tgn_main_term_info[:aat_place] = ntriple['Object']['value']
+            tgn_main_term_info[:aat_place] ||= ntriple['Object']['value']
           when 'http://schema.org/latitude'
-            tgn_main_term_info[:latitude] = ntriple['Object']['value']
+            tgn_main_term_info[:latitude] ||= ntriple['Object']['value']
           when 'http://schema.org/longitude'
-            tgn_main_term_info[:longitude] = ntriple['Object']['value']
+            tgn_main_term_info[:longitude] ||= ntriple['Object']['value']
           when 'http://vocab.getty.edu/ontology#broaderPreferredExtended'
             broader_place_type_list << ntriple['Object']['value']
         end
@@ -289,18 +286,14 @@ EXAMPLE SPARQL:
       end
 
       hier_geo = {}
+      non_hier_geo = {}
+
       #Default term to best label language...
       tgn_term = tgn_main_term_info[:label_en]
       tgn_term ||= tgn_main_term_info[:label_default]
       tgn_term ||= tgn_main_term_info[:label_other]
       tgn_term ||= tgn_main_term_info[:label_alt]
-      if tgn_term.blank?
-        if label_remaining_check
-          raise "Could not determine a single label for TGN: " + tgn_id
-        else
-          tgn_term = tgn_main_term_info[:label_remaining]
-        end
-      end
+      tgn_term ||= tgn_main_term_info[:label_remaining]
 
       tgn_term_type = tgn_main_term_info[:aat_place].split('/').last
 
@@ -309,11 +302,11 @@ EXAMPLE SPARQL:
         case tgn_term_type
           when '300128176' #continent
             hier_geo[:continent] = tgn_term
-          when '300128207' #nations
+          when '300128207', '300387130', '300387506' #nation, autonomous areas, countries
             hier_geo[:country] = tgn_term
           when '300000774' #province
             hier_geo[:province] = tgn_term
-          when '300236112', '300182722', '300387194', '300387052' #region, union, semi-independent political entity
+          when '300236112', '300182722', '300387194', '300387052', '300387113', '300387107' #region, union, semi-independent political entity, autonomous communities, autonomous regions
             hier_geo[:region] = tgn_term
           when '300000776', '300000772', '300235093' #state, department, governorate
             hier_geo[:state] = tgn_term
@@ -325,27 +318,83 @@ EXAMPLE SPARQL:
             end
           when '300135982', '300387176', '300387122' #territory, dependent state, union territory
             hier_geo[:territory] = tgn_term
-          when '300000771' #county
+          when '300000771', '300387092', '300387071' #county, parishes, unitary authorities
             hier_geo[:county] = tgn_term
-          when '300008347' #inhabited place
+          when '300008347', '300008389' #inhabited place, cities
             hier_geo[:city] = tgn_term
-          when '300000745' #neighborhood
+          when '300000745', '300000778', '300387331' #neighborhood, parishes, parts of inhabited places
             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'
+          when '300387575', '300387346', '300167671', '300387178', '300387082', '300387173', '300055621', '300386853', '300386831', '300386832', '300008178', '300008804', '300387131', '300132348', '300387085', '300387198', '300008761'   #'81101/area', '22101/general region', '83210/deserted settlement', '81501/historical region', '81126/national division', administrative divisions, area (measurement), island groups, mountain ranges, mountain systems, nature reserves, peninsulas, regional divisions, sand bars, senatorial districts (administrative districts), third level subdivisions (political entities), valleys (landforms)
             hier_geo[:area] = tgn_term
+          when '300386699' #Top level element of World
+            non_hier_geo[:value] = 'World'
+            non_hier_geo[:qualifier] = nil
           else
-            non_hier_geo = tgn_term
+            aat_main_term_info = {}
+            label_remaining_check = false
+
+            aat_type_response = Typhoeus::Request.get("http://vocab.getty.edu/download/json", :params=>{:uri=>"http://vocab.getty.edu/aat/#{tgn_term_type}.json"}, :timeout=>500)
+            JSON.parse(aat_type_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'
+                    aat_main_term_info[:label_en] ||= ntriple['Object']['value']
+                  elsif ntriple['Object']['xml:lang'].present? &&  ntriple['Object']['xml:lang'] == 'en-us'
+                    aat_main_term_info[:label_en] ||= ntriple['Object']['value']
+                  elsif  ntriple['Object']['xml:lang'].present? &&  ntriple['Object']['xml:lang'] == 'zh-latn-pinyin'
+                    aat_main_term_info[:label_other] ||= ntriple['Object']['value']
+                  elsif ntriple['Object']['xml:lang'].blank?
+                    aat_main_term_info[:label_default] ||= ntriple['Object']['value']
+                  else
+                    label_remaining_check = true if aat_main_term_info[:label_remaining].present?
+                    aat_main_term_info[:label_remaining] ||= ntriple['Object']['value']
+                  end
+                when 'http://www.w3.org/2004/02/skos/core#altLabel'
+                  if ntriple['Object']['xml:lang'].present? &&  ntriple['Object']['xml:lang'] == 'en'
+                    aat_main_term_info[:label_alt] ||= ntriple['Object']['value']
+                  end
+              end
+
+            end
+            #Default term to best label language...
+            aat_term = aat_main_term_info[:label_en]
+            aat_term ||= aat_main_term_info[:label_default]
+            aat_term ||= aat_main_term_info[:label_other]
+            aat_term ||= aat_main_term_info[:label_alt]
+
+            if aat_term.blank?
+              if label_remaining_check
+                raise "Could not determine a single aat non_hier_geo label for TGN: " + tgn_id
+              else
+                aat_term = aat_main_term_info[:label_remaining]
+              end
+            end
+
+            #Fix cases like http://vocab.getty.edu/aat/300132316 which are bays (bodies of water)
+            aat_term = aat_term.gsub(/ \(.+\)$/, '')
+
+            if (aat_term =~ /ies$/).present?
+              aat_term = aat_term.gsub(/ies$/, 'y')
+            elsif (aat_term =~ /es$/).present?
+              aat_term = aat_term.gsub(/es$/, '')
+            elsif (aat_term =~ /s$/).present?
+              aat_term = aat_term.gsub(/s$/, '')
+            end
+
+            #Fix cases like "Boston Harbor" as "Boston Harbor (harbor)" isn't that helpful
+            non_hier_geo[:value] = tgn_term
+            non_hier_geo[:qualifier] = tgn_term.downcase.include?(aat_term.downcase) ? nil : aat_term
         end
 
         #Broader places
         #FIXME: could parse xml:lang instead of the three optional clauses now... didn't expect places to lack a default preferred label.
+        if broader_place_type_list.present? #Case of World... top of hierachy check
+          query = "SELECT ?identifier_place ?place_label_default ?place_label_en ?place_label_remaining ?aat_pref WHERE {"
 
-        query = "SELECT ?identifier_place ?place_label_default ?place_label_en ?place_label_remaining ?aat_pref WHERE {"
-
-        broader_place_type_list.each do |place_uri|
-          query += %{{<#{place_uri}> <http://purl.org/dc/elements/1.1/identifier> ?identifier_place .
+          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" )
                  }
@@ -364,66 +413,67 @@ EXAMPLE SPARQL:
         <#{place_uri}> <http://vocab.getty.edu/ontology#placeTypePreferred> ?aat_pref
        } UNION
      }
-        end
+          end
 
-        query = query[0..-12]
-        query += ". } GROUP BY ?identifier_place ?place_label_default ?place_label_en ?place_label_latn_pinyin ?place_label_alt ?place_label_remaining ?aat_pref"
-        query = query.squish
+          query = query[0..-12]
+          query += ". } GROUP BY ?identifier_place ?place_label_default ?place_label_en ?place_label_latn_pinyin ?place_label_alt ?place_label_remaining ?aat_pref"
+          query = query.squish
 
-        tgn_response_for_aat = Typhoeus::Request.post("http://vocab.getty.edu/sparql.json", :body=>{:query=>query})
-        as_json_tgn_response_for_aat = JSON.parse(tgn_response_for_aat.body)
+          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_type = aat_response['aat_pref']['value'].split('/').last
+          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']
-          elsif aat_response['place_label_default'].present? && aat_response['place_label_default']['value'] != '-'
-            tgn_term = aat_response['place_label_default']['value']
-          elsif aat_response['place_label_latn_pinyin'].present? && aat_response['place_label_latn_pinyin']['value'] != '-'
-            tgn_term = aat_response['place_label_latn_pinyin']['value']
-          elsif aat_response['place_label_alt'].present? && aat_response['place_label_alt']['value'] != '-'
-            tgn_term = aat_response['place_label_alt']['value']
-          else
-            tgn_term = aat_response['place_label_remaining']['value']
-          end
+            if aat_response['place_label_en'].present? && aat_response['place_label_en']['value'] != '-'
+              tgn_term = aat_response['place_label_en']['value']
+            elsif aat_response['place_label_default'].present? && aat_response['place_label_default']['value'] != '-'
+              tgn_term = aat_response['place_label_default']['value']
+            elsif aat_response['place_label_latn_pinyin'].present? && aat_response['place_label_latn_pinyin']['value'] != '-'
+              tgn_term = aat_response['place_label_latn_pinyin']['value']
+            elsif aat_response['place_label_alt'].present? && aat_response['place_label_alt']['value'] != '-'
+              tgn_term = aat_response['place_label_alt']['value']
+            else
+              tgn_term = aat_response['place_label_remaining']['value']
+            end
 
-          case tgn_term_type
-            when '300128176' #continent
-              hier_geo[:continent] = tgn_term
-            when '300128207' #nation
-              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'
+            case tgn_term_type
+              when '300128176' #continent
+                hier_geo[:continent] = tgn_term
+              when '300128207', '300387130', '300387506' #nation, autonomous areas, countries
+                hier_geo[:country] = tgn_term
+              when '300000774' #province
+                hier_geo[:province] = tgn_term
+              when '300236112', '300182722', '300387194', '300387052', '300387113', '300387107' #region, union, semi-independent political entity, autonomous communities, autonomous regions
+                hier_geo[:region] = tgn_term
+              when '300000776', '300000772', '300235093' #state, department, governorate
                 hier_geo[:state] = tgn_term
-              else
+              when '300387081' #national district
+                if tgn_term == 'District of Columbia'
+                  hier_geo[:state] = tgn_term
+                else
+                  hier_geo[:territory] = tgn_term
+                end
+              when '300135982', '300387176', '300387122' #territory, dependent state, union territory
                 hier_geo[:territory] = tgn_term
-              end
-            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
+              when '300000771', '300387092', '300387071' #county, parishes, unitary authorities
+                hier_geo[:county] = tgn_term
+              when '300008347', '300008389' #inhabited place, cities
+                hier_geo[:city] = tgn_term
+              when '300000745', '300000778', '300387331' #neighborhood, parishes, parts of inhabited places
+                hier_geo[:city_section] = tgn_term
+              when '300008791', '300387062' #island
+                hier_geo[:island] = tgn_term
+              when '300387575', '300387346', '300167671', '300387178', '300387082', '300387173', '300055621', '300386853', '300386831', '300386832', '300008178', '300008804', '300387131', '300132348', '300387085', '300387198', '300008761'   #'81101/area', '22101/general region', '83210/deserted settlement', '81501/historical region', '81126/national division', administrative divisions, area (measurement), island groups, mountain ranges, mountain systems, nature reserves, peninsulas, regional divisions, sand bars, senatorial districts (administrative districts), third level subdivisions (political entities), valleys (landforms)
+                hier_geo[:area] = tgn_term
+            end
           end
         end
 
         tgn_data = {}
         tgn_data[:coords] = coords
         tgn_data[:hier_geo] = hier_geo.length > 0 ? hier_geo : nil
-        tgn_data[:non_hier_geo] = non_hier_geo ? non_hier_geo : nil
+        tgn_data[:non_hier_geo] = non_hier_geo.present? ? non_hier_geo : nil
 
       else
 
@@ -435,17 +485,19 @@ EXAMPLE SPARQL:
 
     end
 
-
     def self.tgn_id_from_geo_hash(geo_hash)
       return nil if Geomash::TGN.tgn_enabled != true
 
       geo_hash = geo_hash.clone
-
       max_retry = 3
       sleep_time = 60 # In seconds
       retry_count = 0
 
       return_hash = {}
+      country_response = {}
+      states_response = {}
+      cities_response = {}
+      neighboorhood_response = {}
 
       state_part = geo_hash[:state_part]
 
@@ -454,41 +506,71 @@ EXAMPLE SPARQL:
 
 
       country_part = Geomash::Constants::COUNTRY_TGN_LOOKUP[geo_hash[:country_part]][:tgn_country_name] unless Geomash::Constants::COUNTRY_TGN_LOOKUP[geo_hash[:country_part]].blank?
-      country_part ||= geo_hash[:country_part]
+      country_part = geo_hash[:country_part] if country_part.blank?
       country_part ||= ''
 
       city_part = geo_hash[:city_part]
 
       neighborhood_part = geo_hash[:neighborhood_part]
 
+      web_request_error = false
+      begin
+        if retry_count > 0
+          sleep(sleep_time)
+        end
+        retry_count = retry_count + 1
 
+        #First we get county!!
 
-      if city_part.blank? && state_part.blank?
-        # Limit to nations
         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 .
+  ?x <http://www.w3.org/2000/01/rdf-schema#label> ?object_label .
   FILTER regex(?object_label, "^#{country_part}$", "i" )
-}}
-      elsif state_part.present? && city_part.blank? && country_code == 7012149
-        #Limit to states
-        query = %{SELECT ?object_identifier
+}
+  GROUP BY ?object_identifier
+}
+        country_response = self.tgn_sparql_request(query)
+        return nil if country_response[:id].blank? && !country_response[:errors]
+        return_hash[:id] = country_response[:id]
+        return_hash[:rdf] = country_response[:rdf]
+        return_hash[:parse_depth] = 1
+        web_request_error = true if country_response[:errors]
+
+        #United State state query
+        if state_part.present? && country_code == 7012149 && !web_request_error
+          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://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300000776>} 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> <http://vocab.getty.edu/tgn/7012149> .
-}}
-      elsif state_part.present? && city_part.blank?
-       #Limit to regions
+}
+  GROUP BY ?object_identifier
+}
 
-        query = %{SELECT ?object_identifier
+          states_response = self.tgn_sparql_request(query)
+          if states_response[:id].blank? && !states_response[:errors]
+            return_hash[:original_string_differs] = true
+          else
+            return_hash[:id] = states_response[:id]
+            return_hash[:rdf] = states_response[:rdf]
+            return_hash[:parse_depth] = 2
+          end
+          web_request_error = true if states_response[:errors]
+        end
+
+        #Non United States state query
+        #Note: Had to remove   {?x <http://vocab.getty.edu/ontology#placeTypePreferred> <http://vocab.getty.edu/aat/300008347>} UNION as it returned two results
+        #for "15. Bezirk (Rudolfsheim-Fünfhaus, Vienna, Austria)--Exhibitions". Correct or not?
+        if state_part.present? && country_code != 7012149 && !web_request_error
+          query = %{SELECT ?object_identifier
 WHERE
 {
   ?x <http://purl.org/dc/elements/1.1/identifier> ?object_identifier .
@@ -500,75 +582,76 @@ WHERE
   {?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" )
-    }
-
-  }
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> <http://vocab.getty.edu/tgn/#{country_response[:id]}> .
 }
 GROUP BY ?object_identifier
 }
 
-        #FIXME Temporary: For Geomash.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...
-        query = %{SELECT ?object_identifier
+          states_response = self.tgn_sparql_request(query)
+          if states_response[:id].blank? && !states_response[:errors]
+            return_hash[:original_string_differs] = true
+          else
+            return_hash[:id] = states_response[:id]
+            return_hash[:rdf] = states_response[:rdf]
+            return_hash[:parse_depth] = 2
+          end
+          web_request_error = true if states_response[:errors]
+        end
+
+        if states_response[:id].present? && city_part.present? && !web_request_error
+          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" )
-    }
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> <http://vocab.getty.edu/tgn/#{country_response[:id]}> .
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> <http://vocab.getty.edu/tgn/#{states_response[:id]}> .
+}
+GROUP BY ?object_identifier
+}
+          cities_response = self.tgn_sparql_request(query)
+          if cities_response[:id].blank? && !cities_response[:errors]
+            return_hash[:original_string_differs] = true
+          else
+            return_hash[:id] = cities_response[:id]
+            return_hash[:rdf] = cities_response[:rdf]
+            return_hash[:parse_depth] = 3
+          end
+          web_request_error = true if cities_response[:errors]
 
-  }
+        end
 
+        #Case of Countries without a state breakdown... ie. Tokyo, Japan
+        if state_part.blank? && country_response[:id].present? && city_part.present? && !web_request_error
+          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> <http://vocab.getty.edu/tgn/#{country_response[:id]}> .
 }
 GROUP BY ?object_identifier
 }
+          cities_response = self.tgn_sparql_request(query)
+          if cities_response[:id].blank? && !cities_response[:errors]
+            return_hash[:original_string_differs] = true
+          else
+            return_hash[:id] = cities_response[:id]
+            return_hash[:rdf] = cities_response[:rdf]
+            return_hash[:parse_depth] = 3
+          end
+          web_request_error = true if cities_response[:errors]
 
+        end
 
-      elsif state_part.present? && city_part.present? && neighborhood_part.present?
-        #Limited to only to neighborhoods currently...
+      if cities_response[:id].present? && neighborhood_part.present? && !web_request_error
         query = %{SELECT ?object_identifier
 WHERE
 {
@@ -576,97 +659,71 @@ WHERE
   ?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" )
-    }
-
-  }
-
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> <http://vocab.getty.edu/tgn/#{country_response[:id]}> .
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> <http://vocab.getty.edu/tgn/#{states_response[:id]}> .
+  ?x <http://vocab.getty.edu/ontology#broaderPreferredExtended> <http://vocab.getty.edu/tgn/#{cities_response[:id]}> .
 }
 GROUP BY ?object_identifier
 }
+        neighborhood_response = self.tgn_sparql_request(query)
+        if neighborhood_response[:id].blank? && !neighborhood_response[:errors]
+          return_hash[:original_string_differs]=true
+        else
+          return_hash[:id] = neighborhood_response[:id]
+          return_hash[:rdf] = neighborhood_response[:rdf]
+          return_hash[:parse_depth] = 4
+        end
+        web_request_error = true if neighborhood_response[:errors]
+      end
 
+      end until (!web_request_error || retry_count == max_retry)
 
+      if return_hash.present? && !web_request_error
+        return_hash[:original_string_differs] ||= Geomash::Standardizer.parsed_and_original_check(geo_hash)
+        return return_hash
       else
         return nil
       end
 
-      begin
+    end
 
-        if retry_count > 0
-          sleep(sleep_time)
+      def self.tgn_sparql_request(query,method="GET")
+        response = {}
+        query = query.squish
+        if(method=="GET")
+          tgn_response = Typhoeus::Request.get("http://vocab.getty.edu/sparql.json", :params=>{:query=>query}, :timeout=>500)
+        else
+          tgn_response = Typhoeus::Request.post("http://vocab.getty.edu/sparql.json", :params=>{:query=>query}, :timeout=>500)
         end
-        retry_count = retry_count + 1
-
-      query = query.squish
-       tgn_response = Typhoeus::Request.get("http://vocab.getty.edu/sparql.json", :params=>{:query=>query})
-
-      end until (tgn_response.code != 500 || retry_count == max_retry)
-
 
+        if tgn_response.success? && tgn_response.code == 200
+          begin
+            as_json = JSON.parse(tgn_response.body)
+            response[:json] = as_json
+            if as_json["results"]["bindings"].present? && as_json["results"]["bindings"].first["object_identifier"].present?
+              response[:id] = as_json["results"]["bindings"].first["object_identifier"]["value"]
+              response[:rdf] = "http://vocab.getty.edu/tgn/#{response[:id]}.rdf"
+            end
+            response[:errors] = false
+          rescue JSON::ParserError
+            response[:json] = nil
+            response[:errors] = true
+            if tgn_response.cached? && Typhoeus::Config.cache.present?
+              cache_key = Typhoeus::Request.new("http://vocab.getty.edu/sparql.json", params: {query: query}).cache_key
+              Typhoeus::Config.cache.delete(cache_key) #Need to define a delete method like: def delete(request) Rails.cache.delete(request) end
+            end
 
-
-      unless tgn_response.code == 500
-        as_json = JSON.parse(tgn_response.body)
-
-        #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"
+          end
         else
-          return nil
+          if tgn_response.cached? && Typhoeus::Config.cache.present?
+            cache_key = Typhoeus::Request.new("http://vocab.getty.edu/sparql.json", params: {query: query}).cache_key
+            Typhoeus::Config.cache.delete(cache_key) #Need to define a delete method like: def delete(request) Rails.cache.delete(request) end
+          end
         end
-      end
 
-      if tgn_response.code == 500
-        raise 'TGN Server appears to not be responding for Geographic query: ' + query
-      end
+        return response
 
-      if return_hash.present?
-        return_hash[:original_string_differs] = Geomash::Standardizer.parsed_and_original_check(geo_hash)
-        return return_hash
-      else
-        return nil
       end
-    end
 
 
   end