Changeset 430

Timestamp:

Apr 28, 2023, 4:39:34 PM (20 months ago)

Author:

alloc

Message:

*Markers: Added storing the icon URL used for each marker

Location:

binary-improvements2

Files:

• MarkersMod/ModInfo.xml (modified) (1 diff)
• MarkersMod/src/Markers.cs (modified) (11 diffs)
• bin/Mods/TFP_CommandExtensions/CommandExtensions.dll (modified) ( previous)
• bin/Mods/TFP_CommandExtensions/CommandExtensions.pdb (modified) ( previous)
• bin/Mods/TFP_MapRendering/MapRendering.dll (modified) ( previous)
• bin/Mods/TFP_MapRendering/MapRendering.pdb (modified) ( previous)
• bin/Mods/TFP_WebServer/SpaceWizards.HttpListener.dll (modified) ( previous)
• bin/Mods/TFP_WebServer/SpaceWizards.HttpListener.pdb (modified) ( previous)
• bin/Mods/TFP_WebServer/WebServer.dll (modified) ( previous)
• bin/Mods/TFP_WebServer/WebServer.pdb (modified) ( previous)
• bin/Mods/Xample_MarkersMod/MarkersMod.dll (modified) ( previous)
• bin/Mods/Xample_MarkersMod/MarkersMod.pdb (modified) ( previous)
• bin/Mods/Xample_MarkersMod/ModInfo.xml (modified) (1 diff)

binary-improvements2/MarkersMod/ModInfo.xml

@@ -5 +5 @@
         <Description value="Allows placing custom markers on the web map" />
         <Author value="Catalysm and Alloc" />
-        <Version value="21.0.275.0" />
+        <Version value="21.0.275.1" />
         <Website value="" />
 </xml>

binary-improvements2/MarkersMod/src/Markers.cs

@@ -12 +12 @@
                 private const int numRandomMarkers = 5;
 
-                private readonly Dictionary<string, (int, int)> markers = new Dictionary<string, (int, int)> ();
+                private const string defaultIcon =
+                        "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)> ();
 
                 public Markers () {
@@ -21 +24 @@
                                 int lng = random.RandomRange (-1000, 1001);
 
-                                markers.Add (WebUtils.GenerateGuid (), (lat, lng));
+                                markers.Add (WebUtils.GenerateGuid (), (lat, lng, null));
                         }
                 }
@@ -28 +31 @@
                 private static readonly byte[] jsonKeyLat = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("lat");
                 private static readonly byte[] jsonKeyLng = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("lng");
+                private static readonly byte[] jsonKeyIcon = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("icon");
 
                 protected override void HandleRestGet (RequestContext _context) {
@@ -38 +42 @@
 
                                 bool first = true;
-                                foreach ((string markerId, (int, int) coordinates) in markers) {
+                                foreach ((string markerId, (int, int, string) properties) in markers) {
                                         if (!first) {
                                                 writer.WriteValueSeparator ();
@@ -45 +49 @@
                                         first = false;
                                         
-                                        writeMarkerJson (ref writer, markerId, coordinates);
+                                        writeMarkerJson (ref writer, markerId, properties);
                                 }
 
@@ -53 +57 @@
                         }
 
-                        if (!markers.TryGetValue (id, out (int, int) location)) {
+                        if (!markers.TryGetValue (id, out (int, int, string) properties2)) {
                                 writer.WriteRaw (JsonEmptyData);
                                 SendEnvelopedResult (_context, ref writer, HttpStatusCode.NotFound);
@@ -62 +66 @@
                                 writer.WriteBeginArray ();
                                 
-                                writeMarkerJson (ref writer, id, location);
+                                writeMarkerJson (ref writer, id, properties2);
                                 
                                 writer.WriteEndArray ();
@@ -69 +73 @@
                 }
 
-                private void writeMarkerJson (ref JsonWriter _writer, string _markerId, (int, int) _coordinates) {
+                private void writeMarkerJson (ref JsonWriter _writer, string _markerId, (int, int, string) _properties) {
                         _writer.WriteRaw (jsonKeyId);
                         _writer.WriteString (_markerId);
                         _writer.WriteRaw (jsonKeyLat);
-                        _writer.WriteInt32 (_coordinates.Item1);
+                        _writer.WriteInt32 (_properties.Item1);
                         _writer.WriteRaw (jsonKeyLng);
-                        _writer.WriteInt32 (_coordinates.Item2);
+                        _writer.WriteInt32 (_properties.Item2);
+                        _writer.WriteRaw (jsonKeyIcon);
+                        _writer.WriteString (_properties.Item3 ?? defaultIcon);
                         _writer.WriteEndObject ();
                 }
@@ -90 +96 @@
                         }
 
+                        TryGetJsonField (_jsonInput, "icon", out string icon);
+                        if (string.IsNullOrEmpty (icon)) {
+                                icon = null;
+                        }
+
                         string newId = WebUtils.GenerateGuid ();
-                        markers.Add (newId, (lat, lng));
+                        markers.Add (newId, (lat, lng, icon));
 
                         PrepareEnvelopedResult (out JsonWriter writer);
@@ -109 +120 @@
                         }
 
+                        bool keepIcon = !_jsonInput.TryGetValue ("icon", out _);
+                        TryGetJsonField (_jsonInput, "icon", out string icon);
+                        if (string.IsNullOrEmpty (icon)) {
+                                icon = null;
+                        }
+
                         string id = _context.RequestPath;
 
-                        if (!markers.TryGetValue (id, out _)) {
+                        if (!markers.TryGetValue (id, out (int, int, string) properties)) {
                                 SendErrorResult (_context, HttpStatusCode.NotFound, _jsonInputData, "ID_NOT_FOUND");
                                 return;
                         }
-                        
-                        markers [id] = (lat, lng);
+
+                        if (keepIcon) {
+                                icon = properties.Item3;
+                        }
+                        markers [id] = (lat, lng, icon);
 
                         PrepareEnvelopedResult (out JsonWriter writer);
@@ -125 +145 @@
                         writer.WriteRaw (jsonKeyLng);
                         writer.WriteInt32 (lng);
+                        writer.WriteRaw (jsonKeyIcon);
+                        writer.WriteString (icon);
                         writer.WriteEndObject ();
                         SendEnvelopedResult (_context, ref writer);

binary-improvements2/bin/Mods/Xample_MarkersMod/ModInfo.xml

@@ -5 +5 @@
         <Description value="Allows placing custom markers on the web map" />
         <Author value="Catalysm and Alloc" />
-        <Version value="21.0.275.0" />
+        <Version value="21.0.275.1" />
         <Website value="" />
 </xml>