Ensure crop coordinates are always added before focal point

Author: ronaldbarendse

src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs

@@ -56,14 +56,14 @@ void AppendQueryString(string value)
             void AddQueryString(string key, params IConvertible[] values)
                 => AppendQueryString(key + '=' + string.Join(",", values.Select(x => x.ToString(CultureInfo.InvariantCulture))));
 
-            if (options.FocalPoint != null)
+            if (options.Crop != null)
             {
-                AddQueryString("rxy", options.FocalPoint.Left, options.FocalPoint.Top);
+                AddQueryString("cc", options.Crop.Left, options.Crop.Top, options.Crop.Right, options.Crop.Bottom);
             }
 
-            if (options.Crop != null)
+            if (options.FocalPoint != null)
             {
-                AddQueryString("cc", options.Crop.Left, options.Crop.Top, options.Crop.Right, options.Crop.Bottom);
+                AddQueryString("rxy", options.FocalPoint.Left, options.FocalPoint.Top);
             }
 
             if (options.ImageCropMode.HasValue)

src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs

@@ -358,13 +358,14 @@ void AppendQueryString(string value)
                 void AddQueryString(string key, params IConvertible[] values)
                     => AppendQueryString(key + '=' + string.Join(",", values.Select(x => x.ToString(CultureInfo.InvariantCulture))));
 
-                if (options.FocalPoint != null)
+                if (options.Crop != null)
                 {
-                    AddQueryString("f", options.FocalPoint.Top, options.FocalPoint.Left);
+                    AddQueryString("c", options.Crop.Left, options.Crop.Top, options.Crop.Right, options.Crop.Bottom);
                 }
-                else if (options.Crop != null)
+
+                if (options.FocalPoint != null)
                 {
-                    AddQueryString("c", options.Crop.Left, options.Crop.Top, options.Crop.Right, options.Crop.Bottom);
+                    AddQueryString("f", options.FocalPoint.Top, options.FocalPoint.Left);
                 }
 
                 if (options.ImageCropMode.HasValue)
@@ -399,7 +400,7 @@ void AddQueryString(string key, params IConvertible[] values)
 
                 if (options.CacheBusterValue != null)
                 {
-                    AddQueryString("r", options.CacheBusterValue);
+                    AddQueryString("v", options.CacheBusterValue);
                 }
 
                 return imageUrl.ToString();