Merge branch 'release/r' into develmaster
This commit is contained in:
@@ -101,7 +101,7 @@ namespace CampusAppWP8.Model.GeoDb
|
||||
/// <returns>This object as a string.</returns>
|
||||
public string ToNfcString()
|
||||
{
|
||||
string nfcStr = "{\"pid\":\"" + this.PlaceId + "\",\"parent\":\"" + this.ParentId + "\"}";
|
||||
string nfcStr = "{\n\"url\":\"http://www.tu-cottbus.de/campusapp\",\n\"pid\":\"" + this.PlaceId + "\",\n\"parent\":\"" + this.ParentId + "\"\n}";
|
||||
return nfcStr;
|
||||
}
|
||||
|
||||
|
||||
@@ -64,8 +64,8 @@ namespace CampusAppWP8.Pages.Dev
|
||||
private void FileIsReady()
|
||||
{
|
||||
this.ndefList = new List<NDEFMessage>();
|
||||
MapModel map = new CBMainMapModel(this.file.Model.Places.ToList());
|
||||
foreach (PlaceModel place in map.Spatial.Places)
|
||||
//MapModel map = new CBMainMapModel(this.file.Model.Places.ToList());
|
||||
foreach (PlaceModel place in this.file.Model.Places.ToList())
|
||||
{
|
||||
this.ndefList.Add(new NDEFMessage(place.ToNfcString(), NDEFMessage.TYPEVAL.TEXT));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user