Get the right city name if town is provided instead of city.
This commit is contained in:
		
							parent
							
								
									61d272ec72
								
							
						
					
					
						commit
						8885f666af
					
				
				
				Notes:
				
					subgit
				
				2018-03-07 17:59:07 +01:00 
			
			r782 www/trunk
| @ -81,12 +81,22 @@ def mkGeolocationTable(file=''): | |||||||
|             response = URL.urlopen(url) |             response = URL.urlopen(url) | ||||||
|             if ( response.msg == 'OK' ): |             if ( response.msg == 'OK' ): | ||||||
|                 data = JSON.loads(response.read()) |                 data = JSON.loads(response.read()) | ||||||
|  |                 city = [] | ||||||
|                 try: |                 try: | ||||||
|                     try: |                     try: | ||||||
|                         city = data['address']['city'] |                         city = data['address']['city'] | ||||||
|                     except: |                     except: | ||||||
|                         warnings.warn('Using county instead of city for event {0} at {1} N / {2} E (URL: {3})'.format(publicID, lat, lng, url)) |                         warnings.warn('Request {3} for event {0} at {1} N / {2} E did not provide city attribute\n\t(Response: {4})'.format(publicID, lat, lng, url, data)) | ||||||
|  |                         try: | ||||||
|  |                             city = data['address']['town'] | ||||||
|  |                             warnings.warn('Using attribute town ({1}) for event {0}'.format(publicID, city)) | ||||||
|  |                         except: | ||||||
|  |                             try: | ||||||
|                                 city = data['address']['county'] |                                 city = data['address']['county'] | ||||||
|  |                                 warnings.warn('Using attribute county ({1}) for event {0}'.format(publicID, city)) | ||||||
|  |                             except: | ||||||
|  |                                 warnings.warn('Skipping event') | ||||||
|  |                                 continue | ||||||
|                     countryCode = data['address']['country_code'].upper() |                     countryCode = data['address']['country_code'].upper() | ||||||
|                     if ( countryCode == 'DE' ): |                     if ( countryCode == 'DE' ): | ||||||
|                         geolocationTable[publicID] = city.encode('utf-8') |                         geolocationTable[publicID] = city.encode('utf-8') | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user