[mkgmap-dev] Commit r3811: cleanup ShapeMergeFilter