From 238f4796cb4e4703a5a37f5394451e6b9fb1b1e7 Mon Sep 17 00:00:00 2001
From: Simon Proud <simon.proud@stfc.ac.uk>
Date: Tue, 29 Aug 2023 15:17:09 +0100
Subject: [PATCH 1/2] Add Himawari full disk areas to the default areas YAML.

---
 satpy/etc/areas.yaml | 48 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/satpy/etc/areas.yaml b/satpy/etc/areas.yaml
index 6abbc18c82..28129f72d9 100644
--- a/satpy/etc/areas.yaml
+++ b/satpy/etc/areas.yaml
@@ -268,6 +268,54 @@ msg_seviri_iodc_48km:
     lower_left_xy: [-5570248.686685662, -5567248.28340708]
     upper_right_xy: [5567248.28340708,   5570248.686685662]
 
+himawari_ahi_fes_500m:
+  description:
+    Himawari-8/9 full disk area definition at 500m resolution
+  projection:
+    proj: geos
+    lon_0: 140.7
+    a: 6378137.0
+    rf: 298.257024882273
+    h: 35785863.0
+  shape:
+    height: 22000
+    width: 22000
+  area_extent:
+    lower_left_xy: [-5499999.9684, -5499999.9684]
+    upper_right_xy: [5499999.9684, 5499999.9684]
+
+himawari_ahi_fes_1km:
+  description:
+    Himawari-8/9 full disk area definition at 1km resolution
+  projection:
+    proj: geos
+    lon_0: 140.7
+    a: 6378137.0
+    rf: 298.257024882273
+    h: 35785863.0
+  shape:
+    height: 11000
+    width: 11000
+  area_extent:
+    lower_left_xy: [-5500000.0355, -5500000.0355]
+    upper_right_xy: [5500000.0355, 5500000.0355]
+
+  himawari_ahi_fes_2km:
+    description:
+      Himawari-8/9 full disk area definition at 2km resolution
+    projection:
+      proj: geos
+      lon_0: 140.7
+      a: 6378137.0
+      rf: 298.257024882273
+      h: 35785863.0
+    shape:
+      height: 5500
+      width: 5500
+    area_extent:
+      lower_left_xy: [ -5499999.9012, -5499999.9012 ]
+      upper_right_xy: [ 5499999.9012, 5499999.9012 ]
+
 
 # Regional
 

From 5fa71c40e5a99f65799c53f3ec3f942405ade416 Mon Sep 17 00:00:00 2001
From: Simon Proud <simon.proud@stfc.ac.uk>
Date: Tue, 29 Aug 2023 15:18:44 +0100
Subject: [PATCH 2/2] Fix Himawari area indentation.

---
 satpy/etc/areas.yaml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/satpy/etc/areas.yaml b/satpy/etc/areas.yaml
index 28129f72d9..4f71368375 100644
--- a/satpy/etc/areas.yaml
+++ b/satpy/etc/areas.yaml
@@ -300,21 +300,21 @@ himawari_ahi_fes_1km:
     lower_left_xy: [-5500000.0355, -5500000.0355]
     upper_right_xy: [5500000.0355, 5500000.0355]
 
-  himawari_ahi_fes_2km:
-    description:
-      Himawari-8/9 full disk area definition at 2km resolution
-    projection:
-      proj: geos
-      lon_0: 140.7
-      a: 6378137.0
-      rf: 298.257024882273
-      h: 35785863.0
-    shape:
-      height: 5500
-      width: 5500
-    area_extent:
-      lower_left_xy: [ -5499999.9012, -5499999.9012 ]
-      upper_right_xy: [ 5499999.9012, 5499999.9012 ]
+himawari_ahi_fes_2km:
+  description:
+    Himawari-8/9 full disk area definition at 2km resolution
+  projection:
+    proj: geos
+    lon_0: 140.7
+    a: 6378137.0
+    rf: 298.257024882273
+    h: 35785863.0
+  shape:
+    height: 5500
+    width: 5500
+  area_extent:
+    lower_left_xy: [ -5499999.9012, -5499999.9012 ]
+    upper_right_xy: [ 5499999.9012, 5499999.9012 ]
 
 
 # Regional