rhodes 3.2.0.beta.1 → 3.2.0.beta.2

data/doc/device-caps.txt

@@ -1201,13 +1201,16 @@ Preload map tiles for region (0<=zoom<=18):
 	  end
 	
 	  def preload_map
-	      min_zoom = 3
-	      max_zoom = 13
-	      top_latitude = 60.1
-	      left_longitude = 30.0
-	      bottom_latitude = 59.7
-	      right_longitude = 30.6
-	      total_tiles_for_preload_count = MapView.preload_map_tiles('OSM', 'roadmap', top_latitude, left_longitude, bottom_latitude, right_longitude, min_zoom, max_zoom, url_for(:action => :preload_callback))    
+	      options = { :engine => 'OSM',
+	          :map_type => 'roadmap',
+	          :top_latitude => 60.1,
+	          :left_longitude => 30.0,
+	          :bottom_latitude => 59.7,
+	          :right_longitude => 30.6,
+	          :min_zoom => 9,
+	          :max_zoom => 11
+	        }
+	      total_tiles_for_preload_count = MapView.preload_map_tiles(options, url_for(:action => :preload_callback))    
 	      redirect :action => :index
 	  end
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java

@@ -874,7 +874,7 @@ public class RhodesService extends Service {
 			if (params != null) {
 				Bundle startParams = new Bundle();
 				if (params instanceof String) {
-					if (!((String)params).isEmpty()) {
+					if (((String)params).length() != 0) {
 						String[] paramStrings = ((String)params).split("&");
 						for(int i = 0; i < paramStrings.length; ++i) {
 							String key = paramStrings[i];

data/platform/iphone/Classes/MapView/MapViewManager.m

@@ -194,6 +194,8 @@ double mapview_state_center_lon() {
 void mapview_set_file_caching_enable(int enable) {
 }
 
+/*
 int mapview_preload_map_tiles(const char* engine, const char* map_type, double top_latitude, double left_longitude, double bottom_latitude, double right_longitude, int min_zoom, int max_zoom, const char* callback) {
     return 0;
 }
+*/

data/platform/iphone/Classes/MapView/RhoMapViewController.h

@@ -0,0 +1,60 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#ifdef __IPHONE_3_0
+
+#import <MapKit/MapKit.h>
+#import <MapKit/MKAnnotation.h>
+#import <MapKit/MKReverseGeocoder.h>
+#import "GoogleGeocoder.h"
+#import "RhoViewController.h"
+
+#include "ruby/ext/rho/rhoruby.h"
+
+
+#import "MapViewManager.h" 
+
+@interface RhoMapViewController : RhoViewController {
+    UIView *mapView;
+    UIToolbar* toolbar;
+	UIView* savedMainView;
+}
+
+// 
+@property (nonatomic,retain) UIView *savedMainView;
+
++ (void)createMap:(rho_param*)params;
++ (void)closeMap;
++ (BOOL)isStarted;
++ (double)centerLatitude;
++ (double)centerLongitude;
+
+- (void)close;
+- (void)setParams:(rho_param*)params;
+
+@end
+
+#endif

data/platform/iphone/Classes/MapView/RhoMapViewController.m

@@ -0,0 +1,217 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#ifdef __IPHONE_3_0
+
+#import "MapAnnotation.h"
+#import "RhoMapViewController.h"
+#import "Rhodes.h"
+#import "RhoMainView.h"
+
+#include "logging/RhoLog.h"
+#include "ruby/ext/rho/rhoruby.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "MapView"
+
+static RhoMapViewController *mc = nil;
+
+@interface RhoCreateRhoMapTask : NSObject {}
++ (void)run:(NSValue*)value;
+@end
+
+@implementation RhoCreateRhoMapTask
++ (void)run:(NSValue*)value {
+    if (mc) {
+        [mc close];
+        mc = nil;
+    }
+    RhoMapViewController* map = [[RhoMapViewController alloc] init];
+    [map setParams:[value pointerValue]];
+    UIWindow *window = [[Rhodes sharedInstance] rootWindow];
+	map.view.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+	map.view.autoresizesSubviews = YES;
+	
+	UIView* v = [[[Rhodes sharedInstance] mainView] view];
+	map.savedMainView = v;
+	[map.savedMainView retain];
+    [map.savedMainView removeFromSuperview];
+	[window addSubview:map.view];
+    mc = map;
+}
+@end
+
+@interface RhoCloseRhoMapTask : NSObject
++ (void)run;
+@end
+
+@implementation RhoCloseRhoMapTask
++ (void)run {
+    if (mc) {
+        [mc close];
+        mc = nil;
+    }
+}
+@end
+
+
+@implementation RhoMapViewController
+
+@synthesize savedMainView;
+
++ (void)createMap:(rho_param *)params {
+    id runnable = [RhoCreateRhoMapTask class];
+    id arg = [NSValue valueWithPointer:params];
+    [Rhodes performOnUiThread:runnable arg:arg wait:NO];
+}
+
++ (void)closeMap {
+    id runnable = [RhoCloseRhoMapTask class];
+    [Rhodes performOnUiThread:runnable wait:NO];
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+    if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
+         // setup
+    
+    }
+    return self;
+}
+
+- (void)close {
+    [self dismissModalViewControllerAnimated:YES]; 
+    
+	UIWindow *window = [[Rhodes sharedInstance] rootWindow];
+
+
+	[window addSubview:self.savedMainView];
+	[self.view removeFromSuperview];
+
+	[self.savedMainView release];
+	self.savedMainView = nil;
+}
+
+- (void)setParams:(rho_param*)p {
+
+    
+    
+    rho_param_free(p);
+}
+
+
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    //Initialize the toolbar
+    toolbar = [[UIToolbar alloc] init];
+    toolbar.barStyle = UIBarStyleBlack;
+    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc]
+                               initWithTitle:@"Close" style:UIBarButtonItemStyleBordered 
+                               target:self action:@selector(close_clicked:)];
+    [toolbar setItems:[NSArray arrayWithObjects:closeButton,nil]];
+
+	
+	toolbar.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | 
+	UIViewAutoresizingFlexibleWidth;
+	toolbar.autoresizesSubviews = YES;
+    [toolbar sizeToFit];
+	
+    CGFloat toolbarHeight = [toolbar frame].size.height;
+	// hack for do not reduce height of toolbar in Landscape mode
+	if (toolbarHeight < 44) {
+		toolbarHeight = 44;
+	}
+
+	CGRect rootViewBounds = [[[Rhodes sharedInstance] mainView] view].frame;//bounds;
+	
+	self.view.frame = rootViewBounds;
+	
+    CGFloat rootViewHeight = rootViewBounds.size.height;
+	//CGFloat rootViewHeight = CGRectGetHeight(rootViewBounds);
+    CGFloat rootViewWidth = CGRectGetWidth(rootViewBounds);
+    CGRect rectArea = CGRectMake(0, rootViewHeight - toolbarHeight, rootViewWidth, toolbarHeight);
+    toolbar.frame = rectArea;
+    
+	
+	[self.view addSubview:toolbar];
+    [closeButton release];
+    
+    CGRect rectMapArea = CGRectMake(0, 0, rootViewWidth, rootViewHeight - toolbarHeight);
+    //mapView =[[MKMapView alloc] initWithFrame:rectMapArea];
+	mapView = [[UIView alloc] initWithFrame:rectMapArea];
+    mapView.frame = rectMapArea;
+    //mapView.delegate=self;
+    mapView.autoresizesSubviews = YES;
+    mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	mapView.backgroundColor = [UIColor groupTableViewBackgroundColor];
+	
+	
+    [self.view insertSubview:mapView atIndex:0];
+	//[[self.view superview] layoutSubviews];
+	
+}
+
+- (void) close_clicked:(id)sender {
+    [self close];
+	//mc = nil;
+}
+
+- (void)didReceiveMemoryWarning {
+	// Releases the view if it doesn't have a superview.
+    [super didReceiveMemoryWarning];
+	
+	// Release any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+	// Release any retained subviews of the main view.
+	// e.g. self.myOutlet = nil;
+}
+
+
+- (void)dealloc {
+    [super dealloc];
+}
+
+
+
++ (BOOL)isStarted {
+    return mc != nil;
+}
+
++ (double)centerLatitude {
+	return 0.0;
+}
+
++ (double)centerLongitude {
+	return 0.0;
+}
+
+
+@end
+
+#endif

data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj

@@ -76,6 +76,20 @@
 		BDFCB13E112EE2B500AE3724 /* ssl.h in Headers */ = {isa = PBXBuildFile; fileRef = BDFCB13C112EE2B500AE3724 /* ssl.h */; };
 		FA5F58DF12ADDA6D00C7613A /* app_build_configs.c in Sources */ = {isa = PBXBuildFile; fileRef = FA5F58DD12ADDA6D00C7613A /* app_build_configs.c */; };
 		FA5F58E012ADDA6D00C7613A /* app_build_configs.h in Headers */ = {isa = PBXBuildFile; fileRef = FA5F58DE12ADDA6D00C7613A /* app_build_configs.h */; };
+		FAC6EE5B143B1FC800B8E352 /* BaseMapEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC6EE4F143B1FC800B8E352 /* BaseMapEngine.cpp */; };
+		FAC6EE5C143B1FC800B8E352 /* BaseMapEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC6EE50143B1FC800B8E352 /* BaseMapEngine.h */; };
+		FAC6EE5D143B1FC800B8E352 /* ESRIMapEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC6EE51143B1FC800B8E352 /* ESRIMapEngine.cpp */; };
+		FAC6EE5E143B1FC800B8E352 /* ESRIMapEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC6EE52143B1FC800B8E352 /* ESRIMapEngine.h */; };
+		FAC6EE5F143B1FC800B8E352 /* GeocodingMapEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC6EE53143B1FC800B8E352 /* GeocodingMapEngine.cpp */; };
+		FAC6EE60143B1FC800B8E352 /* GeocodingMapEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC6EE54143B1FC800B8E352 /* GeocodingMapEngine.h */; };
+		FAC6EE61143B1FC800B8E352 /* GoogleMapEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC6EE55143B1FC800B8E352 /* GoogleMapEngine.cpp */; };
+		FAC6EE62143B1FC800B8E352 /* GoogleMapEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC6EE56143B1FC800B8E352 /* GoogleMapEngine.h */; };
+		FAC6EE63143B1FC800B8E352 /* MapEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC6EE57143B1FC800B8E352 /* MapEngine.cpp */; };
+		FAC6EE64143B1FC800B8E352 /* MapEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC6EE58143B1FC800B8E352 /* MapEngine.h */; };
+		FAC6EE65143B1FC800B8E352 /* OSMMapEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC6EE59143B1FC800B8E352 /* OSMMapEngine.cpp */; };
+		FAC6EE66143B1FC800B8E352 /* OSMMapEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC6EE5A143B1FC800B8E352 /* OSMMapEngine.h */; };
+		FAC6EE69143B20B600B8E352 /* RhoMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC6EE67143B20B600B8E352 /* RhoMath.cpp */; };
+		FAC6EE6A143B20B600B8E352 /* RhoMath.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC6EE68143B20B600B8E352 /* RhoMath.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -149,6 +163,20 @@
 		D2AAC046055464E500DB518D /* librholib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = librholib.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		FA5F58DD12ADDA6D00C7613A /* app_build_configs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = app_build_configs.c; path = ../../shared/common/app_build_configs.c; sourceTree = SOURCE_ROOT; };
 		FA5F58DE12ADDA6D00C7613A /* app_build_configs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = app_build_configs.h; path = ../../shared/common/app_build_configs.h; sourceTree = SOURCE_ROOT; };
+		FAC6EE4F143B1FC800B8E352 /* BaseMapEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BaseMapEngine.cpp; path = ../../shared/common/map/BaseMapEngine.cpp; sourceTree = "<group>"; };
+		FAC6EE50143B1FC800B8E352 /* BaseMapEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BaseMapEngine.h; path = ../../shared/common/map/BaseMapEngine.h; sourceTree = "<group>"; };
+		FAC6EE51143B1FC800B8E352 /* ESRIMapEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ESRIMapEngine.cpp; path = ../../shared/common/map/ESRIMapEngine.cpp; sourceTree = "<group>"; };
+		FAC6EE52143B1FC800B8E352 /* ESRIMapEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESRIMapEngine.h; path = ../../shared/common/map/ESRIMapEngine.h; sourceTree = "<group>"; };
+		FAC6EE53143B1FC800B8E352 /* GeocodingMapEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GeocodingMapEngine.cpp; path = ../../shared/common/map/GeocodingMapEngine.cpp; sourceTree = "<group>"; };
+		FAC6EE54143B1FC800B8E352 /* GeocodingMapEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeocodingMapEngine.h; path = ../../shared/common/map/GeocodingMapEngine.h; sourceTree = "<group>"; };
+		FAC6EE55143B1FC800B8E352 /* GoogleMapEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GoogleMapEngine.cpp; path = ../../shared/common/map/GoogleMapEngine.cpp; sourceTree = "<group>"; };
+		FAC6EE56143B1FC800B8E352 /* GoogleMapEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GoogleMapEngine.h; path = ../../shared/common/map/GoogleMapEngine.h; sourceTree = "<group>"; };
+		FAC6EE57143B1FC800B8E352 /* MapEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MapEngine.cpp; path = ../../shared/common/map/MapEngine.cpp; sourceTree = "<group>"; };
+		FAC6EE58143B1FC800B8E352 /* MapEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapEngine.h; path = ../../shared/common/map/MapEngine.h; sourceTree = "<group>"; };
+		FAC6EE59143B1FC800B8E352 /* OSMMapEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OSMMapEngine.cpp; path = ../../shared/common/map/OSMMapEngine.cpp; sourceTree = "<group>"; };
+		FAC6EE5A143B1FC800B8E352 /* OSMMapEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OSMMapEngine.h; path = ../../shared/common/map/OSMMapEngine.h; sourceTree = "<group>"; };
+		FAC6EE67143B20B600B8E352 /* RhoMath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoMath.cpp; path = ../../shared/common/RhoMath.cpp; sourceTree = "<group>"; };
+		FAC6EE68143B20B600B8E352 /* RhoMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoMath.h; path = ../../shared/common/RhoMath.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -215,6 +243,9 @@
 		5C7162600F8B7DEE0096B6AA /* common */ = {
 			isa = PBXGroup;
 			children = (
+				FAC6EE67143B20B600B8E352 /* RhoMath.cpp */,
+				FAC6EE68143B20B600B8E352 /* RhoMath.h */,
+				FAC6EE4C143B1F1E00B8E352 /* map */,
 				5C0F94DE132979140093FA1B /* RhoTime.cpp */,
 				FA5F58DD12ADDA6D00C7613A /* app_build_configs.c */,
 				FA5F58DE12ADDA6D00C7613A /* app_build_configs.h */,
@@ -319,6 +350,25 @@
 			name = Documentation;
 			sourceTree = "<group>";
 		};
+		FAC6EE4C143B1F1E00B8E352 /* map */ = {
+			isa = PBXGroup;
+			children = (
+				FAC6EE4F143B1FC800B8E352 /* BaseMapEngine.cpp */,
+				FAC6EE50143B1FC800B8E352 /* BaseMapEngine.h */,
+				FAC6EE51143B1FC800B8E352 /* ESRIMapEngine.cpp */,
+				FAC6EE52143B1FC800B8E352 /* ESRIMapEngine.h */,
+				FAC6EE53143B1FC800B8E352 /* GeocodingMapEngine.cpp */,
+				FAC6EE54143B1FC800B8E352 /* GeocodingMapEngine.h */,
+				FAC6EE55143B1FC800B8E352 /* GoogleMapEngine.cpp */,
+				FAC6EE56143B1FC800B8E352 /* GoogleMapEngine.h */,
+				FAC6EE57143B1FC800B8E352 /* MapEngine.cpp */,
+				FAC6EE58143B1FC800B8E352 /* MapEngine.h */,
+				FAC6EE59143B1FC800B8E352 /* OSMMapEngine.cpp */,
+				FAC6EE5A143B1FC800B8E352 /* OSMMapEngine.h */,
+			);
+			name = map;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -366,6 +416,13 @@
 				5C2CE255122AEC87005EDBC4 /* RhoAppAdapter.h in Headers */,
 				FA5F58E012ADDA6D00C7613A /* app_build_configs.h in Headers */,
 				5CE03CCD12DB7E990058B474 /* sqlite3.h in Headers */,
+				FAC6EE5C143B1FC800B8E352 /* BaseMapEngine.h in Headers */,
+				FAC6EE5E143B1FC800B8E352 /* ESRIMapEngine.h in Headers */,
+				FAC6EE60143B1FC800B8E352 /* GeocodingMapEngine.h in Headers */,
+				FAC6EE62143B1FC800B8E352 /* GoogleMapEngine.h in Headers */,
+				FAC6EE64143B1FC800B8E352 /* MapEngine.h in Headers */,
+				FAC6EE66143B1FC800B8E352 /* OSMMapEngine.h in Headers */,
+				FAC6EE6A143B20B600B8E352 /* RhoMath.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -447,6 +504,13 @@
 				5CE03CCC12DB7E990058B474 /* sqlite3.c in Sources */,
 				5CB821AE1312487100778441 /* INetRequest.cpp in Sources */,
 				5C0F94DF132979140093FA1B /* RhoTime.cpp in Sources */,
+				FAC6EE5B143B1FC800B8E352 /* BaseMapEngine.cpp in Sources */,
+				FAC6EE5D143B1FC800B8E352 /* ESRIMapEngine.cpp in Sources */,
+				FAC6EE5F143B1FC800B8E352 /* GeocodingMapEngine.cpp in Sources */,
+				FAC6EE61143B1FC800B8E352 /* GoogleMapEngine.cpp in Sources */,
+				FAC6EE63143B1FC800B8E352 /* MapEngine.cpp in Sources */,
+				FAC6EE65143B1FC800B8E352 /* OSMMapEngine.cpp in Sources */,
+				FAC6EE69143B20B600B8E352 /* RhoMath.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

data/platform/iphone/rhorunner.xcodeproj/project.pbxproj

@@ -86,6 +86,7 @@
 		FA52317B12E7511700AB55CC /* esri.png in Resources */ = {isa = PBXBuildFile; fileRef = FA52317412E7511700AB55CC /* esri.png */; };
 		FA52317C12E7511700AB55CC /* esri@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA52317512E7511700AB55CC /* esri@2x.png */; };
 		FA52330112E9204300AB55CC /* BluePushpin@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA52330012E9204300AB55CC /* BluePushpin@2x.png */; };
+		FAC6EE6D143B3AF100B8E352 /* RhoMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FAC6EE6C143B3AF100B8E352 /* RhoMapViewController.m */; };
 		FACA4C781270AC0900777CFF /* LeftViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FACA4C711270AC0900777CFF /* LeftViewController.m */; };
 		FACA4C791270AC0900777CFF /* RightViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FACA4C731270AC0900777CFF /* RightViewController.m */; };
 		FACA4C7A1270AC0900777CFF /* SplittedMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = FACA4C751270AC0900777CFF /* SplittedMainView.m */; };
@@ -287,6 +288,8 @@
 		FA52317412E7511700AB55CC /* esri.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = esri.png; path = ESRI/esri.png; sourceTree = "<group>"; };
 		FA52317512E7511700AB55CC /* esri@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "esri@2x.png"; path = "ESRI/esri@2x.png"; sourceTree = "<group>"; };
 		FA52330012E9204300AB55CC /* BluePushpin@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "BluePushpin@2x.png"; path = "ESRI/BluePushpin@2x.png"; sourceTree = "<group>"; };
+		FAC6EE6B143B3AF100B8E352 /* RhoMapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoMapViewController.h; path = MapView/RhoMapViewController.h; sourceTree = "<group>"; };
+		FAC6EE6C143B3AF100B8E352 /* RhoMapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RhoMapViewController.m; path = MapView/RhoMapViewController.m; sourceTree = "<group>"; };
 		FACA4C701270AC0900777CFF /* LeftViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LeftViewController.h; path = SplitView/LeftViewController.h; sourceTree = "<group>"; };
 		FACA4C711270AC0900777CFF /* LeftViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LeftViewController.m; path = SplitView/LeftViewController.m; sourceTree = "<group>"; };
 		FACA4C721270AC0900777CFF /* RightViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RightViewController.h; path = SplitView/RightViewController.h; sourceTree = "<group>"; };
@@ -581,6 +584,8 @@
 		F5425BCD1060539A000CCA8C /* MapView */ = {
 			isa = PBXGroup;
 			children = (
+				FAC6EE6B143B3AF100B8E352 /* RhoMapViewController.h */,
+				FAC6EE6C143B3AF100B8E352 /* RhoMapViewController.m */,
 				FA52300B12E4BBC700AB55CC /* MapViewManager.h */,
 				FA52300C12E4BBC700AB55CC /* MapViewManager.m */,
 				F5128C2A106C1FF3002F00E5 /* GoogleGeocoder.h */,
@@ -996,6 +1001,7 @@
 				FA522E8012DEA7B300AB55CC /* NVViewController.m in Sources */,
 				FA522E8112DEA7B300AB55CC /* RhoNativeViewManager.mm in Sources */,
 				FA52300D12E4BBC700AB55CC /* MapViewManager.m in Sources */,
+				FAC6EE6D143B3AF100B8E352 /* RhoMapViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};