MAP: Fix of cursor closed too early

A cursor variable was reused for a new query, which lead to
the cursor being closed too early.
This fix introduces a second cursor variable and appropriate
close calls.

Bug: 20227071
Bug: 20565456

Change-Id: I1fa271497a9eb37bb3e435b61dc5daa2b9727af4
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
1 file changed