From abc8fb8947d87b92faaed3a23cc663235c796cb9 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 17 May 2019 19:09:53 -0700 Subject: [PATCH 1/4] replace extract_region_from_filename- use re --- roles/osm-vector-maps/templates/iiab-update-map | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/roles/osm-vector-maps/templates/iiab-update-map b/roles/osm-vector-maps/templates/iiab-update-map index 3d72bba62..837bc9e85 100755 --- a/roles/osm-vector-maps/templates/iiab-update-map +++ b/roles/osm-vector-maps/templates/iiab-update-map @@ -192,14 +192,11 @@ def fetch_menu_json_value(key): return data.get(key,'') def extract_region_from_filename(fname): - substitutions = { "north": "north_america",\ - "central": "central_america",\ - "southeast": "southeast_asia", - "south": "south_america" } - # wish I had used - as separator between key and date - nibble = fname.split('_')[0] - nibble = substitutions.get(nibble,nibble) - return(nibble) + nibble = re.search(r"^.._osm_..._(.*)_[0-9]{4}",fname) + if not nibble: + return("maplist") + resp = nibble.group(1) + return(resp) if __name__ == '__main__': if console_installed: From 7eae142a62aed1954cb02e27a3e4e4fbfacb0a02 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 17 May 2019 21:53:57 -0700 Subject: [PATCH 2/4] use regular expressions to break apart filename --- roles/osm-vector-maps/templates/iiab-update-map | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/osm-vector-maps/templates/iiab-update-map b/roles/osm-vector-maps/templates/iiab-update-map index 837bc9e85..278352cfd 100755 --- a/roles/osm-vector-maps/templates/iiab-update-map +++ b/roles/osm-vector-maps/templates/iiab-update-map @@ -54,7 +54,6 @@ def main(): # For installed regions, check that a menu def exists, and it's on home page for fname in installed_maps: 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 menu_ref = 'en-map_test' item = { "perma_ref" : "en-map_test" } @@ -128,6 +127,7 @@ def write_vector_map_idx(installed_maps): region = extract_region_from_filename(fname) if map == 'maplist': continue # not a real region map_dict = map_catalog['regions'].get(region,'') + print('check for %s in %s'%(region,map_dict)) if map_dict == '': continue # Create the idx file in format required bo js-menu system @@ -192,11 +192,13 @@ def fetch_menu_json_value(key): return data.get(key,'') def extract_region_from_filename(fname): - nibble = re.search(r"^.._osm_..._(.*)_[0-9]{4}",fname) - if not nibble: + # find the index of the date + nibble = re.search(r"\d{4}-\d{2}-\d{2}",fname) + if nibble: + fname = fname[:nibble.start()-1] + return fname + else: return("maplist") - resp = nibble.group(1) - return(resp) if __name__ == '__main__': if console_installed: From a5088f063d1e171d57cdd99f7bf4d56031ac1eef Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sun, 19 May 2019 17:07:01 -0700 Subject: [PATCH 3/4] permit omt and sat to be used in filename --- roles/osm-vector-maps/templates/iiab-update-map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/templates/iiab-update-map b/roles/osm-vector-maps/templates/iiab-update-map index 837bc9e85..d38bb0b7d 100755 --- a/roles/osm-vector-maps/templates/iiab-update-map +++ b/roles/osm-vector-maps/templates/iiab-update-map @@ -105,7 +105,7 @@ def get_installed_regions(): os.chdir(map_doc_root) for filename in os.listdir('.'): 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) # add the splash page if no other maps are present if len(installed) == 0: From 9a899b43141af853a12bcb8ae30ed21f88237e16 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sun, 19 May 2019 17:12:49 -0700 Subject: [PATCH 4/4] remove debug print statement --- roles/osm-vector-maps/templates/iiab-update-map | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/osm-vector-maps/templates/iiab-update-map b/roles/osm-vector-maps/templates/iiab-update-map index e80d869ae..0e312d705 100755 --- a/roles/osm-vector-maps/templates/iiab-update-map +++ b/roles/osm-vector-maps/templates/iiab-update-map @@ -127,7 +127,6 @@ def write_vector_map_idx(installed_maps): region = extract_region_from_filename(fname) if map == 'maplist': continue # not a real region map_dict = map_catalog['regions'].get(region,'') - print('check for %s in %s'%(region,map_dict)) if map_dict == '': continue # Create the idx file in format required bo js-menu system