added expression replacement for ERA5 configuration

Author: TomBlock

CHANGES.md

@@ -8,6 +8,7 @@
 * changed database to use relative archive paths and added migration tool
 * updated SLSTR reader to allow switching geo-coding source between tie-point/pixel
 * added database timeout to configuration
+* Updated ERA5 post-processing - simplify configuration
 
 ### Updates from version 1.5.4 to 1.5.5
 * updated to use SNAP version 8.0.9 / S3TBX version 8.0.6

post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/Era5PostProcessingPlugin.java

@@ -63,6 +63,11 @@ private static void parseSatelliteFields(Element rootElement, Configuration conf
                 }
             }
 
+            final Element sensorRefElement = satelliteFieldsElement.getChild("sensor-ref");
+            if (sensorRefElement != null) {
+                satelliteFieldsConfiguration.setSensorRef(sensorRefElement.getValue());
+            }
+
             final Element humidityElement = satelliteFieldsElement.getChild("an_ml_q");
             if (humidityElement != null) {
                 satelliteFieldsConfiguration.set_an_q_name(getElementValueTrimmed(humidityElement));
@@ -157,6 +162,11 @@ private static void parseMatchupFields(Element rootElement, Configuration config
         if (matchupFieldsElements != null) {
             final MatchupFieldsConfiguration matchupFieldsConfiguration = new MatchupFieldsConfiguration();
 
+            final Element insituRefElment = matchupFieldsElements.getChild("insitu-ref");
+            if (insituRefElment != null) {
+                matchupFieldsConfiguration.setInsituRef(insituRefElment.getValue());
+            }
+
             final Element windUElement = matchupFieldsElements.getChild("an_sfc_u10");
             if (windUElement != null) {
                 matchupFieldsConfiguration.set_an_u10_name(getElementValueTrimmed(windUElement));

post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/FieldsConfiguration.java

@@ -0,0 +1,25 @@
+package com.bc.fiduceo.post.plugin.era5;
+
+import org.esa.snap.core.util.StringUtils;
+
+class FieldsConfiguration {
+
+    protected String expand(String variableName, String key, String replacement) {
+        if (StringUtils.isNullOrEmpty(replacement)) {
+            return variableName;
+        } else {
+            final int idx = variableName.indexOf(key);
+            if (idx < 0) {
+                return variableName;
+            }
+
+            final StringBuilder stringBuilder = new StringBuilder();
+            if (idx > 0) {
+                stringBuilder.append(variableName, 0, idx);
+            }
+            stringBuilder.append(replacement);
+            stringBuilder.append(variableName.substring(idx + key.length()));
+            return stringBuilder.toString();
+        }
+    }
+}

post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/MatchupFieldsConfiguration.java

@@ -2,8 +2,9 @@
 
 import org.esa.snap.core.util.StringUtils;
 
-class MatchupFieldsConfiguration {
+class MatchupFieldsConfiguration extends FieldsConfiguration {
 
+    public static final String INSITU_REF = "{insitu-ref}";
     private String an_u10_name;
     private String an_v10_name;
     private String an_siconc_name;
@@ -22,6 +23,7 @@ class MatchupFieldsConfiguration {
     private String longitude_variable_name;
     private String latitude_variable_name;
     private String nwp_time_variable_name;
+    private String insituRef;
 
     MatchupFieldsConfiguration() {
         an_u10_name = "nwp_mu_u10";
@@ -42,82 +44,83 @@ class MatchupFieldsConfiguration {
         longitude_variable_name = null;
         latitude_variable_name = null;
         nwp_time_variable_name = null;
+        insituRef = null;
     }
 
     String get_an_u10_name() {
-        return an_u10_name;
+        return expand(an_u10_name);
     }
 
     void set_an_u10_name(String an_u10_name) {
         this.an_u10_name = an_u10_name;
     }
 
     String get_an_v10_name() {
-        return an_v10_name;
+        return expand(an_v10_name);
     }
 
     void set_an_v10_name(String an_v10_name) {
         this.an_v10_name = an_v10_name;
     }
 
     String get_an_siconc_name() {
-        return an_siconc_name;
+        return expand(an_siconc_name);
     }
 
     void set_an_siconc_name(String an_siconc_name) {
         this.an_siconc_name = an_siconc_name;
     }
 
     String get_an_sst_name() {
-        return an_sst_name;
+        return expand(an_sst_name);
     }
 
     void set_an_sst_name(String an_sst_name) {
         this.an_sst_name = an_sst_name;
     }
 
     String get_fc_metss_name() {
-        return fc_metss_name;
+        return expand(fc_metss_name);
     }
 
     void set_fc_metss_name(String fc_metss_name) {
         this.fc_metss_name = fc_metss_name;
     }
 
     String get_fc_mntss_name() {
-        return fc_mntss_name;
+        return expand(fc_mntss_name);
     }
 
     void set_fc_mntss_name(String fc_mntss_name) {
         this.fc_mntss_name = fc_mntss_name;
     }
 
     String get_fc_mslhf_name() {
-        return fc_mslhf_name;
+        return expand(fc_mslhf_name);
     }
 
     void set_fc_mslhf_name(String fc_mslhf_name) {
         this.fc_mslhf_name = fc_mslhf_name;
     }
 
     String get_fc_msnlwrf_name() {
-        return fc_msnlwrf_name;
+        return expand(fc_msnlwrf_name);
     }
 
     void set_fc_msnlwrf_name(String fc_msnlwrf_name) {
         this.fc_msnlwrf_name = fc_msnlwrf_name;
     }
 
     String get_fc_msnswrf_name() {
-        return fc_msnswrf_name;
+        return expand(fc_msnswrf_name);
     }
 
     void set_fc_msnswrf_name(String fc_msnswrf_name) {
         this.fc_msnswrf_name = fc_msnswrf_name;
     }
 
     String get_fc_msshf_name() {
-        return fc_msshf_name;
+        return expand(fc_msshf_name);
     }
 
     void set_fc_msshf_name(String fc_msshf_name) {
@@ -149,37 +152,45 @@ void set_time_dim_name(String time_dim_name) {
     }
 
     String get_time_variable_name() {
-        return time_variable_name;
+        return expand(time_variable_name);
     }
 
     void set_time_variable_name(String time_variable_name) {
         this.time_variable_name = time_variable_name;
     }
 
     String get_longitude_variable_name() {
-        return longitude_variable_name;
+        return expand(longitude_variable_name);
     }
 
     void set_longitude_variable_name(String longitude_variable_name) {
         this.longitude_variable_name = longitude_variable_name;
     }
 
     String get_latitude_variable_name() {
-        return latitude_variable_name;
+        return expand(latitude_variable_name);
     }
 
     void set_latitude_variable_name(String latitude_variable_name) {
         this.latitude_variable_name = latitude_variable_name;
     }
 
     String get_nwp_time_variable_name() {
-        return nwp_time_variable_name;
+        return expand(nwp_time_variable_name);
     }
 
     void set_nwp_time_variable_name(String nwp_time_variable_name) {
         this.nwp_time_variable_name = nwp_time_variable_name;
     }
 
+    public String getInsituRef() {
+        return insituRef;
+    }
+
+    public void setInsituRef(String insituRef) {
+        this.insituRef = insituRef;
+    }
+
     boolean verify() {
         if (time_steps_past < 0) {
             throw new IllegalArgumentException("time steps past not configured");
@@ -204,4 +215,8 @@ boolean verify() {
         }
         return true;
     }
+
+    private String expand(String variableName) {
+        return expand(variableName, INSITU_REF, insituRef);
+    }
 }