[mkgmap-dev] Splitter r483 in refactoring2 branch