Merge branch 'main' into test-and-packaging

Author: adhocmaster

readmbtiles.py

@@ -2,7 +2,7 @@
 import networkx as nx
 
 # Initialize reader
-dir_name = "data/osm/"
+dir_name = "../data/osm/"
 map_name = "SantaBarbara"
 osm = OSM(dir_name+map_name+".osm.pbf")
 for i in range(len(osm.get_boundaries()['osm_type'])):

maps.py src/maps.pymaps.py renamed to src/maps.py

@@ -0,0 +1,3 @@
+import mbutil
+
+mbutil.mbtiles_to_disk('../data/input/mbtiles/PaloAlto-mbtiles-openmaptiles/PaloAlto.mbtiles', 'data/output/tiles')

osm2graphdata.py src/osm2graphdata.pyosm2graphdata.py renamed to src/osm2graphdata.py

@@ -1,6 +1,6 @@
 # Run this script to generate data in /output directory.
 import maps
 
-sfMap = maps.MapReader('data/input/sf_layered.txt')
+sfMap = maps.MapReader('../data/input/sf_layered.txt')
 mapsDataset = maps.MapsDataset((32, 32), 2, 1280, maps.single_layer_converter) #Third parameter is the group size
 mapsDataset.generate_patches(sfMap) #This will generate dill files which contain the saved sample lists.

osm2imgdata.py src/osm2imgdata.pyosm2imgdata.py renamed to src/osm2imgdata.py

@@ -4,7 +4,7 @@
 import numpy as np
 from matplotlib import image as mpimg
 
-np_image = mpimg.imread('data/output/SanJose3.png')
+np_image = mpimg.imread('../data/output/SanJose3.png')
 i=0