iOS: Call [CDVViewController registerPlugin:withPluginName:] instead calling private properties

- Since cordova-ios 8 the properties `pluginObjects` and `pluginsMap` in `CDVViewController` are deprecated and should not be used anymore. [CDVViewController registerPlugin:withPluginName:] is used, when `setObject` or `setValue` was called on these deprecated properties before.
- Removed deregistering of pseudo map plugins in`pluginUnload` by using private properties `pluginObjects` and `pluginsMap` of `CDVViewController`. There is no equivalent method in `CDVViewController` for deregister a plugin.

Author: GitToTheHub

src/ios/GoogleMaps/CordovaGoogleMaps.m

@@ -155,20 +155,14 @@ -(void)pageDidLoad {
 }
 
 - (void)_destroyMap:(NSString *)mapId {
-  if (![self.viewPlugins objectForKey:mapId]) {
-    return;
-  }
-  CDVViewController *cdvViewController = (CDVViewController*)self.viewController;
+  if (![self.viewPlugins objectForKey:mapId]) return;
 
   CDVPlugin<IPluginView> *pluginView = [self.viewPlugins objectForKey:mapId];
   if ([mapId hasPrefix:@"streetview_"]) {
     PluginStreetViewPanorama *pluginSV = (PluginStreetViewPanorama *)pluginView;
     pluginSV.isRemoved = YES;
     //[pluginSV clear:nil];
     [pluginSV pluginUnload];
-    [cdvViewController.pluginObjects setObject:pluginView forKey:mapId];
-    [cdvViewController.pluginsMap setValue:mapId forKey:mapId];
-
     [self.pluginLayer removePluginOverlay:pluginSV.panoramaCtrl];
     pluginSV.panoramaCtrl.view = nil;
     pluginSV = nil;
@@ -177,10 +171,6 @@ - (void)_destroyMap:(NSString *)mapId {
     pluginMap.isRemoved = YES;
     //[pluginMap clear:nil];
     [pluginMap pluginUnload];
-
-    [cdvViewController.pluginObjects setObject:pluginView forKey:mapId];
-    [cdvViewController.pluginsMap setValue:mapId forKey:mapId];
-
     [self.pluginLayer removePluginOverlay:pluginMap.mapCtrl];
 
     pluginMap.mapCtrl.view = nil;
@@ -193,8 +183,6 @@ - (void)_destroyMap:(NSString *)mapId {
 
 
   [self.viewPlugins removeObjectForKey:mapId];
-
-  [cdvViewController.pluginObjects removeObjectForKey:mapId];
 }
 /**
  * Remove the map
@@ -248,8 +236,7 @@ - (void)getMap:(CDVInvokedUrlCommand *)command {
             [pluginMap setCommandDelegate:cdvViewController.commandDelegate];
         }
 
-        [cdvViewController.pluginObjects setObject:pluginMap forKey:mapId];
-        [cdvViewController.pluginsMap setValue:mapId forKey:mapId];
+        [cdvViewController registerPlugin:pluginMap withPluginName:mapId];
         [pluginMap pluginInitialize];
 
         [self.viewPlugins setObject:pluginMap forKey:mapId];
@@ -433,8 +420,8 @@ - (void)getPanorama:(CDVInvokedUrlCommand *)command {
     if ([pluginStreetView respondsToSelector:@selector(setCommandDelegate:)]) {
       [pluginStreetView setCommandDelegate:cdvViewController.commandDelegate];
     }
-    [cdvViewController.pluginObjects setObject:pluginStreetView forKey:panoramaId];
-    [cdvViewController.pluginsMap setValue:panoramaId forKey:panoramaId];
+    
+    [cdvViewController registerPlugin:pluginStreetView withPluginName:panoramaId];
     [pluginStreetView pluginInitialize];
 
     [self.viewPlugins setObject:pluginStreetView forKey:panoramaId];

src/ios/GoogleMaps/PluginCircle.m

@@ -35,15 +35,6 @@ - (void)pluginUnload
         }
         [self.mapCtrl.objects removeObjectForKey:key];
     }
-
-    key = nil;
-    keys = nil;
-
-    NSString *pluginId = [NSString stringWithFormat:@"%@-circle", self.mapCtrl.overlayId];
-    CDVViewController *cdvViewController = (CDVViewController*)self.viewController;
-    [cdvViewController.pluginObjects removeObjectForKey:pluginId];
-    [cdvViewController.pluginsMap setValue:nil forKey:pluginId];
-    pluginId = nil;
 }
 -(void)setPluginViewController:(PluginViewController *)viewCtrl
 {

src/ios/GoogleMaps/PluginGroundOverlay.m

@@ -37,18 +37,6 @@ - (void)pluginUnload
         }
         [self.mapCtrl.objects removeObjectForKey:key];
     }
-
-  //[self.imgCache removeAllObjects];
-  //self.imgCache = nil;
-
-  key = nil;
-  keys = nil;
-
-  NSString *pluginId = [NSString stringWithFormat:@"%@-groundoverlay", self.mapCtrl.overlayId];
-  CDVViewController *cdvViewController = (CDVViewController*)self.viewController;
-  [cdvViewController.pluginObjects removeObjectForKey:pluginId];
-  [cdvViewController.pluginsMap setValue:nil forKey:pluginId];
-  pluginId = nil;
 }
 
 -(void)setPluginViewController:(PluginViewController *)viewCtrl

src/ios/GoogleMaps/PluginMap.m

@@ -93,8 +93,8 @@ - (void)loadPlugin:(CDVInvokedUrlCommand*)command {
       if ([plugin respondsToSelector:@selector(setCommandDelegate:)]) {
         [plugin setCommandDelegate:cdvViewController.commandDelegate];
       }
-      [cdvViewController.pluginObjects setObject:plugin forKey:pluginId];
-      [cdvViewController.pluginsMap setValue:pluginId forKey:pluginId];
+      
+      [cdvViewController registerPlugin:plugin withPluginName:pluginId];
       [plugin pluginInitialize];
 
       //NSLog(@"--->loadPlugin : %@ className : %@, plugin : %@", pluginId, className, plugin);
@@ -258,20 +258,9 @@ - (void)clear:(CDVInvokedUrlCommand *)command {
   dispatch_async(dispatch_get_main_queue(), ^{
     [self.mapCtrl.map clear];
   });
-
-
-  CDVViewController *cdvViewController = (CDVViewController*)self.viewController;
-  CDVPlugin<IPluginProtocol> *plugin;
-  NSString *pluginName;
-  NSArray *keys = [self.mapCtrl.plugins allKeys];
-  for (int j = 0; j < [keys count]; j++) {
-    pluginName = [keys objectAtIndex:j];
-    plugin = [self.mapCtrl.plugins objectForKey:pluginName];
-    [plugin pluginUnload];
-
-    [cdvViewController.pluginObjects removeObjectForKey:pluginName];
-    [cdvViewController.pluginsMap setValue:nil forKey:pluginName];
-    //plugin = nil;
+  
+  for (id pluginName in [self.mapCtrl.plugins allKeys]) {
+    [[self.mapCtrl.plugins objectForKey:pluginName] pluginUnload];
   }
 
   [self.mapCtrl.plugins removeAllObjects];

src/ios/GoogleMaps/PluginMarker.m

@@ -46,15 +46,6 @@ - (void)pluginUnload
   }
 
   [[UIImageCache sharedInstance] removeAllCachedImages];
-  key = nil;
-  keys = nil;
-
-
-  NSString *pluginId = [NSString stringWithFormat:@"%@-marker", self.mapCtrl.overlayId];
-  CDVViewController *cdvViewController = (CDVViewController*)self.viewController;
-  [cdvViewController.pluginObjects removeObjectForKey:pluginId];
-  //[cdvViewController.pluginsMap setValue:nil forKey:pluginId];
-  pluginId = nil;
 }
 
 /**

src/ios/GoogleMaps/PluginPolygon.m

@@ -30,15 +30,6 @@ - (void)pluginUnload
       }
       [self.mapCtrl.objects removeObjectForKey:key];
   }
-
-  key = nil;
-  keys = nil;
-
-  NSString *pluginId = [NSString stringWithFormat:@"%@-polygon", self.mapCtrl.overlayId];
-  CDVViewController *cdvViewController = (CDVViewController*)self.viewController;
-  [cdvViewController.pluginObjects removeObjectForKey:pluginId];
-  [cdvViewController.pluginsMap setValue:nil forKey:pluginId];
-  pluginId = nil;
 }
 
 

src/ios/GoogleMaps/PluginPolyline.m

@@ -41,15 +41,6 @@ - (void)pluginUnload
       }
       [self.mapCtrl.objects removeObjectForKey:key];
   }
-
-  key = nil;
-  keys = nil;
-
-  NSString *pluginId = [NSString stringWithFormat:@"%@-polyline", self.mapCtrl.overlayId];
-  CDVViewController *cdvViewController = (CDVViewController*)self.viewController;
-  [cdvViewController.pluginObjects removeObjectForKey:pluginId];
-  [cdvViewController.pluginsMap setValue:nil forKey:pluginId];
-  pluginId = nil;
 }
 
 -(void)create:(CDVInvokedUrlCommand *)command

src/ios/GoogleMaps/PluginTileOverlay.m

@@ -54,15 +54,6 @@ - (void)pluginUnload
 
   [self.imgCache removeAllObjects];
   self.imgCache = nil;
-
-  key = nil;
-  keys = nil;
-
-  NSString *pluginId = [NSString stringWithFormat:@"%@-tileoverlay", self.mapCtrl.overlayId];
-  CDVViewController *cdvViewController = (CDVViewController*)self.viewController;
-  [cdvViewController.pluginObjects removeObjectForKey:pluginId];
-  [cdvViewController.pluginsMap setValue:nil forKey:pluginId];
-  pluginId = nil;
 }
 
 -(void)create:(CDVInvokedUrlCommand *)command