1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 11:42:08 +00:00

Merge pull request #1683 from georgejhunt/register-map

Register map
This commit is contained in:
A Holt 2019-05-19 21:10:05 -04:00 committed by GitHub
commit 33b8c06f57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -54,7 +54,6 @@ def main():
# For installed regions, check that a menu def exists, and it's on home page # For installed regions, check that a menu def exists, and it's on home page
for fname in installed_maps: for fname in installed_maps:
region = extract_region_from_filename(fname) region = extract_region_from_filename(fname)
print('checking for %s region'%region)
if region == 'maplist': # it is the splash page, display only if no others if region == 'maplist': # it is the splash page, display only if no others
menu_ref = 'en-map_test' menu_ref = 'en-map_test'
item = { "perma_ref" : "en-map_test" } item = { "perma_ref" : "en-map_test" }
@ -105,7 +104,7 @@ def get_installed_regions():
os.chdir(map_doc_root) os.chdir(map_doc_root)
for filename in os.listdir('.'): for filename in os.listdir('.'):
if fnmatch.fnmatch(filename, '??-osm-omt*'): if fnmatch.fnmatch(filename, '??-osm-omt*'):
region = re.sub(r'^..-osm-omt_(.*)',r'\1',filename) region = re.sub(r'^..-osm-..._(.*)',r'\1',filename)
installed.append(region) installed.append(region)
# add the splash page if no other maps are present # add the splash page if no other maps are present
if len(installed) == 0: if len(installed) == 0:
@ -192,14 +191,13 @@ def fetch_menu_json_value(key):
return data.get(key,'') return data.get(key,'')
def extract_region_from_filename(fname): def extract_region_from_filename(fname):
substitutions = { "north": "north_america",\ # find the index of the date
"central": "central_america",\ nibble = re.search(r"\d{4}-\d{2}-\d{2}",fname)
"southeast": "southeast_asia", if nibble:
"south": "south_america" } fname = fname[:nibble.start()-1]
# wish I had used - as separator between key and date return fname
nibble = fname.split('_')[0] else:
nibble = substitutions.get(nibble,nibble) return("maplist")
return(nibble)
if __name__ == '__main__': if __name__ == '__main__':
if console_installed: if console_installed: