Changeset 444 for TFP-WebServer/MapRendering

Timestamp:

Jun 10, 2023, 6:33:56 PM (19 months ago)

Author:

alloc

Message:

Added more details to API map/config
Updated web files to 0.7.0

Location:

TFP-WebServer/MapRendering

Files:

• ModInfo.xml (modified) (1 diff)
• src/Api/Map.cs (modified) (3 diffs)

TFP-WebServer/MapRendering/ModInfo.xml

@@ -5 +5 @@
         <Description value="Render the game map to image map tiles as it is uncovered" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="21.0.293.0" />
+        <Version value="21.0.310.0" />
         <Website value="" />
 </xml>

TFP-WebServer/MapRendering/src/Api/Map.cs

@@ -10 +10 @@
         public class Map : AbsRestApi {
 
-                private static readonly byte[] jsonEnabledKey = JsonWriter.GetEncodedPropertyNameWithBeginObject ("enabled");
-                
                 protected override void HandleRestGet (RequestContext _context) {
                         string id = _context.RequestPath;
@@ -19 +17 @@
                         switch (id) {
                                 case "config":
-                                        writer.WriteRaw (jsonEnabledKey);
-                                        writer.WriteBoolean (MapRenderer.Enabled);
-                                        writer.WriteEndObject ();
+                                        writeConfig (ref writer);
                                         break;
                                 default:
@@ -29 +25 @@
                         
                         SendEnvelopedResult (_context, ref writer);
+                }
+
+                private static readonly byte[] jsonKeyEnabled = JsonWriter.GetEncodedPropertyNameWithBeginObject ("enabled");
+                private static readonly byte[] jsonKeyMapBlockSize = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("mapBlockSize");
+                private static readonly byte[] jsonKeyMaxZoom = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("maxZoom");
+                private static readonly byte[] jsonKeyMapSize = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("mapSize");
+                
+                private void writeConfig (ref JsonWriter writer) {
+                        writer.WriteRaw (jsonKeyEnabled);
+                        writer.WriteBoolean (MapRenderer.Enabled);
+
+                        writer.WriteRaw (jsonKeyMapBlockSize);
+                        writer.WriteInt32 (Constants.MapBlockSize);
+
+                        writer.WriteRaw (jsonKeyMaxZoom);
+                        writer.WriteInt32 (Constants.Zoomlevels - 1);
+
+                        GameManager.Instance.World.GetWorldExtent (out Vector3i worldMinPos, out Vector3i worldMaxPos);
+                        Vector3i worldSize = worldMaxPos - worldMinPos;
+
+                        writer.WriteRaw (jsonKeyMapSize);
+                        JsonCommons.WriteVector3I (ref writer, worldSize);
+                        
+                        writer.WriteEndObject ();
                 }