small update

cschotte · cschotte · commit 87f38e734bd7 · 2023-04-06T11:34:10.000+02:00
diff --git a/Build/SampleBuilder/Models/Sample.cs b/Build/SampleBuilder/Models/Sample.cs
@@ -27,6 +27,8 @@ public string Id
 
         public string Author { get; set; }
 
+        public string Version { get; set; }
+
         public DateTime LastChangeDate { get; set; }
     }
 }
diff --git a/Build/SampleBuilder/Program.cs b/Build/SampleBuilder/Program.cs
@@ -138,17 +138,44 @@ static void WriteStartPage(string filename)
             string categoryList = "";
             foreach(var category in database.Categories)
             {
-                categoryList += $"<li><a class=\"dropdown-item\" href=\"#{category.Id}\">{category.Title}</a></li>";
+                categoryList += $"""
+                                <li>
+                                    <a class=\"dropdown-item\" href=\"#{category.Id}\">{category.Title}</a>
+                                </li>
+                                """;
             }
 
             string sampleList = "";
             foreach (var category in database.Categories)
             {
-                sampleList += $"<div class=\"w-100\"><a name=\"{category.Id}\"></a><h3 class=\"fw-light\">{category.Title} <small class=\"text-muted\">({category.NumberOfSamples})</small></h3><p>{category.Description}</p></div>";
+                sampleList += $"""
+                               <div class=\"w-100\">
+                                <a name=\"{category.Id}\"></a>
+                                <h3 class=\"fw-light\">{category.Title} <small class=\"text-muted\">({category.NumberOfSamples})</small></h3>
+                                <p>{category.Description}</p>
+                               </div>
+                               """;
 
                 foreach(var sample in category.Samples)
                 {
-                    sampleList += $"<div class=\"col\"><div class=\"card shadow-sm\"><img class=\"card-img-top\" src=\"{sample.Path}/{sample.Screenshot}\" loading=\"lazy\" alt=\"{sample.Title}\" /><div class=\"card-body\"><h5 class=\"card-title\">{sample.Title}</h5><p class=\"card-text\">{sample.Description}</p><div class=\"d-flex justify-content-between align-items-center\"><div class=\"btn-group\"><button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" data-bs-toggle=\"modal\" data-bs-target=\"#sampleModal\" data-bs-id=\"{sample.Id}\" data-bs-title=\"{sample.Title}\" data-bs-path=\"{sample.Path}\" data-bs-source=\"{database.GitHub}{sample.Source}\" aria-description=\"Run the sample in a new popup\"><small>Run Sample</small></button><a href=\"{sample.Path}\" target=\"_blank\" class=\"btn btn-sm btn-outline-secondary\" role=\"button\" aria-description=\"Open the sample in a new Tab\"><small>Open In New Tab</small></a><a href=\"{database.GitHub}{sample.Source}\" target=\"_blank\" class=\"btn btn-sm btn-outline-secondary\" role=\"button\" aria-description=\"Show the source code of the sample\"><small>Source Code</small></a></div></div></div></div></div>";
+                    sampleList += $"""
+                                  <div class=\"col\">
+                                    <div class=\"card shadow-sm\">
+                                        <img class=\"card-img-top\" src=\"{sample.Path}/{sample.Screenshot}\" loading=\"lazy\" alt=\"{sample.Title}\" />
+                                        <div class=\"card-body\">
+                                            <h5 class=\"card-title\">{sample.Title}</h5>
+                                            <p class=\"card-text\">{sample.Description}</p>
+                                            <div class=\"d-flex justify-content-between align-items-center\">
+                                                <div class=\"btn-group\">
+                                                    <button type=\"button\" class=\"btn btn-sm btn-outline-secondary\" data-bs-toggle=\"modal\" data-bs-target=\"#sampleModal\" data-bs-id=\"{sample.Id}\" data-bs-title=\"{sample.Title}\" data-bs-path=\"{sample.Path}\" data-bs-source=\"{database.GitHub}{sample.Source}\" aria-describedby=\"Run the sample in a new popup\"><small>Run Sample</small></button>
+                                                    <a href=\"{sample.Path}\" target=\"_blank\" class=\"btn btn-sm btn-outline-secondary\" role=\"button\" aria-describedby=\"Open the sample in a new Tab\"><small>Open In New Tab</small></a>
+                                                    <a href=\"{database.GitHub}{sample.Source}\" target=\"_blank\" class=\"btn btn-sm btn-outline-secondary\" role=\"button\" aria-describedby=\"Show the source code of the sample\"><small>Source Code</small></a>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                  </div>
+                                  """;
                 }
             }
 
@@ -262,6 +289,12 @@ static Sample GetSampleDetails(string filename)
             else
                 sample.Screenshot = screenshot.Attributes["content"].Value;
 
+            var version = doc.DocumentNode.SelectSingleNode("//meta[@name='version']");
+            if (version == null)
+                Exit($"Missing version in file '{filename}'");
+            else
+                sample.Version = version.Attributes["content"].Value;
+
             return sample;
         }
 
diff --git a/Build/SampleBuilder/SampleBuilder.csproj b/Build/SampleBuilder/SampleBuilder.csproj
@@ -5,14 +5,14 @@
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
-    <FileVersion>1.2.0.0</FileVersion>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
+    <FileVersion>1.3.0.0</FileVersion>
+    <AssemblyVersion>1.3.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="xsitemap" Version="2.7.0" />
+    <PackageReference Include="xsitemap" Version="2.8.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Samples/Creator/Creator Custom Styling/screenshot.jpg b/Samples/Creator/Creator Custom Styling/screenshot.jpg
diff --git a/Samples/REST Services/Route Waypoint Optimization/Route Waypoint Optimization.html b/Samples/REST Services/Route Waypoint Optimization/Route Waypoint Optimization.html
@@ -4,12 +4,13 @@
     <title>Route Waypoint Optimization - Azure Maps Web SDK Samples</title>
 
     <meta charset="utf-8" />
-	<link rel="shortcut icon" href="/favicon.ico"/>
-    
+    <link rel="shortcut icon" href="/favicon.ico" />
+
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
     <meta name="description" content="This sample shows how to calculate routes with and without waypoint optimization using the Azure Maps REST Route API." />
     <meta name="keywords" content="Microsoft maps, map, gis, API, SDK, route directions service, direcitons, travelling salesmen problem, route optimization, optimize, vehicle routing problem, VRP, TSP" />
     <meta name="author" content="Microsoft Azure Maps" />
+    <meta name="version" content="1.0" />
     <meta name="screenshot" content="screenshot.jpg" />
 
     <!-- Add references to the Azure Maps Map control JavaScript and CSS files. -->
@@ -133,7 +134,7 @@
                         pinOrder.push(r.optimizedWaypoints[i].optimizedIndex + 1);
                     }
 
-                    //Add the desintation index to the end. 
+                    //Add the desintation index to the end.
                     pinOrder.push(waypoints.length - 1);
 
                     output += 'Waypoint Order: ' + pinOrder.join(', ');
diff --git a/Samples/Spatial Math/Cardinal Spline Options/Cardinal Spline Options.html b/Samples/Spatial Math/Cardinal Spline Options/Cardinal Spline Options.html
@@ -4,12 +4,13 @@
     <title>Cardinal Spline Options - Azure Maps Web SDK Samples</title>
 
     <meta charset="utf-8" />
-	<link rel="shortcut icon" href="/favicon.ico"/>
-    
+    <link rel="shortcut icon" href="/favicon.ico" />
+
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
     <meta name="description" content="This sample provides a set of controls to test the various features of the Cardinal Spline calculation." />
     <meta name="keywords" content="Microsoft maps, map, gis, API, SDK, spatial math, math, spline, cardinal spline, curves, lines, line layer" />
     <meta name="author" content="Microsoft Azure Maps" />
+    <meta name="version" content="1.0" />
     <meta name="screenshot" content="screenshot.jpg" />
 
     <!-- Add references to the Azure Maps Map control JavaScript and CSS files. -->
@@ -26,7 +27,7 @@
             [-122.109186, 47.608526],
             [-122.111589, 47.580163]
         ];
-        
+
         function GetMap() {
             //Initialize a map instance.
             map = new atlas.Map('myMap', {
@@ -68,7 +69,7 @@
                     })
                 );
 
-                //Create to line shapes for easy updating. A red straightline will be created to show the straight line path between the points. 
+                //Create to line shapes for easy updating. A red straightline will be created to show the straight line path between the points.
                 straightLine = new atlas.Shape(new atlas.data.LineString(positions), null, {
                     color: 'red',
                     width: 2
@@ -82,7 +83,7 @@
                 //Add the lines to the data source.
                 datasource.add([straightLine, spline]);
 
-                //Create a draggable HTML marker for each position. 
+                //Create a draggable HTML marker for each position.
                 for (var i = 0; i < positions.length; i++) {
                     var marker = new atlas.HtmlMarker({
                         draggable: true,
@@ -108,10 +109,10 @@
             positions[e.target.properties.index] = e.target.getOptions().position;
 
             //Calculate the cardinal spline coordinates and update the spline.
-            spline.setCoordinates(atlas.math.getCardinalSpline(positions, tension, nodeSize, close));           
+            spline.setCoordinates(atlas.math.getCardinalSpline(positions, tension, nodeSize, close));
 
             //Update the lines with the new positions.
-            straightLine.setCoordinates(positions);            
+            straightLine.setCoordinates(positions);
         }
 
         function calculateSpline() {
diff --git a/Static/js/site.js b/Static/js/site.js
@@ -21,7 +21,7 @@ function showSampleCards() {
         $.each(data.Categories, function (index, value) {
             $('#sampleList').append(`<div class="w-100"><a name="${value.Id}"></a><h3 class="fw-light">${value.Title} <small class="text-muted">(${value.NumberOfSamples})</small></h3><p>${value.Description}</p></div>`);
             $.each(value.Samples, function (index, value) {
-                $('#sampleList').append(`<div class="col"><div class="card shadow-sm"><img class="card-img-top" src="${value.Path}/${value.Screenshot}" loading="lazy" alt="${value.Title}" /><div class="card-body"><h5 class="card-title">${value.Title}</h5><p class="card-text">${value.Description}</p><div class="d-flex justify-content-between align-items-center"><div class="btn-group"><button type="button" class="btn btn-sm btn-outline-secondary" data-bs-toggle="modal" aria-description="Run the sample in a new popup" data-bs-target="#sampleModal" data-bs-id="${value.Id}" data-bs-title="${value.Title}" data-bs-path="${value.Path}" data-bs-source="${data.GitHub}${value.Source}"><small>Run Sample</small></button><a href="${value.Path}" target="_blank" class="btn btn-sm btn-outline-secondary" role="button" aria-description="Open sample in a new Tab"><small>Open In New Tab</small></a><a href="${data.GitHub}${value.Source}" target="_blank" class="btn btn-sm btn-outline-secondary" role="button" aria-description="Show the Source Code"><small>Source Code</small></a></div></div></div></div></div>`);
+                $('#sampleList').append(`<div class="col"><div class="card shadow-sm"><img class="card-img-top" src="${value.Path}/${value.Screenshot}" loading="lazy" alt="${value.Title}" /><div class="card-body"><h5 class="card-title">${value.Title}</h5><p class="card-text">${value.Description}</p><div class="d-flex justify-content-between align-items-center"><div class="btn-group"><button type="button" class="btn btn-sm btn-outline-secondary" data-bs-toggle="modal" aria-describedby="Run the sample in a new popup" data-bs-target="#sampleModal" data-bs-id="${value.Id}" data-bs-title="${value.Title}" data-bs-path="${value.Path}" data-bs-source="${data.GitHub}${value.Source}"><small>Run Sample</small></button><a href="${value.Path}" target="_blank" class="btn btn-sm btn-outline-secondary" role="button" aria-describedby="Open sample in a new Tab"><small>Open In New Tab</small></a><a href="${data.GitHub}${value.Source}" target="_blank" class="btn btn-sm btn-outline-secondary" role="button" aria-describedby="Show the Source Code"><small>Source Code</small></a></div></div></div></div></div>`);
             });
         });
     }
diff --git a/Static/js/site.min.js b/Static/js/site.min.js

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ public string Id`
`27`	`27`
`28`	`28`	`public string Author { get; set; }`
`29`	`29`
	`30`	`+ public string Version { get; set; }`
	`31`	`+`
`30`	`32`	`public DateTime LastChangeDate { get; set; }`
`31`	`33`	`}`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ function showSampleCards() {`
`21`	`21`	`$.each(data.Categories, function (index, value) {`
`22`	`22`	$('#sampleList').append(`<div class="w-100"><a name="${value.Id}"></a><h3 class="fw-light">${value.Title} <small class="text-muted">(${value.NumberOfSamples})</small></h3><p>${value.Description}</p></div>`);
`23`	`23`	`$.each(value.Samples, function (index, value) {`
`24`		- $('#sampleList').append(`<div class="col"><div class="card shadow-sm"><img class="card-img-top" src="${value.Path}/${value.Screenshot}" loading="lazy" alt="${value.Title}" /><div class="card-body"><h5 class="card-title">${value.Title}</h5><p class="card-text">${value.Description}</p><div class="d-flex justify-content-between align-items-center"><div class="btn-group"><button type="button" class="btn btn-sm btn-outline-secondary" data-bs-toggle="modal" aria-description="Run the sample in a new popup" data-bs-target="#sampleModal" data-bs-id="${value.Id}" data-bs-title="${value.Title}" data-bs-path="${value.Path}" data-bs-source="${data.GitHub}${value.Source}"><small>Run Sample</small></button><a href="${value.Path}" target="_blank" class="btn btn-sm btn-outline-secondary" role="button" aria-description="Open sample in a new Tab"><small>Open In New Tab</small></a><a href="${data.GitHub}${value.Source}" target="_blank" class="btn btn-sm btn-outline-secondary" role="button" aria-description="Show the Source Code"><small>Source Code</small></a></div></div></div></div></div>`);
	`24`	+ $('#sampleList').append(`<div class="col"><div class="card shadow-sm"><img class="card-img-top" src="${value.Path}/${value.Screenshot}" loading="lazy" alt="${value.Title}" /><div class="card-body"><h5 class="card-title">${value.Title}</h5><p class="card-text">${value.Description}</p><div class="d-flex justify-content-between align-items-center"><div class="btn-group"><button type="button" class="btn btn-sm btn-outline-secondary" data-bs-toggle="modal" aria-describedby="Run the sample in a new popup" data-bs-target="#sampleModal" data-bs-id="${value.Id}" data-bs-title="${value.Title}" data-bs-path="${value.Path}" data-bs-source="${data.GitHub}${value.Source}"><small>Run Sample</small></button><a href="${value.Path}" target="_blank" class="btn btn-sm btn-outline-secondary" role="button" aria-describedby="Open sample in a new Tab"><small>Open In New Tab</small></a><a href="${data.GitHub}${value.Source}" target="_blank" class="btn btn-sm btn-outline-secondary" role="button" aria-describedby="Show the Source Code"><small>Source Code</small></a></div></div></div></div></div>`);
`25`	`25`	`});`
`26`	`26`	`});`
`27`	`27`	`}`