Merge branch 'release/#r' into develmaster

Conflicts:
	CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml

.gitattributes

@@ -25,7 +25,6 @@
 *.csproj -text merge=union
 *.sln -text merge=union
 *.resx -text merge=union
-*.StyleCop -text merge=union
 #*.vbproj    merge=binary
 #*.vcxproj   merge=binary
 #*.vcproj    merge=binary

.gitignore

@@ -160,7 +160,6 @@ winphone/
 *.spl
 *.srum
 Doxyfile
-screenshots/
 CampusAppWP8/packages/WPtoolkit.4.2012.10.30/lib/sl3-wp/Microsoft.Phone.Controls.Toolkit.dll
 CampusAppWP8/packages/WPtoolkit.4.2012.10.30/lib/sl4-windowsphone71/Microsoft.Phone.Controls.Toolkit.dll
 CampusAppWP8/packages/WPtoolkit.4.2012.10.30/lib/wp8/Microsoft.Phone.Controls.Toolkit.dll
@@ -307,3 +306,6 @@ CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/windows8-native+javascript/ZXing.wi
 CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/wp8/zxing.wp8.0.XML
 CampusAppWP8/packages/ZXing.Net.0.11.0.1/lib/wp8/zxing.wp8.0.dll
 work/.svn/
+CampusAppWP8/packages/
+*.DLL
+*.dll

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "CampusAppWP8/NfcLib"]
+	path = CampusAppWP8/NfcLib
+	url = git@141.43.76.143:repos/bare/nfclib.git
+	branch = develop

CampusAppWP8/CampusAppDLL/Model/Campusmap/CBMainMapModel.cs

@@ -35,7 +35,7 @@ namespace CampusAppDLL.Model.Campusmap
             this.Spatial = new SpsModel();
             foreach (PlaceModel place in model.Places)
             {
-                if (Campus.Equals(place.ParentId) || Campus.Equals(place.PlaceId))
+                if (place.ParentId.StartsWith(CBMainMapModel.Campus))
                 {
                     this.Spatial.Places.Add(place);
                 }

CampusAppWP8/CampusAppDLL/Model/Campusmap/MapModel.cs

@@ -8,6 +8,7 @@
 namespace CampusAppDLL.Model.Campusmap
 {
     using CampusAppDLL.Model.GeoDb;
+    using CampusAppDLL.Utility;
     using System;
 
     /// <summary>
@@ -41,6 +42,8 @@ namespace CampusAppDLL.Model.Campusmap
         /// <remarks>Stubbfel, 19.08.2013.</remarks>
         protected virtual void LoadSpatials(string xmlFilePath)
         {
+            SpsModel model = XmlManager.DeserializationFileToModel<SpsModel>(xmlFilePath);
+            this.Spatial = model;
         }
 
         #endregion

CampusAppWP8/CampusAppDLL/Settings.StyleCop

@@ -0,0 +1,10 @@
+<StyleCopSettings Version="105">
+  <Analyzers>
+    <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
+      <AnalyzerSettings>
+        <StringProperty Name="CompanyName">BTU/IIT</StringProperty>
+        <StringProperty Name="Copyright">BTU/IIT</StringProperty>
+      </AnalyzerSettings>
+    </Analyzer>
+  </Analyzers>
+</StyleCopSettings>

CampusAppWP8/CampusAppW8.sln

@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CampusAppDLL", "CampusAppDL
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CampusAppWP8ScheduledTaskAgent", "CampusAppWP8ScheduledTaskAgent\CampusAppWP8ScheduledTaskAgent.csproj", "{2A51FA6C-791B-4935-B869-FDBA9ED774D7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ndefpclib", "NfcLib\src\ndefpclib\ndefpclib.csproj", "{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,9 +37,9 @@ Global
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|ARM.ActiveCfg = Debug|ARM
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|ARM.Build.0 = Debug|ARM
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|ARM.Deploy.0 = Debug|ARM
-		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
+		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Mixed Platforms.Deploy.0 = Release|Any CPU
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Win32.ActiveCfg = Debug|x86
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Win32.Build.0 = Debug|x86
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Debug|Win32.Deploy.0 = Debug|x86
@@ -51,9 +53,9 @@ Global
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|ARM.ActiveCfg = Release|ARM
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|ARM.Build.0 = Release|ARM
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|ARM.Deploy.0 = Release|ARM
-		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.Build.0 = Release|x86
-		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.Deploy.0 = Release|x86
+		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Win32.ActiveCfg = Release|x86
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Win32.Build.0 = Release|x86
 		{120B88CC-F3F0-4C5A-A3FD-C26E835338CC}.Release|Win32.Deploy.0 = Release|x86
@@ -67,9 +69,9 @@ Global
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|ARM.ActiveCfg = Debug|ARM
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|ARM.Build.0 = Debug|ARM
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|ARM.Deploy.0 = Debug|ARM
-		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
+		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Mixed Platforms.Deploy.0 = Release|Any CPU
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Win32.ActiveCfg = Debug|x86
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Win32.Build.0 = Debug|x86
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Debug|Win32.Deploy.0 = Debug|x86
@@ -85,9 +87,9 @@ Global
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|ARM.ActiveCfg = Release|ARM
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|ARM.Build.0 = Release|ARM
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|ARM.Deploy.0 = Release|ARM
-		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.Build.0 = Release|x86
-		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.Deploy.0 = Release|x86
+		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Win32.ActiveCfg = Release|x86
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Win32.Build.0 = Release|x86
 		{E49420AA-3023-42EF-8255-67B1F5E52B43}.Release|Win32.Deploy.0 = Release|x86
@@ -100,8 +102,8 @@ Global
 		{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
 		{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -115,7 +117,7 @@ Global
 		{67D80BE2-0FB7-44C8-A495-7D44FC2AC262}.Release|x86.ActiveCfg = Release|Any CPU
 		{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{78E8DC22-F4E1-42D9-BA04-93EA031C630C}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -128,8 +130,8 @@ Global
 		{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
 		{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{E4EC5B95-06FC-4304-97E2-9E3F9B980303}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -145,8 +147,8 @@ Global
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|ARM.ActiveCfg = Debug|ARM
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|ARM.Build.0 = Debug|ARM
-		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Win32.ActiveCfg = Debug|x86
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|Win32.Build.0 = Debug|x86
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -156,13 +158,29 @@ Global
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|ARM.ActiveCfg = Release|ARM
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|ARM.Build.0 = Release|ARM
-		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Mixed Platforms.Build.0 = Release|x86
+		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Win32.ActiveCfg = Release|x86
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|Win32.Build.0 = Release|x86
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|x64.ActiveCfg = Release|Any CPU
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|x86.ActiveCfg = Release|x86
 		{2A51FA6C-791B-4935-B869-FDBA9ED774D7}.Release|x86.Build.0 = Release|x86
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|Win32.ActiveCfg = Release|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|x64.ActiveCfg = Release|Any CPU
+		{01C6941E-AAF1-4324-BA54-B4A53BC66ADF}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs

@@ -1,27 +1,28 @@
 //-----------------------------------------------------------------------
 // <copyright file="CampusSpsApi.cs" company="BTU/IIT">
-//     Company copyright tag.
+// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
 // </copyright>
-// <author>stubbfel</author>
-// <sience>12.08.2013</sience>
-//----------------------------------------------------------------------
+// <author>Stubbfel</author>
+// <date>14.10.2013</date>
+// <summary>Implements the campus sps API class</summary>
+//-----------------------------------------------------------------------
 namespace CampusAppWP8.Api.GeoApi
 {
-    using System;
-    using CampusAppWP8.Model.GeoDb;
+    using System; 
     using CampusAppWP8.Resources;
-    using CampusAppWP8.Utility;    
+    using CampusAppWP8.Utility;
+    using CampusAppWPortalLib8.Model.GeoDb;
+    using CampusAppWPortalLib8.Model.Utility;   
 
-    /// <summary>
-    /// Class for SPSAPI
-    /// </summary>
+    /// <summary> Class for SPSAPI. </summary>
+    /// <remarks> Stubbfel, 14.10.2013. </remarks>
+    /// <seealso cref="T:CampusAppWP8.Api.GeoApi.SpsApi"/>
     public class CampusSpsApi : SpsApi
     {
         #region Constructor
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CampusSpsApi" /> class.
-        /// </summary>
+        /// <summary> Initializes a new instance of the <see cref="CampusSpsApi" /> class. </summary>
+        /// <remarks> Stubbfel, 14.10.2013. </remarks>
         public CampusSpsApi()
             : base()
         {
@@ -32,38 +33,39 @@ namespace CampusAppWP8.Api.GeoApi
         #region Method
 
         /// <summary>
-        /// Method set the UriParameter of a campusRequest for a given latitude and longitude
+        ///     Method set the UriParameter of a campusRequest for a given latitude and longitude.
         /// </summary>
-        /// <param name="lat">latitude parameter</param>
-        /// <param name="log">longitude parameter</param>
-        public void SetupCampusRequest(string lat, string log)
+        /// <remarks> Stubbfel, 14.10.2013. </remarks>
+        /// <param name="lat"> latitude parameter. </param>
+        /// <param name="log"> longitude parameter. </param>
+        public void SetupCampusRequest(double lat, double log)
         {
             this.SetupPlaceRequest(lat, log, Constants.SpsApi_CampusDomain);
         }
 
-        /// <summary>
-        /// Method set the UriParameter of a campusRequest for the actualPosition
-        /// </summary>
+        /// <summary> Method set the UriParameter of a campusRequest for the actualPosition. </summary>
+        /// <remarks> Stubbfel, 14.10.2013. </remarks>
         public void SetupCurrentCampusRequest()
         {
             Utilities.DetermineAndStoreCurrentPosition();
-            string lat = App.LoadFromAppState<string>(Constants.GeoWatch_CurrentPosition_Lat);
-            string log = App.LoadFromAppState<string>(Constants.GeoWatch_CurrentPosition_Long);
-            this.SetupCampusRequest(lat, log);
+            GeoMapPoint currentPosition = App.LoadFromAppState<GeoMapPoint>(Constants.GeoWatch_CurrentPositionPoint);
+            if (currentPosition != null)
+            {
+                this.SetupCampusRequest(currentPosition.Latitude, currentPosition.Longitude);
+            }
         }
 
-        /// <summary>
-        /// Method return the campus of the placeList
-        /// </summary>
-        /// <returns>actual campus</returns>
-        public CampusAppWP8.Model.Setting.UserProfilModel.Campus GetCampus()
+        /// <summary> Method return the campus of the placeList. </summary>
+        /// <remarks> Stubbfel, 14.10.2013. </remarks>
+        /// <returns> actual campus. </returns>
+        public CampusAppWPortalLib8.Model.Settings.Campus GetCampus()
         {
             if (this.Model == null)
             {
                 return Settings.UserProfil.DefaultCampus;
             }
 
-            CampusAppWP8.Model.Setting.UserProfilModel.Campus campus;
+            CampusAppWPortalLib8.Model.Settings.Campus campus;
             foreach (PlaceModel place in this.Model.Places)
             {
                 if (Enum.TryParse(place.PlaceId, true, out campus))

CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs

@@ -1,28 +1,29 @@
 //-----------------------------------------------------------------------
 // <copyright file="PisApi.cs" company="BTU/IIT">
-//     Company copyright tag.
+// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
 // </copyright>
-// <author>stubbfel</author>
-// <sience>09.09.2013</sience>
-//----------------------------------------------------------------------
-
+// <author>Stubbfel</author>
+// <date>14.10.2013</date>
+// <summary>Implements the pis API class</summary>
+//-----------------------------------------------------------------------
 namespace CampusAppWP8.Api.GeoApi
 {
     using System.Collections.Generic;
     using CampusAppWP8.Model;
-    using CampusAppWP8.Model.GeoDb;
-    using CampusAppWP8.Model.Utility;
     using CampusAppWP8.Resources;
-    using CampusAppWPortalLib8.Model.Utility;    
+    using CampusAppWPortalLib8.Model;
+    using CampusAppWPortalLib8.Model.GeoDb;
+    using CampusAppWPortalLib8.Model.Utility;
 
-    /// <summary>Pis api.</summary>
-    /// <remarks>Stubbfel, 09.09.2013.</remarks>
+    /// <summary> Pis api. </summary>
+    /// <remarks> Stubbfel, 09.09.2013. </remarks>
+    /// <seealso cref="T:CampusAppWP8.Model.XmlModel{CampusAppWP8.Model.GeoDb.SpsModel}"/>
     public class PisApi : XmlModel<SpsModel>
     {
         #region Constructor
 
-        /// <summary>Initializes a new instance of the PisApi class.</summary>
-        /// <remarks>Stubbfel, 09.09.2013.</remarks>
+        /// <summary> Initializes a new instance of the PisApi class. </summary>
+        /// <remarks> Stubbfel, 09.09.2013. </remarks>
         public PisApi()
             : base(ModelType.Feed, Constants.UrlPisService)
         {
@@ -32,10 +33,10 @@ namespace CampusAppWP8.Api.GeoApi
 
         #region Method
 
-        /// <summary>Sets up the information request.</summary>
-        /// <remarks>Stubbfel, 09.09.2013.</remarks>
-        /// <param name="pidList">  List of pids.</param>
-        /// <param name="infoNames">(Optional) list of names of the information.</param>
+        /// <summary> Sets up the information request. </summary>
+        /// <remarks> Stubbfel, 09.09.2013. </remarks>
+        /// <param name="pidList">   List of pids. </param>
+        /// <param name="infoNames"> (Optional) list of names of the information. </param>
         public void SetupInformationRequest(List<string> pidList, List<string> infoNames = null)
         {
             string pidListStr = string.Empty;

CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs

@@ -1,28 +1,29 @@
 //-----------------------------------------------------------------------
 // <copyright file="PssApi.cs" company="BTU/IIT">
-//     Company copyright tag.
+// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
 // </copyright>
-// <author>stubbfel</author>
-// <sience>09.09.2013</sience>
-//----------------------------------------------------------------------
-
+// <author>Stubbfel</author>
+// <date>14.10.2013</date>
+// <summary>Implements the pss API class</summary>
+//-----------------------------------------------------------------------
 namespace CampusAppWP8.Api.GeoApi
 {
     using System.Collections.Generic;
     using CampusAppWP8.Model;
-    using CampusAppWP8.Model.GeoDb;
-    using CampusAppWP8.Model.Utility;
     using CampusAppWP8.Resources;
+    using CampusAppWPortalLib8.Model;
+    using CampusAppWPortalLib8.Model.GeoDb;
     using CampusAppWPortalLib8.Model.Utility;
 
-    /// <summary>Pss api.</summary>
-    /// <remarks>Stubbfel, 09.09.2013.</remarks>
+    /// <summary> Pss api. </summary>
+    /// <remarks> Stubbfel, 09.09.2013. </remarks>
+    /// <seealso cref="T:CampusAppWP8.Model.XmlModel{CampusAppWP8.Model.GeoDb.SpsModel}"/>
     public class PssApi : XmlModel<SpsModel>
     {
         #region Constructor
 
-        /// <summary>Initializes a new instance of the PssApi class.</summary>
-        /// <remarks>Stubbfel, 09.09.2013.</remarks>
+        /// <summary> Initializes a new instance of the PssApi class. </summary>
+        /// <remarks> Stubbfel, 09.09.2013. </remarks>
         public PssApi()
             : base(ModelType.Feed, Constants.UrlPssService)
         {
@@ -32,10 +33,10 @@ namespace CampusAppWP8.Api.GeoApi
 
         #region Method
 
-        /// <summary>Sets up the service request.</summary>
-        /// <remarks>Stubbfel, 09.09.2013.</remarks>
-        /// <param name="pidList">     List of pids.</param>
-        /// <param name="serviceNames">(Optional) list of names of the services.</param>
+        /// <summary> Sets up the service request. </summary>
+        /// <remarks> Stubbfel, 09.09.2013. </remarks>
+        /// <param name="pidList">      List of pids. </param>
+        /// <param name="serviceNames"> (Optional) list of names of the services. </param>
         public void SetupServiceRequest(List<string> pidList, List<string> serviceNames = null)
         {
             string pidListStr = string.Empty;

CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs

@@ -1,30 +1,30 @@
 //-----------------------------------------------------------------------
 // <copyright file="SpsApi.cs" company="BTU/IIT">
-//     Company copyright tag.
+// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
 // </copyright>
-// <author>stubbfel</author>
-// <sience>06.08.2013</sience>
-//----------------------------------------------------------------------
+// <author>Stubbfel</author>
+// <date>14.10.2013</date>
+// <summary>Implements the sps API class</summary>
+//-----------------------------------------------------------------------
 namespace CampusAppWP8.Api.GeoApi
 {
-    using System.Collections.Generic;
+    using System.Collections.Generic;  
     using CampusAppWP8.Model;
-    using CampusAppWP8.Model.GeoDb;
-    using CampusAppWP8.Model.Utility;
     using CampusAppWP8.Resources;
     using CampusAppWP8.Utility;
-    using CampusAppWPortalLib8.Model.Utility;    
+    using CampusAppWPortalLib8.Model;
+    using CampusAppWPortalLib8.Model.GeoDb;
+    using CampusAppWPortalLib8.Model.Utility;
 
-    /// <summary>
-    /// Class for SPSAPI
-    /// </summary>
+    /// <summary> Class for SPSAPI. </summary>
+    /// <remarks> Stubbfel, 14.10.2013. </remarks>
+    /// <seealso cref="T:CampusAppWP8.Model.XmlModel{CampusAppWP8.Model.GeoDb.SpsModel}"/>
     public class SpsApi : XmlModel<SpsModel>
     {
         #region Constructor
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SpsApi" /> class.
-        /// </summary>
+        /// <summary> Initializes a new instance of the <see cref="SpsApi" /> class. </summary>
+        /// <remarks> Stubbfel, 14.10.2013. </remarks>
         public SpsApi()
             : base(ModelType.Feed, Constants.UrlSpsService)
         {
@@ -35,16 +35,17 @@ namespace CampusAppWP8.Api.GeoApi
         #region Method
 
         /// <summary>
-        ///  Method set the UriParameter of a placeRequest for a given latitude and longitude
+        ///     Method set the UriParameter of a placeRequest for a given latitude and longitude.
         /// </summary>
-        /// <param name="lat">latitude of the place</param>
-        /// <param name="log">longitude of the place</param>
-        /// <param name="domian">request domain</param>
-        public void SetupPlaceRequest(string lat, string log, string domian = null)
+        /// <remarks> Stubbfel, 14.10.2013. </remarks>
+        /// <param name="lat">    latitude of the place. </param>
+        /// <param name="log">    longitude of the place. </param>
+        /// <param name="domian"> (Optional) request domain. </param>
+        public void SetupPlaceRequest(double lat, double log, string domian = null)
         {
             List<UrlParamModel> parameterList = new List<UrlParamModel>();
-            parameterList.Add(new CleanUrlParamModel(Constants.SpsApi_LatitudeParaKey, lat));
-            parameterList.Add(new CleanUrlParamModel(Constants.SpsApi_LongitudeParaKey, log));
+            parameterList.Add(new CleanUrlParamModel(Constants.SpsApi_LatitudeParaKey, lat.ToString()));
+            parameterList.Add(new CleanUrlParamModel(Constants.SpsApi_LongitudeParaKey, log.ToString()));
             if (domian != null)
             {
                 parameterList.Add(new CleanUrlParamModel(Constants.SpsApi_DomainParaKey, domian));
@@ -53,15 +54,17 @@ namespace CampusAppWP8.Api.GeoApi
             this.SetUriParams(parameterList);
         }
 
-        /// <summary>Sets up the current place request.</summary>
-        /// <remarks>Stubbfel, 09.09.2013.</remarks>
-        /// <param name="domian">(Optional) request domain.</param>
+        /// <summary> Sets up the current place request. </summary>
+        /// <remarks> Stubbfel, 09.09.2013. </remarks>
+        /// <param name="domian"> (Optional) request domain. </param>
         public void SetupCurrentPlaceRequest(string domian = null)
         {
             Utilities.DetermineAndStoreCurrentPosition();
-            string lat = App.LoadFromAppState<string>(Constants.GeoWatch_CurrentPosition_Lat);
-            string log = App.LoadFromAppState<string>(Constants.GeoWatch_CurrentPosition_Long);
-            this.SetupPlaceRequest(lat, log, domian);
+            GeoMapPoint currentPosition = App.LoadFromAppState<GeoMapPoint>(Constants.GeoWatch_CurrentPositionPoint);
+            if (currentPosition != null)
+            {
+                this.SetupPlaceRequest(currentPosition.Latitude, currentPosition.Latitude, domian);
+            }
         }
 
         #endregion

CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs

@@ -1,29 +1,27 @@
 //-----------------------------------------------------------------------
 // <copyright file="LectureApi.cs" company="BTU/IIT">
-//     Company copyright tag.
+// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
 // </copyright>
-// <author>stubbfel</author>
-// <sience>13.06.2013</sience>
-//----------------------------------------------------------------------
+// <author>Stubbfel</author>
+// <date>14.10.2013</date>
+// <summary>Implements the lecture API class</summary>
+//-----------------------------------------------------------------------
 namespace CampusAppWP8.Api.Lecture
 {
     using CampusAppWP8.Model;
     using CampusAppWP8.Model.Lecture;
     using CampusAppWP8.Resources;
-    
-    /// <summary>
-    /// Class for the feed of the Lecture
-    /// </summary>
-    /// <remarks>
-    /// need the XmlAPI
-    /// </remarks>
-    public class LectureApi : XmlModel<LectureList>
+    using CampusAppWPortalLib8.Model;
+
+    /// <summary> Class for the feed of the Lecture. </summary>
+    /// <remarks> need the XmlAPI. </remarks>
+    /// <seealso cref="T:CampusAppWP8.Model.XmlModel{CampusAppWP8.Model.Lecture.LectureWp8List}"/>
+    public class LectureApi : XmlModel<LectureWp8List>
     {
         #region Constructor
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LectureApi" /> class.
-        /// </summary>
+        /// <summary> Initializes a new instance of the <see cref="LectureApi" /> class. </summary>
+        /// <remarks> Stubbfel, 14.10.2013. </remarks>
         public LectureApi()
             : base(ModelType.Feed, Constants.UrlLecture_ApiBaseAddr)
         {

CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs

@@ -1,25 +1,27 @@
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------
 // <copyright file="PersonSearchApi.cs" company="BTU/IIT">
-//     Company copyright tag.
+// The MIT License (MIT). Copyright (c) 2013 BTU/IIT.
 // </copyright>
-// <author>stubbfel</author>
-// <sience>05.09.2013</sience>
-//-----------------------------------------------------------------------------
-
+// <author>Stubbfel</author>
+// <date>14.10.2013</date>
+// <summary>Implements the person search API class</summary>
+//-----------------------------------------------------------------------
 namespace CampusAppWP8.Api.Person
 {
     using CampusAppWP8.Model;
     using CampusAppWP8.Model.Person;
     using CampusAppWP8.Resources;
+    using CampusAppWPortalLib8.Model;
 
-    /// <summary>Person search api.</summary>
-    /// <remarks>Stubbfel, 05.09.2013.</remarks>
-    public class PersonSearchApi : XmlModel<PersonListModel>
+    /// <summary> Person search api. </summary>
+    /// <remarks> Stubbfel, 05.09.2013. </remarks>
+    /// <seealso cref="T:CampusAppWP8.Model.XmlModel{CampusAppWP8.Model.Person.PersonListWp8Model}"/>
+    public class PersonSearchApi : XmlModel<PersonListWp8Model>
     {
         #region Constructor
 
-        /// <summary>Initializes a new instance of the PersonSearchApi class.</summary>
-        /// <remarks>Stubbfel, 05.09.2013.</remarks>
+        /// <summary> Initializes a new instance of the PersonSearchApi class. </summary>
+        /// <remarks> Stubbfel, 05.09.2013. </remarks>
         public PersonSearchApi()
             : base(ModelType.Feed, Constants.UrlPerson_PersonSearchByName)
         {

CampusAppWP8/CampusAppWP8/App.xaml

@@ -12,6 +12,8 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Styles/ListButton.xaml"/>
                 <ResourceDictionary Source="Styles/StartPageStyles.xaml"/>
+                <ResourceDictionary Source="Styles/Labels.xaml"/>
+                <ResourceDictionary Source="Styles/UniColors.xaml"/>
                 <ResourceDictionary>
                     <local:LocalizedStrings xmlns:local="clr-namespace:CampusAppWP8" x:Key="LocalizedStrings"/>
                     <local:ThemelizedIcons xmlns:local="clr-namespace:CampusAppWP8" x:Key="ThemelizedIcons"/>

CampusAppWP8/CampusAppWP8/App.xaml.cs

@@ -10,6 +10,7 @@ using System.IO.IsolatedStorage;
 using System.Threading;
 using System.Windows;
 using System.Windows.Markup;
+using System.Windows.Media;
 using System.Windows.Navigation;
 
 
@@ -150,25 +151,52 @@ namespace CampusAppWP8
                 Settings.AppSetting.DevMode = false;
             }
 
+            int appDeploy;
+            bool parseResult = int.TryParse(Constants.DeploymentNumber, out appDeploy);
+            if (!parseResult || Settings.AppSetting.DeploymentNumber != appDeploy) 
+            {
+                Settings.AppSetting.InitApp = false;
+            }
+
+            Color appColor = ((SolidColorBrush)App.Current.Resources["PhoneAccentBrush"]).Color;
+            if (!Settings.AppSetting.DisplaySetting.PhoneAccentColor.Equals(appColor))
+            {
+                if (Settings.AppSetting.DisplaySetting.AppAccentColor.Equals(Settings.AppSetting.DisplaySetting.PhoneAccentColor))
+                {
+                    Settings.AppSetting.DisplaySetting.AppAccentColor = appColor;
+                }
+                Settings.AppSetting.DisplaySetting.PhoneAccentColor = appColor;
+            }
+
+            appColor = Settings.AppSetting.DisplaySetting.AppAccentColor;
+            Utilities.SwitchAccentColor(appColor);
+
             this.UserSettingsLoaded();
 
-            Settings.AppSetting.UniNetwork = Utilities.IsUniNetworkAvailable();
-            if (!Settings.AppSetting.UniNetwork)
+            Settings.AppSetting.NetworkSetting.UniNetwork = Utilities.IsUniNetworkAvailable();
+            if (!Settings.AppSetting.NetworkSetting.UniNetwork)
             {
-                Settings.AppSetting.WifiEnable = Utilities.IsWifiAvailable();
+                Settings.AppSetting.NetworkSetting.WifiEnable = Utilities.IsWifiAvailable();
             }
             else
             {
-                Settings.AppSetting.WifiEnable = true;
+                Settings.AppSetting.NetworkSetting.WifiEnable = true;
             }
-            
-            if (Settings.AppSetting.GeoWatchEnable)
+
+            if (Settings.AppSetting.LocatingSetting.GeoWatchEnable)
             {
-                Thread thread = new Thread(new ThreadStart(Utilities.DetermineAndStoreCurrentPositionForce));
+                Thread thread = new Thread(new ThreadStart(this.PositionThread));
                 thread.Start();
             }
         }
 
+        /// <summary> Position thread. </summary>
+        /// <remarks> Stubbfel, 18.11.2013. </remarks>
+        private void PositionThread()
+        {
+            Utilities.DetermineAndStoreCurrentPositionForce();
+        }
+
         /// <summary>
         /// Load the usersettings from the store
         /// </summary>
@@ -198,7 +226,7 @@ namespace CampusAppWP8
         // Dieser Code wird beim Deaktivieren der Anwendung nicht ausgeführt
         private void Application_Closing(object sender, ClosingEventArgs e)
         {
-            // Sicherstellen, dass der erforderliche Anwendungszustand hier beibehalten wird
+            App.SaveToIsolatedStorage<string>("StartPageIndex", null);
         }
 
         // Code, der bei einem Navigationsfehler ausgeführt wird
@@ -243,6 +271,9 @@ namespace CampusAppWP8
             // Behandeln Sie Rücksetzanforderungen zum Löschen des Backstack
             RootFrame.Navigated += CheckForResetNavigation;
 
+            // Assign the lens example URI-mapper class to the application frame.
+            RootFrame.UriMapper = new AppUriMapper();
+
             // Sicherstellen, dass keine erneute Initialisierung erfolgt
             phoneApplicationInitialized = true;
         }