Feature/distance default strategy

fix the order of the template parameters for distance's default_strategy: the two geometry tags appear first

( this is the same with pull request #46, but with clean history)