Updated to lib 2.2.2

Author: rijnb

build.sbt

@@ -10,7 +10,7 @@ scalacOptions ++= Seq("-feature")
 resolvers += Resolver.mavenLocal
 
 libraryDependencies ++= Seq(
-  "com.mapcode" % "mapcode" % "2.0.2" withSources(),
+  "com.mapcode" % "mapcode" % "2.2.2" withSources(),
   "com.google.code.findbugs" % "jsr305" % "1.3.+",
   "org.slf4j" % "slf4j-api" % "1.7.2" % "test",
   "org.slf4j" % "slf4j-log4j12" % "1.7.2" % "test",

src/main/scala/com/mapcode/scala/Mapcode.scala

@@ -165,10 +165,10 @@ object Mapcode {
    * check if the mapcode is really a valid mapcode representing a position on Earth.
    *
    * @param mapcode Mapcode (optionally with a territory).
-   * @return Type of mapcode code format.
+   * @return Type of mapcode precision format (0-8).
    * @throws UnknownPrecisionFormatException If precision format is incorrect.
    */
-  def precisionFormat(mapcode: String): PrecisionFormat =
+  def precisionFormat(mapcode: String): Integer =
     JMapcode.getPrecisionFormat(mapcode)
 
   /**
@@ -230,29 +230,5 @@ object Mapcode {
 
   implicit def toJava(mapcode: Mapcode): JMapcode =
     mapcode.delegate
-
-  /**
-   * This enum describes the types of available mapcodes (as returned by [[com.mapcode.scala.Mapcode#precisionFormat(String)]].
-   */
-  case class PrecisionFormat(delegate: JMapcode.PrecisionFormat) {
-
-    override def toString: String =
-      delegate.toString
-  }
-
-  object PrecisionFormat {
-    val PRECISION_0 = PrecisionFormat(JMapcode.PrecisionFormat.PRECISION_0)
-    val PRECISION_1 = PrecisionFormat(JMapcode.PrecisionFormat.PRECISION_1)
-    val PRECISION_2 = PrecisionFormat(JMapcode.PrecisionFormat.PRECISION_2)
-
-    def values: Seq[PrecisionFormat] =
-      JMapcode.PrecisionFormat.values.map(PrecisionFormat(_))
-
-    implicit def fromJava(format: JMapcode.PrecisionFormat): PrecisionFormat =
-      PrecisionFormat(format)
-
-    implicit def toJava(format: PrecisionFormat): JMapcode.PrecisionFormat =
-      format.delegate
-  }
 }
 

src/test/scala/com/mapcode/scala/DecoderTest.scala

@@ -15,15 +15,15 @@
  */
 package com.mapcode.scala
 
-import com.mapcode.UnknownMapcodeException
+import com.mapcode.{UnknownPrecisionFormatException, UnknownMapcodeException}
 import org.scalatest.prop.GeneratorDrivenPropertyChecks
 import org.scalatest.{FunSuite, Matchers}
 
 class DecoderTest extends FunSuite with Matchers with GeneratorDrivenPropertyChecks {
 
   test("decodeMapcodeWithTerritory") {
     val point = MapcodeCodec.decode("49.4V", Territory.NLD)
-    52.376514 shouldBe point.latDeg
+    52.376514 shouldBe (point.latDeg +- 0.000001)
     4.908542 shouldBe (point.lonDeg +- 0.00001)
   }
 
@@ -58,7 +58,7 @@ class DecoderTest extends FunSuite with Matchers with GeneratorDrivenPropertyChe
   }
 
   test("invalidMapcode1") {
-    an[UnknownMapcodeException] should be thrownBy MapcodeCodec.decode("494.V494V", Territory.NLD)
+    an[UnknownPrecisionFormatException] should be thrownBy MapcodeCodec.decode("494.V494V", Territory.NLD)
   }
 
   test("invalidHighPrecisionCharacter") {

src/test/scala/com/mapcode/scala/MapcodeTest.scala

@@ -28,16 +28,23 @@ class MapcodeTest extends FunSuite with Matchers {
     Mapcode.isValidMapcodeFormat("AAAA.BBB") shouldBe true
     Mapcode.isValidMapcodeFormat("AAAA.BBBB") shouldBe true
     Mapcode.isValidMapcodeFormat("AAAAA.BBBB") shouldBe true
-    Mapcode.isValidMapcodeFormat("AAAAA.BBBBB") shouldBe true
     Mapcode.isValidMapcodeFormat("AA.AA-0") shouldBe true
     Mapcode.isValidMapcodeFormat("AA.AA-01") shouldBe true
     Mapcode.isValidMapcodeFormat("AA.AA-A") shouldBe true
     Mapcode.isValidMapcodeFormat("AA.AA-AA") shouldBe true
     Mapcode.isValidMapcodeFormat("AA.AA-Y") shouldBe true
     Mapcode.isValidMapcodeFormat("AA.AA-1Y") shouldBe true
+    Mapcode.isValidMapcodeFormat("AA.AA-012") shouldBe true
+    Mapcode.isValidMapcodeFormat("AA.AA-0123") shouldBe true
+    Mapcode.isValidMapcodeFormat("AA.AA-01234") shouldBe true
+    Mapcode.isValidMapcodeFormat("AA.AA-012345") shouldBe true
+    Mapcode.isValidMapcodeFormat("AA.AA-0123456") shouldBe true
+    Mapcode.isValidMapcodeFormat("AA.AA-01234567") shouldBe true
   }
 
   test("checkInvalidMapcodeFormats") {
+    Mapcode.isValidMapcodeFormat("AA.AA-012345678") shouldBe false
+    Mapcode.isValidMapcodeFormat("AA.AA-0123456789") shouldBe false
     Mapcode.isValidMapcodeFormat("A") shouldBe false
     Mapcode.isValidMapcodeFormat("AB") shouldBe false
     Mapcode.isValidMapcodeFormat("AB.") shouldBe false
@@ -56,7 +63,6 @@ class MapcodeTest extends FunSuite with Matchers {
     Mapcode.isValidMapcodeFormat("00.01-") shouldBe false
     Mapcode.isValidMapcodeFormat("AAAAAA.BBBBB") shouldBe false
     Mapcode.isValidMapcodeFormat("AAAAA.BBBBBB") shouldBe false
-    Mapcode.isValidMapcodeFormat("AA.AA-012") shouldBe false
     Mapcode.isValidMapcodeFormat("AA.AA-Z") shouldBe false
     Mapcode.isValidMapcodeFormat("AA.AA-1Z") shouldBe false
     Mapcode.isValidMapcodeFormat("A.AAA") shouldBe false
@@ -69,9 +75,15 @@ class MapcodeTest extends FunSuite with Matchers {
 
   test("checkMapcodeFormatType") {
 
-    Mapcode.precisionFormat("AA.BB") should be(Mapcode.PrecisionFormat.PRECISION_0)
-    Mapcode.precisionFormat("AA.BB-1") should be(Mapcode.PrecisionFormat.PRECISION_1)
-    Mapcode.precisionFormat("AA.BB-12") should be(Mapcode.PrecisionFormat.PRECISION_2)
+    Mapcode.precisionFormat("AA.BB") should be(0)
+    Mapcode.precisionFormat("AA.BB-1") should be(1)
+    Mapcode.precisionFormat("AA.BB-12") should be(2)
+    Mapcode.precisionFormat("AA.BB-123") should be(3)
+    Mapcode.precisionFormat("AA.BB-1234") should be(4)
+    Mapcode.precisionFormat("AA.BB-12345") should be(5)
+    Mapcode.precisionFormat("AA.BB-123456") should be(6)
+    Mapcode.precisionFormat("AA.BB-1234567") should be(7)
+    Mapcode.precisionFormat("AA.BB-12345678") should be(8)
   }
 
   test("invalid map code") {