library/include/mobilisis/configuration.h

@@ -83,7 +83,6 @@ public:
     TariffOutOfServiceType TariffOutOfServices;
     ATBTariffPrepaidType TariffPrepaids;
     ATBTariffCarryOverType TariffCarryOvers;
-    QStringList TariffIncludes;
 
 	/// <summary>
 	/// Parse JSON string
@@ -124,9 +123,6 @@ public:
     std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
     std::optional<QVector<ATBWeekDaysWorktime>> getAllWeekDayWorkTimes();
 
-    QStringList const &getTariffIncludes() const { return TariffIncludes; }
-    QStringList &getTariffIncludes() { return TariffIncludes; }
-
     std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
     int getPaymentOptionIndex(PERMIT_TYPE permitType);
     int getPaymentOptionIndex(PERMIT_TYPE permitType) const;

library/include/mobilisis/member_type.h

@@ -22,8 +22,7 @@ enum MemberType
     ProductType = 0x0F,
     InterpolationType = 0x10,
     PrepaidType = 0x11,
-    CarryOverType = 0x12,
+    CarryOverType = 0x12
-    IncludesType = 0x13
 };
 
 #endif // MEMBER_TYPE_H_INCLUDED

library/include/mobilisis/tariff_permit_type.h

@@ -19,9 +19,7 @@ enum class PERMIT_TYPE : quint8 {
     SHORT_TERM_PARKING_CAMPER=12,
     DAY_TICKET_PKW=13,
     DAY_TICKET_BUS=14,
-    DAY_TICKET_CAMPER=15,
+    DAY_TICKET_CAMPER=15
-    FREE_TICKET=16,
-    PRODUCT_MAX
 };
 
 struct PermitType {
@@ -75,9 +73,6 @@ struct PermitType {
         case 15:
             m_permitType = PERMIT_TYPE::DAY_TICKET_CAMPER;
             break;
-        case 16:
-            m_permitType = PERMIT_TYPE::FREE_TICKET;
-            break;
         default:
             m_permitType = PERMIT_TYPE::INVALID;
         }
@@ -121,8 +116,6 @@ struct PermitType {
             return 14;
         case PERMIT_TYPE::DAY_TICKET_CAMPER:
             return 15;
-        case PERMIT_TYPE::FREE_TICKET:
-            return 16;
         default:
             break;
         }
@@ -139,6 +132,9 @@ struct PermitType {
         if (permitTypeStr == "DAY_TICKET_CHILD") {
             return PERMIT_TYPE::DAY_TICKET_CHILD;
         } else
+        if (permitTypeStr == "DAY_TICKET_ADULT") {
+            return PERMIT_TYPE::DAY_TICKET_ADULT;
+        } else
         if (permitTypeStr == "DAY_TICKET_TEEN") {
             return PERMIT_TYPE::DAY_TICKET_TEEN;
         } else
@@ -174,9 +170,6 @@ struct PermitType {
         } else
         if (permitTypeStr == "DAY_TICKET_CAMPER") {
             return PERMIT_TYPE::DAY_TICKET_CAMPER;
-        } else
-        if (permitTypeStr == "FREE_TICKET") {
-            return PERMIT_TYPE::FREE_TICKET;
         }
 
         return PERMIT_TYPE::INVALID;
@@ -214,8 +207,6 @@ struct PermitType {
             return QString("DAY_TICKET_BUS");
         case PERMIT_TYPE::DAY_TICKET_CAMPER:
             return QString("DAY_TICKET_CAMPER");
-        case PERMIT_TYPE::FREE_TICKET:
-            return QString("FREE_TICKET");
         default:
             break;
         }
@@ -254,8 +245,6 @@ struct PermitType {
             return QString("DAY_TICKET_BUS");
         case PERMIT_TYPE::DAY_TICKET_CAMPER:
             return QString("DAY_TICKET_CAMPER");
-        case PERMIT_TYPE::FREE_TICKET:
-            return QString("FREE_TICKET");
         default:
             break;
         }

library/src/calculate_price.cpp

@@ -5,15 +5,12 @@
 #include "utilities.h"
 #include "tariff_global_defines.h"
 #include "period_year.h"
-#include "tariff_permit_type.h"
 
 #include <QFile>
 #include <QFileInfo>
 #include <QDateTime>
 #include <QDebug>
 #include <QList>
-#include <map>
-#include <memory>
 
 QString const CalcState::SUCCESS = "SUCCESS";
 QString const CalcState::ERROR_PARSING_ZONE_NR = "ERROR_PARSING_ZONE_NR";
@@ -31,9 +28,6 @@ QString const CalcState::OVERPAID = "OVERPAID";
 QString const CalcState::OUTSIDE_ALLOWED_PARKING_TIME = "OUTSIDE_ALLOWED_PARKING_TIME";
 QString const CalcState::SUCCESS_MAXPRICE = "SUCCESS_MAXPRICE";
 
-
-static std::map<PERMIT_TYPE, std::unique_ptr<parking_tariff_t>> tariffs;
-
 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
     return Calculator::GetInstance().GetTimeSteps(cfg);
 }
@@ -470,31 +464,6 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
 
     qCritical() << "init_tariff: Parsing tariff config (" << confFile << ")";
 
-    if ((*tariff)->TariffIncludes.size() > 0) {
-        qCritical() << "init_tariff: TariffIncludes" << (*tariff)->TariffIncludes;
-        for (int i = 0 ; i < (*tariff)->TariffIncludes.size(); ++i) {
-            QFile f(QString("/etc/psa_tariff/%1").arg((*tariff)->TariffIncludes.at(i)));
-            if (f.exists() &&
-                f.open(QIODevice::ReadOnly | QIODevice::Text)) {
-
-                QString json = f.readAll();
-                std::unique_ptr<parking_tariff_t> t = std::make_unique<parking_tariff_t>();
-
-                if (! t->ParseJson(t.get(), json.toStdString().c_str())) {
-                    qCritical() << "      ... error parsing tariff in" << f.fileName();
-                    qCritical() << "      ... json" << json;
-                } else {
-                    PERMIT_TYPE pt = static_cast<PERMIT_TYPE>(t->getPaymentOptions().pop_product_id);
-                    if (tariffs.count(pt) == 0) {
-                        const auto [it, success] = tariffs.insert(std::make_pair(pt, std::move(t)));
-                        qCritical() << "      ... insertion" << success;
-                        qCritical() << "      ... insertion" << (int)it->first << it->second->getPaymentOptions().pop_product_name;
-                        qCritical() << "      ... insertion" << tariffs[pt]->getPaymentOptions().pop_product_name;
-                    }
-                }
-            }
-        }
-    }
     return calcState;
 }
 
@@ -1135,10 +1104,6 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         QDateTime &ticketEndTime,
         PermitType permitType)
 {
-    if (tariffs.count(permitType) > 0) {
-        tariff = tariffs[permitType].get();
-    }
-
     tariff->getPaymentOptions(0).pop_max_price
         = tariff->getPaymentOptions(0).pop_max_price_save;
 
@@ -1146,15 +1111,8 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 
     bool prepaid = true;
 
-    qCritical() << __func__ << ":" << __LINE__ << "   permit type (int): " << static_cast<int>(permitType);
-    qCritical() << __func__ << ":" << __LINE__ << "permit type (string): " << permitType.toString();
-    qCritical() << __func__ << ":" << __LINE__ << "     tariff-includes: " << tariff->getTariffIncludes();
-
     int paymentOptionIndex = getPaymentOptionIndex(*tariff, start_parking_time);
-
     qCritical() << __func__ << ":" << __LINE__ << "payment option index: " << paymentOptionIndex;
-
-
     if (paymentOptionIndex == -1) {
         paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
     }

library/src/calculator_functions.cpp

@@ -3696,9 +3696,6 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
         if (dailyTickets) {
             QVector<ATBDailyTicket> const tickets = dailyTickets.value();
             switch (permitType) {
-                case PERMIT_TYPE::FREE_TICKET: {
-                    // TODO
-                } break;
                 case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET: {
                     // TODO
                 } break;

library/src/configuration.cpp

@@ -46,7 +46,6 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
     if (strcmp(member_name, "Interpolation") == 0) return MemberType::InterpolationType;
     if (strcmp(member_name, "Prepaid") == 0) return MemberType::PrepaidType;
     if (strcmp(member_name, "CarryOver") == 0) return MemberType::CarryOverType;
-    if (strcmp(member_name, "Includes") == 0) return MemberType::IncludesType;
     else return MemberType::UnknownType;
 }
 
@@ -812,7 +811,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
             ATBInterpolation TariffInterpolation;
             ATBPrepaid TariffPrepaidOption;
             ATBCarryOver TariffCarryOver;
-            QStringList TariffIncludes;
 
             MemberType mb_type = MemberType::UnknownType;
             this->currentPaymentOptions.clear();
@@ -1344,9 +1342,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                         else if (strcmp(inner_obj_name, "pcu_minor") == 0) Currency.pcu_minor = k->value.GetString();
                         else if (strcmp(inner_obj_name, "pcu_active") == 0) Currency.pcu_active = k->value.GetBool();
                         break;
-                    case MemberType::IncludesType:
-                        TariffIncludes << k->value.GetString();
-                        break;
                     case MemberType::PaymentMethodType:
                         if (strcmp(inner_obj_name, "pme_id") == 0) PaymentMethod.pme_id = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "pme_label") == 0) PaymentMethod.pme_label = k->value.GetString();
@@ -1636,9 +1631,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                     cfg->TariffCarryOverOptions.insert(pair<int, ATBCarryOver>(TariffCarryOver.id, TariffCarryOver));
                     // qCritical() << TariffCarryOver;
                     break;
-                case MemberType::IncludesType:
-                    cfg->TariffIncludes = TariffIncludes;
-                    // qCritical() << "TariffIncludes" << cfg->TariffIncludes;
                 default:
                      break;
                 }

main/main.cpp

@@ -211,73 +211,21 @@ static bool test_neuhauser_kirchdorf(int step, double cost) {
     return 0;
 */
 
-#include <QProcess>
-#include <QCoreApplication>
-QString getCalculatorLibVersion() {
-    static QString v;
-    if (v.isEmpty()) {
-        QProcess shell;
-        QString command = QString("cat /proc/%1/maps | awk '{print $6;}' | grep 'libmobilisis_calc' | uniq").arg(QCoreApplication::applicationPid());
-
-        shell.start("/bin/bash", {"-c", command});
-        if ( shell.waitForFinished( 5000 )) {
-            v = shell.readAllStandardOutput();
-            // /usr/lib/libmobilisis_calc.so.2.3.99-18
-            if (!v.isEmpty()) {
-                QStringList vlst = v.trimmed().split("/", QString::SkipEmptyParts);
-                if (vlst.size() > 0) {
-                    vlst = vlst.last().split(".", QString::SkipEmptyParts);
-                    if (vlst.size() > 4) {
-                        v = QString("%1.%2.%3").arg(vlst[2]).arg(vlst[3]).arg(vlst[4]);
-                    }
-                }
-            }
-        }
-    }
-    return v;
-}
-
-bool isProductSupportedInCalculatorLib(QString const &product) {
-    bool supported{false};
-
-    QProcess shell;
-    QString command = QString("cat /proc/%1/maps | awk '{print $6;}' | grep 'libmobilisis_calc' | uniq | xargs strings | grep %2").arg(QCoreApplication::applicationPid()).arg(product);
-
-    shell.start("/bin/bash", {"-c", command});
-    if ( shell.waitForFinished( 5000 )) {
-        QString s = shell.readAllStandardOutput().trimmed();
-        // /usr/lib/libmobilisis_calc.so.2.3.99-18
-        if (!s.isEmpty() && (s == product)) {
-            qCritical() << "product" << s << "supported";
-            supported = true;
-        } else {
-            qCritical() << "product" << product << "not supported";
-        }
-    }
-
-    return supported;
-}
 
 int main() {
 
-    qCritical() << getCalculatorLibVersion();
+
-    isProductSupportedInCalculatorLib("FREE_TICKET");
-    return 0;
     //487     {
     //  488         "pra_payment_option_id": 1049,
     //  489         "pra_payment_unit_id": 84,
     //  490         "pra_price":"840"
     //>>491     }
 
-    //for (int i = 1; i < 346; ++i) {
+    //for (int i = 1; i < 85; ++i) {
-    //printf("{\n    \"pun_id\": %i,\n    \"pun_duration\": %d\n},\n",
+    //printf("{\n    \"\pra_payment_option_id\": 1049,\n    \"\pra_payment_unit_id\": %d,\n    \"pra_price\": %d\n},\n",
-    //       i, 60 + i*4);
+    //       i, i*10);
     //}
-    for (int i = 1; i < 361; ++i) {
+    //return 0;
-    printf("{\n    \"pra_payment_option_id\": 1049,\n    \"pra_payment_unit_id\": %i,\n    \"pra_price\":%i\n},\n",
-           i, i*10);
-    }
-    return 0;
 #if 0
     MessageHelper msgHelp;
     // msgHelp.createLoginMessageChunksToSend(0x02);

main/main.pro

@@ -1,5 +1,3 @@
-QT += core
-
 TEMPLATE = app
 TARGET = main