If price (=key) is not found, compute the next smaller valid price (=key)

and use this as maxPrice. Usage: (Innichen (508) with) direct coin input.
Restore pop_max_price in case it has been changed (for certain settings).
2025-04-17 13:33:22 +02:00 · 2025-04-17 13:09:53 +02:00 · 2025-04-16 11:32:20 +02:00 · 2025-04-16 11:31:05 +02:00 · 2025-04-03 11:53:47 +02:00 · 2025-04-02 15:28:46 +02:00
5 changed files with 90 additions and 30 deletions
--- a/library/include/mobilisis/tariff_carryover.h
+++ b/library/include/mobilisis/tariff_carryover.h
@ -37,7 +37,7 @@ struct ATBTariffCarryOver {
        if (coif == "always") {
            m_carryOverIf = ApplyCarryOver::ALWAYS;
        } else {
-           qCritical() << "ERROR unknown carry over application" << coif;
+           qCritical() << __func__ << ":" << __LINE__ << "ERROR unknown carry over application" << coif;
        }
    }

@ -65,13 +65,22 @@ struct ATBTariffCarryOver {
        int minutes = 0;
        QString end = m_range.m_end.toString(Qt::ISODate);
        if (end == "24:00:00") {
-            QDateTime t = dt.addDays(1);
-            t.setTime(QTime(0,0,0));
-            minutes = dt.secsTo(t) / 60;
+            // note: this did not work
+            // QDateTime t(dt.addDays(1));
+            // t.setTime(QTime(0,0,0));
+            // dt: 2024-10-27T00:00:00 EEST, but t: 2024-10-28T00:00:00 EET (!)
+            // so the difference is 1500 instead of 1440
+            // reason: change from summer to winter time
+
+            // compute minutes directly
+            if (dt.time().isValid()) {
+                minutes = 1440 - (dt.time().hour() * 60 + dt.time().minute());
+            }
        } else {
-            QDateTime t(dt);
-            t.setTime(QTime::fromString(end, Qt::ISODate));
-            minutes = dt.secsTo(t) / 60;
+            QTime t(QTime::fromString(end, Qt::ISODate));
+            if (t.isValid() && dt.time().isValid()) {
+                minutes = (t.hour() * 60 + t.minute()) - (dt.time().hour() * 60 + dt.time().minute());
+            }
        }

        if (minutes < 0 || minutes > m_range.m_duration) {
--- a/library/include/mobilisis/tariff_prepaid.h
+++ b/library/include/mobilisis/tariff_prepaid.h
@ -38,7 +38,7 @@ struct ATBTariffPrepaid {
        if (ppif == "always") {
            m_prepaidIf = ApplyPrepaid::ALWAYS;
        } else {
-           qCritical() << "ERROR unknown carry over application" << ppif;
+           qCritical() << __func__ << ":" << __LINE__ << "ERROR unknown carry over application" << ppif;
        }
    }

--- a/library/src/calculate_price.cpp
+++ b/library/src/calculate_price.cpp
@ -396,14 +396,12 @@ int CALCULATE_LIBRARY_API get_zone_nr(int zone)
    if(zone > -1) return zone;
    else
    {
-        QFile zone("/etc/zone_nr");
+        QFile zone("/mnt/system_data/zone_nr");
        if (zone.exists()) {
            QFileInfo finfo(zone);
-            if (finfo.size() <= 4) { // decimal 000\n
-                if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) {
-                    QTextStream in(&zone);
-                    return in.readLine(100).toInt();
-                }
+            if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                QTextStream in(&zone);
+                return in.readLine(100).toInt();
            }
        }
        return -1;
@ -782,7 +780,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
    double maxMin = tariff->getPaymentOptions(paymentOptionIndex).pop_max_time;

    // DEBUG
-    qCritical() << "compute_price_for_parking_ticket() " << endl
+    qCritical() << __func__ << ":" << __LINE__ << endl
                << "          paymentOptionIndex: " << paymentOptionIndex << endl
                << "          start_parking_time: " << start_parking_time << endl
                << "          netto_parking_time: " << netto_parking_time << endl
@ -914,10 +912,12 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(

            if (carryOver == 1) {
                QTime carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
+                QTime carryOverEnd = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_end;
                int carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;

-                qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
-                qCritical() << __func__ << ":" << __LINE__ << "carryOverDuration" << carryOverDuration;
+                qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart:" << carryOverStart.toString(Qt::ISODate);
+                qCritical() << __func__ << ":" << __LINE__ << "     carryOverEnd:" << carryOverEnd.toString(Qt::ISODate);
+                qCritical() << __func__ << ":" << __LINE__ << "carryOverDuration:" << carryOverDuration;

                // handle carry over
                int minutesUntilCarryOver = effectiveStartTime.time().secsTo(carryOverStart) / 60;
@ -943,12 +943,21 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                    end_parking_time = end_parking_time.addSecs(carryOverDuration * 60);
                } else
                if (end_parking_time.time() == carryOverStart) {
-                    qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
-                    qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
+                    qCritical() << __func__ << ":" << __LINE__ << "        end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+                    qCritical() << __func__ << ":" << __LINE__ << "          carryOverStart:" << carryOverStart.toString(Qt::ISODate);
                    ATBPaymentOption const &po = tariff->getPaymentOptions(paymentOptionIndex);
                    if (po.pop_apply_carry_over_to_ticket_endtime) {
                        end_parking_time = end_parking_time.addSecs(carryOverDuration * 60);
-                        qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+                        qCritical() << __func__ << ":" << __LINE__ << "adapted end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+                    }
+                } else
+                if (end_parking_time.time() == carryOverEnd) {
+                    qCritical() << __func__ << ":" << __LINE__ << "        end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+                    qCritical() << __func__ << ":" << __LINE__ << "            carryOverEnd:" << carryOverEnd.toString(Qt::ISODate);
+                    ATBPaymentOption const &po = tariff->getPaymentOptions(paymentOptionIndex);
+                    if (po.pop_apply_carry_over_to_ticket_endtime == false) {
+                        end_parking_time = end_parking_time.addSecs(-carryOverDuration * 60);
+                        qCritical() << __func__ << ":" << __LINE__ << "adapted end-parking-time:" << end_parking_time.toString(Qt::ISODate);
                    }
                }
            } else {
--- a/library/src/calculator_functions.cpp
+++ b/library/src/calculator_functions.cpp
@ -379,7 +379,8 @@ Calculator::ComputeDurationFromCost(Configuration *cfg,

    int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
    int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
-    int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
+    int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price =
+                                cfg->getPaymentOptions(paymentOptionIndex).pop_max_price_save;
    int const pop_max_time = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time;
    int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
    int const pop_allow_overpay = cfg->getPaymentOptions(paymentOptionIndex).pop_allow_overpay;
@ -452,13 +453,50 @@ Calculator::ComputeDurationFromCost(Configuration *cfg,
    netto_parking_time_in_minutes = 0;
    brutto_parking_time_in_minutes = 0;
    free_parking_time_in_minutes = 0;
+    int nettoParktimeForCost = 0;

-    int const nettoParktimeForCost = priceNettoParktime[int(cost)];
-    qCritical() << __func__ << ":" << __LINE__ << QString("cost=%1 nettoParkTimeForCost=%2").
-                                                        arg(cost).arg(nettoParktimeForCost);
+    if (priceNettoParktime.contains(int(cost))) {
+        nettoParktimeForCost = priceNettoParktime[int(cost)];
+        qCritical() << __func__ << ":" << __LINE__ << QString("cost=%1 nettoParkTimeForCost=%2").
+                                                            arg(cost).arg(nettoParktimeForCost);
+    } else {
+
+        // cannot find netto-parking time for cost (=price)
+        // this happens for direct coin input and should not happen otherwise
+        // take the value for the nearest value of cost and mark result as overpaid
+
+        QList <int> keys = priceNettoParktime.keys();   // keys (=prices) are sorted in ascending order
+        QSet<int> s; // make keys unique
+        for (int k = 0; k < keys.size(); ++k) {
+            if (keys[k] < cost) {
+                s << keys[k];
+            }
+        }
+        keys = s.values();
+        // sort in descending order
+        std::sort(std::begin(keys), std::end(keys), std::greater<>());
+        // qCritical() << __func__ << ":" << __LINE__ << "keys=" << keys;
+        if (!keys.isEmpty()) {
+            int const maxCost = keys[0];
+            auto const p = priceNettoParktime.equal_range(maxCost);
+            for (auto it = p.first; it != p.second; ++it) {
+                nettoParktimeForCost = std::max(nettoParktimeForCost, it.value());
+            }
+            ATBPaymentOption &po = cfg->getPaymentOptions(paymentOptionIndex);
+            po.pop_max_price = maxCost;
+            cfg->getPaymentOptions(paymentOptionIndex).pop_max_price = maxCost;
+            if (pop_allow_overpay) {
+                overPaid = true;
+            }
+            qCritical() << __func__ << ":" << __LINE__ << QString("cost=%1 -> maxCost=%2 nettoParkTimeForCost=%3").
+                                                            arg(cost).arg(maxCost).arg(nettoParktimeForCost);
+        } else {
+            qCritical() << __func__ << ":" << __LINE__ << "ERROR empty keys -> check tariff file";
+        }
+    }

    int cnt = 0;
-    while (++cnt < 10 && netto_parking_time_in_minutes < nettoParktimeForCost) {
+    while (++cnt < 20 && netto_parking_time_in_minutes < nettoParktimeForCost) {
        // qCritical() << __func__ << ":" << __LINE__ << "cnt [" << cnt;

        brutto_parking_time_in_minutes = free_parking_time_in_minutes + netto_parking_time_in_minutes;
@ -912,7 +950,8 @@ Calculator::GetDurationFromCost(Configuration* cfg,
                }

                int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
-                int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
+                int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price
+                                            = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price_save;
                //int const pop_max_time = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time;
                int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
                int const pop_allow_overpay = cfg->getPaymentOptions(paymentOptionIndex).pop_allow_overpay;
@ -3584,7 +3623,9 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
            qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
        }

-        if (timeStep == pun_duration) {
+        // allow some tolerance when searching for [timeStep == pun_duration]:
+        // this might happen when crossing minute boundaries
+        if (std::abs(timeStep - pun_duration) < 4) {
            qCritical() << "(" << __func__ << ":" << __LINE__ << ") return price" << price;
            return price;
        }
--- a/library/src/configuration.cpp
+++ b/library/src/configuration.cpp
@ -171,8 +171,9 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
                                                                if (!d.isNull() && d.isValid()) {
                                                                    TariffPrepaid.m_date = d;
                                                                }
-                                                                TariffPrepaid.setPrepaidIf(prepaidIf);
-
+                                                                if (!prepaidIf.isNull() && !prepaidIf.trimmed().isEmpty()) {
+                                                                    TariffPrepaid.setPrepaidIf(prepaidIf);
+                                                                }
                                                                qCritical() << TariffPrepaid;

                                                                cfg.TariffPrepaids.insert(std::pair<int, ATBTariffPrepaid>(weekDay, TariffPrepaid));
@ -258,7 +259,7 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
                                                                if (!d.isNull() && d.isValid()) {
                                                                    TariffCarryOver.m_date = d;
                                                                }
-                                                                if (!carryOverIf.isEmpty()) {
+                                                                if (!carryOverIf.isNull() && !carryOverIf.trimmed().isEmpty()) {
                                                                    TariffCarryOver.setCarryOverIf(carryOverIf);
                                                                }
Author	SHA1	Message	Date
Gerhard Hoffmann	54921f0e85	If price (=key) is not found, compute the next smaller valid price (=key) and use this as maxPrice. Usage: (Innichen (508) with) direct coin input.	2025-04-17 13:33:22 +02:00
Gerhard Hoffmann	077c2334ca	Restore pop_max_price in case it has been changed (for certain settings).	2025-04-17 13:09:53 +02:00
Gerhard Hoffmann	d605af5c5a	Check prepaidIf and carryOverIf for null and emptyness.	2025-04-16 11:32:20 +02:00
Gerhard Hoffmann	c5900f9f2b	Minor: extend debug output	2025-04-16 11:31:05 +02:00
Gerhard Hoffmann	9b137c2873	Fix in Calculator::GetPriceForTimeStep(): Allow some tolerance (of 3 minutes) when looking up the current time-step value in the duration-array. Otherwise, when corossing a minute-boundary, it can happen to not find the match and returning a price of 0 (which is almost always wrong).	2025-04-03 11:53:47 +02:00
Gerhard Hoffmann	dd249a87d5	Set cnt-limit to 20. This allows a bigger time-range for tariff, which have in principle no time-limit.	2025-04-02 15:28:46 +02:00
Gerhard Hoffmann	575885c19e	Merge branch 'master' into kleipeda-experimental	2025-04-02 09:44:20 +02:00
Gerhard Hoffmann	d82a732a8d	if end of parking time equals carry-over-end, then, if configured, go back to carry-over-start.	2025-04-01 14:26:21 +02:00
Gerhard Hoffmann	99dbd7c194	Minor: debug output.	2025-04-01 14:24:42 +02:00
Siegfried Siegert	ae985d25ce	Merge branch 'kleipeda-experimental'	2025-02-04 14:58:58 +01:00
Siegfried Siegert	6a215d4cf9	Allow zone_nr > 999	2025-02-04 14:47:07 +01:00
Siegfried Siegert	a3f4a742ce	Read zone_nr from system_data	2025-02-04 14:44:28 +01:00
Gerhard Hoffmann	e6d8c04076	Fix: for time change summer -> winter term. Compute minutes until midnight manually.	2024-10-30 15:56:58 +01:00