Move to STJ #1837 - added missing json properties, date converter, re…

…moved unused files.
IsraelHikingMap · Feb 13, 2023 · ff5c60a · ff5c60a
1 parent eec368c
commit ff5c60a
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 63 deletions.
diff --git a/IsraelHiking.Common/Category.cs b/IsraelHiking.Common/Category.cs
@@ -1,10 +1,13 @@
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace IsraelHiking.Common
 {
     public class IconAndTags
     {
+        [JsonPropertyName("iconColorCategory")]
         public IconColorCategory IconColorCategory { get; }
+        [JsonPropertyName("tags")]
         public List<KeyValuePair<string, string>> Tags { get; }
 
         public IconAndTags(IconColorCategory iconColorCategory)
@@ -31,10 +34,14 @@ public IconAndTags(IconColorCategory iconColorCategory, List<KeyValuePair<string
 
     public class Category
     {
+        [JsonPropertyName("name")]
         public string Name { get; set; }
+        [JsonPropertyName("icon")]
         public string Icon { get; set; }
+        [JsonPropertyName("color")]
         public string Color { get; set; }
-
+
+        [JsonPropertyName("items")]
         public List<IconAndTags> Items { get; set; }
 
         public Category()

diff --git a/IsraelHiking.Common/DataContainer/RouteSegmentData.cs b/IsraelHiking.Common/DataContainer/RouteSegmentData.cs
@@ -7,7 +7,6 @@ public static class RoutingType
     {
         public const string HIKE = "Hike";
         public const string BIKE = "Bike";
-        public const string CAR = "Car";
         public const string FOUR_WHEEL_DRIVE = "4WD";
         public const string NONE = "None";
     }

diff --git a/IsraelHiking.Common/Extensions/GeoJsonExtensions.cs b/IsraelHiking.Common/Extensions/GeoJsonExtensions.cs
@@ -228,6 +228,9 @@ public static List<string> GetStringListFromAttributeValue(object value)
                 case object[] objectArray:
                     titles.AddRange(objectArray.Select(o => o.ToString()).ToList());
                     break;
+                case IList<object> objectsIList:
+                    titles.AddRange(objectsIList.Select(o => o.ToString()).ToList());
+                    break;
             }
             return titles;
         }

diff --git a/IsraelHiking.Common/FeatureProperties.cs b/IsraelHiking.Common/FeatureProperties.cs
diff --git a/IsraelHiking.Common/FileExplorer/FileExplorerViewModel.cs b/IsraelHiking.Common/FileExplorer/FileExplorerViewModel.cs
diff --git a/IsraelHiking.Common/FileExplorer/FileFormatViewModel.cs b/IsraelHiking.Common/FileExplorer/FileFormatViewModel.cs
diff --git a/IsraelHiking.Common/FileExplorer/FileSystemEntry.cs b/IsraelHiking.Common/FileExplorer/FileSystemEntry.cs
diff --git a/IsraelHiking.Common/IconColorCategory.cs b/IsraelHiking.Common/IconColorCategory.cs
@@ -1,10 +1,16 @@
-namespace IsraelHiking.Common
+using System.Text.Json.Serialization;
+
+namespace IsraelHiking.Common
 {
     public class IconColorCategory
     {
+        [JsonPropertyName("icon")]
         public string Icon { get; set; }
+        [JsonPropertyName("category")]
         public string Category { get; set; }
+        [JsonPropertyName("color")]
         public string Color { get; set; }
+        [JsonPropertyName("label")]
         public string Label { get; set; }
 
         public IconColorCategory() : this(string.Empty)

diff --git a/IsraelHiking.Common/Poi/Contribution.cs b/IsraelHiking.Common/Poi/Contribution.cs
diff --git a/IsraelHiking.Common/Poi/NorthEast.cs b/IsraelHiking.Common/Poi/NorthEast.cs
@@ -1,4 +1,6 @@
-namespace IsraelHiking.Common.Poi
+using System.Text.Json.Serialization;
+
+namespace IsraelHiking.Common.Poi
 {
     /// <summary>
     /// Return value for elevation request
@@ -8,10 +10,12 @@ public class NorthEast
         /// <summary>
         /// North coordinates in meters
         /// </summary>
+        [JsonPropertyName("north")]
         public int North { get; set; }
         /// <summary>
         /// East coordinates in meters
         /// </summary>
+        [JsonPropertyName("east")]
         public int East { get; set; }
     }
 }
diff --git a/IsraelHiking.Common/Poi/Reference.cs b/IsraelHiking.Common/Poi/Reference.cs
@@ -1,8 +1,12 @@
-namespace IsraelHiking.Common.Poi
+using System.Text.Json.Serialization;
+
+namespace IsraelHiking.Common.Poi
 {
     public class Reference
     {
+        [JsonPropertyName("url")]
         public string Url { get; set; }
+        [JsonPropertyName("sourceImageUrl")]
         public string SourceImageUrl { get; set; }
     }
 }
diff --git a/IsraelHiking.Common/Poi/SearchResultsPointOfInterest.cs b/IsraelHiking.Common/Poi/SearchResultsPointOfInterest.cs
@@ -5,7 +5,6 @@ public class SearchResultsPointOfInterest
         public string Id { get; set; }
         public string Source { get; set; }
         public string Title { get; set; }
-        public string Description { get; set; }
         public string DisplayName { get; set; }
         public string Icon { get; set; }
         public string IconColor { get; set; }

diff --git a/IsraelHiking.Common/RebuildContext.cs b/IsraelHiking.Common/RebuildContext.cs
@@ -1,13 +1,18 @@
 using IsraelHiking.Common.Api;
 using System;
+using System.Text.Json.Serialization;
 
 namespace IsraelHiking.Common
 {
     public class RebuildContext
     {
+        [JsonPropertyName("request")]
         public UpdateRequest Request { get; set; }
+        [JsonPropertyName("startTime")]
         public DateTime StartTime { get; set; }
+        [JsonPropertyName("succeeded")]
         public bool Succeeded { get; set; }
+        [JsonPropertyName("errorMessage")]
         public string ErrorMessage { get; set; }
     }
 }
diff --git a/IsraelHiking.DataAccess/ElasticSearchGateway.cs b/IsraelHiking.DataAccess/ElasticSearchGateway.cs
@@ -169,7 +169,8 @@ public class SystemTextJsonSerializer : IElasticsearchSerializer
     private IList<JsonConverter> BakedInConverters { get; } = new List<JsonConverter>
     {
         {new ExceptionConverter()},
-        {new DynamicDictionaryConverter()}
+        {new DynamicDictionaryConverter()},
+        {new DateTimeConverter()}
     };
 
     public SystemTextJsonSerializer(JsonConverterFactory factory)