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

Version mkgmap-r4494 was committed by gerd on Thu, 21 May 2020 fix some sonarlint issues, simplify code (no change in output expected) http://www.mkgmap.org.uk/websvn/revision.php?repname=mkgmap&rev=4494