Change arrival weight if both arrival time points and leading points are used

[Joerg Ewald]

If both arrival time points and leading points are used, right now their respective weights are doubled compared to regular GAP, reducing time weight significantly. This is because arrival time points were originally designed to be used stand-alone, without leading points.

Change the code so that if both arrival time points and leading points are used, the arrival weight (and therefore the leading weight derived from it) are the same as in regular GAP: Arrival weight = (1 – Distance weight) / 8 Leading weight = Arrival weight * 1.4