diff --git a/src/extractorvalidator.cpp b/src/extractorvalidator.cpp --- a/src/extractorvalidator.cpp +++ b/src/extractorvalidator.cpp @@ -81,14 +81,9 @@ return res.startTime().isValid(); } -static bool filterFoodEstablishment(const FoodEstablishment &res) +static bool filterLocalBusiness(const LocalBusiness &business) { - return !res.name().isEmpty(); -} - -static bool filterLodgingBusiness(const LodgingBusiness &hotel) -{ - return !hotel.name().isEmpty(); + return !business.name().isEmpty(); } bool ExtractorValidator::isValidElement(const QVariant &elem) @@ -124,11 +119,8 @@ if (JsonLd::isA(elem)) { return filterEvent(elem.value()); } - if (JsonLd::isA(elem)) { - return filterFoodEstablishment(elem.value()); - } - if (JsonLd::isA(elem)) { - return filterLodgingBusiness(elem.value()); + if (JsonLd::canConvert(elem)) { + return filterLocalBusiness(JsonLd::convert(elem)); } // types without specific filters yet