Omit blank GEO properties on EventInstances

Author: gregjoy1

redical_core/src/event_instance.rs

@@ -17,6 +17,7 @@ use redical_ical::{
     properties::{
         ICalendarProperty,
         ICalendarDateTimeProperty,
+        ICalendarGeoProperty,
         CategoriesProperty,
         LocationTypeProperty,
         ClassProperty,
@@ -108,8 +109,12 @@ impl EventInstance {
         event_occurrence_override: Option<&EventOccurrenceOverride>,
     ) -> Option<GeoProperty> {
         if let Some(event_occurrence_override) = event_occurrence_override {
-            if event_occurrence_override.indexed_properties.geo.is_some() {
-                return event_occurrence_override.indexed_properties.geo.to_owned();
+            if let Some(overridden_geo_property) = event_occurrence_override.indexed_properties.geo.as_ref() {
+                if overridden_geo_property.is_present() {
+                    return Some(overridden_geo_property.to_owned());
+                } else {
+                    return None;
+                }
             }
         }
 

tests/integration.rs

@@ -908,7 +908,7 @@ mod integration {
                     "RELATED-TO;RELTYPE=PARENT:PARENT_UID",
                     "CATEGORIES:CATEGORY_ONE,OVERRIDDEN_CATEGORY", // <= Overridden
                     "LOCATION-TYPE:X-KEY=VALUE:LOCATION_TYPE",
-                    "GEO:;",                                       // <= Overridden
+                    // "GEO:;",                                    // <= Overridden (removed from EventInstance because blank)
                     "X-SPACES-BOOKED:12",                          // <= Overridden
                 ],
             ],
@@ -1160,7 +1160,7 @@ mod integration {
                         "DTEND:20210105T190000Z",
                         "DTSTART:20210105T183000Z",
                         "DURATION:PT30M",
-                        "GEO:;",
+                        // "GEO:;", <= Overridden (removed from EventInstance because blank)
                         "RECURRENCE-ID;VALUE=DATE-TIME:20210105T183000Z",
                         "RELATED-TO;RELTYPE=PARENT:PARENT_UID_OVERRIDE",
                         "SUMMARY:Overridden Event in Bristol on Tuesdays and Thursdays at 6:30PM (running online)",