Merge pull request #126 from Resgrid/develop

Develop
Resgrid · May 22, 2024 · 2d86b42 · 2d86b42
2 parents a5c6b87 + 844d073
commit 2d86b42
Show file tree

Hide file tree

Showing 57 changed files with 4,181 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -148,40 +148,6 @@ Web/Resgrid.WebCore/appsettings.Azure.json
 Web/Resgrid.WebCore/appsettings.Development.json
 Web/Resgrid.WebCore/appsettings.Production.json
 Web/Resgrid.WebCore/appsettings.Staging.json
-Web/Resgrid.WebCore/Areas/User/Controllers/SubscriptionController.cs
-Web/Resgrid.WebCore/Areas/User/Models/Subscription/*
-Web/Resgrid.WebCore/Areas/User/Views/Subscription/*
-Web/Resgrid.WebCore/Controllers/AffiliateController.cs
-Web/Resgrid.WebCore/Controllers/DeveloperController.cs
-Web/Resgrid.WebCore/Controllers/ForController.cs
-Web/Resgrid.WebCore/Controllers/JobsController.cs
-Web/Resgrid.WebCore/Controllers/ManageController.cs
-Web/Resgrid.WebCore/Controllers/PublicController.cs
-Web/Resgrid.WebCore/Views/Affiliate/*
-Web/Resgrid.WebCore/Views/Developer/*
-Web/Resgrid.WebCore/Views/For/*
-Web/Resgrid.WebCore/Views/Home/*
-Web/Resgrid.WebCore/Views/Jobs/*
-Web/Resgrid.WebCore/Views/Manage/*
-Web/Resgrid.WebCore/Views/Public/*
-Web/Resgrid.WebCore/wwwroot/lib/*
-Web/Resgrid.WebCore/wwwroot/css/landing/*
-Web/Resgrid.WebCore/wwwroot/css/lead/*
-Web/Resgrid.WebCore/wwwroot/css/patterns/*
-Web/Resgrid.WebCore/wwwroot/css/pricing/*
-Web/Resgrid.WebCore/wwwroot/documents/*
-Web/Resgrid.WebCore/wwwroot/images/*.jpg
-Web/Resgrid.WebCore/wwwroot/images/*.svg
-Web/Resgrid.WebCore/wwwroot/images/apps/*
-Web/Resgrid.WebCore/wwwroot/images/landing/*
-Web/Resgrid.WebCore/wwwroot/images/Mobile/*
-Web/Resgrid.WebCore/wwwroot/images/Personnel/*
-Web/Resgrid.WebCore/wwwroot/images/Screenshots/*
-Web/Resgrid.WebCore/wwwroot/images/Store/*
-Web/Resgrid.WebCore/wwwroot/js/app/admin/*
-Web/Resgrid.WebCore/wwwroot/videos/*
-Workers/Resgrid.Workers.BackendWorkers/*
-Workers/Resgrid.Workers.BroadcastWorker/*
 Workers/WebJobs/*
 Common/resgrid.com.crt
 Common/resgrid.local.crt
@@ -302,3 +268,4 @@ Web/Resgrid.WebCore/wwwroot/js/ng/polyfills.js
 Web/Resgrid.WebCore/wwwroot/js/ng/runtime.js
 Web/Resgrid.WebCore/wwwroot/js/ng/styles.css
 Web/Resgrid.WebCore/wwwroot/js/ng/*
+Web/Resgrid.WebCore/wwwroot/lib/*
diff --git a/Providers/Resgrid.Providers.Geo/GeoLocationProvider.cs b/Providers/Resgrid.Providers.Geo/GeoLocationProvider.cs
@@ -240,7 +240,7 @@ public async Task<Coordinates> GetCoordinatesFromW3W(string words)
 				try
 				{
 					var client = new RestClient("https://api.what3words.com");
-					var request = new RestRequest($"/v3/convert-to-coordinates?key={Config.MappingConfig.What3WordsApiKey}&addr={words}", Method.Get);
+					var request = new RestRequest($"/v3/convert-to-coordinates?key={Config.MappingConfig.What3WordsApiKey}&words={words}", Method.Get);
 
 					var response = await client.ExecuteAsync<W3WResponse>(request);
 
@@ -268,7 +268,7 @@ public async Task<Coordinates> GetCoordinatesFromW3WAsync(string words)
 				try
 				{
 					var client = new RestClient("https://api.what3words.com");
-					var request = new RestRequest($"/v3/convert-to-coordinates?key={Config.MappingConfig.What3WordsApiKey}&addr={words}", Method.Get);
+					var request = new RestRequest($"/v3/convert-to-coordinates?key={Config.MappingConfig.What3WordsApiKey}&words={words}", Method.Get);
 
 					var response = await client.ExecuteAsync<W3WResponse>(request);
 
@@ -296,7 +296,7 @@ public async Task<string> GetW3WFromCoordinates(Coordinates coordinates)
 				try
 				{
 					var client = new RestClient("https://api.what3words.com");
-					var request = new RestRequest($"/v3/convert-to-3wa?key={Config.MappingConfig.What3WordsApiKey}&coords={$"{coordinates.Latitude},{coordinates.Longitude}"}", Method.Get);
+					var request = new RestRequest($"/v3/convert-to-3wa?key={Config.MappingConfig.What3WordsApiKey}&coordinates={$"{coordinates.Latitude},{coordinates.Longitude}"}", Method.Get);
 
 					var response = await client.ExecuteAsync<ReverseW3WResponse>(request);