From 94785a61d0c79c5d3281f59168afc7b9ec842b74 Mon Sep 17 00:00:00 2001 From: tim-moody Date: Tue, 4 Apr 2023 13:22:09 -0400 Subject: [PATCH] #532 --- .../cmdsrv/files/scripts/osm-vect_v2_finish_install.py | 10 +++++----- roles/common/templates/adm_lib.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/cmdsrv/files/scripts/osm-vect_v2_finish_install.py b/roles/cmdsrv/files/scripts/osm-vect_v2_finish_install.py index cc5aae49..4e215a2b 100755 --- a/roles/cmdsrv/files/scripts/osm-vect_v2_finish_install.py +++ b/roles/cmdsrv/files/scripts/osm-vect_v2_finish_install.py @@ -47,11 +47,11 @@ def main(): # create init.json which sets initial coords and zoom if is_map: init = {} - map = map_catalog[map_id] - init['region'] = map['region'] - init['zoom'] = map['zoom'] - init['center_lon'] = map['center_lon'] - init['center_lat'] = map['center_lat'] + osm_map = map_catalog[map_id] + init['region'] = osm_map['region'] + init['zoom'] = osm_map['zoom'] + init['center_lon'] = osm_map['center_lon'] + init['center_lat'] = osm_map['center_lat'] init_fn = viewer_path + '/init.json' adm.write_json_file(init, init_fn) diff --git a/roles/common/templates/adm_lib.py b/roles/common/templates/adm_lib.py index c5dabedd..25fc408e 100644 --- a/roles/common/templates/adm_lib.py +++ b/roles/common/templates/adm_lib.py @@ -781,7 +781,7 @@ def write_vector_map_idx(installed_maps): idx_dict = {} for fname in installed_maps: region = extract_region_from_filename(fname) - if map == 'maplist': continue # not a real region + if region == 'maplist': continue # not a real region map_dict = map_catalog['regions'].get(region, '') if map_dict == '': continue