[mkgmap-dev] Commit: r1676: Extract methods that will go into new classes in a later