MarkChannel: added MSort constructor

hvega/src/Graphics/Vega/VegaLite.hs

@@ -1963,6 +1963,10 @@ data MarkChannel
       -- ^ Indicate that data encoding with a mark are already binned.
       --
       --   @since 0.4.0.0
+    | MSort [SortProperty]
+      -- ^ Sort order.
+      --
+      --   @since 0.4.0.0
     | MImpute [ImputeProperty]
       -- ^ Set the imputation rules for a mark channel. See the
       --   [Vega-Lite impute documentation](https://vega.github.io/vega-lite/docs/impute.html).
@@ -2030,6 +2034,7 @@ markChannelProperty (MScale sps) = [scaleProp_ sps]
 markChannelProperty (MLegend lps) = [legendProp_ lps]
 markChannelProperty (MBin bps) = [bin bps]
 markChannelProperty MBinned = [binned_]
+markChannelProperty (MSort ops) = [sort_ ops]
 markChannelProperty (MImpute ips) = [impute_ ips]
 markChannelProperty (MSelectionCondition selName ifClause elseClause) =
   selCond_ markChannelProperty selName ifClause elseClause
@@ -2078,6 +2083,10 @@ supported in @hvega@.
 
 -}
 
+-- based on schema 3.3.0 #/definitions/MarkConfig
+--
+-- but it also contains a number of other properties
+
 data MarkProperty
     = MAlign HAlign
       -- ^ Horizontal alignment of a text mark.

hvega/tests/ColorTests.hs

@@ -103,18 +103,24 @@ namedContinuous2 =
         (color [ MName "Acceleration", MmType Quantitative, MScale [ SScheme "plasma" [ 0.5, 1 ] ] ])
 
 
--- TODO: use of SReverse is not to spec; need an MSort constructor
 namedContinuous3 :: VegaLite
 namedContinuous3 =
     chart "Continuous colour scale based on named vega schame. Should use the flipped plasma colour scheme (i.e. red to orange)."
-        (color [ MName "Acceleration", MmType Quantitative, MScale [ SScheme "plasma" [] {- , SReverse True -} ] ])
+        (color [ MName "Acceleration"
+               , MmType Quantitative
+               , MScale [ SScheme "plasma" [] ]
+               , MSort [ Descending ]
+               ])
 
 
--- TODO: use of SReverse is not to spec; need an MSort constructor
 namedContinuous4 :: VegaLite
 namedContinuous4 =
     chart "Continuous colour scale based on named vega schame. Should use the first half of the flipped plasma colour scheme (i.e. red to orange)."
-        (color [ MName "Acceleration", MmType Quantitative, MScale [ SScheme "plasma" [ 0, 0.5 ] {- , SReverse True -} ] ])
+        (color [ MName "Acceleration"
+               , MmType Quantitative
+               , MScale [ SScheme "plasma" [ 0, 0.5 ] ]
+               , MSort [ Descending ]
+               ])
 
 
 customContinuous :: VegaLite

hvega/tests/color/namedContinuous3.vl

@@ -16,6 +16,7 @@
             "scale": {
                 "scheme": "plasma"
             },
+            "sort": "descending",
             "type": "quantitative"
         },
         "size": {

hvega/tests/color/namedContinuous4.vl

@@ -22,6 +22,7 @@
                     "name": "plasma"
                 }
             },
+            "sort": "descending",
             "type": "quantitative"
         },
         "size": {