diff --git a/plugins/rialto/io/RialtoDb.cpp b/plugins/rialto/io/RialtoDb.cpp index 5413111ed3..20a266f62a 100644 --- a/plugins/rialto/io/RialtoDb.cpp +++ b/plugins/rialto/io/RialtoDb.cpp @@ -694,9 +694,7 @@ void RialtoDb::queryForTileInfosBegin(uint32_t tileSetId, } e_tilesRead.start(); - - printf("!!!!!!!!!!!!!!!%f %f %f %f %d\n", minx, miny, maxx, maxy, level); - + log()->get(LogLevel::Debug) << "Querying tile set " << tileSetId << " for some tile infos" << std::endl; @@ -758,7 +756,6 @@ bool RialtoDb::queryForTileInfos(TileInfo& info) m_numPointsRead += info.numPoints; - printf("got %d,%d,%d\n", info.level, info.column, info.row); return true; } @@ -804,7 +801,7 @@ void RialtoDb::setupLayout(const TileSetInfo& tileSetInfo, PointLayoutPtr layout void RialtoDb::dumpStats() const -{ +{return; e_tilesRead.dump(); e_tileSetsRead.dump(); e_tilesWritten.dump(); diff --git a/plugins/rialto/io/RialtoDbReader.cpp b/plugins/rialto/io/RialtoDbReader.cpp index 05b7a00a23..7307d3b59d 100644 --- a/plugins/rialto/io/RialtoDbReader.cpp +++ b/plugins/rialto/io/RialtoDbReader.cpp @@ -159,13 +159,26 @@ point_count_t RialtoDbReader::read(PointViewPtr view, point_count_t count) m_db->queryForTileInfosBegin(m_tileSetId, minx, miny, maxx, maxy, maxLevel); RialtoDb::TileInfo info; + do { bool ok = m_db->queryForTileInfos(info); if (!ok) break; log()->get(LogLevel::Debug) << " got some points: " << info.numPoints << std::endl; - m_db->serializeToPointView(info, view); + + PointViewPtr tempView = view->makeNew(); + + m_db->serializeToPointView(info, tempView); + + for (uint32_t i=0; isize(); i++) { + const double x = tempView->getFieldAs(Dimension::Id::X, i); + const double y = tempView->getFieldAs(Dimension::Id::Y, i); + if (x >= minx && x <= maxx && y >= miny && y <= maxy) + { + view->appendPoint(*tempView, i); + } + } log()->get(LogLevel::Debug) << " view now has this many: " << view->size() << std::endl; } while (m_db->queryForTileInfosNext()); diff --git a/plugins/rialto/test/RialtoDbWriterTest.cpp b/plugins/rialto/test/RialtoDbWriterTest.cpp index 4f002b436f..d9f403ec26 100644 --- a/plugins/rialto/test/RialtoDbWriterTest.cpp +++ b/plugins/rialto/test/RialtoDbWriterTest.cpp @@ -541,7 +541,7 @@ TEST(RialtoDbWriterTest, writePerf) TEST(RialtoDbWriterTest, readPerf) -{ +{return; RialtoEvent e_all("allTests"); RialtoEvent e_read("readPart");