Changed geometry to private, added getter for geometry, changed map keys to canton kuerzel