From c4c3feabc2a749b369cf431a78ea346426fdcf88 Mon Sep 17 00:00:00 2001 From: Scott Hunter Date: Mon, 2 Jan 2017 16:48:24 -0500 Subject: [PATCH 1/5] Update date in license. --- DotNet/LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DotNet/LICENSE.md b/DotNet/LICENSE.md index 47efe121..b2b57bf3 100644 --- a/DotNet/LICENSE.md +++ b/DotNet/LICENSE.md @@ -1,4 +1,4 @@ -Copyright 2011-2015 Cesium Contributors +Copyright 2011-2017 Cesium Contributors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 92fdc6e153810c3c70dd9f3a5fcd2d7d1cb2d2ca Mon Sep 17 00:00:00 2001 From: Scott Hunter Date: Tue, 3 Jan 2017 15:39:54 -0500 Subject: [PATCH 2/5] Add NuGet packaging files --- .../CesiumLanguageWriter.nuspec | 17 +++++++++++++++++ .../Properties/AssemblyInfo.cs | 15 ++++++--------- DotNet/CesiumLanguageWriter/packages.config | 2 +- DotNet/StrongNameKey.snk | Bin 0 -> 596 bytes 4 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 DotNet/CesiumLanguageWriter/CesiumLanguageWriter.nuspec create mode 100644 DotNet/StrongNameKey.snk diff --git a/DotNet/CesiumLanguageWriter/CesiumLanguageWriter.nuspec b/DotNet/CesiumLanguageWriter/CesiumLanguageWriter.nuspec new file mode 100644 index 00000000..28b16b91 --- /dev/null +++ b/DotNet/CesiumLanguageWriter/CesiumLanguageWriter.nuspec @@ -0,0 +1,17 @@ + + + + $id$ + $version$ + $title$ + $author$ + $author$ + https://github.com/AnalyticalGraphicsInc/czml-writer/blob/master/DotNet/LICENSE.md + https://github.com/AnalyticalGraphicsInc/czml-writer + https://raw.githubusercontent.com/AnalyticalGraphicsInc/cesium/master/favicon.ico + false + $description$ + $copyright$ + Cesium CZML + + \ No newline at end of file diff --git a/DotNet/CesiumLanguageWriter/Properties/AssemblyInfo.cs b/DotNet/CesiumLanguageWriter/Properties/AssemblyInfo.cs index 0e9fdecb..a7b47ce7 100644 --- a/DotNet/CesiumLanguageWriter/Properties/AssemblyInfo.cs +++ b/DotNet/CesiumLanguageWriter/Properties/AssemblyInfo.cs @@ -6,11 +6,11 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("CesiumLanguageWriter")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("A library for writing CZML content for use with Cesium.")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Analytical Graphics, Inc.")] [assembly: AssemblyProduct("CesiumLanguageWriter")] -[assembly: AssemblyCopyright("Copyright © 2011-2016 Cesium Contributors")] +[assembly: AssemblyCopyright("Copyright © 2011-2017 Cesium Contributors")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -29,10 +29,7 @@ // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.0.0")] +[assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: InternalsVisibleTo("CesiumLanguageWriterTests")] +[assembly: InternalsVisibleTo("CesiumLanguageWriterTests,PublicKey=00240000048000009400000006020000002400005253413100040000010001009b7aa680a19ae7c27dca3e265540bd729fe5cd48c2fcdf8a91c6dff09fe42e9f8fdabca5c9f3c7597d8f7302894a6d45195cb75e7373f24062b6862343c433ba7bbbe73e6686f9657dd7486bf146d9b4da31b1cbc0997c64130d244eda655f94c65d6719f64cd6350a77e84164afa8cd3a996c04d3373121d49f4b5fbd6b66ba")] diff --git a/DotNet/CesiumLanguageWriter/packages.config b/DotNet/CesiumLanguageWriter/packages.config index 68f466a1..feeb5ef0 100644 --- a/DotNet/CesiumLanguageWriter/packages.config +++ b/DotNet/CesiumLanguageWriter/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/DotNet/StrongNameKey.snk b/DotNet/StrongNameKey.snk new file mode 100644 index 0000000000000000000000000000000000000000..87cbdfaa78fac0351ccd7c7c4449ae4f4b8c3ce5 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097-dZvJ(n&-lO%04DlK)rIG<;_UK{NIX^ z#^3OtEdwtFIN zVf#DF3-p!JdF|VHpb-3mmfSw|n$OKa1sjJEEBvt|;RJm3gu|gxc4u6`@_dv}C@HKO{` z8aJFbW1n$x>9D+a09plL;zL22tfll^xAV4$|2|+FJ~og*r@3M5(wfsd% z11836QS|@IqhIDWA~$b?^iEFsom2iw?3JIlP>GC#8q_fYkPtbr7eBI3iob5gRQ$Yi i&3zTyN%8vZt{?E}+2B!`;#e)$oQHCT#e7QL<9;YtMkx^h literal 0 HcmV?d00001 From 3695dca67ab8d167f8314b618873781f0e3de573 Mon Sep 17 00:00:00 2001 From: Scott Hunter Date: Wed, 4 Jan 2017 15:49:55 -0500 Subject: [PATCH 3/5] Update example server. --- .../ExampleCesiumLanguageServer.csproj | 9 ++-- .../Global.asax.cs | 5 +-- .../InfoHandler.cs | 42 ++++++++++--------- .../Properties/AssemblyInfo.cs | 6 +-- DotNet/ExampleCesiumLanguageServer/index.html | 19 +++------ 5 files changed, 38 insertions(+), 43 deletions(-) diff --git a/DotNet/ExampleCesiumLanguageServer/ExampleCesiumLanguageServer.csproj b/DotNet/ExampleCesiumLanguageServer/ExampleCesiumLanguageServer.csproj index 517ad9e8..d92990f5 100644 --- a/DotNet/ExampleCesiumLanguageServer/ExampleCesiumLanguageServer.csproj +++ b/DotNet/ExampleCesiumLanguageServer/ExampleCesiumLanguageServer.csproj @@ -1,12 +1,9 @@  - + Debug AnyCPU - - - 2.0 {1F1824FB-14DA-4666-BF30-5E9593D0DECD} {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library @@ -14,11 +11,15 @@ ExampleCesiumLanguageServer ExampleCesiumLanguageServer v4.5 + 512 + true + ..\StrongNameKey.snk true + true diff --git a/DotNet/ExampleCesiumLanguageServer/Global.asax.cs b/DotNet/ExampleCesiumLanguageServer/Global.asax.cs index f76946dd..eb706c77 100644 --- a/DotNet/ExampleCesiumLanguageServer/Global.asax.cs +++ b/DotNet/ExampleCesiumLanguageServer/Global.asax.cs @@ -1,13 +1,10 @@ using System; -using System.Collections.Generic; using System.Web; using System.Web.Routing; -using System.Web.Security; -using System.Web.SessionState; namespace ExampleCesiumLanguageServer { - public class Global : System.Web.HttpApplication + public class Global : HttpApplication { protected void Application_Start(object sender, EventArgs e) { diff --git a/DotNet/ExampleCesiumLanguageServer/InfoHandler.cs b/DotNet/ExampleCesiumLanguageServer/InfoHandler.cs index e5564950..fcbfcc55 100644 --- a/DotNet/ExampleCesiumLanguageServer/InfoHandler.cs +++ b/DotNet/ExampleCesiumLanguageServer/InfoHandler.cs @@ -1,5 +1,4 @@ -using System; -using System.Drawing; +using System.Drawing; using System.IO; using System.Web; using System.Web.Routing; @@ -31,12 +30,13 @@ public void ProcessRequest(HttpContext context) using (var outputStream = new StreamWriter(context.Response.OutputStream)) { var cesiumWriter = new CesiumStreamWriter(); - var output = new CesiumOutputStream(outputStream); - - // Since this is a demo, turning on PrettyFormatting makes the response easier to view - // with web browser developer tools. It just adds whitespace and newlines to the response, - // so production environments would typically leave this turned off. - output.PrettyFormatting = true; + var output = new CesiumOutputStream(outputStream) + { + // Since this is a demo, turning on PrettyFormatting makes the response easier to view + // with web browser developer tools. It just adds whitespace and newlines to the response, + // so production environments would typically leave this turned off. + PrettyFormatting = true + }; // The whole body of CZML must be wrapped in a JSON array, opened here. output.WriteStartSequence(); @@ -75,11 +75,18 @@ public void ProcessRequest(HttpContext context) // Click any dot in Cesium Viewer to read its description. using (var description = entity.OpenDescriptionProperty()) { - description.WriteString( - "" + - "" + - "" + - "
Longitude" + lon.ToString("0") + " degrees
Latitude" + lat.ToString("0") + " degrees
"); + description.WriteString($@" + + + + + + + + + + +
Longitude{lon:0} degrees
Latitude{lat:0} degrees
"); } } } @@ -90,11 +97,8 @@ public void ProcessRequest(HttpContext context) } } - public bool IsReusable - { - // Return false if your handler cannot be reused for another request, true if it can. - get { return true; } - } + // Return false if your handler cannot be reused for another request, true if it can. + public bool IsReusable => true; /// /// Gets the IHttpHandler for this route, which is always "this" because this class @@ -108,4 +112,4 @@ public IHttpHandler GetHttpHandler(RequestContext requestContext) return this; } } -} +} \ No newline at end of file diff --git a/DotNet/ExampleCesiumLanguageServer/Properties/AssemblyInfo.cs b/DotNet/ExampleCesiumLanguageServer/Properties/AssemblyInfo.cs index aa5d7fa9..a912e8be 100644 --- a/DotNet/ExampleCesiumLanguageServer/Properties/AssemblyInfo.cs +++ b/DotNet/ExampleCesiumLanguageServer/Properties/AssemblyInfo.cs @@ -6,11 +6,11 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("ExampleCesiumLanguageServer")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("A sample web application demonstrating writing CZML content and loading it in Cesium.")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Analytical Graphics, Inc.")] [assembly: AssemblyProduct("ExampleCesiumLanguageServer")] -[assembly: AssemblyCopyright("Copyright © 2014 Cesium Contributors")] +[assembly: AssemblyCopyright("Copyright © 2014-2017 Cesium Contributors")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/DotNet/ExampleCesiumLanguageServer/index.html b/DotNet/ExampleCesiumLanguageServer/index.html index fac998bd..0c16b44b 100644 --- a/DotNet/ExampleCesiumLanguageServer/index.html +++ b/DotNet/ExampleCesiumLanguageServer/index.html @@ -11,9 +11,9 @@ Example page for server-side CZML generation - - - + + +