[mkgmap-dev] Commit r4493: fix some sonarlint issues, simplify code (no change in output expected)