model.airspace: simplify grouping of infringements

This method is both faster and more robust...
views.upload: scale image extent by factor 1.05