Skip to content

Commit 22a1ba9

Browse files
Merge pull request #146 from ngageoint/develop (5,000 Observation Fix)
Merge Changes for 4.3.0 Release - Fixes performance issues for 5,000+ observations
2 parents 4063c20 + 6d85166 commit 22a1ba9

File tree

80 files changed

+574
-516
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+574
-516
lines changed

MAGE.xcodeproj/project.pbxproj

Lines changed: 168 additions & 42 deletions
Large diffs are not rendered by default.

MAGE.xcodeproj/xcshareddata/xcschemes/MAGE.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
buildConfiguration = "Debug">
138138
</AnalyzeAction>
139139
<ArchiveAction
140-
buildConfiguration = "Debug"
140+
buildConfiguration = "Release"
141141
revealArchiveInOrganizer = "YES">
142142
</ArchiveAction>
143143
</Scheme>

MAGE.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 136 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MAGEGeoPackageTests/Map/GeoPackage/GeoPackageImporterTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import XCTest
1010
import OHHTTPStubs
1111
import Nimble
12-
import geopackage_ios
12+
import GeoPackage
1313
import OSLog
1414

1515
@testable import MAGE

MAGEGeoPackageTests/Map/GeoPackage/GeoPackageImporterUITests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import XCTest
1010
import Nimble
1111
import Quick
12-
import geopackage_ios
12+
import GeoPackage
1313
import OHHTTPStubs
1414

1515
@testable import MAGE

MAGEGeoPackageTests/Map/GeoPackage/GeoPackageTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import XCTest
1010
import OHHTTPStubs
11-
import geopackage_ios
11+
import GeoPackage
1212
import OSLog
1313

1414
@testable import MAGE

MAGEGeoPackageTests/TestingAppDelegate.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
#import <Foundation/Foundation.h>
1010
#import "TestingAppDelegate.h"
1111
#import "MagicalRecord+MAGE.h"
12-
#import "GPKGGeoPackageManager.h"
13-
#import "GPKGGeoPackageFactory.h"
12+
@import GeoPackage;
1413
#import "MAGE-Swift.h"
1514

1615
@interface TestingAppDelegate ()

Mage/AppDelegate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#import <AFNetworking/AFNetworkActivityIndicatorManager.h>
1313
#import "MageSessionManager.h"
1414
#import "MagicalRecord+MAGE.h"
15-
#import "GPKGGeoPackageFactory.h"
15+
@import GeoPackage;
1616
#import "MageConstants.h"
1717
#import "MageOfflineObservationManager.h"
1818
#import "MageAppCoordinator.h"

Mage/BaseMapOverlay.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import Foundation
1010
import MapFramework
11-
import geopackage_ios
11+
import GeoPackage
1212

1313
@objc class BaseMapOverlay: GPKGFeatureOverlay, OverlayRenderable {
1414
var renderer: MKOverlayRenderer {

Mage/CoordinateDisplayType.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import Foundation
99
import MapKit
10-
import gars_ios
11-
import mgrs_ios
10+
import GARS
11+
import MGRS
1212
import CLLocationCoordinate2DExtensions
1313

1414
enum CoordinateDisplayType: Int, CustomStringConvertible {

0 commit comments

Comments
 (0)