改用距离做速心比X轴 (#14)

* Clean code.

* Bump mill.

* Distance Xaxis.

* Clean code.

* Improve tick format.

.mill-version

@@ -1 +1 @@
-0.11.10
+0.11.12

build.sc

@@ -13,7 +13,7 @@ object root extends RootModule with ScalaJSModule with ScalablyTyped {
   }
 
   override def scalacOptions: Target[Seq[String]] = T {
-    super.scalacOptions() ++ Seq("-Wunused:all")
+    super.scalacOptions() ++ Seq("-Wunused:all", "-feature")
   }
 
   object test extends ScalaJSTests {

src/garmin/Activities.scala

@@ -42,5 +42,4 @@ object Activities:
   private val `a.inline-edit-target`   = implicitly[Name].value |> Selector[Seq]
   private val `div.advanced-filtering` = implicitly[Name].value |> Selector[Id]
 
-  extension [A](a: A) inline def |>[B](f: A => B): B = f(a)
 end Activities

src/garmin/Profile.scala

@@ -40,5 +40,4 @@ object Profile:
   private val `div[class^="PageContent"]`  = implicitly[Name].value |> Selector[Id]
   private val `i[class^="icon-activity-"]` = implicitly[Name].value |> Selector[Id]
 
-  extension [A](a: A) inline def |>[B](f: A => B): B = f(a)
 end Profile

src/garmin/package.scala

@@ -19,3 +19,5 @@ private[garmin] val Attribute = LiteralExtract[Element, String]: key =>
 
 private[garmin] class LiteralExtract[A, B](f: String => A => Option[B]) extends (String => PartialFunction[A, B]):
   def apply(s: String) = f(s).unlift
+
+extension [A](a: A) private[garmin] inline def |>[B](f: A => B): B = f(a)

src/plotly/DataArrayFrom.scala

@@ -20,13 +20,18 @@ trait DataArrayFrom[A] extends (A => js.Array[Data]):
 object DataArrayFrom:
 
   given intervals(using Performance[Interval]): DataArrayFrom[Intervals] = v =>
+    val distances = 
+      val (_, r) = v.foldLeft(0.0 -> List.empty[Meter]):
+        case ((a, t), i) => (i.distance + a) -> (i.distance + a :: t)
+      r.map(_.round).reverse
+
     def scatterLine[A <: Double](name: String, fy: Interval => A) =
       Data
         .PartialPlotDataAutobinx()
         .setName(name)
         .setLine(PartialScatterLine().setWidth(1))
         .setY(v.map(fy).toJSArray)
-        .setX(v.indices.map(_ + 1.0).toJSArray)
+        .setX(distances.toJSArray)
         .setHoverinfo(yPlussignname)
 
     js.Array(

src/plotly/Layout.scala

@@ -12,6 +12,7 @@ import typings.plotlyJs.plotlyJsStrings.right
 import typings.plotlyJs.plotlyJsStrings.y2
 
 import core.metrics.*
+import typings.plotlyJs.plotlyJsStrings.array
 
 trait Layout[A] extends (A => PartialLayout):
   extension (a: A) inline def layout = this(a)
@@ -44,7 +45,7 @@ object Layout:
       .setShowlegend(true)
       .setColorPalette
       .setLegend(inside)
-      .setXaxis(PartialLayoutAxis().setDtick(1.0).setTitle("圈数"))
+      .setXaxis(PartialLayoutAxis().setTickformat("~s").setTicksuffix("m").setTickmode(array))
       .setYaxis(yAxis)
       .setYaxis2(yAxis2)
   end intervals

src/plotly/Listen.scala

@@ -1,5 +1,6 @@
 package plotly
 
+import scala.language.implicitConversions
 import scala.scalajs.js
 import scala.scalajs.js.JSConverters.*
 
@@ -8,6 +9,7 @@ import org.scalajs.dom.HTMLElement
 import typings.plotlyJs.anon.PartialLayout
 import typings.plotlyJs.anon.PartialLayoutAxis
 import typings.plotlyJs.anon.PartialPlotDataAutobinx
+import typings.plotlyJs.anon.PartialScatterLine
 import typings.plotlyJs.mod.LegendClickEvent
 import typings.plotlyJs.mod.PlotlyHTMLElement
 import typings.plotlyJs.mod.PlotMouseEvent
@@ -20,7 +22,6 @@ import typings.plotlyJsDistMin.mod.relayout
 import typings.plotlyJsDistMin.mod.restyle
 
 import core.metrics.*
-import typings.plotlyJs.anon.PartialScatterLine
 
 type Context[A] = (A, PlotlyHTMLElement)
 trait Listen[A, B] extends (Context[A] => Unit)