gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[generator][ugc] Skip empty UGCs

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-01-11 13:58:56 +03:00 • committed by Yuri Gorshenin
parent 83cbd1a81e
commit 2e1f7a507e
2 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
generator/generator_tests/ugc_test.cpp
View file

@ -8,16 +8,32 @@
#include "base/math.hpp"
#include "base/osm_id.hpp"
namespace
{
std::string g_database(R"LLL(
PRAGMA foreign_keys=OFF;
BEGIN TRANSACTION;
CREATE TABLE ratings (key bigint, value blob);
INSERT INTO "ratings" VALUES(9826352,'{"osm_id":9826352,"total_rating":10.34,"based_on":721,"ratings":[{"key":"2","value":3.4},{"key":"2","value":6.0001}],"reviews":[{"id":7864532, "text":{"text":"The best service on the Earth","lang":"en"},"author":"Robert","rating":8.5,"date":1234567}]}');
INSERT INTO "ratings" VALUES(9826353,'{"osm_id":9826353,"total_rating":0.34,"based_on":1,"ratings":[{"key":"2","value":3.4},{"key":"3","value":6.0001},{"key":"6","value":0.0001}],"reviews":[{"id":78645323924,"text":{"text":"Изумительно!","lang":"ru"},"author":"Вася","rating":10,"date":1234569}]}');
INSERT INTO "ratings" VALUES(9826354,'{"osm_id":9826354,"total_rating":-1.0,"based_on":1,"ratings":[{"key":"2","value":3.4},{"key":"3","value":6.0001},{"key":"6","value":0.0001}],"reviews":[{"id":78645323924,"text":{"text":"Изумительно!","lang":"ru"},"author":"Вася","rating":10,"date":1234569}]}');
CREATE INDEX key_index ON ratings (key);
COMMIT;
)LLL");
ugc::UGC GetUgcForId(uint32_t id)
{
generator::UGCTranslator tr;
tr.CreateDb(g_database);
osm::Id osmId(id);
ugc::UGC ugc;
bool rc = tr.TranslateUGC(osmId, ugc);
TEST(rc, ("Can't translate ugc for", osmId));
return ugc;
}
UNIT_TEST(UGC_SmokeTest)
{
generator::UGCDB db(":memory:");
@ -31,15 +47,16 @@ UNIT_TEST(UGC_SmokeTest)
UNIT_TEST(UGC_TranslateRatingTest)
{
generator::UGCTranslator tr;
tr.CreateDb(g_database);
osm::Id id = osm::Id(9826352);
ugc::UGC ugc;
bool rc = tr.TranslateUGC(id, ugc);
TEST(rc, ("Can't translate rating for", id));
auto const ugc = GetUgcForId(9826352);
TEST_EQUAL(ugc.m_ratings.size(), 2, ());
TEST_EQUAL(ugc.m_ratings[0].m_key, "2", ());
TEST(my::AlmostEqualAbs(ugc.m_ratings[0].m_value, 3.4f, 1e-6f), ());
}
UNIT_TEST(UGC_TranslateEmptyUgcTest)
{
auto const ugc = GetUgcForId(9826354);
TEST(ugc.IsEmpty(), ());
}
} // namespace

3
generator/ugc_section_builder.cpp
View file

@ -53,6 +53,9 @@ bool BuildUgcMwmSection(std::string const & srcDbFilename, std::string const & m
if (!translator.TranslateUGC(it->second, result))
return;
if (result.IsEmpty())
return;
content.emplace_back(featureId, result);
});