Model Morocco as Sundown

Author: robertbastian

components/datetime/tests/patterns/tests/time_zones.json

@@ -42,6 +42,28 @@
       "vvvv": "heure d’Europe centrale (Algérie)"
     }
   },
+  {
+    "locale": "en-GB",
+    "datetime": "2021-07-11T12:00:00.000+01[Africa/Casablanca]",
+    "expectations": {
+      "z": "CET",
+      "zzzz": "Central European Standard Time",
+
+      "v": "Morocco Time",
+      "vvvv": "Morocco Time"
+    }
+  },
+  {
+    "locale": "en-GB",
+    "datetime": "2021-07-11T12:00:00.000+00[Africa/Casablanca]",
+    "expectations": {
+      "z": "GMT+0",
+      "zzzz": "GMT+00:00",
+
+      "v": "Morocco Time",
+      "vvvv": "Morocco Time"
+    }
+  },
   {
     "locale": "en",
     "datetime": "2021-07-11T12:00:00.000-06:00[America/Regina]",

provider/data/time/data/timezone_periods_v1.rs.data

@@ -1,4 +1,4 @@
 timezone/identifiers/iana/core/v1, <singleton>, 9559B, 9516B, fe8602f4657f987
 timezone/identifiers/iana/extended/v1, <singleton>, 9757B, 9735B, ca82fcaee49bef7
 timezone/identifiers/windows/v1, <singleton>, 8634B, 8591B, 90b7fe3f9cadf5bd
-timezone/periods/v1, <singleton>, 7173B, 7086B, 945f137c71bb7cf7
+timezone/periods/v1, <singleton>, 7165B, 7078B, 43627fd5d449efa7

provider/data/time/fingerprints.csv

@@ -95,8 +95,11 @@ impl SourceDataProvider {
                     (("iedub", "GMT", ZoneNameTimestamp::far_in_past()), (0, None)),
                     (("iedub", "IST", ZoneNameTimestamp::far_in_past()), (0, Some(3600))),
                     // Morroco and Western Sahara used to observe +0 with normal summer DST, but currently they observe +1 with
-                    // negative DST during Ramadan. Model this all as normal DST.
-                    // TODO: Here we could set the zone variant to Ramadan
+                    // negative DST during Ramadan.
+                    (("macas", "+00", ZoneNameTimestamp::from_zoned_date_time_iso(ZonedDateTime::try_offset_only_from_str("2018-10-28T02:00:00Z", Iso).unwrap())), (3600, Some(0))),
+                    (("macas", "+01", ZoneNameTimestamp::from_zoned_date_time_iso(ZonedDateTime::try_offset_only_from_str("2018-10-28T02:00:00Z", Iso).unwrap())), (3600, None)),
+                    (("eheai", "+00", ZoneNameTimestamp::from_zoned_date_time_iso(ZonedDateTime::try_offset_only_from_str("2018-10-28T02:00:00Z", Iso).unwrap())), (3600, Some(0))),
+                    (("eheai", "+01", ZoneNameTimestamp::from_zoned_date_time_iso(ZonedDateTime::try_offset_only_from_str("2018-10-28T02:00:00Z", Iso).unwrap())), (3600, None)),
                     (("macas", "+00", ZoneNameTimestamp::far_in_past()), (0, None)),
                     (("macas", "+01", ZoneNameTimestamp::far_in_past()), (0, Some(3600))),
                     (("eheai", "+00", ZoneNameTimestamp::far_in_past()), (0, None)),
@@ -170,6 +173,19 @@ impl SourceDataProvider {
                             .flatten()
                             .collect::<Vec<_>>();
 
+                        if iana == "Africa/Casablanca" {
+                            periods = vec![
+                                (ZoneNameTimestamp::far_in_past(), Some("Europe_Western")),
+                                (ZoneNameTimestamp::from_zoned_date_time_iso(ZonedDateTime::try_offset_only_from_str("2018-10-28T02:00:00Z", Iso).unwrap()), Some("Europe_Central")),
+                            ];
+                        } else if iana == "Africa/El_Aaiun" {
+                            periods = vec![
+                                (ZoneNameTimestamp::far_in_past(), None),
+                                (ZoneNameTimestamp::from_zoned_date_time_iso(ZonedDateTime::try_offset_only_from_str("1976-04-14T00:00:00-01", Iso).unwrap()), Some("Europe_Western")),
+                                (ZoneNameTimestamp::from_zoned_date_time_iso(ZonedDateTime::try_offset_only_from_str("2018-10-28T02:00:00Z", Iso).unwrap()), Some("Europe_Central")),
+                            ];
+                        }
+
                         let mut i = 0;
                         while i < periods.len() {
                             if i + 1 < periods.len() && periods[i].0 == periods[i + 1].0 {