Changeset 390

Timestamp:

Aug 7, 2022, 1:12:28 AM (2 years ago)

Author:

alloc

Message:

Added MarkersMod example

Location:

binary-improvements2

Files:

• MapRendering/WebAndMapRendering.csproj (modified) (1 diff)
• MarkersMod (added)
• MarkersMod/API.cs (added)
• MarkersMod/AssemblyInfo.cs (added)
• MarkersMod/Markers.cs (moved) (moved from binary-improvements2/MapRendering/Web/API/Markers.cs ) (5 diffs)
• MarkersMod/MarkersMod.csproj (added)
• MarkersMod/ModInfo.xml (added)
• MarkersMod/WebMod (added)
• MarkersMod/WebMod/bundle.js (added)
• MarkersMod/WebMod/bundle.js.LICENSE.txt (added)
• server-fixes.sln (modified) (2 diffs)

binary-improvements2/MapRendering/WebAndMapRendering.csproj

@@ -91 +91 @@
     <Compile Include="Web\API\GetHostileLocation.cs" />
     <Compile Include="Web\API\GetWebMods.cs" />
-    <Compile Include="Web\API\Markers.cs" />
     <Compile Include="Web\API\Null.cs" />
     <Compile Include="Web\Handlers\RewriteHandler.cs" />

binary-improvements2/MarkersMod/Markers.cs

@@ -1 @@
-using System;
 using System.Collections.Generic;
 using System.Net;
 using AllocsFixes.JSON;
+using AllocsFixes.NetConnections.Servers.Web;
+using AllocsFixes.NetConnections.Servers.Web.API;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
+namespace Examples {
         class Markers : AbsRestApi {
-                private readonly Dictionary<string, (string, string)> markers = new Dictionary<string, (string, string)> ();
+                private const int NumRandomMarkers = 5;
+
+                private readonly Dictionary<string, (int, int)> markers = new Dictionary<string, (int, int)> ();
 
                 private static readonly JSONArray emptyResult = new JSONArray ();
                 
                 public Markers () {
-                        markers.Add (WebUtils.GenerateGuid (), ("539", "498"));
-                        markers.Add (WebUtils.GenerateGuid (), ("-18", "524"));
-                        markers.Add (WebUtils.GenerateGuid (), ("29", "-162"));
-                        markers.Add (WebUtils.GenerateGuid (), ("458", "-257"));
+                        GameRandom random = GameRandomManager.Instance.CreateGameRandom ();
+                        
+                        for (int i = 0; i < NumRandomMarkers; i++) {
+                                int lat = random.RandomRange (-1000, 1001);
+                                int lng = random.RandomRange (-1000, 1001);
+
+                                markers.Add (WebUtils.GenerateGuid (), (lat, lng));
+                        }
                 }
 
@@ -23 +30 @@
                                 JSONArray result = new JSONArray ();
 
-                                foreach (KeyValuePair<string, (string, string)> kvp in markers) {
+                                foreach (KeyValuePair<string, (int, int)> kvp in markers) {
                                         JSONObject marker = new JSONObject ();
                                         marker.Add ("id", new JSONString (kvp.Key));
-                                        marker.Add ("lat", new JSONString (kvp.Value.Item1));
-                                        marker.Add ("lng", new JSONString (kvp.Value.Item2));
+                                        marker.Add ("lat", new JSONNumber (kvp.Value.Item1));
+                                        marker.Add ("lng", new JSONNumber (kvp.Value.Item2));
                                         result.Add (marker);
                                 }
@@ -35 +42 @@
                         }
 
-                        if (!markers.TryGetValue (id, out (string, string) location)) {
+                        if (!markers.TryGetValue (id, out (int, int) location)) {
                                 SendEnvelopedResult (_context, emptyResult, HttpStatusCode.NotFound);
                                 return;
@@ -44 +51 @@
                                 JSONObject marker = new JSONObject ();
                                 marker.Add ("id", new JSONString (id));
-                                marker.Add ("lat", new JSONString (location.Item1));
-                                marker.Add ("lng", new JSONString (location.Item2));
+                                marker.Add ("lat", new JSONNumber (location.Item1));
+                                marker.Add ("lng", new JSONNumber (location.Item2));
                                 result.Add (marker);
                                 SendEnvelopedResult (_context, result);
@@ -53 +60 @@
                 protected override void HandleRestPost (RequestContext _context, JSONNode _jsonBody) {
                         if (!(_jsonBody is JSONObject bodyObject)) {
-                                
+                                SendEnvelopedResult (_context, null, HttpStatusCode.BadRequest, _jsonBody, "BODY_NOT_OBJECT");
+                                return;
                         }
 
-                        throw new NotImplementedException ();
+                        if (!TryGetJsonField (bodyObject, "lat", out int lat)) {
+                                SendEnvelopedResult (_context, null, HttpStatusCode.BadRequest, _jsonBody, "NO_OR_INVALID_LAT");
+                                return;
+                        }
+
+                        if (!TryGetJsonField (bodyObject, "lng", out int lng)) {
+                                SendEnvelopedResult (_context, null, HttpStatusCode.BadRequest, _jsonBody, "NO_OR_INVALID_LNG");
+                                return;
+                        }
+
+                        string newId = WebUtils.GenerateGuid ();
+                        markers.Add (newId, (lat, lng));
+
+                        JSONString result = new JSONString (newId);
+                        SendEnvelopedResult (_context, result);
                 }
 
                 protected override void HandleRestPut (RequestContext _context, JSONNode _jsonBody) {
-                        throw new NotImplementedException ();
+                        if (!(_jsonBody is JSONObject bodyObject)) {
+                                SendEnvelopedResult (_context, null, HttpStatusCode.BadRequest, _jsonBody, "BODY_NOT_OBJECT");
+                                return;
+                        }
+
+                        if (!TryGetJsonField (bodyObject, "lat", out int lat)) {
+                                SendEnvelopedResult (_context, null, HttpStatusCode.BadRequest, _jsonBody, "NO_OR_INVALID_LAT");
+                                return;
+                        }
+
+                        if (!TryGetJsonField (bodyObject, "lng", out int lng)) {
+                                SendEnvelopedResult (_context, null, HttpStatusCode.BadRequest, _jsonBody, "NO_OR_INVALID_LNG");
+                                return;
+                        }
+
+                        string id = _context.RequestPath;
+
+                        if (!markers.TryGetValue (id, out (int, int) location)) {
+                                SendEnvelopedResult (_context, null, HttpStatusCode.NotFound, _jsonBody, "ID_NOT_FOUND");
+                                return;
+                        }
+                        
+                        markers [id] = (lat, lng);
+
+                        JSONObject result = new JSONObject ();
+                        result.Add ("id", new JSONString (id));
+                        result.Add ("lat", new JSONNumber (lat));
+                        result.Add ("lng", new JSONNumber (lng));
+                        SendEnvelopedResult (_context, result);
                 }
 
                 protected override void HandleRestDelete (RequestContext _context) {
-                        throw new NotImplementedException ();
+                        string id = _context.RequestPath;
+
+                        SendEnvelopedResult (_context, null, markers.Remove (id) ? HttpStatusCode.NoContent : HttpStatusCode.NotFound);
                 }
         }

binary-improvements2/server-fixes.sln

@@ -9 +9 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWizards.HttpListener", "SpaceWizards.HttpListener\SpaceWizards.HttpListener.csproj", "{E273D042-57F9-4E2E-8268-5053527E5287}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarkersMod", "MarkersMod\MarkersMod.csproj", "{2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}"
 EndProject
 Global
@@ -42 +44 @@
                 {E273D042-57F9-4E2E-8268-5053527E5287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {E273D042-57F9-4E2E-8268-5053527E5287}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release|Any CPU.Build.0 = Release|Any CPU
+                {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Version|Any CPU.ActiveCfg = Release|Any CPU
+                {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Version|Any CPU.Build.0 = Release|Any CPU
+                {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Profiler|Any CPU.ActiveCfg = Release_Profiler|Any CPU
+                {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Profiler|Any CPU.Build.0 = Release_Profiler|Any CPU
         EndGlobalSection
         GlobalSection(MonoDevelopProperties) = preSolution