Now it actually converts properly

justinshannon · Jan 12, 2023 · 1db8a76 · 1db8a76
1 parent b604043
commit 1db8a76
Show file tree

Hide file tree

Showing 16 changed files with 310 additions and 316 deletions.
diff --git a/GeoRam/ConsoleCommand/MapFilterButton.cs b/GeoRam/ConsoleCommand/MapFilterButton.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Xml.Serialization;
 
 namespace GeoMapConverter.GeoRam.ConsoleCommand
@@ -17,6 +18,8 @@ public class MapFilterButton
 
         [XmlIgnore]
         public string FilterButtonName => $"{LabelLine1} {LabelLine2}";
+
+        public override string ToString() => FilterButtonName;
     }
 
     public class MapFilterGroup

diff --git a/GeoRam/GeoMap/DefaultLineProperties.cs b/GeoRam/GeoMap/DefaultLineProperties.cs
@@ -16,11 +16,11 @@ public class DefaultLineProperties
         public int Thickness { get; set; }
 
         [XmlElement("GeoLineFilters")]
-        public FilterGroup GeoLineFilters { get; set; }
+        public List<FilterGroup> GeoLineFilters { get; set; }
 
         public DefaultLineProperties()
         {
-            GeoLineFilters = new FilterGroup();
+            GeoLineFilters = new List<FilterGroup>();
         }
     }
 

diff --git a/GeoRam/GeoMap/DefaultSymbolProperties.cs b/GeoRam/GeoMap/DefaultSymbolProperties.cs
@@ -16,11 +16,11 @@ public class DefaultSymbolProperties
         public int FontSize { get; set; }
 
         [XmlElement("GeoSymbolFilters")]
-        public GeoSymbolFilter GeoSymbolFilters { get; set; }
+        public List<GeoSymbolFilter> GeoSymbolFilters { get; set; }
 
         public DefaultSymbolProperties()
         {
-            GeoSymbolFilters = new GeoSymbolFilter();
+            GeoSymbolFilters = new List<GeoSymbolFilter>();
         }
     }
 }
diff --git a/GeoRam/GeoMap/Enums/ObjectTypes.cs b/GeoRam/GeoMap/Enums/ObjectTypes.cs
@@ -29,6 +29,7 @@ public enum ObjectTypes
         SupplementalLine,
         SupplementalSymbol,
         AAV,
-        TAV
+        TAV,
+        DME
     }
 }
diff --git a/GeoRam/GeoMap/GeoMapObject.cs b/GeoRam/GeoMap/GeoMapObject.cs
@@ -27,5 +27,11 @@ public class GeoMapObject
 
         [XmlElement("GeoMapText")]
         public List<GeoMapText> GeoMapTextList { get; set; }
+
+        [XmlIgnore]
+        public bool HasFilterGroup =>
+            (DefaultLineProperties != null && DefaultLineProperties.GeoLineFilters.Count > 0 ||
+             DefaultSymbolProperties != null && DefaultSymbolProperties.GeoSymbolFilters.Count > 0 ||
+             TextDefaultProperties != null && TextDefaultProperties.GeoTextFilters.Count > 0);
     }
 }
diff --git a/GeoRam/GeoMap/TextDefaultProperties.cs b/GeoRam/GeoMap/TextDefaultProperties.cs
@@ -24,11 +24,11 @@ public class TextDefaultProperties
         public int YPixelOffset { get; set; }
 
         [XmlElement("GeoTextFilters")]
-        public GeoTextFilter GeoTextFilters { get; set; }
+        public List<GeoTextFilter> GeoTextFilters { get; set; }
 
         public TextDefaultProperties()
         {
-            GeoTextFilters = new GeoTextFilter();
+            GeoTextFilters = new List<GeoTextFilter>();
         }
     }
 

diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ public enum ObjectTypes @@
             SupplementalLine,
             SupplementalSymbol,
             AAV,
-            TAV
+            TAV,
+            DME
         }
     }