Tour/aupi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Computerboer
2024-10-13 20:27:28 +02:00
parent e26fa7ef84 41795462fb
commit 33ba327810
597 changed files with 197008 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
utils/locationutils.py
View File

@@ -19,7 +19,7 @@ def getLocationArray(countrycode: Countrycode):
geonames = []
for line in f:
line = line.rstrip('\n');
line = line.rstrip('\n')
data = line.split("\t")
alternatenames = []
if data[3] != "":
@@ -49,23 +49,23 @@ def getGeoLocationByCity(city = "", countrycode: Countrycode = Countrycode.NL ):
geo = list(filter(lambda g: g.name == cityname, geonames))
if(geo): geo = geo[0]
# print('first try' + repr(geo))
if (geo): return geo;
if (geo): return geo
#also tries in the alternatenames
geo = list(filter(lambda g: inAlternatenames(g.alternatenames, cityname), geonames))
if(geo): geo = geo[0]
#print('alternatenames'+ repr( geo))
if (geo): return geo;
if (geo): return geo
#then tries name without 'gemeente as prefix'
geo = list(filter(lambda g: g.name == city, geonames))
if(geo): geo = geo[0]
#print('without gemeente' + repr( geo))
if (geo): return geo;
if (geo): return geo
#also tries in the alternatenames
geo = list(filter(lambda g: inAlternatenames(g.alternatenames, city), geonames))
if(geo): geo = geo[0]
#print('alternatenames without gemeente' + repr( geo))
if (geo): return geo;
if (geo): return geo
#removes everything between () and then removes the leading and trailing spaces;
log('name before regex ' + city)
@@ -77,16 +77,17 @@ def getGeoLocationByCity(city = "", countrycode: Countrycode = Countrycode.NL ):
geo = list(filter(lambda g: g.name == city, geonames))
if(geo): geo = geo[0]
#print('without anything between ()' + repr( geo))
if (geo): return geo;
if (geo): return geo
#also tries in the alternatenames
geo = list(filter(lambda g: inAlternatenames(g.alternatenames, city), geonames))
if(geo): geo = geo[0]
#print('alternatenames without ()'+ repr( geo))
if (geo): return geo;
if (geo): return geo
log('city not found ' + city)
return None;
print('city not found: '+ city)
return None
def inAlternatenames(alternatenames = [], name = ""):
return name in alternatenames