Skip to content

Commit 6e40c2d

Browse files
committed
updating usage of deprecated functions
1 parent 0d01483 commit 6e40c2d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

dataframe-geo/src/main/kotlin/org/jetbrains/kotlinx/dataframe/geo/geotools/toGeoDataFrame.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fun SimpleFeatureCollection.toGeoDataFrame(): GeoDataFrame<*> {
5959
}
6060
}
6161

62-
val geometryColumn = DataColumn.create("geometry", geometries, Infer.Type)
62+
val geometryColumn = DataColumn.createByType("geometry", geometries, Infer.Type)
6363

6464
@Suppress("UNCHECKED_CAST")
6565
return GeoDataFrame((data.toDataFrame() + geometryColumn) as DataFrame<WithGeometry>, crs)

dataframe-geo/src/main/kotlin/org/jetbrains/kotlinx/dataframe/geo/io/read.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import org.geotools.geojson.feature.FeatureJSON
66
import org.jetbrains.kotlinx.dataframe.DataFrame
77
import org.jetbrains.kotlinx.dataframe.geo.GeoDataFrame
88
import org.jetbrains.kotlinx.dataframe.geo.geotools.toGeoDataFrame
9-
import org.jetbrains.kotlinx.dataframe.io.asURL
9+
import org.jetbrains.kotlinx.dataframe.io.asUrl
1010
import java.net.URL
1111

12-
fun GeoDataFrame.Companion.readGeoJson(path: String): GeoDataFrame<*> = readGeoJson(asURL(path))
12+
fun GeoDataFrame.Companion.readGeoJson(path: String): GeoDataFrame<*> = readGeoJson(asUrl(path))
1313

1414
fun GeoDataFrame.Companion.readGeoJson(url: URL): GeoDataFrame<*> =
1515
url.openStream().use { inputStream ->
@@ -21,7 +21,7 @@ fun DataFrame.Companion.readGeoJson(path: String): GeoDataFrame<*> = GeoDataFram
2121

2222
fun DataFrame.Companion.readGeoJson(url: URL): GeoDataFrame<*> = GeoDataFrame.readGeoJson(url)
2323

24-
fun GeoDataFrame.Companion.readShapefile(path: String): GeoDataFrame<*> = readShapefile(asURL(path))
24+
fun GeoDataFrame.Companion.readShapefile(path: String): GeoDataFrame<*> = readShapefile(asUrl(path))
2525

2626
fun GeoDataFrame.Companion.readShapefile(url: URL): GeoDataFrame<*> {
2727
val dataStore = ShapefileDataStoreFactory().createDataStore(url)

0 commit comments

Comments
 (0)