update

mapsplugin · Mar 20, 2015 · 24c9454 · 24c9454
1 parent c353eed
commit 24c9454
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 15 deletions.
diff --git a/...deproj/project.xcworkspace/xcuserdata/wf9a5m75.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/wf9a5m75.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/src/ios/GoogleMaps/GoogleMapsViewController.h b/src/ios/GoogleMaps/GoogleMapsViewController.h
@@ -12,7 +12,7 @@
 #import "PluginUtil.h"
 #import "NSData+Base64.h"
 
-@interface GoogleMapsViewController : UIViewController<GMSMapViewDelegate>
+@interface GoogleMapsViewController : UIViewController<GMSMapViewDelegate, GMSIndoorDisplayDelegate>
 
 @property (nonatomic, strong) GMSMapView* map;
 @property (nonatomic, strong) UIWebView* webView;
@@ -37,4 +37,7 @@
 
 - (void)removeObjectForKey: (NSString *)key;
 - (BOOL)didTapMyLocationButtonForMapView:(GMSMapView *)mapView;
+
+- (void) didChangeActiveBuilding: (GMSIndoorBuilding *)building;
+- (void) didChangeActiveLevel: (GMSIndoorLevel *)level;
 @end
diff --git a/src/ios/GoogleMaps/GoogleMapsViewController.m b/src/ios/GoogleMaps/GoogleMapsViewController.m
@@ -83,6 +83,9 @@ - (void)viewDidLoad
     //self.map.autoresizingMask = UIViewAutoresizingNone;
     self.map.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
+    //indoor display
+    self.map.indoorDisplay.delegate = self;
+
 
     BOOL isEnabled = NO;
     //controls
@@ -646,6 +649,43 @@ -(UIImage *)loadImageFromGoogleMap:(NSString *)fileName {
 }
 
 
+- (void) didChangeActiveBuilding: (GMSIndoorBuilding *)building {
+  //Notify to the JS
+  NSString* jsString = @"javascript:plugin.google.maps.Map._onMapEvent('indoor_building_focused')";
+  [self.webView stringByEvaluatingJavaScriptFromString:jsString];
+}
+
+- (void) didChangeActiveLevel: (GMSIndoorLevel *)activeLevel {
+
+  GMSIndoorBuilding *building = self.map.indoorDisplay.activeBuilding;
+
+  NSMutableDictionary *result = [NSMutableDictionary dictionary];
+
+  NSUInteger activeLevelIndex = [building.levels indexOfObject:activeLevel];
+  [result setObject:[NSNumber numberWithInteger:activeLevelIndex] forKey:@"activeLevelIndex"];
+  [result setObject:[NSNumber numberWithInteger:building.defaultLevelIndex] forKey:@"defaultLevelIndex"];
+
+  GMSIndoorLevel *level;
+  NSMutableDictionary *levelInfo;
+  NSMutableArray *levels = [NSMutableArray array];
+  for (level in building.levels) {
+    levelInfo = [NSMutableDictionary dictionary];
+
+    [levelInfo setObject:[NSString stringWithString:level.name] forKey:@"name"];
+    [levelInfo setObject:[NSString stringWithString:level.shortName] forKey:@"shortName"];
+    [levels addObject:levelInfo];
+  }
+  [result setObject:levels forKey:@"levels"];
+
+  NSError *error;
+  NSData *data = [NSJSONSerialization dataWithJSONObject:result options:NSJSONWritingPrettyPrinted error:&error];
+
+  NSString *JSONstring = [[NSString alloc] initWithData:data
+                                           encoding:NSUTF8StringEncoding];
+  NSString *jsString = [NSString stringWithFormat:@"javascript:plugin.google.maps.Map._onMapEvent('indoor_level_activated', %@)", JSONstring];
+
+  [self.webView stringByEvaluatingJavaScriptFromString:jsString];
+}
 
 
 

diff --git a/src/ios/GoogleMaps/Map.h b/src/ios/GoogleMaps/Map.h
@@ -28,4 +28,5 @@
 - (void)setAllGesturesEnabled:(CDVInvokedUrlCommand*)command;
 - (void)setPadding:(CDVInvokedUrlCommand*)command;
 - (void)panBy:(CDVInvokedUrlCommand*)command;
+- (void)getFocusedBuilding:(CDVInvokedUrlCommand*)command;
 @end
diff --git a/src/ios/GoogleMaps/Map.m b/src/ios/GoogleMaps/Map.m
@@ -470,4 +470,35 @@ - (void)setPadding:(CDVInvokedUrlCommand *)command {
 
   [self.mapCtrl.map setPadding:padding];
 }
+
+- (void)getFocusedBuilding:(CDVInvokedUrlCommand*)command {
+  GMSIndoorBuilding *building = self.mapCtrl.map.indoorDisplay.activeBuilding;
+  if (building != nil) {
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+  }
+  GMSIndoorLevel *activeLevel = self.mapCtrl.map.indoorDisplay.activeLevel;
+
+  NSMutableDictionary *result = [NSMutableDictionary dictionary];
+
+  NSUInteger activeLevelIndex = [building.levels indexOfObject:activeLevel];
+  [result setObject:[NSNumber numberWithInteger:activeLevelIndex] forKey:@"activeLevelIndex"];
+  [result setObject:[NSNumber numberWithInteger:building.defaultLevelIndex] forKey:@"defaultLevelIndex"];
+
+  GMSIndoorLevel *level;
+  NSMutableDictionary *levelInfo;
+  NSMutableArray *levels = [NSMutableArray array];
+  for (level in building.levels) {
+    levelInfo = [NSMutableDictionary dictionary];
+
+    [levelInfo setObject:[NSString stringWithString:level.name] forKey:@"name"];
+    [levelInfo setObject:[NSString stringWithString:level.shortName] forKey:@"shortName"];
+    [levels addObject:levelInfo];
+  }
+  [result setObject:levels forKey:@"levels"];
+
+
+  CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:result];
+  [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
 @end
diff --git a/www/index.html b/www/index.html
@@ -4,28 +4,29 @@
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
     <meta charset="utf-8" />
     <title>Google Maps Plugin for Cordova</title>
-    <link rel="stylesheet" type="text/css" href="css/animate.css" />
-    <link href="css/prettify.css" type="text/css" rel="stylesheet" />
-    <link href="css/app.css" type="text/css" rel="stylesheet" />
     <script type="text/javascript" src="cordova.js"></script>
-    <script type="text/javascript" src="js/prettify.js"></script>
     <script type="text/javascript" src="js/jquery.min.js"></script>
-    <script type="text/javascript" src="js/jquery.fittext.js"></script>
-    <script type="text/javascript" src="js/example.js"></script>
+    <script type="text/javascript">
+      var map;
+      function onDeviceReady() {
+        map = plugin.google.maps.Map.getMap($("map_canvas")[0]);
+        map.on("map_ready", onMapReady);
+        map.on("indoor_level_activated", onIndoorLevelActived);
+      }
+      function onMapReady() {
+      }
+      function onIndoorLevelActived(building) {
+        console.log(building);
+      }
+      $(document).one("deviceready", onDeviceReady);
+    </script>
     <style type="text/css">
-      html,body {
+      html,body, #map_canvas {
         width: 100%;
         height: 100%;
         margin: 0;
         padding: 0;
       }
-      #map_canvas {
-        width: 70%;
-        height: 70%;
-        margin: 15%;
-        padding: 0;
-        border: 1px solid red;
-      }
     </style>
   </head>
   <body>