Adjust KML color style models.

Author: EMaksymenko

worldwind/src/commonMain/kotlin/earth/worldwind/formats/kml/models/ColorStyle.kt

@@ -9,7 +9,7 @@ import nl.adaptivity.xmlutil.serialization.XmlSerialName
  * It provides elements for specifying the color and color mode of extended style types.
  */
 @Serializable
-internal abstract class ColorStyle(
+internal abstract class ColorStyle : Object() {
     /**
      * Color and opacity (alpha) values are expressed in hexadecimal notation.
      * The range of values for any one color is 0 to 255 (00 to ff). For alpha, 00 is fully transparent and ff is fully opaque.
@@ -18,7 +18,7 @@ internal abstract class ColorStyle(
      * <color>7fff0000</color>, where alpha=0x7f, blue=0xff, green=0x00, and red=0x00.
      */
     @XmlElement
-    val color: String = "ffffffff",
+    abstract val color: String
 
     /**
      * Values for [colorMode] are [ColorMode.normal] (no effect) and [ColorMode.random].
@@ -32,5 +32,5 @@ internal abstract class ColorStyle(
      */
     @XmlSerialName("colorMode")
     @XmlElement
-    val colorMode: ColorMode = ColorMode.normal
-) : Object()
+    abstract val colorMode: ColorMode
+}

worldwind/src/commonMain/kotlin/earth/worldwind/formats/kml/models/Coordinates.kt

@@ -6,4 +6,10 @@ import nl.adaptivity.xmlutil.serialization.XmlValue
 @Serializable
 internal data class Coordinates(@XmlValue(true) val value: String) {
     override fun toString() = value
+
+    companion object {
+        fun fromCoordinates(list: List<Coordinate>) = Coordinates(value = toString(list))
+
+        private fun toString(list: List<Coordinate>) = list.joinToString(" ") { it.toString() }
+    }
 }

worldwind/src/commonMain/kotlin/earth/worldwind/formats/kml/models/Document.kt

@@ -2,7 +2,6 @@ package earth.worldwind.formats.kml.models
 
 import kotlinx.serialization.Serializable
 import nl.adaptivity.xmlutil.serialization.XmlElement
-import nl.adaptivity.xmlutil.serialization.XmlPolyChildren
 
 /**
  * A Document is a container for features and styles. This element is required if your KML file uses shared styles.
@@ -32,22 +31,9 @@ import nl.adaptivity.xmlutil.serialization.XmlPolyChildren
 internal data class Document(
     override val id: String? = null,
 
-    /**
-     * Define all Styles in a Document. Assign a unique ID to each Style.
-     */
-    @XmlElement
-    val styles: List<Style> = emptyList(),
-
-    /**
-     * Within a given Feature or StyleMap, reference the Style's ID using a [styleUrl] element.
-     */
-    @XmlElement
-    val styleMaps: List<StyleMap> = emptyList(),
-
     /**
      * Specifies a custom KML schemas that is used to add custom data to KML Features.
      */
     @XmlElement
     val schemas: List<Schema> = emptyList(),
-) : Container()
-
+) : Container()

worldwind/src/commonMain/kotlin/earth/worldwind/formats/kml/models/Feature.kt

@@ -4,7 +4,6 @@ import earth.worldwind.formats.kml.serializer.FlexibleBooleanSerializer
 import kotlinx.serialization.Serializable
 import nl.adaptivity.xmlutil.serialization.XmlElement
 import nl.adaptivity.xmlutil.serialization.XmlPolyChildren
-import nl.adaptivity.xmlutil.serialization.XmlSerialName
 
 /**
  * This is an abstract element and cannot be used directly in a KML file.
@@ -112,7 +111,7 @@ internal abstract class Feature(
             "earth.worldwind.formats.kml.models.StyleMap",
         ]
     )
-    val styleSelector: StyleSelector? = null,
+    val styleSelector: List<StyleSelector> = emptyList(),
 
     /**
      * Features and geometry associated with a Region are drawn only when the Region is active. See [Region].

worldwind/src/commonMain/kotlin/earth/worldwind/formats/kml/models/Folder.kt

@@ -1,8 +1,6 @@
 package earth.worldwind.formats.kml.models
 
 import kotlinx.serialization.Serializable
-import nl.adaptivity.xmlutil.serialization.XmlElement
-import nl.adaptivity.xmlutil.serialization.XmlPolyChildren
 
 /**
  * A Folder is used to arrange other Features hierarchically ([Folder]s, [Placemark]s, [NetworkLink]s, or [Overlay]s).

worldwind/src/commonMain/kotlin/earth/worldwind/formats/kml/models/HotSpot.kt

@@ -27,12 +27,12 @@ internal data class HotSpot(
      * A value of pixels indicates the x value in pixels. A value of insetPixels indicates the indent from the right edge of the icon.
      */
     @XmlSerialName("xunits")
-    val xunits: HotSpotUnits,
+    val xunits: HotSpotUnits = HotSpotUnits.fraction,
 
     /**
      * Units in which the y value is specified. A value of fraction indicates the y value is a fraction of the icon.
      * A value of pixels indicates the y value in pixels. A value of insetPixels indicates the indent from the top edge of the icon.
      */
     @XmlSerialName("yunits")
-    val yunits: HotSpotUnits,
+    val yunits: HotSpotUnits = HotSpotUnits.fraction,
 )

worldwind/src/commonMain/kotlin/earth/worldwind/formats/kml/models/Icon.kt

@@ -18,7 +18,7 @@ internal data class Icon(
      * An HTTP address or a local file specification used to load an icon.
      */
     @XmlElement
-    val href: String? = null,
+    val href: String,
 
     /**
      * If the <href> specifies an icon palette, these elements identify the offsets, in pixels, from the lower-left

worldwind/src/commonMain/kotlin/earth/worldwind/formats/kml/models/IconStyle.kt

@@ -13,6 +13,12 @@ import nl.adaptivity.xmlutil.serialization.XmlSerialName
 internal data class IconStyle(
     override val id: String? = null,
 
+    @XmlElement
+    override var color: String = "ffffffff",
+
+    @XmlElement
+    override val colorMode: ColorMode = ColorMode.normal,
+
     /**
      * Resizes the icon.
      */

worldwind/src/commonMain/kotlin/earth/worldwind/formats/kml/models/LabelStyle.kt

@@ -11,6 +11,12 @@ import nl.adaptivity.xmlutil.serialization.XmlElement
 internal data class LabelStyle(
     override val id: String? = null,
 
+    @XmlElement
+    override var color: String = "ffffffff",
+
+    @XmlElement
+    override val colorMode: ColorMode = ColorMode.normal,
+
     /**
      * Resizes the label.
      */

worldwind/src/commonMain/kotlin/earth/worldwind/formats/kml/models/LineStyle.kt

@@ -14,6 +14,12 @@ import nl.adaptivity.xmlutil.serialization.XmlSerialName
 internal data class LineStyle(
     override val id: String? = null,
 
+    @XmlElement
+    override var color: String = "ffffffff",
+
+    @XmlElement
+    override val colorMode: ColorMode = ColorMode.normal,
+
     /**
      * Width of the line, in pixels.
      */