Merge pull request #533 from tim-moody/0.6.4-fixes

re #532
iiab · Apr 4, 2023 · a2bc585 · a2bc585
2 parents 912d0c5 + 94785a6
commit a2bc585
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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
@@ -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