make custom data override checkwx instead of replace

README.md

@@ -136,11 +136,12 @@ each parameter.
       mission brief.
   * `use-custom-data`: boolean
     * If true, Real Weather will load METAR data from a checkwx.json file
-      instead of accessing the CheckWX API. This data must be in the same format
-      CheckWX would provide. See [examples/checkwx.json](examples/checkwx.json)
-      and [checkwxapi.com](https://www.checkwxapi.com/documentation/metar) for
-      more info. Only the parameters shown in the example are currently
-      supported.
+      and overwrite data from the CheckWX API. This data must be in the same
+      format CheckWX would provide. See
+      [examples/checkwx.json](examples/checkwx.json) and
+      [checkwxapi.com](https://www.checkwxapi.com/documentation/metar) for more
+      info. Only the parameters shown in the example are currently supported.
+      If not all parameters are given, the missing data will come from CheckWX.
 * `options`
   * `update-time`: boolean
     * Disable/enable Real Weather modifying your mission time.

main.go

@@ -115,8 +115,14 @@ func getWx() weather.WeatherData {
 		debugCheckWx = true
 	}
 
+	data, err = weather.GetWeather(config.Get().METAR.ICAO, config.Get().APIKey)
+	if err != nil {
+		log.Printf("Error getting weather, using default: %v\n", err)
+		data = weather.DefaultWeather
+	}
+
 	if debugCheckWx {
-		log.Println("Using custom weather data from file...")
+		log.Println("Overriding weather with custom data from file...")
 		b, err := os.ReadFile("checkwx.json")
 		if err != nil {
 			log.Fatalf("Could not read checkwx.json: %v", err)
@@ -134,13 +140,6 @@ func getWx() weather.WeatherData {
 			log.Fatalf("Could not parse checkwx.json: %v", err)
 		}
 		log.Println("Parsed weather data: ")
-
-	} else {
-		data, err = weather.GetWeather(config.Get().METAR.ICAO, config.Get().APIKey)
-		if err != nil {
-			log.Printf("Error getting weather, using default: %v\n", err)
-			data = weather.DefaultWeather
-		}
 	}
 
 	return data