Skip to content

Fix price decoding 4 VDV tickets and add some more fields 4 primary d… #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
user4223 merged 1 commit into from
Jun 20, 2026
Merged

Fix price decoding 4 VDV tickets and add some more fields 4 primary d… #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[project]
name = "ticket-decoder"
version = "v0.20.0"
version = "v0.20.1"
description = "Train ticket barcode to json decoding library, using zxing-cpp decoding in combination with record interpreter, to transform content into json structure"
license = "GPL-3.0-or-later"
authors = [ { name = "user4223" } ]
Expand Down
28 changes: 24 additions & 4 deletions source/lib/interpreter/detail/vdv/source/VDVInterpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,21 @@

#include "lib/infrastructure/include/Logging.h"

#include <type_traits>
#include <optional>

namespace interpreter::detail::vdv
{
using namespace common;

template <typename T>
constexpr std::optional<T> hideZero(T value)
{
static_assert(std::is_integral_v<T>, "Integral types are supported only");

return value != 0 ? std::make_optional(value) : std::nullopt;
}

/* This is actually not a fixed ident. 0x9e is a BER-TLV tag (signature) and 0x81+0x80 a length (128 bytes).
But it should be sufficient for now to identify VDV tickets.
*/
Expand All @@ -34,10 +45,19 @@ namespace interpreter::detail::vdv
static void decodePrimaryData(std::span<std::uint8_t const> bytes, utility::JsonBuilder &jsonResult)
{
auto context = Context(bytes);
context.ignoreBytes(7); // TODO This heading block is not always 7 bytes, i guess, so find out what structure is used for EFS here
auto const price = NumberDecoder::consumeUInteger4(context);
jsonResult
.add("price", price);
.add("paymentType", hideZero(NumberDecoder::consumeUInteger1(context)))
.add("passengerType", hideZero(NumberDecoder::consumeUInteger1(context)))
.add("includedItem1Type", hideZero(NumberDecoder::consumeUInteger1(context)))
.add("includedItem1Count", hideZero(NumberDecoder::consumeUInteger1(context)))
.add("includedItem2Type", hideZero(NumberDecoder::consumeUInteger1(context)))
.add("includedItem2Count", hideZero(NumberDecoder::consumeUInteger1(context)))
.add("transportCategory", hideZero(NumberDecoder::consumeUInteger1(context)))
.add("serviceClass", hideZero(NumberDecoder::consumeUInteger1(context)))
.add("price", hideZero(NumberDecoder::consumeUInteger3(context)))
.add("vatRate", hideZero(BCDDecoder::consumePackedInteger2(context) / 100))
.add("priceLevel", hideZero(NumberDecoder::consumeUInteger1(context)))
.add("internalProductNumber", hideZero(NumberDecoder::consumeUInteger3(context)));
}

static void decodePassengerData(std::span<std::uint8_t const> bytes, utility::JsonBuilder &jsonResult)
Expand All @@ -47,7 +67,7 @@ namespace interpreter::detail::vdv
auto const dateOfBirth = DateTimeDecoder::consumeBCDDate4(context);
auto const name = StringDecoder::decodeLatin1(context.consumeRemainingBytes());
jsonResult
.add("gender", gender)
.add("gender", hideZero(gender))
.add("name", name)
.add("dateOfBirth", dateOfBirth);
}
Expand Down
Loading