Minor changes in Mapa class (better use of local and private class variables)
Authored by: niedowidek 2013-03-01
Parent: [r23]
Child: [r25]
