rhodes 2.0.0.beta1 → 2.0.0.beta2

data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java

@@ -22,6 +22,7 @@ public class Annotation {
 		}
 	};
 	
+	public String type = null;
 	public String title = null;
 	public String subtitle = null;
 	public String street_address = null;

data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java

@@ -6,6 +6,10 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
 
+import org.json.me.JSONArray;
+import org.json.me.JSONException;
+import org.json.me.JSONObject;
+
 import j2me.lang.MathEx;
 
 import com.rho.RhoClassFactory;
@@ -374,7 +378,7 @@ public class GoogleMapField extends Field implements RhoMapField {
 			cmd.mapField.draw(cmd.latitude, cmd.longitude, cmd.zoom, img);
 		}
 		
-		private void processCommand(MapGeocodingCommand cmd) throws IOException {
+		private void processCommand(MapGeocodingCommand cmd) throws IOException, JSONException {
 			LOG.TRACE("Processing map geocoding command (thread #" + hashCode() + "): " + cmd.description());
 			
 			if (cmd.annotation.street_address == null) {
@@ -385,7 +389,7 @@ public class GoogleMapField extends Field implements RhoMapField {
 			StringBuffer url = new StringBuffer();
 			url.append("http://maps.google.com/maps/geo?");
 			url.append("q=" + URI.urlEncode(cmd.annotation.street_address));
-			url.append("&output=csv&mobile=true&sensor=false");
+			url.append("&output=json&mobile=true&sensor=false");
 			url.append("&key=" + mapkey);
 			
 			String finalUrl = url.toString();
@@ -393,6 +397,30 @@ public class GoogleMapField extends Field implements RhoMapField {
 			byte[] data = fetchData(finalUrl);
 			String response = new String(data);
 			
+			JSONObject resp = new JSONObject(response);
+			JSONObject status = resp.getJSONObject("Status");
+			int statusCode = status.getInt("code");
+			if (statusCode/100 != 2) {
+				LOG.ERROR("Error received from geocoding service: " + statusCode);
+				return;
+			}
+			
+			JSONArray placemarks = resp.getJSONArray("Placemark");
+			if (placemarks.length() == 0) {
+				LOG.ERROR("Geocoding request return empty response");
+				return;
+			}
+			JSONObject placemark = placemarks.getJSONObject(0);
+			JSONObject point = placemark.getJSONObject("Point");
+			JSONArray coordinates = point.getJSONArray("coordinates");
+			if (coordinates.length() < 2) {
+				LOG.ERROR("Geocoding response contains less than 2 coordinates");
+				return;
+			}
+			double longitude = coordinates.getDouble(0);
+			double latitude = coordinates.getDouble(1);
+			
+			/*
 			// Parse response
 			Vector res = split(response, ",");
 			if (res.size() != 4) {
@@ -404,9 +432,10 @@ public class GoogleMapField extends Field implements RhoMapField {
 			int accuracy = Integer.parseInt((String)res.elementAt(1));
 			double latitude = Double.parseDouble((String)res.elementAt(2));
 			double longitude = Double.parseDouble((String)res.elementAt(3));
+			*/
 			
 			LOG.TRACE("Geocoding request done, pass results back");
-			cmd.mapField.geocodingDone(cmd.annotation, statusCode, accuracy, latitude, longitude);
+			cmd.mapField.geocodingDone(cmd.annotation, latitude, longitude);
 		}
 		
 		public void run() {
@@ -903,19 +932,16 @@ public class GoogleMapField extends Field implements RhoMapField {
 			fetchThreadPool.send(new MapGeocodingCommand(ann, this));
 	}
 	
-	private void geocodingDone(Annotation ann, int statusCode,
-			int accuracy, double lat, double lon) {
+	private void geocodingDone(Annotation ann, double lat, double lon) {
 		
-		LOG.TRACE("Apply geocoding result: " + statusCode + "," + accuracy +
-				"," + lat + "," + lon);
-		if (statusCode/100 != 2) {
-			LOG.ERROR("Error received from geocoding service: " + statusCode);
-			return;
-		}
+		LOG.TRACE("Apply geocoding result: " + lat + "," + lon);
 		ann.coordinates = new Annotation.Coordinates(lat, lon);
 		long nlat = degreesToPixelsY(lat, MAX_ZOOM);
 		long nlon = degreesToPixelsX(lon, MAX_ZOOM);
 		ann.normalized_coordinates = new Annotation.NormalizedCoordinates(nlat, nlon);
+		if (ann.type.equals("center")) {
+			moveTo(lat, lon);
+		}
 	}
 	
 	private static int calcZoom(double degrees, int pixels) {

data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java

@@ -117,28 +117,57 @@ public class MapView extends RubyBasic {
 						else if (strKey.equals("shows_user_location"))
 							settings.put(strKey, new Boolean(value.toString().equalsIgnoreCase("true")));
 						else if (strKey.equals("region")) {
-							if (!(value instanceof RubyArray))
-								throw new RubyException(RubyRuntime.ArgumentErrorClass,
-										"Wrong 'region' type, should be Array");
-							RubyArray arr = (RubyArray)value;
-							if (arr.size() == 4) {
-								Hashtable region = new Hashtable();
-								double[] cs = {0.0, 0.0, 0.0, 0.0};
-								for (int k = 0; k != 4; ++k) {
-									String v = arr.get(k).toString();
-									try {
-										cs[k] = Double.parseDouble(v);
+							if (value instanceof RubyArray) {
+								RubyArray arr = (RubyArray)value;
+								if (arr.size() == 4) {
+									Hashtable region = new Hashtable();
+									double[] cs = {0.0, 0.0, 0.0, 0.0};
+									for (int k = 0; k != 4; ++k) {
+										String v = arr.get(k).toString();
+										try {
+											cs[k] = Double.parseDouble(v);
+										}
+										catch (NumberFormatException e) {
+											throw new RubyException(RubyRuntime.ArgumentErrorClass,
+													"Wrong region value: " + v + ", should be Float");
+										}
+									}
+									region.put("latitude", new Double(cs[0]));
+									region.put("longitude", new Double(cs[1]));
+									region.put("latDelta", new Double(cs[2]));
+									region.put("lonDelta", new Double(cs[3]));
+									settings.put(strKey, region);
+								}
+							}
+							else if (value instanceof RubyHash) {
+								RubyHash hsh = (RubyHash)value;
+								RubyArray hKeys = hsh.keys();
+								RubyArray hValues = hsh.values();
+								for (int j = 0; j < hKeys.size(); ++j) {
+									RubyValue hKey = hKeys.get(j);
+									RubyValue hValue = hValues.get(j);
+									if (hKey == null || hValue == null)
+										continue;
+									
+									String strHKey = hKey.toString();
+									if (strHKey.equals("center")) {
+										Annotation ann = new Annotation();
+										ann.type = "center";
+										ann.street_address = hValue.toString();
+										annotations.addElement(ann);
 									}
-									catch (NumberFormatException e) {
-										throw new RubyException(RubyRuntime.ArgumentErrorClass,
-												"Wrong region value: " + v + ", should be Float");
+									else if (strHKey.equals("radius")) {
+										String strHValue = hValue.toString();
+										try {
+											double radius = Double.parseDouble(strHValue);
+											settings.put("radius", new Double(radius));
+										}
+										catch (NumberFormatException e) {
+											throw new RubyException(RubyRuntime.ArgumentErrorClass,
+													"Wrong 'radius' parameter: " + strHValue + ", should be Float");
+										}
 									}
 								}
-								region.put("latitude", new Double(cs[0]));
-								region.put("longitude", new Double(cs[1]));
-								region.put("latDelta", new Double(cs[2]));
-								region.put("lonDelta", new Double(cs[3]));
-								settings.put(strKey, region);
 							}
 						}
 					}
@@ -147,6 +176,7 @@ public class MapView extends RubyBasic {
 				if (annotationsArray != null) {
 					for (int i = 0; i != annotationsArray.size(); ++i) {
 						Annotation annotation = new Annotation();
+						annotation.type = "ann";
 						RubyValue val = annotationsArray.get(i);
 						if (!(val instanceof RubyHash))
 							throw new RubyException(RubyRuntime.ArgumentErrorClass,

data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java

@@ -129,6 +129,12 @@ public class MapViewScreen extends MainScreen {
 			}
 		}
 		
+		Double radius = (Double)settings.get("radius");
+		if (radius != null) {
+			int zoom = mapField.calculateZoom(radius.doubleValue(), radius.doubleValue());
+			mapField.setZoom(zoom);
+		}
+		
 		// Annotations
 		Enumeration e = annotations.elements();
 		while (e.hasMoreElements()) {

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

@@ -7,14 +7,13 @@
 #define kGeoCodeURL @"http://maps.google.com/maps/geo?q="
 
 @interface GoogleGeocoder : NSObject {
-	NSMutableArray *annotations;
-	MapAnnotation* currentAnnotation;
-	NSString *theElement;
-	NSString *gapikey;
+    NSMutableArray *annotations;
+    MapAnnotation* currentAnnotation;
+    NSString *theElement;
+    NSString *gapikey;
 @public
-	id  actionTarget;
-	SEL onDidFindAddress;
-	
+    id  actionTarget;
+    SEL onDidFindAddress;
 }
 
 // 

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

@@ -11,88 +11,88 @@
 @synthesize actionTarget,onDidFindAddress,theElement,annotations,gapikey;
 
 -(void)doGeocoding:(NSMutableArray*)items {
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-	NSEnumerator * enumerator = [items objectEnumerator];
-	MapAnnotation* annotation, *element;	
-	while(element = [enumerator nextObject]) {
-		annotation = nil;
-		if ( (element.coordinate.latitude==10000) ||
-			(element.coordinate.longitude==10000) ) {
-			NSString* address = [element address];
-			if ( ([address length] > 0) && [self geocode:element]) {
-				annotation = element;
-			}
-		} else {
-			annotation = element;
-		}
-		
-		if(annotation && actionTarget && [actionTarget respondsToSelector:onDidFindAddress]) {
-			[actionTarget performSelectorOnMainThread:onDidFindAddress withObject:annotation waitUntilDone:NO];
-		}			
-	}
-
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    
+    NSEnumerator * enumerator = [items objectEnumerator];
+    MapAnnotation* annotation, *element;	
+    while(element = [enumerator nextObject]) {
+        annotation = nil;
+        if ( (element.coordinate.latitude==10000) ||
+            (element.coordinate.longitude==10000) ) {
+            NSString* address = [element address];
+            if ( ([address length] > 0) && [self geocode:element]) {
+                annotation = element;
+            }
+        } else {
+            annotation = element;
+        }
+        
+        if(annotation && actionTarget && [actionTarget respondsToSelector:onDidFindAddress]) {
+            [actionTarget performSelectorOnMainThread:onDidFindAddress withObject:annotation waitUntilDone:NO];
+        }
+    }
+    
     [pool release];	
 }
 
 -(void)start {
-	if (annotations) {
-		[NSThread detachNewThreadSelector:@selector(doGeocoding:) toTarget:self withObject:annotations];
-	}
+    if (annotations) {
+        [NSThread detachNewThreadSelector:@selector(doGeocoding:) toTarget:self withObject:annotations];
+    }
 }
 
 -(id)initWithAnnotations:(NSMutableArray*)_annotations apikey:(NSString*)key{
-	self = [super init];
+    self = [super init];
     annotations = _annotations;
-	gapikey = [key copy];
+    gapikey = [key copy];
     return self;
 }
 
 -(BOOL)geocode:(MapAnnotation *)annotation
 {
-	BOOL retvar = TRUE;
-	currentAnnotation = annotation;
-	NSMutableString *url = [[NSMutableString alloc] initWithString:kGeoCodeURL];
-	[url appendString:[annotation address]];
-	[url appendFormat:@"&output=xml"];
-	[url replaceOccurrencesOfString:@"ä" withString:@"ae" options:1 range:(NSRange){0,[url length]}];
-	[url replaceOccurrencesOfString:@"ö" withString:@"oe" options:1 range:(NSRange){0,[url length]}];
-	[url replaceOccurrencesOfString:@"ü" withString:@"ue" options:1 range:(NSRange){0,[url length]}];
-	[url replaceOccurrencesOfString:@"ß" withString:@"ss" options:1 range:(NSRange){0,[url length]}];
-	[url replaceOccurrencesOfString:@" " withString:@"+" options:1 range:(NSRange){0,[url length]}];
-	if (gapikey) {
-		[url appendString:@"&key="];
-		[url appendString:gapikey];
-	}
-	NSLog(@"Geocoding url = %@\n", url);
-	NSURLRequest *request=[NSURLRequest requestWithURL:[NSURL URLWithString:url]							  
-										cachePolicy:NSURLRequestUseProtocolCachePolicy
-										timeoutInterval:60.0];	
-	@try {
-		NSHTTPURLResponse *response = NULL;
-		NSData* data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:nil];
-		NSXMLParser *parser = [[NSXMLParser alloc] initWithData:data];
-		[parser setDelegate:self];
-		[parser parse];
-		[self stringCooridinatesToCLLocation];
-	}
-	@catch (NSException *exception) {
-		NSLog(@"Geocoding failed");
-		retvar = FALSE;
-	}
-	@finally {
-		//NSLog(@"finally");
-	}
-	return retvar;
+    BOOL retvar = TRUE;
+    currentAnnotation = annotation;
+    NSMutableString *url = [[NSMutableString alloc] initWithString:kGeoCodeURL];
+    [url appendString:[annotation address]];
+    [url appendFormat:@"&output=xml"];
+    [url replaceOccurrencesOfString:@"ä" withString:@"ae" options:1 range:(NSRange){0,[url length]}];
+    [url replaceOccurrencesOfString:@"ö" withString:@"oe" options:1 range:(NSRange){0,[url length]}];
+    [url replaceOccurrencesOfString:@"ü" withString:@"ue" options:1 range:(NSRange){0,[url length]}];
+    [url replaceOccurrencesOfString:@"ß" withString:@"ss" options:1 range:(NSRange){0,[url length]}];
+    [url replaceOccurrencesOfString:@" " withString:@"+" options:1 range:(NSRange){0,[url length]}];
+    if (gapikey) {
+        [url appendString:@"&key="];
+        [url appendString:gapikey];
+    }
+    NSLog(@"Geocoding url = %@\n", url);
+    NSURLRequest *request=[NSURLRequest requestWithURL:[NSURL URLWithString:url]							  
+                                        cachePolicy:NSURLRequestUseProtocolCachePolicy
+                                        timeoutInterval:60.0];	
+    @try {
+        NSHTTPURLResponse *response = NULL;
+        NSData* data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:nil];
+        NSXMLParser *parser = [[NSXMLParser alloc] initWithData:data];
+        [parser setDelegate:self];
+        [parser parse];
+        [self stringCooridinatesToCLLocation];
+    }
+    @catch (NSException *exception) {
+        NSLog(@"Geocoding failed");
+        retvar = FALSE;
+    }
+    @finally {
+        //NSLog(@"finally");
+    }
+    return retvar;
 }
 
 -(CLLocation *)stringCooridinatesToCLLocation{
-	NSArray *array = [[currentAnnotation coordinateString] componentsSeparatedByString:@","];
-	double longitude = [[array objectAtIndex:0] doubleValue];
-	double lattitude = [[array objectAtIndex:1] doubleValue];
-	CLLocation *location = [[[CLLocation alloc] initWithLatitude:lattitude longitude:longitude] autorelease];
-	[currentAnnotation setCoordinate:location.coordinate];
-	return location;
+    NSArray *array = [[currentAnnotation coordinateString] componentsSeparatedByString:@","];
+    double longitude = [[array objectAtIndex:0] doubleValue];
+    double lattitude = [[array objectAtIndex:1] doubleValue];
+    CLLocation *location = [[[CLLocation alloc] initWithLatitude:lattitude longitude:longitude] autorelease];
+    [currentAnnotation setCoordinate:location.coordinate];
+    return location;
 }
 
 #pragma mark -
@@ -101,8 +101,8 @@
 -(void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName
  namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName
    attributes:(NSDictionary *)attributeDict {
-	if(theElement) [theElement release];
-	theElement = [[NSString alloc] initWithString:elementName];
+    if(theElement) [theElement release];
+    theElement = [[NSString alloc] initWithString:elementName];
 }
 
 -(void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string {
@@ -111,10 +111,10 @@
     if ([string length] == 0)
         return;
     
-	if([theElement isEqualToString:@"address"])
+    if([theElement isEqualToString:@"address"])
         [currentAnnotation setResolvedAddress:string];
 	
-	if([theElement isEqualToString:@"coordinates"])
+    if([theElement isEqualToString:@"coordinates"])
         [currentAnnotation setCoordinateString:string];
 }
 

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

@@ -13,11 +13,13 @@
 
 
 @interface MapAnnotation : NSObject<MKAnnotation> {
-	NSString *title, *subtitle, *address, *url;
-	NSString *coordinateString,*resolvedAddress; 
-	CLLocationCoordinate2D coordinate;
+    NSString *type;
+    NSString *title, *subtitle, *address, *url;
+    NSString *coordinateString,*resolvedAddress; 
+    CLLocationCoordinate2D coordinate;
 }
 
+@property (nonatomic,copy) NSString *type;
 @property (nonatomic,copy) NSString *title;
 @property (nonatomic,copy) NSString *subtitle;
 @property (nonatomic,copy) NSString *address;

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

@@ -12,20 +12,22 @@
 
 @implementation MapAnnotation
 
-@synthesize title, subtitle, address, url, coordinateString, resolvedAddress, coordinate;
+@synthesize type, title, subtitle, address, url, coordinateString, resolvedAddress, coordinate;
 
 -(id) init {
-	[super init];
-	title = [[NSString alloc] initWithFormat:@""];
-	subtitle = [[NSString alloc] initWithFormat:@""];
+    [super init];
+    type = [[NSString alloc] initWithFormat:@"ann"];
+    title = [[NSString alloc] initWithFormat:@""];
+    subtitle = [[NSString alloc] initWithFormat:@""];
     address = [[NSString alloc] initWithFormat:@""];
-	coordinateString = [[NSMutableString alloc] initWithFormat:@""]; 
-	resolvedAddress = [[NSMutableString alloc] initWithFormat:@""];
-	url = [[NSString alloc] initWithFormat:@""];
-	return self;
+    coordinateString = [[NSMutableString alloc] initWithFormat:@""]; 
+    resolvedAddress = [[NSMutableString alloc] initWithFormat:@""];
+    url = [[NSString alloc] initWithFormat:@""];
+    return self;
 }
 
 -(void) dealloc {
+    [type release];
     [title release];
     [subtitle release];
     [address release];