From ecdc5505218d71ba365ff729f11a1b504a71c986 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Tue, 23 Nov 2021 09:59:31 +0100
Subject: added fcb version 3 data type to the DOSIPAS encoding and decoding

---
 src/main/java/org/uic/barcode/Encoder.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org/uic/barcode/Encoder.java')

diff --git a/src/main/java/org/uic/barcode/Encoder.java b/src/main/java/org/uic/barcode/Encoder.java
index e906881..9463548 100644
--- a/src/main/java/org/uic/barcode/Encoder.java
+++ b/src/main/java/org/uic/barcode/Encoder.java
@@ -100,7 +100,13 @@ public class Encoder {
 				DataType ticketData = new DataType();
 				
 				UicRailTicketCoder uicTicketCoder = new UicRailTicketCoder();
-				ticketData.setFormat(Constants.DATA_TYPE_FCB_VERSION_1);
+				if (fcbVersion == 1) {
+					ticketData.setFormat(Constants.DATA_TYPE_FCB_VERSION_1);
+				} else if (fcbVersion == 2) {
+					ticketData.setFormat(Constants.DATA_TYPE_FCB_VERSION_2);
+				} else if (fcbVersion == 3) {
+					ticketData.setFormat(Constants.DATA_TYPE_FCB_VERSION_3);
+				}
 				ticketData.setData(new OctetString(uicTicketCoder.encode(ticket, fcbVersion)));
 				dynamicFrame.getLevel2SignedData().getLevel1Data().getData().add(ticketData);
 				
-- 
cgit v1.2.3


From cd76118fb6737eb241cab60207262617e12d237d Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Tue, 23 Nov 2021 11:16:40 +0100
Subject: test added

---
 src/main/java/org/uic/barcode/Encoder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/org/uic/barcode/Encoder.java')

diff --git a/src/main/java/org/uic/barcode/Encoder.java b/src/main/java/org/uic/barcode/Encoder.java
index 9463548..f0f8d14 100644
--- a/src/main/java/org/uic/barcode/Encoder.java
+++ b/src/main/java/org/uic/barcode/Encoder.java
@@ -100,7 +100,7 @@ public class Encoder {
 				DataType ticketData = new DataType();
 				
 				UicRailTicketCoder uicTicketCoder = new UicRailTicketCoder();
-				if (fcbVersion == 1) {
+				if (fcbVersion == 1 || fcbVersion == 13) {
 					ticketData.setFormat(Constants.DATA_TYPE_FCB_VERSION_1);
 				} else if (fcbVersion == 2) {
 					ticketData.setFormat(Constants.DATA_TYPE_FCB_VERSION_2);
-- 
cgit v1.2.3