Replace ctry_PROJ with aoi_proj and _PROJ with _proj

ghislainv · Jun 15, 2024 · 5fc7810 · 5fc7810
1 parent b18e065
commit 5fc7810
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/far_functions/far_get_variables.py b/far_functions/far_get_variables.py
@@ -238,7 +238,7 @@ def finished(self, result):
             # Plot
             fcc123_file = opj(self.DATA, "fcc123.tif")
             png_file = opj(self.OUT, "fcc123.png")
-            border_file = opj(self.DATA, "ctry_PROJ.gpkg")
+            border_file = opj(self.DATA, "aoi_proj.gpkg")
             fig_fcc123 = far.plot.fcc123(
                 input_fcc_raster=fcc123_file,
                 maxpixels=1e8,
@@ -258,7 +258,7 @@ def finished(self, result):
                 var_group = root.addGroup("Variables")
 
             # Add border layer to QGis project
-            border_file = opj(self.DATA, "ctry_PROJ.gpkg")
+            border_file = opj(self.DATA, "aoi_proj.gpkg")
             border_layer = QgsVectorLayer(border_file, "border", "ogr")
             border_layer.loadNamedStyle(opj("qgis_layer_style", "border.qml"))
             add_layer(far_project, border_layer)

diff --git a/far_functions/far_predict.py b/far_functions/far_predict.py
@@ -140,7 +140,7 @@ def plot_prob(self, model, date):
         """Plot probability of deforestation."""
         prob_file = opj(self.outdir, f"prob_{model}_{date}.tif")
         png_file = opj(self.outdir, f"prob_{model}_{date}.png")
-        border_file = opj(self.DATA, "ctry_PROJ.gpkg")
+        border_file = opj(self.DATA, "aoi_proj.gpkg")
         fig_prob = far.plot.prob(
             input_prob_raster=prob_file,
             maxpixels=1e8,
@@ -274,7 +274,7 @@ def finished(self, result):
                 predict_group = root.addGroup("FAR models")
 
             # Add border layer to QGis project
-            border_file = opj(self.DATA, "ctry_PROJ.gpkg")
+            border_file = opj(self.DATA, "aoi_proj.gpkg")
             border_layer = QgsVectorLayer(border_file, "border", "ogr")
             border_layer.loadNamedStyle(opj("qgis_layer_style", "border.qml"))
             add_layer(far_project, border_layer)

diff --git a/rmj_functions/bm_calibrate.py b/rmj_functions/bm_calibrate.py
@@ -79,7 +79,7 @@ def plot_prob(self, model, date):
         """Plot probability of deforestation."""
         prob_file = opj(self.outdir, f"prob_{model}_{date}.tif")
         png_file = opj(self.outdir, f"prob_{model}_{date}.png")
-        border_file = opj(self.DATA, "ctry_PROJ.gpkg")
+        border_file = opj(self.DATA, "aoi_proj.gpkg")
         fig_prob = rmj.benchmark.plot.vulnerability_map(
             input_map=prob_file,
             maxpixels=1e8,
@@ -154,7 +154,7 @@ def run(self):
 
             # Rasterize subjurisdictions
             rmj.benchmark.rasterize_subjurisdictions(
-                input_file=opj(self.DATA, "ctry_PROJ.gpkg"),
+                input_file=opj(self.DATA, "aoi_proj.gpkg"),
                 fcc_file=opj(self.datadir, "fcc.tif"),
                 output_file=opj(self.outdir, "subj.tif"),
                 verbose=False)
@@ -243,7 +243,7 @@ def finished(self, result):
                 mw_group = root.addGroup("Benchmark")
 
             # Add border layer to QGis project
-            border_file = opj(self.DATA, "ctry_PROJ.gpkg")
+            border_file = opj(self.DATA, "aoi_proj.gpkg")
             border_layer = QgsVectorLayer(
                 border_file, "border", "ogr")
             border_layer.loadNamedStyle(

diff --git a/rmj_functions/bm_predict.py b/rmj_functions/bm_predict.py
@@ -98,7 +98,7 @@ def plot_prob(self, model, date):
         """Plot probability of deforestation."""
         prob_file = opj(self.outdir, f"prob_{model}_{date}.tif")
         png_file = opj(self.outdir, f"prob_{model}_{date}.png")
-        border_file = opj(self.DATA, "ctry_PROJ.gpkg")
+        border_file = opj(self.DATA, "aoi_proj.gpkg")
         fig_prob = rmj.benchmark.plot.vulnerability_map(
             input_map=prob_file,
             maxpixels=1e8,
@@ -218,7 +218,7 @@ def finished(self, result):
                 mw_group = root.addGroup("Benchmark")
 
             # Add border layer to QGis project
-            border_file = opj(self.DATA, "ctry_PROJ.gpkg")
+            border_file = opj(self.DATA, "aoi_proj.gpkg")
             border_layer = QgsVectorLayer(border_file, "border", "ogr")
             border_layer.loadNamedStyle(opj("qgis_layer_style", "border.qml"))
             add_layer(far_project, border_layer)

diff --git a/rmj_functions/mw_predict.py b/rmj_functions/mw_predict.py
@@ -101,7 +101,7 @@ def plot_prob(self, model, date):
         """Plot probability of deforestation."""
         prob_file = opj(self.outdir, f"prob_{model}_{date}.tif")
         png_file = opj(self.outdir, f"prob_{model}_{date}.png")
-        border_file = opj(self.DATA, "ctry_PROJ.gpkg")
+        border_file = opj(self.DATA, "aoi_proj.gpkg")
         fig_prob = rmj.plot.riskmap(
             input_risk_map=prob_file,
             maxpixels=1e8,
@@ -211,7 +211,7 @@ def finished(self, result):
                 mw_group = root.addGroup("Moving window")
 
             # Add border layer to QGis project
-            border_file = opj(self.DATA, "ctry_PROJ.gpkg")
+            border_file = opj(self.DATA, "aoi_proj.gpkg")
             border_layer = QgsVectorLayer(border_file, "border", "ogr")
             border_layer.loadNamedStyle(opj("qgis_layer_style", "border.qml"))
             add_layer(far_project, border_layer)