RFC Osm pylint

docs/README.md

@@ -30,6 +30,7 @@
    2. The world's landmasses are covered by `detail.mbtiles -> <regional selection of OSM data>.mbtiles` (typically 2-30 GB, depending on region) at zoom levels 11-14 and overzoomable to level 18 — encoded as MVT/PBF vector maps.
    3. Satellite imagery of the World is covered by `satellite.mbtiles -> satellite_z0-z9_2020.mbtiles` (1.2 GB) at zoom levels 0-9, encoded as JPEG bitmap/raster imagery.  (IIAB also allows you to add to this file, supplementing it with satellite photos for specific regions you care about most.)
 
+
 #### 5 Important Repos
 
   - [github.com/iiab/maps](https://github.com/iiab/maps) (right here!)

osm-source/pages/viewer/scripts/iiab-make-init.py

@@ -1,66 +1,54 @@
-#!/usr/bin/python3 
+#!/usr/bin/python3
 # -*- coding: UTF-8 -*-
-
-import iiab.iiab_lib as iiab
-
-
+"""Writes init.json """
+import sys
 import argparse
-import sys, os
-import json
-import glob
-import shutil
 import json
 
 # GLOBALS
-viewer_path = '/library/www/osm-vector-maps/viewer'
-catalog_path = '/etc/iiab'
-map_catalog = {}
+VIEWER_PATH = '/library/www/osm-vector-maps/viewer'
+CATALOG_PATH = '/etc/iiab/map-catalog.json'
 
 if len(sys.argv) != 2:
-   print("Argument 1=map_url")
-   sys.exit(1)
+    print("Argument 1=map_url")
+    sys.exit(1)
 
 def get_map_catalog():
-    global map_catalog
-    input_json = '/etc/iiab/map-catalog.json'
+    """returns CATALOG_PATH entries"""
+    input_json = CATALOG_PATH
     with open(input_json, 'r') as regions:
         reg_str = regions.read()
         map_catalog = json.loads(reg_str)
     #print(json.dumps(map_catalog, indent=2))
     return map_catalog
 
-def subproc_cmd(cmdstr, shell=False):
-    args = shlex.split(cmdstr)
-    outp = subproc_check_output(args, shell=shell)
-    return (outp)
-
 def parse_args():
+    """returns parsed args"""
     parser = argparse.ArgumentParser(description="Create init.json for a tile URL.")
     parser.add_argument("map_url", help="The 'detail_url' field in mapcatalog.json.")
     return parser.parse_args()
 
 def main():
-    global map_catalog
+    """create init.json which sets initial coords and zoom"""
     args = parse_args()
     map_catalog = get_map_catalog()
     catalog = map_catalog['maps']
     #for k in catalog.keys():
       #print(k)
-    map   = catalog.get(args.map_url,{})
-    if  len(map) == 0:
+    map2 = catalog.get(args.map_url,{})
+    if  len(map2) == 0:
         print('Download URL not found in map-catalog.json: %s'%args.map_url)
         sys.exit(1)
 
-    # create init.json which sets initial coords and zoom
     init = {}
-    map = catalog[args.map_url]
-    init['region'] = map['region']
-    init['zoom'] = map['zoom'] 
-    init['center_lon'] = map['center_lon'] 
-    init['center_lat'] = map['center_lat'] 
-    init_fn = viewer_path + '/init.json'
+    map3 = catalog[args.map_url]
+    init['region'] = map3['region']
+    init['zoom'] = map3['zoom']
+    init['center_lon'] = map3['center_lon']
+    init['center_lat'] = map3['center_lat']
+    init_fn = VIEWER_PATH + '/init.json'
     with open(init_fn,'w') as init_fp:
         init_fp.write(json.dumps(init,indent=2))
 
 if __name__ == '__main__':
-   main()
+    main()

osm-source/pages/viewer/scripts/iiab-maps-finish.py

@@ -1,47 +1,58 @@
-#!/usr/bin/python3 
+#!/usr/bin/python3
 # -*- coding: UTF-8 -*-
-
-import iiab.iiab_lib as iiab
-
-
+"""Create the idx file in format required by js-menu system"""
+import sys
+import os
 import argparse
-import sys, os
-import json
 import glob
-import shutil
 import json
 
 # GLOBALS
-viewer_path = '/library/www/osm-vector-maps/viewer'
-vector_map_idx_dir = '/library/www/html/common/assets'
-catalog_path = '/etc/iiab'
-map_catalog = {}
+VIEWER_PATH = '/library/www/osm-vector-maps/viewer'
+VECTOR_MAP_IDX_PATH = '/library/www/html/common/assets/vector-map-idx.json'
+CATALOG_PATH = '/etc/iiab/map-catalog.json'
 
 if len(sys.argv) != 2:
-   print("Argument 1=map_url")
-   sys.exit(1)
+    print("Argument 1=map_url")
+    sys.exit(1)
+
 
 def get_map_catalog():
-    global map_catalog
-    input_json = '/etc/iiab/map-catalog.json'
+    """returns contents of CATALOG_PATH"""
+    input_json = CATALOG_PATH
     with open(input_json, 'r') as regions:
         reg_str = regions.read()
         map_catalog = json.loads(reg_str)
-    #print(json.dumps(map_catalog, indent=2))
+    # print(json.dumps(map_catalog, indent=2))
     return map_catalog
 
-def subproc_cmd(cmdstr, shell=False):
-    args = shlex.split(cmdstr)
-    outp = subproc_check_output(args, shell=shell)
-    return (outp)
+
+def write_init_json():
+    """create init.json which sets initial coords and zoom"""
+    init = {}
+    args = parse_args()
+    source_catalog = get_map_catalog()
+    catalog = source_catalog['maps']
+    map3 = catalog[args.map_url]
+    init['region'] = map3['region']
+    init['zoom'] = map3['zoom']
+    init['center_lon'] = map3['center_lon']
+    init['center_lat'] = map3['center_lat']
+    init_fn = VIEWER_PATH + '/init.json'
+    with open(init_fn, 'w') as init_fp:
+        init_fp.write(json.dumps(init, indent=2))
+
 
 def write_vector_map_idx(installed_maps):
-    # copied from adm_lib
+    """copied from adm_lib"""
     map_dict = {}
     idx_dict = {}
+    map_catalog = get_map_catalog()
+
     for fname in installed_maps:
         map_dict = map_catalog['maps'].get(fname, '')
-        if map_dict == '': continue
+        if map_dict == '':
+            continue
 
         # Create the idx file in format required bo js-menu system
         item = map_dict['perma_ref']
@@ -53,50 +64,50 @@ def write_vector_map_idx(installed_maps):
         idx_dict[item]['region'] = map_dict['region']
         idx_dict[item]['language'] = map_dict['perma_ref'][:2]
 
-    with open(vector_map_idx_dir + '/vector-map-idx.json', 'w') as idx:
+    with open(VECTOR_MAP_IDX_PATH, 'w') as idx:
         idx.write(json.dumps(idx_dict, indent=2))
 
+
 def get_installed_tiles():
+    """returns installed maps"""
     installed_maps = []
-    tile_list = glob.glob(viewer_path + '/tiles/*')
+    tile_list = glob.glob(VIEWER_PATH + '/tiles/*')
     for index in range(len(tile_list)):
-       if tile_list[index].startswith('sat'): continue
-       if tile_list[index].startswith('osm-planet_z0'): continue
-       installed_maps.append(os.path.basename(tile_list[index]))
+        if tile_list[index].startswith('sat'):
+            continue
+        if tile_list[index].startswith('osm-planet_z0'):
+            continue
+        installed_maps.append(os.path.basename(tile_list[index]))
     return installed_maps
 
+
 def parse_args():
-    parser = argparse.ArgumentParser(description="Create init.json for a tile URL.")
-    parser.add_argument("map_url", help="The 'detail_url' field in mapcatalog.json.")
+    """returns parse args"""
+    parser = argparse.ArgumentParser(description="Create init.json for a tile \
+        URL.")
+    parser.add_argument("map_url", help="The 'detail_url' field in \
+        mapcatalog.json.")
     return parser.parse_args()
 
+
 def main():
-    global map_catalog
+    """Create the idx file in format required by js-menu system"""
     args = parse_args()
-    map_catalog = get_map_catalog()
-    catalog = map_catalog['maps']
-    #for k in catalog.keys():
-      #print(k)
-    map   = catalog.get(args.map_url,{})
-    if  len(map) == 0:
-        print('Download URL not found in map-catalog.json: %s'%args.map_url)
+    source_catalog = get_map_catalog()
+    catalog = source_catalog['maps']
+    # for k in catalog.keys():
+    #    print(k)
+    map2 = catalog.get(args.map_url, {})
+    if len(map2) == 0:
+        print('Download URL not found in map-catalog.json: %s' % args.map_url)
         sys.exit(1)
 
-    # create init.json which sets initial coords and zoom
-    init = {}
-    map = catalog[args.map_url]
-    init['region'] = map['region']
-    init['zoom'] = map['zoom'] 
-    init['center_lon'] = map['center_lon'] 
-    init['center_lat'] = map['center_lat'] 
-    init_fn = viewer_path + '/init.json'
-    with open(init_fn,'w') as init_fp:
-        init_fp.write(json.dumps(init,indent=2))
-
+    write_init_json()
     installed_maps = get_installed_tiles()
     print('installed_maps')
     print(repr(installed_maps))
     write_vector_map_idx(installed_maps)
 
+
 if __name__ == '__main__':
-   main()
+    main()