From cbaf279dbbb96c9fe32996ea1eaae70def2944c7 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 16 Mar 2023 14:49:29 +0000
Subject: [PATCH] ECC-1552: Revert for now (breaks Magics)

---
 src/grib_accessor_class_proj_string.cc | 12 +++++++-----
 tests/grib_proj_string.sh              | 21 +++++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/grib_accessor_class_proj_string.cc b/src/grib_accessor_class_proj_string.cc
index 4e02e4cfd..92d99c2a1 100644
--- a/src/grib_accessor_class_proj_string.cc
+++ b/src/grib_accessor_class_proj_string.cc
@@ -294,7 +294,8 @@ static int proj_polar_stereographic(grib_handle* h, char* result)
     return err;
 }
 
-// This is for regular_ll, regular_gg, reduced_ll, reduced_gg
+#if 0
+// ECC-1552: This is for regular_ll, regular_gg, reduced_ll, reduced_gg
 static int proj_unprojected(grib_handle* h, char* result)
 {
     int err = 0;
@@ -305,6 +306,7 @@ static int proj_unprojected(grib_handle* h, char* result)
     snprintf(result, 1024, "+proj=longlat %s", shape);
     return err;
 }
+#endif
 
 static int proj_mercator(grib_handle* h, char* result)
 {
@@ -323,10 +325,10 @@ static int proj_mercator(grib_handle* h, char* result)
 
 #define NUMBER(a) (sizeof(a) / sizeof(a[0]))
 static proj_mapping proj_mappings[] = {
-    { "regular_ll", &proj_unprojected },
-    { "regular_gg", &proj_unprojected },
-    { "reduced_ll", &proj_unprojected },
-    { "reduced_gg", &proj_unprojected },
+    // { "regular_ll", &proj_unprojected },
+    // { "regular_gg", &proj_unprojected },
+    // { "reduced_ll", &proj_unprojected },
+    // { "reduced_gg", &proj_unprojected },
 
     { "mercator", &proj_mercator },
     { "lambert", &proj_lambert_conformal },
diff --git a/tests/grib_proj_string.sh b/tests/grib_proj_string.sh
index 8400c3004..fe245782c 100755
--- a/tests/grib_proj_string.sh
+++ b/tests/grib_proj_string.sh
@@ -46,16 +46,17 @@ for f in `echo $files`; do
 done
 
 # Various grid types
-${tools_dir}/grib_get -p projString $grib2_sample > $tempText
-grep -q "proj=longlat +R=6367470" $tempText
-${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/regular_ll_pl_grib2.tmpl > $tempText
-grep -q "proj=longlat +R=6371229" $tempText
-${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/regular_gg_ml_grib1.tmpl > $tempText
-grep -q "proj=longlat +R=6367470" $tempText
-${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/reduced_ll_sfc_grib1.tmpl > $tempText
-grep -q "proj=longlat +R=6367470" $tempText
-${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/reduced_gg_pl_32_grib2.tmpl > $tempText
-grep -q "proj=longlat +R=6371229" $tempText
+# ECC-1552
+# ${tools_dir}/grib_get -p projString $grib2_sample > $tempText
+# grep -q "proj=longlat +R=6367470" $tempText
+# ${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/regular_ll_pl_grib2.tmpl > $tempText
+# grep -q "proj=longlat +R=6371229" $tempText
+# ${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/regular_gg_ml_grib1.tmpl > $tempText
+# grep -q "proj=longlat +R=6367470" $tempText
+# ${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/reduced_ll_sfc_grib1.tmpl > $tempText
+# grep -q "proj=longlat +R=6367470" $tempText
+# ${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/reduced_gg_pl_32_grib2.tmpl > $tempText
+# grep -q "proj=longlat +R=6371229" $tempText
 
 
 ${tools_dir}/grib_set -s gridType=lambert_azimuthal_equal_area $grib2_sample $tempGrib