Merge with master

Author: cleherny

examples/mineral-extract-sites-detection/config_trne.yaml

@@ -1,24 +1,25 @@
-# 1-Produce tile geometries based on the AoI extent and zoom level
+# Produce tile geometries based on the AoI extent and zoom level
 prepare_data.py:  
   srs: EPSG:2056
   datasets:
     shapefile: ./data/labels/tlm-hr-trn-topo.shp                   # GT labels
     # FP_shapefile: ./data/FP/FP_list.gpkg                           # FP labels
     # empty_tiles_aoi: ./data/AoI/AoI_2020.shp                       # AOI in which additional empty tiles can be selected. Only one 'empty_tiles' option can be selected  
+    # empty_tiles_year: multi-year                                  # If "empty_tiles_aoi" selected then provide a year. Choice: (1) numeric (i.e. 2020), (2) multi-year (random year selection within years [1945-2023]) 
     # empty_tiles_shp: .data/EPT/<SHPFILE>                         # Provided shpfile of selected empty tiles. Only one 'empty_tiles' option can be selected  
   output_folder: ./output/output_trne
   zoom_level: 16
 
-# 2-Fetch of tiles and split into 3 datasets: train, test, validation
+# Fetch of tiles and split into 3 datasets: train, test, validation
 generate_tilesets.py:
   debug_mode: 
-    enable: True  # sample of tiles
+    enable: False  # sample of tiles
     nb_tiles_max: 1000
   working_directory: output
   datasets:
     aoi_tiles: output_trne/tiles.geojson
     ground_truth_labels: output_trne/labels.geojson
-    # FP_labels: output_trne/FP.geojson               
+    # FP_labels: output_trne/FP.geojson                            
     image_source:
       # ############# 
       # type: FOLDER
@@ -32,7 +33,7 @@ generate_tilesets.py:
       # srs: "EPSG:2056"
       # ############ 
       type: XYZ                             # supported values: 1. MIL = Map Image Layer 2. WMS 3. XYZ 4. FOLDER
-      year: multi-year                    # supported values: 1. multi-year (tiles of different year), 2. <year> (i.e. 2020)
+      year: 2020                    # supported values: 1. multi-year (tiles of different year), 2. <year> (i.e. 2020)
       location: https://wmts.geo.admin.ch/1.0.0/ch.swisstopo.swissimage-product/default/{year}/3857/{z}/{x}/{y}.jpeg
       # ############ 
   empty_tiles:            # add empty tiles to datasets
@@ -54,7 +55,7 @@ generate_tilesets.py:
       name: Unknown
       url:
 
-# 3-Train the model with the detectron2 algorithm
+# Train the model with the detectron2 algorithm
 train_model.py:
   working_directory: ./output/output_trne
   log_subfolder: logs
@@ -67,7 +68,7 @@ train_model.py:
   model_weights:
     model_zoo_checkpoint_url: COCO-InstanceSegmentation/mask_rcnn_R_50_FPN_1x.yaml
 
-# 4-Object detection with the optimised trained model
+# Object detection with the optimised trained model
 make_detections.py:
   working_directory: ./output/output_trne
   log_subfolder: logs
@@ -86,7 +87,7 @@ make_detections.py:
   score_lower_threshold: 0.05
   remove_det_overlap: True
 
-# 5-Evaluate the quality of the detections for the different datasets by calculating metrics
+# Evaluate the quality of the detections for the different datasets by calculating metrics
 assess_detections.py:
   working_directory: ./output/output_trne
   datasets:

scripts/generate_tilesets.py

@@ -497,6 +497,11 @@ def main(cfg_file_path):
 
         logger.info("(using the MIL connector)")
 
+        assert_year(IM_SOURCE_TYPE, YEAR, aoi_tiles_gdf) 
+        if YEAR:
+            YEAR = None
+
+
         assert_year(IM_SOURCE_TYPE, YEAR, aoi_tiles_gdf) 
         if YEAR:
             YEAR = None
@@ -518,6 +523,10 @@ def main(cfg_file_path):
 
         logger.info("(using the WMS connector)")
 
+        assert_year(IM_SOURCE_TYPE, YEAR, aoi_tiles_gdf) 
+        if YEAR:
+            YEAR = None
+
         assert_year(IM_SOURCE_TYPE, YEAR, aoi_tiles_gdf) 
         if YEAR:
             YEAR = None