@@ -87,46 +87,50 @@ @implementation MapDelegate
8787
8888- (id ) init {
8989 if (self = [super init ]) {
90- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults ];
91- [defaults addObserver: self
92- forKeyPath: @" mapType"
93- options: NSKeyValueObservingOptionNew
94- context: NULL ];
95-
96- [defaults addObserver: self
97- forKeyPath: kCurrentEventIdKey
98- options: NSKeyValueObservingOptionNew
99- context: NULL ];
100-
101- if (!self.hideStaticLayers ) {
102- [defaults addObserver: self
103- forKeyPath: @" selectedStaticLayers"
104- options: NSKeyValueObservingOptionNew
105- context: NULL ];
106- }
107-
90+ [self setupListeners ];
91+ }
92+
93+ return self;
94+ }
95+
96+ - (void ) setupListeners {
97+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults ];
98+ [defaults addObserver: self
99+ forKeyPath: @" mapType"
100+ options: NSKeyValueObservingOptionNew
101+ context: NULL ];
102+
103+ [defaults addObserver: self
104+ forKeyPath: kCurrentEventIdKey
105+ options: NSKeyValueObservingOptionNew
106+ context: NULL ];
107+
108+ if (!self.hideStaticLayers ) {
108109 [defaults addObserver: self
109- forKeyPath: @" selectedOnlineLayers "
110+ forKeyPath: @" selectedStaticLayers "
110111 options: NSKeyValueObservingOptionNew
111112 context: NULL ];
112-
113- self.mapCacheOverlays = [[NSMutableDictionary alloc ] init ];
114- [[CacheOverlays getInstance ] registerListener: self ];
115- self.cacheOverlayUpdate = nil ;
116- self.cacheOverlayUpdateLock = [[NSObject alloc ] init ];
117- self.updatingCacheOverlays = false ;
118- self.waitingCacheOverlaysUpdate = false ;
119- GPKGGeoPackageManager * geoPackageManager = [GPKGGeoPackageFactory manager ];
120- self.geoPackageCache = [[GPKGGeoPackageCache alloc ]initWithManager:geoPackageManager];
121-
122- self.locationManager = [[CLLocationManager alloc ] init ];
123- self.locationManager .delegate = self;
124-
125- [[NSNotificationCenter defaultCenter ] addObserver: self selector: @selector (formFetched: ) name: MAGEFormFetched object: nil ];
126- self.darkMode = false ;
127113 }
128114
129- return self;
115+ [defaults addObserver: self
116+ forKeyPath: @" selectedOnlineLayers"
117+ options: NSKeyValueObservingOptionNew
118+ context: NULL ];
119+
120+ self.mapCacheOverlays = [[NSMutableDictionary alloc ] init ];
121+ [[CacheOverlays getInstance ] registerListener: self ];
122+ self.cacheOverlayUpdate = nil ;
123+ self.cacheOverlayUpdateLock = [[NSObject alloc ] init ];
124+ self.updatingCacheOverlays = false ;
125+ self.waitingCacheOverlaysUpdate = false ;
126+ GPKGGeoPackageManager * geoPackageManager = [GPKGGeoPackageFactory manager ];
127+ self.geoPackageCache = [[GPKGGeoPackageCache alloc ]initWithManager:geoPackageManager];
128+
129+ self.locationManager = [[CLLocationManager alloc ] init ];
130+ self.locationManager .delegate = self;
131+
132+ [[NSNotificationCenter defaultCenter ] addObserver: self selector: @selector (formFetched: ) name: MAGEFormFetched object: nil ];
133+ self.darkMode = false ;
130134}
131135
132136// map annotation drop code from: https://stackoverflow.com/questions/6808876/how-do-i-animate-mkannotationview-drop
0 commit comments