[mkgmap-dev] Commit r4544: improve code, use lambdas