[mkgmap-dev] Commit r4362: simplify code and add @Override, no functional change