A little bit more strict check when precision is above 0

Pascal MALAISE · Pascal MALAISE · commit ed1a10d8f1cb · 2018-05-07T07:20:57.000+02:00
Add MMR in test scenario
Update years of copyright
diff --git a/NOTICE b/NOTICE
@@ -6,4 +6,4 @@ Original C library created by Pieter Geelen. Work on Java version
 of the Mapcode library by Rijn Buve (original port by Matthew Lowden).
 Port into Ada by Pascal Malaise.
 
-Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Release](https://img.shields.io/github/release/mapcode-foundation/mapcode-ada.svg?maxAge=3600)](https://github.com/mapcode-foundation/mapcode-ada/releases)
 
 
-**Copyright (C) 2014-2017 Stichting Mapcode Foundation (http://www.mapcode.com)**
+**Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)**
 
 ----
 
@@ -302,6 +302,12 @@ Decode a mapcode with context.
 
 # Version History
 
+### 1.0.4
+
+* A little bit more strict check when precision is above 0
+* Add MMR in test scenario
+* Update years of copyright
+
 ### 1.0.3
 
 * Fix and improve accuracy
diff --git a/src/as_u.adb b/src/as_u.adb
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/src/as_u.ads b/src/as_u.ads
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/src/bits.adb b/src/bits.adb
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/src/bits.ads b/src/bits.ads
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/src/ctrynams.ads b/src/ctrynams.ads
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/src/ctrynams_short.ads b/src/ctrynams_short.ads
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/src/mapcodes.adb b/src/mapcodes.adb
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/src/mapcodes.ads b/src/mapcodes.ads
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ package Mapcodes is
 
   Mapcode_C_Version : constant String := "2.0.2";
   Mapcode_Data_Version : constant String := "2.3.0";
-  Mapcode_Ada_Version  : constant String := "1.0.3/Data"
+  Mapcode_Ada_Version  : constant String := "1.0.4/Data"
                                           & Mapcode_Data_Version;
 
   -- Real type
diff --git a/src/ndata.ads b/src/ndata.ads
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/src/str_tools.adb b/src/str_tools.adb
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/src/str_tools.ads b/src/str_tools.ads
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/src/t_mapcode.adb b/src/t_mapcode.adb
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+-- Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 -- 
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/test/DecodeFailures.txt b/test/DecodeFailures.txt
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+# Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/DecodeOk.txt b/test/DecodeOk.txt
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+# Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/EncodeOk.txt b/test/EncodeOk.txt
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+# Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/Scenario.txt b/test/Scenario.txt
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+# Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@
 -d S93HM.RVB8 => 40.786251000 -73.961418000
 -c 40.786251000 -73.961418000 AAA => S93HM.RVB8 AAA S93HM.RVB8 532
 
-#:VIC (AU)
+# VIC (AU)
 -d KJ.HX5 VIC => -37.827455000 145.045353500
 -c -37.827455000 145.045353500 VIC => KJ.HX5 AU-VIC 'AU-VIC KJ.HX5' 313
 -d PMJG.HQJF AUS => -37.827432000 145.045375500
@@ -116,7 +116,7 @@
 -d QD3CL.PX8J => 29.802516000 -39.364007500
 -c 29.802516000 -39.364007500 => QD3CL.PX8J AAA QD3CL.PX8J 532
 
-#:Anchorage (US-AK)
+# Anchorage (US-AK)
 -d 27.L1H AK => 61.173945000 -149.981249250
 -c 61.173945000 -149.981249250 AK => 27.L1H US-AK 'US-AK 27.L1H' 393
 -d 9F24.FXKQ USA => 61.173985500 -149.981291000
@@ -132,7 +132,7 @@
 -d WNQMZ.JSX3 => 56.862363000 60.710366000
 -c 56.862363000 60.710366000 AAA => WNQMZ.JSX3 AAA WNQMZ.JSX3 532
 
-#:ARG (Acuncagua)
+# ARG - Acuncagua
 -d WL0.TDT CHL => -32.653214500 -70.010874000
 -c -32.653214500 -70.010874000 CHL => WL0.TDT CHL 'CHL WL0.TDT' 209
 -d M61.HQJF ARG => -32.653250000 -70.010842000
@@ -142,6 +142,10 @@
 -d 79GMS.VQDX => -32.653233000 -70.010853500
 -c -32.653233000 -70.010853500 AAA => 79GMS.VQDX AAA 79GMS.VQDX 532
 
+# MMR
+-d 9Z3R.YKP MMR => 26.904910500 95.138544000
+-c 26.904910500 95.138544000 MMR => 9Z3R.YKP MMR 'MMR 9Z3R.YKP' 207
+
 # Extremes
 -d HHHHC.X0KG => -0.000002000 0.000003000
 -c 0.000000000 0.000000000 => HHHHC.X0KG AAA HHHHC.X0KG 532
diff --git a/test/TerritoryFailures.txt b/test/TerritoryFailures.txt
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+# Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/fulltest b/test/fulltest
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+# Copyright (C) 2003-2018 Stichting Mapcode Foundation (http://www.mapcode.com)
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@
 
 # Precision, in fraction of dregree, depending of encoding precision
 EPSILON[0]="2.5E-4"
-EPSILON[1]="7.5E-5"
-EPSILON[2]="5.0E-5"
+EPSILON[1]="5.0E-5"
+EPSILON[2]="7.5E-6"
 
 # Defaults
 export DEBUG=""
-export PRECISION=1
+export PRECISION=2
 
 function usage {
   echo "Usage: `basename $0` [ -p | --precision <precision> ] [ -d | --debug ]"
@@ -51,7 +51,7 @@ while [ -n "$1" ] ; do
       shift
     ;;
     (*)
-      usage
+      error "Invalid arguments"
     ;;
   esac
   shift
