Merge pull request #207 from avenueconsultants/Lat/LongBandaid

Lat/long bandaid
udotdevelopment · Jan 24, 2023 · bafb345 · bafb345
2 parents 45827ca + 9b1e610
commit bafb345
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/MOE.Common/Models/Signal.cs b/MOE.Common/Models/Signal.cs
@@ -91,11 +91,13 @@ public string SignalID
         [Required]
         [StringLength(30)]
         [DataMember]
+        [RegularExpression(@"^-?([0-9]{1,2}|1[0-7][0-9]|180)(\.[0-9]{1,10})?$")]
         public string Latitude { get; set; }
 
         [Required]
         [StringLength(30)]
         [DataMember]
+        [RegularExpression(@"^-?([0-9]{1,2}|1[0-7][0-9]|180)(\.[0-9]{1,10})?$")]
         public string Longitude { get; set; }
 
         [Required]

diff --git a/SPM/Controllers/SignalsController.cs b/SPM/Controllers/SignalsController.cs
@@ -587,6 +587,10 @@ public ActionResult Edit(Signal signal)
                     }
                     return Content("Save Successful! " + DateTime.Now.ToString());
                 }
+                if (signal.Latitude.Contains("°") || signal.Longitude.Contains("°"))
+                {
+                    return Content("Latitude/Longitude must be typed in decimal format. Do not include degree symbols or minute/second indicators.");
+                }
                 return Content("There was a validation error.");
             }