Changeset 391 for binary-improvements2/MarkersMod

Timestamp:

Aug 7, 2022, 3:02:24 PM (2 years ago)

Author:

alloc

Message:

Major refactoring/cleanup

Location:

binary-improvements2/MarkersMod

Files:

• MarkersMod.csproj (modified) (6 diffs)
• src (added)
• src/AssemblyInfo.cs (moved) (moved from binary-improvements2/MarkersMod/AssemblyInfo.cs ) (1 diff)
• src/Markers.cs (moved) (moved from binary-improvements2/MarkersMod/Markers.cs ) (7 diffs)
• src/ModApi.cs (moved) (moved from binary-improvements2/MarkersMod/API.cs ) (1 diff)

binary-improvements2/MarkersMod/MarkersMod.csproj

@@ -8 +8 @@
     <ProjectGuid>{2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>MarkersMod</RootNamespace>
+    <RootNamespace>Examples</RootNamespace>
     <AssemblyName>MarkersMod</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
@@ -16 +16 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\bin\Mods\MarkersMod\</OutputPath>
+    <OutputPath>..\bin\Mods\Xample_MarkersMod\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -23 +23 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Profiler|AnyCPU' ">
-    <OutputPath>..\bin\Mods\MarkersMod\</OutputPath>
+    <OutputPath>..\bin\Mods\Xample_MarkersMod\</OutputPath>
     <DefineConstants>ENABLE_PROFILER</DefineConstants>
     <Optimize>true</Optimize>
@@ -32 +32 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\bin\Mods\MarkersMod\</OutputPath>
+    <OutputPath>..\bin\Mods\Xample_MarkersMod\</OutputPath>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
@@ -55 +55 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="API.cs" />
-    <Compile Include="Markers.cs" />
+    <Compile Include="src\ModApi.cs" />
+    <Compile Include="src\AssemblyInfo.cs" />
+    <Compile Include="src\Markers.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -71 +71 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MapRendering\WebAndMapRendering.csproj">
-      <Project>{a1847b5f-7bfc-4bcd-94aa-a6c9fb7e7c54}</Project>
-      <Name>WebAndMapRendering</Name>
+    <ProjectReference Include="..\WebServer\WebServer.csproj">
+      <Project>{01b5f981-b9fd-4364-8f9e-9127130d2542}</Project>
+      <Name>WebServer</Name>
       <Private>False</Private>
     </ProjectReference>

binary-improvements2/MarkersMod/src/AssemblyInfo.cs

@@ -7 +7 @@
 [assembly: AssemblyDescription ("")]
 [assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
+[assembly: AssemblyCompany ("The Fun Pimps LLC")]
 [assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("")]
+[assembly: AssemblyCopyright ("The Fun Pimps LLC")]
 [assembly: AssemblyTrademark ("")]
 [assembly: AssemblyCulture ("")]

binary-improvements2/MarkersMod/src/Markers.cs

@@ -2 +2 @@
 using System.Net;
 using AllocsFixes.JSON;
-using AllocsFixes.NetConnections.Servers.Web;
-using AllocsFixes.NetConnections.Servers.Web.API;
+using Webserver;
+using Webserver.WebAPI;
 
 namespace Examples {
-        class Markers : AbsRestApi {
-                private const int NumRandomMarkers = 5;
+        public class Markers : AbsRestApi {
+                private const int numRandomMarkers = 5;
 
                 private readonly Dictionary<string, (int, int)> markers = new Dictionary<string, (int, int)> ();
 
-                private static readonly JSONArray emptyResult = new JSONArray ();
+                private static readonly JsonArray emptyResult = new JsonArray ();
                 
                 public Markers () {
                         GameRandom random = GameRandomManager.Instance.CreateGameRandom ();
                         
-                        for (int i = 0; i < NumRandomMarkers; i++) {
+                        for (int i = 0; i < numRandomMarkers; i++) {
                                 int lat = random.RandomRange (-1000, 1001);
                                 int lng = random.RandomRange (-1000, 1001);
@@ -28 +28 @@
                         
                         if (string.IsNullOrEmpty (id)) {
-                                JSONArray result = new JSONArray ();
+                                JsonArray result = new JsonArray ();
 
-                                foreach (KeyValuePair<string, (int, int)> kvp in markers) {
-                                        JSONObject marker = new JSONObject ();
-                                        marker.Add ("id", new JSONString (kvp.Key));
-                                        marker.Add ("lat", new JSONNumber (kvp.Value.Item1));
-                                        marker.Add ("lng", new JSONNumber (kvp.Value.Item2));
+                                foreach ((string markerId, (int, int) coordinates) in markers) {
+                                        JsonObject marker = new JsonObject ();
+                                        marker.Add ("id", new JsonString (markerId));
+                                        marker.Add ("lat", new JsonNumber (coordinates.Item1));
+                                        marker.Add ("lng", new JsonNumber (coordinates.Item2));
                                         result.Add (marker);
                                 }
@@ -48 +48 @@
 
                         {
-                                JSONArray result = new JSONArray ();
-                                JSONObject marker = new JSONObject ();
-                                marker.Add ("id", new JSONString (id));
-                                marker.Add ("lat", new JSONNumber (location.Item1));
-                                marker.Add ("lng", new JSONNumber (location.Item2));
+                                JsonArray result = new JsonArray ();
+                                JsonObject marker = new JsonObject ();
+                                marker.Add ("id", new JsonString (id));
+                                marker.Add ("lat", new JsonNumber (location.Item1));
+                                marker.Add ("lng", new JsonNumber (location.Item2));
                                 result.Add (marker);
                                 SendEnvelopedResult (_context, result);
@@ -58 +58 @@
                 }
 
-                protected override void HandleRestPost (RequestContext _context, JSONNode _jsonBody) {
-                        if (!(_jsonBody is JSONObject bodyObject)) {
+                protected override void HandleRestPost (RequestContext _context, JsonNode _jsonBody) {
+                        if (!(_jsonBody is JsonObject bodyObject)) {
                                 SendEnvelopedResult (_context, null, HttpStatusCode.BadRequest, _jsonBody, "BODY_NOT_OBJECT");
                                 return;
@@ -77 +77 @@
                         markers.Add (newId, (lat, lng));
 
-                        JSONString result = new JSONString (newId);
-                        SendEnvelopedResult (_context, result);
+                        JsonString result = new JsonString (newId);
+                        SendEnvelopedResult (_context, result, HttpStatusCode.Created);
                 }
 
-                protected override void HandleRestPut (RequestContext _context, JSONNode _jsonBody) {
-                        if (!(_jsonBody is JSONObject bodyObject)) {
+                protected override void HandleRestPut (RequestContext _context, JsonNode _jsonBody) {
+                        if (!(_jsonBody is JsonObject bodyObject)) {
                                 SendEnvelopedResult (_context, null, HttpStatusCode.BadRequest, _jsonBody, "BODY_NOT_OBJECT");
                                 return;
@@ -99 +99 @@
                         string id = _context.RequestPath;
 
-                        if (!markers.TryGetValue (id, out (int, int) location)) {
+                        if (!markers.TryGetValue (id, out _)) {
                                 SendEnvelopedResult (_context, null, HttpStatusCode.NotFound, _jsonBody, "ID_NOT_FOUND");
                                 return;
@@ -106 +106 @@
                         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));
+                        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);
                 }

binary-improvements2/MarkersMod/src/ModApi.cs

@@ -1 +1 @@
 namespace Examples {
-        public class API : IModApi {
+        public class ModApi : IModApi {
                 public void InitMod (Mod _modInstance) {
                 }