[mkgmap-dev] Commit r4515: minor code improvements, no change in output expected