From 4b4a7340ed766368711f753623a2a15cd722c641 Mon Sep 17 00:00:00 2001
From: "gu.martinm@gmail.com" <gu.martinm@gmail.com>
Date: Mon, 7 Apr 2014 06:21:31 +0200
Subject: [PATCH] Weather Information with Google Maps

---
 Android/WeatherInformation/AndroidManifest.xml     |  25 +++
 Android/WeatherInformation/proguard-project.txt    |  17 ++
 Android/WeatherInformation/project.properties      |   1 +
 .../res/drawable-hdpi/ic_action_map.png            | Bin 0 -> 802 bytes
 .../res/drawable-mdpi/ic_action_map.png            | Bin 0 -> 604 bytes
 .../res/drawable-xhdpi/ic_action_map.png           | Bin 0 -> 1022 bytes
 .../res/drawable-xxhdpi/ic_action_map.png          | Bin 0 -> 1529 bytes
 .../res/layout/fragment_main.xml                   | 131 ---------------
 .../WeatherInformation/res/layout/weather_map.xml  |  54 +++++++
 .../res/menu/weather_main_menu.xml                 |   9 ++
 Android/WeatherInformation/res/values/strings.xml  |   7 +-
 .../exampletdd/WeatherInformationActivity.java     |  22 ++-
 .../exampletdd/WeatherInformationMapActivity.java  | 178 +++++++++++++++++++++
 .../exampletdd/activityinterface/GetWeather.java   |   8 +
 .../activityinterface/OnClickButtons.java          |   8 -
 .../fragment/WeatherInformationDataFragment.java   |  99 ++++++++----
 .../de/example/exampletdd/model/GeocodingData.java | 109 +++++++++++++
 .../exampletdd/parser/IJPOSWeatherParser.java      |   1 +
 .../exampletdd/parser/JPOSWeatherParser.java       |  32 +---
 .../example/exampletdd/service/WeatherService.java |  10 +-
 20 files changed, 503 insertions(+), 208 deletions(-)
 create mode 100644 Android/WeatherInformation/res/drawable-hdpi/ic_action_map.png
 create mode 100644 Android/WeatherInformation/res/drawable-mdpi/ic_action_map.png
 create mode 100644 Android/WeatherInformation/res/drawable-xhdpi/ic_action_map.png
 create mode 100644 Android/WeatherInformation/res/drawable-xxhdpi/ic_action_map.png
 delete mode 100644 Android/WeatherInformation/res/layout/fragment_main.xml
 create mode 100644 Android/WeatherInformation/res/layout/weather_map.xml
 create mode 100644 Android/WeatherInformation/src/de/example/exampletdd/WeatherInformationMapActivity.java
 create mode 100644 Android/WeatherInformation/src/de/example/exampletdd/activityinterface/GetWeather.java
 delete mode 100644 Android/WeatherInformation/src/de/example/exampletdd/activityinterface/OnClickButtons.java
 create mode 100644 Android/WeatherInformation/src/de/example/exampletdd/model/GeocodingData.java

diff --git a/Android/WeatherInformation/AndroidManifest.xml b/Android/WeatherInformation/AndroidManifest.xml
index 8ae62c1..811923f 100644
--- a/Android/WeatherInformation/AndroidManifest.xml
+++ b/Android/WeatherInformation/AndroidManifest.xml
@@ -9,8 +9,18 @@
         android:maxSdkVersion="18"
         android:minSdkVersion="18"
         android:targetSdkVersion="18" />
+    <uses-feature
+        android:glEsVersion="0x00020000"
+        android:required="true"/>
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <!-- The following two permissions are not required to use
+     Google Maps Android API v2, but are recommended. -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
 
     <application
         android:allowBackup="true"
@@ -37,6 +47,21 @@
             </intent-filter>
         </activity>
         
+        <activity
+            android:name=".WeatherInformationMapActivity" 
+            android:parentActivityName="de.example.exampletdd.WeatherInformationActivity">
+            <intent-filter >
+                <action android:name="android.intent.action.WEATHERINFORMATIONMAP" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        
+        <meta-data
+            android:name="com.google.android.maps.v2.API_KEY"
+            android:value="AIzaSyBNYGgEZgS3cqEaElaegEtOlY57jhLeEqU"/>
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
     </application>
 
 </manifest>
diff --git a/Android/WeatherInformation/proguard-project.txt b/Android/WeatherInformation/proguard-project.txt
index f2fe155..dd79e3a 100644
--- a/Android/WeatherInformation/proguard-project.txt
+++ b/Android/WeatherInformation/proguard-project.txt
@@ -18,3 +18,20 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-keep class * extends java.util.ListResourceBundle {
+    protected Object[][] getContents();
+}
+
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+    public static final *** NULL;
+}
+
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+    @com.google.android.gms.common.annotation.KeepName *;
+}
+
+-keepnames class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}
diff --git a/Android/WeatherInformation/project.properties b/Android/WeatherInformation/project.properties
index ce39f2d..2110cdf 100644
--- a/Android/WeatherInformation/project.properties
+++ b/Android/WeatherInformation/project.properties
@@ -12,3 +12,4 @@
 
 # Project target.
 target=android-18
+android.library.reference.1=../../../../android/android-sdk-linux/extras/google/google_play_services/libproject/google-play-services_lib
diff --git a/Android/WeatherInformation/res/drawable-hdpi/ic_action_map.png b/Android/WeatherInformation/res/drawable-hdpi/ic_action_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..370cf5c38f3efec6d186a1e65ee9b23efbf0c1cb
GIT binary patch
literal 802
zcmV+-1Ks?IP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!#7RU!RCwC#S;29_Fc36^uM2<zoC4f{
z^M?XV0Z;(^ll<cXpaA#>|3eB;0~7!SPyjh)Rx^smmSjcNVBlsnV2tHk-QM2Geu_G7
zPY(bO0Cx^xAii8KmkE80JK}fQ>-Bbj0FVu7q#Xgk#FzffP^bbSyE0$XDu&boAdaoC
z$$QGtSrY(lIg!AL7(eZ4p$<4VqK`8jpM6lsx8q#lW)KQtXPlb?6hF78<5HZH?BE0d
zE4IJ{>n5v1*M9J8Xz-PN74j!Zbqr9lWf-c>>+WMxA;G(x#wR(ISvsG>k(fa50pt);
zg~aM-iZU$#qA)~bBo+Yk2+k+I0q7zSt2`v9Cjeq9c>F(wlCVMRK%^ww79$cR+z`19
z4o{%ZQQ|uToiZP-%fR4xX+am&gwqKe9b&E}pN9a(aD3cq1fb7vO(%qtqbfzA-=knT
zz^OnZcdVFW%Sg#OzeL1OzLJ<v^y~n__Wx(e+20CH(c=-HHUZJsQGriLW7`mbt?DFF
zWj-O%Bjnpg>HV2&C5|D5W87p*lN~KqwuyAEQSju2Dxq56h>Ej}eyQ{zP-{b{`mPkL
z+yH2XYyL!^K3>{t=4PnIZ=#b_Zq8eWy%a?r{*}%4(03&^@pl8oG07^^^g+x-k+uNH
z(XiP^GY#FMHUZ2ldUG{l53T^XAn*l1`{5q|!avt3h-I6>G=(g$*#r2YP*tKz$!Ap~
z08*W2C)Ews8h{#(mk!CdQ(6ZBzR(paA2OPFa9$KAu^8`ydYTA(10Y9$SK`9uMsRrP
z&>W_^2-(PJEQPv=0va00m5)ly9GbfSI3D9kM&^S;OxmP}a6Gr@pX>qf#tl2H5VmN#
z)$Cg);4u(@VH+wG(u$^!Vd?;+Hl1d`q)zLeMGZ9C--)+1H}!_*6kXq28JkBk-L}Vz
g?gxN-2k;}n0Dm9>SJ?%Fr~m)}07*qoM6N<$f=nP{CIA2c

literal 0
HcmV?d00001

diff --git a/Android/WeatherInformation/res/drawable-mdpi/ic_action_map.png b/Android/WeatherInformation/res/drawable-mdpi/ic_action_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..50a91002ad0cbf33ea70fdeb8dcb560404ae25ca
GIT binary patch
literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz{z*hZRCwC#SIcq2Fc7sfy1D>U01dc+
zPyi`_6aWRJ0N@S<;Ctc%oC0Wo22_AufO02qnN>!k(ONbHCkJ+Bv4y4Gw;w&(N%D|C
zmXv<Z=ko-Y`N+OM(==@q4|3>oWB@1V4*)9$s_*Q03eD`m2cVIb)jhqV+y`6=3BWZ5
zsecyG8JDt!me6PD7qoV!xBhx17_GTRB{hmLXU6GF7=UH~q-$rY+uUUo01PkK2rZmq
zTmeKKz+eFwr?!LTDe#|d5Cg}rLi9AJVW1PQiOmoIQV&q7stZwsqt7@4EzdIyi2mQ*
z3gA<!yC*q2Tno=zo-?=vRQDJuE#18waBR!5vYG4+0MQ?zC2y~;=)0b2OKPyScY5R4
zXBWJ1ggNdhnmvK?%jDb_0^4n|&Nk$h!8EWLEkW)?NY@<}ZMgGomTF>5X3bLQquR@A
z)3*mgLY(j+ooay|*x$kfRluk{y^=uBG#<s$c!rD>R{@~9K{o@Va={(@Y`@r9P<ZV2
z<}_4DYA%!J>}5T<L}Wq>fDCS6tn(cK&rbkNwB0gLBhYu&7l3uXibU>$(2*m17vceF
z7hFiAuk#Ma8MErUbXqDQn#$exH^@BpuBkdwYJLHL_K51_Gp7n1M29=R5*B_bRN$O1
qk`YBYL{pCZUC=(h3;%_D3orn$Rk5nL;If_o0000<MNUMnLSTZ~AO@%a

literal 0
HcmV?d00001

diff --git a/Android/WeatherInformation/res/drawable-xhdpi/ic_action_map.png b/Android/WeatherInformation/res/drawable-xhdpi/ic_action_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..537c5a49c6b2cd48308429f3420d64757321af3a
GIT binary patch
literal 1022
zcmV<a0|ESrP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#ph-kQRCwC#TFY_bKoEs3t^@!9-~eXt
zRsawH-n)HY`EIzIy<7J+cZ&dU03@IQAOHp6?WUf#x>N(we1wFVu9_11PrvDY{boe3
z7c5w?V8Mdjto7y2*Vor0Z63e5&q=@EPl}x%w;lljfLjM(P;q`mExU3bC)8qF05T$s
z-8Fkp#2!+>B?T@$T4UPWQ;Vo6acWDE_>60YI5&~y?5Y7Erxf&u(wxqz?VwR2<g~nR
ztKliWW>^QHfk7u{w3%Ww){YKy2OsD;3;cfN4i~(G-y`e~&ybip0os4j<FgF@#>-;r
zbPDusEe4o90)ZWV7S2CW+jmL_kh60!LOqPm8y$Z|PMYSqD)JdX@-q$q;G<$xTOq-y
zw9k3>iM)L$Ct{3bT{{58m(sJR*P;X?ayX?nL!QO8XJ7sP9`|iDz+O!mTnmR%+N1{I
z&s=gRNbZ39XX03Kd<Q;w><R!p+G}z;w|w77j5<5F0e}q7MgWi%?_i$kLIiMUSB816
z3xBTXPar)ex+(2Xi&`#aw}_UgbpU)QE@5MkU%8%F>h?Cv;MkMmi!{!g+7<+QxMUT0
zff97J*y5f9a#%*oJ1WTowPopiBLMJA6lAN5{2f``I>(6jgfwRDp_r3EqDi9wpmr}D
zNpR?J-&`Z4a?!uFCMA}Q=zxL`7?cb1)fW0=T$Ij|r9v+(Ph4XM0K&JJibgob(ZEa0
z+nNq!7&Y5Sh|uyA!fOqFNK96-1_tD%G;?mA4DEpUz9Nlsy7rgQ`<V!D6K+|adOl{7
z7he!zVE&SGN!2<5KuSu{wZ#muPGp!wT%(gA9Z|(L(_@U>rpBck&w|V=05VTMEHp#a
zs4~N^+MEvOhS6|uI!CCuBz2g8c@sh=x%X+&mt92#IWB@aF2z|3p&ZN7b#gVUTZ0V%
z*b7ytTH^p#gEdlRVcC~c0OUe}s<u*~c8#``%iw|h-0BnfC2I|UipkK@Lyi8_u)hRg
z)wT{$XPi$x^hZv8c^gaicl{vaLkTKP&j0b`{81@l$xK1`G*bFp0JtkT|Kz$(r~x5!
z&GX^|YMpd3O@UF9&igP-*WWa22wtl|SDimj%uHsNrYVp^=wuype2B%6dD9%wiO*Rj
z$LDBP3oS+f(8#a&(|CslKkhkxP&MX&j)lMT*W~agscY^$MdQz=0hqM$z0R{uTmXo_
sdkTa<O9udg1q&7|Sg>HXYX1Zn0G9|@T`~jJtpET307*qoM6N<$f=bxXTL1t6

literal 0
HcmV?d00001

diff --git a/Android/WeatherInformation/res/drawable-xxhdpi/ic_action_map.png b/Android/WeatherInformation/res/drawable-xxhdpi/ic_action_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed72ce91c8788fad8b1a8ade10783d10b60f3ae7
GIT binary patch
literal 1529
zcmV<V1qS+wP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%n@L1LRCwC#T}^V@Ob{Kryfg>E2apfI
zxBtjKWKRxY_JO_49<n$4SbL)bkbQIk4qy(T131&JCu&NWk@eG~Kl)XvC<8*!Z>Iab
zo&hT*5C{YUfj}S-2m}JbCE?0;=llD6pl?PJ9#$k*S69cP1U&1TiNuT*u_j=Vz4Kb)
z(k_GmAwUQaw1}HBRa_rO30Wabd=PN7RdIn;MgEZ#BsD-F1PrVQ_bm@oD`kp;7~n9m
z(=~19IG3J#(vK%XK>5H^(7z)1d5SK{1bku~L|&+mtq@Q=@H2h$ppS6@IsH=~xB8qX
z1l)Gc9Aq9$vT_jV8S~aS0s2kOF=7t3Zl9;rLe~t_6ru0iI7WPI(d2agW5LUfajhbt
zYn3M8x@ItF#4R!MUMLXyxbw`x2G=ul`r2X=SMV*JHji~x&@A&ejlx$D<74y(#)v)>
zjhV1A3DNf*^z$c{;yVl#gq-Wjw-3mlPt0j)mPrrFAmL44GfMM(U)D5kDh8iM-w(&b
zRJ86f@+d7i<z5Atc|O2<St3uL3{t)h-H45qd&!b|Ml<B)6K2B(#j`H9c+C$o^lQEt
zMRKfq2p>*(j+C%Bh`2}LtOd&Jc+H(T3&aWM2W_u!_9&nnMR){dlc?$&2kM;LX#yf+
zbY_V-)(rgCk!E6CH%48u`GF%IPmjk>oN})SNMPGTkG&I{TaD4riB0Vf>3M!{S>i$F
zbSNo^3gWT>2OJqa8oK6->zWxtY%cm~2sMC$u*mzc%yr~!v@pU`pJ7cg*_mi`Mt`V|
zZ8*EB7?8IreGi5ryma(t(suJ4&r4HO>X<t#QG3%3Mdz}N!Rp1%zB*3$wu$a1uJ_P@
zyA9#u??B%FO{A+jPWU;aID7^Fj>E)d0v$OF<Q)to^{~EBorA1Cb&Y@{j%PIGd}7Z0
zdeclx!^ET6$t972KGt_tY*D5e0!U?`*S^41^$G5F1I^xz%P>M=%`7VHXXkoB7$K{k
z5ul75pX8WJTT8{2ilVBL{F1k&OcBt;aMqNXzERW9an9Zm{HIoCK-TPdD#~7!78P54
z{D+kE*}{6n8T{Hl01h+lt&mI{!2})98;Y3-@TIl_tSO{vZVQ#<G@$zVAwDbhp~BXT
z*e4rMi4a;aAp+J_wrd#JAwb?pFxo3off=(^jQfRrJ7EgiYn^3DD3C?Y45ZPxWO%R3
zCU(NLRfI{}y>KkbSmbb+BPokw-IS|uQw61q^m7ldT_+dsATia@2{=!6+A_kqfeWc4
zs&Hz=xMQO?1f;d$7xM<LvWn}d8rXc>Wg|AS+5Q?hR7gEZp9$b9TDOd8=vd<U2h{=8
zAz)Eq)Y<U6#Wa-4*??Q2c_#o8a8*+RMm0@ZRRXdz<-2NWr^GeG)ZbMsW{HO)SegLC
z%muw903?K}{HoE4y9k!31F@wQ(R&qCCY7u`ZfS`N%)CQJ5_5`*)(9xtEQ>rl&(8>O
z?cj@hOF#()QM-R$P+q#y;mOjr_%LKmZ8GyU1Ma&Jd;@z&>iMVRi7oG;Y6)BfOga>N
zg;9RY1b@+1$1@K%4G_?D@ITa$PK#s|=brpVcL;!v9_Of?R$9GCH9OUDaHOEXk#84m
z_Su^PHX|&%L_iw+_yU4YpZ!_Y*uBS51F{=fJ6Y^J1fS~OM%CQF%e^SSyO7}1LK4ej
z64!Uc&WdN?fv08EN5!~BhNA}jHk8NPKm$L*sQ;yy_a||*qbcZXBQFju@Z@1$k#g9-
zu)$ITNN(ykdQijr#r2Ky{8cBmA`Ih`3~2NRs)6sB$*(55G3|>J7Ier53<(Dzphdt?
zdN-Alf_jvK0{jk}pd|uEO8&8rq#z+cAOr{j0zSEGyHoy^p%)~VuvjG!2m}IwKp+qZ
f1Oh=m{t7SvM#&ydtJi}g00000NkvXXu0mjfVK&0o

literal 0
HcmV?d00001

diff --git a/Android/WeatherInformation/res/layout/fragment_main.xml b/Android/WeatherInformation/res/layout/fragment_main.xml
deleted file mode 100644
index b110cec..0000000
--- a/Android/WeatherInformation/res/layout/fragment_main.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="de.example.exampletdd.fragment.WeatherInformationDataFragment" >
-
-    <EditText
-        android:id="@+id/editTextCity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
-        android:ems="10"
-        android:inputType="text"
-        android:labelFor="@id/editTextCity"
-        android:text="@string/text_default_city"
-        android:textStyle="bold" />
-
-    <EditText
-        android:id="@+id/editTextWeatherDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/editTextCity"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="102dp"
-        android:background="@android:color/transparent"
-        android:ems="10"
-        android:enabled="false"
-        android:inputType="none"
-        android:labelFor="@id/editTextWeatherDescription"
-        android:text="@string/text_field_description"
-        android:textStyle="bold" />
-
-    <ImageView
-        android:id="@+id/imageIcon"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_below="@+id/editTextCity"
-        android:layout_centerHorizontal="true"
-        android:contentDescription="@string/icon_weather_description"
-        android:scaleType="fitCenter"
-        android:src="@drawable/ic_launcher" />
-
-    <EditText
-        android:id="@+id/editTextSunSet"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/buttonweather"
-        android:layout_alignLeft="@+id/editTextSunRise"
-        android:layout_marginBottom="18dp"
-        android:background="@android:color/transparent"
-        android:ems="10"
-        android:enabled="false"
-        android:inputType="none"
-        android:labelFor="@id/editTextSunSet"
-        android:text="@string/text_field_sun_set"
-        android:textStyle="bold" />
-
-    <EditText
-        android:id="@+id/editTextSunRise"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/editTextSunSet"
-        android:layout_alignLeft="@+id/editTextMinTemperature"
-        android:layout_marginBottom="18dp"
-        android:background="@android:color/transparent"
-        android:ems="10"
-        android:enabled="false"
-        android:inputType="none"
-        android:labelFor="@id/editTextSunRise"
-        android:text="@string/text_field_sun_rise"
-        android:textStyle="bold" />
-
-    <EditText
-        android:id="@+id/editTextMinTemperature"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/editTextSunRise"
-        android:layout_alignLeft="@+id/editTextMaxTemperature"
-        android:layout_marginBottom="18dp"
-        android:background="@android:color/transparent"
-        android:ems="10"
-        android:enabled="false"
-        android:inputType="none"
-        android:labelFor="@id/editTextMinTemperature"
-        android:text="@string/text_field_tem_min"
-        android:textStyle="bold" />
-
-    <EditText
-        android:id="@+id/editTextMaxTemperature"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/editTextTemperature"
-        android:layout_centerVertical="true"
-        android:background="@android:color/transparent"
-        android:ems="10"
-        android:enabled="false"
-        android:inputType="none"
-        android:labelFor="@id/editTextMaxTemperature"
-        android:text="@string/text_field_tem_max"
-        android:textStyle="bold" />
-
-    <EditText
-        android:id="@+id/editTextTemperature"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/editTextWeatherDescription"
-        android:layout_below="@+id/editTextWeatherDescription"
-        android:layout_marginTop="19dp"
-        android:background="@android:color/transparent"
-        android:ems="10"
-        android:enabled="false"
-        android:inputType="none"
-        android:labelFor="@id/editTextTemperature"
-        android:text="@string/text_field_tem"
-        android:textStyle="bold" />
-
-    <Button
-        android:id="@+id/buttonweather"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="19dp"
-        android:onClick="onClickGetWeather"
-        android:text="@string/button_weather" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/Android/WeatherInformation/res/layout/weather_map.xml b/Android/WeatherInformation/res/layout/weather_map.xml
new file mode 100644
index 0000000..62c94d0
--- /dev/null
+++ b/Android/WeatherInformation/res/layout/weather_map.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>    
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="bottom"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="de.example.exampletdd.WeatherInformationActivity" >
+
+    <TextView
+        android:id="@+id/weather_map_citycountry_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="top"
+        android:text="City,country:"
+        android:textAlignment="textStart"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textIsSelectable="false"
+        android:textStyle="normal" />
+    
+    <TextView
+        android:id="@+id/weather_map_citycountry_data"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/weather_map_citycountry_header"
+        android:gravity="top"
+        android:text="City,country"
+        android:textAlignment="textStart"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textStyle="bold|normal" />
+
+    <fragment
+        android:id="@+id/map"
+        android:name="com.google.android.gms.maps.MapFragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/buttonweather"
+        android:layout_below="@+id/weather_map_citycountry_data" />
+       
+    <Button
+        android:id="@+id/buttonweather"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:onClick="setChosenLocation"
+        android:text="@string/button_set_chosen_location" />
+
+ 
+
+</RelativeLayout>
diff --git a/Android/WeatherInformation/res/menu/weather_main_menu.xml b/Android/WeatherInformation/res/menu/weather_main_menu.xml
index 6e3221f..3b6359d 100644
--- a/Android/WeatherInformation/res/menu/weather_main_menu.xml
+++ b/Android/WeatherInformation/res/menu/weather_main_menu.xml
@@ -26,6 +26,15 @@
         android:icon="@drawable/ic_action_settings"
         android:showAsAction="ifRoom|withText">
     </item>
+    <item
+        android:id="@+id/weather_menu_map"
+        android:icon="@drawable/ic_action_map"
+        android:showAsAction="ifRoom|withText"
+        android:visible="true"
+        android:checkable="false"
+        android:enabled="true"
+        android:checked="false">
+    </item>
     
     
 
diff --git a/Android/WeatherInformation/res/values/strings.xml b/Android/WeatherInformation/res/values/strings.xml
index 8a39ec6..f0475fe 100644
--- a/Android/WeatherInformation/res/values/strings.xml
+++ b/Android/WeatherInformation/res/values/strings.xml
@@ -5,10 +5,12 @@
     <string name="action_settings">Settings</string>
     <string name="action_search">City,country</string>
     <string name="action_get_weather">Get weather</string>
-    <string name="button_weather">Get weather</string>
-    <string name="uri_api_coord">http://api.openweathermap.org/data/{0}/weather?lat={1}&amp;lon={2}</string>
+    <string name="action_map">Select Location</string>
+    <string name="button_set_chosen_location">Set Location</string>
+    <string name="uri_api_coord">http://api.openweathermap.org/data/{0}/weather?lat={1}&amp;lon={2}&amp;lang={3}&amp;cnt=1</string>
     <string name="uri_api_city">http://api.openweathermap.org/data/{0}/weather?q={1}&amp;lang={2}</string>
     <string name="uri_api_icon">http://openweathermap.org/img/w/{0}.png</string>
+    <string name="uri_api_geocoding">https://maps.googleapis.com/maps/api/geocode/json?latlng={0},{1}&amp;sensor=true</string>
     <string name="api_version">2.5</string>
     <string name="text_default_city">London,uk</string>
     <string name="text_field_city">City name</string>
@@ -28,6 +30,7 @@
     <string name="button_ok">OK</string>
     <string name="error_dialog_connection_tiemout">Connection error timeout</string>
     <string name="error_dialog_generic_error">Impossible to receive weather data.</string>
+    <string name="error_dialog_store_geocoding_data">Impossible to save current location.</string>
     <string name="icon_weather_description">Icon weather</string>
     <string name="header_action_bar">City,country</string>
     <string name="weather_preferences_units_key">weather_preferences_units</string>
diff --git a/Android/WeatherInformation/src/de/example/exampletdd/WeatherInformationActivity.java b/Android/WeatherInformation/src/de/example/exampletdd/WeatherInformationActivity.java
index e693053..876de1c 100644
--- a/Android/WeatherInformation/src/de/example/exampletdd/WeatherInformationActivity.java
+++ b/Android/WeatherInformation/src/de/example/exampletdd/WeatherInformationActivity.java
@@ -10,12 +10,12 @@ import android.preference.PreferenceManager;
 import android.view.Menu;
 import android.view.MenuItem;
 import de.example.exampletdd.activityinterface.ErrorMessage;
-import de.example.exampletdd.activityinterface.OnClickButtons;
+import de.example.exampletdd.activityinterface.GetWeather;
 import de.example.exampletdd.fragment.ErrorDialogFragment;
 import de.example.exampletdd.fragment.WeatherInformationDataFragment;
 
 public class WeatherInformationActivity extends Activity implements ErrorMessage {
-    private OnClickButtons onclickButtons;
+    private GetWeather mGetWeather;
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
@@ -41,7 +41,7 @@ public class WeatherInformationActivity extends Activity implements ErrorMessage
         final WeatherInformationDataFragment weatherDataFragment = (WeatherInformationDataFragment) this
                 .getFragmentManager().findFragmentById(R.id.weather_data_frag);
 
-        this.onclickButtons = weatherDataFragment;
+        this.mGetWeather = weatherDataFragment;
 
     }
 
@@ -59,15 +59,23 @@ public class WeatherInformationActivity extends Activity implements ErrorMessage
         // automatically handle clicks on the Home/Up button, so long
         // as you specify a parent activity in AndroidManifest.xml.
         super.onOptionsItemSelected(item);
+
+        Intent intent;
         switch (item.getItemId()) {
         case R.id.weather_menu_settings:
-            final Intent intent = new Intent("de.example.exampletdd.WEATHERINFO").
+            intent = new Intent("de.example.exampletdd.WEATHERINFO").
             setComponent(new ComponentName("de.example.exampletdd",
                     "de.example.exampletdd.WeatherInformationPreferencesActivity"));
             this.startActivity(intent);
             return true;
         case R.id.weather_menu_get:
-            this.onClickGetWeather();
+            this.getWeather();
+            return true;
+        case R.id.weather_menu_map:
+            intent = new Intent("de.example.exampletdd.WEATHERINFO")
+            .setComponent(new ComponentName("de.example.exampletdd",
+                    "de.example.exampletdd.WeatherInformationMapActivity"));
+            this.startActivity(intent);
             return true;
         default:
             break;
@@ -83,8 +91,8 @@ public class WeatherInformationActivity extends Activity implements ErrorMessage
         newFragment.show(this.getFragmentManager(), "errorDialog");
     }
 
-    public void onClickGetWeather() {
-        this.onclickButtons.onClickGetWeather();
+    public void getWeather() {
+        this.mGetWeather.getWeather();
     }
 
 }
diff --git a/Android/WeatherInformation/src/de/example/exampletdd/WeatherInformationMapActivity.java b/Android/WeatherInformation/src/de/example/exampletdd/WeatherInformationMapActivity.java
new file mode 100644
index 0000000..ef3bcca
--- /dev/null
+++ b/Android/WeatherInformation/src/de/example/exampletdd/WeatherInformationMapActivity.java
@@ -0,0 +1,178 @@
+package de.example.exampletdd;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.StreamCorruptedException;
+import java.text.DecimalFormat;
+
+import android.app.Activity;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.GoogleMap.OnMapLongClickListener;
+import com.google.android.gms.maps.GoogleMap.OnMarkerClickListener;
+import com.google.android.gms.maps.MapFragment;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.MarkerOptions;
+
+import de.example.exampletdd.fragment.ErrorDialogFragment;
+import de.example.exampletdd.model.GeocodingData;
+
+public class WeatherInformationMapActivity extends Activity {
+    private static final String WEATHER_GEOCODING_FILE = "weathergeocoding.file";
+    private static final String TAG = "WeatherInformationMapActivity";
+    private GoogleMap mMap;
+    private Marker mMarker;
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.setContentView(R.layout.weather_map);
+
+        final MapFragment mapFragment = (MapFragment) this.getFragmentManager()
+                .findFragmentById(R.id.map);
+
+        this.mMap = mapFragment.getMap();
+        this.mMap.setMyLocationEnabled(true);
+        this.mMap.getUiSettings().setCompassEnabled(false);
+        this.mMap.setOnMapLongClickListener(new LongClickListener());
+        this.mMap.setOnMarkerClickListener(new MarkerClickListener());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        GeocodingData geocodingData = null;
+        try {
+            geocodingData = this.restoreGeocodingDataFromFile();
+        } catch (final StreamCorruptedException e) {
+            Log.e(TAG, "onResume exception: ", e);
+        } catch (final FileNotFoundException e) {
+            Log.e(TAG, "onResume exception: ", e);
+        } catch (final IOException e) {
+            Log.e(TAG, "onResume exception: ", e);
+        } catch (final ClassNotFoundException e) {
+            Log.e(TAG, "onResume exception: ", e);
+        }
+
+        if (geocodingData != null) {
+            final LatLng point = new LatLng(
+                    geocodingData.getLatitude(), geocodingData.getLongitude());
+            this.mMap.clear();
+            this.mMarker = this.mMap.addMarker(new MarkerOptions().position(
+                    point).draggable(
+                            true));
+
+            final DecimalFormat tempFormatter = new DecimalFormat("#####.#####");
+            final TextView cityCountry = (TextView) WeatherInformationMapActivity.this
+                    .findViewById(R.id.weather_map_citycountry_data);
+            final String latitude = tempFormatter.format(point.latitude);
+            final String longitude = tempFormatter.format(point.longitude);
+            cityCountry.setText(latitude + "," + longitude);
+        }
+    }
+
+    public void setChosenLocation(final View view) {
+
+        if (this.mMarker == null) {
+            return;
+        }
+
+        final LatLng coordinates = this.mMarker.getPosition();
+
+        final GeocodingData geocodingData = new GeocodingData.Builder()
+        .setLatitude(coordinates.latitude)
+        .setLongitude(coordinates.longitude).build();
+
+        try {
+            this.storeGeocodingDataToFile(geocodingData);
+        } catch (final IOException e) {
+            Log.e(TAG, "Store geocoding data exception: ", e);
+            this.createErrorDialog(R.string.error_dialog_store_geocoding_data);
+        }
+
+    }
+
+    public void createErrorDialog(final int title) {
+        final DialogFragment newFragment = ErrorDialogFragment
+                .newInstance(title);
+        newFragment.show(this.getFragmentManager(), "errorDialog");
+    }
+
+    private void storeGeocodingDataToFile(final GeocodingData geocodingData)
+            throws FileNotFoundException, IOException {
+        final OutputStream persistenceFile = this.openFileOutput(
+                WEATHER_GEOCODING_FILE, Context.MODE_PRIVATE);
+
+        ObjectOutputStream oos = null;
+        try {
+            oos = new ObjectOutputStream(persistenceFile);
+
+            oos.writeObject(geocodingData);
+        } finally {
+            if (oos != null) {
+                oos.close();
+            }
+        }
+    }
+
+    private GeocodingData restoreGeocodingDataFromFile()
+            throws StreamCorruptedException, FileNotFoundException,
+            IOException, ClassNotFoundException {
+        final InputStream persistenceFile = this
+                .openFileInput(WEATHER_GEOCODING_FILE);
+
+        ObjectInputStream ois = null;
+        try {
+            ois = new ObjectInputStream(persistenceFile);
+
+            return (GeocodingData) ois.readObject();
+        } finally {
+            if (ois != null) {
+                ois.close();
+            }
+        }
+    }
+
+    private class LongClickListener implements OnMapLongClickListener {
+
+        @Override
+        public void onMapLongClick(final LatLng point) {
+            if (WeatherInformationMapActivity.this.mMarker == null) {
+                WeatherInformationMapActivity.this.mMarker = WeatherInformationMapActivity.this.mMap
+                        .addMarker(new MarkerOptions().position(point).draggable(
+                                true));
+            } else {
+                WeatherInformationMapActivity.this.mMarker.setPosition(point);
+            }
+
+            final DecimalFormat tempFormatter = new DecimalFormat("#####.#####");
+            final TextView cityCountry = (TextView) WeatherInformationMapActivity.this
+                    .findViewById(R.id.weather_map_citycountry_data);
+            final String latitude = tempFormatter.format(point.latitude);
+            final String longitude = tempFormatter.format(point.longitude);
+            cityCountry.setText(latitude + "," + longitude);
+        }
+    }
+
+    private class MarkerClickListener implements OnMarkerClickListener {
+
+        @Override
+        public boolean onMarkerClick(final Marker marker) {
+            marker.getPosition();
+            return false;
+        }
+
+    }
+}
diff --git a/Android/WeatherInformation/src/de/example/exampletdd/activityinterface/GetWeather.java b/Android/WeatherInformation/src/de/example/exampletdd/activityinterface/GetWeather.java
new file mode 100644
index 0000000..98734cd
--- /dev/null
+++ b/Android/WeatherInformation/src/de/example/exampletdd/activityinterface/GetWeather.java
@@ -0,0 +1,8 @@
+package de.example.exampletdd.activityinterface;
+
+
+public interface GetWeather {
+
+    public void getWeather();
+
+}
diff --git a/Android/WeatherInformation/src/de/example/exampletdd/activityinterface/OnClickButtons.java b/Android/WeatherInformation/src/de/example/exampletdd/activityinterface/OnClickButtons.java
deleted file mode 100644
index 2206cc5..0000000
--- a/Android/WeatherInformation/src/de/example/exampletdd/activityinterface/OnClickButtons.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package de.example.exampletdd.activityinterface;
-
-
-public interface OnClickButtons {
-
-    public void onClickGetWeather();
-
-}
diff --git a/Android/WeatherInformation/src/de/example/exampletdd/fragment/WeatherInformationDataFragment.java b/Android/WeatherInformation/src/de/example/exampletdd/fragment/WeatherInformationDataFragment.java
index 32eb712..f7398bc 100644
--- a/Android/WeatherInformation/src/de/example/exampletdd/fragment/WeatherInformationDataFragment.java
+++ b/Android/WeatherInformation/src/de/example/exampletdd/fragment/WeatherInformationDataFragment.java
@@ -37,18 +37,20 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import de.example.exampletdd.R;
 import de.example.exampletdd.activityinterface.ErrorMessage;
-import de.example.exampletdd.activityinterface.OnClickButtons;
+import de.example.exampletdd.activityinterface.GetWeather;
 import de.example.exampletdd.httpclient.WeatherHTTPClient;
+import de.example.exampletdd.model.GeocodingData;
 import de.example.exampletdd.model.WeatherData;
 import de.example.exampletdd.parser.IJPOSWeatherParser;
 import de.example.exampletdd.parser.JPOSWeatherParser;
 import de.example.exampletdd.service.WeatherService;
 
-public class WeatherInformationDataFragment extends Fragment implements OnClickButtons {
-    private boolean isFahrenheit;
-    private String language;
+public class WeatherInformationDataFragment extends Fragment implements GetWeather {
     private static final String WEATHER_DATA_FILE = "weatherdata.file";
+    private static final String WEATHER_GEOCODING_FILE = "weathergeocoding.file";
     private static final String TAG = "WeatherInformationDataFragment";
+    private boolean mIsFahrenheit;
+    private String mLanguage;
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {
@@ -60,7 +62,7 @@ public class WeatherInformationDataFragment extends Fragment implements OnClickB
                 .getDefaultSharedPreferences(this.getActivity());
         final String keyPreference = this.getResources().getString(
                 R.string.weather_preferences_language_key);
-        this.language = sharedPreferences.getString(
+        this.mLanguage = sharedPreferences.getString(
                 keyPreference, "");
     }
 
@@ -90,26 +92,41 @@ public class WeatherInformationDataFragment extends Fragment implements OnClickB
     }
 
     @Override
-    public void onClickGetWeather() {
+    public void getWeather() {
 
-        final IJPOSWeatherParser JPOSWeatherParser = new JPOSWeatherParser();
-        final WeatherService weatherService = new WeatherService(
-                JPOSWeatherParser);
-        final AndroidHttpClient httpClient = AndroidHttpClient
-                .newInstance("Android Weather Information Agent");
-        final WeatherHTTPClient HTTPweatherClient = new WeatherHTTPClient(
-                httpClient);
+        GeocodingData geocodingData = null;
+        try {
+            geocodingData = this.restoreGeocodingDataFromFile();
+        } catch (final StreamCorruptedException e) {
+            Log.e(TAG, "onResume exception: ", e);
+        } catch (final FileNotFoundException e) {
+            Log.e(TAG, "onResume exception: ", e);
+        } catch (final IOException e) {
+            Log.e(TAG, "onResume exception: ", e);
+        } catch (final ClassNotFoundException e) {
+            Log.e(TAG, "onResume exception: ", e);
+        }
+
+        if (geocodingData != null) {
+            final IJPOSWeatherParser JPOSWeatherParser = new JPOSWeatherParser();
+            final WeatherService weatherService = new WeatherService(
+                    JPOSWeatherParser);
+            final AndroidHttpClient httpClient = AndroidHttpClient
+                    .newInstance("Android Weather Information Agent");
+            final WeatherHTTPClient HTTPweatherClient = new WeatherHTTPClient(
+                    httpClient);
 
-        final WeatherTask weatherTask = new WeatherTask(HTTPweatherClient, weatherService);
+            final WeatherTask weatherTask = new WeatherTask(HTTPweatherClient, weatherService);
 
 
-        weatherTask.execute("Candeleda,spain");
+            weatherTask.execute(geocodingData);
+        }
     }
 
     public void updateWeatherData(final WeatherData weatherData) {
         final DecimalFormat tempFormatter = new DecimalFormat("#####.#####");
         final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss Z");
-        final double tempUnits = this.isFahrenheit ? 0 : 273.15;
+        final double tempUnits = this.mIsFahrenheit ? 0 : 273.15;
 
         final List<WeatherDataEntry> entries = this.createEmptyEntriesList();
 
@@ -178,25 +195,25 @@ public class WeatherInformationDataFragment extends Fragment implements OnClickB
         final String celsius = this.getResources().getString(
                 R.string.weather_preferences_units_celsius);
         if (unitsPreferenceValue.equals(celsius)) {
-            this.isFahrenheit = false;
+            this.mIsFahrenheit = false;
         } else {
-            this.isFahrenheit = true;
+            this.mIsFahrenheit = true;
         }
 
         keyPreference = this.getResources().getString(
                 R.string.weather_preferences_language_key);
         final String languagePreferenceValue = sharedPreferences.getString(
                 keyPreference, "");
-        if (!languagePreferenceValue.equals(this.language)) {
-            this.language = languagePreferenceValue;
-            this.onClickGetWeather();
+        if (!languagePreferenceValue.equals(this.mLanguage)) {
+            this.mLanguage = languagePreferenceValue;
+            this.getWeather();
 
             return;
         }
 
         WeatherData weatherData = null;
         try {
-            weatherData = this.restoreDataFromFile();
+            weatherData = this.restoreWeatherDataFromFile();
         } catch (final StreamCorruptedException e) {
             Log.e(TAG, "onResume exception: ", e);
         } catch (final FileNotFoundException e) {
@@ -213,7 +230,7 @@ public class WeatherInformationDataFragment extends Fragment implements OnClickB
     }
 
     public class WeatherTask extends AsyncTask<Object, Void, WeatherData> {
-        private static final String TAG = "JSONWeatherTask";
+        private static final String TAG = "WeatherTask";
         private final WeatherHTTPClient weatherHTTPClient;
         private final WeatherService weatherService;
 
@@ -286,19 +303,19 @@ public class WeatherInformationDataFragment extends Fragment implements OnClickB
                             R.string.weather_preferences_language_key);
             final String languagePreferenceValue = sharedPreferences.getString(keyPreference, "");
 
-            final String cityCountry = (String) params[0];
-            final String urlAPICity = WeatherInformationDataFragment.this.getResources()
-                    .getString(R.string.uri_api_city);
+            final GeocodingData geocodingData = (GeocodingData) params[0];
+            final String urlAPICoord = WeatherInformationDataFragment.this.getResources()
+                    .getString(R.string.uri_api_coord);
             final String APIVersion = WeatherInformationDataFragment.this.getResources()
                     .getString(R.string.api_version);
-            String url = this.weatherService.createURIAPICityCountry(
-                    cityCountry, urlAPICity, APIVersion, languagePreferenceValue);
+            String url = this.weatherService.createURIAPICoord(geocodingData.getLatitude(),
+                    geocodingData.getLongitude(), urlAPICoord, APIVersion, languagePreferenceValue);
 
 
             final String jsonData = this.weatherHTTPClient.retrieveJSONDataFromAPI(new URL(url));
 
 
-            final WeatherData weatherData = this.weatherService.retrieveWeather(jsonData);
+            final WeatherData weatherData = this.weatherService.retrieveDataFromJPOS(jsonData);
 
 
             final String icon = weatherData.getWeather().getIcon();
@@ -315,7 +332,7 @@ public class WeatherInformationDataFragment extends Fragment implements OnClickB
 
         private void onPostExecuteThrowable(final WeatherData weatherData)
                 throws FileNotFoundException, IOException {
-            WeatherInformationDataFragment.this.storeWeatherData(weatherData);
+            WeatherInformationDataFragment.this.storeWeatherDataToFile(weatherData);
 
             WeatherInformationDataFragment.this.updateWeatherData(weatherData);
         }
@@ -338,7 +355,7 @@ public class WeatherInformationDataFragment extends Fragment implements OnClickB
         return entries;
     }
 
-    private void storeWeatherData(final WeatherData weatherData)
+    private void storeWeatherDataToFile(final WeatherData weatherData)
             throws FileNotFoundException, IOException {
         final OutputStream persistenceFile = this.getActivity().openFileOutput(
                 WEATHER_DATA_FILE, Context.MODE_PRIVATE);
@@ -355,7 +372,7 @@ public class WeatherInformationDataFragment extends Fragment implements OnClickB
         }
     }
 
-    private WeatherData restoreDataFromFile() throws StreamCorruptedException,
+    private WeatherData restoreWeatherDataFromFile() throws StreamCorruptedException,
     FileNotFoundException, IOException, ClassNotFoundException {
         final InputStream persistenceFile = this.getActivity().openFileInput(
                 WEATHER_DATA_FILE);
@@ -371,4 +388,22 @@ public class WeatherInformationDataFragment extends Fragment implements OnClickB
             }
         }
     }
+
+    private GeocodingData restoreGeocodingDataFromFile()
+            throws StreamCorruptedException, FileNotFoundException,
+            IOException, ClassNotFoundException {
+        final InputStream persistenceFile = this.getActivity()
+                .openFileInput(WEATHER_GEOCODING_FILE);
+
+        ObjectInputStream ois = null;
+        try {
+            ois = new ObjectInputStream(persistenceFile);
+
+            return (GeocodingData) ois.readObject();
+        } finally {
+            if (ois != null) {
+                ois.close();
+            }
+        }
+    }
 }
diff --git a/Android/WeatherInformation/src/de/example/exampletdd/model/GeocodingData.java b/Android/WeatherInformation/src/de/example/exampletdd/model/GeocodingData.java
new file mode 100644
index 0000000..d61046f
--- /dev/null
+++ b/Android/WeatherInformation/src/de/example/exampletdd/model/GeocodingData.java
@@ -0,0 +1,109 @@
+package de.example.exampletdd.model;
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+
+public class GeocodingData implements Serializable {
+    private static final long serialVersionUID = -6774793966351174343L;
+    private final String city;
+    private final String country;
+    private final GeocodingStatus status;
+    private final double latitude;
+    private final double longitude;
+
+    public static class Builder {
+        private String mCity;
+        private String mCountry;
+        private GeocodingStatus mStatus;
+        private double mLatitude;
+        private double mLongitude;
+
+        public Builder setCity(final String city) {
+            this.mCity = city;
+            return this;
+        }
+
+        public Builder setCountry(final String country) {
+            this.mCountry = country;
+            return this;
+        }
+
+        public Builder setStatus(final GeocodingStatus status) {
+            this.mStatus = status;
+            return this;
+        }
+
+        public Builder setLatitude(final double latitude) {
+            this.mLatitude = latitude;
+            return this;
+        }
+
+        public Builder setLongitude(final double longitude) {
+            this.mLongitude = longitude;
+            return this;
+        }
+
+        public GeocodingData build() {
+            return new GeocodingData(this);
+        }
+    }
+
+    private GeocodingData(final Builder builder) {
+        super();
+        this.city = builder.mCity;
+        this.country = builder.mCountry;
+        this.status = builder.mStatus;
+        this.latitude = builder.mLatitude;
+        this.longitude = builder.mLongitude;
+    }
+
+    public String getCity() {
+        return this.city;
+    }
+
+    public String getCountry() {
+        return this.country;
+    }
+
+    public GeocodingStatus getStatus() {
+        return this.status;
+    }
+
+    public double getLatitude() {
+        return this.latitude;
+    }
+
+    public double getLongitude() {
+        return this.longitude;
+    }
+
+    public enum GeocodingStatus {
+        // see: https://developers.google.com/maps/documentation/geocoding/
+        OK("OK"),
+        ZERO_RESULTS("ZERO_RESULTS"),
+        OVER_QUERY_LIMIT("OVER_QUERY_LIMIT"),
+        REQUEST_DENIED("REQUEST_DENIED"),
+        INVALID_REQUEST("INVALID_REQUEST"),
+        UNKNOWN_ERROR("UNKNOWN_ERROR");
+
+        private final String codeValue;
+        private static final HashMap<String, GeocodingStatus> mapStatus =
+                new HashMap<String, GeocodingStatus>();
+
+        static {
+            for (final GeocodingStatus status : GeocodingStatus.values()) {
+                mapStatus.put(status.codeValue, status);
+            }
+        }
+
+        private GeocodingStatus(final String codeValue) {
+            this.codeValue = codeValue;
+        }
+
+        public static GeocodingStatus getGeocodingStatus(final String value) {
+            return mapStatus.get(value);
+        }
+
+    }
+}
diff --git a/Android/WeatherInformation/src/de/example/exampletdd/parser/IJPOSWeatherParser.java b/Android/WeatherInformation/src/de/example/exampletdd/parser/IJPOSWeatherParser.java
index c351010..184a6c7 100644
--- a/Android/WeatherInformation/src/de/example/exampletdd/parser/IJPOSWeatherParser.java
+++ b/Android/WeatherInformation/src/de/example/exampletdd/parser/IJPOSWeatherParser.java
@@ -7,4 +7,5 @@ import de.example.exampletdd.model.WeatherData;
 public interface IJPOSWeatherParser {
 
     WeatherData retrieveWeatherFromJPOS(final String jsonData) throws JSONException;
+
 }
diff --git a/Android/WeatherInformation/src/de/example/exampletdd/parser/JPOSWeatherParser.java b/Android/WeatherInformation/src/de/example/exampletdd/parser/JPOSWeatherParser.java
index f92a2ef..7c2f6ff 100644
--- a/Android/WeatherInformation/src/de/example/exampletdd/parser/JPOSWeatherParser.java
+++ b/Android/WeatherInformation/src/de/example/exampletdd/parser/JPOSWeatherParser.java
@@ -39,14 +39,9 @@ public class JPOSWeatherParser implements IJPOSWeatherParser {
 
         jsonObject = jsonWeatherData.getJSONObject("main");
         final double temp = jsonObject.getDouble("temp");
-        double minTemp = 0;
-        try {
-            minTemp = jsonObject.getDouble("temp_min");
-        } catch (final JSONException e) {}
-        double maxTemp = 0;
-        try {
-            maxTemp = jsonObject.getDouble("temp_max");
-        } catch (final JSONException e) {}
+        final double minTemp = jsonObject.optDouble("temp_min", 0);
+
+        final double maxTemp = jsonObject.optDouble("temp_max", 0);
         final double humidity = jsonObject.getDouble("humidity");
         final double pressure = jsonObject.getDouble("pressure");
         final WeatherData.Main main = new WeatherData.Main(temp, minTemp,
@@ -55,18 +50,9 @@ public class JPOSWeatherParser implements IJPOSWeatherParser {
         jsonObject = jsonWeatherData.getJSONObject("wind");
         final double speed = jsonObject.getDouble("speed");
         final double deg = jsonObject.getDouble("deg");
-        double gust = 0;
-        try {
-            gust = jsonObject.getDouble("gust");
-        } catch (final JSONException e) {}
-        double var_beg = 0;
-        try {
-            var_beg = jsonObject.getDouble("var_beg");
-        } catch (final JSONException e) {}
-        double var_end = 0;
-        try {
-            var_end = jsonObject.getDouble("var_end");
-        } catch (final JSONException e) {}
+        final double gust = jsonObject.optDouble("gust", 0);
+        final double var_beg = jsonObject.optDouble("var_beg", 0);
+        final double var_end = jsonObject.optDouble("var_end", 0);
         final WeatherData.Wind wind = new WeatherData.Wind(speed, deg, gust,
                 var_beg, var_end);
 
@@ -74,10 +60,7 @@ public class JPOSWeatherParser implements IJPOSWeatherParser {
         final double cloudiness = jsonObject.getDouble("all");
         final WeatherData.Clouds clouds = new WeatherData.Clouds(cloudiness);
 
-        double time = 0;
-        try {
-            time = jsonObject.getDouble("time");
-        } catch (final JSONException e) {}
+        final double time = jsonObject.optDouble("time", 0);
         final WeatherData.DataReceivingTime dataReceivingTime =
                 new WeatherData.DataReceivingTime(time);
 
@@ -87,4 +70,5 @@ public class JPOSWeatherParser implements IJPOSWeatherParser {
                 .setClouds(clouds).setDataReceivingTime(dataReceivingTime)
                 .build();
     }
+
 }
diff --git a/Android/WeatherInformation/src/de/example/exampletdd/service/WeatherService.java b/Android/WeatherInformation/src/de/example/exampletdd/service/WeatherService.java
index 356288b..2d9c363 100644
--- a/Android/WeatherInformation/src/de/example/exampletdd/service/WeatherService.java
+++ b/Android/WeatherInformation/src/de/example/exampletdd/service/WeatherService.java
@@ -15,19 +15,21 @@ public class WeatherService {
         this.JPOSWeatherParser = JPOSWeatherParser;
     }
 
-    public WeatherData retrieveWeather(final String jsonData) throws JSONException {
+    public WeatherData retrieveDataFromJPOS(final String jsonData) throws JSONException {
         return this.JPOSWeatherParser.retrieveWeatherFromJPOS(jsonData);
     }
 
-    public String createURIAPICoord(final int latitude, final int longitude,
-            final String urlAPI, final String APIVersion) {
+    public String createURIAPICoord(final double latitude,
+            final double longitude, final String urlAPI,
+            final String APIVersion, final String language) {
 
         final MessageFormat formatURIAPI = new MessageFormat(urlAPI,
                 Locale.ENGLISH);
-        final Object[] values = new Object[3];
+        final Object[] values = new Object[4];
         values[0] = APIVersion;
         values[1] = latitude;
         values[2] = longitude;
+        values[3] = language;
 
         return formatURIAPI.format(values);
     }
-- 
2.1.4