rhodes 2.2.6 → 2.3.0.beta.1

data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java

@@ -40,6 +40,8 @@ import net.rim.device.api.ui.Manager;
 import net.rim.device.api.math.Fixed32;
 //import net.rim.device.api.system.EventInjector.KeyCodeEvent;
 import net.rim.blackberry.api.invoke.MessageArguments;
+import net.rim.blackberry.api.mail.Address;
+import net.rim.blackberry.api.mail.Message.RecipientType;
 
 import com.rho.*;
 //import com.rho.db.DBAdapter;
@@ -78,14 +80,20 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 	class CKeyListener  implements KeyListener{
 
 		public boolean keyChar(char key, int status, int time) {
+			if ( m_bDisableInput )
+				return true;
+			
 	        if( key == Characters.ENTER ) {
 	        
-	        	openLink();
-	        	return true;
+	        	return openLink();
+	        	//return true;
 	        }
 			return false;
 		}
 		public boolean keyDown(int keycode, int time) {
+			if ( m_bDisableInput )
+				return true;
+			
 			int nKey = Keypad.key(keycode);
 			if ( nKey == Keypad.KEY_ESCAPE )
 			{
@@ -108,8 +116,11 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     class CTrackwheelListener implements TrackwheelListener{
 
 		public boolean trackwheelClick(int status, int time) {
-			openLink();
-			return true;
+			if ( m_bDisableInput )
+				return true;
+
+			return openLink();
+			//return true;
 		}
 
 		public boolean trackwheelRoll(int amount, int status, int time) 
@@ -124,6 +135,12 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         		RHODESAPP().canonicalizeRhoUrl(url), null, null, null);
         thread.start();                       
     }
+
+    public void navigateUrlWithEvent(String url, Object ev){
+    	PrimaryResourceFetchThread thread = new PrimaryResourceFetchThread(
+        		RHODESAPP().canonicalizeRhoUrl(url), null, null, ev);
+        thread.start();                       
+    }
     
     public void addMenuItem(String label, String value){
     	LOG.TRACE("Adding menu item: label: " + label + ", value: " + value);
@@ -177,14 +194,14 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         thread.start();                       
     }
     
-    void saveCurrentLocation(String url) {
+    void saveCurrentLocation(String url) 
+    {
     	if (RhoConf.getInstance().getBool("KeepTrackOfLastVisitedPage")) {
-			RhoConf.getInstance().setString("LastVisitedPage",url);
-			RhoConf.getInstance().saveToFile();
+			RhoConf.getInstance().setString("LastVisitedPage",url,true);
 			LOG.TRACE("Saved LastVisitedPage: " + url);
 		}   	
     }
-
+/*
     boolean restoreLocation() {
     	LOG.TRACE("Restore Location to LastVisitedPage");
     	if (RhoConf.getInstance().getBool("KeepTrackOfLastVisitedPage")) {
@@ -200,7 +217,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 			}
 		} 
 		return false;
-    }
+    }*/
    
     public void navigateBack()
     {
@@ -306,7 +323,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     }
 
     private boolean m_bOpenLink = false;
-    private String m_strGetLink, m_strEmailMenu, m_strCallMenu;
+    private String m_strGetLink, m_strEmailMenu, m_strCallMenu, m_strChangeOptionMenu;
     boolean openLink(){
     	LOG.TRACE("openLink");
     	try{
@@ -325,6 +342,8 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
             	m_strEmailMenu = RhoAppAdapter.getMessageText("email_menu");
             if (m_strCallMenu==null)
             	m_strCallMenu = RhoAppAdapter.getMessageText("call_menu");
+            if (m_strChangeOptionMenu==null)
+            	m_strChangeOptionMenu = RhoAppAdapter.getMessageText("change_option_menu");
             
 	    	Menu menu = _mainScreen.getMenu(0);
 	        int size = menu.getSize();
@@ -335,7 +354,8 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 	            //LOG.INFO("*******openLink: " + label);
 	            
 	            if( label.equalsIgnoreCase(m_strGetLink) 
-	                ||label.startsWith(m_strEmailMenu) || label.startsWith(m_strCallMenu))
+	                ||label.indexOf(m_strEmailMenu)>=0 || label.indexOf(m_strCallMenu)>=0 ||
+	                label.equalsIgnoreCase(m_strChangeOptionMenu) )
 	            {
 	              item.run();
 	              return true;
@@ -368,6 +388,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     private SyncStatusPopup _syncStatusPopup = null;
     
     private String _lastStatusMessage = null;
+    private String _hideStatus = null;
     
     //private HttpConnection  _currentConnection;
 
@@ -389,7 +410,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     	_mainScreen.invalidate();
     }
     
-    static String m_strSecurityToken = "";
+    static String m_strCmdLine = "", m_strSecurityToken = "";
     /***************************************************************************
      * Main.
      **************************************************************************/
@@ -402,6 +423,11 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 			{
 				for( int i = 0; i < args.length; i++)
 				{
+					if ( i > 0 )
+						m_strCmdLine += " ";
+					
+					m_strCmdLine += args[i];
+					
 					if ( args[i].startsWith("security_token=") )
 						m_strSecurityToken = args[i].substring(15);
 				}
@@ -442,6 +468,9 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     	if ( SyncThread.getInstance() != null )
     		SyncThread.getInstance().Destroy();
     	
+    	RhoRuby.rho_ruby_deactivateApp();
+    	RhoRuby.rho_ruby_uiDestroyed();
+    	
 		GeoLocation.stop();
         RhoRuby.RhoRubyStop();
         
@@ -547,13 +576,15 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 		    		System.exit(1);
 		    	}
 		    	
+		    	RhoRuby.rho_ruby_uiCreated();
+		    	
 		    	runActivateHooks();
 		    	
 				RhoRuby.rho_ruby_activateApp();
 		
-		        if(!restoreLocation()) {
-		        	navigateHome();
-		        }    
+		        //if(!restoreLocation()) {
+		        //	navigateHome();
+		        //}    
 		
 		    	onPlatformActivate();	    		
 
@@ -585,6 +616,8 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 	        }
 	        
 	        RhoRuby.RhoRubyInitApp();
+	        RhoRuby.call_config_conflicts();
+	        RhoConf.getInstance().conflictsResolved();	        
     	}finally
     	{
 	        m_bRubyInit = true;
@@ -614,6 +647,25 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 			_lastStatusMessage = null;
 		}
 	}
+
+	synchronized public void showStatus(String status, String hide) 
+	{
+		_lastStatusMessage = status;
+		_hideStatus = hide;
+		invokeLater( new Runnable() {
+			public void run() {
+				if (_syncStatusPopup != null) { 
+					_syncStatusPopup.showStatus(_lastStatusMessage);
+				}else
+				{
+					SyncStatusPopup popup = new SyncStatusPopup(_lastStatusMessage, _hideStatus);
+					RhodesApplication.getInstance().setSyncStatusPopup(popup);
+					pushScreen(popup);
+				}
+			}
+		});	
+				
+	}
 	
 	synchronized public void reportStatus(String status, int error) {
 		_lastStatusMessage = status;
@@ -627,7 +679,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 					_syncStatusPopup.showStatus(_lastStatusMessage);
 				}else
 				{
-					SyncStatusPopup popup = new SyncStatusPopup(_lastStatusMessage);
+					SyncStatusPopup popup = new SyncStatusPopup(_lastStatusMessage, null);
 					RhodesApplication.getInstance().setSyncStatusPopup(popup);
 					pushScreen(popup);
 				}
@@ -641,7 +693,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 		invokeLater( new Runnable() {
 			public void run() {
 				if (_syncStatusPopup == null) {
-					SyncStatusPopup popup = new SyncStatusPopup(_lastStatusMessage);
+					SyncStatusPopup popup = new SyncStatusPopup(_lastStatusMessage, null);
 					RhodesApplication.getInstance().setSyncStatusPopup(popup);
 					pushScreen(popup);
 				}
@@ -651,13 +703,16 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 	
 	static class SyncStatusPopup extends PopupScreen {
 		LabelField _labelStatus;
-	    public SyncStatusPopup(String status) {
+	    public SyncStatusPopup(String status, String hide) {
 	        super( new VerticalFieldManager( Manager.NO_VERTICAL_SCROLL | Manager.NO_VERTICAL_SCROLLBAR) );
 			
 	        add(_labelStatus = new LabelField(status != null ? status : "", Field.FIELD_HCENTER));
 	        add(new LabelField(""));
 	        
-	        ButtonField hideButton = new ButtonField( RhoAppAdapter.getMessageText("hide"), Field.FIELD_HCENTER );
+	        if ( hide == null )
+	        	hide = RhoAppAdapter.getMessageText("hide");
+	        
+	        ButtonField hideButton = new ButtonField( hide, Field.FIELD_HCENTER );
 			hideButton.setChangeListener( new HideListener(this) );
 			add(hideButton);
 	    }
@@ -733,7 +788,10 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 			return super.navigationClick(status, time);
 		}
 
-    	protected boolean onTouchUnclick() {
+    	protected boolean onTouchUnclick(int x, int y) {
+			if ( m_bDisableInput )
+				return true;
+    		
 			return openLink();
     	}
     	
@@ -943,11 +1001,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     	try {
     		RubyProgram obj = new xruby.version.main();
 	    	String pngname = "/apps/app/loading.png";
-	    	String pngbbname = "/apps/app/loading.bb.png";
-	    	is = obj.getClass().getResourceAsStream(pngbbname);
-	    	if (is == null) {
-		    	is = obj.getClass().getResourceAsStream(pngname);
-	    	}
+	    	is = obj.getClass().getResourceAsStream(pngname);
 	    	if ( is != null )
 	    	{
 		    	int size = is.available();
@@ -1056,7 +1110,8 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
             }
             
 	        LOG.INFO(" STARTING RHODES: ***----------------------------------*** " );
-	    	
+	        RhodesApp.setStartParameters(m_strCmdLine);
+	        
 	        RhodesApp.Create(RhoConf.getInstance().getRhoRootPath());
         	
 	    	CKeyListener list = new CKeyListener();
@@ -1128,7 +1183,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     
     public String getCookie(String url) {
     	URI uri = new URI(url);
-    	String baseUrl = uri.getScheme() + "://" + uri.getHost() + "/" + uri.getPath();
+    	String baseUrl = uri.getPathNoFragmentNoQuery();
     	Object c = cookies.get(baseUrl);
     	if (c instanceof String)
     		return (String)c;
@@ -1137,8 +1192,15 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     
     public void setCookie(String url, String cookie) {
     	URI uri = new URI(url);
-    	String baseUrl = uri.getScheme() + "://" + uri.getHost() + "/" + uri.getPath();
+    	String baseUrl = uri.getPathNoFragmentNoQuery();
     	cookies.put(baseUrl, cookie);
+    	
+    	m_oBrowserAdapter.setCookie(url, cookie);
+    }
+    
+    public boolean hasTouchScreen()
+    {
+    	return _mainScreen.isTouchScreen();
     }
     
     private void createBrowserControl()
@@ -1265,6 +1327,8 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     	});
     }
 
+    boolean m_bDisableInput = false;
+    public boolean isInputDisabled(){ return m_bDisableInput; }
     public void processConnection(HttpConnection connection, Object e) 
     {
         // cancel previous request
@@ -1279,14 +1343,16 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         
         RHODESAPP().getSplashScreen().hide();
         
+        m_bDisableInput = true;
         m_oBrowserAdapter.processConnection(connection, e);
+        m_bDisableInput = false;
     }
 
     public static class PrimaryResourceFetchThread {//extends Thread {
 
     	private static class HttpServerThread extends RhoThread
     	{
-    		private Mutex         m_mxStackCommands = new Mutex();
+    		private Object        m_mxStackCommands;// = new Mutex();
     		private LinkedList	  m_stackCommands = new LinkedList();	         
     		boolean m_bExit = false;
     		private static final int INTERVAL_INFINITE = Integer.MAX_VALUE/1000;
@@ -1295,6 +1361,8 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     		HttpServerThread()
     		{
     			super(new RhoClassFactory());
+    			
+    			m_mxStackCommands = getSyncObject();
     			start(epNormal);
     		}
     		
@@ -1351,8 +1419,12 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
 	        	    		LOG.ERROR("Process command crashed.", exc);
 	        	    	}
 	        		}
-	        		
-	        		wait(INTERVAL_INFINITE);
+
+        	    	synchronized(m_mxStackCommands)
+        	    	{
+        	    		if ( m_stackCommands.isEmpty() )
+        	    			wait(INTERVAL_INFINITE);
+        	    	}
         		}
         		
         		LOG.INFO( "Exit HttpServerThread main routine..." );
@@ -1478,6 +1550,64 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     		
     	};
     	
+    	void runMailApplication(URI uri)
+    	{
+    		net.rim.blackberry.api.mail.Message msg = new net.rim.blackberry.api.mail.Message();
+    		
+    		String strTo = uri.getPath();
+    		
+    		try
+    		{
+	    		if ( strTo != null && strTo.length() > 0 )
+	    			msg.addRecipient(RecipientType.TO, new Address( strTo, strTo) );
+	    		
+    		}catch(Exception exc)
+    		{
+    			LOG.ERROR("Error setting mail TO: " + strTo, exc);
+    		}
+    		
+        	String query = uri.getQueryString();
+        	if (query != null) 
+        	{
+        		StringParser tok = new StringParser(query, "&");
+        		while (tok.hasMoreElements()) {
+        			String pair = (String)tok.nextElement();
+        			StringParser nv = new StringParser(pair, "=");
+        			String name = (String)nv.nextElement();
+        			String value = (String)nv.nextElement();
+        			if (name == null || value == null)
+        				continue;
+
+            		try
+            		{
+	        			if (name.equalsIgnoreCase("subject") )
+	        				msg.setSubject(value);
+	        			else if (name.equalsIgnoreCase("body")) 
+	        				msg.setContent(value);
+	        			else if (name.equalsIgnoreCase("cc")) 
+	        				msg.addRecipient(RecipientType.CC, new Address( value, value) );
+	        			else if (name.equalsIgnoreCase("bcc")) 
+	        				msg.addRecipient(RecipientType.BCC, new Address( value, value) );
+	        			else if (name.equalsIgnoreCase("from")) 
+	        				msg.addRecipient(RecipientType.FROM, new Address( value, value) );
+	        			else if (name.equalsIgnoreCase("to")) 
+	        				msg.addRecipient(RecipientType.TO, new Address( value, value) );
+	        			else if (name.equalsIgnoreCase("sender")) 
+	        				msg.addRecipient(RecipientType.SENDER, new Address( value, value) );
+	        			else if (name.equalsIgnoreCase("reply_to")) 
+	        				msg.addRecipient(RecipientType.REPLY_TO, new Address( value, value) );
+	        			else
+	        				msg.addHeader(name.toUpperCase(), value);
+
+            		}catch(Exception exc)
+            		{
+            			LOG.ERROR("Error setting message property: " + name + ";value:" + value, exc);
+            		}
+        		}
+        	}
+    		Invoke.invokeApplication(Invoke.APP_TYPE_MESSAGES, new MessageArguments( msg ));
+    	}
+    	
         void processCommand()throws IOException
         {
         	if ( m_bActivateApp )
@@ -1505,18 +1635,22 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         				return;
         			}
         			
-        			if (name.equals("body")) 
+        			if (name.equalsIgnoreCase("body")) 
         			{
         				strMsgBody = value;
         			}
         		}
         	}
 
-        	if ( uri.getScheme().equalsIgnoreCase("sms"))
+        	if ( uri.getScheme().equalsIgnoreCase("rhomailto"))
+        	{
+        		runMailApplication(uri);
+        		return;
+        	}else if ( uri.getScheme().equalsIgnoreCase("sms"))
         	{
         		RhoTextMessage msg = new RhoTextMessage(uri.getPath(), URI.urlDecode(strMsgBody) );
         		
-        		MessageArguments args = new MessageArguments( msg ); 
+        		MessageArguments args = new MessageArguments( msg );
         		Invoke.invokeApplication(Invoke.APP_TYPE_MESSAGES, args);
         		return;
         	}
@@ -1554,14 +1688,13 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     		else
     		{
     			_application.processConnection(connection, _event);
-    			
-            	if (_callback != null )
-            	{
-            		_callback.run();
-            		_callback = null;
-            	}
-    			
     		}
+    		
+        	if (_callback != null )
+        	{
+        		_callback.run();
+        		_callback = null;
+        	}
         }
         
     }

data/platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java

@@ -17,15 +17,19 @@ class CallDateTimePickerScreen implements Runnable {
 	private String _callback;
 	private String _title;
 	private long _init;
+	private long _min_time;
+	private long _max_time;
 	private DateFormat _fmt;
 	private String _opaque;
 	
 	private static DateTimeScreen screen = null;
 	
-	CallDateTimePickerScreen(String callback, String title, long init, DateFormat fmt, String opaque) {
+	CallDateTimePickerScreen(String callback, String title, long init, DateFormat fmt, String opaque, long min_time, long max_time) {
 		_callback = callback;
 		_title = title;
 		_init = init;
+		_min_time = min_time;
+		_max_time = max_time; 
 		_fmt = fmt;
 		_opaque = opaque;
 	}
@@ -34,7 +38,7 @@ class CallDateTimePickerScreen implements Runnable {
 		if (screen != null)
 			return;
 		//Initialize the screen.
-		screen = new DateTimeScreen(_callback, _title, _init, _fmt, _opaque);
+		screen = new DateTimeScreen(_callback, _title, _init, _fmt, _opaque, _min_time, _max_time);
         UiApplication.getUiApplication().pushModalScreen(screen);
         screen = null;
 	}
@@ -51,7 +55,20 @@ public class DateTimePicker extends RubyBasic {
 		String title = arg2.toStr();
 		long init = arg3.toRubyTime().getTime();
 		
-		CallDateTimePickerScreen screen = new CallDateTimePickerScreen(callback, title, (long)init, fmt, opaque);
+		CallDateTimePickerScreen screen = new CallDateTimePickerScreen(callback, title, (long)init, fmt, opaque, 0, 0);
+		UiApplication.getUiApplication().invokeLater(screen);
+        
+		return RubyConstant.QNIL;
+	}
+
+	public static RubyValue choose_with_range(RubyValue arg1, RubyValue arg2, RubyValue arg3, DateFormat fmt, String opaque, RubyValue arg6, RubyValue arg7) {
+		String callback = arg1.toStr();
+		String title = arg2.toStr();
+		long init = arg3.toRubyTime().getTime();
+		long min_t = arg6.toRubyTime().getTime(); 
+		long max_t = arg7.toRubyTime().getTime(); 
+		
+		CallDateTimePickerScreen screen = new CallDateTimePickerScreen(callback, title, (long)init, fmt, opaque, min_t, max_t);
 		UiApplication.getUiApplication().invokeLater(screen);
         
 		return RubyConstant.QNIL;
@@ -87,6 +104,38 @@ public class DateTimePicker extends RubyBasic {
 				return DateTimePicker.choose(arg1, arg2, arg3, new SimpleDateFormat(fmt), opaque);
 			}
 		});		
+		klass.getSingletonClass().defineMethod("choose_with_range", new RubyVarArgMethod() {
+			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) {
+				if(args.size() != 7)
+					throw new RubyException(RubyRuntime.ArgumentErrorClass,
+							"in `" + this.getID() + "': wrong number of arguments (" + args.size() + " for 4 or 5)");
+				
+				RubyValue arg1 = args.get(0);
+				RubyValue arg2 = args.get(1);
+				RubyValue arg3 = args.get(2);
+				RubyValue arg4 = args.get(3);
+				
+				String opaque = null;
+				opaque = args.get(4).toStr();
+
+				RubyValue arg6 = args.get(5);
+				RubyValue arg7 = args.get(6);
+
+				
+				int fmt;
+				switch(arg4.toInt())
+				{
+				case 0: fmt = DateFormat.DATE_LONG | DateFormat.TIME_FULL; break;
+				case 1: fmt = DateFormat.DATE_LONG; break;
+				case 2: fmt = DateFormat.TIME_FULL; break;
+				default: throw new RubyException(RubyRuntime.ArgumentErrorClass,
+						"in `" + this.getID() + "': wrong value of the third parameter (" +
+						arg4.toInt() + ", should be 0, 1 or 2)");
+				}
+				
+				return DateTimePicker.choose_with_range(arg1, arg2, arg3, new SimpleDateFormat(fmt), opaque, arg6, arg7);
+			}
+		});		
 	}
 
 }

data/platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java

@@ -32,7 +32,11 @@ public class DateTimeScreen extends MainScreen {
 	private ButtonField _okButton;
 	private ButtonField _cancelButton;
 	
-	public DateTimeScreen(String callback, String title, long init, DateFormat fmt, String opaque)
+	private long _min_time;
+	private long _max_time;
+	
+	
+	public DateTimeScreen(String callback, String title, long init, DateFormat fmt, String opaque, long min_time, long max_time)
 	{
 		_callbackUrl = callback;
 		_opaque = opaque;
@@ -43,6 +47,34 @@ public class DateTimeScreen extends MainScreen {
 		
 		_dateTimeField = new DateField("", init, fmt);
 		
+		_min_time = min_time;
+		_max_time = max_time;
+		
+		_dateTimeField.setChangeListener( new FieldChangeListener() {
+			public void fieldChanged(Field field, int context) {
+				if (_dateTimeField == null) {
+					return;
+				}
+				long cur_date = _dateTimeField.getDate();
+				boolean is_fixed = false;
+				if (_min_time != 0) {
+					if (cur_date < _min_time) {
+						cur_date = _min_time;
+						is_fixed = true;
+					}
+				}
+				if (_max_time != 0) {
+					if (cur_date > _max_time) {
+						cur_date = _max_time;
+						is_fixed = true;
+					}
+				}
+				if (is_fixed) {
+					_dateTimeField.setDate(cur_date);
+				}
+			}
+		});
+		
 		_okButton = new ButtonField("OK");
 		_okButton.setChangeListener(new OkListener());
 		_cancelButton = new ButtonField("Cancel");

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

@@ -12,23 +12,11 @@ public class Annotation {
 		}
 	};
 	
-	public static class NormalizedCoordinates {
-		public long latitude;
-		public long longitude;
-		
-		public NormalizedCoordinates(long lat, long lon) {
-			latitude = lat;
-			longitude = lon;
-		}
-	};
-	
-	public String type = null;
-	public String title = null;
-	public String subtitle = null;
+	public String title = "";
+	public String subtitle = "";
 	public String street_address = null;
 	public String resolved_address = null;
 	public String url = null;
 	public Coordinates coordinates = null;
-	public NormalizedCoordinates normalized_coordinates = null;
 	
 }