[mkgmap-dev] RE Commit r3801: merge split-shape branch