Changeset 487 for TFP-WebServer/MarkersMod/src/Markers.cs

Timestamp:

Jun 17, 2024, 5:25:43 PM (5 months ago)

Author:

alloc

Message:

1.1.0.1 Release for V 1.0

File:

• TFP-WebServer/MarkersMod/src/Markers.cs (modified) (11 diffs)

TFP-WebServer/MarkersMod/src/Markers.cs

@@ -15 +15 @@
                         "https://upload.wikimedia.org/wikipedia/commons/thumb/1/11/Blue_question_mark_icon.svg/1200px-Blue_question_mark_icon.svg.png";
                 
-                private readonly Dictionary<string, (int, int, string)> markers = new Dictionary<string, (int, int, string)> ();
+                private readonly Dictionary<string, MarkerData> markers = new Dictionary<string, MarkerData> ();
 
                 public Markers () {
@@ -24 +24 @@
                                 int y = random.RandomRange (-1000, 1001);
 
-                                markers.Add (WebUtils.GenerateGuid (), (x, y, null));
+                                string guid = WebUtils.GenerateGuid ();
+                                markers.Add (guid, new MarkerData(guid, new Vector2i (x, y), "RandomMarker " + i, null));
                         }
                         
@@ -33 +34 @@
                 private static readonly byte[] jsonKeyX = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("x");
                 private static readonly byte[] jsonKeyY = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("y");
+                private static readonly byte[] jsonKeyName = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("name");
                 private static readonly byte[] jsonKeyIcon = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("icon");
 
@@ -44 +46 @@
 
                                 bool first = true;
-                                foreach ((string markerId, (int, int, string) properties) in markers) {
+                                foreach ((_, MarkerData iMarker) in markers) {
                                         if (!first) {
                                                 writer.WriteValueSeparator ();
@@ -51 +53 @@
                                         first = false;
                                         
-                                        writeMarkerJson (ref writer, markerId, properties);
+                                        writeMarkerJson (ref writer, iMarker);
                                 }
 
@@ -59 +61 @@
                         }
 
-                        if (!markers.TryGetValue (id, out (int, int, string) properties2)) {
+                        if (!markers.TryGetValue (id, out MarkerData singleMarker)) {
                                 writer.WriteRaw (WebUtils.JsonEmptyData);
                                 SendEnvelopedResult (_context, ref writer, HttpStatusCode.NotFound);
@@ -68 +70 @@
                                 writer.WriteBeginArray ();
                                 
-                                writeMarkerJson (ref writer, id, properties2);
+                                writeMarkerJson (ref writer, singleMarker);
                                 
                                 writer.WriteEndArray ();
@@ -75 +77 @@
                 }
 
-                private void writeMarkerJson (ref JsonWriter _writer, string _markerId, (int, int, string) _properties) {
+                private void writeMarkerJson (ref JsonWriter _writer, MarkerData _marker) {
                         _writer.WriteRaw (jsonKeyId);
-                        _writer.WriteString (_markerId);
+                        _writer.WriteString (_marker.Id);
                         _writer.WriteRaw (jsonKeyX);
-                        (int x, int y, string icon) = _properties;
-                        _writer.WriteInt32 (x);
+                        _writer.WriteInt32 (_marker.Position.x);
                         _writer.WriteRaw (jsonKeyY);
-                        _writer.WriteInt32 (y);
+                        _writer.WriteInt32 (_marker.Position.y);
+                        _writer.WriteRaw (jsonKeyName);
+                        _writer.WriteString (_marker.Name);
                         _writer.WriteRaw (jsonKeyIcon);
-                        _writer.WriteString (icon ?? defaultIcon);
+                        _writer.WriteString (_marker.Icon ?? defaultIcon);
                         _writer.WriteEndObject ();
                 }
@@ -99 +102 @@
                         }
 
+                        JsonCommons.TryGetJsonField (_jsonInput, "name", out string name);
+                        if (string.IsNullOrEmpty (name)) {
+                                name = null;
+                        }
+
                         JsonCommons.TryGetJsonField (_jsonInput, "icon", out string icon);
                         if (string.IsNullOrEmpty (icon)) {
@@ -105 +113 @@
 
                         string newId = WebUtils.GenerateGuid ();
-                        markers.Add (newId, (x, y, icon));
+                        markers.Add (newId, new MarkerData(newId, new Vector2i (x, y), name, icon));
 
                         PrepareEnvelopedResult (out JsonWriter writer);
@@ -123 +131 @@
                         }
 
-                        bool keepIcon = !_jsonInput.TryGetValue ("icon", out _);
-                        JsonCommons.TryGetJsonField (_jsonInput, "icon", out string icon);
-                        if (string.IsNullOrEmpty (icon)) {
-                                icon = null;
-                        }
+                        bool keepName = !JsonCommons.TryGetJsonField (_jsonInput, "name", out string name);
+
+                        bool keepIcon = !JsonCommons.TryGetJsonField (_jsonInput, "icon", out string icon);
 
                         string id = _context.RequestPath;
 
-                        if (!markers.TryGetValue (id, out (int, int, string) properties)) {
+                        if (!markers.TryGetValue (id, out MarkerData oldMarker)) {
                                 SendEmptyResponse (_context, HttpStatusCode.NotFound, _jsonInputData, "ID_NOT_FOUND");
                                 return;
                         }
 
+                        if (keepName) {
+                                name = oldMarker.Name;
+                        }
+                        
                         if (keepIcon) {
-                                icon = properties.Item3;
+                                icon = oldMarker.Icon;
                         }
-                        markers [id] = (x, y, icon);
+
+                        MarkerData updatedMarker = new MarkerData(id, new Vector2i (x, y), name, icon);
+                        markers [id] = updatedMarker;
 
                         PrepareEnvelopedResult (out JsonWriter writer);
-                        writer.WriteRaw (jsonKeyId);
-                        writer.WriteString (id);
-                        writer.WriteRaw (jsonKeyX);
-                        writer.WriteInt32 (x);
-                        writer.WriteRaw (jsonKeyY);
-                        writer.WriteInt32 (y);
-                        writer.WriteRaw (jsonKeyIcon);
-                        writer.WriteString (icon);
-                        writer.WriteEndObject ();
+                        writeMarkerJson (ref writer, updatedMarker);
                         SendEnvelopedResult (_context, ref writer);
                 }