Fixed json load

Breda-Tour/Breda-Tour.csproj

@@ -94,6 +94,32 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="project.json" />
+    <Content Include="Storage\Images\1.jpg" />
+    <Content Include="Storage\Images\10.jpg" />
+    <Content Include="Storage\Images\11.jpg" />
+    <Content Include="Storage\Images\12.jpg" />
+    <Content Include="Storage\Images\13.jpg" />
+    <Content Include="Storage\Images\14.jpg" />
+    <Content Include="Storage\Images\15.jpg" />
+    <Content Include="Storage\Images\16.jpg" />
+    <Content Include="Storage\Images\17.jpg" />
+    <Content Include="Storage\Images\18.jpg" />
+    <Content Include="Storage\Images\19.jpg" />
+    <Content Include="Storage\Images\2.jpg" />
+    <Content Include="Storage\Images\20.jpg" />
+    <Content Include="Storage\Images\21.jpg" />
+    <Content Include="Storage\Images\22.jpg" />
+    <Content Include="Storage\Images\23.jpg" />
+    <Content Include="Storage\Images\24.jpg" />
+    <Content Include="Storage\Images\25.jpg" />
+    <Content Include="Storage\Images\26.jpg" />
+    <Content Include="Storage\Images\3.jpg" />
+    <Content Include="Storage\Images\4.jpg" />
+    <Content Include="Storage\Images\5.jpg" />
+    <Content Include="Storage\Images\6.jpg" />
+    <Content Include="Storage\Images\7.jpg" />
+    <Content Include="Storage\Images\8.jpg" />
+    <Content Include="Storage\Images\9.jpg" />
     <Content Include="Storage\Routes\routes.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -144,7 +170,6 @@
     <None Include="Breda-Tour_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Assets\1.jpg" />
     <Content Include="Assets\Ags_Logo.png" />
     <Content Include="Assets\Marker.png" />
     <Content Include="Properties\Default.rd.xml" />

Breda-Tour/Data/RouteDatabase.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -14,20 +15,21 @@ namespace Breda_Tour.Data
         public RouteDatabase()
         {
             Routes = new List<Route>();
-            readRoutes();
+            //readRoutes();
         }
 
-        private void readRoutes()
+        public void readRoutes()
         {
-            Task.Run(() =>
-            {
+            //Task.Run(() =>
+           // {
                 string json = File.ReadAllText("Storage/Routes/routes.json");
                 JObject JsonObject = JObject.Parse(json);
                 IList<JToken> JsonList = JsonObject["Routes"].ToList();
                 foreach (JToken route in JsonList){
                    Routes.Add(JsonConvert.DeserializeObject<Route>(route.ToString()));
+                    Debug.Write($"Routes toegevoegd: groote is: {Routes.Count}");
                 }
-        });
+       // });
         }
     }
 }

Breda-Tour/Data/waypoint.cs

@@ -25,10 +25,13 @@ namespace Breda_Tour.Data
             this.Title = Title;
             this.Description = Description;
             this.Pictures = new List<Picture>();
-            foreach (var imageSource in pictures)
+            if (pictures != null)
             {
-                string newSource = "ms-appx:///Assets/" + imageSource;
-                Pictures.Add(new Picture(newSource));
+                foreach (var imageSource in pictures)
+                {
+                    string newSource = "ms-appx:///Storage/Images/" + imageSource;
+                    Pictures.Add(new Picture(newSource));
+                }
             }
         }
     }

Breda-Tour/MapScreen/MapPage.xaml.cs

@@ -48,8 +48,9 @@ namespace Breda_Tour.MapScreen
             gps = new Gps(this);
             gps.Start();
             RouteDatabase routeDB = new RouteDatabase();
-            Debug.Write(routeDB.Routes.Count);
-            //route = routeDB.Routes.ElementAt(1);
+            routeDB.readRoutes();
+            Debug.Write("Groote van de routes is:" + routeDB.Routes.Count);
+            route = routeDB.Routes.ElementAt(0);
             this.InitializeComponent();
             Debug.Write("New Map generated");
         }
@@ -74,7 +75,7 @@ namespace Breda_Tour.MapScreen
                }
                marker.Location = point;
            });
-            await Map.TrySetViewAsync(point, 15);
+            await Map.TrySetViewAsync(point, 17);
             ShowWaypoints(route);
             ShowRoute(route);
         }