Synchronize class library with BAGIS v3

lbross · Jul 26, 2017 · dfbad9d · dfbad9d
1 parent ac4f148
commit dfbad9d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/BAGIS_ClassLibrary/ConstantsModule.vb b/src/BAGIS_ClassLibrary/ConstantsModule.vb
@@ -98,8 +98,8 @@
     Public Const BA_MAPS_STREAMS = "AOI Streams"
     Public Const BA_MAPS_ASPECT = "Aspect"
     Public Const BA_MAPS_SLOPE = "Slope"
-    Public Const BA_MAPS_SCENARIO1_REPRESENTATION = "Scenario 1 Represented"
-    Public Const BA_MAPS_SCENARIO2_REPRESENTATION = "Scenario 2 Represented"
+    Public Const BA_MAPS_SCENARIO1_REPRESENTATION = "Scenario 1 Represented Area"
+    Public Const BA_MAPS_SCENARIO2_REPRESENTATION = "Scenario 2 Represented Area"
     Public Const BA_MAPS_PSEUDO_SITES = "Pseudo Sites"
     Public Const BA_MAPS_BOTH_REPRESENTATION = "Represented in Both"
     Public Const BA_MAPS_SNOTEL_SCENARIO1 = "Snotel Scenario 1"
@@ -109,13 +109,13 @@
     Public Const BA_MAPS_PSEUDO_SCENARIO1 = "Pseudo Site Scenario 1"
     Public Const BA_MAPS_PSEUDO_SCENARIO2 = "Pseudo Site Scenario 2"
     Public Const BA_MAPS_FILLED_DEM = "Filled DEM"
-    Public Const BA_MAPS_PS_REPRESENTED = "Represented Area"
     Public Const BA_MAPS_PS_ELEVATION = "Area Included For Elevation"
     Public Const BA_MAPS_AOI_BASEMAP = "AOI"
     Public Const BA_MAPS_PS_INDICATOR = "New Pseudo Site Indicator"
     Public Const BA_MAPS_PS_PROXIMITY = "Area Included For Proximity"
     Public Const BA_MAPS_PS_PRECIPITATION = "Area Included For Precipitation"
     Public Const BA_MAPS_PS_LOCATION = "Area Included For Location"
+    Public Const BA_MAPS_PS_ALL_CONSTRAINTS = "Area Meeting All Constraints"
 
     'these constants are used to ID whether a folder is a basin or an AOI or both
     Public Const BA_BASIN_DEM_EXTENT_SHAPEFILE As String = "aoi_v" 'vector

diff --git a/src/BAGIS_ClassLibrary/MapsModule.vb b/src/BAGIS_ClassLibrary/MapsModule.vb
@@ -310,6 +310,9 @@ Public Module MapsModule
                     Case MapsDisplayStyle.Brown_to_Blue_Green 'Pseudo-site Location Layer (brown)
                         StyleName = "Brown to Blue Green Diverging, Dark"
                         StyleCategory = "Dichromatic Ramps"
+                    Case MapsDisplayStyle.Pink_to_Yellow_Green 'All constraints Layer (bright purple)
+                        StyleName = "Pink to YellowGreen Diverging, Bright"
+                        StyleCategory = "Dichromatic Ramps"
                     Case Else
                         StyleName = "Black to White"
                         StyleCategory = "Default Ramps"
@@ -988,7 +991,7 @@ Public Module MapsModule
             Else
                 pmxDoc.PageLayout.ZoomToWhole()
             End If
-            pmxDoc.ActiveView.Refresh()
+            'pmxDoc.ActiveView.Refresh()
         End If
     End Sub
 

diff --git a/src/BAGIS_ClassLibrary/Objects/AoiTask.vb b/src/BAGIS_ClassLibrary/Objects/AoiTask.vb
@@ -24,7 +24,7 @@ Public Class AoiTask
     Public offset As String
     Public created_at As String
     ' Status code used by django
-    Public status As Integer
+    Public status As String
     Public completed_at As String
     Public task As Task
 

diff --git a/src/BAGIS_ClassLibrary/enumerations/MapsDisplayStyle.vb b/src/BAGIS_ClassLibrary/enumerations/MapsDisplayStyle.vb
@@ -12,5 +12,6 @@
     Condition_Number
     Yellows
     Brown_to_Blue_Green
+    Pink_to_Yellow_Green
     Unknown
 End Enum