Merge branch 'feature/#151' into develop

2013-08-20 10:44:25 +02:00
parent 305737366e 0e3eac2c6a
commit f3ff78c6ab
19 changed files with 751 additions and 64 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -192,3 +192,86 @@ CampusAppWP8/packages/Newtonsoft.Json.4.5.11/lib/winrt45/Newtonsoft.Json.xml
 CampusAppWP8/packages/SharpZipLib-WP7.0.86.0.518/SharpZipLib-WP7.0.86.0.518.nupkg
 CampusAppWP8/packages/SharpZipLib-WP7.0.86.0.518/SharpZipLib-WP7.0.86.0.518.nuspec
 CampusAppWP8/packages/SharpZipLib-WP7.0.86.0.518/lib/sl4-windowsphone71/SharpZipLib.WindowsPhone7.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/WPtoolkit.4.2013.08.16.nupkg
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/WPtoolkit.4.2013.08.16.nuspec
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/content/README_FIRST.txt
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/content/Toolkit.Content/ApplicationBar.Add.png
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/content/Toolkit.Content/ApplicationBar.Cancel.png
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/content/Toolkit.Content/ApplicationBar.Check.png
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/content/Toolkit.Content/ApplicationBar.Delete.png
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/content/Toolkit.Content/ApplicationBar.Select.png
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl3-wp/Microsoft.Phone.Controls.Toolkit.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/Microsoft.Phone.Controls.Toolkit.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/cs-CZ/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/da-DK/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/de-DE/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/el-GR/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/en-GB/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/es-ES/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/fi-FI/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/fr-FR/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/hu-HU/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/id-ID/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/it-IT/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/ja-JP/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/ko-KR/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/ms-MY/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/nb-NO/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/nl-NL/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/pl-PL/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/pt-BR/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/ru-RU/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/sv-SE/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/zh-CN/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/sl4-windowsphone71/zh-TW/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/Microsoft.Phone.Controls.Toolkit.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/ar-SA/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/az-Latn-AZ/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/be-BY/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/bg-BG/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/ca-ES/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/cs-CZ/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/da-DK/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/de-DE/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/el-GR/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/en-GB/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/es-ES/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/es-MX/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/et-EE/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/fa-IR/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/fi-FI/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/fil-PH/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/fr-CA/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/fr-FR/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/he-IL/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/hi-IN/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/hr-HR/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/hu-HU/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/id-ID/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/it-IT/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/ja-JP/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/kk-KZ/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/ko-KR/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/lt-LT/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/lv-LV/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/mk-MK/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/ms-MY/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/nb-NO/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/nl-NL/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/pl-PL/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/pt-BR/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/pt-PT/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/ro-RO/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/ru-RU/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/sk-SK/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/sl-SI/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/sq-AL/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/sr-Latn-CS/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/sv-SE/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/th-TH/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/tr-TR/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/uk-UA/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/uz-Latn-UZ/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/vi-VN/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/zh-CN/Microsoft.Phone.Controls.Toolkit.resources.dll
+CampusAppWP8/packages/WPtoolkit.4.2013.08.16/lib/wp8/zh-TW/Microsoft.Phone.Controls.Toolkit.resources.dll
--- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs
+++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs
@@ -14,6 +14,7 @@ namespace CampusAppWP8.Feed.GeoApi
    using CampusAppWP8.Model.Utility;
    using CampusAppWP8.Resources;
    using CampusAppWP8.Utility;
+    using System.Device.Location;

    /// <summary>
    /// Class for SPSAPI
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -105,7 +105,9 @@
    <Compile Include="Feed\Mensa\MensaFeedCBNorth.cs" />
    <Compile Include="Feed\Mensa\MensaFeedCBMain.cs" />
    <Compile Include="Model\Campusmap\CBMainMapModel.cs" />
+    <Compile Include="Model\GeoDb\PlaceInformation.cs" />
    <Compile Include="Model\GeoDb\PlaceModel.cs" />
+    <Compile Include="Model\GeoDb\PlaceService.cs" />
    <Compile Include="Model\GeoDb\SpsModel.cs" />
    <Compile Include="Model\Mensa\MealModel.cs" />
    <Compile Include="Model\Setting\AppSettings.cs" />
@@ -426,7 +428,9 @@
    <Content Include="Assets\Tiles\kachel_large.png" />
    <Content Include="Assets\Tiles\kachel_medium.png" />
    <Content Include="Assets\Tiles\kachel_small.png" />
+    <Content Include="File\Campusmap\Offlinemap.xml" />
    <Content Include="README_FIRST.txt" />
+    <Content Include="Toolkit.Content\ApplicationBar.Add.png" />
    <Content Include="Toolkit.Content\ApplicationBar.Cancel.png" />
    <Content Include="Toolkit.Content\ApplicationBar.Check.png" />
    <Content Include="Toolkit.Content\ApplicationBar.Delete.png" />
@@ -449,13 +453,12 @@
  </ItemGroup>
  <ItemGroup>
    <Reference Include="Microsoft.Phone.Controls, Version=8.0.0.0, Culture=neutral, PublicKeyToken=24eec0d8c86cda1e, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.Phone.Controls.Toolkit">
-      <HintPath>..\packages\WPToolkit.4.2013.06.11\lib\wp8\Microsoft.Phone.Controls.Toolkit.dll</HintPath>
+    <Reference Include="Microsoft.Phone.Controls.Toolkit, Version=8.0.1.0, Culture=neutral, PublicKeyToken=b772ad94eb9ca604, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\WPtoolkit.4.2013.08.16\lib\wp8\Microsoft.Phone.Controls.Toolkit.dll</HintPath>
    </Reference>
  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="File\" />
-  </ItemGroup>
+  <ItemGroup />
  <ItemGroup>
    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
  </ItemGroup>
--- a/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml
+++ b/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <place id="1" parentId="" refpoint="POINT(14.324056352976152 51.76737987049448)">
+    <placeInformation placeInformationName="name">Campus Cottbus Mitte</placeInformation>
+    <placeInformation placeInformationName="typ">campus</placeInformation>
+  </place>
+  <place id="2" parentId="" refpoint="POINT(14.319497377197282 51.72668339740452)">
+    <placeInformation placeInformationName="name">Campus Cottbus Süd</placeInformation>
+    <placeInformation placeInformationName="typ">campus</placeInformation>
+  </place>
+  <place id="3" parentId="" refpoint="POINT(13.986618441187698 51.522217168257356)">
+    <placeInformation placeInformationName="name">Campus Senftenberg</placeInformation>
+    <placeInformation placeInformationName="typ">campus</placeInformation>
+  </place>
+  <place id="4" parentId="" refpoint="POINT(14.293908825617 51.77670359509875)">
+    <placeInformation placeInformationName="name">Campus Cottbus Nord</placeInformation>
+    <placeInformation placeInformationName="typ">campus</placeInformation>
+  </place>
+  <place id="25091388" parentId="4" refpoint="POINT(14.291954883333334 51.776766916666666)">
+    <placeInformation placeInformationName="name">Lehrgebäude 4/6</placeInformation>
+  </place>
+  <place id="25091389" parentId="4" refpoint="POINT(14.294196 51.7762505625)">
+    <placeInformation placeInformationName="name">Lehrgebäude 4/3</placeInformation>
+  </place>
+  <place id="25091390" parentId="4" refpoint="POINT(14.294610075 51.77676294999999)">
+    <placeInformation placeInformationName="name">Lehrgebäude 4/1</placeInformation>
+  </place>
+  <place id="25091391" parentId="4" refpoint="POINT(14.2952951 51.77793325)">
+    <placeInformation placeInformationName="name">Lehrgebäude 4/4</placeInformation>
+  </place>
+  <place id="89552667" parentId="3" refpoint="POINT(13.988664100000001 51.520596499999996)">
+    <placeInformation placeInformationName="name">Wohnheim</placeInformation>
+  </place>
+  <place id="89552669" parentId="3" refpoint="POINT(13.98994325 51.521213599999996)">
+    <placeInformation placeInformationName="name">Wohnheim</placeInformation>
+  </place>
+  <place id="89552670" parentId="3" refpoint="POINT(13.989489149999999 51.5208131)">
+    <placeInformation placeInformationName="name">Wohnheim</placeInformation>
+  </place>
+  <place id="89552675" parentId="3" refpoint="POINT(13.988018654545455 51.521318268181815)">
+    <placeInformation placeInformationName="name">Wohnheim</placeInformation>
+  </place>
+  <place id="89552676" parentId="3" refpoint="POINT(13.9890434 51.52150835)">
+    <placeInformation placeInformationName="name">Wohnheim</placeInformation>
+  </place>
+  <place id="98446004" parentId="3" refpoint="POINT(13.983276944444444 51.522954)">
+    <placeInformation placeInformationName="name">Biotechnologie</placeInformation>
+  </place>
+  <place id="126565095" parentId="2" refpoint="POINT(14.318193599999999 51.725572375)">
+    <placeInformation placeInformationName="name">Lehrgebäude Musikpädagogik</placeInformation>
+  </place>
+  <place id="127003463" parentId="1" refpoint="POINT(14.329434351923076 51.76722032307691)">
+    <placeInformation placeInformationName="name">Informations, Kommunikations und Medienzentrum</placeInformation>
+    <placeInformation placeInformationName="typ">library</placeInformation>
+  </place>
+  <place id="127003745" parentId="1" refpoint="POINT(14.330883875 51.7678221)">
+    <placeInformation placeInformationName="name">Internationales Begegnungszentrum</placeInformation>
+  </place>
+  <place id="127003746" parentId="1" refpoint="POINT(14.3305683 51.76835295)">
+    <placeInformation placeInformationName="name">Lehrgebäude 8</placeInformation>
+  </place>
+  <place id="127010188" parentId="1" refpoint="POINT(14.31918153 51.76944543999999)">
+    <placeInformation placeInformationName="name">Laborhalle 3D</placeInformation>
+  </place>
+  <place id="127010189" parentId="1" refpoint="POINT(14.318166900000001 51.769462600000004)">
+    <placeInformation placeInformationName="name">Gewächshaus Fakultät 4</placeInformation>
+  </place>
+  <place id="127010192" parentId="1" refpoint="POINT(14.32553145 51.76862572499999)">
+    <placeInformation placeInformationName="name">Reprographie</placeInformation>
+  </place>
+  <place id="127010225" parentId="1" refpoint="POINT(14.3239971 51.7678181)">
+    <placeInformation placeInformationName="name">Umformer Station</placeInformation>
+  </place>
+  <place id="127010228" parentId="1" refpoint="POINT(14.3265728 51.76835932)">
+    <placeInformation placeInformationName="name">Zentrale Einrichtung Sprachenzentrum</placeInformation>
+  </place>
+  <place id="129140526" parentId="1" refpoint="POINT(14.329964147222219 51.768867747222224)">
+    <placeInformation placeInformationName="name">Lehrgebäude 9</placeInformation>
+  </place>
+  <place id="129140566" parentId="1" refpoint="POINT(14.327171049999999 51.768546066666666)">
+    <placeInformation placeInformationName="name">Baustofflabor</placeInformation>
+  </place>
+  <place id="129258388" parentId="1" refpoint="POINT(14.322364300000002 51.76576072500001)">
+    <placeInformation placeInformationName="name">Studentenwerk Frankfurt (Oder)</placeInformation>
+  </place>
+  <place id="129258396" parentId="1" refpoint="POINT(14.32840075 51.765809774999994)">
+    <placeInformation placeInformationName="name">Zentralverwaltung Hubertstraße (ZVH)</placeInformation>
+  </place>
+  <place id="129258513" parentId="1" refpoint="POINT(14.320277773573652 51.76586220609145)">
+    <placeInformation placeInformationName="name">Wohnheim Papitzer Straße 4/5</placeInformation>
+    <placeInformation placeInformationName="typ">guest_house</placeInformation>
+  </place>
+  <place id="129357942" parentId="1" refpoint="POINT(14.325887666666667 51.76394285000001)">
+    <placeInformation placeInformationName="name">Lehrgebäude 10</placeInformation>
+  </place>
+  <place id="129357943" parentId="1" refpoint="POINT(14.325013391666666 51.76421453333333)">
+    <placeInformation placeInformationName="name">Studentenwohnanlage ErichWeinertStraße</placeInformation>
+  </place>
+  <place id="129357944" parentId="1" refpoint="POINT(14.327351425 51.765186625)">
+    <placeInformation placeInformationName="name">Studentenwohnanlage Universitätsstraße 1</placeInformation>
+  </place>
+  <place id="129357945" parentId="1" refpoint="POINT(14.326389 51.76530997500001)">
+    <placeInformation placeInformationName="name">Studentenwohnanlage Universitätsstraße 2</placeInformation>
+  </place>
+  <place id="129357946" parentId="1" refpoint="POINT(14.325485850000002 51.765425037499995)">
+    <placeInformation placeInformationName="name">Studentenwohnanlage Universitätsstraße 3</placeInformation>
+  </place>
+  <place id="129357947" parentId="1" refpoint="POINT(14.326990899999998 51.765654600000005)">
+    <placeInformation placeInformationName="name">Zwischenbau 1</placeInformation>
+  </place>
+  <place id="129357949" parentId="1" refpoint="POINT(14.32601965 51.765781849999996)">
+    <placeInformation placeInformationName="name">Zwischenbau 3</placeInformation>
+  </place>
+  <place id="129357950" parentId="1" refpoint="POINT(14.325752350000002 51.764987175)">
+    <placeInformation placeInformationName="name">Zwischenbau 4</placeInformation>
+  </place>
+  <place id="129357951" parentId="1" refpoint="POINT(14.3254197375 51.7637245)">
+    <placeInformation placeInformationName="name">Zwischenbau 6</placeInformation>
+  </place>
+  <place id="129357952" parentId="1" refpoint="POINT(14.325669099999999 51.764512059999994)">
+    <placeInformation placeInformationName="name">Zwischenbau 5</placeInformation>
+  </place>
+  <place id="140400852" parentId="3" refpoint="POINT(13.987574563157894 51.521223294736856)">
+    <placeInformation placeInformationName="name">Mehrzweckgebäude</placeInformation>
+  </place>
+  <place id="140400854" parentId="3" refpoint="POINT(13.983964349999997 51.522447674999995)">
+    <placeInformation placeInformationName="name">Physiotheraphie/Medizintechnik</placeInformation>
+  </place>
+  <place id="141509869" parentId="2" refpoint="POINT(14.319057066666666 51.726194099999994)">
+    <placeInformation placeInformationName="name">Cafeteria HL</placeInformation>
+    <placeInformation placeInformationName="typ">public_building</placeInformation>
+  </place>
+  <place id="141509871" parentId="2" refpoint="POINT(14.320103391666665 51.72584225)">
+    <placeInformation placeInformationName="name">Gebäude 14</placeInformation>
+  </place>
+  <place id="141509873" parentId="2" refpoint="POINT(14.320494978125 51.72755265625001)">
+    <placeInformation placeInformationName="name">Laborgebäude Bauingenieurwesen Verfahrenstechni</placeInformation>
+  </place>
+  <place id="141509874" parentId="2" refpoint="POINT(14.32044634 51.726733839999994)">
+    <placeInformation placeInformationName="name">Lehrgebäude Bauningenieurwesen Architektur</placeInformation>
+  </place>
+  <place id="141509875" parentId="2" refpoint="POINT(14.3196709 51.7271438)">
+    <placeInformation placeInformationName="name">Lehrgebäude Bauningenieurwesen Architektur</placeInformation>
+  </place>
+  <place id="141509876" parentId="2" refpoint="POINT(14.318373025 51.7267223)">
+    <placeInformation placeInformationName="name">Lehrgebäude Betriebswirtschaftslehre</placeInformation>
+  </place>
+  <place id="141509877" parentId="2" refpoint="POINT(14.31889922 51.72755642)">
+    <placeInformation placeInformationName="name">Lehrgebäude Sozialwesen</placeInformation>
+  </place>
+  <place id="141509893" parentId="2" refpoint="POINT(14.319239050000002 51.72455225)">
+    <placeInformation placeInformationName="name">Wohnheim 1</placeInformation>
+  </place>
+  <place id="145126872" parentId="1" refpoint="POINT(14.326107239999999 51.76841574)">
+    <placeInformation placeInformationName="name">Fakultät 3 / Sport</placeInformation>
+  </place>
+  <place id="145126874" parentId="1" refpoint="POINT(14.3271468 51.76813533999999)">
+    <placeInformation placeInformationName="name">Laborgebäude 1B</placeInformation>
+  </place>
+  <place id="145126875" parentId="1" refpoint="POINT(14.327784339999997 51.768178549999995)">
+    <placeInformation placeInformationName="name">Lehrgebäude 1A</placeInformation>
+  </place>
+  <place id="145128359" parentId="1" refpoint="POINT(14.322298770000003 51.768124109999995)">
+    <placeInformation placeInformationName="name">Forschungs und Materialprüfanstalt Cottbus</placeInformation>
+  </place>
+  <place id="145128360" parentId="1" refpoint="POINT(14.322584050000001 51.768901983333336)">
+    <placeInformation placeInformationName="name">Garagenkomplex</placeInformation>
+  </place>
+  <place id="145128365" parentId="1" refpoint="POINT(14.3245076125 51.7680148)">
+    <placeInformation placeInformationName="name">Lehrgebäude 1C</placeInformation>
+  </place>
+  <place id="145128368" parentId="1" refpoint="POINT(14.323577843750002 51.768762243750004)">
+    <placeInformation placeInformationName="name">Lehrgebäude 3</placeInformation>
+  </place>
+  <place id="145128369" parentId="1" refpoint="POINT(14.323765416666669 51.76840466666667)">
+    <placeInformation placeInformationName="name">Lehrhalle 3G Verkehrtechnikhalle</placeInformation>
+  </place>
+  <place id="145128371" parentId="1" refpoint="POINT(14.324894700000002 51.76894906)">
+    <placeInformation placeInformationName="name">Sporthalle 1</placeInformation>
+  </place>
+  <place id="145128380" parentId="1" refpoint="POINT(14.324635666666667 51.768258633333325)">
+    <placeInformation placeInformationName="name">Hörsaal 3</placeInformation>
+  </place>
+  <place id="145130526" parentId="1" refpoint="POINT(14.318696583333333 51.769080383333346)">
+    <placeInformation placeInformationName="name">GrundbauVersuchshalle</placeInformation>
+  </place>
+  <place id="145130527" parentId="1" refpoint="POINT(14.321550466666666 51.76952978888889)">
+    <placeInformation placeInformationName="name">Laborgebäude 4B</placeInformation>
+  </place>
+  <place id="145130528" parentId="1" refpoint="POINT(14.31957525 51.7687229)">
+    <placeInformation placeInformationName="name">Laborhalle 3C</placeInformation>
+  </place>
+  <place id="145130529" parentId="1" refpoint="POINT(14.321277350000003 51.76929023333332)">
+    <placeInformation placeInformationName="name">Laborhalle 4C</placeInformation>
+  </place>
+  <place id="145130530" parentId="1" refpoint="POINT(14.320434075757573 51.76835607878787)">
+    <placeInformation placeInformationName="name">Lehrgebäude 3A</placeInformation>
+  </place>
+  <place id="145130531" parentId="1" refpoint="POINT(14.3214907 51.7684953375)">
+    <placeInformation placeInformationName="name">Lehrgebäude 3B</placeInformation>
+  </place>
+  <place id="145130532" parentId="1" refpoint="POINT(14.32181761111111 51.76925883333334)">
+    <placeInformation placeInformationName="name">Lehrgebäude 4A</placeInformation>
+  </place>
+  <place id="145130533" parentId="1" refpoint="POINT(14.318569425 51.768416925)">
+    <placeInformation placeInformationName="name">Panta Rhei Halle</placeInformation>
+  </place>
+  <place id="145132458" parentId="1" refpoint="POINT(14.326804730000001 51.76767220000001)">
+    <placeInformation placeInformationName="name">Großer Hörsaal</placeInformation>
+    <placeInformation placeInformationName="typ">entrance</placeInformation>
+  </place>
+  <place id="145132460" parentId="1" refpoint="POINT(14.327332890909092 51.767140422727266)">
+    <placeInformation placeInformationName="name">Hauptgebäude</placeInformation>
+  </place>
+  <place id="145132464" parentId="1" refpoint="POINT(14.327362925 51.76601645)">
+    <placeInformation placeInformationName="name">Zentralverwaltung</placeInformation>
+  </place>
+  <place id="145271897" parentId="1" refpoint="POINT(14.324329966666669 51.76674437777778)">
+    <placeInformation placeInformationName="name">Zwischenbau Lehrgebäude 2A/B</placeInformation>
+  </place>
+  <place id="145271902" parentId="1" refpoint="POINT(14.324795547058825 51.76663094705882)">
+    <placeInformation placeInformationName="name">Lehrgebäude 2A</placeInformation>
+  </place>
+  <place id="145271906" parentId="1" refpoint="POINT(14.323845864705879 51.7667514882353)">
+    <placeInformation placeInformationName="name">Lehrgebäude 2B</placeInformation>
+  </place>
+  <place id="145271909" parentId="1" refpoint="POINT(14.322875529411766 51.7668744117647)">
+    <placeInformation placeInformationName="name">Lehrgebäude 2C</placeInformation>
+  </place>
+  <place id="145271910" parentId="1" refpoint="POINT(14.3219259 51.76699498823529)">
+    <placeInformation placeInformationName="name">Lehrgebäude 2D</placeInformation>
+  </place>
+  <place id="145271920" parentId="1" refpoint="POINT(14.32240947777778 51.76698596666667)">
+    <placeInformation placeInformationName="name">Zwischenbau Lehrgebäude 2C/D</placeInformation>
+  </place>
+  <place id="145280191" parentId="1" refpoint="POINT(14.320955458333335 51.76702027499999)">
+    <placeInformation placeInformationName="name">Alte Schwimmhalle (geschlossen)</placeInformation>
+  </place>
+  <place id="145280193" parentId="1" refpoint="POINT(14.326168833333334 51.76649038666667)">
+    <placeInformation placeInformationName="name">BTU Mensa</placeInformation>
+    <placeInformation placeInformationName="typ">restaurant</placeInformation>
+  </place>
+  <place id="145280213" parentId="1" refpoint="POINT(14.325830832142858 51.76742222500002)">
+    <placeInformation placeInformationName="name">Zentrales Hörsaalgebäude</placeInformation>
+  </place>
+  <place id="149292698" parentId="1" refpoint="POINT(14.326734299999998 51.764857675)">
+    <placeInformation placeInformationName="name">Zwischenbau 2</placeInformation>
+  </place>
+  <place id="173777125" parentId="3" refpoint="POINT(13.9839968625 51.52364)">
+    <placeInformation placeInformationName="name">Elektrotechnik/Chemie/Verfahrenstechnik</placeInformation>
+    <placeInformation placeInformationName="typ">school</placeInformation>
+  </place>
+  <place id="173780283" parentId="3" refpoint="POINT(13.986237655555556 51.52300835555556)">
+    <placeInformation placeInformationName="name">Maschinenbau</placeInformation>
+    <placeInformation placeInformationName="typ">school</placeInformation>
+  </place>
+  <place id="173780284" parentId="3" refpoint="POINT(13.984948066666668 51.52346673333333)">
+    <placeInformation placeInformationName="name">Sporthalle</placeInformation>
+    <placeInformation placeInformationName="typ">school</placeInformation>
+  </place>
+  <place id="173780285" parentId="3" refpoint="POINT(13.98732225 51.52266459999999)">
+    <placeInformation placeInformationName="name">Mensa</placeInformation>
+    <placeInformation placeInformationName="typ">school</placeInformation>
+  </place>
+  <place id="173780286" parentId="3" refpoint="POINT(13.984847919999998 51.522048039999994)">
+    <placeInformation placeInformationName="name">Informatik (Labor)</placeInformation>
+    <placeInformation placeInformationName="typ">school</placeInformation>
+  </place>
+  <place id="173780289" parentId="3" refpoint="POINT(13.985745083333333 51.52182505)">
+    <placeInformation placeInformationName="name">Informatik</placeInformation>
+    <placeInformation placeInformationName="typ">school</placeInformation>
+  </place>
+  <place id="173780291" parentId="3" refpoint="POINT(13.98583916111111 51.52230788333334)">
+    <placeInformation placeInformationName="name">KonradZuseMedienzentrum</placeInformation>
+    <placeInformation placeInformationName="typ">school</placeInformation>
+  </place>
+  <place id="173780296" parentId="3" refpoint="POINT(13.987333000000001 51.522037025)">
+    <placeInformation placeInformationName="name">Hochschulbibliothek</placeInformation>
+    <placeInformation placeInformationName="typ">school</placeInformation>
+  </place>
+  <place id="173780298" parentId="3" refpoint="POINT(13.986758933333332 51.521615125000004)">
+    <placeInformation placeInformationName="name">Hochschulverwaltung/Rechenzentrum</placeInformation>
+    <placeInformation placeInformationName="typ">school</placeInformation>
+  </place>
+  <place id="179989851" parentId="1" refpoint="POINT(14.319523595585968 51.766827543042716)">
+    <placeInformation placeInformationName="name">Wohnanlage 8</placeInformation>
+  </place>
+  <place id="183190820" parentId="4" refpoint="POINT(14.294928650000001 51.776659775)">
+    <placeInformation placeInformationName="name">Lehrgebäude 4/2</placeInformation>
+  </place>
+  <place id="183190822" parentId="4" refpoint="POINT(14.294772000000002 51.777980975)">
+    <placeInformation placeInformationName="name">Lehrgebäude 4/5</placeInformation>
+  </place>
+</root>
+
--- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs
@@ -8,18 +8,24 @@
 namespace CampusAppWP8.Model.Campusmap
 {
    using System.Windows;
+    using CampusAppWP8.Model.GeoDb;
+    using CampusAppWP8.Resources;
+    using CampusAppWP8.Utility;

    /// <summary>
    /// Class for the MapModel of the mainCampus of cottbus
    /// </summary>
    public class CBMainMapModel : MapModel
    {
+        /// <summary>Variable for the identify of the campus.</summary>
+        private static readonly string Campus = ((int)CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_MAIN).ToString();
+
        /// <summary>
        ///  Initializes a new instance of the <see cref="CBMainMapModel" /> class.
        /// </summary>
        public CBMainMapModel()
        {
-            this.ImageSource = "/Assets/campusmap.png";
+            this.ImageSource = Constants.FileMap_CBMainMap;
            this.ImageWidth = 2000;
            this.ImageHeight = 1425;
            this.MapImageOffsetX = -228;
@@ -30,5 +36,21 @@ namespace CampusAppWP8.Model.Campusmap
            this.GeoOffsetX = 14.327159;
            this.GeoOffsetY = 51.766548;
        }
+
+        /// <summary>Loads the spatial./.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        protected override void LoadSpatials()
+        {
+            SpsModel model = XmlManager.DeserializationFileToModel<SpsModel>(Constants.FileMap_OfflineMap);
+
+            this.Spatial = new SpsModel();
+            foreach (PlaceModel place in model.Places)
+            {
+                if (Campus.Equals(place.ParentId) || Campus.Equals(place.PlaceId))
+                {
+                    this.Spatial.Places.Add(place);
+                }
+            }
+        }
    }
 }
--- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs
@@ -11,6 +11,7 @@ namespace CampusAppWP8.Model.Campusmap
    using System.Windows;
    using System.Windows.Controls;
    using System.Windows.Media.Imaging;
+    using CampusAppWP8.Model.GeoDb;

    /// <summary>
    /// This Class manage the properties of a Map
@@ -24,6 +25,7 @@ namespace CampusAppWP8.Model.Campusmap
        /// </summary>
        public MapModel()
        {
+            this.LoadSpatials();
        }

        #endregion
@@ -80,6 +82,10 @@ namespace CampusAppWP8.Model.Campusmap
        /// </summary>
        public Point RefPoint { get; set; }

+        /// <summary>Gets or sets the spatial of the map.</summary>
+        /// <value>The spatial.</value>
+        public SpsModel Spatial { get; set; }
+
        #endregion

        #region Methods
@@ -199,6 +205,11 @@ namespace CampusAppWP8.Model.Campusmap
            return this.ConverToMapPoint(point.X, point.Y);
        }

+        /// <summary>Loads the spatial./</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        protected virtual void LoadSpatials()
+        {
+        }
        #endregion
    }
 }
--- a/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceInformation.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceInformation.cs
@@ -0,0 +1,26 @@
+//-----------------------------------------------------------------------
+// <copyright file="PlaceInformation.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>19.08.2013</sience>
+//----------------------------------------------------------------------
+namespace CampusAppWP8.Model.GeoDb
+{
+    using System.Xml.Serialization;
+
+    /// <summary>Information about the place.</summary>
+    /// <remarks>Stubbfel, 19.08.2013.</remarks>
+    public class PlaceInformation
+    {
+        /// <summary>Gets or sets the name of the information.</summary>
+        /// <value>The name of the information.</value>
+        [XmlElement("placeInformationName")]
+        public string InformationName { get; set; }
+
+        /// <summary>Gets or sets the information value.</summary>
+        /// <value>The information value.</value>
+        [XmlText]
+        public string InformationValue { get; set; }
+    }
+}
--- a/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceModel.cs
@@ -8,7 +8,14 @@

 namespace CampusAppWP8.Model.GeoDb
 {
+    using System;
+    using System.Collections.ObjectModel;
+    using System.Device.Location;
+    using System.Globalization;
+    using System.Text.RegularExpressions;
    using System.Xml.Serialization;
+    using CampusAppWP8.Resources;
+    using CampusAppWP8.Utility;

    /// <summary>
    /// Model for a place of the SPSService
@@ -32,5 +39,49 @@ namespace CampusAppWP8.Model.GeoDb
        /// </summary>
        [XmlAttribute("refpoint")]
        public string RefPoint { get; set; }
+
+        /// <summary>Gets the geo reference point.</summary>
+        /// <value>The geo reference point.</value>
+        public GeoCoordinate GeoRefPoint
+        {
+            get
+            {
+                string refstring = this.RefPoint;
+                Regex rx = new Regex(Constants.Regex_Coordinate);
+                MatchCollection matches = rx.Matches(refstring);
+                if (matches.Count != 1)
+                {
+                    return null;
+                }
+
+                string[] values = matches[0].ToString().Split(' ');
+
+                if (values.Length != 2)
+                {
+                    return null;
+                }
+
+                // create the GeoCoordirate
+                try
+                {
+                    return new GeoCoordinate(double.Parse(values[1], CultureInfo.InvariantCulture), double.Parse(values[0], CultureInfo.InvariantCulture));
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogException(ex);
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>Gets or sets the information.</summary>
+        /// <value>The information.</value>
+        [XmlElement("placeInformation")]
+        public ObservableCollection<PlaceInformation> Informations { get; set; }
+
+        /// <summary>Gets or sets the services.</summary>
+        /// <value>The services.</value>
+        [XmlElement("placeService")]
+        public ObservableCollection<PlaceService> Services { get; set; }
    }
 }
--- a/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceService.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceService.cs
@@ -0,0 +1,32 @@
+//-----------------------------------------------------------------------------
+// <copyright file="PlaceService.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>19.08.2013</sience>
+//-----------------------------------------------------------------------------
+
+namespace CampusAppWP8.Model.GeoDb
+{
+    using System.Xml.Serialization;
+
+    /// <summary>Place service.</summary>
+    /// <remarks>Stubbfel, 19.08.2013.</remarks>
+    public class PlaceService
+    {
+        /// <summary>Gets or sets the name of the service.</summary>
+        /// <value>The name of the service.</value>
+        [XmlAttribute("placeServiceName")]
+        public string ServiceName { get; set; }
+
+        /// <summary>Gets or sets the SAP of an service.</summary>
+        /// <value>The sap.</value>
+        [XmlElement("sap")]
+        public string SAP { get; set; }
+
+        /// <summary>Gets or sets the request for a place.</summary>
+        /// <value>The request.</value>
+        [XmlElement("request")]
+        public string Request { get; set; }
+    }
+}
--- a/CampusAppWP8/CampusAppWP8/Model/GeoDb/SpsModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/GeoDb/SpsModel.cs
@@ -8,7 +8,9 @@

 namespace CampusAppWP8.Model.GeoDb
 {
+    using System.Collections.Generic;
    using System.Collections.ObjectModel;
+    using System.Linq;
    using System.Xml.Serialization;

    /// <summary>
@@ -17,10 +19,69 @@ namespace CampusAppWP8.Model.GeoDb
    [XmlRoot("root")]
    public class SpsModel
    {
+        /// <summary>Initializes a new instance of the SpsModel class.</summary>
+        /// <remarks>Stubbfel, 20.08.2013.</remarks>
+        public SpsModel()
+        {
+            this.Places = new ObservableCollection<PlaceModel>();
+        }
+
        /// <summary>
        /// Gets or sets a list of places
        /// </summary>
        [XmlElement("place")]
        public ObservableCollection<PlaceModel> Places { get; set; }
+
+        /// <summary>Gets places by information.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        /// <param name="query">         The query.</param>
+        /// <param name="ignoreCases">     (Optional) the ignore cases.</param>
+        /// <param name="informationName">(Optional) name of the information.</param>
+        /// <returns>The places by information.</returns>
+        public List<PlaceModel> GetPlacesByInformation(string query, bool ignoreCases = true, string informationName = null)
+        {
+            string querryLow = string.Empty;
+            IEnumerable<PlaceModel> resultplaces = null;
+
+            // select correct statement
+            if (ignoreCases && informationName == null)
+            {
+                querryLow = query.ToLower();
+                resultplaces = from place in this.Places
+                               from info in place.Informations
+                               where info.InformationValue.ToLower().Contains(querryLow)
+                               select place;
+            }
+            else if (ignoreCases && informationName != null)
+            {
+                querryLow = query.ToLower();
+                resultplaces = from place in this.Places
+                               from info in place.Informations
+                               where info.InformationValue.ToLower().Contains(querryLow) && info.InformationName.Equals(informationName)
+                               select place;
+            }
+            else if (!ignoreCases && informationName == null)
+            {
+                resultplaces = from place in this.Places
+                               from info in place.Informations
+                               where info.InformationValue.Contains(querryLow)
+                               select place;
+            }
+            else if (!ignoreCases && informationName != null)
+            {
+                resultplaces = from place in this.Places
+                               from info in place.Informations
+                               where info.InformationValue.Contains(querryLow) && info.InformationName.Equals(informationName)
+                               select place;
+            }
+
+            // null assert
+            if (resultplaces == null)
+            {
+                return null;
+            }
+
+            return resultplaces.ToList<PlaceModel>();
+        }
    }
 }
--- a/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs
@@ -122,7 +122,6 @@ namespace CampusAppWP8.Model.Setting
            }
        }

-
        /// <summary>
        /// Gets or sets the defaultCampus of the user
        /// </summary>
--- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml
@@ -35,11 +35,11 @@
            <Grid Grid.Row="0">

                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
+                  <!--  <ColumnDefinition Width="*"/> -->
                    <ColumnDefinition Width="*"/>
                    <ColumnDefinition Width="auto"/>
                </Grid.ColumnDefinitions>
-                <StackPanel  Grid.Column="0">
+            <!--    <StackPanel  Grid.Column="0">
                    <TextBlock Text="Lat:" />
                    <TextBox Name="YPoint" Text="51,767747" InputScope="Number" />
                </StackPanel>
@@ -49,6 +49,12 @@
                </StackPanel>
                <Button Grid.Column="2" Click="Button_Click">
                    <Image Source="{Binding Path=ThemelizedIcon.Search, Source={StaticResource ThemelizedIcons}}" Width="60"/>
+                </Button>-->
+                <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                    <TextBox  Name="QString" InputScope="Text" AcceptsReturn="True" />
+                </StackPanel>
+                <Button Grid.Column="1" Click="Button_Click2">
+                    <Image Source="{Binding Path=ThemelizedIcon.Search, Source={StaticResource ThemelizedIcons}}" Width="60"/>
                </Button>
            </Grid>
            <ScrollViewer Name="MapScroller" Grid.Row="1" HorizontalScrollBarVisibility="Auto" RenderTransformOrigin="0,0">
--- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
@@ -8,27 +8,27 @@
 namespace CampusAppWP8.Pages.Campusmap
 {
    using System;
+    using System.Collections.Generic;
+    using System.Device.Location;
    using System.Globalization;
+    using System.Threading;
    using System.Windows;
    using System.Windows.Navigation;
    using CampusAppWP8.Model.Campusmap;
+    using CampusAppWP8.Model.GeoDb;
    using CampusAppWP8.Resources;
    using CampusAppWP8.Utility;
    using Microsoft.Phone.Controls;

-    /// <summary>
-    /// Class for the campusMap page
-    /// </summary>
+    /// <summary>Class for the campusMap page.</summary>
+    /// <remarks>Stubbfel, 19.08.2013.</remarks>
    public partial class CampusMapPage : PhoneApplicationPage
    {
-        /// <summary>
-        /// Variable for the map model
-        /// </summary>
+        /// <summary>Variable for the map model.</summary>
        private MapModel map;

-        /// <summary>
-        ///  Initializes a new instance of the <see cref="CampusMapPage" /> class.
-        /// </summary>
+        /// <summary>Initializes a new instance of the <see cref="CampusMapPage" /> class.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
        public CampusMapPage()
        {
            this.InitializeComponent();
@@ -36,77 +36,122 @@ namespace CampusAppWP8.Pages.Campusmap
            this.MapCanvas.DataContext = this.map;
        }

-        /// <summary>
-        /// Methods overrides the  OnNavigatedTo-Method
-        /// </summary>
-        /// <param name="e">some NavigationEventArgs</param>
+        /// <summary>Methods overrides the  OnNavigatedTo-Method.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        /// <param name="e">some NavigationEventArgs.</param>
        protected override void OnNavigatedTo(NavigationEventArgs e)
        {
            base.OnNavigatedTo(e);
-            this.ShowCurrentPositionDispatcher();   
+            MapCanvas.Children.Clear();
+            this.AddPins(this.SearchPlaces("campus")); 
+            this.ShowCurrentPositionDispatcher();
        }

-        /// <summary>
-        /// Button click method
-        /// </summary>
-        /// <param name="sender">caller object</param>
-        /// <param name="e">some EventArgs</param>
+        /// <summary>Button click method.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        /// <param name="sender">caller object.</param>
+        /// <param name="e">     some EventArgs.</param>
        private void Button_Click(object sender, RoutedEventArgs e)
        {
-            this.AddPin(double.Parse(XPoint.Text), double.Parse(YPoint.Text));
+            // this.AddPin(double.Parse(XPoint.Text), double.Parse(YPoint.Text));
        }

-        /// <summary>
-        /// Add Pin to  an certain position
-        /// </summary>
-        /// <param name="x">longitude parameter</param>
-        /// <param name="y">latitude parameter</param>
+        /// <summary>Button click method.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        /// <param name="sender">caller object.</param>
+        /// <param name="e">     some EventArgs.</param>
+        private void Button_Click2(object sender, RoutedEventArgs e)
+        {
+            string query = QString.Text.Trim();
+
+            if (query.Equals(string.Empty))
+            {
+                return;
+            }
+ 
+            MapCanvas.Children.Clear();
+            this.AddPins(this.SearchPlaces(query));            
+        }
+
+        /// <summary>Searches for the first places.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        /// <param name="query">The query.</param>
+        /// <returns>The found places.</returns>
+        private List<PlaceModel> SearchPlaces(string query)
+        {
+            return this.map.Spatial.GetPlacesByInformation(query);
+        }
+
+        /// <summary>Adds the pins.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        /// <param name="places">The places.</param>
+        private void AddPins(List<PlaceModel> places)
+        {
+            foreach (PlaceModel place in places)
+            {
+                GeoCoordinate coor = place.GeoRefPoint;
+                if (coor != null)
+                {
+                    this.AddPin(coor.Longitude, coor.Latitude);
+                }
+            }
+        }
+
+        /// <summary>Add Pin to  an certain position.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        /// <param name="x">longitude parameter.</param>
+        /// <param name="y">latitude parameter.</param>
        private void AddPin(double x, double y)
        {
-            MapCanvas.Children.Clear();
            Point scrollPoint = this.map.GetScrollPoint(this.map.ConverToPixelPoint(this.map.ConverToMapPoint(x, y)));
            MapCanvas.Children.Add(this.map.AddPinFromRefPoint(this.map.ConverToPixelPoint(this.map.ConverToMapPoint(x, y))));

            MapScroller.UpdateLayout();
            MapScroller.ScrollToVerticalOffset(scrollPoint.Y);
            MapScroller.ScrollToHorizontalOffset(scrollPoint.X);
-            XPoint.Text = x.ToString();
-            YPoint.Text = y.ToString();
+
+            // XPoint.Text = x.ToString();
+            // YPoint.Text = y.ToString();
        }

-        /// <summary>
-        /// On clicking the update button in the ApplicationBar.
-        /// </summary>
-        /// <param name="sender">caller object</param>
-        /// <param name="e">some EventArgs</param>
+        /// <summary>On clicking the update button in the ApplicationBar.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        /// <param name="sender">caller object.</param>
+        /// <param name="e">     some EventArgs.</param>
        private void UpdateButtonAppBar_Click(object sender, System.EventArgs e)
        {
-            this.ShowCurrentPositionDispatcher(); 
+            this.ShowCurrentPositionDispatcher();
        }

-        /// <summary>
-        /// execute ShowCurrentPosition-Method via Dispatcher
-        /// </summary>
+        /// <summary>execute ShowCurrentPosition-Method via Dispatcher.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
        private void ShowCurrentPositionDispatcher()
        {
            ProgressBar.Visibility = Visibility.Visible;

+            Thread thread = new Thread(new ThreadStart(this.ShowCurrentPosition));
+            thread.Start();
+        }
+
+        /// <summary>Method add a pin on the at the position of the phone.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        private void ShowCurrentPosition()
+        {
+            Utilities.DetermineAndStoreCurrentPositionForce();
            if (this.Dispatcher != null)
            {
-                this.Dispatcher.BeginInvoke(new Action(() => this.ShowCurrentPosition()));
+                this.Dispatcher.BeginInvoke(new Action(() => this.SetPinToCurrentPosition()));
            }
            else
            {
-                this.ShowCurrentPosition();
-            }  
+                this.SetPinToCurrentPosition();
+            }
        }

-        /// <summary>
-        /// Method add a pin on the at the position of the phone
-        /// </summary>
-        private void ShowCurrentPosition()
-        {          
-            Utilities.DetermineAndStoreCurrentPositionForce();
+        /// <summary>Sets pin to current position.</summary>
+        /// <remarks>Stubbfel, 19.08.2013.</remarks>
+        private void SetPinToCurrentPosition()
+        {
            string lat = App.LoadFromAppState<string>(Constants.GeoWatch_CurrentPosition_Lat);
            string log = App.LoadFromAppState<string>(Constants.GeoWatch_CurrentPosition_Long);
            double x;
--- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
@@ -15,6 +15,7 @@ namespace CampusAppWP8.Pages.Mensa
    using CampusAppWP8.Resources;
    using CampusAppWP8.Utility.Lui.MessageBoxes;
    using Microsoft.Phone.Controls;
+    using System.Threading;

    /// <summary>
    /// Class for the MensaPage
@@ -99,7 +100,14 @@ namespace CampusAppWP8.Pages.Mensa
        /// </summary>
        private void SpsApiIsReady()
        {
-            this.InitializeFeed(this.campusApi.GetCampus());
+            if (this.Dispatcher != null)
+            {
+                this.Dispatcher.BeginInvoke(new Action(() => this.InitializeFeed(this.campusApi.GetCampus())));
+            }
+            else
+            {
+                this.InitializeFeed(this.campusApi.GetCampus());
+            }
        }

        /// <summary>
@@ -153,14 +161,8 @@ namespace CampusAppWP8.Pages.Mensa
        {
            if (Settings.AppSetting.GeoWatchEnable)
            {
-                if (this.Dispatcher != null)
-                {
-                    this.Dispatcher.BeginInvoke(new Action(() => this.DeterminCurrentCampusAndLoadFeed()));
-                }
-                else
-                {
-                    this.DeterminCurrentCampusAndLoadFeed();
-                }
+                Thread thread = new Thread(new ThreadStart( this.DeterminCurrentCampusAndLoadFeed));
+                thread.Start();
            }
            else
            {
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
@@ -123,6 +123,24 @@ namespace CampusAppWP8.Resources {
            }
        }
        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die /Assets/campusmap.png ähnelt.
+        /// </summary>
+        public static string FileMap_CBMainMap {
+            get {
+                return ResourceManager.GetString("FileMap_CBMainMap", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die File/Campusmap/Offlinemap.xml ähnelt.
+        /// </summary>
+        public static string FileMap_OfflineMap {
+            get {
+                return ResourceManager.GetString("FileMap_OfflineMap", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Sucht eine lokalisierte Zeichenfolge, die MensaFeed.xml ähnelt.
        /// </summary>
@@ -645,6 +663,15 @@ namespace CampusAppWP8.Resources {
            }
        }
        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die [+-]{0,1}[0-9]+[.,]{0,1}[0-9]+[\s][+-]{0,1}[0-9]+[.,]{0,1}[0-9]+ ähnelt.
+        /// </summary>
+        public static string Regex_Coordinate {
+            get {
+                return ResourceManager.GetString("Regex_Coordinate", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Sucht eine lokalisierte Zeichenfolge, die 767 ähnelt.
        /// </summary>
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -408,4 +408,13 @@
  <data name="PathCampusmap_Campusmap" xml:space="preserve">
    <value>/Pages/Campusmap/CampusMapPage.xaml</value>
  </data>
+  <data name="Regex_Coordinate" xml:space="preserve">
+    <value>[+-]{0,1}[0-9]+[.,]{0,1}[0-9]+[\s][+-]{0,1}[0-9]+[.,]{0,1}[0-9]+</value>
+  </data>
+  <data name="FileMap_OfflineMap" xml:space="preserve">
+    <value>File/Campusmap/Offlinemap.xml</value>
+  </data>
+  <data name="FileMap_CBMainMap" xml:space="preserve">
+    <value>/Assets/campusmap.png</value>
+  </data>
 </root>
--- a/CampusAppWP8/CampusAppWP8/Toolkit.Content/ApplicationBar.Add.png
+++ b/CampusAppWP8/CampusAppWP8/Toolkit.Content/ApplicationBar.Add.png
--- a/CampusAppWP8/CampusAppWP8/Utility/XmlManager.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/XmlManager.cs
@@ -38,6 +38,19 @@ namespace CampusAppWP8.Utility
            return model;
        }

+        /// <summary>Deserialization a xml file to  a model.</summary>
+        /// <remarks>Stubbfel, 20.08.2013.</remarks>
+        /// <typeparam name="T">Generic type parameter.</typeparam>
+        /// <param name="xmlFilePath">Path to the a XmlFile.</param>
+        /// <returns>model of the XmlFile.</returns>
+        public static T DeserializationFileToModel<T>(string xmlFilePath)
+        {
+            XmlSerializer serializer = new XmlSerializer(typeof(T));
+            XDocument document = XDocument.Load(xmlFilePath);
+            T model = (T)serializer.Deserialize(document.CreateReader());
+            return model;
+        }
+
        /// <summary>
        /// Method serializes a model to a string.
        /// </summary>
--- a/CampusAppWP8/CampusAppWP8/packages.config
+++ b/CampusAppWP8/CampusAppWP8/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="WPtoolkit" version="4.2013.08.16" targetFramework="wp80" />
  <package id="WPToolkit" version="4.2013.06.11" targetFramework="wp80" />
 </packages>