|  | @@ -1,7 +1,6 @@
 | 
	
		
			
			| 1 | 1 |  import json
 | 
	
		
			
			| 2 | 2 |  from requests import get
 | 
	
		
			
			| 3 | 3 |  from urllib import urlencode
 | 
	
		
			
			| 4 |  | -from datetime import datetime
 | 
	
		
			
			| 5 | 4 |  
 | 
	
		
			
			| 6 | 5 |  resultCount=2
 | 
	
		
			
			| 7 | 6 |  urlSearch = 'https://www.wikidata.org/w/api.php?action=query&list=search&format=json&srnamespace=0&srprop=sectiontitle&{query}'
 | 
	
	
		
			
			|  | @@ -10,7 +9,6 @@ urlMap = 'https://www.openstreetmap.org/?lat={latitude}&lon={longitude}&zoom={zo
 | 
	
		
			
			| 10 | 9 |  
 | 
	
		
			
			| 11 | 10 |  def request(query, params):
 | 
	
		
			
			| 12 | 11 |      params['url'] = urlSearch.format(query=urlencode({'srsearch': query, 'srlimit': resultCount}))
 | 
	
		
			
			| 13 |  | -    print params['url']
 | 
	
		
			
			| 14 | 12 |      return params
 | 
	
		
			
			| 15 | 13 |  
 | 
	
		
			
			| 16 | 14 |  
 | 
	
	
		
			
			|  | @@ -27,9 +25,7 @@ def response(resp):
 | 
	
		
			
			| 27 | 25 |          language = 'en'
 | 
	
		
			
			| 28 | 26 |      url = urlDetail.format(query=urlencode({'ids': '|'.join(wikidata_ids), 'languages': language + '|en'}))
 | 
	
		
			
			| 29 | 27 |  
 | 
	
		
			
			| 30 |  | -    before = datetime.now()
 | 
	
		
			
			| 31 | 28 |      htmlresponse = get(url)
 | 
	
		
			
			| 32 |  | -    print datetime.now() - before
 | 
	
		
			
			| 33 | 29 |      jsonresponse = json.loads(htmlresponse.content)
 | 
	
		
			
			| 34 | 30 |      for wikidata_id in wikidata_ids:
 | 
	
		
			
			| 35 | 31 |          results = results + getDetail(jsonresponse, wikidata_id, language)
 | 
	
	
		
			
			|  | @@ -38,7 +34,7 @@ def response(resp):
 | 
	
		
			
			| 38 | 34 |  
 | 
	
		
			
			| 39 | 35 |  def getDetail(jsonresponse, wikidata_id, language):
 | 
	
		
			
			| 40 | 36 |      result = jsonresponse.get('entities', {}).get(wikidata_id, {})
 | 
	
		
			
			| 41 |  | -    
 | 
	
		
			
			|  | 37 | +
 | 
	
		
			
			| 42 | 38 |      title = result.get('labels', {}).get(language, {}).get('value', None)
 | 
	
		
			
			| 43 | 39 |      if title == None:
 | 
	
		
			
			| 44 | 40 |          title = result.get('labels', {}).get('en', {}).get('value', wikidata_id)
 | 
	
	
		
			
			|  | @@ -86,7 +82,7 @@ def getDetail(jsonresponse, wikidata_id, language):
 | 
	
		
			
			| 86 | 82 |      musicbrainz_release_group_id = get_string(claims, 'P436')
 | 
	
		
			
			| 87 | 83 |      if musicbrainz_release_group_id != None:
 | 
	
		
			
			| 88 | 84 |          add_url(urls, 'MusicBrainz', 'http://musicbrainz.org/release-group/' + musicbrainz_release_group_id)
 | 
	
		
			
			| 89 |  | -    
 | 
	
		
			
			|  | 85 | +
 | 
	
		
			
			| 90 | 86 |      musicbrainz_label_id = get_string(claims, 'P966')
 | 
	
		
			
			| 91 | 87 |      if musicbrainz_label_id != None:
 | 
	
		
			
			| 92 | 88 |          add_url(urls, 'MusicBrainz', 'http://musicbrainz.org/label/' + musicbrainz_label_id)
 | 
	
	
		
			
			|  | @@ -111,7 +107,7 @@ def getDetail(jsonresponse, wikidata_id, language):
 | 
	
		
			
			| 111 | 107 |  
 | 
	
		
			
			| 112 | 108 |  
 | 
	
		
			
			| 113 | 109 |      results.append({
 | 
	
		
			
			| 114 |  | -            'infobox' : title, 
 | 
	
		
			
			|  | 110 | +            'infobox' : title,
 | 
	
		
			
			| 115 | 111 |              'id' : wikipedia_en_link,
 | 
	
		
			
			| 116 | 112 |              'content' : description,
 | 
	
		
			
			| 117 | 113 |              'attributes' : attributes,
 | 
	
	
		
			
			|  | @@ -144,7 +140,6 @@ def get_string(claims, propertyName, defaultValue=None):
 | 
	
		
			
			| 144 | 140 |      for e in propValue:
 | 
	
		
			
			| 145 | 141 |          mainsnak = e.get('mainsnak', {})
 | 
	
		
			
			| 146 | 142 |  
 | 
	
		
			
			| 147 |  | -        datatype = mainsnak.get('datatype', '')
 | 
	
		
			
			| 148 | 143 |          datavalue = mainsnak.get('datavalue', {})
 | 
	
		
			
			| 149 | 144 |          if datavalue != None:
 | 
	
		
			
			| 150 | 145 |              result.append(datavalue.get('value', ''))
 | 
	
	
		
			
			|  | @@ -164,7 +159,6 @@ def get_time(claims, propertyName, defaultValue=None):
 | 
	
		
			
			| 164 | 159 |      for e in propValue:
 | 
	
		
			
			| 165 | 160 |          mainsnak = e.get('mainsnak', {})
 | 
	
		
			
			| 166 | 161 |  
 | 
	
		
			
			| 167 |  | -        datatype = mainsnak.get('datatype', '')
 | 
	
		
			
			| 168 | 162 |          datavalue = mainsnak.get('datavalue', {})
 | 
	
		
			
			| 169 | 163 |          if datavalue != None:
 | 
	
		
			
			| 170 | 164 |              value = datavalue.get('value', '')
 | 
	
	
		
			
			|  | @@ -192,7 +186,7 @@ def get_geolink(claims, propertyName, defaultValue=''):
 | 
	
		
			
			| 192 | 186 |  
 | 
	
		
			
			| 193 | 187 |      precision = value.get('precision', 0.0002)
 | 
	
		
			
			| 194 | 188 |  
 | 
	
		
			
			| 195 |  | -    # there is no zoom information, deduce from precision (error prone)    
 | 
	
		
			
			|  | 189 | +    # there is no zoom information, deduce from precision (error prone)
 | 
	
		
			
			| 196 | 190 |      # samples :
 | 
	
		
			
			| 197 | 191 |      # 13 --> 5
 | 
	
		
			
			| 198 | 192 |      # 1 --> 6
 |