geopackage-ios 8.0.3 destroy and close calls for memory

ngageoint · Aug 24, 2023 · 661312a · 661312a
1 parent bcd94b6
commit 661312a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 0 deletions.
diff --git a/Mage/BaseMapOverlay.swift b/Mage/BaseMapOverlay.swift
@@ -18,6 +18,7 @@ import geopackage_ios
     @objc public var darkTheme = false
 
     @objc public func cleanup() {
+        super.close()
         featureTiles = nil
     }
 

diff --git a/Mage/GeoPackage/GeoPackage.m b/Mage/GeoPackage/GeoPackage.m
@@ -246,6 +246,7 @@ -(void) addGeoPackageCacheOverlay: (NSMutableDictionary<NSString *, CacheOverlay
 
                 SFPGeometryTransform *transform = [[SFPGeometryTransform alloc] initWithFromProjection:projection andToEpsg:PROJ_EPSG_WORLD_GEODETIC_SYSTEM];
                 GPKGBoundingBox * boundingBox = [contentsBoundingBox transform:transform];
+                [transform destroy];
                 boundingBox = [GPKGTileBoundingBoxUtils boundWgs84BoundingBoxWithWebMercatorLimits:boundingBox];
 
                 if(self.addedCacheBoundingBox == nil){
@@ -281,6 +282,9 @@ -(void) addGeoPackageTileCacheOverlay: (NSMutableDictionary<NSString *, CacheOve
                 cacheOverlay = nil;
             } else {
                 // remove the old one and it will be re-added to preserve layer order
+                if ([tileTableCacheOverlay.tileOverlay isKindOfClass:[GPKGBoundedOverlay class]]){
+                    [((GPKGBoundedOverlay *)tileTableCacheOverlay.tileOverlay) close];
+                }
                 [self.mapView removeOverlay:tileTableCacheOverlay.tileOverlay];
                 cacheOverlay = nil;
             }
@@ -293,6 +297,9 @@ -(void) addGeoPackageTileCacheOverlay: (NSMutableDictionary<NSString *, CacheOve
             [tileTableCacheOverlay setTileOverlay:geoPackageTileOverlay];
 
             // Check for linked feature tables
+            for (GPKGFeatureOverlayQuery *query in tileTableCacheOverlay.featureOverlayQueries) {
+                [query close];
+            }
             [tileTableCacheOverlay.featureOverlayQueries removeAllObjects];
             GPKGFeatureTileTableLinker * linker = [[GPKGFeatureTileTableLinker alloc] initWithGeoPackage:geoPackage];
             NSArray<GPKGFeatureDao *> * featureDaos = [linker featureDaosForTileTable:tileDao.tableName];
@@ -333,6 +340,7 @@ -(void) addGeoPackageTileCacheOverlay: (NSMutableDictionary<NSString *, CacheOve
                 [tileTableCacheOverlay removeFromMap:weakSelf.mapView];
             }
             if (geoPackageTileOverlay != nil) {
+                [geoPackageTileOverlay close];
                 [weakSelf.mapView removeOverlay:geoPackageTileOverlay];
             }
         });
@@ -468,6 +476,7 @@ -(void) addGeoPackageFeatureCacheOverlay: (NSMutableDictionary<NSString *, Cache
                 }
                 @finally {
                     [resultSet close];
+                    [shapeConverter close];
                 }
             }
 
@@ -494,6 +503,7 @@ -(void) addGeoPackageFeatureCacheOverlay: (NSMutableDictionary<NSString *, Cache
                 [featureTableCacheOverlay removeFromMap:weakSelf.mapView];
             }
             if (featureOverlay != nil) {
+                [featureOverlay close];
                 [self.mapView removeOverlay:featureOverlay];
             }
         });

diff --git a/Mage/Map/Cache/GeoPackageFeatureTableCacheOverlay.m b/Mage/Map/Cache/GeoPackageFeatureTableCacheOverlay.m
@@ -189,6 +189,7 @@ -(GPKGFeatureTableData *) getFeatureTableDataWithLocationCoordinate: (CLLocation
                                 SFPGeometryTransform *transform = [[SFPGeometryTransform alloc] initWithFromProjection:self.featureOverlayQuery.featureTiles.featureDao.projection andToEpsg:4326];
 
                                 centroid = [transform transformPoint:centroid];
+                                [transform destroy];
                                 coordinate = CLLocationCoordinate2DMake([centroid.y doubleValue], [centroid.x doubleValue]);
                             }
                             [featureDataTypes setValue:[GPKGDataTypes name:featureRow.featureColumns.columns[i].dataType] forKey:columnName];

diff --git a/Mage/Map/MapObservationManager.m b/Mage/Map/MapObservationManager.m
@@ -65,6 +65,7 @@ -(MapObservation *) addToMapWithObservation: (Observation *) observation withGeo
 
         GPKGMapShapeConverter *shapeConverter = [[GPKGMapShapeConverter alloc] init];
         GPKGMapShape *shape = [shapeConverter toShapeWithGeometry:geometry];
+        [shapeConverter close];
         switch(shape.shapeType){
             case GPKG_MST_POLYLINE:
                 {

diff --git a/Mage/Mixins/FilteredObservationsMap.swift b/Mage/Mixins/FilteredObservationsMap.swift
@@ -155,6 +155,7 @@ class FilteredObservationsMapMixin: NSObject, MapMixin {
                 let style = ObservationShapeStyleParser.style(of: observation)
                 let shapeConverter = GPKGMapShapeConverter()
                 let shape = shapeConverter?.toShape(with: geometry)
+                shapeConverter?.close()
 
                 if let mkpolyline = shape?.shape as? MKPolyline {
                     let styledPolyline = StyledPolyline.create(polyline: mkpolyline)

diff --git a/Mage/Mixins/SFGeometryMap.swift b/Mage/Mixins/SFGeometryMap.swift
@@ -46,6 +46,7 @@ class SFGeometryMapMixin: NSObject, MapMixin {
         }
         let shapeConverter: GPKGMapShapeConverter = GPKGMapShapeConverter()
         let shape = shapeConverter.add(sfGeometry, to: mapView)
+        shapeConverter.close()
         geometryToShape[sfGeometry] = shape
     }