Skip to content

Commit

Permalink
Merge pull request #128 from AnalyticalGraphicsInc/nuget
Browse files Browse the repository at this point in the history 
Add NuGet package creation to project.
  • Loading branch information
@shunter
shunter authored Jan 17, 2017
2 parents aa226a3 + 59d7fdc commit 35b5166
Show file tree
Hide file tree
Showing 15 changed files with 134 additions and 69 deletions.
3 changes: 1 addition & 2 deletions DotNet/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ bin
obj
/packages/
/.vs/
!ThirdParty/**/bin/
ThirdParty/LoadDBF/bin/
_ReSharper.*
*.nupkg
*.suo
*.DotSettings.user
*.userprefs
Expand Down
49 changes: 49 additions & 0 deletions DotNet/CesiumLanguageWriter.sln.DotSettings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CommonFormatter/USE_INDENTS_FROM_MAIN_LANGUAGE_IN_FILE/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_FIRST_ARG_BY_PAREN/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARGUMENT/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_FOR_STMT/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_NAMESPACE/@EntryValue">0</s:Int64>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE/@EntryValue">1</s:Int64>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_LINQ_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SIMPLE_EMBEDDED_STATEMENT_STYLE/@EntryValue">LINE_BREAK</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_EXTENDS_COLON/@EntryValue">True</s:Boolean>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">150</s:Int64>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Interfaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Locals/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=MethodPropertyEvent/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Other/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Parameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="m_" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="s_" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="s_" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>

</wpf:ResourceDictionary>
5 changes: 4 additions & 1 deletion DotNet/CesiumLanguageWriter/CesiumLanguageWriter.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<AssemblyName>CesiumLanguageWriter</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\StrongNameKey.snk</AssemblyOriginatorKeyFile>
<LangVersion>3</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -30,7 +33,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\CesiumLanguageWriter.xml</DocumentationFile>
<LangVersion>3</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="JetBrains.Annotations, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
Expand Down Expand Up @@ -338,6 +340,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="CesiumLanguageWriter.nuspec" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
17 changes: 17 additions & 0 deletions DotNet/CesiumLanguageWriter/CesiumLanguageWriter.nuspec
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>$id$</id>
<version>$version$</version>
<title>$title$</title>
<authors>$author$</authors>
<owners>$author$</owners>
<licenseUrl>https://github.com/AnalyticalGraphicsInc/czml-writer/blob/master/DotNet/LICENSE.md</licenseUrl>
<projectUrl>https://github.com/AnalyticalGraphicsInc/czml-writer</projectUrl>
<iconUrl>https://raw.githubusercontent.com/AnalyticalGraphicsInc/cesium/master/favicon.ico</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description$</description>
<copyright>$copyright$</copyright>
<tags>Cesium CZML</tags>
</metadata>
</package>
15 changes: 6 additions & 9 deletions DotNet/CesiumLanguageWriter/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]

Expand All @@ -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")]
2 changes: 1 addition & 1 deletion DotNet/CesiumLanguageWriter/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="JetBrains.Annotations" version="10.2.1" targetFramework="net40" />
<package id="JetBrains.Annotations" version="10.2.1" targetFramework="net40" developmentDependency="true" />
</packages>
4 changes: 3 additions & 1 deletion DotNet/CesiumLanguageWriterTests/CesiumLanguageWriterTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<AssemblyName>CesiumLanguageWriterTests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\StrongNameKey.snk</AssemblyOriginatorKeyFile>
<LangVersion>3</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -28,7 +31,6 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>3</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
Expand Down
9 changes: 5 additions & 4 deletions DotNet/ExampleCesiumLanguageServer/ExampleCesiumLanguageServer.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>
</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1F1824FB-14DA-4666-BF30-5E9593D0DECD}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ExampleCesiumLanguageServer</RootNamespace>
<AssemblyName>ExampleCesiumLanguageServer</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\StrongNameKey.snk</AssemblyOriginatorKeyFile>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
5 changes: 1 addition & 4 deletions DotNet/ExampleCesiumLanguageServer/Global.asax.cs
View file
Original file line number Diff line number Diff line change
@@ -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)
{
Expand Down
42 changes: 23 additions & 19 deletions DotNet/ExampleCesiumLanguageServer/InfoHandler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Drawing;
using System.Drawing;
using System.IO;
using System.Web;
using System.Web.Routing;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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(
"<table class=\"cesium-infoBox-defaultTable\"><tbody>" +
"<tr><td>Longitude</td><td>" + lon.ToString("0") + " degrees</td></tr>" +
"<tr><td>Latitude</td><td>" + lat.ToString("0") + " degrees</td></tr>" +
"</tbody></table>");
description.WriteString($@"
<table class=""cesium-infoBox-defaultTable"">
<tbody>
<tr>
<td>Longitude</td>
<td>{lon:0} degrees</td>
</tr>
<tr>
<td>Latitude</td>
<td>{lat:0} degrees</td>
</tr>
</tbody></table>");
}
}
}
Expand All @@ -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;

/// <summary>
/// Gets the IHttpHandler for this route, which is always "this" because this class
Expand All @@ -108,4 +112,4 @@ public IHttpHandler GetHttpHandler(RequestContext requestContext)
return this;
}
}
}
}
6 changes: 3 additions & 3 deletions DotNet/ExampleCesiumLanguageServer/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]

Expand Down
19 changes: 6 additions & 13 deletions DotNet/ExampleCesiumLanguageServer/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<title>Example page for server-side CZML generation</title>

<!-- For debugging client-side code, use the "Unminified" Cesium.js. -->
<script src="http://cesiumjs.org/releases/1.2/Cesium.js"></script>
<!-- <script src="http://cesiumjs.org/releases/1.2/Unminified/Cesium.js"></script> -->
<link rel="stylesheet" href="http://cesiumjs.org/releases/1.2/Widgets/widgets.css" />
<script src="http://cesiumjs.org/releases/1.29/Cesium.js"></script>
<!-- <script src="http://cesiumjs.org/releases/1.29/Unminified/Cesium.js"></script> -->
<link rel="stylesheet" href="http://cesiumjs.org/releases/1.29/Widgets/widgets.css" />
<style>
body, #viewerContainer {
position: absolute;
Expand All @@ -27,6 +27,7 @@
color: #fff;
font-family: sans-serif;
}

#message {
position: absolute;
top: 5px;
Expand Down Expand Up @@ -54,18 +55,10 @@

// The following line creates the Cesium viewer with all the default widgets on it.
var viewer = window.viewer = new Cesium.Viewer('viewerContainer');
// CZML entity visualization happens in a mixin for the viewer, applied here.
viewer.extend(Cesium.viewerEntityMixin);

// Create an empty CzmlDataSource (with an ID of 'info') that will hold CZML data once returned from the server.
var dataSource = new Cesium.CzmlDataSource('info');
// Add the empty dataSource to the viewer.
viewer.dataSources.add(dataSource);

// Request that the dataSource populate itself asynchronously with data from URL path 'info'.
// This requires that our server will be able to handle HTTP requests such as 'GET /info', which
// Create and load a CzmlDataSource with CZML data from the server, from URL 'info', which
// is a route that we register in Global.asax.cs.
dataSource.loadUrl('info');
viewer.dataSources.add(Cesium.CzmlDataSource.load('info'));

</script>
</body>
Expand Down
Loading

0 comments on commit 35b5166

Please sign in to comment.