topo_map_processor 0.1.12__tar.gz → 0.1.13__tar.gz

{topo_map_processor-0.1.12 → topo_map_processor-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topo_map_processor
-Version: 0.1.12
+Version: 0.1.13
 Summary: Library for processing topographic maps
 Project-URL: homepage, https://github.com/ramSeraph/topo_map_processor
 Project-URL: repository, https://github.com/ramSeraph/topo_map_processor.git

{topo_map_processor-0.1.12 → topo_map_processor-0.1.13}/topo_map_processor/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.12'
-__version_tuple__ = version_tuple = (0, 1, 12)
+__version__ = version = '0.1.13'
+__version_tuple__ = version_tuple = (0, 1, 13)
 
 __commit_id__ = commit_id = None

{topo_map_processor-0.1.12 → topo_map_processor-0.1.13}/topo_map_processor/processor.py

@@ -85,6 +85,8 @@ class TopoMapProcessor:
         self.extents = extra.get('extents', None)
         self.pixel_cutlines = extra.get('pixel_cutlines', [])
 
+        self.inset_pixel_cutlines = extra.get('inset_pixel_cutlines', None)
+        self.inset_inpaint_color = extra.get('inset_inpaint_color', (255, 255, 255))
         # rotation related
         self.auto_rotate_thresh = extra.get('auto_rotate_thresh', 0.0)
 
@@ -490,6 +492,10 @@ class TopoMapProcessor:
         #cv2.imwrite('temp.jpg', img_strip)
 
         line_poly_t = translate(line_poly, xoff=-bb[0], yoff=-bb[1])
+        # if empty then nothing to do
+        if line_poly_t.is_empty:
+            print('line poly empty, nothing to do')
+            return
         mask = np.zeros(img_strip.shape[:2], dtype=np.uint8)
         poly_coords = np.array([ [int(x[0]), int(x[1])] for x in line_poly_t.exterior.coords ])
         cv2.fillPoly(mask, pts=[poly_coords], color=1)
@@ -767,7 +773,7 @@ class TopoMapProcessor:
             map_contour = ctuples[map_inner_contour_idx][0]
 
         return map_contour
- 
+
     def get_maparea(self):
         workdir = self.get_workdir()
 
@@ -827,7 +833,6 @@ class TopoMapProcessor:
             print('already rotated.. skipping rotation')
             return
 
-
         map_bbox, map_min_rect, _ = self.get_maparea()
         _, _, angle = map_min_rect
         if angle > 45:
@@ -1588,9 +1593,6 @@ class TopoMapProcessor:
             self.remove_grid_lines()
             from_file = workdir.joinpath('nogrid.jpg')
 
-        ibox = self.get_sheet_ibox()
-        print(ibox)
-
         crs_proj = self.get_crs_proj()
 
         gcps = self.get_gcps()
@@ -1604,6 +1606,7 @@ class TopoMapProcessor:
         creation_options = '-co TILED=YES -co COMPRESS=DEFLATE -co PREDICTOR=2' 
         perf_options = '--config GDAL_CACHEMAX 128 --config GDAL_NUM_THREADS ALL_CPUS'
 
+        self.ensure_dir(workdir)
         translate_cmd = f'gdal_translate {creation_options} {perf_options} {gcp_str} -a_srs "{crs_proj}" -of GTiff {str(from_file)} {str(georef_file)}' 
         self.run_external(translate_cmd)
 
@@ -1749,7 +1752,13 @@ class TopoMapProcessor:
             reproj_options = f'-tps -ts 0 {self.warp_output_height} -r bilinear -t_srs "EPSG:3857"' 
         else:
             res = self.get_resolution()
-            reproj_options = f'-tps -tr {res} {res} -r bilinear -t_srs "EPSG:3857"' 
+            if res == 'auto':
+                reproj_options = '-tps -r bilinear -t_srs "EPSG:3857"'
+            else:
+                if type(res) is not list:
+                    res = [res, res]
+                reproj_options = f'-tps -tr {res[0]} {res[1]} -r bilinear -t_srs "EPSG:3857"' 
+
         #nodata_options = '-dstnodata 0'
         nodata_options = '-dstalpha'
         perf_options = '-multi -wo NUM_THREADS=ALL_CPUS --config GDAL_CACHEMAX 1024 -wm 1024' 
@@ -1772,6 +1781,22 @@ class TopoMapProcessor:
 
         return sheet_ibox
 
+    def inpaint_insets(self, img, inset_pixel_cutlines, inpaint_color):
+        cv_img = cv2.cvtColor(np.array(img), cv2.COLOR_RGB2BGR)
+
+        for inset_pixel_cutline in inset_pixel_cutlines:
+            print(f'filling in inset with pixel cutline: {inset_pixel_cutline}')
+            # Create a mask for the inset area
+            mask = np.zeros(cv_img.shape[:2], dtype=np.uint8)
+            pts = np.array([inset_pixel_cutline], dtype=np.int32)
+            cv2.fillPoly(mask, pts, 255)
+            # fill the area in cv_img with inpaint_color
+            cv_img[mask == 255] = inpaint_color
+
+        inpainted_img = cv2.cvtColor(cv_img, cv2.COLOR_BGR2RGB)
+        return Image.fromarray(inpainted_img)
+
+
     def export_bounds_file(self):
         bounds_dir = self.get_bounds_dir()
 
@@ -1800,6 +1825,7 @@ class TopoMapProcessor:
 
         sheet_ibox = self.get_updated_sheet_ibox()
         
+        self.ensure_dir(workdir)
         self.warp_file(sheet_ibox, cutline_file, georef_file, final_file, self.warp_jpeg_export_quality)
 
     def export_gtiff(self, filename, out_filename, jpeg_export_quality):
@@ -1825,12 +1851,24 @@ class TopoMapProcessor:
 
         self.export_gtiff(str(final_file), str(export_file), self.jpeg_export_quality)
 
+    def remove_insets(self):
+        if self.inset_pixel_cutlines is None or len(self.inset_pixel_cutlines) == 0:
+            return
+        full_img = self.get_full_img()
+        inpainted_img = self.inpaint_insets(full_img, self.inset_pixel_cutlines, self.inset_inpaint_color)
+        workdir = self.get_workdir()
+        inpainted_file = workdir.joinpath('full.jpg')
+        self.ensure_dir(workdir)
+        inpainted_img.save(inpainted_file)
+        self.full_img = None
+
 
     def process(self):
         export_file = self.get_export_file()
         if export_file.exists():
             return True
 
+        self.remove_insets()
         self.rotate()
 
         # pause to debug 

{topo_map_processor-0.1.12 → topo_map_processor-0.1.13}/topo_map_processor/tools/retile.py

@@ -24,7 +24,8 @@ from osgeo_utils.gdal2tiles import (
     DividedCache,
 )
 
-from pmtiles_mosaic.tile_sources import create_source_from_paths, MissingTileError
+from pmtiles_mosaic.tile_sources import create_source_from_paths
+from pmtiles_mosaic.tiles_common import MissingTileError
 
 from .utils import relax_open_file_limit
 
@@ -84,7 +85,7 @@ class DiskTilesHandler:
         print(f'deleted {delete_count} files at level {z}')
 
     def save_metadata(self, metadata):
-        metadata_file = self.dir.joinpath('tiles.json')
+        metadata_file = self.dir.joinpath('metadata.json')
         metadata_file.write_text(json.dumps(metadata, indent=2))
 
  

{topo_map_processor-0.1.12 → topo_map_processor-0.1.13}/topo_map_processor/tools/tile.py

@@ -141,7 +141,7 @@ def cli():
 
     vrt_file.unlink()
 
-    metadata_file = tiles_dir / 'tiles.json'
+    metadata_file = tiles_dir / 'metadata.json'
 
     fmt = get_format(args.tile_extension)