[mkgmap-dev] Commit r3871: merge the if-then branch