Merge branch 'dev' into lp_update

Author: AndreiKingsley

kandy-api/src/main/kotlin/org/jetbrains/kotlinx/kandy/dsl/internal/dataframe/concatFixed.kt

@@ -13,7 +13,7 @@ internal fun <T, R> GroupBy<T, R>.concatFixed(): DataFrame<R> {
     return mapToFrames {
         val rowsCount = group.rowsCount()
         val keyColumns = keyNames.filter { it !in group.columnNames() }.map { keyName ->
-            DataColumn.Companion.createByType(keyName, List(rowsCount) { key[keyName] }, Infer.Type)
+            DataColumn.createByType(keyName, List(rowsCount) { key[keyName] }, Infer.Type)
         }
         group.addAll(keyColumns)
     }.concat()

kandy-geo/src/main/kotlin/org/jetbrains/kotlinx/kandy/letsplot/geo/dsl/GeoData.kt

@@ -14,7 +14,7 @@ internal class GeoData(val geoDataFrame: GeoDataFrame<*>) : GeoSpatialData {
     override val dataFrame: DataFrame<WithGeometry> = geoDataFrame.df
 
     companion object {
-        // TODO lets-plot default, encoding precision customization
+        // TODO(https://github.com/Kotlin/kandy/issues/454)
         const val DEFAULT_PRECISION = 10
     }
 

kandy-geo/src/main/kotlin/org/jetbrains/kotlinx/kandy/letsplot/geo/layers/geoLayer.kt

@@ -34,7 +34,7 @@ internal fun <T> LayerCreatorScope.geoLayer(
         // override dataset if datasetBuilder size doesn't match
         dataFrameOf(geometryColumn).toGeo(null)
     } else {
-        // TODO improve logic if the other geometry column with the same size is used
+        // TODO(https://github.com/Kotlin/kandy/issues/456)
         // add geometry column otherwise
         (datasetBuilder as DatasetBuilderImpl).baseDataFrame.add(geometryColumn).toGeo()
     }

kandy-geo/src/main/kotlin/org/jetbrains/kotlinx/kandy/letsplot/geo/layers/geoMap.kt

@@ -21,7 +21,6 @@ import org.locationtech.jts.geom.MultiPolygon
 import org.locationtech.jts.geom.Polygon
 import kotlin.reflect.typeOf
 
-// TODO add ColumnAccessor & String api
 
 @PublishedApi
 internal fun CoordinateReferenceSystem.isWGS84(): Boolean {
@@ -75,7 +74,7 @@ public inline fun GeoDataScope.geoMap(
     if (crs == null || crs.isWGS84() == true) {
         (this as LayerCreatorScope).plotBuilder.coordinatesTransformation = CoordinatesTransformation.mercator()
     } else {
-        //TODO handling other CRS
+        // other CRSs are not supported yet in Lets-Plot
     }
     geoPolygon(block)
 }

kandy-geo/src/main/kotlin/org/jetbrains/kotlinx/kandy/letsplot/geo/layers/geoPath.kt

@@ -61,19 +61,14 @@ import kotlin.reflect.typeOf
 public inline fun GeoDataScope.geoPath(
     block: PathBuilder.() -> Unit = {}
 ) {
-    geometry().forEach {
-        if (it !is Lineal) {
-            error("Not a path geometry: $it")
-        }
-    }
+    geometry().forEach { check(it is Lineal) { "Not a path geometry: $it" } }
     (this as LayerCreatorScope).path {
         x.constant(null)
         y.constant(null)
         block()
     }
 }
 
-// TODO add ColumnAccessor & String api
 /**
  * Adds a new `path` layer to the plot.
  *

kandy-geo/src/main/kotlin/org/jetbrains/kotlinx/kandy/letsplot/geo/layers/geoPoints.kt

@@ -62,19 +62,14 @@ import kotlin.reflect.typeOf
 public inline fun GeoDataScope.geoPoints(
     block: PointsBuilder.() -> Unit = {}
 ) {
-    geometry().forEach {
-        if (it !is Puntal) {
-            error("Not a points geometry: $it")
-        }
-    }
+    geometry().forEach { check(it is Puntal) { "Not a points geometry: $it" } }
     (this as LayerCreatorScope).points {
         x.constant(null)
         y.constant(null)
         block()
     }
 }
 
-// TODO add ColumnAccessor & String api
 /**
  * Adds a new `points` layer to the plot.
  *

kandy-geo/src/main/kotlin/org/jetbrains/kotlinx/kandy/letsplot/geo/layers/geoPolygon.kt

@@ -60,19 +60,14 @@ import kotlin.reflect.typeOf
 public inline fun GeoDataScope.geoPolygon(
     block: PolygonBuilder.() -> Unit = {}
 ) {
-    geometry().forEach {
-        if (it !is Polygonal) {
-            error("Not a polygon geometry: $it")
-        }
-    }
+    geometry().forEach { check(it is Polygonal) { "Not a polygon geometry: $it" } }
     (this as LayerCreatorScope).polygon {
         x.constant(null)
         y.constant(null)
         block()
     }
 }
 
-// TODO add ColumnAccessor & String api
 /**
  * Adds a new `polygon` layer to the plot.
  *

kandy-geo/src/main/kotlin/org/jetbrains/kotlinx/kandy/letsplot/geo/layers/geoRectangles.kt

@@ -67,7 +67,6 @@ public fun GeoDataScope.geoRectangles(
     }
 }
 
-// TODO add ColumnAccessor & String api
 @JvmName("geoRectanglesGeometry")
 /**
  * Adds a new `rectangles` layer to the plot.

kandy-lets-plot/src/main/kotlin/org/jetbrains/kotlinx/kandy/letsplot/data/GeoSpatialData.kt

@@ -9,7 +9,8 @@ import org.jetbrains.letsPlot.spatial.SpatialDataset
  *
  * This interface extends the `TableData` interface, providing specific capabilities for handling geospatial data.
  *
- * @property dataFrame The data frame containing the geospatial data.
+ * @property dataFrame The [DataFrame] containing the geospatial data.
+ * @property toSpatialDataset converts dataset to Lets-Plot [SpatialDataset].
  */
 public interface GeoSpatialData : TableData {
     public val dataFrame: DataFrame<*>