Fix #21: svg.line svg.area radial, angel and radius functions added

Author: spaced

src/main/scala/org/singlespaced/d3js/svg.scala

@@ -9,9 +9,9 @@ trait SvgObject extends js.Object {
 
   import svg._
 
-  def line[T](): Line[T] = js.native
+  val line: Line[Any] = js.native
 
-  def area[T](): Area[T] = js.native
+  val area: Area[Any] = js.native
 
   def arc[T](): Arc[T] = js.native
 
@@ -43,6 +43,8 @@ package svg {
 @js.native
 trait Line[T] extends js.Function1[js.Array[T],String] {
 
+  def apply[T]():Line[T] = js.native
+
   def x(): Double | js.Function2[T, Int, Double] = js.native
 
   def x(x: Double): Line[T] = js.native
@@ -66,6 +68,21 @@ trait Line[T] extends js.Function1[js.Array[T],String] {
   def defined(): js.Function2[T, Double, Boolean] = js.native
 
   def defined(defined: js.Function2[T, Int, Boolean]): Line[T] = js.native
+
+  def radial(): Line[T] = js.native
+
+  def radius(): js.Function2[T, Double, Double] = js.native
+
+  def radius(radius: Double): Line[T] = js.native
+
+  def radius(radius: js.Function2[T, Double, Double]): Line[T] = js.native
+
+  def angle(): js.Function2[T, Double, Double] = js.native
+
+  def angle(angle: Double): Line[T] = js.native
+
+  def angle(angle: js.Function2[T, Double, Double]): Line[T] = js.native
+
 }
 
 @js.native
@@ -172,6 +189,8 @@ trait Brush[T] extends js.Function1[Selection[T] | Transition[T], Unit] {
 @js.native
 trait Area[T] extends js.Function1[js.Array[T],String] {
 
+  def apply[T]():Area[T] = js.native
+
   def x(): Double | js.Function2[T, Int, Double] = js.native
 
   def x(x: Double): Area[T] = js.native
@@ -208,6 +227,8 @@ trait Area[T] extends js.Function1[js.Array[T],String] {
 
   def y1(y1: js.Function2[T, Int, Double]): Area[T] = js.native
 
+  def radial(): Line[T] = js.native
+
   def interpolate(): String | js.Function1[js.Array[js.Tuple2[Double, Double]], String] = js.native
 
   def interpolate(interpolate: String | js.Function1[js.Array[js.Tuple2[Double, Double]], String]): Area[T] = js.native

src/test/scala/org/singlespaced/d3js/SvgAreaTest.scala

@@ -0,0 +1,42 @@
+package org.singlespaced.d3js
+
+import org.scalajs.dom
+import org.singlespaced.d3js.Ops._
+import utest._
+
+import scala.scalajs.js
+
+
+object SvgAreaTest extends TestSuite {
+
+
+  val elem=dom.document.createElement("svg")
+  dom.document.body.appendChild(elem)
+
+
+  val tests = TestSuite {
+    'd3_area_xy {
+      //arrange
+      case class TestDatum(v:Int)
+      val data=js.Array[TestDatum](TestDatum(1),TestDatum(4))
+      val testee = d3.svg.area[TestDatum]()
+      //act
+      val result=testee
+        .x((d:TestDatum,i:Int) =>  d.v.toDouble )
+        .y((d:TestDatum,i:Int) =>  d.v.toDouble )
+      //assert
+      d3.select(elem).data(data)
+        .append("path")
+        .attr("d", result(data))
+
+      val actual=dom.document.getElementsByTagName("path")
+      assert( actual.length == 1)
+      assert( actual.item(0).asInstanceOf[dom.Element].getAttribute("d") =="M1,1L4,4L4,4L1,1Z")
+    }
+    'd3_area_radial {
+      val area = d3.svg.area.radial().interpolate("basis").tension(0).radius(100)
+    }
+
+  }
+}
+

src/test/scala/org/singlespaced/d3js/SvgLineTest.scala

@@ -6,6 +6,8 @@ import utest._
 import scala.scalajs.js
 import org.singlespaced.d3js.Ops._
 
+
+
 object SvgLineTest extends TestSuite {
 
 
@@ -18,7 +20,7 @@ object SvgLineTest extends TestSuite {
       //arrange
       case class TestDatum(v:Int)
       val data=js.Array[TestDatum](TestDatum(1),TestDatum(4))
-      val testee = d3.svg.line[TestDatum]
+      val testee = d3.svg.line[TestDatum]()
       //act
       val result=testee
         .x((d:TestDatum,i:Int) =>  d.v.toDouble )
@@ -36,13 +38,15 @@ object SvgLineTest extends TestSuite {
       //arrange
       case class TestDatum(v:Int)
       val data=js.Array[TestDatum](TestDatum(1),TestDatum(4))
-      val testee = d3.svg.line[TestDatum]
+      val testee = d3.svg.line[TestDatum]()
       //act
       val result=testee
         .x((d:TestDatum) =>  d.v.toDouble )
         .y((d:TestDatum) =>  d.v.toDouble )
     }
-
+    'd3_line_radial_issue_21 {
+      val line = d3.svg.line.radial().interpolate("basis").tension(0).radius(100)
+    }
 
   }
 }