Merge pull request #50 from ar-siddiqui/dev/2.2.2

ar-siddiqui · May 24, 2023 · b17b8c5 · b17b8c5
2 parents 831f6ba + 3d380d1
commit b17b8c5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,7 @@
 {
     "workbench.colorTheme": "Solarized Dark",
-    "python.formatting.provider": "black"
+    "python.formatting.provider": "none",
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter"
+    }
 }
diff --git a/curve_number_generator/metadata.txt b/curve_number_generator/metadata.txt
@@ -6,7 +6,7 @@
 name=Curve Number Generator
 qgisMinimumVersion=3.18
 description=Curve Number Generator plugin has multiple algorithms to generate the curve number layer for any area of interest using different datasets.
-version=2.1.1
+version=2.1.2
 author=Abdul Raheem Siddiqui
 email=ars.work.ce@gmail.com
 
@@ -21,7 +21,9 @@ repository=https://github.com/ar-siddiqui/curve_number_generator
 
 hasProcessingProvider=yes
 # Uncomment the following line and add your changelog:
-changelog= Version 2.1.1 - 2023-03-19
+changelog= Version 2.1.2 - 2023-05-24
+	- conus_nlcd_ssurgo: Fix missing data on corners of a rectangle AOI
+	Version 2.1.1 - 2023-03-19
 	- Fix custom algorithm formula
 	Version 2.1.0 - 2022-09-11
 	- Remove plugin from plugin menu

diff --git a/curve_number_generator/processing/algorithms/conus_nlcd_ssurgo/conus_nlcd_ssurgo.py b/curve_number_generator/processing/algorithms/conus_nlcd_ssurgo/conus_nlcd_ssurgo.py
@@ -71,7 +71,6 @@
 
 
 class ConusNlcdSsurgo(CurveNumberGeneratorAlgorithm):
-
     # Constants used to refer to parameters and outputs. They will be
     # used when calling the algorithm from another algorithm, or when
     # calling from the QGIS console.
@@ -80,7 +79,6 @@ class ConusNlcdSsurgo(CurveNumberGeneratorAlgorithm):
     INPUT = "INPUT"
 
     def initAlgorithm(self, config=None):
-
         self.addParameter(
             QgsProcessingParameterFeatureSource(
                 "aoi",
@@ -176,6 +174,8 @@ def processAlgorithm(self, parameters, context, model_feedback):
 
         checkAreaLimits(area_acres, 100000, 500000, feedback=feedback)
         extent = getExtent(area_layer)
+        # add a buffer cell on each side, refer to #49 for reasoning
+        extent = (extent[0] - 30, extent[1] - 30, extent[2] + 30, extent[3] + 30)
         bbox_dim = createRequestBBOXDim(extent, 30)
 
         # NLCD Impervious Raster
@@ -357,7 +357,6 @@ def processAlgorithm(self, parameters, context, model_feedback):
 
         # # Curve Number Calculations
         if parameters.get("CurveNumber", None):
-
             # Prepare Land Cover for Curve Number Calculation
             # Polygonize (raster to vector)
             outputs["NLCDLandCoverPolygonize"] = gdalPolygonize(

diff --git a/curve_number_generator/processing/config.py b/curve_number_generator/processing/config.py
@@ -1,5 +1,5 @@
 # Constants
-PLUGIN_VERSION = "2.1.1"
+PLUGIN_VERSION = "2.1.2"
 
 REGISTRATION_FORM_LINK = (
     "https://docs.google.com/forms/d/e/1FAIpQLSe-X-OR6tFvULP6oiiPK3M49-v07sjtxTu8md9XAuBOwxk7Xg/formResponse"