Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Curve on livemap #1021

Merged
merged 6 commits into from
Feb 20, 2024
Merged

Curve on livemap #1021

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10197ff
Curve on livemap.
OLarionova-HORIS Feb 15, 2024
63b64d8
Update test notebooks.
OLarionova-HORIS Feb 15, 2024
6b780ac
Cancel irrelevant changes (optimize imports).
OLarionova-HORIS Feb 15, 2024
3635fe0
Move the curve drawing curve by control points to Context2d.
OLarionova-HORIS Feb 16, 2024
092b146
Fix after rebase.
OLarionova-HORIS Feb 19, 2024
0216160
Rename the curve drawing function.
OLarionova-HORIS Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cancel irrelevant changes (optimize imports).
  • Loading branch information
@OLarionova-HORIS
OLarionova-HORIS committed Feb 19, 2024
commit 6b780acbb622cb00c38c6b648173a6c243eb98c2
11 changes: 6 additions & 5 deletions livemap/src/commonMain/kotlin/org/jetbrains/letsPlot/livemap/config/MapProjectionBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ import org.jetbrains.letsPlot.livemap.WorldRectangle
import org.jetbrains.letsPlot.livemap.core.*
import org.jetbrains.letsPlot.livemap.core.Transforms
import org.jetbrains.letsPlot.livemap.mapengine.MapProjection
import org.jetbrains.letsPlot.commons.intern.typedGeometry.*
import kotlin.math.min

internal class MapProjectionBuilder(
private val geoProjection: GeoProjection,
private val mapRect: WorldRectangle
private val mapRect: org.jetbrains.letsPlot.livemap.WorldRectangle
) {
var reverseX = false
var reverseY = false
Expand Down Expand Up @@ -79,18 +80,18 @@ internal class MapProjectionBuilder(
val scaleY = if (reverseY) -scale else scale

val linearProjection =
Transforms.tuple<Geographic, World>(
Transforms.tuple<Geographic, org.jetbrains.letsPlot.livemap.World>(
linear(offsetX, scaleX),
linear(offsetY, scaleY)
)

val proj = composite(geoProjection, linearProjection)

return object : MapProjection {
override fun apply(v: LonLatPoint): WorldPoint? = proj.apply(v)
override fun invert(v: WorldPoint): LonLatPoint? = proj.invert(v)
override fun apply(v: LonLatPoint): org.jetbrains.letsPlot.livemap.WorldPoint? = proj.apply(v)
override fun invert(v: org.jetbrains.letsPlot.livemap.WorldPoint): LonLatPoint? = proj.invert(v)

override val mapRect: WorldRectangle
override val mapRect: org.jetbrains.letsPlot.livemap.WorldRectangle
get() = [email protected]
}
}
Expand Down