Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
Cimon Lucas (LCM) committed Jan 21, 2025
1 parent 7cc9d00 commit c06f8c2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
Empty file modified .pkg.mutex
100755 → 100644
Empty file.
3 changes: 1 addition & 2 deletions include/nigiri/footpath.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@

#include "fmt/ostream.h"

#include "utl/verify.h"
#include "utl/logging.h"
#include "utl/verify.h"

#include "cista/reflection/printable.h"

#include "nigiri/footpath.h"
#include "nigiri/types.h"

namespace nigiri {
Expand Down
8 changes: 6 additions & 2 deletions include/nigiri/loader/hrd/service/expand_local_to_utc.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include "utl/logging.h"

#include "nigiri/loader/hrd/service/ref_service.h"
#include "nigiri/loader/hrd/service/service.h"
#include "nigiri/loader/hrd/stamm/timezone.h"
Expand Down Expand Up @@ -55,7 +57,8 @@ std::optional<duration_t> build_utc_time_seq(
stop_timezones.front(), day, local_times.front(), true);

if (!first_valid) {
utl::log_error("loader.hrd.service.utc",
utl::log_error(
"loader.hrd.service.utc",
"first departure local to utc failed for {}: local_time={}, day={}",
origin, local_times.front(), day);
return std::nullopt;
Expand All @@ -67,7 +70,8 @@ std::optional<duration_t> build_utc_time_seq(
auto const [utc_mam, day_offset, valid] = local_mam_to_utc_mam(
tz, day + first_day_offset, local_time - first_day_offset);
if (day_offset != 0_days || pred > utc_mam || !valid) {
utl::log_error("loader.hrd.service.utc",
utl::log_error(
"loader.hrd.service.utc",
"local to utc failed, ignoring: {}, day={}, time={}, offset={}, "
"pred={}, utc_mam={}, valid={}",
origin, day, local_time, day_offset, pred, utc_mam, valid);
Expand Down
8 changes: 4 additions & 4 deletions include/nigiri/loader/hrd/service/read_services.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,16 @@ void parse_services(config const& c,
}

if (!spec.valid()) {
utl::log_error("loader.hrd.service",
"skipping invalid service at {}:{}", filename, line_number);
utl::log_error("loader.hrd.service", "skipping invalid service at {}:{}",
filename, line_number);
} else if (!spec.ignore()) {
// Store if relevant.
try {
expand_service(store.add(service{c, st, source_file_idx, spec}));
} catch (std::exception const& e) {
utl::log_error("loader.hrd.service.expand",
"unable to build service at {}:{}: {}", filename, line_number,
e.what());
"unable to build service at {}:{}: {}", filename,
line_number, e.what());
}
}

Expand Down
1 change: 1 addition & 0 deletions src/loader/hrd/stamm/category.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "nigiri/clasz.h"
#include "nigiri/loader/hrd/stamm/category.h"
#include "nigiri/loader/hrd/util.h"
#include "nigiri/scoped_timer.h"

namespace nigiri::loader::hrd {

Expand Down

0 comments on commit c06f8c2

Please sign in to comment.