diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs index 94ef65b8..578ebf8a 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs @@ -63,7 +63,7 @@ namespace CampusAppWP8.Api.GeoApi } CampusAppWPortalLib8.Model.Settings.Campus campus; - foreach (PlaceModel place in this.Model.Places) + foreach (PlaceWp8Model place in this.Model.Places) { if (Enum.TryParse(place.PlaceId, true, out campus)) { diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs index 9d8b112d..70387d5d 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs @@ -18,7 +18,7 @@ namespace CampusAppWP8.Api.GeoApi /// Pis api. /// Stubbfel, 09.09.2013. /// - public class PisApi : XmlModel + public class PisApi : XmlModel { #region Constructor diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs index 52e5afb3..550561ff 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs @@ -18,7 +18,7 @@ namespace CampusAppWP8.Api.GeoApi /// Pss api. /// Stubbfel, 09.09.2013. /// - public class PssApi : XmlModel + public class PssApi : XmlModel { #region Constructor diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs index 806d1ca2..6e0959db 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs @@ -19,7 +19,7 @@ namespace CampusAppWP8.Api.GeoApi /// Class for SPSAPI. /// Stubbfel, 14.10.2013. /// - public class SpsApi : XmlModel + public class SpsApi : XmlModel { #region Constructor diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 4b39a196..d0282db0 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -113,27 +113,24 @@ - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + @@ -204,10 +201,7 @@ - - - False - + diff --git a/CampusAppWP8/CampusAppWP8/File/Campusmap/BuildingsMaps.xml b/CampusAppWP8/CampusAppWP8/File/Campusmap/BuildingsMaps.xml index b8ab9ab9..a7f1afea 100644 --- a/CampusAppWP8/CampusAppWP8/File/Campusmap/BuildingsMaps.xml +++ b/CampusAppWP8/CampusAppWP8/File/Campusmap/BuildingsMaps.xml @@ -10,7 +10,7 @@ 800 -288 -390 - Point(430 500) + Point(410, 480) 650000 1200000 @@ -24,7 +24,7 @@ 800 -252 -390 - Point(235 380) + Point(215, 355) 300000 500000 diff --git a/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs b/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs index e39c9ad0..92d2235c 100644 --- a/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs +++ b/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs @@ -16,7 +16,7 @@ namespace CampusAppWP8.File.Places /// Places file. /// Stubbfel, 09.09.2013. /// - public class PlacesFile : XmlModel + public class PlacesFile : XmlModel { #region Constructor @@ -39,7 +39,7 @@ namespace CampusAppWP8.File.Places /// The model. /// Information describing the file. /// true if it succeeds, false if it fails. - private bool CheckIsFileUpToDate(SpsModel model, System.IO.FileInfo fileInfo) + private bool CheckIsFileUpToDate(SpsWp8Model model, System.IO.FileInfo fileInfo) { if (fileInfo == null || !fileInfo.Exists || fileInfo.Length < 1 || (model != null && model.HasChanged)) { @@ -53,7 +53,7 @@ namespace CampusAppWP8.File.Places /// Stubbfel, 14.10.2013. public void FallBackLoad() { - SpsModel fallBackModel = XmlManager.DeserializationFileToModel(Constants.FileMap_OfflineMap); + SpsWp8Model fallBackModel = XmlManager.DeserializationFileToModel(Constants.FileMap_OfflineMap); this.Model = fallBackModel; this.SaveData(); } diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapRoomModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapRoomModel.cs deleted file mode 100644 index a98fb364..00000000 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapRoomModel.cs +++ /dev/null @@ -1,25 +0,0 @@ -//----------------------------------------------------------------------- -// -// The MIT License (MIT). Copyright (c) 2013 BTU/IIT. -// -// Stubbfel -// 14.10.2013 -// Implements the main map room model class -//----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap -{ - /// Class for the MapModel of the mainCampus of cottbus. - /// Stubbfel, 14.10.2013. - public class CBMainMapRoomModel - { - #region Constructor - - /// Initializes a new instance of the CBMainMapRoomModel class. - /// Stubbfel, 14.10.2013. - public CBMainMapRoomModel() - { - } - - #endregion - } -} diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/BuildingMapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/BuildingMapModel.cs similarity index 73% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/BuildingMapModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/BuildingMapModel.cs index 9c9dc708..0aa09ac9 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/BuildingMapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/BuildingMapModel.cs @@ -6,7 +6,7 @@ // 14.10.2013 // Implements the building map model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Map { using System.Globalization; using System.Linq; @@ -14,19 +14,20 @@ namespace CampusAppWP8.Model.Campusmap using CampusAppWP8.Model.GeoDb; using CampusAppWP8.Resources; using CampusAppWPortalLib8.Utility; + using CampusAppWPortalLib8.Model.Utility; /// A data Model for the building map. /// Stubbfel, 14.10.2013. /// - public class BuildingMapModel : MapModel + public class BuildingMapModel : MapWp8Model { /// Initializes a new instance of the BuildingMapModel class. /// Stubbfel, 14.10.2013. /// The identifier. public BuildingMapModel(string id) { - SpsModel buildings = XmlManager.DeserializationFileToModel(Constants.FileMap_BuildingsMap); - PlaceModel building = buildings.GetPlaceById(id); + SpsWp8Model buildings = XmlManager.DeserializationFileToModel(Constants.FileMap_BuildingsMap); + PlaceWp8Model building = buildings.GetPlaceById(id); if (buildings == null) { return; @@ -34,6 +35,7 @@ namespace CampusAppWP8.Model.Campusmap this.ImageSource = building.GetInformationsValue("ImageSource"); double tmpVal; + if (double.TryParse(building.GetInformationsValue("ImageWidth"), NumberStyles.Number, CultureInfo.InvariantCulture, out tmpVal)) { this.ImageWidth = tmpVal; @@ -44,16 +46,6 @@ namespace CampusAppWP8.Model.Campusmap this.ImageHeight = tmpVal; } - if (double.TryParse(building.GetInformationsValue("MapImageOffsetX"), NumberStyles.Number, CultureInfo.InvariantCulture, out tmpVal)) - { - this.MapImageOffsetX = tmpVal; - } - - if (double.TryParse(building.GetInformationsValue("MapImageOffsetY"), NumberStyles.Number, CultureInfo.InvariantCulture, out tmpVal)) - { - this.MapImageOffsetY = tmpVal; - } - string pointString = building.GetInformationsValue("MapRefPoint"); pointString = pointString.TrimStart("Point(".ToArray()); pointString = pointString.TrimEnd(')'); @@ -66,25 +58,26 @@ namespace CampusAppWP8.Model.Campusmap double x; double y; + if (double.TryParse(building.GetInformationsValue("MapImageOffsetX"), NumberStyles.Number, CultureInfo.InvariantCulture, out x) + && double.TryParse(building.GetInformationsValue("MapImageOffsetY"), NumberStyles.Number, CultureInfo.InvariantCulture, out y)) + { + this.MapImageOffsetPoint = new MapPoint(x, y); + } + if (!double.TryParse(coord[0], NumberStyles.Number, CultureInfo.InvariantCulture, out x) || !double.TryParse(coord[1], NumberStyles.Number, CultureInfo.InvariantCulture, out y)) { return; } - this.RefPoint = new Point(x, y); + this.RefPoint = new MapPoint(x, y); - if (double.TryParse(building.GetInformationsValue("ScaleX"), NumberStyles.Number, CultureInfo.InvariantCulture, out tmpVal)) + if (double.TryParse(building.GetInformationsValue("ScaleX"), NumberStyles.Number, CultureInfo.InvariantCulture, out x) + && double.TryParse(building.GetInformationsValue("ScaleY"), NumberStyles.Number, CultureInfo.InvariantCulture, out y)) { - this.ScaleX = tmpVal; + this.ScalePoint = new MapPoint(x, y); } - if (double.TryParse(building.GetInformationsValue("ScaleY"), NumberStyles.Number, CultureInfo.InvariantCulture, out tmpVal)) - { - this.ScaleY = tmpVal; - } - - this.GeoOffsetX = building.GeoRefPoint.Longitude; - this.GeoOffsetY = building.GeoRefPoint.Latitude; + this.GeoOffsetPoint = new MapPoint(building.GeoRefPoint.Longitude, building.GeoRefPoint.Latitude); } } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/CBMainMapModel.cs similarity index 73% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/CBMainMapModel.cs index 2e2757c5..4d9c1e87 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/CBMainMapModel.cs @@ -6,12 +6,13 @@ // 14.10.2013 // Implements the main map model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Map { - using System.Collections.Generic; - using System.Windows; + using System.Collections.Generic; + using System.Windows; using CampusAppWP8.Model.GeoDb; - using CampusAppWP8.Resources; + using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Utility; /// Class for the MapModel of the mainCampus of cottbus. /// Stubbfel, 14.10.2013. @@ -30,19 +31,16 @@ namespace CampusAppWP8.Model.Campusmap /// Initializes a new instance of the class. /// Stubbfel, 14.10.2013. /// List of places. - public CBMainMapModel(List placeList) + public CBMainMapModel(List placeList) : base(placeList, CBMainMapModel.Campus) { this.ImageSource = Constants.FileMap_CBMainMap; this.ImageWidth = 2000; this.ImageHeight = 1425; - this.MapImageOffsetX = -228; - this.MapImageOffsetY = -300; - this.RefPoint = new Point(1365, 800); - this.ScaleX = 129483.4123222749; - this.ScaleY = 197648.8919266073; - this.GeoOffsetX = 14.327159; - this.GeoOffsetY = 51.766548; + this.MapImageOffsetPoint = new MapPoint(-228, -300); + this.RefPoint = new MapPoint(1335, 775); + this.ScalePoint = new MapPoint(129483.4123222749, 197648.8919266073); + this.GeoOffsetPoint = new MapPoint(14.327159, 51.766548); } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CampusMapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/CampusMapModel.cs similarity index 83% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/CampusMapModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/CampusMapModel.cs index 45a71407..9d66fa9e 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CampusMapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/CampusMapModel.cs @@ -6,7 +6,7 @@ // 14.10.2013 // Implements the campus map model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Map { using System.Collections.Generic; using CampusAppWP8.Model.GeoDb; @@ -14,7 +14,7 @@ namespace CampusAppWP8.Model.Campusmap /// Class for the CampusMapModel. /// Stubbfel, 14.10.2013. /// - public class CampusMapModel : MapModel + public class CampusMapModel : MapWp8Model { #region constructor @@ -22,7 +22,7 @@ namespace CampusAppWP8.Model.Campusmap /// Stubbfel, 14.10.2013. /// list of places. /// id of the campus. - public CampusMapModel(List placeList, string campusId) + public CampusMapModel(List placeList, string campusId) { this.CampusId = campusId; this.LoadSpatials(placeList); @@ -50,12 +50,12 @@ namespace CampusAppWP8.Model.Campusmap /// Loads the spatial./. /// Stubbfel, 14.10.2013. /// - protected override void LoadSpatials(List placeList) + protected override void LoadSpatials(List placeList) { - List campusPlaces = new List(); - this.Spatial = new SpsModel(); + List campusPlaces = new List(); + this.Spatial = new SpsWp8Model(); - foreach (PlaceModel place in placeList) + foreach (PlaceWp8Model place in placeList) { if (place.ParentId.Equals(this.CampusId) || place.PlaceId.Equals(this.CampusId)) { diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/MapWp8Model.cs similarity index 56% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/MapWp8Model.cs index 5e105c5d..3bb05881 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Maps/MapWp8Model.cs @@ -6,7 +6,7 @@ // 14.10.2013 // Implements the map model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Map { using System; using System.Collections.Generic; @@ -15,24 +15,27 @@ namespace CampusAppWP8.Model.Campusmap using System.Windows.Input; using System.Windows.Media.Imaging; using CampusAppWP8.Model.GeoDb; + using CampusAppWP8.Model.Campusmap.Pin; + using CampusAppWPortalLib8.Model.Utility; + using CampusAppWPortalLib8.Model.Campusmap.Pin; /// This Class manage the properties of a Map. /// Stubbfel, 14.10.2013. - public class MapModel + public class MapWp8Model : CampusAppWPortalLib8.Model.Campusmap.Map.MapModel { #region Constructors - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// Stubbfel, 14.10.2013. - public MapModel() + public MapWp8Model() { this.IsReady = false; } - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// Stubbfel, 14.10.2013. /// list of places. - public MapModel(List placeList) + public MapWp8Model(List placeList) { this.IsReady = false; this.LoadSpatials(placeList); @@ -46,90 +49,17 @@ namespace CampusAppWP8.Model.Campusmap /// Delegate for MapInfo. /// Stubbfel, 14.10.2013. /// list of places. - public delegate void MapInfos(List places); + public delegate void MapInfos(List places); /// Event ShowMapInfo. public event MapInfos ShowMapInfos = null; - #endregion - #region Property - - /// Gets or sets a value indicating whether the map is ready or not. - /// true if this object is ready, false if not. - public bool IsReady { get; protected set; } - - /// Gets or sets the ImageSource of the map. - /// The image source. - public string ImageSource { get; set; } - - /// Gets or sets the ImageWidth of the map. - /// The width of the image. - public double ImageWidth { get; set; } - - /// Gets or sets the ImageHeight of the map. - /// The height of the image. - public double ImageHeight { get; set; } - - /// Gets or sets the ImageOffsetX of the map. - /// The map image offset x coordinate. - public double MapImageOffsetX { get; set; } - - /// Gets or sets the ImageOffsetY of the map. - /// The map image offset y coordinate. - public double MapImageOffsetY { get; set; } - - /// Gets or sets the GeoOffsetX of the map. - /// The geo offset x coordinate. - public double GeoOffsetX { get; set; } - - /// Gets or sets the GeoOffsetY of the map. - /// The geo offset y coordinate. - public double GeoOffsetY { get; set; } - - /// Gets or sets the Scale (to pixel) of the map. - /// The scale x coordinate. - public double ScaleX { get; set; } - - /// Gets or sets the Scale (to pixel) of the map. - /// The scale y coordinate. - public double ScaleY { get; set; } - - /// Gets or sets the reference point. - /// The reference point. - public Point RefPoint { get; set; } - - /// Gets or sets the spatial of the map. - /// The spatial. - public SpsModel Spatial { get; set; } - #endregion #region Methods #region public - /// Method calculate the coordinates of ScrollToOffsets point. - /// Stubbfel, 14.10.2013. - /// input point. - /// point (in pixel) - public Point GetScrollPoint(Point point) - { - return this.GetScrollPoint(point.X, point.Y); - } - - /// Method calculate the coordinates of ScrollToOffsets point. - /// the input-point will be shown in the center. - /// x - coordinate. - /// y - coordinate. - /// point (in pixel) - public Point GetScrollPoint(double x, double y) - { - x = this.RefPoint.X + this.MapImageOffsetX + x; - y = this.RefPoint.Y + this.MapImageOffsetY - y; - - return new Point(x, y); - } - /// Method create in image, which can show at a certain position. /// Stubbfel, 27.08.2013. /// the x- coordinate. @@ -137,9 +67,9 @@ namespace CampusAppWP8.Model.Campusmap /// The type. /// (Optional) list of places. /// image of the pin. - public Image AddPin(double x, double y, MapPinModel.PinType type, List places = null) + public Image AddPin(double x, double y, MapPinModel.PinType type, List places = null) { - Point position = new Point(x, y); + MapPoint position = new MapPoint(x, y); return this.AddPin(position, type, places); } @@ -153,9 +83,9 @@ namespace CampusAppWP8.Model.Campusmap /// The type. /// (Optional) list of places. /// image of the pin. - public Image AddPinFromRefPoint(double x, double y, MapPinModel.PinType type, List places = null) + public Image AddPinFromRefPoint(double x, double y, MapPinModel.PinType type, List places = null) { - Point position = new Point(this.RefPoint.X + x, this.RefPoint.Y - y); + MapPoint position = new MapPoint(this.RefPoint.X + x, this.RefPoint.Y - y); return this.AddPin(position, type, places); } @@ -168,7 +98,7 @@ namespace CampusAppWP8.Model.Campusmap /// The type. /// (Optional) list of places. /// image of the pin. - public Image AddPinFromRefPoint(Point position, MapPinModel.PinType type, List places = null) + public Image AddPinFromRefPoint(MapPoint position, MapPinModel.PinType type, List places = null) { return this.AddPinFromRefPoint(position.X, position.Y, type, places); } @@ -179,7 +109,7 @@ namespace CampusAppWP8.Model.Campusmap /// The type. /// (Optional) list of places. /// image of the pin. - public Image AddPin(Point position, MapPinModel.PinType type, List places = null) + public Image AddPin(MapPoint position, MapPinModel.PinType type, List places = null) { Image pinImg = new Image(); MapPinModel pin = this.CreatePin(type, places, pinImg); @@ -197,58 +127,6 @@ namespace CampusAppWP8.Model.Campusmap return pinImg; } - /// Convert a coordinates to coordinates which address pixels. - /// Stubbfel, 27.08.2013. - /// the x-coordinate. - /// the y-coordinate. - /// Point in pixel-size. - public Point ConverToPixelPoint(double x, double y) - { - Point p = new Point { X = this.ScaleX * x, Y = this.ScaleY * y }; - return p; - } - - /// Convert a coordinates to coordinates which address pixels. - /// Stubbfel, 14.10.2013. - /// not scaled point. - /// Point in pixel-size. - public Point ConverToPixelPoint(Point point) - { - return this.ConverToPixelPoint(point.X, point.Y); - } - - /// Convert a coordinates to coordinates which address mapPoint. - /// Stubbfel, 14.10.2013. - /// the x-coordinate. - /// the y-coordinate. - /// Point in pixel-size. - public Point ConverToMapPoint(double x, double y) - { - return new Point { X = x - this.GeoOffsetX, Y = y - this.GeoOffsetY }; - } - - /// Convert a coordinates to coordinates which address mapPoint. - /// Stubbfel, 14.10.2013. - /// not scaled point. - /// Point in pixel-size. - public Point ConverToMapPoint(Point point) - { - return this.ConverToMapPoint(point.X, point.Y); - } - - #endregion - - #region protected - - /// Loads the spatial object - /// Stubbfel, 19.08.2013. - /// list of places. - protected virtual void LoadSpatials(List placeList) - { - this.Spatial = new SpsModel(); - this.Spatial.AddPlaces(placeList); - } - #endregion #region private @@ -259,7 +137,7 @@ namespace CampusAppWP8.Model.Campusmap /// list of places. /// image of the pin. /// The new pin. - private MapPinModel CreatePin(MapPinModel.PinType type, List places, Image pinImg) + private MapPinModel CreatePin(MapPinModel.PinType type, List places, Image pinImg) { MapPinModel pin; switch (type) diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/ClickAblePlacePinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/ClickAblePlacePinModel.cs similarity index 85% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/ClickAblePlacePinModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/ClickAblePlacePinModel.cs index 9fc74d80..2a314373 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/ClickAblePlacePinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/ClickAblePlacePinModel.cs @@ -6,10 +6,12 @@ // 14.10.2013 // Implements the click able place pin model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Pin { using System.Collections.Generic; using CampusAppWP8.Model.GeoDb; + using CampusAppWP8.Model.Campusmap.Map; + using CampusAppWPortalLib8.Model.Campusmap.Pin; /// abstract class for click abel bins. /// Stubbfel, 14.10.2013. @@ -20,11 +22,11 @@ namespace CampusAppWP8.Model.Campusmap /// Gets or sets Callback Function, to show place information of the Pin. /// The call back. - public MapModel.MapInfos CallBack { get; set; } + public MapWp8Model.MapInfos CallBack { get; set; } /// Gets or sets place which are associative with this pin. /// The associated places. - public List AssocPlaces { get; set; } + public List AssocPlaces { get; set; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/CurrentPositionPinModel.cs similarity index 85% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/CurrentPositionPinModel.cs index 78d17ad9..7e3d0ed4 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CurrentPositionPinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/CurrentPositionPinModel.cs @@ -6,10 +6,12 @@ // 14.10.2013 // Implements the current position pin model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Pin { using System.Windows; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Utility; + using CampusAppWPortalLib8.Model.Campusmap.Pin; /// Current position pin model. /// Stubbfel, 27.08.2013. @@ -25,8 +27,7 @@ namespace CampusAppWP8.Model.Campusmap this.ImageSource = Icons.CurrentPosition; this.ImageWidth = 60; this.ImageHeight = 60; - this.PinImageOffsetX = -25; - this.PinImageOffsetY = -34; + this.PinImageOffsetPoint = new MapPoint(-25, -34); this.Tag = MapPinModel.CurrentPositionPlacePinString; this.ZIndex = 3; } diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/HiddenPinPlaceModel.cs similarity index 91% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/HiddenPinPlaceModel.cs index 57290f3a..cfe0fe7a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/HiddenPinPlaceModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/HiddenPinPlaceModel.cs @@ -6,7 +6,8 @@ // 14.10.2013 // Implements the hidden pin place model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +using CampusAppWPortalLib8.Model.Campusmap.Pin; +namespace CampusAppWP8.Model.Campusmap.Pin { /// Hidden pin place model. /// Stubbfel, 27.08.2013. diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoLabPlacePinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoLabPlacePinModel.cs similarity index 88% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoLabPlacePinModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoLabPlacePinModel.cs index 2d63a436..98f55e55 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoLabPlacePinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoLabPlacePinModel.cs @@ -6,9 +6,10 @@ // 14.10.2013 // Implements the information lab place pin model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Pin { using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Utility; /// Search pin place model. /// Stubbfel, 27.08.2013. @@ -24,8 +25,7 @@ namespace CampusAppWP8.Model.Campusmap this.ImageSource = Icons.PlaceLab; this.ImageWidth = 40; this.ImageHeight = 40; - this.PinImageOffsetX = -20; - this.PinImageOffsetY = -15; + this.PinImageOffsetPoint = new MapPoint(-10, -15); this.ZIndex += 1; } diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlaceAccessPinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlaceAccessPinModel.cs similarity index 87% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlaceAccessPinModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlaceAccessPinModel.cs index 0c5e5d2e..63f162db 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlaceAccessPinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlaceAccessPinModel.cs @@ -6,9 +6,10 @@ // 14.10.2013 // Implements the information place access pin model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Pin { using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Utility; /// Search pin place model. /// Stubbfel, 27.08.2013. @@ -24,8 +25,7 @@ namespace CampusAppWP8.Model.Campusmap this.ImageSource = Icons.PlaceInfoAccess; this.ImageWidth = 40; this.ImageHeight = 40; - this.PinImageOffsetX = -10; - this.PinImageOffsetY = -35; + this.PinImageOffsetPoint = new MapPoint(-10, -15); } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlacePinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlacePinModel.cs similarity index 85% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlacePinModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlacePinModel.cs index 1111da33..30b20977 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlacePinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlacePinModel.cs @@ -6,9 +6,11 @@ // 14.10.2013 // Implements the information place pin model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Pin { using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Campusmap.Pin; + using CampusAppWPortalLib8.Model.Utility; /// Search pin place model. /// Stubbfel, 27.08.2013. @@ -24,8 +26,7 @@ namespace CampusAppWP8.Model.Campusmap this.ImageSource = Icons.PlaceInfo; this.ImageWidth = 60; this.ImageHeight = 60; - this.PinImageOffsetX = -25; - this.PinImageOffsetY = -27; + this.PinImageOffsetPoint = new MapPoint(-25, -27); this.Tag = MapPinModel.PinTypeToString(PinType.InfoPlace); this.ZIndex = 1; } diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlaceRedPinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlaceRedPinModel.cs similarity index 85% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlaceRedPinModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlaceRedPinModel.cs index 4696f932..c18b72b0 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlaceRedPinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlaceRedPinModel.cs @@ -6,9 +6,11 @@ // 14.10.2013 // Implements the information place red pin model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Pin { using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Campusmap.Pin; + using CampusAppWPortalLib8.Model.Utility; /// A data Model for the information place red pin. /// Stubbfel, 14.10.2013. @@ -24,8 +26,7 @@ namespace CampusAppWP8.Model.Campusmap this.ImageSource = Icons.PlaceRearchRed; this.ImageWidth = 60; this.ImageHeight = 60; - this.PinImageOffsetX = -25; - this.PinImageOffsetY = -27; + this.PinImageOffsetPoint = new MapPoint(-25, -27); this.ZIndex += 1; this.Tag = MapPinModel.InfoRedPlacePinString; } diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlaceWCPinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlaceWCPinModel.cs similarity index 88% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlaceWCPinModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlaceWCPinModel.cs index e070250f..77d3d23a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/InfoPlaceWCPinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/InfoPlaceWCPinModel.cs @@ -6,9 +6,10 @@ // 14.10.2013 // Implements the information place wc pin model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Pin { using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Utility; /// Search pin place model. /// Stubbfel, 27.08.2013. @@ -24,8 +25,7 @@ namespace CampusAppWP8.Model.Campusmap this.ImageSource = Icons.PlaceInfoWc; this.ImageWidth = 40; this.ImageHeight = 40; - this.PinImageOffsetX = 0; - this.PinImageOffsetY = -10; + this.PinImageOffsetPoint = new MapPoint(0, -10); this.ZIndex += 1; } diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/SearchPlacePinModel.cs similarity index 85% rename from CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs rename to CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/SearchPlacePinModel.cs index 252be325..a15f8b68 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/SearchPlacePinModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/Pins/SearchPlacePinModel.cs @@ -6,9 +6,11 @@ // 14.10.2013 // Implements the search place pin model class //----------------------------------------------------------------------- -namespace CampusAppWP8.Model.Campusmap +namespace CampusAppWP8.Model.Campusmap.Pin { using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Campusmap.Pin; + using CampusAppWPortalLib8.Model.Utility; /// Search pin place model. /// Stubbfel, 27.08.2013. @@ -26,8 +28,7 @@ namespace CampusAppWP8.Model.Campusmap this.ImageSource = Icons.SearchPlace; this.ImageWidth = 60; this.ImageHeight = 60; - this.PinImageOffsetX = -25; - this.PinImageOffsetY = -27; + this.PinImageOffsetPoint = new MapPoint(-25, -27); this.Tag = MapPinModel.SearchPlacePinString; this.ZIndex = 4; } diff --git a/CampusAppWP8/CampusAppWP8/Model/GeoDb/CampusBuildingLayerModel.cs b/CampusAppWP8/CampusAppWP8/Model/GeoDb/CampusBuildingLayerModel.cs deleted file mode 100644 index d55db74c..00000000 --- a/CampusAppWP8/CampusAppWP8/Model/GeoDb/CampusBuildingLayerModel.cs +++ /dev/null @@ -1,55 +0,0 @@ -//----------------------------------------------------------------------- -// -// The MIT License (MIT). Copyright (c) 2013 BTU/IIT. -// -// Stubbfel -// 15.10.2013 -// Implements the campus building layer model class -//----------------------------------------------------------------------- -namespace CampusAppWP8.Model.GeoDb -{ - using System.Collections.Generic; - using CampusAppWP8.Resources; - - /// Class is model for buildings of a campus. - /// Stubbfel, 15.10.2013. - public class CampusBuildingLayerModel - { - #region Constructor - - /// - /// Initializes a new instance of the class. - /// - /// Stubbfel, 15.10.2013. - /// id of the layer. - /// list of place which can be room of the layer. - public CampusBuildingLayerModel(string layerId, List places) - { - this.LayerId = layerId; - this.Rooms = new SpsModel(); - - foreach (PlaceModel place in places) - { - string placeLayerId = place.GetInformationsValue(Constants.PisInformationName_Layer); - if (placeLayerId != null && placeLayerId.Equals(layerId)) - { - this.Rooms.Places.Add(place); - } - } - } - - #endregion - - #region property - - /// Gets or sets Rooms. - /// The rooms. - public SpsModel Rooms { get; set; } - - /// Gets or sets LayerId. - /// The identifier of the layer. - public string LayerId { get; set; } - - #endregion - } -} diff --git a/CampusAppWP8/CampusAppWP8/Model/GeoDb/CampusBuildingLayerWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/GeoDb/CampusBuildingLayerWp8Model.cs new file mode 100644 index 00000000..531574a1 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/GeoDb/CampusBuildingLayerWp8Model.cs @@ -0,0 +1,17 @@ +//----------------------------------------------------------------------- +// +// The MIT License (MIT). Copyright (c) 2013 BTU/IIT. +// +// Stubbfel +// 21.10.2013 +// Implements the campus building layer wp 8 model class +//----------------------------------------------------------------------- +namespace CampusAppWP8.Model.GeoDb +{ + /// A data Model for the campus building layer wp 8. + /// Stubbfel, 21.10.2013. + /// + public class CampusBuildingLayerWp8Model : CampusAppWPortalLib8.Model.GeoDb.CampusBuildingLayerModel + { + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/GeoDb/CampusBuildingWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/GeoDb/CampusBuildingWp8Model.cs new file mode 100644 index 00000000..6ba4909f --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/GeoDb/CampusBuildingWp8Model.cs @@ -0,0 +1,27 @@ +//----------------------------------------------------------------------- +// +// The MIT License (MIT). Copyright (c) 2013 BTU/IIT. +// +// Stubbfel +// 21.10.2013 +// Implements the campus building model class +//----------------------------------------------------------------------- +namespace CampusAppWP8.Model.GeoDb +{ + using System.Collections.Generic; + + /// A data Model for the campus building. + /// Stubbfel, 21.10.2013. + /// + public class CampusBuildingWp8Model : CampusAppWPortalLib8.Model.GeoDb.CampusBuildingModel + { + /// Initializes a new instance of the CampusBuildingWp8Model class. + /// Stubbfel, 21.10.2013. + /// Identifier for the building. + /// The places. + public CampusBuildingWp8Model(string buildingId, List places) + : base(buildingId, places) + { + } + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceWp8Model.cs new file mode 100644 index 00000000..92113a00 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/GeoDb/PlaceWp8Model.cs @@ -0,0 +1,62 @@ +//----------------------------------------------------------------------- +// +// The MIT License (MIT). Copyright (c) 2013 BTU/IIT. +// +// Stubbfel +// 21.10.2013 +// Implements the place wp 8 model class +//----------------------------------------------------------------------- +namespace CampusAppWP8.Model.GeoDb +{ + using System; + using System.Device.Location; + using System.Globalization; + using System.Text.RegularExpressions; + using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Utility; + + /// Model for a place of the SPSService. + /// Stubbfel, 15.10.2013. + /// + /// + public class PlaceWp8Model : CampusAppWPortalLib8.Model.GeoDb.PlaceModel + { + #region Property + + /// Gets the geo reference point. + /// The geo reference point. + 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; + } + } + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/GeoDb/SpsWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/GeoDb/SpsWp8Model.cs new file mode 100644 index 00000000..3ef6895c --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/GeoDb/SpsWp8Model.cs @@ -0,0 +1,20 @@ +//----------------------------------------------------------------------- +// +// The MIT License (MIT). Copyright (c) 2013 BTU/IIT. +// +// Stubbfel +// 21.10.2013 +// Implements the sps wp 8 model class +//----------------------------------------------------------------------- +namespace CampusAppWP8.Model.GeoDb +{ + using System.Xml.Serialization; + + /// A data Model for the sps wp 8. + /// Stubbfel, 21.10.2013. + /// + [XmlRoot("root")] + public class SpsWp8Model : CampusAppWPortalLib8.Model.GeoDb.SpsModel + { + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs index 5e64ccdc..eb65095a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs @@ -9,59 +9,12 @@ namespace CampusAppWP8.Model.Person { using System.Xml.Serialization; - using CampusAppWPortalLib8.Model.Person; - using System.Collections.Generic; /// Person list model. /// Stubbfel, 05.09.2013. /// [XmlRoot("Uebersicht")] - public class PersonListWp8Model : CampusAppWPortalLib8.Model.Person.PersonListModel + public class PersonListWp8Model : CampusAppWPortalLib8.Model.Person.PersonListModel { - /// Gets a person. - /// Stubbfel, 15.10.2013. - /// The identifier. - /// The person. - public override PersonWp8Model GetPerson(string id) - { - foreach (PersonWp8Model tmpPerson in this.Persons) - { - if (tmpPerson.ID.Equals(id)) - { - return tmpPerson; - } - } - - return null; - } - - /// Removes the non function person. - /// Stubbfel, 05.09.2013. - public override void RemoveNonFunctionPerson() - { - List removeList = new List(); - foreach (PersonWp8Model tmpPerson in this.Persons) - { - if (tmpPerson.Functions.Count < 1) - { - removeList.Add(tmpPerson); - } - } - - foreach (PersonWp8Model removePerson in removeList) - { - this.Persons.Remove(removePerson); - } - } - - /// Sets person identifier to function. - /// Stubbfel, 05.09.2013. - public override void SetPersonIdToFunction() - { - foreach (PersonWp8Model person in this.Persons) - { - person.SetPersonIdToFunction(); - } - } } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs index ccc49410..a8de6168 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs @@ -11,8 +11,8 @@ namespace CampusAppWP8.Model.Person using System.Xml.Serialization; using CampusAppWP8.Utility; - /// Person model. - /// Stubbfel, 05.09.2013. + /// A data Model for the person . + /// Stubbfel, 21.10.2013. /// public class PersonWp8Model : CampusAppWPortalLib8.Model.Person.PersonModel { diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs index f8e25a50..7a61db9c 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs @@ -8,6 +8,18 @@ //----------------------------------------------------------------------- namespace CampusAppWP8.Pages.Campusmap { + using CampusAppWP8.File.Places; + using CampusAppWP8.Model.Campusmap.Map; + using CampusAppWP8.Model.Campusmap.Pin; + using CampusAppWP8.Model.GeoDb; + using CampusAppWP8.Resources; + using CampusAppWP8.Utility; + using CampusAppWP8.Utility.Lui.MessageBoxes; + using CampusAppWP8.Utility.NDEF; + using CampusAppWPortalLib8.Model.Campusmap.Pin; + using CampusAppWPortalLib8.Model.Utility; + using Microsoft.Phone.Controls; + using Microsoft.Phone.Shell; using System; using System.Collections.Generic; using System.Device.Location; @@ -20,15 +32,6 @@ namespace CampusAppWP8.Pages.Campusmap using System.Windows.Input; using System.Windows.Navigation; using Windows.Networking.Proximity; - using CampusAppWP8.File.Places; - using CampusAppWP8.Model.Campusmap; - using CampusAppWP8.Model.GeoDb; - using CampusAppWP8.Resources; - using CampusAppWP8.Utility; - using CampusAppWP8.Utility.Lui.MessageBoxes; - using CampusAppWP8.Utility.NDEF; - using Microsoft.Phone.Controls; - using Microsoft.Phone.Shell; /// Class for the campusMap page. /// Stubbfel, 19.08.2013. @@ -138,7 +141,7 @@ namespace CampusAppWP8.Pages.Campusmap scroll = false; if (Utilities.IsRoomId(alias)) { - PlaceModel place = this.file.Model.GetPlaceById(alias); + PlaceWp8Model place = this.file.Model.GetPlaceById(alias); if (place != null) { this.GoToRoomList(place.ParentId, place.PlaceId); @@ -159,12 +162,11 @@ namespace CampusAppWP8.Pages.Campusmap App.SaveToIsolatedStorage(Constants.CampusMapApp_QRCodeSearchResultStorageKey, null); string searchPid = Wp8StringManager.FilterPlaceIdinQRResultString(qrcodeResult); - PlaceModel place = this.file.Model.GetPlaceById(searchPid); + PlaceWp8Model place = this.file.Model.GetPlaceById(searchPid); if (searchPid != null) { - - //this.ShowAllPlacesByPlaceIdAsSearchPin(searchPid); + // this.ShowAllPlacesByPlaceIdAsSearchPin(searchPid); if (place.ParentId.Equals(this.campusMap.CampusId) || place.PlaceId.Equals(this.campusMap.CampusId)) { this.ShowAllPlacesByPlaceIdAsSearchPin(searchPid); @@ -176,7 +178,7 @@ namespace CampusAppWP8.Pages.Campusmap } } - ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); + this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); } /// Methods overrides the OnNavigatedFrom-Method. @@ -184,12 +186,11 @@ namespace CampusAppWP8.Pages.Campusmap /// protected override void OnNavigatedFrom(NavigationEventArgs e) { - this.device.StopSubscribingForMessage(ndefId); + this.device.StopSubscribingForMessage(this.ndefId); base.OnNavigatedFrom(e); } - #endregion #region private @@ -431,9 +432,9 @@ namespace CampusAppWP8.Pages.Campusmap return; } - List placeList = new List(); - PlaceModel tmpPlace; - SpsModel spatial; + List placeList = new List(); + PlaceWp8Model tmpPlace; + SpsWp8Model spatial; if (allPlaces) { spatial = this.file.Model; @@ -466,6 +467,7 @@ namespace CampusAppWP8.Pages.Campusmap private void SearchPlaceByNFC_Click(object sender, EventArgs e) { MessageBoxes.ShowMainModelInfoMessageBox(AppResources.ScarNfc_Search); + // this.DefHeader.ProgressVisibility = Visibility.Visible; // this.device.StopSubscribingForMessage(this.ndefId); // this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); @@ -499,7 +501,7 @@ namespace CampusAppWP8.Pages.Campusmap // search for placeId string nfcContent = ndef.GetContent(); string searchPid = Wp8StringManager.FilterPlaceIdinNFCResultString(nfcContent.Trim()); - PlaceModel place = this.file.Model.GetPlaceById(searchPid); + PlaceWp8Model place = this.file.Model.GetPlaceById(searchPid); if (searchPid != null) { @@ -517,7 +519,7 @@ namespace CampusAppWP8.Pages.Campusmap } else { - //this.ShowAllPlacesByPlaceIdAsSearchPin(searchPid); + // this.ShowAllPlacesByPlaceIdAsSearchPin(searchPid); if (place.ParentId.Equals(this.campusMap.CampusId)) { this.ShowAllPlacesByPlaceIdAsSearchPin(searchPid); @@ -549,9 +551,8 @@ namespace CampusAppWP8.Pages.Campusmap { this.DefHeader.ProgressVisibility = Visibility.Collapsed; } - ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); - - + + this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); } /// Searches for the first places. @@ -561,9 +562,9 @@ namespace CampusAppWP8.Pages.Campusmap /// (optional) if its true, search places in place file, otherwise in CampusMapModel. /// /// The found places. - private List SearchPlaces(string query, bool allPlaces = false) + private List SearchPlaces(string query, bool allPlaces = false) { - SpsModel spatial; + SpsWp8Model spatial; if (allPlaces) { spatial = this.file.Model; @@ -576,7 +577,7 @@ namespace CampusAppWP8.Pages.Campusmap // if query is an id if (Wp8StringManager.IsDigitsOnly(query)) { - return new List() { spatial.GetPlaceById(query) }; + return new List() { spatial.GetPlaceById(query) }; } if (this.informationsNames == null) @@ -595,9 +596,9 @@ namespace CampusAppWP8.Pages.Campusmap /// The places. /// The type. /// (Optional) the scroll. - private void AddPins(List places, MapPinModel.PinType type, bool scroll = true) + private void AddPins(List places, MapPinModel.PinType type, bool scroll = true) { - foreach (PlaceModel place in places) + foreach (PlaceWp8Model place in places) { if (place == null) { @@ -607,7 +608,7 @@ namespace CampusAppWP8.Pages.Campusmap GeoCoordinate coor = place.GeoRefPoint; if (coor != null) { - List assocPlaces = new List(); + List assocPlaces = new List(); assocPlaces.Add(place); this.AddPin(coor.Longitude, coor.Latitude, type, scroll, assocPlaces); } @@ -623,9 +624,9 @@ namespace CampusAppWP8.Pages.Campusmap /// /// (Optional) List of places, whose are associative with the pin. /// - private void AddPin(double x, double y, MapPinModel.PinType type, bool scroll = true, List assocPlaces = null) + private void AddPin(double x, double y, MapPinModel.PinType type, bool scroll = true, List assocPlaces = null) { - Point scrollPoint = this.campusMap.GetScrollPoint(this.campusMap.ConverToPixelPoint(this.campusMap.ConverToMapPoint(x, y))); + MapPoint scrollPoint = this.campusMap.GetScrollPoint(this.campusMap.ConverToPixelPoint(this.campusMap.ConverToMapPoint(x, y))); MapCanvas.Children.Add(this.campusMap.AddPinFromRefPoint(this.campusMap.ConverToPixelPoint(this.campusMap.ConverToMapPoint(x, y)), type, assocPlaces)); MapScroller.UpdateLayout(); @@ -648,6 +649,7 @@ namespace CampusAppWP8.Pages.Campusmap { scrollPoint.Y = 0; } + MapScroller.ScrollToVerticalOffset(scrollPoint.Y); MapScroller.ScrollToHorizontalOffset(scrollPoint.X); } @@ -748,7 +750,7 @@ namespace CampusAppWP8.Pages.Campusmap /// Method show same PlaceInformation. /// Stubbfel, 15.10.2013. /// List of places. - private void ShowMapInfo(List places) + private void ShowMapInfo(List places) { if (places == null) { @@ -756,7 +758,7 @@ namespace CampusAppWP8.Pages.Campusmap } string msgText = string.Empty; - foreach (PlaceModel place in places) + foreach (PlaceWp8Model place in places) { msgText += AppResources.PlaceLabel_Name + ": "; msgText += place.GetInformationsValue(Constants.PisInformationName_Name); @@ -789,7 +791,7 @@ namespace CampusAppWP8.Pages.Campusmap MessageBoxes.ShowMainModelInfoMessageBox(msgText); - foreach (PlaceModel place in places) + foreach (PlaceWp8Model place in places) { if (place.ParentId.Equals(this.campusMap.CampusId) && this.HasRooms(place.PlaceId)) { @@ -817,6 +819,7 @@ namespace CampusAppWP8.Pages.Campusmap { urlString += "&" + Constants.ParamRoomId + "=" + roomId; } + Uri url = new Uri(urlString as string, UriKind.Relative); this.NavigationService.Navigate(url); } @@ -827,7 +830,7 @@ namespace CampusAppWP8.Pages.Campusmap /// true, if the place has got rooms, otherwise false. private bool HasRooms(string placeId) { - foreach (PlaceModel place in this.file.Model.Places) + foreach (PlaceWp8Model place in this.file.Model.Places) { if (place.ParentId.Equals(placeId)) { @@ -848,9 +851,9 @@ namespace CampusAppWP8.Pages.Campusmap { this.SearchByText(sender, e); this.MapScroller.Focus(); - } - + } } + #endregion #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs index 70ca3d7b..c49774cb 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs @@ -23,6 +23,9 @@ namespace CampusAppWP8.Pages.Campusmap using CampusAppWP8.Utility.Lui.MessageBoxes; using CampusAppWPortalLib8.Model.Utility; using Microsoft.Phone.Controls; + using CampusAppWP8.Model.Campusmap.Map; + using CampusAppWP8.Model.Campusmap.Pin; + using CampusAppWPortalLib8.Model.Campusmap.Pin; /// Class of the RoomListPage. /// Stubbfel, 14.10.2013. @@ -34,7 +37,7 @@ namespace CampusAppWP8.Pages.Campusmap private PlacesFile placeFile; /// Variable of building which is shown in the list. - private CampusBuildingModel building; + private CampusBuildingWp8Model building; /// Variable for the map model. private BuildingMapModel buildingMap; @@ -43,10 +46,10 @@ namespace CampusAppWP8.Pages.Campusmap private bool pinchRun = false; /// The MapPoint. - private Point mappoint; + private MapPoint mappoint; /// The offset point. - private Point offsetPoint; + private MapPoint offsetPoint; /// The layer list picker. private ListPickerItemListModel layerListPicker; @@ -149,20 +152,21 @@ namespace CampusAppWP8.Pages.Campusmap this.ClearMap(new List() { MapPinModel.InfoPlacePinString }); - PlaceModel room = this.building.GetPlaceById(placeId); + PlaceWp8Model room = this.building.GetPlaceById(placeId); x = room.GeoRefPoint.Longitude; y = room.GeoRefPoint.Latitude; - Point roompoint = this.buildingMap.GetScrollPoint(this.buildingMap.ConverToPixelPoint(this.buildingMap.ConverToMapPoint(x, y))); - Point viewPoint = new Point(roompoint.X - this.mappoint.X + this.offsetPoint.X, roompoint.Y - this.mappoint.Y + this.offsetPoint.Y); + MapPoint roompoint = this.buildingMap.GetScrollPoint(this.buildingMap.ConverToPixelPoint(this.buildingMap.ConverToMapPoint(x, y))); + MapPoint viewPoint = roompoint - mappoint + offsetPoint; + - MapCanvas.Children.Add(this.buildingMap.AddPin(viewPoint, MapPinModel.PinType.InfoRedPlace, new List { room })); + MapCanvas.Children.Add(this.buildingMap.AddPin(viewPoint, MapPinModel.PinType.InfoRedPlace, new List { room })); } /// Shows the map information. /// Stubbfel, 14.10.2013. /// The places. - private void ShowMapInfo(List places) + private void ShowMapInfo(List places) { if (this.pinchRun) { @@ -175,7 +179,7 @@ namespace CampusAppWP8.Pages.Campusmap return; } - foreach (PlaceModel place in places) + foreach (PlaceWp8Model place in places) { msgText += AppResources.PlaceLabel_Name + ": "; msgText += place.GetInformationsValue(Constants.PisInformationName_Name); @@ -288,18 +292,18 @@ namespace CampusAppWP8.Pages.Campusmap layerKey = this.building.Layers.Keys.First(); } - CampusBuildingLayerModel layer = this.building.Layers[layerKey]; + CampusBuildingLayerWp8Model layer = this.building.Layers[layerKey]; double x; double y; this.ClearMap(new List() { MapPinModel.InfoPlacePinString }); - foreach (PlaceModel room in layer.Rooms.Places) + foreach (PlaceWp8Model room in layer.Rooms.Places) { x = room.GeoRefPoint.Longitude; y = room.GeoRefPoint.Latitude; - Point roompoint = this.buildingMap.GetScrollPoint(this.buildingMap.ConverToPixelPoint(this.buildingMap.ConverToMapPoint(x, y))); - Point viewPoint = new Point(roompoint.X - this.mappoint.X + this.offsetPoint.X, roompoint.Y - this.mappoint.Y + this.offsetPoint.Y); + MapPoint roompoint = this.buildingMap.GetScrollPoint(this.buildingMap.ConverToPixelPoint(this.buildingMap.ConverToMapPoint(x, y))); + MapPoint viewPoint = roompoint - mappoint + offsetPoint; MapPinModel.PinType type; @@ -321,10 +325,10 @@ namespace CampusAppWP8.Pages.Campusmap break; } - MapCanvas.Children.Add(this.buildingMap.AddPin(viewPoint, type, new List { room })); + MapCanvas.Children.Add(this.buildingMap.AddPin(viewPoint, type, new List { room })); } - // MapCanvas.Children.Add(this.buildingMap.AddPin(offsetPoint, MapPinModel.PinType.SearchPlace)); + // MapCanvas.Children.Add(this.buildingMap.AddPin(offsetPoint, MapPinModel.PinType.SearchPlace)); } /// Shows the layer places. @@ -341,7 +345,7 @@ namespace CampusAppWP8.Pages.Campusmap /// Identifier for the building. private void SetupCanvas(string buildingId) { - this.building = new CampusBuildingModel(buildingId, this.placeFile.Model.Places.ToList()); + this.building = new CampusBuildingWp8Model(buildingId, this.placeFile.Model.Places.ToList()); this.buildingMap = new BuildingMapModel(this.building.Building.PlaceId); this.buildingMap.ShowMapInfos += new CBMainMapModel.MapInfos(this.ShowMapInfo); @@ -350,7 +354,7 @@ namespace CampusAppWP8.Pages.Campusmap double y = this.building.Building.GeoRefPoint.Latitude; double x = this.building.Building.GeoRefPoint.Longitude; this.mappoint = this.buildingMap.GetScrollPoint(this.buildingMap.ConverToPixelPoint(this.buildingMap.ConverToMapPoint(x, y))); - this.offsetPoint = new Point(-this.buildingMap.MapImageOffsetX, -this.buildingMap.MapImageOffsetY); + this.offsetPoint = -this.buildingMap.MapImageOffsetPoint;// new Point(-this.buildingMap.MapImageOffsetX, -this.buildingMap.MapImageOffsetY); this.MapCanvas.DataContext = this.buildingMap; diff --git a/CampusAppWP8/CampusAppWP8/Pages/Dev/NFC.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Dev/NFC.xaml.cs index ca19f7d8..de581d45 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Dev/NFC.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Dev/NFC.xaml.cs @@ -85,7 +85,7 @@ namespace CampusAppWP8.Pages.Dev this.ndefList = new List(); // MapModel map = new CBMainMapModel(this.file.Model.Places.ToList()); - foreach (PlaceModel place in this.file.Model.Places.ToList()) + foreach (PlaceWp8Model place in this.file.Model.Places.ToList()) { this.ndefList.Add(new NDEFMessage(place.ToNfcString(), NDEFMessage.TYPEVAL.TEXT)); } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml index 27d815f8..34ccfa0b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs index c0fb6c68..f08e99b6 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs @@ -25,7 +25,7 @@ namespace CampusAppWP8.Pages.Events /// /// EventPage, where every event feed has his own PivotItem. /// - public partial class EventPage : PhoneApplicationPage + public partial class EventPage : PortraitLandscapePage { #region Memeber @@ -90,11 +90,6 @@ namespace CampusAppWP8.Pages.Events { base.OnNavigatedTo(e); - if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - this.DefHeader.ProgressVisibility = Visibility.Visible; if (this.isNewInstance) diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml index dcb92263..255c15b9 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs index 3dfbda47..90241e14 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs @@ -24,7 +24,7 @@ namespace CampusAppWP8.Pages.Exams /// class of ExamsPage. /// Stubbfel, 02.09.2013. /// - public partial class Exams : PhoneApplicationPage + public partial class Exams : PortraitLandscapePage { #region Member @@ -62,11 +62,6 @@ namespace CampusAppWP8.Pages.Exams { base.OnNavigatedTo(e); - if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - if (this.feed == null) { this.InitializeFeed(); @@ -93,23 +88,6 @@ namespace CampusAppWP8.Pages.Exams } } - /// - /// On orientation changed. - /// - /// sender object - /// event args - protected override void OnOrientationChanged(OrientationChangedEventArgs e) - { - if (e.Orientation.Equals(PageOrientation.Landscape) || e.Orientation.Equals(PageOrientation.LandscapeLeft) || e.Orientation.Equals(PageOrientation.LandscapeRight)) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - else - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Minimized; - } - base.OnOrientationChanged(e); - } #endregion #region private diff --git a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml index 72007c69..e0d44290 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml @@ -1,4 +1,4 @@ - @@ -79,4 +79,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs index 0e3a5bac..558883df 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs @@ -20,7 +20,7 @@ namespace CampusAppWP8.Pages.Links /// Class for the LinkPage. /// Stubbfel, 15.10.2013. /// - public partial class LinkPage : PhoneApplicationPage + public partial class LinkPage : PortraitLandscapePage { #region Members @@ -57,11 +57,6 @@ namespace CampusAppWP8.Pages.Links { base.OnNavigatedTo(e); - if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - this.InitializeFeeds(); this.DefHeader.ProgressVisibility = Visibility.Visible; @@ -199,22 +194,6 @@ namespace CampusAppWP8.Pages.Links } } - /// Method handle OrientationPage. - /// Stubbfel, 15.10.2013. - /// Caller of the function. - /// some EventArgs. - private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e) - { - if (this.Orientation == PageOrientation.LandscapeLeft || this.Orientation == PageOrientation.LandscapeRight) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - else - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Minimized; - } - } - #endregion #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml index 07850aa1..f15fe48e 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml @@ -1,4 +1,4 @@ - @@ -82,4 +82,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs index ac8acaec..9538c82e 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs @@ -24,7 +24,7 @@ namespace CampusAppWP8.Pages.Mensa /// Class for the MensaPage. /// Stubbfel, 15.10.2013. /// - public partial class MensaPage : PhoneApplicationPage + public partial class MensaPage : PortraitLandscapePage { #region Members @@ -92,11 +92,6 @@ namespace CampusAppWP8.Pages.Mensa { base.OnNavigatedTo(e); - if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - this.InitializeFeed(); } @@ -370,22 +365,6 @@ namespace CampusAppWP8.Pages.Mensa this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.SFB_MAIN); } - /// Method handle OrientationPage. - /// Stubbfel, 15.10.2013. - /// Caller of the function. - /// some EventArgs. - private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e) - { - if (this.Orientation == PageOrientation.LandscapeLeft || this.Orientation == PageOrientation.LandscapeRight) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - else - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Minimized; - } - } - /// Event handler. Called by MenuItem for click events. /// Stubbfel, 14.10.2013. /// button object. diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml index e6d1517f..8102ef88 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs index 9939d43f..2a443de4 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs @@ -21,7 +21,7 @@ namespace CampusAppWP8.Pages.News /// /// Overview page of all news. /// - public partial class NewsIndexPage : PhoneApplicationPage + public partial class NewsIndexPage : PortraitLandscapePage { #region Member @@ -97,20 +97,6 @@ namespace CampusAppWP8.Pages.News #region protected - /// - /// On navigation to this page, creates a FeedEventHandler and load the RSS feed data. - /// - /// event args - protected override void OnNavigatedTo(NavigationEventArgs e) - { - base.OnNavigatedTo(e); - - if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - } - /// /// Methods overrides the OnNavigatedFrom-Method /// @@ -130,26 +116,6 @@ namespace CampusAppWP8.Pages.News #region private - /// - /// Methods overrides the OnOrientationChanged-Method. - /// - /// orientation changed event args. - protected override void OnOrientationChanged(OrientationChangedEventArgs e) - { - if (e.Orientation == PageOrientation.LandscapeRight - || e.Orientation == PageOrientation.LandscapeLeft - || e.Orientation == PageOrientation.Landscape) - { - ApplicationBar.Mode = ApplicationBarMode.Default; - } - else - { - ApplicationBar.Mode = ApplicationBarMode.Minimized; - } - - base.OnOrientationChanged(e); - } - /// /// Is called after the RSS feeds are loaded into the newsFeed model. /// If there was no feed information set to the UI, the feed list diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml index 797ae08c..855ec90d 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml @@ -1,4 +1,4 @@ - - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs index b677cbe6..83100fba 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs @@ -23,7 +23,7 @@ namespace CampusAppWP8.Pages.News /// /// EventPage, where every news fees has his own PivotItem. /// - public partial class NewsPage : PhoneApplicationPage + public partial class NewsPage : PortraitLandscapePage { /// /// for checking if the feed source is already set or not. @@ -76,11 +76,6 @@ namespace CampusAppWP8.Pages.News { base.OnNavigatedTo(e); - if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - this.DefHeader.ProgressVisibility = Visibility.Visible; if (this.isNewInstance) @@ -151,24 +146,6 @@ namespace CampusAppWP8.Pages.News } } - /* - protected override void OnOrientationChanged(OrientationChangedEventArgs e) - { - if (e.Orientation == PageOrientation.Landscape - || e.Orientation == PageOrientation.LandscapeLeft - || e.Orientation == PageOrientation.LandscapeRight) - { - ApplicationBar.Mode = ApplicationBarMode.Default; - } - else - { - ApplicationBar.Mode = ApplicationBarMode.Minimized; - } - - base.OnOrientationChanged(e); - } - */ - /// /// Called when the index of the selected PivotItem is changed. /// Set the text Grid to visible and the WebBrowser to collapsed. diff --git a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml index 67c5df8f..672f1be3 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs index 66aa0e24..68775ab2 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs @@ -20,7 +20,7 @@ namespace CampusAppWP8.Pages.Openinghours /// /// Opening hours page. /// - public partial class OpeninghoursPage : PhoneApplicationPage + public partial class OpeninghoursPage : PortraitLandscapePage { #region Members @@ -72,11 +72,6 @@ namespace CampusAppWP8.Pages.Openinghours { base.OnNavigatedTo(e); - if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - if (this.isNewInstance) { if ((this.feed == null) || (this.feed.Model == null)) @@ -113,26 +108,6 @@ namespace CampusAppWP8.Pages.Openinghours } - /// - /// Override the OnOrientationChanged method. - /// - /// orientation changed event args. - protected override void OnOrientationChanged(OrientationChangedEventArgs e) - { - if (e.Orientation == PageOrientation.Landscape - || e.Orientation == PageOrientation.LandscapeLeft - || e.Orientation == PageOrientation.LandscapeRight) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - else - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Minimized; - } - - base.OnOrientationChanged(e); - } - // protected #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs index 886c8239..6f23a2c7 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs @@ -132,15 +132,16 @@ namespace CampusAppWP8.Pages.Person saveContactTask.FirstName = person.FirstName; saveContactTask.LastName = person.SurName; saveContactTask.Title = person.Akadgrad; - saveContactTask.JobTitle = person.Functions[functionIndex].Function; - saveContactTask.Company = Constants.Addr_CBMainCompanyName + " - " + person.Functions[functionIndex].Appointment; + PersonFunctionWp8Model personFunction = person.Functions[functionIndex]; + saveContactTask.JobTitle = personFunction.Function; + saveContactTask.Company = Constants.Addr_CBMainCompanyName + " - " + personFunction.Appointment; saveContactTask.WorkAddressCountry = Constants.Addr_CBMainCountry; saveContactTask.WorkAddressCity = Constants.Addr_CBMainCity; saveContactTask.WorkAddressState = Constants.Addr_CBMainState; saveContactTask.WorkAddressZipCode = Constants.Addr_CBMainZipCode; - saveContactTask.WorkAddressStreet = person.Functions[functionIndex].Building; - saveContactTask.WorkPhone = person.Functions[functionIndex].Tel1; - saveContactTask.WorkEmail = person.Functions[functionIndex].Mail; + saveContactTask.WorkAddressStreet = personFunction.Building; + saveContactTask.WorkPhone = personFunction.Tel; + saveContactTask.WorkEmail = personFunction.Mail; saveContactTask.Show(); } diff --git a/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml b/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml index cf5ae132..c5cd9bdc 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml.cs index 0bd1f127..d0d1d672 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml.cs @@ -29,7 +29,7 @@ namespace CampusAppWP8.Pages.PlaceNews /// Place news. /// Stubbfel, 09.09.2013. /// - public partial class PlaceNews : PhoneApplicationPage + public partial class PlaceNews : PortraitLandscapePage { #region Member @@ -90,7 +90,7 @@ namespace CampusAppWP8.Pages.PlaceNews if (this.places == null) { this.places = new PlacesFile(); - this.places.Model = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_AllPlaces); + this.places.Model = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_AllPlaces); } if (this.qrScan) @@ -131,7 +131,7 @@ namespace CampusAppWP8.Pages.PlaceNews { if (NavigationMode.Back == e.NavigationMode) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_AllPlaces, null); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_AllPlaces, null); } } @@ -199,7 +199,7 @@ namespace CampusAppWP8.Pages.PlaceNews /// Stubbfel, 09.09.2013. private void PlacesFileIsFail() { - this.places.Model = new SpsModel(); + this.places.Model = new SpsWp8Model(); if (this.spsApi == null) { this.spsApi = new SpsApi(); @@ -328,7 +328,7 @@ namespace CampusAppWP8.Pages.PlaceNews this.ResultBox.ItemsSource = this.places.Model.FilterByPid(this.searchPidList); this.ProgressBar.Visibility = Visibility.Collapsed; this.places.SaveData(); - App.SaveToIsolatedStorage(Constants.IsolatedStorage_AllPlaces, this.places.Model); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_AllPlaces, this.places.Model); this.forceRequest = false; } @@ -412,7 +412,7 @@ namespace CampusAppWP8.Pages.PlaceNews return; } - PlaceModel place = this.places.Model.GetPlaceById(placeID); + PlaceWp8Model place = this.places.Model.GetPlaceById(placeID); txt.Text = place.GetInformationsValue(Constants.PisInformationName_Name); } diff --git a/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/ShowPad.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/ShowPad.xaml.cs index d26c4b46..0d0ce2df 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/ShowPad.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/ShowPad.xaml.cs @@ -39,9 +39,9 @@ namespace CampusAppWP8.Pages.PlaceNews { if (NavigationContext.QueryString.ContainsKey(Constants.ParamPlaceID)) { - SpsModel model = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_AllPlaces); + SpsWp8Model model = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_AllPlaces); string placeId = NavigationContext.QueryString[Constants.ParamPlaceID]; - PlaceModel place = model.GetPlaceById(placeId); + PlaceWp8Model place = model.GetPlaceById(placeId); if (place != null && place.Services != null && place.Services.Count > 0 && place.Informations != null && place.Informations.Count > 0) { this.Room.Text += " - " + place.Informations[0].InformationValue; diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml index c92da838..a022cd2e 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index 80f8532a..bed4dfcf 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -29,7 +29,7 @@ namespace CampusAppWP8.Pages /// Class for the StartPage. /// Stubbfel, 15.10.2013. /// - public partial class StartPage : PhoneApplicationPage + public partial class StartPage : PortraitLandscapePage { #region Member diff --git a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml index 25db516a..a731c3fc 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs index 81615043..5be5c0f6 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs @@ -20,7 +20,7 @@ namespace CampusAppWP8.Pages.StudentCouncil /// Class for the StudentCouncilPage. /// Stubbfel, 15.10.2013. /// - public partial class StudentCouncilPage : PhoneApplicationPage + public partial class StudentCouncilPage : PortraitLandscapePage { #region Members @@ -52,11 +52,6 @@ namespace CampusAppWP8.Pages.StudentCouncil { base.OnNavigatedTo(e); - if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - if (this.feed == null) { this.InitializeFeed(); @@ -74,25 +69,6 @@ namespace CampusAppWP8.Pages.StudentCouncil this.feed.SaveData(); } - /// Override the OnOrientationChanged method. - /// Stubbfel, 15.10.2013. - /// - protected override void OnOrientationChanged(OrientationChangedEventArgs e) - { - if (e.Orientation == PageOrientation.Landscape - || e.Orientation == PageOrientation.LandscapeLeft - || e.Orientation == PageOrientation.LandscapeRight) - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; - } - else - { - ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Minimized; - } - - base.OnOrientationChanged(e); - } - #endregion #region private diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index ab3dd3e0..98f32ee9 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -528,9 +528,6 @@ /Pages/Campusmap/RoomListPage.xaml - - Ebene - Barrierefreiheit diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index c193b4a1..2da9f39b 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -1131,15 +1131,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Ebene ähnelt. - /// - public static string PisInformationName_Layer { - get { - return ResourceManager.GetString("PisInformationName_Layer", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Name ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/SubmissionInfo/720p_lecture.png b/CampusAppWP8/CampusAppWP8/SubmissionInfo/720p_lecture.png index 3bf8548b..3be6b815 100644 Binary files a/CampusAppWP8/CampusAppWP8/SubmissionInfo/720p_lecture.png and b/CampusAppWP8/CampusAppWP8/SubmissionInfo/720p_lecture.png differ diff --git a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs index da03d882..87d42f83 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs @@ -18,28 +18,15 @@ namespace CampusAppWP8.Utility using CampusAppWP8.Resources; using CampusAppWPortalLib8.Model; using CampusAppWPortalLib8.Model.Settings; + using CampusAppWPortalLib8.Model.Utility; using CampusAppWPortalLib8.Utility; using Microsoft.Phone.Net.NetworkInformation; + using CampusAppWPortalLib8.Model.Campusmap.Map; /// Collection of utility functions. /// Stubbfel, 14.10.2013. public static class Utilities { - #region member - - /// The north campus of cottbus. - private static GeoCoordinate northCB = new GeoCoordinate(51.77670359509875,14.293908825617); - - /// The middle campus of cottbus. - private static GeoCoordinate midCB = new GeoCoordinate(51.76737987049448,14.324056352976152); - - /// The south campus of cottbus. - private static GeoCoordinate southCB = new GeoCoordinate(51.72668339740452,14.319497377197282); - - /// The middle campus of senftenberg. - private static GeoCoordinate midSFB = new GeoCoordinate(51.522217168257356,13.986618441187698); - - #endregion #region Enums /// Comparison types. @@ -416,16 +403,18 @@ namespace CampusAppWP8.Utility return result; } - Point currentPoint = new Point(log, lat); - + MapPoint currentPoint = new MapPoint(log, lat); + MapPoint tmpCampus = CampusMapPoints.NorthCB; - double minDistance = Utilities.CalcDistance(currentPoint, new Point(Utilities.northCB.Longitude, Utilities.northCB.Latitude)); + double minDistance = MapPoint.CalcDistance(currentPoint, tmpCampus); if (minDistance < 0.01) { result = Campus.CB_NORTH; } - double tmpDistance = Utilities.CalcDistance(currentPoint, new Point(Utilities.midCB.Longitude, Utilities.midCB.Latitude)); + + tmpCampus = CampusMapPoints.MidCB; + double tmpDistance = MapPoint.CalcDistance(currentPoint, tmpCampus); if (tmpDistance < 0.01 && tmpDistance < minDistance) { @@ -433,16 +422,16 @@ namespace CampusAppWP8.Utility result = Campus.CB_MAIN; } - tmpDistance = Utilities.CalcDistance(currentPoint, new Point(Utilities.southCB.Longitude, Utilities.southCB.Latitude)); - + tmpCampus = CampusMapPoints.SouthCB; + tmpDistance = MapPoint.CalcDistance(currentPoint, tmpCampus); if (tmpDistance < 0.01 && tmpDistance < minDistance) { minDistance = tmpDistance; result = Campus.CB_SOUTH; } - tmpDistance = Utilities.CalcDistance(currentPoint, new Point(Utilities.midSFB.Longitude, Utilities.midSFB.Latitude)); - + tmpCampus = CampusMapPoints.MidSFB; + tmpDistance = MapPoint.CalcDistance(currentPoint, tmpCampus); if (tmpDistance < 0.01 && tmpDistance < minDistance) { minDistance = tmpDistance; @@ -452,19 +441,6 @@ namespace CampusAppWP8.Utility return result; } - /// Calculates the distance. - /// Stubbfel, 14.10.2013. - /// the source point. - /// the destination Point. - /// The calculated distance. - public static double CalcDistance(Point src, Point dst) - { - double xPow = Math.Pow(dst.X - src.X, 2); - double yPow = Math.Pow(dst.Y - src.Y, 2); - double result = Math.Sqrt(xPow + yPow); - return Math.Sqrt(Math.Pow(dst.X - src.X, 2) + Math.Pow(dst.Y - src.Y, 2)); - } - #endregion } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj index dea60ce8..52ea7f04 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj +++ b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj @@ -33,12 +33,21 @@ 4 + + + + + + + + + @@ -53,8 +62,6 @@ - - @@ -76,6 +83,7 @@ + True @@ -115,6 +123,7 @@ Designer +