diff --git a/DotNet/CesiumLanguageWriter.sln b/DotNet/CesiumLanguageWriter.sln index abbc4a6b..d20fd8d0 100644 --- a/DotNet/CesiumLanguageWriter.sln +++ b/DotNet/CesiumLanguageWriter.sln @@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schema", "Schema", "{04E49F ..\Schema\Box.json = ..\Schema\Box.json ..\Schema\BoxDimensions.json = ..\Schema\BoxDimensions.json ..\Schema\CheckerboardMaterial.json = ..\Schema\CheckerboardMaterial.json + ..\Schema\ClassificationType.json = ..\Schema\ClassificationType.json ..\Schema\Clock.json = ..\Schema\Clock.json ..\Schema\Color.json = ..\Schema\Color.json ..\Schema\ColorBlendMode.json = ..\Schema\ColorBlendMode.json @@ -167,6 +168,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ValueProperties", "ValuePro ..\Schema\ValueProperties\CartographicRadiansValueProperty.json = ..\Schema\ValueProperties\CartographicRadiansValueProperty.json ..\Schema\ValueProperties\CartographicRectangleDegreesValueProperty.json = ..\Schema\ValueProperties\CartographicRectangleDegreesValueProperty.json ..\Schema\ValueProperties\CartographicRectangleRadiansValueProperty.json = ..\Schema\ValueProperties\CartographicRectangleRadiansValueProperty.json + ..\Schema\ValueProperties\ClassificationTypeValueProperty.json = ..\Schema\ValueProperties\ClassificationTypeValueProperty.json ..\Schema\ValueProperties\ColorBlendModeValueProperty.json = ..\Schema\ValueProperties\ColorBlendModeValueProperty.json ..\Schema\ValueProperties\CornerTypeValueProperty.json = ..\Schema\ValueProperties\CornerTypeValueProperty.json ..\Schema\ValueProperties\DistanceDisplayConditionValueProperty.json = ..\Schema\ValueProperties\DistanceDisplayConditionValueProperty.json @@ -212,6 +214,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Values", "Values", "{A9C205 ..\Schema\Values\CartographicRadiansValue.json = ..\Schema\Values\CartographicRadiansValue.json ..\Schema\Values\CartographicRectangleDegreesValue.json = ..\Schema\Values\CartographicRectangleDegreesValue.json ..\Schema\Values\CartographicRectangleRadiansValue.json = ..\Schema\Values\CartographicRectangleRadiansValue.json + ..\Schema\Values\ClassificationTypeValue.json = ..\Schema\Values\ClassificationTypeValue.json ..\Schema\Values\ClockRangeValue.json = ..\Schema\Values\ClockRangeValue.json ..\Schema\Values\ClockStepValue.json = ..\Schema\Values\ClockStepValue.json ..\Schema\Values\ColorBlendModeValue.json = ..\Schema\Values\ColorBlendModeValue.json diff --git a/DotNet/CesiumLanguageWriter/Advanced/CesiumClassificationTypeValuePropertyAdaptor.cs b/DotNet/CesiumLanguageWriter/Advanced/CesiumClassificationTypeValuePropertyAdaptor.cs new file mode 100644 index 00000000..e482d74f --- /dev/null +++ b/DotNet/CesiumLanguageWriter/Advanced/CesiumClassificationTypeValuePropertyAdaptor.cs @@ -0,0 +1,26 @@ +using JetBrains.Annotations; + +namespace CesiumLanguageWriter.Advanced +{ + /// + /// Adapts a class that implements to implement + /// for values. + /// + /// The class that implements to adapt. + public class CesiumClassificationTypeValuePropertyAdaptor : CesiumWriterAdaptor + where TFrom : class, ICesiumClassificationTypeValuePropertyWriter + { + /// + /// Initializes a new instance. + /// + /// The instance to wrap. + /// The callback to write values of type . + /// The callback to write an indication that the client should delete existing data. + public CesiumClassificationTypeValuePropertyAdaptor([NotNull] TFrom parent, + [NotNull] CesiumWriterAdaptorWriteCallback writeValueCallback, + [NotNull] CesiumWriterAdaptorWriteDeleteCallback writeDeleteValueCallback) + : base(parent, writeValueCallback, writeDeleteValueCallback) + { + } + } +} \ No newline at end of file diff --git a/DotNet/CesiumLanguageWriter/Advanced/CesiumFormattingHelper.cs b/DotNet/CesiumLanguageWriter/Advanced/CesiumFormattingHelper.cs index 5dccd3ab..fbf78ade 100644 --- a/DotNet/CesiumLanguageWriter/Advanced/CesiumFormattingHelper.cs +++ b/DotNet/CesiumLanguageWriter/Advanced/CesiumFormattingHelper.cs @@ -468,6 +468,27 @@ public static string CornerTypeToString(CesiumCornerType value) } } + /// + /// Converts a to the corresponding string in a CZML stream. + /// + /// The value to convert. + /// The string representing the specified value. + [NotNull] + public static string ClassificationTypeToString(CesiumClassificationType value) + { + switch (value) + { + case CesiumClassificationType.Terrain: + return "TERRAIN"; + case CesiumClassificationType.Cesium3DTile: + return "CESIUM_3D_TILE"; + case CesiumClassificationType.Both: + return "BOTH"; + default: + throw new ArgumentException(CesiumLocalization.UnknownEnumerationValue, "value"); + } + } + /// /// Converts a to the corresponding string in a CZML stream. /// diff --git a/DotNet/CesiumLanguageWriter/Advanced/CesiumValuePropertyAdaptors.cs b/DotNet/CesiumLanguageWriter/Advanced/CesiumValuePropertyAdaptors.cs index b793bc35..6523bb30 100644 --- a/DotNet/CesiumLanguageWriter/Advanced/CesiumValuePropertyAdaptors.cs +++ b/DotNet/CesiumLanguageWriter/Advanced/CesiumValuePropertyAdaptors.cs @@ -170,6 +170,18 @@ public static CesiumCartographicRectangleDegreesValuePropertyAdaptor Crea return new CesiumCartographicRectangleDegreesValuePropertyAdaptor(parent, (writer, value) => writer.WriteWsenDegrees(value), (writer, dates, values, startIndex, length) => writer.WriteWsenDegrees(dates, values, startIndex, length), CreateWriteDeleteCallback()); } + /// + /// Create an adaptor for values. + /// + /// The class that implements to adapt. + /// The instance to wrap. + /// The new adaptor. + public static CesiumClassificationTypeValuePropertyAdaptor CreateClassificationType([NotNull] TFrom parent) + where TFrom : class, ICesiumClassificationTypeValuePropertyWriter, ICesiumDeletablePropertyWriter + { + return new CesiumClassificationTypeValuePropertyAdaptor(parent, (writer, value) => writer.WriteClassificationType(value), CreateWriteDeleteCallback()); + } + /// /// Create an adaptor for values. /// diff --git a/DotNet/CesiumLanguageWriter/Advanced/ICesiumClassificationTypeValuePropertyWriter.cs b/DotNet/CesiumLanguageWriter/Advanced/ICesiumClassificationTypeValuePropertyWriter.cs new file mode 100644 index 00000000..0ff9273e --- /dev/null +++ b/DotNet/CesiumLanguageWriter/Advanced/ICesiumClassificationTypeValuePropertyWriter.cs @@ -0,0 +1,14 @@ +namespace CesiumLanguageWriter.Advanced +{ + /// + /// A writer that can write a value as a classification type. + /// + public interface ICesiumClassificationTypeValuePropertyWriter : ICesiumPropertyWriter + { + /// + /// Writes the value expressed as a classification type. + /// + /// The classification type. + void WriteClassificationType(CesiumClassificationType value); + } +} \ No newline at end of file diff --git a/DotNet/CesiumLanguageWriter/CesiumClassificationType.cs b/DotNet/CesiumLanguageWriter/CesiumClassificationType.cs new file mode 100644 index 00000000..aa806586 --- /dev/null +++ b/DotNet/CesiumLanguageWriter/CesiumClassificationType.cs @@ -0,0 +1,23 @@ +namespace CesiumLanguageWriter +{ + /// + /// Whether a classification affects terrain, 3D Tiles or both. + /// + public enum CesiumClassificationType + { + /// + /// Only terrain will be classified. + /// + Terrain, + + /// + /// Only 3D Tiles will be classified. + /// + Cesium3DTile, + + /// + /// Both terrain and 3D Tiles will be classified. + /// + Both, + } +} \ No newline at end of file diff --git a/DotNet/CesiumLanguageWriter/CesiumLanguageWriter.csproj b/DotNet/CesiumLanguageWriter/CesiumLanguageWriter.csproj index a88a10c6..080bc250 100644 --- a/DotNet/CesiumLanguageWriter/CesiumLanguageWriter.csproj +++ b/DotNet/CesiumLanguageWriter/CesiumLanguageWriter.csproj @@ -58,6 +58,7 @@ + @@ -111,6 +112,7 @@ + @@ -162,6 +164,7 @@ + @@ -205,6 +208,7 @@ Code + Code diff --git a/DotNet/CesiumLanguageWriter/Generated/BoxCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/BoxCesiumWriter.cs index 1f6a3844..a566953c 100644 --- a/DotNet/CesiumLanguageWriter/Generated/BoxCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/BoxCesiumWriter.cs @@ -26,6 +26,11 @@ public class BoxCesiumWriter : CesiumPropertyWriter /// public const string DimensionsPropertyName = "dimensions"; + /// + /// The name of the heightReference property. + /// + public const string HeightReferencePropertyName = "heightReference"; + /// /// The name of the fill property. /// @@ -63,6 +68,7 @@ public class BoxCesiumWriter : CesiumPropertyWriter private readonly Lazy m_show = new Lazy(() => new BooleanCesiumWriter(ShowPropertyName), false); private readonly Lazy m_dimensions = new Lazy(() => new BoxDimensionsCesiumWriter(DimensionsPropertyName), false); + private readonly Lazy m_heightReference = new Lazy(() => new HeightReferenceCesiumWriter(HeightReferencePropertyName), false); private readonly Lazy m_fill = new Lazy(() => new BooleanCesiumWriter(FillPropertyName), false); private readonly Lazy m_material = new Lazy(() => new MaterialCesiumWriter(MaterialPropertyName), false); private readonly Lazy m_outline = new Lazy(() => new BooleanCesiumWriter(OutlinePropertyName), false); @@ -285,6 +291,87 @@ public void WriteDimensionsPropertyReference(string identifier, string[] propert } } + /// + /// Gets the writer for the heightReference property. The returned instance must be opened by calling the method before it can be used for writing. The heightReference property defines the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + [NotNull] + public HeightReferenceCesiumWriter HeightReferenceWriter + { + get { return m_heightReference.Value; } + } + + /// + /// Opens and returns the writer for the heightReference property. The heightReference property defines the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + [NotNull] + public HeightReferenceCesiumWriter OpenHeightReferenceProperty() + { + OpenIntervalIfNecessary(); + return OpenAndReturn(HeightReferenceWriter); + } + + /// + /// Writes a value for the heightReference property as a heightReference value. The heightReference property specifies the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The height reference. + public void WriteHeightReferenceProperty(CesiumHeightReference value) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteHeightReference(value); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The reference. + public void WriteHeightReferencePropertyReference(Reference value) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The reference. + public void WriteHeightReferencePropertyReference(string value) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The identifier of the object which contains the referenced property. + /// The property on the referenced object. + public void WriteHeightReferencePropertyReference(string identifier, string propertyName) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(identifier, propertyName); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The identifier of the object which contains the referenced property. + /// The hierarchy of properties to be indexed on the referenced object. + public void WriteHeightReferencePropertyReference(string identifier, string[] propertyNames) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(identifier, propertyNames); + } + } + /// /// Gets the writer for the fill property. The returned instance must be opened by calling the method before it can be used for writing. The fill property defines whether or not the box is filled. If not specified, the default value is . /// diff --git a/DotNet/CesiumLanguageWriter/Generated/ClassificationTypeCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/ClassificationTypeCesiumWriter.cs new file mode 100644 index 00000000..8bcd4bb9 --- /dev/null +++ b/DotNet/CesiumLanguageWriter/Generated/ClassificationTypeCesiumWriter.cs @@ -0,0 +1,182 @@ +// +// This file was generated automatically by GenerateFromSchema. Do NOT edit it. +// https://github.com/AnalyticalGraphicsInc/czml-writer +// + +using CesiumLanguageWriter.Advanced; +using System; +using JetBrains.Annotations; + +namespace CesiumLanguageWriter +{ + /// + /// Writes a ClassificationType to a . A ClassificationType is whether a classification affects terrain, 3D Tiles or both. + /// + public class ClassificationTypeCesiumWriter : CesiumPropertyWriter, ICesiumDeletablePropertyWriter, ICesiumClassificationTypeValuePropertyWriter, ICesiumReferenceValuePropertyWriter + { + /// + /// The name of the classificationType property. + /// + public const string ClassificationTypePropertyName = "classificationType"; + + /// + /// The name of the reference property. + /// + public const string ReferencePropertyName = "reference"; + + /// + /// The name of the delete property. + /// + public const string DeletePropertyName = "delete"; + + private readonly Lazy> m_asClassificationType; + private readonly Lazy> m_asReference; + + /// + /// Initializes a new instance. + /// + /// The name of the property. + public ClassificationTypeCesiumWriter([NotNull] string propertyName) + : base(propertyName) + { + m_asClassificationType = CreateAsClassificationType(); + m_asReference = CreateAsReference(); + } + + /// + /// Initializes a new instance as a copy of an existing instance. + /// + /// The existing instance to copy. + protected ClassificationTypeCesiumWriter([NotNull] ClassificationTypeCesiumWriter existingInstance) + : base(existingInstance) + { + m_asClassificationType = CreateAsClassificationType(); + m_asReference = CreateAsReference(); + } + + /// + public override ClassificationTypeCesiumWriter Clone() + { + return new ClassificationTypeCesiumWriter(this); + } + + /// + /// Writes the value expressed as a classificationType, which is the classification type, which indicates whether a classification affects terrain, 3D Tiles or both. + /// + /// The classification type. + public void WriteClassificationType(CesiumClassificationType value) + { + const string PropertyName = ClassificationTypePropertyName; + if (ForceInterval) + { + OpenIntervalIfNecessary(); + } + if (IsInterval) + { + Output.WritePropertyName(PropertyName); + } + Output.WriteValue(CesiumFormattingHelper.ClassificationTypeToString(value)); + } + + /// + /// Writes the value expressed as a reference, which is the classification type specified as a reference to another property. + /// + /// The reference. + public void WriteReference(Reference value) + { + const string PropertyName = ReferencePropertyName; + OpenIntervalIfNecessary(); + Output.WritePropertyName(PropertyName); + CesiumWritingHelper.WriteReference(Output, value); + } + + /// + /// Writes the value expressed as a reference, which is the classification type specified as a reference to another property. + /// + /// The reference. + public void WriteReference(string value) + { + const string PropertyName = ReferencePropertyName; + OpenIntervalIfNecessary(); + Output.WritePropertyName(PropertyName); + CesiumWritingHelper.WriteReference(Output, value); + } + + /// + /// Writes the value expressed as a reference, which is the classification type specified as a reference to another property. + /// + /// The identifier of the object which contains the referenced property. + /// The property on the referenced object. + public void WriteReference(string identifier, string propertyName) + { + const string PropertyName = ReferencePropertyName; + OpenIntervalIfNecessary(); + Output.WritePropertyName(PropertyName); + CesiumWritingHelper.WriteReference(Output, identifier, propertyName); + } + + /// + /// Writes the value expressed as a reference, which is the classification type specified as a reference to another property. + /// + /// The identifier of the object which contains the referenced property. + /// The hierarchy of properties to be indexed on the referenced object. + public void WriteReference(string identifier, string[] propertyNames) + { + const string PropertyName = ReferencePropertyName; + OpenIntervalIfNecessary(); + Output.WritePropertyName(PropertyName); + CesiumWritingHelper.WriteReference(Output, identifier, propertyNames); + } + + /// + /// Writes the value expressed as a delete, which is whether the client should delete existing samples or interval data for this property. Data will be deleted for the containing interval, or if there is no containing interval, then all data. If true, all other properties in this property will be ignored. + /// + /// The value. + public void WriteDelete(bool value) + { + const string PropertyName = DeletePropertyName; + OpenIntervalIfNecessary(); + Output.WritePropertyName(PropertyName); + Output.WriteValue(value); + } + + /// + /// Returns a wrapper for this instance that implements . Because the returned instance is a wrapper for this instance, you may call on either this instance or the wrapper, but you must not call it on both. + /// + /// The wrapper. + public CesiumClassificationTypeValuePropertyAdaptor AsClassificationType() + { + return m_asClassificationType.Value; + } + + private Lazy> CreateAsClassificationType() + { + return new Lazy>(CreateClassificationType, false); + } + + private CesiumClassificationTypeValuePropertyAdaptor CreateClassificationType() + { + return CesiumValuePropertyAdaptors.CreateClassificationType(this); + } + + /// + /// Returns a wrapper for this instance that implements . Because the returned instance is a wrapper for this instance, you may call on either this instance or the wrapper, but you must not call it on both. + /// + /// The wrapper. + public CesiumReferenceValuePropertyAdaptor AsReference() + { + return m_asReference.Value; + } + + private Lazy> CreateAsReference() + { + return new Lazy>(CreateReference, false); + } + + private CesiumReferenceValuePropertyAdaptor CreateReference() + { + return CesiumValuePropertyAdaptors.CreateReference(this); + } + + } +} diff --git a/DotNet/CesiumLanguageWriter/Generated/CorridorCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/CorridorCesiumWriter.cs index 3ca8c008..4fa78f4e 100644 --- a/DotNet/CesiumLanguageWriter/Generated/CorridorCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/CorridorCesiumWriter.cs @@ -37,14 +37,14 @@ public class CorridorCesiumWriter : CesiumPropertyWriter public const string HeightPropertyName = "height"; /// - /// The name of the extrudedHeight property. + /// The name of the heightReference property. /// - public const string ExtrudedHeightPropertyName = "extrudedHeight"; + public const string HeightReferencePropertyName = "heightReference"; /// - /// The name of the heightReference property. + /// The name of the extrudedHeight property. /// - public const string HeightReferencePropertyName = "heightReference"; + public const string ExtrudedHeightPropertyName = "extrudedHeight"; /// /// The name of the extrudedHeightReference property. @@ -96,6 +96,11 @@ public class CorridorCesiumWriter : CesiumPropertyWriter /// public const string DistanceDisplayConditionPropertyName = "distanceDisplayCondition"; + /// + /// The name of the classificationType property. + /// + public const string ClassificationTypePropertyName = "classificationType"; + /// /// The name of the zIndex property. /// @@ -105,8 +110,8 @@ public class CorridorCesiumWriter : CesiumPropertyWriter private readonly Lazy m_positions = new Lazy(() => new PositionListCesiumWriter(PositionsPropertyName), false); private readonly Lazy m_width = new Lazy(() => new DoubleCesiumWriter(WidthPropertyName), false); private readonly Lazy m_height = new Lazy(() => new DoubleCesiumWriter(HeightPropertyName), false); - private readonly Lazy m_extrudedHeight = new Lazy(() => new DoubleCesiumWriter(ExtrudedHeightPropertyName), false); private readonly Lazy m_heightReference = new Lazy(() => new HeightReferenceCesiumWriter(HeightReferencePropertyName), false); + private readonly Lazy m_extrudedHeight = new Lazy(() => new DoubleCesiumWriter(ExtrudedHeightPropertyName), false); private readonly Lazy m_extrudedHeightReference = new Lazy(() => new HeightReferenceCesiumWriter(ExtrudedHeightReferencePropertyName), false); private readonly Lazy m_cornerType = new Lazy(() => new CornerTypeCesiumWriter(CornerTypePropertyName), false); private readonly Lazy m_granularity = new Lazy(() => new DoubleCesiumWriter(GranularityPropertyName), false); @@ -117,6 +122,7 @@ public class CorridorCesiumWriter : CesiumPropertyWriter private readonly Lazy m_outlineWidth = new Lazy(() => new DoubleCesiumWriter(OutlineWidthPropertyName), false); private readonly Lazy m_shadows = new Lazy(() => new ShadowModeCesiumWriter(ShadowsPropertyName), false); private readonly Lazy m_distanceDisplayCondition = new Lazy(() => new DistanceDisplayConditionCesiumWriter(DistanceDisplayConditionPropertyName), false); + private readonly Lazy m_classificationType = new Lazy(() => new ClassificationTypeCesiumWriter(ClassificationTypePropertyName), false); private readonly Lazy m_zIndex = new Lazy(() => new IntegerCesiumWriter(ZIndexPropertyName), false); /// @@ -510,190 +516,190 @@ public void WriteHeightPropertyReference(string identifier, string[] propertyNam } /// - /// Gets the writer for the extrudedHeight property. The returned instance must be opened by calling the method before it can be used for writing. The extrudedHeight property defines the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + /// Gets the writer for the heightReference property. The returned instance must be opened by calling the method before it can be used for writing. The heightReference property defines the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// [NotNull] - public DoubleCesiumWriter ExtrudedHeightWriter + public HeightReferenceCesiumWriter HeightReferenceWriter { - get { return m_extrudedHeight.Value; } + get { return m_heightReference.Value; } } /// - /// Opens and returns the writer for the extrudedHeight property. The extrudedHeight property defines the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + /// Opens and returns the writer for the heightReference property. The heightReference property defines the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// [NotNull] - public DoubleCesiumWriter OpenExtrudedHeightProperty() + public HeightReferenceCesiumWriter OpenHeightReferenceProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(ExtrudedHeightWriter); - } - - /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. - /// - /// The value. - public void WriteExtrudedHeightProperty(double value) - { - using (var writer = OpenExtrudedHeightProperty()) - { - writer.WriteNumber(value); - } - } - - /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. - /// - /// The dates at which the value is specified. - /// The values corresponding to each date. - public void WriteExtrudedHeightProperty(IList dates, IList values) - { - using (var writer = OpenExtrudedHeightProperty()) - { - writer.WriteNumber(dates, values); - } + return OpenAndReturn(HeightReferenceWriter); } /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + /// Writes a value for the heightReference property as a heightReference value. The heightReference property specifies the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// - /// The dates at which the value is specified. - /// The value corresponding to each date. - /// The index of the first element to write. - /// The number of elements to write. - public void WriteExtrudedHeightProperty(IList dates, IList values, int startIndex, int length) + /// The height reference. + public void WriteHeightReferenceProperty(CesiumHeightReference value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { - writer.WriteNumber(dates, values, startIndex, length); + writer.WriteHeightReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The reference. - public void WriteExtrudedHeightPropertyReference(Reference value) + public void WriteHeightReferencePropertyReference(Reference value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The reference. - public void WriteExtrudedHeightPropertyReference(string value) + public void WriteHeightReferencePropertyReference(string value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteExtrudedHeightPropertyReference(string identifier, string propertyName) + public void WriteHeightReferencePropertyReference(string identifier, string propertyName) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteExtrudedHeightPropertyReference(string identifier, string[] propertyNames) + public void WriteHeightReferencePropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(identifier, propertyNames); } } /// - /// Gets the writer for the heightReference property. The returned instance must be opened by calling the method before it can be used for writing. The heightReference property defines the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Gets the writer for the extrudedHeight property. The returned instance must be opened by calling the method before it can be used for writing. The extrudedHeight property defines the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. /// [NotNull] - public HeightReferenceCesiumWriter HeightReferenceWriter + public DoubleCesiumWriter ExtrudedHeightWriter { - get { return m_heightReference.Value; } + get { return m_extrudedHeight.Value; } } /// - /// Opens and returns the writer for the heightReference property. The heightReference property defines the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Opens and returns the writer for the extrudedHeight property. The extrudedHeight property defines the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. /// [NotNull] - public HeightReferenceCesiumWriter OpenHeightReferenceProperty() + public DoubleCesiumWriter OpenExtrudedHeightProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(HeightReferenceWriter); + return OpenAndReturn(ExtrudedHeightWriter); } /// - /// Writes a value for the heightReference property as a heightReference value. The heightReference property specifies the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. /// - /// The height reference. - public void WriteHeightReferenceProperty(CesiumHeightReference value) + /// The value. + public void WriteExtrudedHeightProperty(double value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { - writer.WriteHeightReference(value); + writer.WriteNumber(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + /// + /// The dates at which the value is specified. + /// The values corresponding to each date. + public void WriteExtrudedHeightProperty(IList dates, IList values) + { + using (var writer = OpenExtrudedHeightProperty()) + { + writer.WriteNumber(dates, values); + } + } + + /// + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + /// + /// The dates at which the value is specified. + /// The value corresponding to each date. + /// The index of the first element to write. + /// The number of elements to write. + public void WriteExtrudedHeightProperty(IList dates, IList values, int startIndex, int length) + { + using (var writer = OpenExtrudedHeightProperty()) + { + writer.WriteNumber(dates, values, startIndex, length); + } + } + + /// + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. /// /// The reference. - public void WriteHeightReferencePropertyReference(Reference value) + public void WriteExtrudedHeightPropertyReference(Reference value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. /// /// The reference. - public void WriteHeightReferencePropertyReference(string value) + public void WriteExtrudedHeightPropertyReference(string value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteHeightReferencePropertyReference(string identifier, string propertyName) + public void WriteExtrudedHeightPropertyReference(string identifier, string propertyName) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the corridor, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteHeightReferencePropertyReference(string identifier, string[] propertyNames) + public void WriteExtrudedHeightPropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(identifier, propertyNames); } @@ -1642,6 +1648,87 @@ public void WriteDistanceDisplayConditionPropertyReference(string identifier, st } } + /// + /// Gets the writer for the classificationType property. The returned instance must be opened by calling the method before it can be used for writing. The classificationType property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + [NotNull] + public ClassificationTypeCesiumWriter ClassificationTypeWriter + { + get { return m_classificationType.Value; } + } + + /// + /// Opens and returns the writer for the classificationType property. The classificationType property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + [NotNull] + public ClassificationTypeCesiumWriter OpenClassificationTypeProperty() + { + OpenIntervalIfNecessary(); + return OpenAndReturn(ClassificationTypeWriter); + } + + /// + /// Writes a value for the classificationType property as a classificationType value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The classification type. + public void WriteClassificationTypeProperty(CesiumClassificationType value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteClassificationType(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The reference. + public void WriteClassificationTypePropertyReference(Reference value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The reference. + public void WriteClassificationTypePropertyReference(string value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The identifier of the object which contains the referenced property. + /// The property on the referenced object. + public void WriteClassificationTypePropertyReference(string identifier, string propertyName) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(identifier, propertyName); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The identifier of the object which contains the referenced property. + /// The hierarchy of properties to be indexed on the referenced object. + public void WriteClassificationTypePropertyReference(string identifier, string[] propertyNames) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(identifier, propertyNames); + } + } + /// /// Gets the writer for the zIndex property. The returned instance must be opened by calling the method before it can be used for writing. The zIndex property defines the z-index of the corridor, used for ordering ground geometry. Only has an effect if the corridor is constant, and height and extrudedHeight are not specified. If not specified, the default value is 0. /// diff --git a/DotNet/CesiumLanguageWriter/Generated/CylinderCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/CylinderCesiumWriter.cs index 3d895abe..bfe07c88 100644 --- a/DotNet/CesiumLanguageWriter/Generated/CylinderCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/CylinderCesiumWriter.cs @@ -36,6 +36,11 @@ public class CylinderCesiumWriter : CesiumPropertyWriter /// public const string BottomRadiusPropertyName = "bottomRadius"; + /// + /// The name of the heightReference property. + /// + public const string HeightReferencePropertyName = "heightReference"; + /// /// The name of the fill property. /// @@ -85,6 +90,7 @@ public class CylinderCesiumWriter : CesiumPropertyWriter private readonly Lazy m_length = new Lazy(() => new DoubleCesiumWriter(LengthPropertyName), false); private readonly Lazy m_topRadius = new Lazy(() => new DoubleCesiumWriter(TopRadiusPropertyName), false); private readonly Lazy m_bottomRadius = new Lazy(() => new DoubleCesiumWriter(BottomRadiusPropertyName), false); + private readonly Lazy m_heightReference = new Lazy(() => new HeightReferenceCesiumWriter(HeightReferencePropertyName), false); private readonly Lazy m_fill = new Lazy(() => new BooleanCesiumWriter(FillPropertyName), false); private readonly Lazy m_material = new Lazy(() => new MaterialCesiumWriter(MaterialPropertyName), false); private readonly Lazy m_outline = new Lazy(() => new BooleanCesiumWriter(OutlinePropertyName), false); @@ -527,6 +533,87 @@ public void WriteBottomRadiusPropertyReference(string identifier, string[] prope } } + /// + /// Gets the writer for the heightReference property. The returned instance must be opened by calling the method before it can be used for writing. The heightReference property defines the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + [NotNull] + public HeightReferenceCesiumWriter HeightReferenceWriter + { + get { return m_heightReference.Value; } + } + + /// + /// Opens and returns the writer for the heightReference property. The heightReference property defines the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + [NotNull] + public HeightReferenceCesiumWriter OpenHeightReferenceProperty() + { + OpenIntervalIfNecessary(); + return OpenAndReturn(HeightReferenceWriter); + } + + /// + /// Writes a value for the heightReference property as a heightReference value. The heightReference property specifies the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The height reference. + public void WriteHeightReferenceProperty(CesiumHeightReference value) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteHeightReference(value); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The reference. + public void WriteHeightReferencePropertyReference(Reference value) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The reference. + public void WriteHeightReferencePropertyReference(string value) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The identifier of the object which contains the referenced property. + /// The property on the referenced object. + public void WriteHeightReferencePropertyReference(string identifier, string propertyName) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(identifier, propertyName); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The identifier of the object which contains the referenced property. + /// The hierarchy of properties to be indexed on the referenced object. + public void WriteHeightReferencePropertyReference(string identifier, string[] propertyNames) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(identifier, propertyNames); + } + } + /// /// Gets the writer for the fill property. The returned instance must be opened by calling the method before it can be used for writing. The fill property defines whether or not the cylinder is filled. If not specified, the default value is . /// diff --git a/DotNet/CesiumLanguageWriter/Generated/EllipseCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/EllipseCesiumWriter.cs index eadcc8b0..4ee3e569 100644 --- a/DotNet/CesiumLanguageWriter/Generated/EllipseCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/EllipseCesiumWriter.cs @@ -37,14 +37,14 @@ public class EllipseCesiumWriter : CesiumPropertyWriter public const string HeightPropertyName = "height"; /// - /// The name of the extrudedHeight property. + /// The name of the heightReference property. /// - public const string ExtrudedHeightPropertyName = "extrudedHeight"; + public const string HeightReferencePropertyName = "heightReference"; /// - /// The name of the heightReference property. + /// The name of the extrudedHeight property. /// - public const string HeightReferencePropertyName = "heightReference"; + public const string ExtrudedHeightPropertyName = "extrudedHeight"; /// /// The name of the extrudedHeightReference property. @@ -106,6 +106,11 @@ public class EllipseCesiumWriter : CesiumPropertyWriter /// public const string DistanceDisplayConditionPropertyName = "distanceDisplayCondition"; + /// + /// The name of the classificationType property. + /// + public const string ClassificationTypePropertyName = "classificationType"; + /// /// The name of the zIndex property. /// @@ -115,8 +120,8 @@ public class EllipseCesiumWriter : CesiumPropertyWriter private readonly Lazy m_semiMajorAxis = new Lazy(() => new DoubleCesiumWriter(SemiMajorAxisPropertyName), false); private readonly Lazy m_semiMinorAxis = new Lazy(() => new DoubleCesiumWriter(SemiMinorAxisPropertyName), false); private readonly Lazy m_height = new Lazy(() => new DoubleCesiumWriter(HeightPropertyName), false); - private readonly Lazy m_extrudedHeight = new Lazy(() => new DoubleCesiumWriter(ExtrudedHeightPropertyName), false); private readonly Lazy m_heightReference = new Lazy(() => new HeightReferenceCesiumWriter(HeightReferencePropertyName), false); + private readonly Lazy m_extrudedHeight = new Lazy(() => new DoubleCesiumWriter(ExtrudedHeightPropertyName), false); private readonly Lazy m_extrudedHeightReference = new Lazy(() => new HeightReferenceCesiumWriter(ExtrudedHeightReferencePropertyName), false); private readonly Lazy m_rotation = new Lazy(() => new DoubleCesiumWriter(RotationPropertyName), false); private readonly Lazy m_stRotation = new Lazy(() => new DoubleCesiumWriter(StRotationPropertyName), false); @@ -129,6 +134,7 @@ public class EllipseCesiumWriter : CesiumPropertyWriter private readonly Lazy m_numberOfVerticalLines = new Lazy(() => new IntegerCesiumWriter(NumberOfVerticalLinesPropertyName), false); private readonly Lazy m_shadows = new Lazy(() => new ShadowModeCesiumWriter(ShadowsPropertyName), false); private readonly Lazy m_distanceDisplayCondition = new Lazy(() => new DistanceDisplayConditionCesiumWriter(DistanceDisplayConditionPropertyName), false); + private readonly Lazy m_classificationType = new Lazy(() => new ClassificationTypeCesiumWriter(ClassificationTypePropertyName), false); private readonly Lazy m_zIndex = new Lazy(() => new IntegerCesiumWriter(ZIndexPropertyName), false); /// @@ -564,190 +570,190 @@ public void WriteHeightPropertyReference(string identifier, string[] propertyNam } /// - /// Gets the writer for the extrudedHeight property. The returned instance must be opened by calling the method before it can be used for writing. The extrudedHeight property defines the altitude of the ellipse's extruded face relative to the surface. + /// Gets the writer for the heightReference property. The returned instance must be opened by calling the method before it can be used for writing. The heightReference property defines the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// [NotNull] - public DoubleCesiumWriter ExtrudedHeightWriter + public HeightReferenceCesiumWriter HeightReferenceWriter { - get { return m_extrudedHeight.Value; } + get { return m_heightReference.Value; } } /// - /// Opens and returns the writer for the extrudedHeight property. The extrudedHeight property defines the altitude of the ellipse's extruded face relative to the surface. + /// Opens and returns the writer for the heightReference property. The heightReference property defines the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// [NotNull] - public DoubleCesiumWriter OpenExtrudedHeightProperty() + public HeightReferenceCesiumWriter OpenHeightReferenceProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(ExtrudedHeightWriter); - } - - /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. - /// - /// The value. - public void WriteExtrudedHeightProperty(double value) - { - using (var writer = OpenExtrudedHeightProperty()) - { - writer.WriteNumber(value); - } - } - - /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. - /// - /// The dates at which the value is specified. - /// The values corresponding to each date. - public void WriteExtrudedHeightProperty(IList dates, IList values) - { - using (var writer = OpenExtrudedHeightProperty()) - { - writer.WriteNumber(dates, values); - } + return OpenAndReturn(HeightReferenceWriter); } /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. + /// Writes a value for the heightReference property as a heightReference value. The heightReference property specifies the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// - /// The dates at which the value is specified. - /// The value corresponding to each date. - /// The index of the first element to write. - /// The number of elements to write. - public void WriteExtrudedHeightProperty(IList dates, IList values, int startIndex, int length) + /// The height reference. + public void WriteHeightReferenceProperty(CesiumHeightReference value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { - writer.WriteNumber(dates, values, startIndex, length); + writer.WriteHeightReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The reference. - public void WriteExtrudedHeightPropertyReference(Reference value) + public void WriteHeightReferencePropertyReference(Reference value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The reference. - public void WriteExtrudedHeightPropertyReference(string value) + public void WriteHeightReferencePropertyReference(string value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteExtrudedHeightPropertyReference(string identifier, string propertyName) + public void WriteHeightReferencePropertyReference(string identifier, string propertyName) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteExtrudedHeightPropertyReference(string identifier, string[] propertyNames) + public void WriteHeightReferencePropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(identifier, propertyNames); } } /// - /// Gets the writer for the heightReference property. The returned instance must be opened by calling the method before it can be used for writing. The heightReference property defines the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Gets the writer for the extrudedHeight property. The returned instance must be opened by calling the method before it can be used for writing. The extrudedHeight property defines the altitude of the ellipse's extruded face relative to the surface. /// [NotNull] - public HeightReferenceCesiumWriter HeightReferenceWriter + public DoubleCesiumWriter ExtrudedHeightWriter { - get { return m_heightReference.Value; } + get { return m_extrudedHeight.Value; } } /// - /// Opens and returns the writer for the heightReference property. The heightReference property defines the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Opens and returns the writer for the extrudedHeight property. The extrudedHeight property defines the altitude of the ellipse's extruded face relative to the surface. /// [NotNull] - public HeightReferenceCesiumWriter OpenHeightReferenceProperty() + public DoubleCesiumWriter OpenExtrudedHeightProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(HeightReferenceWriter); + return OpenAndReturn(ExtrudedHeightWriter); } /// - /// Writes a value for the heightReference property as a heightReference value. The heightReference property specifies the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. /// - /// The height reference. - public void WriteHeightReferenceProperty(CesiumHeightReference value) + /// The value. + public void WriteExtrudedHeightProperty(double value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { - writer.WriteHeightReference(value); + writer.WriteNumber(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. + /// + /// The dates at which the value is specified. + /// The values corresponding to each date. + public void WriteExtrudedHeightProperty(IList dates, IList values) + { + using (var writer = OpenExtrudedHeightProperty()) + { + writer.WriteNumber(dates, values); + } + } + + /// + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. + /// + /// The dates at which the value is specified. + /// The value corresponding to each date. + /// The index of the first element to write. + /// The number of elements to write. + public void WriteExtrudedHeightProperty(IList dates, IList values, int startIndex, int length) + { + using (var writer = OpenExtrudedHeightProperty()) + { + writer.WriteNumber(dates, values, startIndex, length); + } + } + + /// + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. /// /// The reference. - public void WriteHeightReferencePropertyReference(Reference value) + public void WriteExtrudedHeightPropertyReference(Reference value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. /// /// The reference. - public void WriteHeightReferencePropertyReference(string value) + public void WriteExtrudedHeightPropertyReference(string value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteHeightReferencePropertyReference(string identifier, string propertyName) + public void WriteExtrudedHeightPropertyReference(string identifier, string propertyName) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipse, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the altitude of the ellipse's extruded face relative to the surface. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteHeightReferencePropertyReference(string identifier, string[] propertyNames) + public void WriteExtrudedHeightPropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(identifier, propertyNames); } @@ -1942,6 +1948,87 @@ public void WriteDistanceDisplayConditionPropertyReference(string identifier, st } } + /// + /// Gets the writer for the classificationType property. The returned instance must be opened by calling the method before it can be used for writing. The classificationType property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + [NotNull] + public ClassificationTypeCesiumWriter ClassificationTypeWriter + { + get { return m_classificationType.Value; } + } + + /// + /// Opens and returns the writer for the classificationType property. The classificationType property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + [NotNull] + public ClassificationTypeCesiumWriter OpenClassificationTypeProperty() + { + OpenIntervalIfNecessary(); + return OpenAndReturn(ClassificationTypeWriter); + } + + /// + /// Writes a value for the classificationType property as a classificationType value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The classification type. + public void WriteClassificationTypeProperty(CesiumClassificationType value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteClassificationType(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The reference. + public void WriteClassificationTypePropertyReference(Reference value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The reference. + public void WriteClassificationTypePropertyReference(string value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The identifier of the object which contains the referenced property. + /// The property on the referenced object. + public void WriteClassificationTypePropertyReference(string identifier, string propertyName) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(identifier, propertyName); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The identifier of the object which contains the referenced property. + /// The hierarchy of properties to be indexed on the referenced object. + public void WriteClassificationTypePropertyReference(string identifier, string[] propertyNames) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(identifier, propertyNames); + } + } + /// /// Gets the writer for the zIndex property. The returned instance must be opened by calling the method before it can be used for writing. The zIndex property defines the z-index of the ellipse, used for ordering ground geometry. Only has an effect if the ellipse is constant, and height and extrudedHeight are not specified. If not specified, the default value is 0. /// diff --git a/DotNet/CesiumLanguageWriter/Generated/EllipsoidCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/EllipsoidCesiumWriter.cs index a9a1b9fb..8e2f68b2 100644 --- a/DotNet/CesiumLanguageWriter/Generated/EllipsoidCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/EllipsoidCesiumWriter.cs @@ -12,7 +12,7 @@ namespace CesiumLanguageWriter { /// - /// Writes a Ellipsoid to a . A Ellipsoid is a closed quadric surface that is a three dimensional analogue of an ellipse. + /// Writes a Ellipsoid to a . A Ellipsoid is a closed quadric surface that is a three-dimensional analogue of an ellipse. /// public class EllipsoidCesiumWriter : CesiumPropertyWriter { @@ -26,6 +26,11 @@ public class EllipsoidCesiumWriter : CesiumPropertyWriter /// public const string RadiiPropertyName = "radii"; + /// + /// The name of the heightReference property. + /// + public const string HeightReferencePropertyName = "heightReference"; + /// /// The name of the fill property. /// @@ -78,6 +83,7 @@ public class EllipsoidCesiumWriter : CesiumPropertyWriter private readonly Lazy m_show = new Lazy(() => new BooleanCesiumWriter(ShowPropertyName), false); private readonly Lazy m_radii = new Lazy(() => new EllipsoidRadiiCesiumWriter(RadiiPropertyName), false); + private readonly Lazy m_heightReference = new Lazy(() => new HeightReferenceCesiumWriter(HeightReferencePropertyName), false); private readonly Lazy m_fill = new Lazy(() => new BooleanCesiumWriter(FillPropertyName), false); private readonly Lazy m_material = new Lazy(() => new MaterialCesiumWriter(MaterialPropertyName), false); private readonly Lazy m_outline = new Lazy(() => new BooleanCesiumWriter(OutlinePropertyName), false); @@ -303,6 +309,87 @@ public void WriteRadiiPropertyReference(string identifier, string[] propertyName } } + /// + /// Gets the writer for the heightReference property. The returned instance must be opened by calling the method before it can be used for writing. The heightReference property defines the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + [NotNull] + public HeightReferenceCesiumWriter HeightReferenceWriter + { + get { return m_heightReference.Value; } + } + + /// + /// Opens and returns the writer for the heightReference property. The heightReference property defines the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + [NotNull] + public HeightReferenceCesiumWriter OpenHeightReferenceProperty() + { + OpenIntervalIfNecessary(); + return OpenAndReturn(HeightReferenceWriter); + } + + /// + /// Writes a value for the heightReference property as a heightReference value. The heightReference property specifies the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The height reference. + public void WriteHeightReferenceProperty(CesiumHeightReference value) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteHeightReference(value); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The reference. + public void WriteHeightReferencePropertyReference(Reference value) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The reference. + public void WriteHeightReferencePropertyReference(string value) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The identifier of the object which contains the referenced property. + /// The property on the referenced object. + public void WriteHeightReferencePropertyReference(string identifier, string propertyName) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(identifier, propertyName); + } + } + + /// + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + /// + /// The identifier of the object which contains the referenced property. + /// The hierarchy of properties to be indexed on the referenced object. + public void WriteHeightReferencePropertyReference(string identifier, string[] propertyNames) + { + using (var writer = OpenHeightReferenceProperty()) + { + writer.WriteReference(identifier, propertyNames); + } + } + /// /// Gets the writer for the fill property. The returned instance must be opened by calling the method before it can be used for writing. The fill property defines whether or not the ellipsoid is filled. If not specified, the default value is . /// diff --git a/DotNet/CesiumLanguageWriter/Generated/GridMaterialCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/GridMaterialCesiumWriter.cs index e4c9b58b..75fb5dd1 100644 --- a/DotNet/CesiumLanguageWriter/Generated/GridMaterialCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/GridMaterialCesiumWriter.cs @@ -12,7 +12,7 @@ namespace CesiumLanguageWriter { /// - /// Writes a GridMaterial to a . A GridMaterial is a material that fills the surface with a two dimensional grid. + /// Writes a GridMaterial to a . A GridMaterial is a material that fills the surface with a two-dimensional grid. /// public class GridMaterialCesiumWriter : CesiumPropertyWriter { diff --git a/DotNet/CesiumLanguageWriter/Generated/PacketCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/PacketCesiumWriter.cs index 9143c10f..833562c0 100644 --- a/DotNet/CesiumLanguageWriter/Generated/PacketCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/PacketCesiumWriter.cs @@ -1001,7 +1001,7 @@ public EllipseCesiumWriter OpenEllipseProperty() } /// - /// Gets the writer for the ellipsoid property. The returned instance must be opened by calling the method before it can be used for writing. The ellipsoid property defines an ellipsoid, which is a closed quadric surface that is a three dimensional analogue of an ellipse. The ellipsoid is positioned and oriented using the position and orientation properties. + /// Gets the writer for the ellipsoid property. The returned instance must be opened by calling the method before it can be used for writing. The ellipsoid property defines an ellipsoid, which is a closed quadric surface that is a three-dimensional analogue of an ellipse. The ellipsoid is positioned and oriented using the position and orientation properties. /// [NotNull] public EllipsoidCesiumWriter EllipsoidWriter @@ -1010,7 +1010,7 @@ public EllipsoidCesiumWriter EllipsoidWriter } /// - /// Opens and returns the writer for the ellipsoid property. The ellipsoid property defines an ellipsoid, which is a closed quadric surface that is a three dimensional analogue of an ellipse. The ellipsoid is positioned and oriented using the position and orientation properties. + /// Opens and returns the writer for the ellipsoid property. The ellipsoid property defines an ellipsoid, which is a closed quadric surface that is a three-dimensional analogue of an ellipse. The ellipsoid is positioned and oriented using the position and orientation properties. /// [NotNull] public EllipsoidCesiumWriter OpenEllipsoidProperty() @@ -1145,7 +1145,7 @@ public RectangleCesiumWriter OpenRectangleProperty() } /// - /// Gets the writer for the wall property. The returned instance must be opened by calling the method before it can be used for writing. The wall property defines a two dimensional wall which conforms to the curvature of the globe and can be placed along the surface or at altitude. + /// Gets the writer for the wall property. The returned instance must be opened by calling the method before it can be used for writing. The wall property defines a two-dimensional wall which conforms to the curvature of the globe and can be placed along the surface or at altitude. /// [NotNull] public WallCesiumWriter WallWriter @@ -1154,7 +1154,7 @@ public WallCesiumWriter WallWriter } /// - /// Opens and returns the writer for the wall property. The wall property defines a two dimensional wall which conforms to the curvature of the globe and can be placed along the surface or at altitude. + /// Opens and returns the writer for the wall property. The wall property defines a two-dimensional wall which conforms to the curvature of the globe and can be placed along the surface or at altitude. /// [NotNull] public WallCesiumWriter OpenWallProperty() diff --git a/DotNet/CesiumLanguageWriter/Generated/PathCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/PathCesiumWriter.cs index 0799f3bf..4d7ba117 100644 --- a/DotNet/CesiumLanguageWriter/Generated/PathCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/PathCesiumWriter.cs @@ -21,24 +21,24 @@ public class PathCesiumWriter : CesiumPropertyWriter public const string ShowPropertyName = "show"; /// - /// The name of the width property. + /// The name of the leadTime property. /// - public const string WidthPropertyName = "width"; + public const string LeadTimePropertyName = "leadTime"; /// - /// The name of the resolution property. + /// The name of the trailTime property. /// - public const string ResolutionPropertyName = "resolution"; + public const string TrailTimePropertyName = "trailTime"; /// - /// The name of the leadTime property. + /// The name of the width property. /// - public const string LeadTimePropertyName = "leadTime"; + public const string WidthPropertyName = "width"; /// - /// The name of the trailTime property. + /// The name of the resolution property. /// - public const string TrailTimePropertyName = "trailTime"; + public const string ResolutionPropertyName = "resolution"; /// /// The name of the material property. @@ -51,10 +51,10 @@ public class PathCesiumWriter : CesiumPropertyWriter public const string DistanceDisplayConditionPropertyName = "distanceDisplayCondition"; private readonly Lazy m_show = new Lazy(() => new BooleanCesiumWriter(ShowPropertyName), false); - private readonly Lazy m_width = new Lazy(() => new DoubleCesiumWriter(WidthPropertyName), false); - private readonly Lazy m_resolution = new Lazy(() => new DoubleCesiumWriter(ResolutionPropertyName), false); private readonly Lazy m_leadTime = new Lazy(() => new DoubleCesiumWriter(LeadTimePropertyName), false); private readonly Lazy m_trailTime = new Lazy(() => new DoubleCesiumWriter(TrailTimePropertyName), false); + private readonly Lazy m_width = new Lazy(() => new DoubleCesiumWriter(WidthPropertyName), false); + private readonly Lazy m_resolution = new Lazy(() => new DoubleCesiumWriter(ResolutionPropertyName), false); private readonly Lazy m_material = new Lazy(() => new PolylineMaterialCesiumWriter(MaterialPropertyName), false); private readonly Lazy m_distanceDisplayCondition = new Lazy(() => new DistanceDisplayConditionCesiumWriter(DistanceDisplayConditionPropertyName), false); @@ -164,436 +164,436 @@ public void WriteShowPropertyReference(string identifier, string[] propertyNames } /// - /// Gets the writer for the width property. The returned instance must be opened by calling the method before it can be used for writing. The width property defines the width of the path line. If not specified, the default value is 1.0. + /// Gets the writer for the leadTime property. The returned instance must be opened by calling the method before it can be used for writing. The leadTime property defines the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// [NotNull] - public DoubleCesiumWriter WidthWriter + public DoubleCesiumWriter LeadTimeWriter { - get { return m_width.Value; } + get { return m_leadTime.Value; } } /// - /// Opens and returns the writer for the width property. The width property defines the width of the path line. If not specified, the default value is 1.0. + /// Opens and returns the writer for the leadTime property. The leadTime property defines the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// [NotNull] - public DoubleCesiumWriter OpenWidthProperty() + public DoubleCesiumWriter OpenLeadTimeProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(WidthWriter); + return OpenAndReturn(LeadTimeWriter); } /// - /// Writes a value for the width property as a number value. The width property specifies the width of the path line. If not specified, the default value is 1.0. + /// Writes a value for the leadTime property as a number value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The value. - public void WriteWidthProperty(double value) + public void WriteLeadTimeProperty(double value) { - using (var writer = OpenWidthProperty()) + using (var writer = OpenLeadTimeProperty()) { writer.WriteNumber(value); } } /// - /// Writes a value for the width property as a number value. The width property specifies the width of the path line. If not specified, the default value is 1.0. + /// Writes a value for the leadTime property as a number value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The dates at which the value is specified. /// The values corresponding to each date. - public void WriteWidthProperty(IList dates, IList values) + public void WriteLeadTimeProperty(IList dates, IList values) { - using (var writer = OpenWidthProperty()) + using (var writer = OpenLeadTimeProperty()) { writer.WriteNumber(dates, values); } } /// - /// Writes a value for the width property as a number value. The width property specifies the width of the path line. If not specified, the default value is 1.0. + /// Writes a value for the leadTime property as a number value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The dates at which the value is specified. /// The value corresponding to each date. /// The index of the first element to write. /// The number of elements to write. - public void WriteWidthProperty(IList dates, IList values, int startIndex, int length) + public void WriteLeadTimeProperty(IList dates, IList values, int startIndex, int length) { - using (var writer = OpenWidthProperty()) + using (var writer = OpenLeadTimeProperty()) { writer.WriteNumber(dates, values, startIndex, length); } } /// - /// Writes a value for the width property as a reference value. The width property specifies the width of the path line. If not specified, the default value is 1.0. + /// Writes a value for the leadTime property as a reference value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The reference. - public void WriteWidthPropertyReference(Reference value) + public void WriteLeadTimePropertyReference(Reference value) { - using (var writer = OpenWidthProperty()) + using (var writer = OpenLeadTimeProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the width property as a reference value. The width property specifies the width of the path line. If not specified, the default value is 1.0. + /// Writes a value for the leadTime property as a reference value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The reference. - public void WriteWidthPropertyReference(string value) + public void WriteLeadTimePropertyReference(string value) { - using (var writer = OpenWidthProperty()) + using (var writer = OpenLeadTimeProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the width property as a reference value. The width property specifies the width of the path line. If not specified, the default value is 1.0. + /// Writes a value for the leadTime property as a reference value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteWidthPropertyReference(string identifier, string propertyName) + public void WriteLeadTimePropertyReference(string identifier, string propertyName) { - using (var writer = OpenWidthProperty()) + using (var writer = OpenLeadTimeProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the width property as a reference value. The width property specifies the width of the path line. If not specified, the default value is 1.0. + /// Writes a value for the leadTime property as a reference value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteWidthPropertyReference(string identifier, string[] propertyNames) + public void WriteLeadTimePropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenWidthProperty()) + using (var writer = OpenLeadTimeProperty()) { writer.WriteReference(identifier, propertyNames); } } /// - /// Gets the writer for the resolution property. The returned instance must be opened by calling the method before it can be used for writing. The resolution property defines the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + /// Gets the writer for the trailTime property. The returned instance must be opened by calling the method before it can be used for writing. The trailTime property defines the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// [NotNull] - public DoubleCesiumWriter ResolutionWriter + public DoubleCesiumWriter TrailTimeWriter { - get { return m_resolution.Value; } + get { return m_trailTime.Value; } } /// - /// Opens and returns the writer for the resolution property. The resolution property defines the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + /// Opens and returns the writer for the trailTime property. The trailTime property defines the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// [NotNull] - public DoubleCesiumWriter OpenResolutionProperty() + public DoubleCesiumWriter OpenTrailTimeProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(ResolutionWriter); + return OpenAndReturn(TrailTimeWriter); } /// - /// Writes a value for the resolution property as a number value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + /// Writes a value for the trailTime property as a number value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The value. - public void WriteResolutionProperty(double value) + public void WriteTrailTimeProperty(double value) { - using (var writer = OpenResolutionProperty()) + using (var writer = OpenTrailTimeProperty()) { writer.WriteNumber(value); } } /// - /// Writes a value for the resolution property as a number value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + /// Writes a value for the trailTime property as a number value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The dates at which the value is specified. /// The values corresponding to each date. - public void WriteResolutionProperty(IList dates, IList values) + public void WriteTrailTimeProperty(IList dates, IList values) { - using (var writer = OpenResolutionProperty()) + using (var writer = OpenTrailTimeProperty()) { writer.WriteNumber(dates, values); } } /// - /// Writes a value for the resolution property as a number value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + /// Writes a value for the trailTime property as a number value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The dates at which the value is specified. /// The value corresponding to each date. /// The index of the first element to write. /// The number of elements to write. - public void WriteResolutionProperty(IList dates, IList values, int startIndex, int length) + public void WriteTrailTimeProperty(IList dates, IList values, int startIndex, int length) { - using (var writer = OpenResolutionProperty()) + using (var writer = OpenTrailTimeProperty()) { writer.WriteNumber(dates, values, startIndex, length); } } /// - /// Writes a value for the resolution property as a reference value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + /// Writes a value for the trailTime property as a reference value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The reference. - public void WriteResolutionPropertyReference(Reference value) + public void WriteTrailTimePropertyReference(Reference value) { - using (var writer = OpenResolutionProperty()) + using (var writer = OpenTrailTimeProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the resolution property as a reference value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + /// Writes a value for the trailTime property as a reference value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The reference. - public void WriteResolutionPropertyReference(string value) + public void WriteTrailTimePropertyReference(string value) { - using (var writer = OpenResolutionProperty()) + using (var writer = OpenTrailTimeProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the resolution property as a reference value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + /// Writes a value for the trailTime property as a reference value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteResolutionPropertyReference(string identifier, string propertyName) + public void WriteTrailTimePropertyReference(string identifier, string propertyName) { - using (var writer = OpenResolutionProperty()) + using (var writer = OpenTrailTimeProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the resolution property as a reference value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + /// Writes a value for the trailTime property as a reference value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteResolutionPropertyReference(string identifier, string[] propertyNames) + public void WriteTrailTimePropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenResolutionProperty()) + using (var writer = OpenTrailTimeProperty()) { writer.WriteReference(identifier, propertyNames); } } /// - /// Gets the writer for the leadTime property. The returned instance must be opened by calling the method before it can be used for writing. The leadTime property defines the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Gets the writer for the width property. The returned instance must be opened by calling the method before it can be used for writing. The width property defines the width of the path line. If not specified, the default value is 1.0. /// [NotNull] - public DoubleCesiumWriter LeadTimeWriter + public DoubleCesiumWriter WidthWriter { - get { return m_leadTime.Value; } + get { return m_width.Value; } } /// - /// Opens and returns the writer for the leadTime property. The leadTime property defines the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Opens and returns the writer for the width property. The width property defines the width of the path line. If not specified, the default value is 1.0. /// [NotNull] - public DoubleCesiumWriter OpenLeadTimeProperty() + public DoubleCesiumWriter OpenWidthProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(LeadTimeWriter); + return OpenAndReturn(WidthWriter); } /// - /// Writes a value for the leadTime property as a number value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the width property as a number value. The width property specifies the width of the path line. If not specified, the default value is 1.0. /// /// The value. - public void WriteLeadTimeProperty(double value) + public void WriteWidthProperty(double value) { - using (var writer = OpenLeadTimeProperty()) + using (var writer = OpenWidthProperty()) { writer.WriteNumber(value); } } /// - /// Writes a value for the leadTime property as a number value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the width property as a number value. The width property specifies the width of the path line. If not specified, the default value is 1.0. /// /// The dates at which the value is specified. /// The values corresponding to each date. - public void WriteLeadTimeProperty(IList dates, IList values) + public void WriteWidthProperty(IList dates, IList values) { - using (var writer = OpenLeadTimeProperty()) + using (var writer = OpenWidthProperty()) { writer.WriteNumber(dates, values); } } /// - /// Writes a value for the leadTime property as a number value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the width property as a number value. The width property specifies the width of the path line. If not specified, the default value is 1.0. /// /// The dates at which the value is specified. /// The value corresponding to each date. /// The index of the first element to write. /// The number of elements to write. - public void WriteLeadTimeProperty(IList dates, IList values, int startIndex, int length) + public void WriteWidthProperty(IList dates, IList values, int startIndex, int length) { - using (var writer = OpenLeadTimeProperty()) + using (var writer = OpenWidthProperty()) { writer.WriteNumber(dates, values, startIndex, length); } } /// - /// Writes a value for the leadTime property as a reference value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the width property as a reference value. The width property specifies the width of the path line. If not specified, the default value is 1.0. /// /// The reference. - public void WriteLeadTimePropertyReference(Reference value) + public void WriteWidthPropertyReference(Reference value) { - using (var writer = OpenLeadTimeProperty()) + using (var writer = OpenWidthProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the leadTime property as a reference value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the width property as a reference value. The width property specifies the width of the path line. If not specified, the default value is 1.0. /// /// The reference. - public void WriteLeadTimePropertyReference(string value) + public void WriteWidthPropertyReference(string value) { - using (var writer = OpenLeadTimeProperty()) + using (var writer = OpenWidthProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the leadTime property as a reference value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the width property as a reference value. The width property specifies the width of the path line. If not specified, the default value is 1.0. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteLeadTimePropertyReference(string identifier, string propertyName) + public void WriteWidthPropertyReference(string identifier, string propertyName) { - using (var writer = OpenLeadTimeProperty()) + using (var writer = OpenWidthProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the leadTime property as a reference value. The leadTime property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the width property as a reference value. The width property specifies the width of the path line. If not specified, the default value is 1.0. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteLeadTimePropertyReference(string identifier, string[] propertyNames) + public void WriteWidthPropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenLeadTimeProperty()) + using (var writer = OpenWidthProperty()) { writer.WriteReference(identifier, propertyNames); } } /// - /// Gets the writer for the trailTime property. The returned instance must be opened by calling the method before it can be used for writing. The trailTime property defines the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Gets the writer for the resolution property. The returned instance must be opened by calling the method before it can be used for writing. The resolution property defines the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. /// [NotNull] - public DoubleCesiumWriter TrailTimeWriter + public DoubleCesiumWriter ResolutionWriter { - get { return m_trailTime.Value; } + get { return m_resolution.Value; } } /// - /// Opens and returns the writer for the trailTime property. The trailTime property defines the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Opens and returns the writer for the resolution property. The resolution property defines the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. /// [NotNull] - public DoubleCesiumWriter OpenTrailTimeProperty() + public DoubleCesiumWriter OpenResolutionProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(TrailTimeWriter); + return OpenAndReturn(ResolutionWriter); } /// - /// Writes a value for the trailTime property as a number value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the resolution property as a number value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. /// /// The value. - public void WriteTrailTimeProperty(double value) + public void WriteResolutionProperty(double value) { - using (var writer = OpenTrailTimeProperty()) + using (var writer = OpenResolutionProperty()) { writer.WriteNumber(value); } } /// - /// Writes a value for the trailTime property as a number value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the resolution property as a number value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. /// /// The dates at which the value is specified. /// The values corresponding to each date. - public void WriteTrailTimeProperty(IList dates, IList values) + public void WriteResolutionProperty(IList dates, IList values) { - using (var writer = OpenTrailTimeProperty()) + using (var writer = OpenResolutionProperty()) { writer.WriteNumber(dates, values); } } /// - /// Writes a value for the trailTime property as a number value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the resolution property as a number value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. /// /// The dates at which the value is specified. /// The value corresponding to each date. /// The index of the first element to write. /// The number of elements to write. - public void WriteTrailTimeProperty(IList dates, IList values, int startIndex, int length) + public void WriteResolutionProperty(IList dates, IList values, int startIndex, int length) { - using (var writer = OpenTrailTimeProperty()) + using (var writer = OpenResolutionProperty()) { writer.WriteNumber(dates, values, startIndex, length); } } /// - /// Writes a value for the trailTime property as a reference value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the resolution property as a reference value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. /// /// The reference. - public void WriteTrailTimePropertyReference(Reference value) + public void WriteResolutionPropertyReference(Reference value) { - using (var writer = OpenTrailTimeProperty()) + using (var writer = OpenResolutionProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the trailTime property as a reference value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the resolution property as a reference value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. /// /// The reference. - public void WriteTrailTimePropertyReference(string value) + public void WriteResolutionPropertyReference(string value) { - using (var writer = OpenTrailTimeProperty()) + using (var writer = OpenResolutionProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the trailTime property as a reference value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the resolution property as a reference value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteTrailTimePropertyReference(string identifier, string propertyName) + public void WriteResolutionPropertyReference(string identifier, string propertyName) { - using (var writer = OpenTrailTimeProperty()) + using (var writer = OpenResolutionProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the trailTime property as a reference value. The trailTime property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + /// Writes a value for the resolution property as a reference value. The resolution property specifies the maximum step-size, in seconds, used to sample the path. If the position property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteTrailTimePropertyReference(string identifier, string[] propertyNames) + public void WriteResolutionPropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenTrailTimeProperty()) + using (var writer = OpenResolutionProperty()) { writer.WriteReference(identifier, propertyNames); } diff --git a/DotNet/CesiumLanguageWriter/Generated/PolygonCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/PolygonCesiumWriter.cs index 1d51c24c..0c3f86a7 100644 --- a/DotNet/CesiumLanguageWriter/Generated/PolygonCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/PolygonCesiumWriter.cs @@ -37,14 +37,14 @@ public class PolygonCesiumWriter : CesiumPropertyWriter public const string HeightPropertyName = "height"; /// - /// The name of the extrudedHeight property. + /// The name of the heightReference property. /// - public const string ExtrudedHeightPropertyName = "extrudedHeight"; + public const string HeightReferencePropertyName = "heightReference"; /// - /// The name of the heightReference property. + /// The name of the extrudedHeight property. /// - public const string HeightReferencePropertyName = "heightReference"; + public const string ExtrudedHeightPropertyName = "extrudedHeight"; /// /// The name of the extrudedHeightReference property. @@ -111,6 +111,11 @@ public class PolygonCesiumWriter : CesiumPropertyWriter /// public const string DistanceDisplayConditionPropertyName = "distanceDisplayCondition"; + /// + /// The name of the classificationType property. + /// + public const string ClassificationTypePropertyName = "classificationType"; + /// /// The name of the zIndex property. /// @@ -120,8 +125,8 @@ public class PolygonCesiumWriter : CesiumPropertyWriter private readonly Lazy m_positions = new Lazy(() => new PositionListCesiumWriter(PositionsPropertyName), false); private readonly Lazy m_arcType = new Lazy(() => new ArcTypeCesiumWriter(ArcTypePropertyName), false); private readonly Lazy m_height = new Lazy(() => new DoubleCesiumWriter(HeightPropertyName), false); - private readonly Lazy m_extrudedHeight = new Lazy(() => new DoubleCesiumWriter(ExtrudedHeightPropertyName), false); private readonly Lazy m_heightReference = new Lazy(() => new HeightReferenceCesiumWriter(HeightReferencePropertyName), false); + private readonly Lazy m_extrudedHeight = new Lazy(() => new DoubleCesiumWriter(ExtrudedHeightPropertyName), false); private readonly Lazy m_extrudedHeightReference = new Lazy(() => new HeightReferenceCesiumWriter(ExtrudedHeightReferencePropertyName), false); private readonly Lazy m_stRotation = new Lazy(() => new DoubleCesiumWriter(StRotationPropertyName), false); private readonly Lazy m_granularity = new Lazy(() => new DoubleCesiumWriter(GranularityPropertyName), false); @@ -135,6 +140,7 @@ public class PolygonCesiumWriter : CesiumPropertyWriter private readonly Lazy m_closeBottom = new Lazy(() => new BooleanCesiumWriter(CloseBottomPropertyName), false); private readonly Lazy m_shadows = new Lazy(() => new ShadowModeCesiumWriter(ShadowsPropertyName), false); private readonly Lazy m_distanceDisplayCondition = new Lazy(() => new DistanceDisplayConditionCesiumWriter(DistanceDisplayConditionPropertyName), false); + private readonly Lazy m_classificationType = new Lazy(() => new ClassificationTypeCesiumWriter(ClassificationTypePropertyName), false); private readonly Lazy m_zIndex = new Lazy(() => new IntegerCesiumWriter(ZIndexPropertyName), false); /// @@ -500,190 +506,190 @@ public void WriteHeightPropertyReference(string identifier, string[] propertyNam } /// - /// Gets the writer for the extrudedHeight property. The returned instance must be opened by calling the method before it can be used for writing. The extrudedHeight property defines the extruded height of the polygon. + /// Gets the writer for the heightReference property. The returned instance must be opened by calling the method before it can be used for writing. The heightReference property defines the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// [NotNull] - public DoubleCesiumWriter ExtrudedHeightWriter + public HeightReferenceCesiumWriter HeightReferenceWriter { - get { return m_extrudedHeight.Value; } + get { return m_heightReference.Value; } } /// - /// Opens and returns the writer for the extrudedHeight property. The extrudedHeight property defines the extruded height of the polygon. + /// Opens and returns the writer for the heightReference property. The heightReference property defines the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// [NotNull] - public DoubleCesiumWriter OpenExtrudedHeightProperty() + public HeightReferenceCesiumWriter OpenHeightReferenceProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(ExtrudedHeightWriter); - } - - /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the polygon. - /// - /// The value. - public void WriteExtrudedHeightProperty(double value) - { - using (var writer = OpenExtrudedHeightProperty()) - { - writer.WriteNumber(value); - } - } - - /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the polygon. - /// - /// The dates at which the value is specified. - /// The values corresponding to each date. - public void WriteExtrudedHeightProperty(IList dates, IList values) - { - using (var writer = OpenExtrudedHeightProperty()) - { - writer.WriteNumber(dates, values); - } + return OpenAndReturn(HeightReferenceWriter); } /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the polygon. + /// Writes a value for the heightReference property as a heightReference value. The heightReference property specifies the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// - /// The dates at which the value is specified. - /// The value corresponding to each date. - /// The index of the first element to write. - /// The number of elements to write. - public void WriteExtrudedHeightProperty(IList dates, IList values, int startIndex, int length) + /// The height reference. + public void WriteHeightReferenceProperty(CesiumHeightReference value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { - writer.WriteNumber(dates, values, startIndex, length); + writer.WriteHeightReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the polygon. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The reference. - public void WriteExtrudedHeightPropertyReference(Reference value) + public void WriteHeightReferencePropertyReference(Reference value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the polygon. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The reference. - public void WriteExtrudedHeightPropertyReference(string value) + public void WriteHeightReferencePropertyReference(string value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the polygon. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteExtrudedHeightPropertyReference(string identifier, string propertyName) + public void WriteHeightReferencePropertyReference(string identifier, string propertyName) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the polygon. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteExtrudedHeightPropertyReference(string identifier, string[] propertyNames) + public void WriteHeightReferencePropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(identifier, propertyNames); } } /// - /// Gets the writer for the heightReference property. The returned instance must be opened by calling the method before it can be used for writing. The heightReference property defines the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Gets the writer for the extrudedHeight property. The returned instance must be opened by calling the method before it can be used for writing. The extrudedHeight property defines the extruded height of the polygon. /// [NotNull] - public HeightReferenceCesiumWriter HeightReferenceWriter + public DoubleCesiumWriter ExtrudedHeightWriter { - get { return m_heightReference.Value; } + get { return m_extrudedHeight.Value; } } /// - /// Opens and returns the writer for the heightReference property. The heightReference property defines the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Opens and returns the writer for the extrudedHeight property. The extrudedHeight property defines the extruded height of the polygon. /// [NotNull] - public HeightReferenceCesiumWriter OpenHeightReferenceProperty() + public DoubleCesiumWriter OpenExtrudedHeightProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(HeightReferenceWriter); + return OpenAndReturn(ExtrudedHeightWriter); } /// - /// Writes a value for the heightReference property as a heightReference value. The heightReference property specifies the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the polygon. /// - /// The height reference. - public void WriteHeightReferenceProperty(CesiumHeightReference value) + /// The value. + public void WriteExtrudedHeightProperty(double value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { - writer.WriteHeightReference(value); + writer.WriteNumber(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the polygon. + /// + /// The dates at which the value is specified. + /// The values corresponding to each date. + public void WriteExtrudedHeightProperty(IList dates, IList values) + { + using (var writer = OpenExtrudedHeightProperty()) + { + writer.WriteNumber(dates, values); + } + } + + /// + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the polygon. + /// + /// The dates at which the value is specified. + /// The value corresponding to each date. + /// The index of the first element to write. + /// The number of elements to write. + public void WriteExtrudedHeightProperty(IList dates, IList values, int startIndex, int length) + { + using (var writer = OpenExtrudedHeightProperty()) + { + writer.WriteNumber(dates, values, startIndex, length); + } + } + + /// + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the polygon. /// /// The reference. - public void WriteHeightReferencePropertyReference(Reference value) + public void WriteExtrudedHeightPropertyReference(Reference value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the polygon. /// /// The reference. - public void WriteHeightReferencePropertyReference(string value) + public void WriteExtrudedHeightPropertyReference(string value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the polygon. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteHeightReferencePropertyReference(string identifier, string propertyName) + public void WriteExtrudedHeightPropertyReference(string identifier, string propertyName) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the polygon, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the polygon. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteHeightReferencePropertyReference(string identifier, string[] propertyNames) + public void WriteExtrudedHeightPropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(identifier, propertyNames); } @@ -1903,6 +1909,87 @@ public void WriteDistanceDisplayConditionPropertyReference(string identifier, st } } + /// + /// Gets the writer for the classificationType property. The returned instance must be opened by calling the method before it can be used for writing. The classificationType property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + [NotNull] + public ClassificationTypeCesiumWriter ClassificationTypeWriter + { + get { return m_classificationType.Value; } + } + + /// + /// Opens and returns the writer for the classificationType property. The classificationType property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + [NotNull] + public ClassificationTypeCesiumWriter OpenClassificationTypeProperty() + { + OpenIntervalIfNecessary(); + return OpenAndReturn(ClassificationTypeWriter); + } + + /// + /// Writes a value for the classificationType property as a classificationType value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The classification type. + public void WriteClassificationTypeProperty(CesiumClassificationType value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteClassificationType(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The reference. + public void WriteClassificationTypePropertyReference(Reference value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The reference. + public void WriteClassificationTypePropertyReference(string value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The identifier of the object which contains the referenced property. + /// The property on the referenced object. + public void WriteClassificationTypePropertyReference(string identifier, string propertyName) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(identifier, propertyName); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The identifier of the object which contains the referenced property. + /// The hierarchy of properties to be indexed on the referenced object. + public void WriteClassificationTypePropertyReference(string identifier, string[] propertyNames) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(identifier, propertyNames); + } + } + /// /// Gets the writer for the zIndex property. The returned instance must be opened by calling the method before it can be used for writing. The zIndex property defines the z-index of the polygon, used for ordering ground geometry. Only has an effect if the polygon is constant, and height and extrudedHeight are not specified. If not specified, the default value is 0. /// diff --git a/DotNet/CesiumLanguageWriter/Generated/PolylineCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/PolylineCesiumWriter.cs index 9a8ee9a8..edb475e5 100644 --- a/DotNet/CesiumLanguageWriter/Generated/PolylineCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/PolylineCesiumWriter.cs @@ -70,6 +70,11 @@ public class PolylineCesiumWriter : CesiumPropertyWriter /// public const string ClampToGroundPropertyName = "clampToGround"; + /// + /// The name of the classificationType property. + /// + public const string ClassificationTypePropertyName = "classificationType"; + /// /// The name of the zIndex property. /// @@ -86,6 +91,7 @@ public class PolylineCesiumWriter : CesiumPropertyWriter private readonly Lazy m_depthFailMaterial = new Lazy(() => new PolylineMaterialCesiumWriter(DepthFailMaterialPropertyName), false); private readonly Lazy m_distanceDisplayCondition = new Lazy(() => new DistanceDisplayConditionCesiumWriter(DistanceDisplayConditionPropertyName), false); private readonly Lazy m_clampToGround = new Lazy(() => new BooleanCesiumWriter(ClampToGroundPropertyName), false); + private readonly Lazy m_classificationType = new Lazy(() => new ClassificationTypeCesiumWriter(ClassificationTypePropertyName), false); private readonly Lazy m_zIndex = new Lazy(() => new IntegerCesiumWriter(ZIndexPropertyName), false); /// @@ -962,6 +968,87 @@ public void WriteClampToGroundPropertyReference(string identifier, string[] prop } } + /// + /// Gets the writer for the classificationType property. The returned instance must be opened by calling the method before it can be used for writing. The classificationType property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + [NotNull] + public ClassificationTypeCesiumWriter ClassificationTypeWriter + { + get { return m_classificationType.Value; } + } + + /// + /// Opens and returns the writer for the classificationType property. The classificationType property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + [NotNull] + public ClassificationTypeCesiumWriter OpenClassificationTypeProperty() + { + OpenIntervalIfNecessary(); + return OpenAndReturn(ClassificationTypeWriter); + } + + /// + /// Writes a value for the classificationType property as a classificationType value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The classification type. + public void WriteClassificationTypeProperty(CesiumClassificationType value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteClassificationType(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The reference. + public void WriteClassificationTypePropertyReference(Reference value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The reference. + public void WriteClassificationTypePropertyReference(string value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The identifier of the object which contains the referenced property. + /// The property on the referenced object. + public void WriteClassificationTypePropertyReference(string identifier, string propertyName) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(identifier, propertyName); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The identifier of the object which contains the referenced property. + /// The hierarchy of properties to be indexed on the referenced object. + public void WriteClassificationTypePropertyReference(string identifier, string[] propertyNames) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(identifier, propertyNames); + } + } + /// /// Gets the writer for the zIndex property. The returned instance must be opened by calling the method before it can be used for writing. The zIndex property defines the z-index of the polyline, used for ordering ground geometry. Only has an effect if the polyline is constant, and clampToGround is true. If not specified, the default value is 0. /// diff --git a/DotNet/CesiumLanguageWriter/Generated/RectangleCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/RectangleCesiumWriter.cs index 678d4b7a..ab1e50c3 100644 --- a/DotNet/CesiumLanguageWriter/Generated/RectangleCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/RectangleCesiumWriter.cs @@ -32,14 +32,14 @@ public class RectangleCesiumWriter : CesiumPropertyWriter public const string HeightPropertyName = "height"; /// - /// The name of the extrudedHeight property. + /// The name of the heightReference property. /// - public const string ExtrudedHeightPropertyName = "extrudedHeight"; + public const string HeightReferencePropertyName = "heightReference"; /// - /// The name of the heightReference property. + /// The name of the extrudedHeight property. /// - public const string HeightReferencePropertyName = "heightReference"; + public const string ExtrudedHeightPropertyName = "extrudedHeight"; /// /// The name of the extrudedHeightReference property. @@ -96,6 +96,11 @@ public class RectangleCesiumWriter : CesiumPropertyWriter /// public const string DistanceDisplayConditionPropertyName = "distanceDisplayCondition"; + /// + /// The name of the classificationType property. + /// + public const string ClassificationTypePropertyName = "classificationType"; + /// /// The name of the zIndex property. /// @@ -104,8 +109,8 @@ public class RectangleCesiumWriter : CesiumPropertyWriter private readonly Lazy m_show = new Lazy(() => new BooleanCesiumWriter(ShowPropertyName), false); private readonly Lazy m_coordinates = new Lazy(() => new RectangleCoordinatesCesiumWriter(CoordinatesPropertyName), false); private readonly Lazy m_height = new Lazy(() => new DoubleCesiumWriter(HeightPropertyName), false); - private readonly Lazy m_extrudedHeight = new Lazy(() => new DoubleCesiumWriter(ExtrudedHeightPropertyName), false); private readonly Lazy m_heightReference = new Lazy(() => new HeightReferenceCesiumWriter(HeightReferencePropertyName), false); + private readonly Lazy m_extrudedHeight = new Lazy(() => new DoubleCesiumWriter(ExtrudedHeightPropertyName), false); private readonly Lazy m_extrudedHeightReference = new Lazy(() => new HeightReferenceCesiumWriter(ExtrudedHeightReferencePropertyName), false); private readonly Lazy m_rotation = new Lazy(() => new DoubleCesiumWriter(RotationPropertyName), false); private readonly Lazy m_stRotation = new Lazy(() => new DoubleCesiumWriter(StRotationPropertyName), false); @@ -117,6 +122,7 @@ public class RectangleCesiumWriter : CesiumPropertyWriter private readonly Lazy m_outlineWidth = new Lazy(() => new DoubleCesiumWriter(OutlineWidthPropertyName), false); private readonly Lazy m_shadows = new Lazy(() => new ShadowModeCesiumWriter(ShadowsPropertyName), false); private readonly Lazy m_distanceDisplayCondition = new Lazy(() => new DistanceDisplayConditionCesiumWriter(DistanceDisplayConditionPropertyName), false); + private readonly Lazy m_classificationType = new Lazy(() => new ClassificationTypeCesiumWriter(ClassificationTypePropertyName), false); private readonly Lazy m_zIndex = new Lazy(() => new IntegerCesiumWriter(ZIndexPropertyName), false); /// @@ -513,190 +519,190 @@ public void WriteHeightPropertyReference(string identifier, string[] propertyNam } /// - /// Gets the writer for the extrudedHeight property. The returned instance must be opened by calling the method before it can be used for writing. The extrudedHeight property defines the extruded height of the rectangle. + /// Gets the writer for the heightReference property. The returned instance must be opened by calling the method before it can be used for writing. The heightReference property defines the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// [NotNull] - public DoubleCesiumWriter ExtrudedHeightWriter + public HeightReferenceCesiumWriter HeightReferenceWriter { - get { return m_extrudedHeight.Value; } + get { return m_heightReference.Value; } } /// - /// Opens and returns the writer for the extrudedHeight property. The extrudedHeight property defines the extruded height of the rectangle. + /// Opens and returns the writer for the heightReference property. The heightReference property defines the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// [NotNull] - public DoubleCesiumWriter OpenExtrudedHeightProperty() + public HeightReferenceCesiumWriter OpenHeightReferenceProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(ExtrudedHeightWriter); - } - - /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the rectangle. - /// - /// The value. - public void WriteExtrudedHeightProperty(double value) - { - using (var writer = OpenExtrudedHeightProperty()) - { - writer.WriteNumber(value); - } - } - - /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the rectangle. - /// - /// The dates at which the value is specified. - /// The values corresponding to each date. - public void WriteExtrudedHeightProperty(IList dates, IList values) - { - using (var writer = OpenExtrudedHeightProperty()) - { - writer.WriteNumber(dates, values); - } + return OpenAndReturn(HeightReferenceWriter); } /// - /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the rectangle. + /// Writes a value for the heightReference property as a heightReference value. The heightReference property specifies the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// - /// The dates at which the value is specified. - /// The value corresponding to each date. - /// The index of the first element to write. - /// The number of elements to write. - public void WriteExtrudedHeightProperty(IList dates, IList values, int startIndex, int length) + /// The height reference. + public void WriteHeightReferenceProperty(CesiumHeightReference value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { - writer.WriteNumber(dates, values, startIndex, length); + writer.WriteHeightReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the rectangle. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The reference. - public void WriteExtrudedHeightPropertyReference(Reference value) + public void WriteHeightReferencePropertyReference(Reference value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the rectangle. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The reference. - public void WriteExtrudedHeightPropertyReference(string value) + public void WriteHeightReferencePropertyReference(string value) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the rectangle. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteExtrudedHeightPropertyReference(string identifier, string propertyName) + public void WriteHeightReferencePropertyReference(string identifier, string propertyName) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the rectangle. + /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteExtrudedHeightPropertyReference(string identifier, string[] propertyNames) + public void WriteHeightReferencePropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenExtrudedHeightProperty()) + using (var writer = OpenHeightReferenceProperty()) { writer.WriteReference(identifier, propertyNames); } } /// - /// Gets the writer for the heightReference property. The returned instance must be opened by calling the method before it can be used for writing. The heightReference property defines the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Gets the writer for the extrudedHeight property. The returned instance must be opened by calling the method before it can be used for writing. The extrudedHeight property defines the extruded height of the rectangle. /// [NotNull] - public HeightReferenceCesiumWriter HeightReferenceWriter + public DoubleCesiumWriter ExtrudedHeightWriter { - get { return m_heightReference.Value; } + get { return m_extrudedHeight.Value; } } /// - /// Opens and returns the writer for the heightReference property. The heightReference property defines the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Opens and returns the writer for the extrudedHeight property. The extrudedHeight property defines the extruded height of the rectangle. /// [NotNull] - public HeightReferenceCesiumWriter OpenHeightReferenceProperty() + public DoubleCesiumWriter OpenExtrudedHeightProperty() { OpenIntervalIfNecessary(); - return OpenAndReturn(HeightReferenceWriter); + return OpenAndReturn(ExtrudedHeightWriter); } /// - /// Writes a value for the heightReference property as a heightReference value. The heightReference property specifies the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the rectangle. /// - /// The height reference. - public void WriteHeightReferenceProperty(CesiumHeightReference value) + /// The value. + public void WriteExtrudedHeightProperty(double value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { - writer.WriteHeightReference(value); + writer.WriteNumber(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the rectangle. + /// + /// The dates at which the value is specified. + /// The values corresponding to each date. + public void WriteExtrudedHeightProperty(IList dates, IList values) + { + using (var writer = OpenExtrudedHeightProperty()) + { + writer.WriteNumber(dates, values); + } + } + + /// + /// Writes a value for the extrudedHeight property as a number value. The extrudedHeight property specifies the extruded height of the rectangle. + /// + /// The dates at which the value is specified. + /// The value corresponding to each date. + /// The index of the first element to write. + /// The number of elements to write. + public void WriteExtrudedHeightProperty(IList dates, IList values, int startIndex, int length) + { + using (var writer = OpenExtrudedHeightProperty()) + { + writer.WriteNumber(dates, values, startIndex, length); + } + } + + /// + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the rectangle. /// /// The reference. - public void WriteHeightReferencePropertyReference(Reference value) + public void WriteExtrudedHeightPropertyReference(Reference value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the rectangle. /// /// The reference. - public void WriteHeightReferencePropertyReference(string value) + public void WriteExtrudedHeightPropertyReference(string value) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(value); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the rectangle. /// /// The identifier of the object which contains the referenced property. /// The property on the referenced object. - public void WriteHeightReferencePropertyReference(string identifier, string propertyName) + public void WriteExtrudedHeightPropertyReference(string identifier, string propertyName) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(identifier, propertyName); } } /// - /// Writes a value for the heightReference property as a reference value. The heightReference property specifies the height reference of the rectangle, which indicates if height is relative to terrain or not. If not specified, the default value is NONE. + /// Writes a value for the extrudedHeight property as a reference value. The extrudedHeight property specifies the extruded height of the rectangle. /// /// The identifier of the object which contains the referenced property. /// The hierarchy of properties to be indexed on the referenced object. - public void WriteHeightReferencePropertyReference(string identifier, string[] propertyNames) + public void WriteExtrudedHeightPropertyReference(string identifier, string[] propertyNames) { - using (var writer = OpenHeightReferenceProperty()) + using (var writer = OpenExtrudedHeightProperty()) { writer.WriteReference(identifier, propertyNames); } @@ -1782,6 +1788,87 @@ public void WriteDistanceDisplayConditionPropertyReference(string identifier, st } } + /// + /// Gets the writer for the classificationType property. The returned instance must be opened by calling the method before it can be used for writing. The classificationType property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + [NotNull] + public ClassificationTypeCesiumWriter ClassificationTypeWriter + { + get { return m_classificationType.Value; } + } + + /// + /// Opens and returns the writer for the classificationType property. The classificationType property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + [NotNull] + public ClassificationTypeCesiumWriter OpenClassificationTypeProperty() + { + OpenIntervalIfNecessary(); + return OpenAndReturn(ClassificationTypeWriter); + } + + /// + /// Writes a value for the classificationType property as a classificationType value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The classification type. + public void WriteClassificationTypeProperty(CesiumClassificationType value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteClassificationType(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The reference. + public void WriteClassificationTypePropertyReference(Reference value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The reference. + public void WriteClassificationTypePropertyReference(string value) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(value); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The identifier of the object which contains the referenced property. + /// The property on the referenced object. + public void WriteClassificationTypePropertyReference(string identifier, string propertyName) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(identifier, propertyName); + } + } + + /// + /// Writes a value for the classificationType property as a reference value. The classificationType property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + /// + /// The identifier of the object which contains the referenced property. + /// The hierarchy of properties to be indexed on the referenced object. + public void WriteClassificationTypePropertyReference(string identifier, string[] propertyNames) + { + using (var writer = OpenClassificationTypeProperty()) + { + writer.WriteReference(identifier, propertyNames); + } + } + /// /// Gets the writer for the zIndex property. The returned instance must be opened by calling the method before it can be used for writing. The zIndex property defines the z-index of the rectangle, used for ordering ground geometry. Only has an effect if the rectangle is constant, and height and extrudedHeight are not specified. If not specified, the default value is 0. /// diff --git a/DotNet/CesiumLanguageWriter/Generated/WallCesiumWriter.cs b/DotNet/CesiumLanguageWriter/Generated/WallCesiumWriter.cs index f5659113..e4ea5814 100644 --- a/DotNet/CesiumLanguageWriter/Generated/WallCesiumWriter.cs +++ b/DotNet/CesiumLanguageWriter/Generated/WallCesiumWriter.cs @@ -12,7 +12,7 @@ namespace CesiumLanguageWriter { /// - /// Writes a Wall to a . A Wall is a two dimensional wall defined as a line strip and optional maximum and minimum heights, which conforms to the curvature of the globe and can be placed along the surface or at altitude. + /// Writes a Wall to a . A Wall is a two-dimensional wall defined as a line strip and optional maximum and minimum heights, which conforms to the curvature of the globe and can be placed along the surface or at altitude. /// public class WallCesiumWriter : CesiumPropertyWriter { diff --git a/DotNet/CesiumLanguageWriterTests/TestGenerateValidationDocument.cs b/DotNet/CesiumLanguageWriterTests/TestGenerateValidationDocument.cs index a98c0a78..59fd2c28 100644 --- a/DotNet/CesiumLanguageWriterTests/TestGenerateValidationDocument.cs +++ b/DotNet/CesiumLanguageWriterTests/TestGenerateValidationDocument.cs @@ -230,6 +230,11 @@ private void WriteConstantValues() w2.WriteCartesian(new Cartesian(57494, 62432, 42995)); m_assertionsWriter.WriteLine(" expect(e.box.dimensions.getValue(date)).toEqual(new Cartesian3(57494, 62432, 42995));"); } + using (var w2 = w.OpenHeightReferenceProperty()) + { + w2.WriteHeightReference(CesiumHeightReference.ClampToGround); + m_assertionsWriter.WriteLine(" expect(e.box.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); + } using (var w2 = w.OpenFillProperty()) { w2.WriteBoolean(true); @@ -294,16 +299,16 @@ private void WriteConstantValues() w2.WriteNumber(8062.0); m_assertionsWriter.WriteLine(" expect(e.corridor.height.getValue(date)).toEqual(8062.0);"); } - using (var w2 = w.OpenExtrudedHeightProperty()) - { - w2.WriteNumber(22846.0); - m_assertionsWriter.WriteLine(" expect(e.corridor.extrudedHeight.getValue(date)).toEqual(22846.0);"); - } using (var w2 = w.OpenHeightReferenceProperty()) { w2.WriteHeightReference(CesiumHeightReference.ClampToGround); m_assertionsWriter.WriteLine(" expect(e.corridor.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); } + using (var w2 = w.OpenExtrudedHeightProperty()) + { + w2.WriteNumber(22846.0); + m_assertionsWriter.WriteLine(" expect(e.corridor.extrudedHeight.getValue(date)).toEqual(22846.0);"); + } using (var w2 = w.OpenExtrudedHeightReferenceProperty()) { w2.WriteHeightReference(CesiumHeightReference.ClampToGround); @@ -360,6 +365,11 @@ private void WriteConstantValues() w2.WriteDistanceDisplayCondition(new Bounds(15797, 46507)); m_assertionsWriter.WriteLine(" expect(e.corridor.distanceDisplayCondition.getValue(date)).toEqual(new DistanceDisplayCondition(15797, 46507));"); } + using (var w2 = w.OpenClassificationTypeProperty()) + { + w2.WriteClassificationType(CesiumClassificationType.Terrain); + m_assertionsWriter.WriteLine(" expect(e.corridor.classificationType.getValue(date)).toEqual(ClassificationType.TERRAIN);"); + } using (var w2 = w.OpenZIndexProperty()) { w2.WriteNumber(59315); @@ -388,6 +398,11 @@ private void WriteConstantValues() w2.WriteNumber(59378.0); m_assertionsWriter.WriteLine(" expect(e.cylinder.bottomRadius.getValue(date)).toEqual(59378.0);"); } + using (var w2 = w.OpenHeightReferenceProperty()) + { + w2.WriteHeightReference(CesiumHeightReference.ClampToGround); + m_assertionsWriter.WriteLine(" expect(e.cylinder.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); + } using (var w2 = w.OpenFillProperty()) { w2.WriteBoolean(true); @@ -462,16 +477,16 @@ private void WriteConstantValues() w2.WriteNumber(15549.0); m_assertionsWriter.WriteLine(" expect(e.ellipse.height.getValue(date)).toEqual(15549.0);"); } - using (var w2 = w.OpenExtrudedHeightProperty()) - { - w2.WriteNumber(55640.0); - m_assertionsWriter.WriteLine(" expect(e.ellipse.extrudedHeight.getValue(date)).toEqual(55640.0);"); - } using (var w2 = w.OpenHeightReferenceProperty()) { w2.WriteHeightReference(CesiumHeightReference.ClampToGround); m_assertionsWriter.WriteLine(" expect(e.ellipse.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); } + using (var w2 = w.OpenExtrudedHeightProperty()) + { + w2.WriteNumber(55640.0); + m_assertionsWriter.WriteLine(" expect(e.ellipse.extrudedHeight.getValue(date)).toEqual(55640.0);"); + } using (var w2 = w.OpenExtrudedHeightReferenceProperty()) { w2.WriteHeightReference(CesiumHeightReference.ClampToGround); @@ -538,6 +553,11 @@ private void WriteConstantValues() w2.WriteDistanceDisplayCondition(new Bounds(27813, 30828)); m_assertionsWriter.WriteLine(" expect(e.ellipse.distanceDisplayCondition.getValue(date)).toEqual(new DistanceDisplayCondition(27813, 30828));"); } + using (var w2 = w.OpenClassificationTypeProperty()) + { + w2.WriteClassificationType(CesiumClassificationType.Terrain); + m_assertionsWriter.WriteLine(" expect(e.ellipse.classificationType.getValue(date)).toEqual(ClassificationType.TERRAIN);"); + } using (var w2 = w.OpenZIndexProperty()) { w2.WriteNumber(3341); @@ -556,6 +576,11 @@ private void WriteConstantValues() w2.WriteCartesian(new Cartesian(15638, 24381, 37983)); m_assertionsWriter.WriteLine(" expect(e.ellipsoid.radii.getValue(date)).toEqual(new Cartesian3(15638, 24381, 37983));"); } + using (var w2 = w.OpenHeightReferenceProperty()) + { + w2.WriteHeightReference(CesiumHeightReference.ClampToGround); + m_assertionsWriter.WriteLine(" expect(e.ellipsoid.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); + } using (var w2 = w.OpenFillProperty()) { w2.WriteBoolean(true); @@ -827,16 +852,6 @@ private void WriteConstantValues() w2.WriteBoolean(true); m_assertionsWriter.WriteLine(" expect(e.path.show.getValue(date)).toEqual(true);"); } - using (var w2 = w.OpenWidthProperty()) - { - w2.WriteNumber(56040.0); - m_assertionsWriter.WriteLine(" expect(e.path.width.getValue(date)).toEqual(56040.0);"); - } - using (var w2 = w.OpenResolutionProperty()) - { - w2.WriteNumber(31563.0); - m_assertionsWriter.WriteLine(" expect(e.path.resolution.getValue(date)).toEqual(31563.0);"); - } using (var w2 = w.OpenLeadTimeProperty()) { w2.WriteNumber(5997.0); @@ -847,6 +862,16 @@ private void WriteConstantValues() w2.WriteNumber(52915.0); m_assertionsWriter.WriteLine(" expect(e.path.trailTime.getValue(date)).toEqual(52915.0);"); } + using (var w2 = w.OpenWidthProperty()) + { + w2.WriteNumber(56040.0); + m_assertionsWriter.WriteLine(" expect(e.path.width.getValue(date)).toEqual(56040.0);"); + } + using (var w2 = w.OpenResolutionProperty()) + { + w2.WriteNumber(31563.0); + m_assertionsWriter.WriteLine(" expect(e.path.resolution.getValue(date)).toEqual(31563.0);"); + } using (var w2 = w.OpenMaterialProperty()) { using (var m = w2.OpenSolidColorProperty()) @@ -939,16 +964,16 @@ private void WriteConstantValues() w2.WriteNumber(26391.0); m_assertionsWriter.WriteLine(" expect(e.polygon.height.getValue(date)).toEqual(26391.0);"); } - using (var w2 = w.OpenExtrudedHeightProperty()) - { - w2.WriteNumber(15922.0); - m_assertionsWriter.WriteLine(" expect(e.polygon.extrudedHeight.getValue(date)).toEqual(15922.0);"); - } using (var w2 = w.OpenHeightReferenceProperty()) { w2.WriteHeightReference(CesiumHeightReference.ClampToGround); m_assertionsWriter.WriteLine(" expect(e.polygon.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); } + using (var w2 = w.OpenExtrudedHeightProperty()) + { + w2.WriteNumber(15922.0); + m_assertionsWriter.WriteLine(" expect(e.polygon.extrudedHeight.getValue(date)).toEqual(15922.0);"); + } using (var w2 = w.OpenExtrudedHeightReferenceProperty()) { w2.WriteHeightReference(CesiumHeightReference.ClampToGround); @@ -1020,6 +1045,11 @@ private void WriteConstantValues() w2.WriteDistanceDisplayCondition(new Bounds(5989, 26104)); m_assertionsWriter.WriteLine(" expect(e.polygon.distanceDisplayCondition.getValue(date)).toEqual(new DistanceDisplayCondition(5989, 26104));"); } + using (var w2 = w.OpenClassificationTypeProperty()) + { + w2.WriteClassificationType(CesiumClassificationType.Terrain); + m_assertionsWriter.WriteLine(" expect(e.polygon.classificationType.getValue(date)).toEqual(ClassificationType.TERRAIN);"); + } using (var w2 = w.OpenZIndexProperty()) { w2.WriteNumber(31269); @@ -1090,6 +1120,11 @@ private void WriteConstantValues() w2.WriteBoolean(true); m_assertionsWriter.WriteLine(" expect(e.polyline.clampToGround.getValue(date)).toEqual(true);"); } + using (var w2 = w.OpenClassificationTypeProperty()) + { + w2.WriteClassificationType(CesiumClassificationType.Terrain); + m_assertionsWriter.WriteLine(" expect(e.polyline.classificationType.getValue(date)).toEqual(ClassificationType.TERRAIN);"); + } using (var w2 = w.OpenZIndexProperty()) { w2.WriteNumber(17658); @@ -1113,16 +1148,16 @@ private void WriteConstantValues() w2.WriteNumber(20608.0); m_assertionsWriter.WriteLine(" expect(e.rectangle.height.getValue(date)).toEqual(20608.0);"); } - using (var w2 = w.OpenExtrudedHeightProperty()) - { - w2.WriteNumber(23002.0); - m_assertionsWriter.WriteLine(" expect(e.rectangle.extrudedHeight.getValue(date)).toEqual(23002.0);"); - } using (var w2 = w.OpenHeightReferenceProperty()) { w2.WriteHeightReference(CesiumHeightReference.ClampToGround); m_assertionsWriter.WriteLine(" expect(e.rectangle.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); } + using (var w2 = w.OpenExtrudedHeightProperty()) + { + w2.WriteNumber(23002.0); + m_assertionsWriter.WriteLine(" expect(e.rectangle.extrudedHeight.getValue(date)).toEqual(23002.0);"); + } using (var w2 = w.OpenExtrudedHeightReferenceProperty()) { w2.WriteHeightReference(CesiumHeightReference.ClampToGround); @@ -1184,6 +1219,11 @@ private void WriteConstantValues() w2.WriteDistanceDisplayCondition(new Bounds(21388, 23379)); m_assertionsWriter.WriteLine(" expect(e.rectangle.distanceDisplayCondition.getValue(date)).toEqual(new DistanceDisplayCondition(21388, 23379));"); } + using (var w2 = w.OpenClassificationTypeProperty()) + { + w2.WriteClassificationType(CesiumClassificationType.Terrain); + m_assertionsWriter.WriteLine(" expect(e.rectangle.classificationType.getValue(date)).toEqual(ClassificationType.TERRAIN);"); + } using (var w2 = w.OpenZIndexProperty()) { w2.WriteNumber(445); @@ -9057,6 +9097,11 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("box", "dimensions"))); m_assertionsWriter.WriteLine(" expect(e.box.dimensions.getValue(date)).toEqual(constant.box.dimensions.getValue(date));"); } + using (var w2 = w.OpenHeightReferenceProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("box", "heightReference"))); + m_assertionsWriter.WriteLine(" expect(e.box.heightReference.getValue(date)).toEqual(constant.box.heightReference.getValue(date));"); + } using (var w2 = w.OpenFillProperty()) { w2.WriteReference(new Reference("Constant", CreateList("box", "fill"))); @@ -9119,16 +9164,16 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("corridor", "height"))); m_assertionsWriter.WriteLine(" expect(e.corridor.height.getValue(date)).toEqual(constant.corridor.height.getValue(date));"); } - using (var w2 = w.OpenExtrudedHeightProperty()) - { - w2.WriteReference(new Reference("Constant", CreateList("corridor", "extrudedHeight"))); - m_assertionsWriter.WriteLine(" expect(e.corridor.extrudedHeight.getValue(date)).toEqual(constant.corridor.extrudedHeight.getValue(date));"); - } using (var w2 = w.OpenHeightReferenceProperty()) { w2.WriteReference(new Reference("Constant", CreateList("corridor", "heightReference"))); m_assertionsWriter.WriteLine(" expect(e.corridor.heightReference.getValue(date)).toEqual(constant.corridor.heightReference.getValue(date));"); } + using (var w2 = w.OpenExtrudedHeightProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("corridor", "extrudedHeight"))); + m_assertionsWriter.WriteLine(" expect(e.corridor.extrudedHeight.getValue(date)).toEqual(constant.corridor.extrudedHeight.getValue(date));"); + } using (var w2 = w.OpenExtrudedHeightReferenceProperty()) { w2.WriteReference(new Reference("Constant", CreateList("corridor", "extrudedHeightReference"))); @@ -9183,6 +9228,11 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("corridor", "distanceDisplayCondition"))); m_assertionsWriter.WriteLine(" expect(e.corridor.distanceDisplayCondition.getValue(date)).toEqual(constant.corridor.distanceDisplayCondition.getValue(date));"); } + using (var w2 = w.OpenClassificationTypeProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("corridor", "classificationType"))); + m_assertionsWriter.WriteLine(" expect(e.corridor.classificationType.getValue(date)).toEqual(constant.corridor.classificationType.getValue(date));"); + } using (var w2 = w.OpenZIndexProperty()) { w2.WriteReference(new Reference("Constant", CreateList("corridor", "zIndex"))); @@ -9211,6 +9261,11 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("cylinder", "bottomRadius"))); m_assertionsWriter.WriteLine(" expect(e.cylinder.bottomRadius.getValue(date)).toEqual(constant.cylinder.bottomRadius.getValue(date));"); } + using (var w2 = w.OpenHeightReferenceProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("cylinder", "heightReference"))); + m_assertionsWriter.WriteLine(" expect(e.cylinder.heightReference.getValue(date)).toEqual(constant.cylinder.heightReference.getValue(date));"); + } using (var w2 = w.OpenFillProperty()) { w2.WriteReference(new Reference("Constant", CreateList("cylinder", "fill"))); @@ -9283,16 +9338,16 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("ellipse", "height"))); m_assertionsWriter.WriteLine(" expect(e.ellipse.height.getValue(date)).toEqual(constant.ellipse.height.getValue(date));"); } - using (var w2 = w.OpenExtrudedHeightProperty()) - { - w2.WriteReference(new Reference("Constant", CreateList("ellipse", "extrudedHeight"))); - m_assertionsWriter.WriteLine(" expect(e.ellipse.extrudedHeight.getValue(date)).toEqual(constant.ellipse.extrudedHeight.getValue(date));"); - } using (var w2 = w.OpenHeightReferenceProperty()) { w2.WriteReference(new Reference("Constant", CreateList("ellipse", "heightReference"))); m_assertionsWriter.WriteLine(" expect(e.ellipse.heightReference.getValue(date)).toEqual(constant.ellipse.heightReference.getValue(date));"); } + using (var w2 = w.OpenExtrudedHeightProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("ellipse", "extrudedHeight"))); + m_assertionsWriter.WriteLine(" expect(e.ellipse.extrudedHeight.getValue(date)).toEqual(constant.ellipse.extrudedHeight.getValue(date));"); + } using (var w2 = w.OpenExtrudedHeightReferenceProperty()) { w2.WriteReference(new Reference("Constant", CreateList("ellipse", "extrudedHeightReference"))); @@ -9357,6 +9412,11 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("ellipse", "distanceDisplayCondition"))); m_assertionsWriter.WriteLine(" expect(e.ellipse.distanceDisplayCondition.getValue(date)).toEqual(constant.ellipse.distanceDisplayCondition.getValue(date));"); } + using (var w2 = w.OpenClassificationTypeProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("ellipse", "classificationType"))); + m_assertionsWriter.WriteLine(" expect(e.ellipse.classificationType.getValue(date)).toEqual(constant.ellipse.classificationType.getValue(date));"); + } using (var w2 = w.OpenZIndexProperty()) { w2.WriteReference(new Reference("Constant", CreateList("ellipse", "zIndex"))); @@ -9375,6 +9435,11 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("ellipsoid", "radii"))); m_assertionsWriter.WriteLine(" expect(e.ellipsoid.radii.getValue(date)).toEqual(constant.ellipsoid.radii.getValue(date));"); } + using (var w2 = w.OpenHeightReferenceProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("ellipsoid", "heightReference"))); + m_assertionsWriter.WriteLine(" expect(e.ellipsoid.heightReference.getValue(date)).toEqual(constant.ellipsoid.heightReference.getValue(date));"); + } using (var w2 = w.OpenFillProperty()) { w2.WriteReference(new Reference("Constant", CreateList("ellipsoid", "fill"))); @@ -9642,16 +9707,6 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("path", "show"))); m_assertionsWriter.WriteLine(" expect(e.path.show.getValue(date)).toEqual(constant.path.show.getValue(date));"); } - using (var w2 = w.OpenWidthProperty()) - { - w2.WriteReference(new Reference("Constant", CreateList("path", "width"))); - m_assertionsWriter.WriteLine(" expect(e.path.width.getValue(date)).toEqual(constant.path.width.getValue(date));"); - } - using (var w2 = w.OpenResolutionProperty()) - { - w2.WriteReference(new Reference("Constant", CreateList("path", "resolution"))); - m_assertionsWriter.WriteLine(" expect(e.path.resolution.getValue(date)).toEqual(constant.path.resolution.getValue(date));"); - } using (var w2 = w.OpenLeadTimeProperty()) { w2.WriteReference(new Reference("Constant", CreateList("path", "leadTime"))); @@ -9662,6 +9717,16 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("path", "trailTime"))); m_assertionsWriter.WriteLine(" expect(e.path.trailTime.getValue(date)).toEqual(constant.path.trailTime.getValue(date));"); } + using (var w2 = w.OpenWidthProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("path", "width"))); + m_assertionsWriter.WriteLine(" expect(e.path.width.getValue(date)).toEqual(constant.path.width.getValue(date));"); + } + using (var w2 = w.OpenResolutionProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("path", "resolution"))); + m_assertionsWriter.WriteLine(" expect(e.path.resolution.getValue(date)).toEqual(constant.path.resolution.getValue(date));"); + } using (var w2 = w.OpenMaterialProperty()) using (var m = w2.OpenSolidColorProperty()) { @@ -9752,16 +9817,16 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("polygon", "height"))); m_assertionsWriter.WriteLine(" expect(e.polygon.height.getValue(date)).toEqual(constant.polygon.height.getValue(date));"); } - using (var w2 = w.OpenExtrudedHeightProperty()) - { - w2.WriteReference(new Reference("Constant", CreateList("polygon", "extrudedHeight"))); - m_assertionsWriter.WriteLine(" expect(e.polygon.extrudedHeight.getValue(date)).toEqual(constant.polygon.extrudedHeight.getValue(date));"); - } using (var w2 = w.OpenHeightReferenceProperty()) { w2.WriteReference(new Reference("Constant", CreateList("polygon", "heightReference"))); m_assertionsWriter.WriteLine(" expect(e.polygon.heightReference.getValue(date)).toEqual(constant.polygon.heightReference.getValue(date));"); } + using (var w2 = w.OpenExtrudedHeightProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("polygon", "extrudedHeight"))); + m_assertionsWriter.WriteLine(" expect(e.polygon.extrudedHeight.getValue(date)).toEqual(constant.polygon.extrudedHeight.getValue(date));"); + } using (var w2 = w.OpenExtrudedHeightReferenceProperty()) { w2.WriteReference(new Reference("Constant", CreateList("polygon", "extrudedHeightReference"))); @@ -9831,6 +9896,11 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("polygon", "distanceDisplayCondition"))); m_assertionsWriter.WriteLine(" expect(e.polygon.distanceDisplayCondition.getValue(date)).toEqual(constant.polygon.distanceDisplayCondition.getValue(date));"); } + using (var w2 = w.OpenClassificationTypeProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("polygon", "classificationType"))); + m_assertionsWriter.WriteLine(" expect(e.polygon.classificationType.getValue(date)).toEqual(constant.polygon.classificationType.getValue(date));"); + } using (var w2 = w.OpenZIndexProperty()) { w2.WriteReference(new Reference("Constant", CreateList("polygon", "zIndex"))); @@ -9897,6 +9967,11 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("polyline", "clampToGround"))); m_assertionsWriter.WriteLine(" expect(e.polyline.clampToGround.getValue(date)).toEqual(constant.polyline.clampToGround.getValue(date));"); } + using (var w2 = w.OpenClassificationTypeProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("polyline", "classificationType"))); + m_assertionsWriter.WriteLine(" expect(e.polyline.classificationType.getValue(date)).toEqual(constant.polyline.classificationType.getValue(date));"); + } using (var w2 = w.OpenZIndexProperty()) { w2.WriteReference(new Reference("Constant", CreateList("polyline", "zIndex"))); @@ -9920,16 +9995,16 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("rectangle", "height"))); m_assertionsWriter.WriteLine(" expect(e.rectangle.height.getValue(date)).toEqual(constant.rectangle.height.getValue(date));"); } - using (var w2 = w.OpenExtrudedHeightProperty()) - { - w2.WriteReference(new Reference("Constant", CreateList("rectangle", "extrudedHeight"))); - m_assertionsWriter.WriteLine(" expect(e.rectangle.extrudedHeight.getValue(date)).toEqual(constant.rectangle.extrudedHeight.getValue(date));"); - } using (var w2 = w.OpenHeightReferenceProperty()) { w2.WriteReference(new Reference("Constant", CreateList("rectangle", "heightReference"))); m_assertionsWriter.WriteLine(" expect(e.rectangle.heightReference.getValue(date)).toEqual(constant.rectangle.heightReference.getValue(date));"); } + using (var w2 = w.OpenExtrudedHeightProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("rectangle", "extrudedHeight"))); + m_assertionsWriter.WriteLine(" expect(e.rectangle.extrudedHeight.getValue(date)).toEqual(constant.rectangle.extrudedHeight.getValue(date));"); + } using (var w2 = w.OpenExtrudedHeightReferenceProperty()) { w2.WriteReference(new Reference("Constant", CreateList("rectangle", "extrudedHeightReference"))); @@ -9989,6 +10064,11 @@ private void WriteReferenceValues() w2.WriteReference(new Reference("Constant", CreateList("rectangle", "distanceDisplayCondition"))); m_assertionsWriter.WriteLine(" expect(e.rectangle.distanceDisplayCondition.getValue(date)).toEqual(constant.rectangle.distanceDisplayCondition.getValue(date));"); } + using (var w2 = w.OpenClassificationTypeProperty()) + { + w2.WriteReference(new Reference("Constant", CreateList("rectangle", "classificationType"))); + m_assertionsWriter.WriteLine(" expect(e.rectangle.classificationType.getValue(date)).toEqual(constant.rectangle.classificationType.getValue(date));"); + } using (var w2 = w.OpenZIndexProperty()) { w2.WriteReference(new Reference("Constant", CreateList("rectangle", "zIndex"))); @@ -14875,18 +14955,6 @@ private void WriteSampledValues() } using (var w = packet.OpenPathProperty()) { - using (var w2 = w.OpenWidthProperty()) - { - w2.WriteNumber(CreateList(m_documentStartDate, m_documentStopDate), CreateList(32449.0, 33819.0)); - m_assertionsWriter.WriteLine(" expect(e.path.width.getValue(documentStartDate)).toEqual(32449.0);"); - m_assertionsWriter.WriteLine(" expect(e.path.width.getValue(documentStopDate)).toEqual(33819.0);"); - } - using (var w2 = w.OpenResolutionProperty()) - { - w2.WriteNumber(CreateList(m_documentStartDate, m_documentStopDate), CreateList(8399.0, 19400.0)); - m_assertionsWriter.WriteLine(" expect(e.path.resolution.getValue(documentStartDate)).toEqual(8399.0);"); - m_assertionsWriter.WriteLine(" expect(e.path.resolution.getValue(documentStopDate)).toEqual(19400.0);"); - } using (var w2 = w.OpenLeadTimeProperty()) { w2.WriteNumber(CreateList(m_documentStartDate, m_documentStopDate), CreateList(40222.0, 33294.0)); @@ -14899,6 +14967,18 @@ private void WriteSampledValues() m_assertionsWriter.WriteLine(" expect(e.path.trailTime.getValue(documentStartDate)).toEqual(34052.0);"); m_assertionsWriter.WriteLine(" expect(e.path.trailTime.getValue(documentStopDate)).toEqual(57713.0);"); } + using (var w2 = w.OpenWidthProperty()) + { + w2.WriteNumber(CreateList(m_documentStartDate, m_documentStopDate), CreateList(32449.0, 33819.0)); + m_assertionsWriter.WriteLine(" expect(e.path.width.getValue(documentStartDate)).toEqual(32449.0);"); + m_assertionsWriter.WriteLine(" expect(e.path.width.getValue(documentStopDate)).toEqual(33819.0);"); + } + using (var w2 = w.OpenResolutionProperty()) + { + w2.WriteNumber(CreateList(m_documentStartDate, m_documentStopDate), CreateList(8399.0, 19400.0)); + m_assertionsWriter.WriteLine(" expect(e.path.resolution.getValue(documentStartDate)).toEqual(8399.0);"); + m_assertionsWriter.WriteLine(" expect(e.path.resolution.getValue(documentStopDate)).toEqual(19400.0);"); + } using (var w2 = w.OpenMaterialProperty()) { using (var m = w2.OpenSolidColorProperty()) diff --git a/DotNet/GenerateFromSchema/GenerateCSharp.config.json b/DotNet/GenerateFromSchema/GenerateCSharp.config.json index f6a081b6..394b6a14 100644 --- a/DotNet/GenerateFromSchema/GenerateCSharp.config.json +++ b/DotNet/GenerateFromSchema/GenerateCSharp.config.json @@ -956,6 +956,19 @@ "needsInterval": false } ], + "ClassificationType": [ + { + "parameters": [ + { + "type": "CesiumClassificationType", + "name": "value", + "description": "The classification type." + } + ], + "writeValue": "Output.WriteValue(CesiumFormattingHelper.ClassificationTypeToString(value));", + "needsInterval": false + } + ], "ColorBlendMode": [ { "parameters": [ diff --git a/DotNet/GenerateFromSchema/ValidationDocumentGenerator.cs b/DotNet/GenerateFromSchema/ValidationDocumentGenerator.cs index fb8197c3..f5f10700 100644 --- a/DotNet/GenerateFromSchema/ValidationDocumentGenerator.cs +++ b/DotNet/GenerateFromSchema/ValidationDocumentGenerator.cs @@ -1458,6 +1458,13 @@ int GetNumber(int n) valueType = "CesiumShadowMode"; return; } + case "ClassificationType": + { + value = "CesiumClassificationType.Terrain"; + assertionValue = "ClassificationType.TERRAIN"; + valueType = "CesiumClassificationType"; + return; + } case "ColorBlendMode": { value = "CesiumColorBlendMode.Replace"; diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/BoxCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/BoxCesiumWriter.java index b480d11c..261f2069 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/BoxCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/BoxCesiumWriter.java @@ -11,6 +11,7 @@ import cesiumlanguagewriter.ColorCesiumWriter; import cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter; import cesiumlanguagewriter.DoubleCesiumWriter; +import cesiumlanguagewriter.HeightReferenceCesiumWriter; import cesiumlanguagewriter.MaterialCesiumWriter; import cesiumlanguagewriter.ShadowModeCesiumWriter; import java.awt.Color; @@ -45,6 +46,13 @@ public class BoxCesiumWriter extends CesiumPropertyWriter { public static final String DimensionsPropertyName = "dimensions"; /** * + The name of the {@code heightReference} property. + + + */ + public static final String HeightReferencePropertyName = "heightReference"; + /** + * The name of the {@code fill} property. @@ -102,6 +110,11 @@ public cesiumlanguagewriter.BoxDimensionsCesiumWriter invoke() { return new BoxDimensionsCesiumWriter(DimensionsPropertyName); } }, false); + private Lazy m_heightReference = new Lazy(new Func1() { + public cesiumlanguagewriter.HeightReferenceCesiumWriter invoke() { + return new HeightReferenceCesiumWriter(HeightReferencePropertyName); + } + }, false); private Lazy m_fill = new Lazy(new Func1() { public cesiumlanguagewriter.BooleanCesiumWriter invoke() { return new BooleanCesiumWriter(FillPropertyName); @@ -465,6 +478,127 @@ public final void writeDimensionsPropertyReference(String identifier, String[] p } } + /** + * Gets the writer for the {@code heightReference} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code heightReference} property defines the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + */ + @Nonnull + public final HeightReferenceCesiumWriter getHeightReferenceWriter() { + return m_heightReference.getValue(); + } + + /** + * + Opens and returns the writer for the {@code heightReference} property. The {@code heightReference} property defines the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + */ + @Nonnull + public final HeightReferenceCesiumWriter openHeightReferenceProperty() { + openIntervalIfNecessary(); + return this. openAndReturn(getHeightReferenceWriter()); + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code heightReference} value. The {@code heightReference} property specifies the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + * @param value The height reference. + */ + public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference value) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeHeightReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + * @param value The reference. + */ + public final void writeHeightReferencePropertyReference(Reference value) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + * @param value The reference. + */ + public final void writeHeightReferencePropertyReference(String value) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyName The property on the referenced object. + */ + public final void writeHeightReferencePropertyReference(String identifier, String propertyName) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(identifier, propertyName); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the box, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + */ + public final void writeHeightReferencePropertyReference(String identifier, String[] propertyNames) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(identifier, propertyNames); + } finally { + DisposeHelper.dispose(writer); + } + } + } + /** * Gets the writer for the {@code fill} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code fill} property defines whether or not the box is filled. If not specified, the default value is {@code true}. diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CesiumClassificationType.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CesiumClassificationType.java new file mode 100644 index 00000000..6baa4ea3 --- /dev/null +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CesiumClassificationType.java @@ -0,0 +1,82 @@ +package cesiumlanguagewriter; + + +import agi.foundation.compatibility.*; +import agi.foundation.compatibility.Enumeration; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +/** + * + Whether a classification affects terrain, 3D Tiles or both. + + + */ +@SuppressWarnings( { + "unused", + "deprecation", + "serial" +}) +public enum CesiumClassificationType implements Enumeration { + /** + * + Only terrain will be classified. + + + */ + TERRAIN(0), /** + * + Only 3D Tiles will be classified. + + + */ + CESIUM3DTILE(1), /** + * + Both terrain and 3D Tiles will be classified. + + + */ + BOTH(2); + private final int value; + + CesiumClassificationType(int value) { + this.value = value; + } + + /** + * Get the numeric value associated with this enum constant. + * @return A numeric value. + */ + @Override + public int getValue() { + return value; + } + + /** + * Get the enum constant that is associated with the given numeric value. + * @return The enum constant associated with value. + * @param value a numeric value. + */ + @Nonnull + public static CesiumClassificationType getFromValue(int value) { + switch (value) { + case 0: + return TERRAIN; + case 1: + return CESIUM3DTILE; + case 2: + return BOTH; + default: + throw new IllegalArgumentException("Undefined enum value."); + } + } + + /** + * Get the enum constant that is considered to be the default. + * @return The default enum constant. + */ + @Nonnull + public static CesiumClassificationType getDefault() { + return TERRAIN; + } +} \ No newline at end of file diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/ClassificationTypeCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/ClassificationTypeCesiumWriter.java new file mode 100644 index 00000000..d30ce428 --- /dev/null +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/ClassificationTypeCesiumWriter.java @@ -0,0 +1,236 @@ +package cesiumlanguagewriter; + + +import agi.foundation.compatibility.*; +import agi.foundation.compatibility.Func1; +import agi.foundation.compatibility.Lazy; +import cesiumlanguagewriter.advanced.*; +import javax.annotation.Nonnull; + +/** + * + Writes a {@code ClassificationType} to a {@link CesiumOutputStream}. A {@code ClassificationType} is whether a classification affects terrain, 3D Tiles or both. + + + */ +@SuppressWarnings( { + "unused", + "deprecation", + "serial" +}) +public class ClassificationTypeCesiumWriter extends CesiumPropertyWriter implements ICesiumDeletablePropertyWriter, ICesiumClassificationTypeValuePropertyWriter, + ICesiumReferenceValuePropertyWriter { + /** + * + The name of the {@code classificationType} property. + + + */ + public static final String ClassificationTypePropertyName = "classificationType"; + /** + * + The name of the {@code reference} property. + + + */ + public static final String ReferencePropertyName = "reference"; + /** + * + The name of the {@code delete} property. + + + */ + public static final String DeletePropertyName = "delete"; + private Lazy> m_asClassificationType; + private Lazy> m_asReference; + + /** + * + Initializes a new instance. + + + + * @param propertyName The name of the property. + */ + public ClassificationTypeCesiumWriter(@Nonnull String propertyName) { + super(propertyName); + m_asClassificationType = createAsClassificationType(); + m_asReference = createAsReference(); + } + + /** + * + Initializes a new instance as a copy of an existing instance. + + + + * @param existingInstance The existing instance to copy. + */ + protected ClassificationTypeCesiumWriter(@Nonnull ClassificationTypeCesiumWriter existingInstance) { + super(existingInstance); + m_asClassificationType = createAsClassificationType(); + m_asReference = createAsReference(); + } + + /** + * + + Copies this instance and returns the copy. + + + + * @return The copy. + */ + @Override + public ClassificationTypeCesiumWriter clone() { + return new ClassificationTypeCesiumWriter(this); + } + + /** + * + Writes the value expressed as a {@code classificationType}, which is the classification type, which indicates whether a classification affects terrain, 3D Tiles or both. + + + + * @param value The classification type. + */ + public final void writeClassificationType(@Nonnull CesiumClassificationType value) { + final String PropertyName = ClassificationTypePropertyName; + if (getForceInterval()) { + openIntervalIfNecessary(); + } + if (getIsInterval()) { + getOutput().writePropertyName(PropertyName); + } + getOutput().writeValue(CesiumFormattingHelper.classificationTypeToString(value)); + } + + /** + * + Writes the value expressed as a {@code reference}, which is the classification type specified as a reference to another property. + + + + * @param value The reference. + */ + public final void writeReference(Reference value) { + final String PropertyName = ReferencePropertyName; + openIntervalIfNecessary(); + getOutput().writePropertyName(PropertyName); + CesiumWritingHelper.writeReference(getOutput(), value); + } + + /** + * + Writes the value expressed as a {@code reference}, which is the classification type specified as a reference to another property. + + + + * @param value The reference. + */ + public final void writeReference(String value) { + final String PropertyName = ReferencePropertyName; + openIntervalIfNecessary(); + getOutput().writePropertyName(PropertyName); + CesiumWritingHelper.writeReference(getOutput(), value); + } + + /** + * + Writes the value expressed as a {@code reference}, which is the classification type specified as a reference to another property. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyName The property on the referenced object. + */ + public final void writeReference(String identifier, String propertyName) { + final String PropertyName = ReferencePropertyName; + openIntervalIfNecessary(); + getOutput().writePropertyName(PropertyName); + CesiumWritingHelper.writeReference(getOutput(), identifier, propertyName); + } + + /** + * + Writes the value expressed as a {@code reference}, which is the classification type specified as a reference to another property. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + */ + public final void writeReference(String identifier, String[] propertyNames) { + final String PropertyName = ReferencePropertyName; + openIntervalIfNecessary(); + getOutput().writePropertyName(PropertyName); + CesiumWritingHelper.writeReference(getOutput(), identifier, propertyNames); + } + + /** + * + Writes the value expressed as a {@code delete}, which is whether the client should delete existing samples or interval data for this property. Data will be deleted for the containing interval, or if there is no containing interval, then all data. If true, all other properties in this property will be ignored. + + + + * @param value The value. + */ + public final void writeDelete(boolean value) { + final String PropertyName = DeletePropertyName; + openIntervalIfNecessary(); + getOutput().writePropertyName(PropertyName); + getOutput().writeValue(value); + } + + /** + * + Returns a wrapper for this instance that implements {@link ICesiumClassificationTypeValuePropertyWriter}. Because the returned instance is a wrapper for this instance, you may call {@link ICesiumElementWriter#close} on either this instance or the wrapper, but you must not call it on both. + + + + * @return The wrapper. + */ + public final CesiumClassificationTypeValuePropertyAdaptor asClassificationType() { + return m_asClassificationType.getValue(); + } + + private final Lazy> createAsClassificationType() { + return new Lazy>( + new Func1>(this, "createClassificationType") { + public cesiumlanguagewriter.advanced.CesiumClassificationTypeValuePropertyAdaptor invoke() { + return createClassificationType(); + } + }, false); + } + + private final CesiumClassificationTypeValuePropertyAdaptor createClassificationType() { + return CesiumValuePropertyAdaptors. createClassificationType(this); + } + + /** + * + Returns a wrapper for this instance that implements {@link ICesiumReferenceValuePropertyWriter}. Because the returned instance is a wrapper for this instance, you may call {@link ICesiumElementWriter#close} on either this instance or the wrapper, but you must not call it on both. + + + + * @return The wrapper. + */ + public final CesiumReferenceValuePropertyAdaptor asReference() { + return m_asReference.getValue(); + } + + private final Lazy> createAsReference() { + return new Lazy>( + new Func1>(this, "createReference") { + public cesiumlanguagewriter.advanced.CesiumReferenceValuePropertyAdaptor invoke() { + return createReference(); + } + }, false); + } + + private final CesiumReferenceValuePropertyAdaptor createReference() { + return CesiumValuePropertyAdaptors. createReference(this); + } +} \ No newline at end of file diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CorridorCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CorridorCesiumWriter.java index cf083cce..ec76422b 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CorridorCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CorridorCesiumWriter.java @@ -7,6 +7,7 @@ import agi.foundation.compatibility.Lazy; import cesiumlanguagewriter.advanced.*; import cesiumlanguagewriter.BooleanCesiumWriter; +import cesiumlanguagewriter.ClassificationTypeCesiumWriter; import cesiumlanguagewriter.ColorCesiumWriter; import cesiumlanguagewriter.CornerTypeCesiumWriter; import cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter; @@ -62,18 +63,18 @@ public class CorridorCesiumWriter extends CesiumPropertyWriter m_extrudedHeight = new Lazy(new Func1() { - public cesiumlanguagewriter.DoubleCesiumWriter invoke() { - return new DoubleCesiumWriter(ExtrudedHeightPropertyName); - } - }, false); private Lazy m_heightReference = new Lazy(new Func1() { public cesiumlanguagewriter.HeightReferenceCesiumWriter invoke() { return new HeightReferenceCesiumWriter(HeightReferencePropertyName); } }, false); + private Lazy m_extrudedHeight = new Lazy(new Func1() { + public cesiumlanguagewriter.DoubleCesiumWriter invoke() { + return new DoubleCesiumWriter(ExtrudedHeightPropertyName); + } + }, false); private Lazy m_extrudedHeightReference = new Lazy(new Func1() { public cesiumlanguagewriter.HeightReferenceCesiumWriter invoke() { return new HeightReferenceCesiumWriter(ExtrudedHeightReferencePropertyName); @@ -232,6 +240,11 @@ public cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter invoke() { return new DistanceDisplayConditionCesiumWriter(DistanceDisplayConditionPropertyName); } }, false); + private Lazy m_classificationType = new Lazy(new Func1() { + public cesiumlanguagewriter.ClassificationTypeCesiumWriter invoke() { + return new ClassificationTypeCesiumWriter(ClassificationTypePropertyName); + } + }, false); private Lazy m_zIndex = new Lazy(new Func1() { public cesiumlanguagewriter.IntegerCesiumWriter invoke() { return new IntegerCesiumWriter(ZIndexPropertyName); @@ -830,40 +843,40 @@ public final void writeHeightPropertyReference(String identifier, String[] prope } /** - * Gets the writer for the {@code extrudedHeight} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code extrudedHeight} property defines the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + * Gets the writer for the {@code heightReference} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code heightReference} property defines the height reference of the corridor, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. */ @Nonnull - public final DoubleCesiumWriter getExtrudedHeightWriter() { - return m_extrudedHeight.getValue(); + public final HeightReferenceCesiumWriter getHeightReferenceWriter() { + return m_heightReference.getValue(); } /** * - Opens and returns the writer for the {@code extrudedHeight} property. The {@code extrudedHeight} property defines the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + Opens and returns the writer for the {@code heightReference} property. The {@code heightReference} property defines the height reference of the corridor, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. */ @Nonnull - public final DoubleCesiumWriter openExtrudedHeightProperty() { + public final HeightReferenceCesiumWriter openHeightReferenceProperty() { openIntervalIfNecessary(); - return this. openAndReturn(getExtrudedHeightWriter()); + return this. openAndReturn(getHeightReferenceWriter()); } /** * - Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + Writes a value for the {@code heightReference} property as a {@code heightReference} value. The {@code heightReference} property specifies the height reference of the corridor, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param value The value. + * @param value The height reference. */ - public final void writeExtrudedHeightProperty(double value) { + public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(value); + writer.writeHeightReference(value); } finally { DisposeHelper.dispose(writer); } @@ -872,19 +885,17 @@ public final void writeExtrudedHeightProperty(double value) { /** * - Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. - + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the corridor, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param dates The dates at which the value is specified. - * @param values The values corresponding to each date. + * @param value The reference. */ - public final void writeExtrudedHeightProperty(List dates, List values) { + public final void writeHeightReferencePropertyReference(Reference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(dates, values); + writer.writeReference(value); } finally { DisposeHelper.dispose(writer); } @@ -893,23 +904,17 @@ public final void writeExtrudedHeightProperty(List dates, List dates, List values, int startIndex, int length) { + public final void writeHeightReferencePropertyReference(String value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(dates, values, startIndex, length); + writer.writeReference(value); } finally { DisposeHelper.dispose(writer); } @@ -918,17 +923,19 @@ public final void writeExtrudedHeightProperty(List dates, List openAndReturn(getExtrudedHeightWriter()); + } + + /** + * + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. - * @param identifier The identifier of the object which contains the referenced property. - * @param propertyName The property on the referenced object. + * @param value The value. */ - public final void writeExtrudedHeightPropertyReference(String identifier, String propertyName) { + public final void writeExtrudedHeightProperty(double value) { { cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeReference(identifier, propertyName); + writer.writeNumber(value); } finally { DisposeHelper.dispose(writer); } @@ -977,60 +1006,44 @@ public final void writeExtrudedHeightPropertyReference(String identifier, String /** * - Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. - * @param identifier The identifier of the object which contains the referenced property. - * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + * @param dates The dates at which the value is specified. + * @param values The values corresponding to each date. */ - public final void writeExtrudedHeightPropertyReference(String identifier, String[] propertyNames) { + public final void writeExtrudedHeightProperty(List dates, List values) { { cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeReference(identifier, propertyNames); + writer.writeNumber(dates, values); } finally { DisposeHelper.dispose(writer); } } } - /** - * Gets the writer for the {@code heightReference} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code heightReference} property defines the height reference of the corridor, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - - - */ - @Nonnull - public final HeightReferenceCesiumWriter getHeightReferenceWriter() { - return m_heightReference.getValue(); - } - /** * - Opens and returns the writer for the {@code heightReference} property. The {@code heightReference} property defines the height reference of the corridor, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. + + - - */ - @Nonnull - public final HeightReferenceCesiumWriter openHeightReferenceProperty() { - openIntervalIfNecessary(); - return this. openAndReturn(getHeightReferenceWriter()); - } - - /** - * - Writes a value for the {@code heightReference} property as a {@code heightReference} value. The {@code heightReference} property specifies the height reference of the corridor, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param value The height reference. + * @param dates The dates at which the value is specified. + * @param values The value corresponding to each date. + * @param startIndex The index of the first element to write. + * @param length The number of elements to write. */ - public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference value) { + public final void writeExtrudedHeightProperty(List dates, List values, int startIndex, int length) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeHeightReference(value); + writer.writeNumber(dates, values, startIndex, length); } finally { DisposeHelper.dispose(writer); } @@ -1039,15 +1052,15 @@ public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference va /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the corridor, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. * @param value The reference. */ - public final void writeHeightReferencePropertyReference(Reference value) { + public final void writeExtrudedHeightPropertyReference(Reference value) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(value); } finally { @@ -1058,15 +1071,15 @@ public final void writeHeightReferencePropertyReference(Reference value) { /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the corridor, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. * @param value The reference. */ - public final void writeHeightReferencePropertyReference(String value) { + public final void writeExtrudedHeightPropertyReference(String value) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(value); } finally { @@ -1077,7 +1090,7 @@ public final void writeHeightReferencePropertyReference(String value) { /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the corridor, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. @@ -1085,9 +1098,9 @@ public final void writeHeightReferencePropertyReference(String value) { * @param identifier The identifier of the object which contains the referenced property. * @param propertyName The property on the referenced object. */ - public final void writeHeightReferencePropertyReference(String identifier, String propertyName) { + public final void writeExtrudedHeightPropertyReference(String identifier, String propertyName) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(identifier, propertyName); } finally { @@ -1098,7 +1111,7 @@ public final void writeHeightReferencePropertyReference(String identifier, Strin /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the corridor, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface. @@ -1106,9 +1119,9 @@ public final void writeHeightReferencePropertyReference(String identifier, Strin * @param identifier The identifier of the object which contains the referenced property. * @param propertyNames The hierarchy of properties to be indexed on the referenced object. */ - public final void writeHeightReferencePropertyReference(String identifier, String[] propertyNames) { + public final void writeExtrudedHeightPropertyReference(String identifier, String[] propertyNames) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(identifier, propertyNames); } finally { @@ -2548,6 +2561,127 @@ public final void writeDistanceDisplayConditionPropertyReference(String identifi } } + /** + * Gets the writer for the {@code classificationType} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code classificationType} property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + */ + @Nonnull + public final ClassificationTypeCesiumWriter getClassificationTypeWriter() { + return m_classificationType.getValue(); + } + + /** + * + Opens and returns the writer for the {@code classificationType} property. The {@code classificationType} property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + */ + @Nonnull + public final ClassificationTypeCesiumWriter openClassificationTypeProperty() { + openIntervalIfNecessary(); + return this. openAndReturn(getClassificationTypeWriter()); + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code classificationType} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The classification type. + */ + public final void writeClassificationTypeProperty(@Nonnull CesiumClassificationType value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeClassificationType(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The reference. + */ + public final void writeClassificationTypePropertyReference(Reference value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The reference. + */ + public final void writeClassificationTypePropertyReference(String value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyName The property on the referenced object. + */ + public final void writeClassificationTypePropertyReference(String identifier, String propertyName) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(identifier, propertyName); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + */ + public final void writeClassificationTypePropertyReference(String identifier, String[] propertyNames) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(identifier, propertyNames); + } finally { + DisposeHelper.dispose(writer); + } + } + } + /** * Gets the writer for the {@code zIndex} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code zIndex} property defines the z-index of the corridor, used for ordering ground geometry. Only has an effect if the corridor is constant, and {@code height} and {@code extrudedHeight} are not specified. If not specified, the default value is 0. diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CylinderCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CylinderCesiumWriter.java index b82d9f02..996b412d 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CylinderCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/CylinderCesiumWriter.java @@ -10,6 +10,7 @@ import cesiumlanguagewriter.ColorCesiumWriter; import cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter; import cesiumlanguagewriter.DoubleCesiumWriter; +import cesiumlanguagewriter.HeightReferenceCesiumWriter; import cesiumlanguagewriter.IntegerCesiumWriter; import cesiumlanguagewriter.MaterialCesiumWriter; import cesiumlanguagewriter.ShadowModeCesiumWriter; @@ -59,6 +60,13 @@ public class CylinderCesiumWriter extends CesiumPropertyWriter m_heightReference = new Lazy(new Func1() { + public cesiumlanguagewriter.HeightReferenceCesiumWriter invoke() { + return new HeightReferenceCesiumWriter(HeightReferencePropertyName); + } + }, false); private Lazy m_fill = new Lazy(new Func1() { public cesiumlanguagewriter.BooleanCesiumWriter invoke() { return new BooleanCesiumWriter(FillPropertyName); @@ -847,6 +860,127 @@ public final void writeBottomRadiusPropertyReference(String identifier, String[] } } + /** + * Gets the writer for the {@code heightReference} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code heightReference} property defines the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + */ + @Nonnull + public final HeightReferenceCesiumWriter getHeightReferenceWriter() { + return m_heightReference.getValue(); + } + + /** + * + Opens and returns the writer for the {@code heightReference} property. The {@code heightReference} property defines the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + */ + @Nonnull + public final HeightReferenceCesiumWriter openHeightReferenceProperty() { + openIntervalIfNecessary(); + return this. openAndReturn(getHeightReferenceWriter()); + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code heightReference} value. The {@code heightReference} property specifies the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + * @param value The height reference. + */ + public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference value) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeHeightReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + * @param value The reference. + */ + public final void writeHeightReferencePropertyReference(Reference value) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + * @param value The reference. + */ + public final void writeHeightReferencePropertyReference(String value) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyName The property on the referenced object. + */ + public final void writeHeightReferencePropertyReference(String identifier, String propertyName) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(identifier, propertyName); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the cylinder, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + */ + public final void writeHeightReferencePropertyReference(String identifier, String[] propertyNames) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(identifier, propertyNames); + } finally { + DisposeHelper.dispose(writer); + } + } + } + /** * Gets the writer for the {@code fill} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code fill} property defines whether or not the cylinder is filled. If not specified, the default value is {@code true}. diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/EllipseCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/EllipseCesiumWriter.java index 9c5e4756..313f6847 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/EllipseCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/EllipseCesiumWriter.java @@ -7,6 +7,7 @@ import agi.foundation.compatibility.Lazy; import cesiumlanguagewriter.advanced.*; import cesiumlanguagewriter.BooleanCesiumWriter; +import cesiumlanguagewriter.ClassificationTypeCesiumWriter; import cesiumlanguagewriter.ColorCesiumWriter; import cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter; import cesiumlanguagewriter.DoubleCesiumWriter; @@ -60,18 +61,18 @@ public class EllipseCesiumWriter extends CesiumPropertyWriter m_extrudedHeight = new Lazy(new Func1() { - public cesiumlanguagewriter.DoubleCesiumWriter invoke() { - return new DoubleCesiumWriter(ExtrudedHeightPropertyName); - } - }, false); private Lazy m_heightReference = new Lazy(new Func1() { public cesiumlanguagewriter.HeightReferenceCesiumWriter invoke() { return new HeightReferenceCesiumWriter(HeightReferencePropertyName); } }, false); + private Lazy m_extrudedHeight = new Lazy(new Func1() { + public cesiumlanguagewriter.DoubleCesiumWriter invoke() { + return new DoubleCesiumWriter(ExtrudedHeightPropertyName); + } + }, false); private Lazy m_extrudedHeightReference = new Lazy(new Func1() { public cesiumlanguagewriter.HeightReferenceCesiumWriter invoke() { return new HeightReferenceCesiumWriter(ExtrudedHeightReferencePropertyName); @@ -254,6 +262,11 @@ public cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter invoke() { return new DistanceDisplayConditionCesiumWriter(DistanceDisplayConditionPropertyName); } }, false); + private Lazy m_classificationType = new Lazy(new Func1() { + public cesiumlanguagewriter.ClassificationTypeCesiumWriter invoke() { + return new ClassificationTypeCesiumWriter(ClassificationTypePropertyName); + } + }, false); private Lazy m_zIndex = new Lazy(new Func1() { public cesiumlanguagewriter.IntegerCesiumWriter invoke() { return new IntegerCesiumWriter(ZIndexPropertyName); @@ -921,40 +934,40 @@ public final void writeHeightPropertyReference(String identifier, String[] prope } /** - * Gets the writer for the {@code extrudedHeight} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code extrudedHeight} property defines the altitude of the ellipse's extruded face relative to the surface. + * Gets the writer for the {@code heightReference} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code heightReference} property defines the height reference of the ellipse, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. */ @Nonnull - public final DoubleCesiumWriter getExtrudedHeightWriter() { - return m_extrudedHeight.getValue(); + public final HeightReferenceCesiumWriter getHeightReferenceWriter() { + return m_heightReference.getValue(); } /** * - Opens and returns the writer for the {@code extrudedHeight} property. The {@code extrudedHeight} property defines the altitude of the ellipse's extruded face relative to the surface. + Opens and returns the writer for the {@code heightReference} property. The {@code heightReference} property defines the height reference of the ellipse, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. */ @Nonnull - public final DoubleCesiumWriter openExtrudedHeightProperty() { + public final HeightReferenceCesiumWriter openHeightReferenceProperty() { openIntervalIfNecessary(); - return this. openAndReturn(getExtrudedHeightWriter()); + return this. openAndReturn(getHeightReferenceWriter()); } /** * - Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the altitude of the ellipse's extruded face relative to the surface. + Writes a value for the {@code heightReference} property as a {@code heightReference} value. The {@code heightReference} property specifies the height reference of the ellipse, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param value The value. + * @param value The height reference. */ - public final void writeExtrudedHeightProperty(double value) { + public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(value); + writer.writeHeightReference(value); } finally { DisposeHelper.dispose(writer); } @@ -963,19 +976,17 @@ public final void writeExtrudedHeightProperty(double value) { /** * - Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the altitude of the ellipse's extruded face relative to the surface. - + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the ellipse, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param dates The dates at which the value is specified. - * @param values The values corresponding to each date. + * @param value The reference. */ - public final void writeExtrudedHeightProperty(List dates, List values) { + public final void writeHeightReferencePropertyReference(Reference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(dates, values); + writer.writeReference(value); } finally { DisposeHelper.dispose(writer); } @@ -984,23 +995,17 @@ public final void writeExtrudedHeightProperty(List dates, List dates, List values, int startIndex, int length) { + public final void writeHeightReferencePropertyReference(String value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(dates, values, startIndex, length); + writer.writeReference(value); } finally { DisposeHelper.dispose(writer); } @@ -1009,17 +1014,19 @@ public final void writeExtrudedHeightProperty(List dates, List openAndReturn(getExtrudedHeightWriter()); + } + + /** + * + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the altitude of the ellipse's extruded face relative to the surface. - * @param identifier The identifier of the object which contains the referenced property. - * @param propertyName The property on the referenced object. + * @param value The value. */ - public final void writeExtrudedHeightPropertyReference(String identifier, String propertyName) { + public final void writeExtrudedHeightProperty(double value) { { cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeReference(identifier, propertyName); + writer.writeNumber(value); } finally { DisposeHelper.dispose(writer); } @@ -1068,60 +1097,44 @@ public final void writeExtrudedHeightPropertyReference(String identifier, String /** * - Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the altitude of the ellipse's extruded face relative to the surface. + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the altitude of the ellipse's extruded face relative to the surface. - * @param identifier The identifier of the object which contains the referenced property. - * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + * @param dates The dates at which the value is specified. + * @param values The values corresponding to each date. */ - public final void writeExtrudedHeightPropertyReference(String identifier, String[] propertyNames) { + public final void writeExtrudedHeightProperty(List dates, List values) { { cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeReference(identifier, propertyNames); + writer.writeNumber(dates, values); } finally { DisposeHelper.dispose(writer); } } } - /** - * Gets the writer for the {@code heightReference} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code heightReference} property defines the height reference of the ellipse, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - - - */ - @Nonnull - public final HeightReferenceCesiumWriter getHeightReferenceWriter() { - return m_heightReference.getValue(); - } - /** * - Opens and returns the writer for the {@code heightReference} property. The {@code heightReference} property defines the height reference of the ellipse, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the altitude of the ellipse's extruded face relative to the surface. + + - - */ - @Nonnull - public final HeightReferenceCesiumWriter openHeightReferenceProperty() { - openIntervalIfNecessary(); - return this. openAndReturn(getHeightReferenceWriter()); - } - - /** - * - Writes a value for the {@code heightReference} property as a {@code heightReference} value. The {@code heightReference} property specifies the height reference of the ellipse, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param value The height reference. + * @param dates The dates at which the value is specified. + * @param values The value corresponding to each date. + * @param startIndex The index of the first element to write. + * @param length The number of elements to write. */ - public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference value) { + public final void writeExtrudedHeightProperty(List dates, List values, int startIndex, int length) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeHeightReference(value); + writer.writeNumber(dates, values, startIndex, length); } finally { DisposeHelper.dispose(writer); } @@ -1130,15 +1143,15 @@ public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference va /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the ellipse, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the altitude of the ellipse's extruded face relative to the surface. * @param value The reference. */ - public final void writeHeightReferencePropertyReference(Reference value) { + public final void writeExtrudedHeightPropertyReference(Reference value) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(value); } finally { @@ -1149,15 +1162,15 @@ public final void writeHeightReferencePropertyReference(Reference value) { /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the ellipse, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the altitude of the ellipse's extruded face relative to the surface. * @param value The reference. */ - public final void writeHeightReferencePropertyReference(String value) { + public final void writeExtrudedHeightPropertyReference(String value) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(value); } finally { @@ -1168,7 +1181,7 @@ public final void writeHeightReferencePropertyReference(String value) { /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the ellipse, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the altitude of the ellipse's extruded face relative to the surface. @@ -1176,9 +1189,9 @@ public final void writeHeightReferencePropertyReference(String value) { * @param identifier The identifier of the object which contains the referenced property. * @param propertyName The property on the referenced object. */ - public final void writeHeightReferencePropertyReference(String identifier, String propertyName) { + public final void writeExtrudedHeightPropertyReference(String identifier, String propertyName) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(identifier, propertyName); } finally { @@ -1189,7 +1202,7 @@ public final void writeHeightReferencePropertyReference(String identifier, Strin /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the ellipse, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the altitude of the ellipse's extruded face relative to the surface. @@ -1197,9 +1210,9 @@ public final void writeHeightReferencePropertyReference(String identifier, Strin * @param identifier The identifier of the object which contains the referenced property. * @param propertyNames The hierarchy of properties to be indexed on the referenced object. */ - public final void writeHeightReferencePropertyReference(String identifier, String[] propertyNames) { + public final void writeExtrudedHeightPropertyReference(String identifier, String[] propertyNames) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(identifier, propertyNames); } finally { @@ -3019,6 +3032,127 @@ public final void writeDistanceDisplayConditionPropertyReference(String identifi } } + /** + * Gets the writer for the {@code classificationType} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code classificationType} property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + */ + @Nonnull + public final ClassificationTypeCesiumWriter getClassificationTypeWriter() { + return m_classificationType.getValue(); + } + + /** + * + Opens and returns the writer for the {@code classificationType} property. The {@code classificationType} property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + */ + @Nonnull + public final ClassificationTypeCesiumWriter openClassificationTypeProperty() { + openIntervalIfNecessary(); + return this. openAndReturn(getClassificationTypeWriter()); + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code classificationType} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The classification type. + */ + public final void writeClassificationTypeProperty(@Nonnull CesiumClassificationType value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeClassificationType(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The reference. + */ + public final void writeClassificationTypePropertyReference(Reference value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The reference. + */ + public final void writeClassificationTypePropertyReference(String value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyName The property on the referenced object. + */ + public final void writeClassificationTypePropertyReference(String identifier, String propertyName) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(identifier, propertyName); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + */ + public final void writeClassificationTypePropertyReference(String identifier, String[] propertyNames) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(identifier, propertyNames); + } finally { + DisposeHelper.dispose(writer); + } + } + } + /** * Gets the writer for the {@code zIndex} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code zIndex} property defines the z-index of the ellipse, used for ordering ground geometry. Only has an effect if the ellipse is constant, and {@code height} and {@code extrudedHeight} are not specified. If not specified, the default value is 0. diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/EllipsoidCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/EllipsoidCesiumWriter.java index 4355074c..9d59389c 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/EllipsoidCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/EllipsoidCesiumWriter.java @@ -11,6 +11,7 @@ import cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter; import cesiumlanguagewriter.DoubleCesiumWriter; import cesiumlanguagewriter.EllipsoidRadiiCesiumWriter; +import cesiumlanguagewriter.HeightReferenceCesiumWriter; import cesiumlanguagewriter.IntegerCesiumWriter; import cesiumlanguagewriter.MaterialCesiumWriter; import cesiumlanguagewriter.ShadowModeCesiumWriter; @@ -20,7 +21,7 @@ /** * - Writes a {@code Ellipsoid} to a {@link CesiumOutputStream}. A {@code Ellipsoid} is a closed quadric surface that is a three dimensional analogue of an ellipse. + Writes a {@code Ellipsoid} to a {@link CesiumOutputStream}. A {@code Ellipsoid} is a closed quadric surface that is a three-dimensional analogue of an ellipse. */ @@ -46,6 +47,13 @@ public class EllipsoidCesiumWriter extends CesiumPropertyWriter m_heightReference = new Lazy(new Func1() { + public cesiumlanguagewriter.HeightReferenceCesiumWriter invoke() { + return new HeightReferenceCesiumWriter(HeightReferencePropertyName); + } + }, false); private Lazy m_fill = new Lazy(new Func1() { public cesiumlanguagewriter.BooleanCesiumWriter invoke() { return new BooleanCesiumWriter(FillPropertyName); @@ -502,6 +515,127 @@ public final void writeRadiiPropertyReference(String identifier, String[] proper } } + /** + * Gets the writer for the {@code heightReference} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code heightReference} property defines the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + */ + @Nonnull + public final HeightReferenceCesiumWriter getHeightReferenceWriter() { + return m_heightReference.getValue(); + } + + /** + * + Opens and returns the writer for the {@code heightReference} property. The {@code heightReference} property defines the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + */ + @Nonnull + public final HeightReferenceCesiumWriter openHeightReferenceProperty() { + openIntervalIfNecessary(); + return this. openAndReturn(getHeightReferenceWriter()); + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code heightReference} value. The {@code heightReference} property specifies the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + * @param value The height reference. + */ + public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference value) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeHeightReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + * @param value The reference. + */ + public final void writeHeightReferencePropertyReference(Reference value) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + * @param value The reference. + */ + public final void writeHeightReferencePropertyReference(String value) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyName The property on the referenced object. + */ + public final void writeHeightReferencePropertyReference(String identifier, String propertyName) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(identifier, propertyName); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the ellipsoid, which indicates if the position is relative to terrain or not. If not specified, the default value is NONE. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + */ + public final void writeHeightReferencePropertyReference(String identifier, String[] propertyNames) { + { + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + try { + writer.writeReference(identifier, propertyNames); + } finally { + DisposeHelper.dispose(writer); + } + } + } + /** * Gets the writer for the {@code fill} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code fill} property defines whether or not the ellipsoid is filled. If not specified, the default value is {@code true}. diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/GridMaterialCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/GridMaterialCesiumWriter.java index ea93e98b..77fface5 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/GridMaterialCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/GridMaterialCesiumWriter.java @@ -17,7 +17,7 @@ /** * - Writes a {@code GridMaterial} to a {@link CesiumOutputStream}. A {@code GridMaterial} is a material that fills the surface with a two dimensional grid. + Writes a {@code GridMaterial} to a {@link CesiumOutputStream}. A {@code GridMaterial} is a material that fills the surface with a two-dimensional grid. */ diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PacketCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PacketCesiumWriter.java index 42a3f32a..568ce051 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PacketCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PacketCesiumWriter.java @@ -1565,7 +1565,7 @@ public final EllipseCesiumWriter openEllipseProperty() { } /** - * Gets the writer for the {@code ellipsoid} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code ellipsoid} property defines an ellipsoid, which is a closed quadric surface that is a three dimensional analogue of an ellipse. The ellipsoid is positioned and oriented using the {@code position} and {@code orientation} properties. + * Gets the writer for the {@code ellipsoid} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code ellipsoid} property defines an ellipsoid, which is a closed quadric surface that is a three-dimensional analogue of an ellipse. The ellipsoid is positioned and oriented using the {@code position} and {@code orientation} properties. */ @@ -1576,7 +1576,7 @@ public final EllipsoidCesiumWriter getEllipsoidWriter() { /** * - Opens and returns the writer for the {@code ellipsoid} property. The {@code ellipsoid} property defines an ellipsoid, which is a closed quadric surface that is a three dimensional analogue of an ellipse. The ellipsoid is positioned and oriented using the {@code position} and {@code orientation} properties. + Opens and returns the writer for the {@code ellipsoid} property. The {@code ellipsoid} property defines an ellipsoid, which is a closed quadric surface that is a three-dimensional analogue of an ellipse. The ellipsoid is positioned and oriented using the {@code position} and {@code orientation} properties. */ @@ -1733,7 +1733,7 @@ public final RectangleCesiumWriter openRectangleProperty() { } /** - * Gets the writer for the {@code wall} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code wall} property defines a two dimensional wall which conforms to the curvature of the globe and can be placed along the surface or at altitude. + * Gets the writer for the {@code wall} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code wall} property defines a two-dimensional wall which conforms to the curvature of the globe and can be placed along the surface or at altitude. */ @@ -1744,7 +1744,7 @@ public final WallCesiumWriter getWallWriter() { /** * - Opens and returns the writer for the {@code wall} property. The {@code wall} property defines a two dimensional wall which conforms to the curvature of the globe and can be placed along the surface or at altitude. + Opens and returns the writer for the {@code wall} property. The {@code wall} property defines a two-dimensional wall which conforms to the curvature of the globe and can be placed along the surface or at altitude. */ diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PathCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PathCesiumWriter.java index 7276357e..972b9683 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PathCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PathCesiumWriter.java @@ -34,32 +34,32 @@ public class PathCesiumWriter extends CesiumPropertyWriter { public static final String ShowPropertyName = "show"; /** * - The name of the {@code width} property. + The name of the {@code leadTime} property. */ - public static final String WidthPropertyName = "width"; + public static final String LeadTimePropertyName = "leadTime"; /** * - The name of the {@code resolution} property. + The name of the {@code trailTime} property. */ - public static final String ResolutionPropertyName = "resolution"; + public static final String TrailTimePropertyName = "trailTime"; /** * - The name of the {@code leadTime} property. + The name of the {@code width} property. */ - public static final String LeadTimePropertyName = "leadTime"; + public static final String WidthPropertyName = "width"; /** * - The name of the {@code trailTime} property. + The name of the {@code resolution} property. */ - public static final String TrailTimePropertyName = "trailTime"; + public static final String ResolutionPropertyName = "resolution"; /** * The name of the {@code material} property. @@ -79,24 +79,24 @@ public cesiumlanguagewriter.BooleanCesiumWriter invoke() { return new BooleanCesiumWriter(ShowPropertyName); } }, false); - private Lazy m_width = new Lazy(new Func1() { + private Lazy m_leadTime = new Lazy(new Func1() { public cesiumlanguagewriter.DoubleCesiumWriter invoke() { - return new DoubleCesiumWriter(WidthPropertyName); + return new DoubleCesiumWriter(LeadTimePropertyName); } }, false); - private Lazy m_resolution = new Lazy(new Func1() { + private Lazy m_trailTime = new Lazy(new Func1() { public cesiumlanguagewriter.DoubleCesiumWriter invoke() { - return new DoubleCesiumWriter(ResolutionPropertyName); + return new DoubleCesiumWriter(TrailTimePropertyName); } }, false); - private Lazy m_leadTime = new Lazy(new Func1() { + private Lazy m_width = new Lazy(new Func1() { public cesiumlanguagewriter.DoubleCesiumWriter invoke() { - return new DoubleCesiumWriter(LeadTimePropertyName); + return new DoubleCesiumWriter(WidthPropertyName); } }, false); - private Lazy m_trailTime = new Lazy(new Func1() { + private Lazy m_resolution = new Lazy(new Func1() { public cesiumlanguagewriter.DoubleCesiumWriter invoke() { - return new DoubleCesiumWriter(TrailTimePropertyName); + return new DoubleCesiumWriter(ResolutionPropertyName); } }, false); private Lazy m_material = new Lazy(new Func1() { @@ -271,38 +271,38 @@ public final void writeShowPropertyReference(String identifier, String[] propert } /** - * Gets the writer for the {@code width} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code width} property defines the width of the path line. If not specified, the default value is 1.0. + * Gets the writer for the {@code leadTime} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code leadTime} property defines the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. */ @Nonnull - public final DoubleCesiumWriter getWidthWriter() { - return m_width.getValue(); + public final DoubleCesiumWriter getLeadTimeWriter() { + return m_leadTime.getValue(); } /** * - Opens and returns the writer for the {@code width} property. The {@code width} property defines the width of the path line. If not specified, the default value is 1.0. + Opens and returns the writer for the {@code leadTime} property. The {@code leadTime} property defines the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. */ @Nonnull - public final DoubleCesiumWriter openWidthProperty() { + public final DoubleCesiumWriter openLeadTimeProperty() { openIntervalIfNecessary(); - return this. openAndReturn(getWidthWriter()); + return this. openAndReturn(getLeadTimeWriter()); } /** * - Writes a value for the {@code width} property as a {@code number} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. + Writes a value for the {@code leadTime} property as a {@code number} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. * @param value The value. */ - public final void writeWidthProperty(double value) { + public final void writeLeadTimeProperty(double value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); try { writer.writeNumber(value); } finally { @@ -313,7 +313,7 @@ public final void writeWidthProperty(double value) { /** * - Writes a value for the {@code width} property as a {@code number} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. + Writes a value for the {@code leadTime} property as a {@code number} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. @@ -321,9 +321,9 @@ public final void writeWidthProperty(double value) { * @param dates The dates at which the value is specified. * @param values The values corresponding to each date. */ - public final void writeWidthProperty(List dates, List values) { + public final void writeLeadTimeProperty(List dates, List values) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); try { writer.writeNumber(dates, values); } finally { @@ -334,7 +334,7 @@ public final void writeWidthProperty(List dates, List values /** * - Writes a value for the {@code width} property as a {@code number} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. + Writes a value for the {@code leadTime} property as a {@code number} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. @@ -346,9 +346,9 @@ public final void writeWidthProperty(List dates, List values * @param startIndex The index of the first element to write. * @param length The number of elements to write. */ - public final void writeWidthProperty(List dates, List values, int startIndex, int length) { + public final void writeLeadTimeProperty(List dates, List values, int startIndex, int length) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); try { writer.writeNumber(dates, values, startIndex, length); } finally { @@ -359,15 +359,15 @@ public final void writeWidthProperty(List dates, List values /** * - Writes a value for the {@code width} property as a {@code reference} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. + Writes a value for the {@code leadTime} property as a {@code reference} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. * @param value The reference. */ - public final void writeWidthPropertyReference(Reference value) { + public final void writeLeadTimePropertyReference(Reference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); try { writer.writeReference(value); } finally { @@ -378,15 +378,15 @@ public final void writeWidthPropertyReference(Reference value) { /** * - Writes a value for the {@code width} property as a {@code reference} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. + Writes a value for the {@code leadTime} property as a {@code reference} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. * @param value The reference. */ - public final void writeWidthPropertyReference(String value) { + public final void writeLeadTimePropertyReference(String value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); try { writer.writeReference(value); } finally { @@ -397,7 +397,7 @@ public final void writeWidthPropertyReference(String value) { /** * - Writes a value for the {@code width} property as a {@code reference} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. + Writes a value for the {@code leadTime} property as a {@code reference} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. @@ -405,9 +405,9 @@ public final void writeWidthPropertyReference(String value) { * @param identifier The identifier of the object which contains the referenced property. * @param propertyName The property on the referenced object. */ - public final void writeWidthPropertyReference(String identifier, String propertyName) { + public final void writeLeadTimePropertyReference(String identifier, String propertyName) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); try { writer.writeReference(identifier, propertyName); } finally { @@ -418,7 +418,7 @@ public final void writeWidthPropertyReference(String identifier, String property /** * - Writes a value for the {@code width} property as a {@code reference} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. + Writes a value for the {@code leadTime} property as a {@code reference} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. @@ -426,9 +426,9 @@ public final void writeWidthPropertyReference(String identifier, String property * @param identifier The identifier of the object which contains the referenced property. * @param propertyNames The hierarchy of properties to be indexed on the referenced object. */ - public final void writeWidthPropertyReference(String identifier, String[] propertyNames) { + public final void writeLeadTimePropertyReference(String identifier, String[] propertyNames) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); try { writer.writeReference(identifier, propertyNames); } finally { @@ -438,38 +438,38 @@ public final void writeWidthPropertyReference(String identifier, String[] proper } /** - * Gets the writer for the {@code resolution} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code resolution} property defines the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + * Gets the writer for the {@code trailTime} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code trailTime} property defines the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. */ @Nonnull - public final DoubleCesiumWriter getResolutionWriter() { - return m_resolution.getValue(); + public final DoubleCesiumWriter getTrailTimeWriter() { + return m_trailTime.getValue(); } /** * - Opens and returns the writer for the {@code resolution} property. The {@code resolution} property defines the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + Opens and returns the writer for the {@code trailTime} property. The {@code trailTime} property defines the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. */ @Nonnull - public final DoubleCesiumWriter openResolutionProperty() { + public final DoubleCesiumWriter openTrailTimeProperty() { openIntervalIfNecessary(); - return this. openAndReturn(getResolutionWriter()); + return this. openAndReturn(getTrailTimeWriter()); } /** * - Writes a value for the {@code resolution} property as a {@code number} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + Writes a value for the {@code trailTime} property as a {@code number} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. * @param value The value. */ - public final void writeResolutionProperty(double value) { + public final void writeTrailTimeProperty(double value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); try { writer.writeNumber(value); } finally { @@ -480,7 +480,7 @@ public final void writeResolutionProperty(double value) { /** * - Writes a value for the {@code resolution} property as a {@code number} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + Writes a value for the {@code trailTime} property as a {@code number} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. @@ -488,9 +488,9 @@ public final void writeResolutionProperty(double value) { * @param dates The dates at which the value is specified. * @param values The values corresponding to each date. */ - public final void writeResolutionProperty(List dates, List values) { + public final void writeTrailTimeProperty(List dates, List values) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); try { writer.writeNumber(dates, values); } finally { @@ -501,7 +501,7 @@ public final void writeResolutionProperty(List dates, List v /** * - Writes a value for the {@code resolution} property as a {@code number} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + Writes a value for the {@code trailTime} property as a {@code number} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. @@ -513,9 +513,9 @@ public final void writeResolutionProperty(List dates, List v * @param startIndex The index of the first element to write. * @param length The number of elements to write. */ - public final void writeResolutionProperty(List dates, List values, int startIndex, int length) { + public final void writeTrailTimeProperty(List dates, List values, int startIndex, int length) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); try { writer.writeNumber(dates, values, startIndex, length); } finally { @@ -526,15 +526,15 @@ public final void writeResolutionProperty(List dates, List v /** * - Writes a value for the {@code resolution} property as a {@code reference} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + Writes a value for the {@code trailTime} property as a {@code reference} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. * @param value The reference. */ - public final void writeResolutionPropertyReference(Reference value) { + public final void writeTrailTimePropertyReference(Reference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); try { writer.writeReference(value); } finally { @@ -545,15 +545,15 @@ public final void writeResolutionPropertyReference(Reference value) { /** * - Writes a value for the {@code resolution} property as a {@code reference} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + Writes a value for the {@code trailTime} property as a {@code reference} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. * @param value The reference. */ - public final void writeResolutionPropertyReference(String value) { + public final void writeTrailTimePropertyReference(String value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); try { writer.writeReference(value); } finally { @@ -564,7 +564,7 @@ public final void writeResolutionPropertyReference(String value) { /** * - Writes a value for the {@code resolution} property as a {@code reference} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + Writes a value for the {@code trailTime} property as a {@code reference} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. @@ -572,9 +572,9 @@ public final void writeResolutionPropertyReference(String value) { * @param identifier The identifier of the object which contains the referenced property. * @param propertyName The property on the referenced object. */ - public final void writeResolutionPropertyReference(String identifier, String propertyName) { + public final void writeTrailTimePropertyReference(String identifier, String propertyName) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); try { writer.writeReference(identifier, propertyName); } finally { @@ -585,7 +585,7 @@ public final void writeResolutionPropertyReference(String identifier, String pro /** * - Writes a value for the {@code resolution} property as a {@code reference} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. + Writes a value for the {@code trailTime} property as a {@code reference} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. @@ -593,9 +593,9 @@ public final void writeResolutionPropertyReference(String identifier, String pro * @param identifier The identifier of the object which contains the referenced property. * @param propertyNames The hierarchy of properties to be indexed on the referenced object. */ - public final void writeResolutionPropertyReference(String identifier, String[] propertyNames) { + public final void writeTrailTimePropertyReference(String identifier, String[] propertyNames) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); try { writer.writeReference(identifier, propertyNames); } finally { @@ -605,38 +605,38 @@ public final void writeResolutionPropertyReference(String identifier, String[] p } /** - * Gets the writer for the {@code leadTime} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code leadTime} property defines the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + * Gets the writer for the {@code width} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code width} property defines the width of the path line. If not specified, the default value is 1.0. */ @Nonnull - public final DoubleCesiumWriter getLeadTimeWriter() { - return m_leadTime.getValue(); + public final DoubleCesiumWriter getWidthWriter() { + return m_width.getValue(); } /** * - Opens and returns the writer for the {@code leadTime} property. The {@code leadTime} property defines the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Opens and returns the writer for the {@code width} property. The {@code width} property defines the width of the path line. If not specified, the default value is 1.0. */ @Nonnull - public final DoubleCesiumWriter openLeadTimeProperty() { + public final DoubleCesiumWriter openWidthProperty() { openIntervalIfNecessary(); - return this. openAndReturn(getLeadTimeWriter()); + return this. openAndReturn(getWidthWriter()); } /** * - Writes a value for the {@code leadTime} property as a {@code number} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code width} property as a {@code number} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. * @param value The value. */ - public final void writeLeadTimeProperty(double value) { + public final void writeWidthProperty(double value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); try { writer.writeNumber(value); } finally { @@ -647,7 +647,7 @@ public final void writeLeadTimeProperty(double value) { /** * - Writes a value for the {@code leadTime} property as a {@code number} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code width} property as a {@code number} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. @@ -655,9 +655,9 @@ public final void writeLeadTimeProperty(double value) { * @param dates The dates at which the value is specified. * @param values The values corresponding to each date. */ - public final void writeLeadTimeProperty(List dates, List values) { + public final void writeWidthProperty(List dates, List values) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); try { writer.writeNumber(dates, values); } finally { @@ -668,7 +668,7 @@ public final void writeLeadTimeProperty(List dates, List val /** * - Writes a value for the {@code leadTime} property as a {@code number} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code width} property as a {@code number} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. @@ -680,9 +680,9 @@ public final void writeLeadTimeProperty(List dates, List val * @param startIndex The index of the first element to write. * @param length The number of elements to write. */ - public final void writeLeadTimeProperty(List dates, List values, int startIndex, int length) { + public final void writeWidthProperty(List dates, List values, int startIndex, int length) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); try { writer.writeNumber(dates, values, startIndex, length); } finally { @@ -693,15 +693,15 @@ public final void writeLeadTimeProperty(List dates, List val /** * - Writes a value for the {@code leadTime} property as a {@code reference} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code width} property as a {@code reference} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. * @param value The reference. */ - public final void writeLeadTimePropertyReference(Reference value) { + public final void writeWidthPropertyReference(Reference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); try { writer.writeReference(value); } finally { @@ -712,15 +712,15 @@ public final void writeLeadTimePropertyReference(Reference value) { /** * - Writes a value for the {@code leadTime} property as a {@code reference} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code width} property as a {@code reference} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. * @param value The reference. */ - public final void writeLeadTimePropertyReference(String value) { + public final void writeWidthPropertyReference(String value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); try { writer.writeReference(value); } finally { @@ -731,7 +731,7 @@ public final void writeLeadTimePropertyReference(String value) { /** * - Writes a value for the {@code leadTime} property as a {@code reference} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code width} property as a {@code reference} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. @@ -739,9 +739,9 @@ public final void writeLeadTimePropertyReference(String value) { * @param identifier The identifier of the object which contains the referenced property. * @param propertyName The property on the referenced object. */ - public final void writeLeadTimePropertyReference(String identifier, String propertyName) { + public final void writeWidthPropertyReference(String identifier, String propertyName) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); try { writer.writeReference(identifier, propertyName); } finally { @@ -752,7 +752,7 @@ public final void writeLeadTimePropertyReference(String identifier, String prope /** * - Writes a value for the {@code leadTime} property as a {@code reference} value. The {@code leadTime} property specifies the time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code width} property as a {@code reference} value. The {@code width} property specifies the width of the path line. If not specified, the default value is 1.0. @@ -760,9 +760,9 @@ public final void writeLeadTimePropertyReference(String identifier, String prope * @param identifier The identifier of the object which contains the referenced property. * @param propertyNames The hierarchy of properties to be indexed on the referenced object. */ - public final void writeLeadTimePropertyReference(String identifier, String[] propertyNames) { + public final void writeWidthPropertyReference(String identifier, String[] propertyNames) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openLeadTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openWidthProperty(); try { writer.writeReference(identifier, propertyNames); } finally { @@ -772,38 +772,38 @@ public final void writeLeadTimePropertyReference(String identifier, String[] pro } /** - * Gets the writer for the {@code trailTime} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code trailTime} property defines the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + * Gets the writer for the {@code resolution} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code resolution} property defines the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. */ @Nonnull - public final DoubleCesiumWriter getTrailTimeWriter() { - return m_trailTime.getValue(); + public final DoubleCesiumWriter getResolutionWriter() { + return m_resolution.getValue(); } /** * - Opens and returns the writer for the {@code trailTime} property. The {@code trailTime} property defines the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Opens and returns the writer for the {@code resolution} property. The {@code resolution} property defines the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. */ @Nonnull - public final DoubleCesiumWriter openTrailTimeProperty() { + public final DoubleCesiumWriter openResolutionProperty() { openIntervalIfNecessary(); - return this. openAndReturn(getTrailTimeWriter()); + return this. openAndReturn(getResolutionWriter()); } /** * - Writes a value for the {@code trailTime} property as a {@code number} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code resolution} property as a {@code number} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. * @param value The value. */ - public final void writeTrailTimeProperty(double value) { + public final void writeResolutionProperty(double value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); try { writer.writeNumber(value); } finally { @@ -814,7 +814,7 @@ public final void writeTrailTimeProperty(double value) { /** * - Writes a value for the {@code trailTime} property as a {@code number} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code resolution} property as a {@code number} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. @@ -822,9 +822,9 @@ public final void writeTrailTimeProperty(double value) { * @param dates The dates at which the value is specified. * @param values The values corresponding to each date. */ - public final void writeTrailTimeProperty(List dates, List values) { + public final void writeResolutionProperty(List dates, List values) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); try { writer.writeNumber(dates, values); } finally { @@ -835,7 +835,7 @@ public final void writeTrailTimeProperty(List dates, List va /** * - Writes a value for the {@code trailTime} property as a {@code number} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code resolution} property as a {@code number} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. @@ -847,9 +847,9 @@ public final void writeTrailTimeProperty(List dates, List va * @param startIndex The index of the first element to write. * @param length The number of elements to write. */ - public final void writeTrailTimeProperty(List dates, List values, int startIndex, int length) { + public final void writeResolutionProperty(List dates, List values, int startIndex, int length) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); try { writer.writeNumber(dates, values, startIndex, length); } finally { @@ -860,15 +860,15 @@ public final void writeTrailTimeProperty(List dates, List va /** * - Writes a value for the {@code trailTime} property as a {@code reference} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code resolution} property as a {@code reference} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. * @param value The reference. */ - public final void writeTrailTimePropertyReference(Reference value) { + public final void writeResolutionPropertyReference(Reference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); try { writer.writeReference(value); } finally { @@ -879,15 +879,15 @@ public final void writeTrailTimePropertyReference(Reference value) { /** * - Writes a value for the {@code trailTime} property as a {@code reference} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code resolution} property as a {@code reference} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. * @param value The reference. */ - public final void writeTrailTimePropertyReference(String value) { + public final void writeResolutionPropertyReference(String value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); try { writer.writeReference(value); } finally { @@ -898,7 +898,7 @@ public final void writeTrailTimePropertyReference(String value) { /** * - Writes a value for the {@code trailTime} property as a {@code reference} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code resolution} property as a {@code reference} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. @@ -906,9 +906,9 @@ public final void writeTrailTimePropertyReference(String value) { * @param identifier The identifier of the object which contains the referenced property. * @param propertyName The property on the referenced object. */ - public final void writeTrailTimePropertyReference(String identifier, String propertyName) { + public final void writeResolutionPropertyReference(String identifier, String propertyName) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); try { writer.writeReference(identifier, propertyName); } finally { @@ -919,7 +919,7 @@ public final void writeTrailTimePropertyReference(String identifier, String prop /** * - Writes a value for the {@code trailTime} property as a {@code reference} value. The {@code trailTime} property specifies the time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object. + Writes a value for the {@code resolution} property as a {@code reference} value. The {@code resolution} property specifies the maximum step-size, in seconds, used to sample the path. If the {@code position} property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path. If not specified, the default value is 60.0. @@ -927,9 +927,9 @@ public final void writeTrailTimePropertyReference(String identifier, String prop * @param identifier The identifier of the object which contains the referenced property. * @param propertyNames The hierarchy of properties to be indexed on the referenced object. */ - public final void writeTrailTimePropertyReference(String identifier, String[] propertyNames) { + public final void writeResolutionPropertyReference(String identifier, String[] propertyNames) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openTrailTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openResolutionProperty(); try { writer.writeReference(identifier, propertyNames); } finally { diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PolygonCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PolygonCesiumWriter.java index 42a89c0d..06689f33 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PolygonCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PolygonCesiumWriter.java @@ -8,6 +8,7 @@ import cesiumlanguagewriter.advanced.*; import cesiumlanguagewriter.ArcTypeCesiumWriter; import cesiumlanguagewriter.BooleanCesiumWriter; +import cesiumlanguagewriter.ClassificationTypeCesiumWriter; import cesiumlanguagewriter.ColorCesiumWriter; import cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter; import cesiumlanguagewriter.DoubleCesiumWriter; @@ -62,18 +63,18 @@ public class PolygonCesiumWriter extends CesiumPropertyWriter m_extrudedHeight = new Lazy(new Func1() { - public cesiumlanguagewriter.DoubleCesiumWriter invoke() { - return new DoubleCesiumWriter(ExtrudedHeightPropertyName); - } - }, false); private Lazy m_heightReference = new Lazy(new Func1() { public cesiumlanguagewriter.HeightReferenceCesiumWriter invoke() { return new HeightReferenceCesiumWriter(HeightReferencePropertyName); } }, false); + private Lazy m_extrudedHeight = new Lazy(new Func1() { + public cesiumlanguagewriter.DoubleCesiumWriter invoke() { + return new DoubleCesiumWriter(ExtrudedHeightPropertyName); + } + }, false); private Lazy m_extrudedHeightReference = new Lazy(new Func1() { public cesiumlanguagewriter.HeightReferenceCesiumWriter invoke() { return new HeightReferenceCesiumWriter(ExtrudedHeightReferencePropertyName); @@ -268,6 +276,11 @@ public cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter invoke() { return new DistanceDisplayConditionCesiumWriter(DistanceDisplayConditionPropertyName); } }, false); + private Lazy m_classificationType = new Lazy(new Func1() { + public cesiumlanguagewriter.ClassificationTypeCesiumWriter invoke() { + return new ClassificationTypeCesiumWriter(ClassificationTypePropertyName); + } + }, false); private Lazy m_zIndex = new Lazy(new Func1() { public cesiumlanguagewriter.IntegerCesiumWriter invoke() { return new IntegerCesiumWriter(ZIndexPropertyName); @@ -820,40 +833,40 @@ public final void writeHeightPropertyReference(String identifier, String[] prope } /** - * Gets the writer for the {@code extrudedHeight} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code extrudedHeight} property defines the extruded height of the polygon. + * Gets the writer for the {@code heightReference} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code heightReference} property defines the height reference of the polygon, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. */ @Nonnull - public final DoubleCesiumWriter getExtrudedHeightWriter() { - return m_extrudedHeight.getValue(); + public final HeightReferenceCesiumWriter getHeightReferenceWriter() { + return m_heightReference.getValue(); } /** * - Opens and returns the writer for the {@code extrudedHeight} property. The {@code extrudedHeight} property defines the extruded height of the polygon. + Opens and returns the writer for the {@code heightReference} property. The {@code heightReference} property defines the height reference of the polygon, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. */ @Nonnull - public final DoubleCesiumWriter openExtrudedHeightProperty() { + public final HeightReferenceCesiumWriter openHeightReferenceProperty() { openIntervalIfNecessary(); - return this. openAndReturn(getExtrudedHeightWriter()); + return this. openAndReturn(getHeightReferenceWriter()); } /** * - Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the polygon. + Writes a value for the {@code heightReference} property as a {@code heightReference} value. The {@code heightReference} property specifies the height reference of the polygon, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param value The value. + * @param value The height reference. */ - public final void writeExtrudedHeightProperty(double value) { + public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(value); + writer.writeHeightReference(value); } finally { DisposeHelper.dispose(writer); } @@ -862,19 +875,17 @@ public final void writeExtrudedHeightProperty(double value) { /** * - Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the polygon. - + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the polygon, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param dates The dates at which the value is specified. - * @param values The values corresponding to each date. + * @param value The reference. */ - public final void writeExtrudedHeightProperty(List dates, List values) { + public final void writeHeightReferencePropertyReference(Reference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(dates, values); + writer.writeReference(value); } finally { DisposeHelper.dispose(writer); } @@ -883,23 +894,17 @@ public final void writeExtrudedHeightProperty(List dates, List dates, List values, int startIndex, int length) { + public final void writeHeightReferencePropertyReference(String value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(dates, values, startIndex, length); + writer.writeReference(value); } finally { DisposeHelper.dispose(writer); } @@ -908,17 +913,19 @@ public final void writeExtrudedHeightProperty(List dates, List openAndReturn(getExtrudedHeightWriter()); + } + + /** + * + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the polygon. - * @param identifier The identifier of the object which contains the referenced property. - * @param propertyName The property on the referenced object. + * @param value The value. */ - public final void writeExtrudedHeightPropertyReference(String identifier, String propertyName) { + public final void writeExtrudedHeightProperty(double value) { { cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeReference(identifier, propertyName); + writer.writeNumber(value); } finally { DisposeHelper.dispose(writer); } @@ -967,60 +996,44 @@ public final void writeExtrudedHeightPropertyReference(String identifier, String /** * - Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the polygon. + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the polygon. - * @param identifier The identifier of the object which contains the referenced property. - * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + * @param dates The dates at which the value is specified. + * @param values The values corresponding to each date. */ - public final void writeExtrudedHeightPropertyReference(String identifier, String[] propertyNames) { + public final void writeExtrudedHeightProperty(List dates, List values) { { cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeReference(identifier, propertyNames); + writer.writeNumber(dates, values); } finally { DisposeHelper.dispose(writer); } } } - /** - * Gets the writer for the {@code heightReference} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code heightReference} property defines the height reference of the polygon, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - - - */ - @Nonnull - public final HeightReferenceCesiumWriter getHeightReferenceWriter() { - return m_heightReference.getValue(); - } - /** * - Opens and returns the writer for the {@code heightReference} property. The {@code heightReference} property defines the height reference of the polygon, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the polygon. + + - - */ - @Nonnull - public final HeightReferenceCesiumWriter openHeightReferenceProperty() { - openIntervalIfNecessary(); - return this. openAndReturn(getHeightReferenceWriter()); - } - - /** - * - Writes a value for the {@code heightReference} property as a {@code heightReference} value. The {@code heightReference} property specifies the height reference of the polygon, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param value The height reference. + * @param dates The dates at which the value is specified. + * @param values The value corresponding to each date. + * @param startIndex The index of the first element to write. + * @param length The number of elements to write. */ - public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference value) { + public final void writeExtrudedHeightProperty(List dates, List values, int startIndex, int length) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeHeightReference(value); + writer.writeNumber(dates, values, startIndex, length); } finally { DisposeHelper.dispose(writer); } @@ -1029,15 +1042,15 @@ public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference va /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the polygon, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the polygon. * @param value The reference. */ - public final void writeHeightReferencePropertyReference(Reference value) { + public final void writeExtrudedHeightPropertyReference(Reference value) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(value); } finally { @@ -1048,15 +1061,15 @@ public final void writeHeightReferencePropertyReference(Reference value) { /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the polygon, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the polygon. * @param value The reference. */ - public final void writeHeightReferencePropertyReference(String value) { + public final void writeExtrudedHeightPropertyReference(String value) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(value); } finally { @@ -1067,7 +1080,7 @@ public final void writeHeightReferencePropertyReference(String value) { /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the polygon, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the polygon. @@ -1075,9 +1088,9 @@ public final void writeHeightReferencePropertyReference(String value) { * @param identifier The identifier of the object which contains the referenced property. * @param propertyName The property on the referenced object. */ - public final void writeHeightReferencePropertyReference(String identifier, String propertyName) { + public final void writeExtrudedHeightPropertyReference(String identifier, String propertyName) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(identifier, propertyName); } finally { @@ -1088,7 +1101,7 @@ public final void writeHeightReferencePropertyReference(String identifier, Strin /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the polygon, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the polygon. @@ -1096,9 +1109,9 @@ public final void writeHeightReferencePropertyReference(String identifier, Strin * @param identifier The identifier of the object which contains the referenced property. * @param propertyNames The hierarchy of properties to be indexed on the referenced object. */ - public final void writeHeightReferencePropertyReference(String identifier, String[] propertyNames) { + public final void writeExtrudedHeightPropertyReference(String identifier, String[] propertyNames) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(identifier, propertyNames); } finally { @@ -2947,6 +2960,127 @@ public final void writeDistanceDisplayConditionPropertyReference(String identifi } } + /** + * Gets the writer for the {@code classificationType} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code classificationType} property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + */ + @Nonnull + public final ClassificationTypeCesiumWriter getClassificationTypeWriter() { + return m_classificationType.getValue(); + } + + /** + * + Opens and returns the writer for the {@code classificationType} property. The {@code classificationType} property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + */ + @Nonnull + public final ClassificationTypeCesiumWriter openClassificationTypeProperty() { + openIntervalIfNecessary(); + return this. openAndReturn(getClassificationTypeWriter()); + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code classificationType} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The classification type. + */ + public final void writeClassificationTypeProperty(@Nonnull CesiumClassificationType value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeClassificationType(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The reference. + */ + public final void writeClassificationTypePropertyReference(Reference value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The reference. + */ + public final void writeClassificationTypePropertyReference(String value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyName The property on the referenced object. + */ + public final void writeClassificationTypePropertyReference(String identifier, String propertyName) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(identifier, propertyName); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + */ + public final void writeClassificationTypePropertyReference(String identifier, String[] propertyNames) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(identifier, propertyNames); + } finally { + DisposeHelper.dispose(writer); + } + } + } + /** * Gets the writer for the {@code zIndex} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code zIndex} property defines the z-index of the polygon, used for ordering ground geometry. Only has an effect if the polygon is constant, and {@code height} and {@code extrudedHeight} are not specified. If not specified, the default value is 0. diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PolylineCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PolylineCesiumWriter.java index dba765f0..a5a7927e 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PolylineCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/PolylineCesiumWriter.java @@ -8,6 +8,7 @@ import cesiumlanguagewriter.advanced.*; import cesiumlanguagewriter.ArcTypeCesiumWriter; import cesiumlanguagewriter.BooleanCesiumWriter; +import cesiumlanguagewriter.ClassificationTypeCesiumWriter; import cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter; import cesiumlanguagewriter.DoubleCesiumWriter; import cesiumlanguagewriter.IntegerCesiumWriter; @@ -108,6 +109,13 @@ public class PolylineCesiumWriter extends CesiumPropertyWriter m_classificationType = new Lazy(new Func1() { + public cesiumlanguagewriter.ClassificationTypeCesiumWriter invoke() { + return new ClassificationTypeCesiumWriter(ClassificationTypePropertyName); + } + }, false); private Lazy m_zIndex = new Lazy(new Func1() { public cesiumlanguagewriter.IntegerCesiumWriter invoke() { return new IntegerCesiumWriter(ZIndexPropertyName); @@ -1482,6 +1495,127 @@ public final void writeClampToGroundPropertyReference(String identifier, String[ } } + /** + * Gets the writer for the {@code classificationType} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code classificationType} property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + */ + @Nonnull + public final ClassificationTypeCesiumWriter getClassificationTypeWriter() { + return m_classificationType.getValue(); + } + + /** + * + Opens and returns the writer for the {@code classificationType} property. The {@code classificationType} property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + */ + @Nonnull + public final ClassificationTypeCesiumWriter openClassificationTypeProperty() { + openIntervalIfNecessary(); + return this. openAndReturn(getClassificationTypeWriter()); + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code classificationType} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The classification type. + */ + public final void writeClassificationTypeProperty(@Nonnull CesiumClassificationType value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeClassificationType(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The reference. + */ + public final void writeClassificationTypePropertyReference(Reference value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The reference. + */ + public final void writeClassificationTypePropertyReference(String value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyName The property on the referenced object. + */ + public final void writeClassificationTypePropertyReference(String identifier, String propertyName) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(identifier, propertyName); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + */ + public final void writeClassificationTypePropertyReference(String identifier, String[] propertyNames) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(identifier, propertyNames); + } finally { + DisposeHelper.dispose(writer); + } + } + } + /** * Gets the writer for the {@code zIndex} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code zIndex} property defines the z-index of the polyline, used for ordering ground geometry. Only has an effect if the polyline is constant, and {@code clampToGround} is true. If not specified, the default value is 0. diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/RectangleCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/RectangleCesiumWriter.java index e7f7c946..7337761c 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/RectangleCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/RectangleCesiumWriter.java @@ -7,6 +7,7 @@ import agi.foundation.compatibility.Lazy; import cesiumlanguagewriter.advanced.*; import cesiumlanguagewriter.BooleanCesiumWriter; +import cesiumlanguagewriter.ClassificationTypeCesiumWriter; import cesiumlanguagewriter.ColorCesiumWriter; import cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter; import cesiumlanguagewriter.DoubleCesiumWriter; @@ -54,18 +55,18 @@ public class RectangleCesiumWriter extends CesiumPropertyWriter m_extrudedHeight = new Lazy(new Func1() { - public cesiumlanguagewriter.DoubleCesiumWriter invoke() { - return new DoubleCesiumWriter(ExtrudedHeightPropertyName); - } - }, false); private Lazy m_heightReference = new Lazy(new Func1() { public cesiumlanguagewriter.HeightReferenceCesiumWriter invoke() { return new HeightReferenceCesiumWriter(HeightReferencePropertyName); } }, false); + private Lazy m_extrudedHeight = new Lazy(new Func1() { + public cesiumlanguagewriter.DoubleCesiumWriter invoke() { + return new DoubleCesiumWriter(ExtrudedHeightPropertyName); + } + }, false); private Lazy m_extrudedHeightReference = new Lazy(new Func1() { public cesiumlanguagewriter.HeightReferenceCesiumWriter invoke() { return new HeightReferenceCesiumWriter(ExtrudedHeightReferencePropertyName); @@ -231,6 +239,11 @@ public cesiumlanguagewriter.DistanceDisplayConditionCesiumWriter invoke() { return new DistanceDisplayConditionCesiumWriter(DistanceDisplayConditionPropertyName); } }, false); + private Lazy m_classificationType = new Lazy(new Func1() { + public cesiumlanguagewriter.ClassificationTypeCesiumWriter invoke() { + return new ClassificationTypeCesiumWriter(ClassificationTypePropertyName); + } + }, false); private Lazy m_zIndex = new Lazy(new Func1() { public cesiumlanguagewriter.IntegerCesiumWriter invoke() { return new IntegerCesiumWriter(ZIndexPropertyName); @@ -846,40 +859,40 @@ public final void writeHeightPropertyReference(String identifier, String[] prope } /** - * Gets the writer for the {@code extrudedHeight} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code extrudedHeight} property defines the extruded height of the rectangle. + * Gets the writer for the {@code heightReference} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code heightReference} property defines the height reference of the rectangle, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. */ @Nonnull - public final DoubleCesiumWriter getExtrudedHeightWriter() { - return m_extrudedHeight.getValue(); + public final HeightReferenceCesiumWriter getHeightReferenceWriter() { + return m_heightReference.getValue(); } /** * - Opens and returns the writer for the {@code extrudedHeight} property. The {@code extrudedHeight} property defines the extruded height of the rectangle. + Opens and returns the writer for the {@code heightReference} property. The {@code heightReference} property defines the height reference of the rectangle, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. */ @Nonnull - public final DoubleCesiumWriter openExtrudedHeightProperty() { + public final HeightReferenceCesiumWriter openHeightReferenceProperty() { openIntervalIfNecessary(); - return this. openAndReturn(getExtrudedHeightWriter()); + return this. openAndReturn(getHeightReferenceWriter()); } /** * - Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the rectangle. + Writes a value for the {@code heightReference} property as a {@code heightReference} value. The {@code heightReference} property specifies the height reference of the rectangle, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param value The value. + * @param value The height reference. */ - public final void writeExtrudedHeightProperty(double value) { + public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(value); + writer.writeHeightReference(value); } finally { DisposeHelper.dispose(writer); } @@ -888,19 +901,17 @@ public final void writeExtrudedHeightProperty(double value) { /** * - Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the rectangle. - + Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the rectangle, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param dates The dates at which the value is specified. - * @param values The values corresponding to each date. + * @param value The reference. */ - public final void writeExtrudedHeightProperty(List dates, List values) { + public final void writeHeightReferencePropertyReference(Reference value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(dates, values); + writer.writeReference(value); } finally { DisposeHelper.dispose(writer); } @@ -909,23 +920,17 @@ public final void writeExtrudedHeightProperty(List dates, List dates, List values, int startIndex, int length) { + public final void writeHeightReferencePropertyReference(String value) { { - cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); try { - writer.writeNumber(dates, values, startIndex, length); + writer.writeReference(value); } finally { DisposeHelper.dispose(writer); } @@ -934,17 +939,19 @@ public final void writeExtrudedHeightProperty(List dates, List openAndReturn(getExtrudedHeightWriter()); + } + + /** + * + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the rectangle. - * @param identifier The identifier of the object which contains the referenced property. - * @param propertyName The property on the referenced object. + * @param value The value. */ - public final void writeExtrudedHeightPropertyReference(String identifier, String propertyName) { + public final void writeExtrudedHeightProperty(double value) { { cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeReference(identifier, propertyName); + writer.writeNumber(value); } finally { DisposeHelper.dispose(writer); } @@ -993,60 +1022,44 @@ public final void writeExtrudedHeightPropertyReference(String identifier, String /** * - Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the rectangle. + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the rectangle. - * @param identifier The identifier of the object which contains the referenced property. - * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + * @param dates The dates at which the value is specified. + * @param values The values corresponding to each date. */ - public final void writeExtrudedHeightPropertyReference(String identifier, String[] propertyNames) { + public final void writeExtrudedHeightProperty(List dates, List values) { { cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeReference(identifier, propertyNames); + writer.writeNumber(dates, values); } finally { DisposeHelper.dispose(writer); } } } - /** - * Gets the writer for the {@code heightReference} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code heightReference} property defines the height reference of the rectangle, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - - - */ - @Nonnull - public final HeightReferenceCesiumWriter getHeightReferenceWriter() { - return m_heightReference.getValue(); - } - /** * - Opens and returns the writer for the {@code heightReference} property. The {@code heightReference} property defines the height reference of the rectangle, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code number} value. The {@code extrudedHeight} property specifies the extruded height of the rectangle. + + - - */ - @Nonnull - public final HeightReferenceCesiumWriter openHeightReferenceProperty() { - openIntervalIfNecessary(); - return this. openAndReturn(getHeightReferenceWriter()); - } - - /** - * - Writes a value for the {@code heightReference} property as a {@code heightReference} value. The {@code heightReference} property specifies the height reference of the rectangle, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. - * @param value The height reference. + * @param dates The dates at which the value is specified. + * @param values The value corresponding to each date. + * @param startIndex The index of the first element to write. + * @param length The number of elements to write. */ - public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference value) { + public final void writeExtrudedHeightProperty(List dates, List values, int startIndex, int length) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { - writer.writeHeightReference(value); + writer.writeNumber(dates, values, startIndex, length); } finally { DisposeHelper.dispose(writer); } @@ -1055,15 +1068,15 @@ public final void writeHeightReferenceProperty(@Nonnull CesiumHeightReference va /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the rectangle, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the rectangle. * @param value The reference. */ - public final void writeHeightReferencePropertyReference(Reference value) { + public final void writeExtrudedHeightPropertyReference(Reference value) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(value); } finally { @@ -1074,15 +1087,15 @@ public final void writeHeightReferencePropertyReference(Reference value) { /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the rectangle, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the rectangle. * @param value The reference. */ - public final void writeHeightReferencePropertyReference(String value) { + public final void writeExtrudedHeightPropertyReference(String value) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(value); } finally { @@ -1093,7 +1106,7 @@ public final void writeHeightReferencePropertyReference(String value) { /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the rectangle, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the rectangle. @@ -1101,9 +1114,9 @@ public final void writeHeightReferencePropertyReference(String value) { * @param identifier The identifier of the object which contains the referenced property. * @param propertyName The property on the referenced object. */ - public final void writeHeightReferencePropertyReference(String identifier, String propertyName) { + public final void writeExtrudedHeightPropertyReference(String identifier, String propertyName) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(identifier, propertyName); } finally { @@ -1114,7 +1127,7 @@ public final void writeHeightReferencePropertyReference(String identifier, Strin /** * - Writes a value for the {@code heightReference} property as a {@code reference} value. The {@code heightReference} property specifies the height reference of the rectangle, which indicates if {@code height} is relative to terrain or not. If not specified, the default value is NONE. + Writes a value for the {@code extrudedHeight} property as a {@code reference} value. The {@code extrudedHeight} property specifies the extruded height of the rectangle. @@ -1122,9 +1135,9 @@ public final void writeHeightReferencePropertyReference(String identifier, Strin * @param identifier The identifier of the object which contains the referenced property. * @param propertyNames The hierarchy of properties to be indexed on the referenced object. */ - public final void writeHeightReferencePropertyReference(String identifier, String[] propertyNames) { + public final void writeExtrudedHeightPropertyReference(String identifier, String[] propertyNames) { { - cesiumlanguagewriter.HeightReferenceCesiumWriter writer = openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter writer = openExtrudedHeightProperty(); try { writer.writeReference(identifier, propertyNames); } finally { @@ -2777,6 +2790,127 @@ public final void writeDistanceDisplayConditionPropertyReference(String identifi } } + /** + * Gets the writer for the {@code classificationType} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code classificationType} property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + */ + @Nonnull + public final ClassificationTypeCesiumWriter getClassificationTypeWriter() { + return m_classificationType.getValue(); + } + + /** + * + Opens and returns the writer for the {@code classificationType} property. The {@code classificationType} property defines whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + */ + @Nonnull + public final ClassificationTypeCesiumWriter openClassificationTypeProperty() { + openIntervalIfNecessary(); + return this. openAndReturn(getClassificationTypeWriter()); + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code classificationType} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The classification type. + */ + public final void writeClassificationTypeProperty(@Nonnull CesiumClassificationType value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeClassificationType(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The reference. + */ + public final void writeClassificationTypePropertyReference(Reference value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + * @param value The reference. + */ + public final void writeClassificationTypePropertyReference(String value) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(value); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyName The property on the referenced object. + */ + public final void writeClassificationTypePropertyReference(String identifier, String propertyName) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(identifier, propertyName); + } finally { + DisposeHelper.dispose(writer); + } + } + } + + /** + * + Writes a value for the {@code classificationType} property as a {@code reference} value. The {@code classificationType} property specifies whether a classification affects terrain, 3D Tiles or both. If not specified, the default value is BOTH. + + + + + * @param identifier The identifier of the object which contains the referenced property. + * @param propertyNames The hierarchy of properties to be indexed on the referenced object. + */ + public final void writeClassificationTypePropertyReference(String identifier, String[] propertyNames) { + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter writer = openClassificationTypeProperty(); + try { + writer.writeReference(identifier, propertyNames); + } finally { + DisposeHelper.dispose(writer); + } + } + } + /** * Gets the writer for the {@code zIndex} property. The returned instance must be opened by calling the {@link CesiumElementWriter#open} method before it can be used for writing. The {@code zIndex} property defines the z-index of the rectangle, used for ordering ground geometry. Only has an effect if the rectangle is constant, and {@code height} and {@code extrudedHeight} are not specified. If not specified, the default value is 0. diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/WallCesiumWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/WallCesiumWriter.java index 64d0d3ae..ecde885b 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/WallCesiumWriter.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/WallCesiumWriter.java @@ -20,7 +20,7 @@ /** * - Writes a {@code Wall} to a {@link CesiumOutputStream}. A {@code Wall} is a two dimensional wall defined as a line strip and optional maximum and minimum heights, which conforms to the curvature of the globe and can be placed along the surface or at altitude. + Writes a {@code Wall} to a {@link CesiumOutputStream}. A {@code Wall} is a two-dimensional wall defined as a line strip and optional maximum and minimum heights, which conforms to the curvature of the globe and can be placed along the surface or at altitude. */ diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/CesiumClassificationTypeValuePropertyAdaptor.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/CesiumClassificationTypeValuePropertyAdaptor.java new file mode 100644 index 00000000..131f4dbc --- /dev/null +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/CesiumClassificationTypeValuePropertyAdaptor.java @@ -0,0 +1,39 @@ +package cesiumlanguagewriter.advanced; + + +import agi.foundation.compatibility.*; +import cesiumlanguagewriter.*; +import javax.annotation.Nonnull; + +/** + * + Adapts a class that implements {@link ICesiumClassificationTypeValuePropertyWriter} to implement + {@link ICesiumPropertyWriter} for {@link CesiumClassificationType} values. + + + + * @param The class that implements {@link ICesiumClassificationTypeValuePropertyWriter} to adapt. + */ +@SuppressWarnings( { + "unused", + "deprecation", + "serial" +}) +public class CesiumClassificationTypeValuePropertyAdaptor extends CesiumWriterAdaptor { + /** + * + Initializes a new instance. + + + + + + * @param parent The instance to wrap. + * @param writeValueCallback The callback to write values of type {@link CesiumClassificationType}. + * @param writeDeleteValueCallback The callback to write an indication that the client should delete existing data. + */ + public CesiumClassificationTypeValuePropertyAdaptor(@Nonnull TFrom parent, @Nonnull CesiumWriterAdaptorWriteCallback writeValueCallback, + @Nonnull CesiumWriterAdaptorWriteDeleteCallback writeDeleteValueCallback) { + super(parent, writeValueCallback, writeDeleteValueCallback); + } +} \ No newline at end of file diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/CesiumFormattingHelper.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/CesiumFormattingHelper.java index 7ea181b6..1279604e 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/CesiumFormattingHelper.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/CesiumFormattingHelper.java @@ -626,6 +626,34 @@ public static String cornerTypeToString(@Nonnull CesiumCornerType value) { } } + /** + * + Converts a {@link CesiumClassificationType} to the corresponding string in a CZML stream. + + + + + * @param value The value to convert. + * @return The string representing the specified value. + */ + @Nonnull + public static String classificationTypeToString(@Nonnull CesiumClassificationType value) { + switch (value) { + case TERRAIN: { + return "TERRAIN"; + } + case CESIUM3DTILE: { + return "CESIUM_3D_TILE"; + } + case BOTH: { + return "BOTH"; + } + default: { + throw new ArgumentException(CesiumLocalization.getUnknownEnumerationValue(), "value"); + } + } + } + /** * Converts a {@link CesiumColorBlendMode} to the corresponding string in a CZML stream. diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/CesiumValuePropertyAdaptors.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/CesiumValuePropertyAdaptors.java index 8eea8e38..b9b04826 100644 --- a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/CesiumValuePropertyAdaptors.java +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/CesiumValuePropertyAdaptors.java @@ -332,6 +332,27 @@ public void invoke(TFrom writer, List dates, List createWriteDeleteCallback()); } + /** + * + Create an adaptor for {@link CesiumClassificationType} values. + + + + + + * @param The class that implements {@link ICesiumClassificationTypeValuePropertyWriter} to adapt. + * @param parent The instance to wrap. + * @return The new adaptor. + */ + public static CesiumClassificationTypeValuePropertyAdaptor createClassificationType( + @Nonnull TFrom parent) { + return new CesiumClassificationTypeValuePropertyAdaptor(parent, new CesiumWriterAdaptorWriteCallback() { + public void invoke(TFrom writer, @Nonnull CesiumClassificationType value) { + writer.writeClassificationType(value); + } + }, CesiumValuePropertyAdaptors. createWriteDeleteCallback()); + } + /** * Create an adaptor for {@link CesiumColorBlendMode} values. diff --git a/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/ICesiumClassificationTypeValuePropertyWriter.java b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/ICesiumClassificationTypeValuePropertyWriter.java new file mode 100644 index 00000000..19ad41f4 --- /dev/null +++ b/Java/CesiumLanguageWriter/translatedSrc/cesiumlanguagewriter/advanced/ICesiumClassificationTypeValuePropertyWriter.java @@ -0,0 +1,29 @@ +package cesiumlanguagewriter.advanced; + + +import agi.foundation.compatibility.*; +import cesiumlanguagewriter.*; +import javax.annotation.Nonnull; + +/** + * + A writer that can write a value as a classification type. + + + */ +@SuppressWarnings( { + "unused", + "deprecation", + "serial" +}) +public interface ICesiumClassificationTypeValuePropertyWriter extends ICesiumPropertyWriter { + /** + * + Writes the value expressed as a classification type. + + + + * @param value The classification type. + */ + void writeClassificationType(@Nonnull CesiumClassificationType value); +} \ No newline at end of file diff --git a/Java/CesiumLanguageWriterTests/translatedSrc/cesiumlanguagewritertests/TestGenerateValidationDocument.java b/Java/CesiumLanguageWriterTests/translatedSrc/cesiumlanguagewritertests/TestGenerateValidationDocument.java index 07f2efca..8b648e6e 100644 --- a/Java/CesiumLanguageWriterTests/translatedSrc/cesiumlanguagewritertests/TestGenerateValidationDocument.java +++ b/Java/CesiumLanguageWriterTests/translatedSrc/cesiumlanguagewritertests/TestGenerateValidationDocument.java @@ -385,6 +385,15 @@ private final void writeConstantValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + try { + w2.writeHeightReference(CesiumHeightReference.CLAMP_TO_GROUND); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.box.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.BooleanCesiumWriter w2 = w.openFillProperty(); try { @@ -507,19 +516,19 @@ private final void writeConstantValues() { } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); try { - w2.writeNumber(22846.0); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.corridor.extrudedHeight.getValue(date)).toEqual(22846.0);"); + w2.writeHeightReference(CesiumHeightReference.CLAMP_TO_GROUND); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.corridor.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); try { - w2.writeHeightReference(CesiumHeightReference.CLAMP_TO_GROUND); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.corridor.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); + w2.writeNumber(22846.0); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.corridor.extrudedHeight.getValue(date)).toEqual(22846.0);"); } finally { DisposeHelper.dispose(w2); } @@ -628,6 +637,15 @@ private final void writeConstantValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter w2 = w.openClassificationTypeProperty(); + try { + w2.writeClassificationType(CesiumClassificationType.TERRAIN); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.corridor.classificationType.getValue(date)).toEqual(ClassificationType.TERRAIN);"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.IntegerCesiumWriter w2 = w.openZIndexProperty(); try { @@ -680,6 +698,15 @@ private final void writeConstantValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + try { + w2.writeHeightReference(CesiumHeightReference.CLAMP_TO_GROUND); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.cylinder.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.BooleanCesiumWriter w2 = w.openFillProperty(); try { @@ -819,19 +846,19 @@ private final void writeConstantValues() { } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); try { - w2.writeNumber(55640.0); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipse.extrudedHeight.getValue(date)).toEqual(55640.0);"); + w2.writeHeightReference(CesiumHeightReference.CLAMP_TO_GROUND); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipse.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); try { - w2.writeHeightReference(CesiumHeightReference.CLAMP_TO_GROUND); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipse.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); + w2.writeNumber(55640.0); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipse.extrudedHeight.getValue(date)).toEqual(55640.0);"); } finally { DisposeHelper.dispose(w2); } @@ -958,6 +985,15 @@ private final void writeConstantValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter w2 = w.openClassificationTypeProperty(); + try { + w2.writeClassificationType(CesiumClassificationType.TERRAIN); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipse.classificationType.getValue(date)).toEqual(ClassificationType.TERRAIN);"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.IntegerCesiumWriter w2 = w.openZIndexProperty(); try { @@ -992,6 +1028,15 @@ private final void writeConstantValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + try { + w2.writeHeightReference(CesiumHeightReference.CLAMP_TO_GROUND); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipsoid.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.BooleanCesiumWriter w2 = w.openFillProperty(); try { @@ -1496,37 +1541,37 @@ private final void writeConstantValues() { } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openWidthProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openLeadTimeProperty(); try { - w2.writeNumber(56040.0); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.width.getValue(date)).toEqual(56040.0);"); + w2.writeNumber(5997.0); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.leadTime.getValue(date)).toEqual(5997.0);"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openResolutionProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openTrailTimeProperty(); try { - w2.writeNumber(31563.0); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.resolution.getValue(date)).toEqual(31563.0);"); + w2.writeNumber(52915.0); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.trailTime.getValue(date)).toEqual(52915.0);"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openLeadTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openWidthProperty(); try { - w2.writeNumber(5997.0); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.leadTime.getValue(date)).toEqual(5997.0);"); + w2.writeNumber(56040.0); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.width.getValue(date)).toEqual(56040.0);"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openTrailTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openResolutionProperty(); try { - w2.writeNumber(52915.0); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.trailTime.getValue(date)).toEqual(52915.0);"); + w2.writeNumber(31563.0); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.resolution.getValue(date)).toEqual(31563.0);"); } finally { DisposeHelper.dispose(w2); } @@ -1705,19 +1750,19 @@ private final void writeConstantValues() { } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); try { - w2.writeNumber(15922.0); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.polygon.extrudedHeight.getValue(date)).toEqual(15922.0);"); + w2.writeHeightReference(CesiumHeightReference.CLAMP_TO_GROUND); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.polygon.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); try { - w2.writeHeightReference(CesiumHeightReference.CLAMP_TO_GROUND); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.polygon.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); + w2.writeNumber(15922.0); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.polygon.extrudedHeight.getValue(date)).toEqual(15922.0);"); } finally { DisposeHelper.dispose(w2); } @@ -1853,6 +1898,15 @@ private final void writeConstantValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter w2 = w.openClassificationTypeProperty(); + try { + w2.writeClassificationType(CesiumClassificationType.TERRAIN); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.polygon.classificationType.getValue(date)).toEqual(ClassificationType.TERRAIN);"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.IntegerCesiumWriter w2 = w.openZIndexProperty(); try { @@ -1989,6 +2043,15 @@ private final void writeConstantValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter w2 = w.openClassificationTypeProperty(); + try { + w2.writeClassificationType(CesiumClassificationType.TERRAIN); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.polyline.classificationType.getValue(date)).toEqual(ClassificationType.TERRAIN);"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.IntegerCesiumWriter w2 = w.openZIndexProperty(); try { @@ -2034,19 +2097,19 @@ private final void writeConstantValues() { } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); try { - w2.writeNumber(23002.0); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.rectangle.extrudedHeight.getValue(date)).toEqual(23002.0);"); + w2.writeHeightReference(CesiumHeightReference.CLAMP_TO_GROUND); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.rectangle.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); try { - w2.writeHeightReference(CesiumHeightReference.CLAMP_TO_GROUND); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.rectangle.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);"); + w2.writeNumber(23002.0); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.rectangle.extrudedHeight.getValue(date)).toEqual(23002.0);"); } finally { DisposeHelper.dispose(w2); } @@ -2164,6 +2227,15 @@ private final void writeConstantValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter w2 = w.openClassificationTypeProperty(); + try { + w2.writeClassificationType(CesiumClassificationType.TERRAIN); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.rectangle.classificationType.getValue(date)).toEqual(ClassificationType.TERRAIN);"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.IntegerCesiumWriter w2 = w.openZIndexProperty(); try { @@ -22022,6 +22094,15 @@ private final void writeReferenceValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + try { + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("box", "heightReference"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.box.heightReference.getValue(date)).toEqual(constant.box.heightReference.getValue(date));"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.BooleanCesiumWriter w2 = w.openFillProperty(); try { @@ -22148,19 +22229,19 @@ private final void writeReferenceValues() { } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("corridor", "extrudedHeight"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.corridor.extrudedHeight.getValue(date)).toEqual(constant.corridor.extrudedHeight.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("corridor", "heightReference"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.corridor.heightReference.getValue(date)).toEqual(constant.corridor.heightReference.getValue(date));"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("corridor", "heightReference"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.corridor.heightReference.getValue(date)).toEqual(constant.corridor.heightReference.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("corridor", "extrudedHeight"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.corridor.extrudedHeight.getValue(date)).toEqual(constant.corridor.extrudedHeight.getValue(date));"); } finally { DisposeHelper.dispose(w2); } @@ -22272,6 +22353,16 @@ private final void writeReferenceValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter w2 = w.openClassificationTypeProperty(); + try { + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("corridor", "classificationType"))); + TextWriterHelper + .writeLine(m_assertionsWriter, " expect(e.corridor.classificationType.getValue(date)).toEqual(constant.corridor.classificationType.getValue(date));"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.IntegerCesiumWriter w2 = w.openZIndexProperty(); try { @@ -22324,6 +22415,15 @@ private final void writeReferenceValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + try { + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("cylinder", "heightReference"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.cylinder.heightReference.getValue(date)).toEqual(constant.cylinder.heightReference.getValue(date));"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.BooleanCesiumWriter w2 = w.openFillProperty(); try { @@ -22466,19 +22566,19 @@ private final void writeReferenceValues() { } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("ellipse", "extrudedHeight"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipse.extrudedHeight.getValue(date)).toEqual(constant.ellipse.extrudedHeight.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("ellipse", "heightReference"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipse.heightReference.getValue(date)).toEqual(constant.ellipse.heightReference.getValue(date));"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("ellipse", "heightReference"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipse.heightReference.getValue(date)).toEqual(constant.ellipse.heightReference.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("ellipse", "extrudedHeight"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipse.extrudedHeight.getValue(date)).toEqual(constant.ellipse.extrudedHeight.getValue(date));"); } finally { DisposeHelper.dispose(w2); } @@ -22609,6 +22709,15 @@ private final void writeReferenceValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter w2 = w.openClassificationTypeProperty(); + try { + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("ellipse", "classificationType"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipse.classificationType.getValue(date)).toEqual(constant.ellipse.classificationType.getValue(date));"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.IntegerCesiumWriter w2 = w.openZIndexProperty(); try { @@ -22643,6 +22752,15 @@ private final void writeReferenceValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + try { + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("ellipsoid", "heightReference"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.ellipsoid.heightReference.getValue(date)).toEqual(constant.ellipsoid.heightReference.getValue(date));"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.BooleanCesiumWriter w2 = w.openFillProperty(); try { @@ -23157,37 +23275,37 @@ private final void writeReferenceValues() { } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openWidthProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openLeadTimeProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("path", "width"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.width.getValue(date)).toEqual(constant.path.width.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("path", "leadTime"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.leadTime.getValue(date)).toEqual(constant.path.leadTime.getValue(date));"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openResolutionProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openTrailTimeProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("path", "resolution"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.resolution.getValue(date)).toEqual(constant.path.resolution.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("path", "trailTime"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.trailTime.getValue(date)).toEqual(constant.path.trailTime.getValue(date));"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openLeadTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openWidthProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("path", "leadTime"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.leadTime.getValue(date)).toEqual(constant.path.leadTime.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("path", "width"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.width.getValue(date)).toEqual(constant.path.width.getValue(date));"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openTrailTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openResolutionProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("path", "trailTime"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.trailTime.getValue(date)).toEqual(constant.path.trailTime.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("path", "resolution"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.resolution.getValue(date)).toEqual(constant.path.resolution.getValue(date));"); } finally { DisposeHelper.dispose(w2); } @@ -23374,19 +23492,19 @@ private final void writeReferenceValues() { } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("polygon", "extrudedHeight"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.polygon.extrudedHeight.getValue(date)).toEqual(constant.polygon.extrudedHeight.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("polygon", "heightReference"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.polygon.heightReference.getValue(date)).toEqual(constant.polygon.heightReference.getValue(date));"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("polygon", "heightReference"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.polygon.heightReference.getValue(date)).toEqual(constant.polygon.heightReference.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("polygon", "extrudedHeight"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.polygon.extrudedHeight.getValue(date)).toEqual(constant.polygon.extrudedHeight.getValue(date));"); } finally { DisposeHelper.dispose(w2); } @@ -23525,6 +23643,15 @@ private final void writeReferenceValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter w2 = w.openClassificationTypeProperty(); + try { + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("polygon", "classificationType"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.polygon.classificationType.getValue(date)).toEqual(constant.polygon.classificationType.getValue(date));"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.IntegerCesiumWriter w2 = w.openZIndexProperty(); try { @@ -23666,6 +23793,16 @@ private final void writeReferenceValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter w2 = w.openClassificationTypeProperty(); + try { + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("polyline", "classificationType"))); + TextWriterHelper + .writeLine(m_assertionsWriter, " expect(e.polyline.classificationType.getValue(date)).toEqual(constant.polyline.classificationType.getValue(date));"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.IntegerCesiumWriter w2 = w.openZIndexProperty(); try { @@ -23710,19 +23847,19 @@ private final void writeReferenceValues() { } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); + cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("rectangle", "extrudedHeight"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.rectangle.extrudedHeight.getValue(date)).toEqual(constant.rectangle.extrudedHeight.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("rectangle", "heightReference"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.rectangle.heightReference.getValue(date)).toEqual(constant.rectangle.heightReference.getValue(date));"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.HeightReferenceCesiumWriter w2 = w.openHeightReferenceProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openExtrudedHeightProperty(); try { - w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("rectangle", "heightReference"))); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.rectangle.heightReference.getValue(date)).toEqual(constant.rectangle.heightReference.getValue(date));"); + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("rectangle", "extrudedHeight"))); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.rectangle.extrudedHeight.getValue(date)).toEqual(constant.rectangle.extrudedHeight.getValue(date));"); } finally { DisposeHelper.dispose(w2); } @@ -23843,6 +23980,16 @@ private final void writeReferenceValues() { DisposeHelper.dispose(w2); } } + { + cesiumlanguagewriter.ClassificationTypeCesiumWriter w2 = w.openClassificationTypeProperty(); + try { + w2.writeReference(new Reference("Constant", TestGenerateValidationDocument. createList("rectangle", "classificationType"))); + TextWriterHelper.writeLine(m_assertionsWriter, + " expect(e.rectangle.classificationType.getValue(date)).toEqual(constant.rectangle.classificationType.getValue(date));"); + } finally { + DisposeHelper.dispose(w2); + } + } { cesiumlanguagewriter.IntegerCesiumWriter w2 = w.openZIndexProperty(); try { @@ -35818,45 +35965,45 @@ private final void writeSampledValues() { cesiumlanguagewriter.PathCesiumWriter w = packet.openPathProperty(); try { { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openWidthProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openLeadTimeProperty(); try { w2.writeNumber(TestGenerateValidationDocument. createList(m_documentStartDate, m_documentStopDate), TestGenerateValidationDocument. createList( - 32449.0, 33819.0)); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.width.getValue(documentStartDate)).toEqual(32449.0);"); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.width.getValue(documentStopDate)).toEqual(33819.0);"); + 40222.0, 33294.0)); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.leadTime.getValue(documentStartDate)).toEqual(40222.0);"); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.leadTime.getValue(documentStopDate)).toEqual(33294.0);"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openResolutionProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openTrailTimeProperty(); try { w2.writeNumber(TestGenerateValidationDocument. createList(m_documentStartDate, m_documentStopDate), TestGenerateValidationDocument. createList( - 8399.0, 19400.0)); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.resolution.getValue(documentStartDate)).toEqual(8399.0);"); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.resolution.getValue(documentStopDate)).toEqual(19400.0);"); + 34052.0, 57713.0)); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.trailTime.getValue(documentStartDate)).toEqual(34052.0);"); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.trailTime.getValue(documentStopDate)).toEqual(57713.0);"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openLeadTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openWidthProperty(); try { w2.writeNumber(TestGenerateValidationDocument. createList(m_documentStartDate, m_documentStopDate), TestGenerateValidationDocument. createList( - 40222.0, 33294.0)); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.leadTime.getValue(documentStartDate)).toEqual(40222.0);"); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.leadTime.getValue(documentStopDate)).toEqual(33294.0);"); + 32449.0, 33819.0)); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.width.getValue(documentStartDate)).toEqual(32449.0);"); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.width.getValue(documentStopDate)).toEqual(33819.0);"); } finally { DisposeHelper.dispose(w2); } } { - cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openTrailTimeProperty(); + cesiumlanguagewriter.DoubleCesiumWriter w2 = w.openResolutionProperty(); try { w2.writeNumber(TestGenerateValidationDocument. createList(m_documentStartDate, m_documentStopDate), TestGenerateValidationDocument. createList( - 34052.0, 57713.0)); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.trailTime.getValue(documentStartDate)).toEqual(34052.0);"); - TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.trailTime.getValue(documentStopDate)).toEqual(57713.0);"); + 8399.0, 19400.0)); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.resolution.getValue(documentStartDate)).toEqual(8399.0);"); + TextWriterHelper.writeLine(m_assertionsWriter, " expect(e.path.resolution.getValue(documentStopDate)).toEqual(19400.0);"); } finally { DisposeHelper.dispose(w2); } diff --git a/Schema/Box.json b/Schema/Box.json index bdd96852..92a5a29f 100644 --- a/Schema/Box.json +++ b/Schema/Box.json @@ -15,6 +15,11 @@ "description": "The dimensions of the box.", "czmlRequiredForDisplay": true }, + "heightReference": { + "$ref": "HeightReference.json", + "description": "The height reference of the box, which indicates if the position is relative to terrain or not.", + "default": "NONE" + }, "fill": { "$ref": "Boolean.json", "description": "Whether or not the box is filled.", diff --git a/Schema/ClassificationType.json b/Schema/ClassificationType.json new file mode 100644 index 00000000..01e64d3a --- /dev/null +++ b/Schema/ClassificationType.json @@ -0,0 +1,29 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://analyticalgraphicsinc.github.io/czml-writer/Schema/ClassificationType.json", + "title": "ClassificationType", + "description": "Whether a classification affects terrain, 3D Tiles or both.", + "allOf": [ + { "$ref": "DeletableProperty.json" }, + { "$ref": "ValueProperties/ClassificationTypeValueProperty.json" }, + { "$ref": "ValueProperties/ReferenceValueProperty.json" } + ], + "type": [ + "array", + "object", + "string" + ], + "items": { + "$ref": "#" + }, + "properties": { + "classificationType": { + "$ref": "Values/ClassificationTypeValue.json", + "description": "The classification type, which indicates whether a classification affects terrain, 3D Tiles or both." + }, + "reference": { + "$ref": "Values/ReferenceValue.json", + "description": "The classification type specified as a reference to another property." + } + } +} \ No newline at end of file diff --git a/Schema/Corridor.json b/Schema/Corridor.json index 184350f3..756a4a24 100644 --- a/Schema/Corridor.json +++ b/Schema/Corridor.json @@ -25,15 +25,15 @@ "description": "The height of the corridor, which is the altitude of the corridor relative to the surface.", "default": 0.0 }, - "extrudedHeight": { - "$ref": "Double.json", - "description": "The extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface." - }, "heightReference": { "$ref": "HeightReference.json", "description": "The height reference of the corridor, which indicates if `height` is relative to terrain or not.", "default": "NONE" }, + "extrudedHeight": { + "$ref": "Double.json", + "description": "The extruded height of the corridor, which is the altitude of the corridor's extruded face relative to the surface." + }, "extrudedHeightReference": { "$ref": "HeightReference.json", "description": "The extruded height reference of the corridor, which indicates if `extrudedHeight` is relative to terrain or not.", @@ -83,6 +83,11 @@ "$ref": "DistanceDisplayCondition.json", "description": "The display condition specifying the distance from the camera at which this corridor will be displayed." }, + "classificationType": { + "$ref": "ClassificationType.json", + "description": "Whether a classification affects terrain, 3D Tiles or both.", + "default": "BOTH" + }, "zIndex": { "$ref": "Integer.json", "description": "The z-index of the corridor, used for ordering ground geometry. Only has an effect if the corridor is constant, and `height` and `extrudedHeight` are not specified.", diff --git a/Schema/Cylinder.json b/Schema/Cylinder.json index b93421e7..cc5f7484 100644 --- a/Schema/Cylinder.json +++ b/Schema/Cylinder.json @@ -25,6 +25,11 @@ "description": "The radius of the bottom of the cylinder.", "czmlRequiredForDisplay": true }, + "heightReference": { + "$ref": "HeightReference.json", + "description": "The height reference of the cylinder, which indicates if the position is relative to terrain or not.", + "default": "NONE" + }, "fill": { "$ref": "Boolean.json", "description": "Whether or not the cylinder is filled.", diff --git a/Schema/Ellipse.json b/Schema/Ellipse.json index 7f2549a4..5e30e719 100644 --- a/Schema/Ellipse.json +++ b/Schema/Ellipse.json @@ -25,15 +25,15 @@ "description": "The altitude of the ellipse relative to the surface.", "default": "0.0" }, - "extrudedHeight": { - "$ref": "Double.json", - "description": "The altitude of the ellipse's extruded face relative to the surface." - }, "heightReference": { "$ref": "HeightReference.json", "description": "The height reference of the ellipse, which indicates if `height` is relative to terrain or not.", "default": "NONE" }, + "extrudedHeight": { + "$ref": "Double.json", + "description": "The altitude of the ellipse's extruded face relative to the surface." + }, "extrudedHeightReference": { "$ref": "HeightReference.json", "description": "The extruded height reference of the ellipse, which indicates if `extrudedHeight` is relative to terrain or not.", @@ -93,6 +93,11 @@ "$ref": "DistanceDisplayCondition.json", "description": "The display condition specifying at what distance from the camera this ellipse will be displayed." }, + "classificationType": { + "$ref": "ClassificationType.json", + "description": "Whether a classification affects terrain, 3D Tiles or both.", + "default": "BOTH" + }, "zIndex": { "$ref": "Integer.json", "description": "The z-index of the ellipse, used for ordering ground geometry. Only has an effect if the ellipse is constant, and `height` and `extrudedHeight` are not specified.", diff --git a/Schema/Ellipsoid.json b/Schema/Ellipsoid.json index 71aacd0a..ec11c77d 100644 --- a/Schema/Ellipsoid.json +++ b/Schema/Ellipsoid.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://analyticalgraphicsinc.github.io/czml-writer/Schema/Ellipsoid.json", "title": "Ellipsoid", - "description": "A closed quadric surface that is a three dimensional analogue of an ellipse.", + "description": "A closed quadric surface that is a three-dimensional analogue of an ellipse.", "type": "object", "properties": { "show": { @@ -15,6 +15,11 @@ "description": "The dimensions of the ellipsoid.", "czmlRequiredForDisplay": true }, + "heightReference": { + "$ref": "HeightReference.json", + "description": "The height reference of the ellipsoid, which indicates if the position is relative to terrain or not.", + "default": "NONE" + }, "fill": { "$ref": "Boolean.json", "description": "Whether or not the ellipsoid is filled.", diff --git a/Schema/GridMaterial.json b/Schema/GridMaterial.json index 5f8ae33f..1aa0d5fe 100644 --- a/Schema/GridMaterial.json +++ b/Schema/GridMaterial.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://analyticalgraphicsinc.github.io/czml-writer/Schema/GridMaterial.json", "title": "GridMaterial", - "description": "A material that fills the surface with a two dimensional grid.", + "description": "A material that fills the surface with a two-dimensional grid.", "type": [ "array", "object" diff --git a/Schema/Packet.json b/Schema/Packet.json index 32479694..b5cf7aa6 100644 --- a/Schema/Packet.json +++ b/Schema/Packet.json @@ -85,7 +85,7 @@ }, "ellipsoid": { "$ref": "Ellipsoid.json", - "description": "An ellipsoid, which is a closed quadric surface that is a three dimensional analogue of an ellipse. The ellipsoid is positioned and oriented using the `position` and `orientation` properties." + "description": "An ellipsoid, which is a closed quadric surface that is a three-dimensional analogue of an ellipse. The ellipsoid is positioned and oriented using the `position` and `orientation` properties." }, "label": { "$ref": "Label.json", @@ -117,7 +117,7 @@ }, "wall": { "$ref": "Wall.json", - "description": "A two dimensional wall which conforms to the curvature of the globe and can be placed along the surface or at altitude." + "description": "A two-dimensional wall which conforms to the curvature of the globe and can be placed along the surface or at altitude." }, "agi_conicSensor": { "$ref": "Extensions/AGI/ConicSensor.json", diff --git a/Schema/Path.json b/Schema/Path.json index 9c93c474..95441d2e 100644 --- a/Schema/Path.json +++ b/Schema/Path.json @@ -10,6 +10,14 @@ "description": "Whether or not the path is shown.", "default": true }, + "leadTime": { + "$ref": "Double.json", + "description": "The time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object." + }, + "trailTime": { + "$ref": "Double.json", + "description": "The time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object." + }, "width": { "$ref": "Double.json", "description": "The width of the path line.", @@ -20,14 +28,6 @@ "description": "The maximum step-size, in seconds, used to sample the path. If the `position` property has data points farther apart than resolution specifies, additional samples will be computed, creating a smoother path.", "default": 60.0 }, - "leadTime": { - "$ref": "Double.json", - "description": "The time ahead of the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object." - }, - "trailTime": { - "$ref": "Double.json", - "description": "The time behind the animation time, in seconds, to show the path. The time will be limited to not exceed the object's availability. By default, the value is unlimited, which effectively results in drawing the entire available path of the object." - }, "material": { "$ref": "PolylineMaterial.json", "description": "The material to use to draw the path.", diff --git a/Schema/Polygon.json b/Schema/Polygon.json index d32fa0f8..6961f841 100644 --- a/Schema/Polygon.json +++ b/Schema/Polygon.json @@ -25,15 +25,15 @@ "description": "The height of the polygon when `perPositionHeight` is false.", "default": 0.0 }, - "extrudedHeight": { - "$ref": "Double.json", - "description": "The extruded height of the polygon." - }, "heightReference": { "$ref": "HeightReference.json", "description": "The height reference of the polygon, which indicates if `height` is relative to terrain or not.", "default": "NONE" }, + "extrudedHeight": { + "$ref": "Double.json", + "description": "The extruded height of the polygon." + }, "extrudedHeightReference": { "$ref": "HeightReference.json", "description": "The extruded height reference of the polygon, which indicates if `extrudedHeight` is relative to terrain or not.", @@ -98,6 +98,11 @@ "$ref": "DistanceDisplayCondition.json", "description": "The display condition specifying the distance from the camera at which this polygon will be displayed." }, + "classificationType": { + "$ref": "ClassificationType.json", + "description": "Whether a classification affects terrain, 3D Tiles or both.", + "default": "BOTH" + }, "zIndex": { "$ref": "Integer.json", "description": "The z-index of the polygon, used for ordering ground geometry. Only has an effect if the polygon is constant, and `height` and `extrudedHeight` are not specified.", diff --git a/Schema/Polyline.json b/Schema/Polyline.json index 3230c004..adeba533 100644 --- a/Schema/Polyline.json +++ b/Schema/Polyline.json @@ -58,6 +58,11 @@ "description": "Whether or not the polyline should be clamped to the ground.", "default": false }, + "classificationType": { + "$ref": "ClassificationType.json", + "description": "Whether a classification affects terrain, 3D Tiles or both.", + "default": "BOTH" + }, "zIndex": { "$ref": "Integer.json", "description": "The z-index of the polyline, used for ordering ground geometry. Only has an effect if the polyline is constant, and `clampToGround` is true.", diff --git a/Schema/Rectangle.json b/Schema/Rectangle.json index 4926c270..b3844d88 100644 --- a/Schema/Rectangle.json +++ b/Schema/Rectangle.json @@ -20,15 +20,15 @@ "description": "The height of the rectangle.", "default": 0.0 }, - "extrudedHeight": { - "$ref": "Double.json", - "description": "The extruded height of the rectangle." - }, "heightReference": { "$ref": "HeightReference.json", "description": "The height reference of the rectangle, which indicates if `height` is relative to terrain or not.", "default": "NONE" }, + "extrudedHeight": { + "$ref": "Double.json", + "description": "The extruded height of the rectangle." + }, "extrudedHeightReference": { "$ref": "HeightReference.json", "description": "The extruded height reference of the rectangle, which indicates if `extrudedHeight` is relative to terrain or not.", @@ -83,6 +83,11 @@ "$ref": "DistanceDisplayCondition.json", "description": "The display condition specifying at what distance from the camera this rectangle will be displayed." }, + "classificationType": { + "$ref": "ClassificationType.json", + "description": "Whether a classification affects terrain, 3D Tiles or both.", + "default": "BOTH" + }, "zIndex": { "$ref": "Integer.json", "description": "The z-index of the rectangle, used for ordering ground geometry. Only has an effect if the rectangle is constant, and `height` and `extrudedHeight` are not specified.", diff --git a/Schema/ValueProperties/CartographicRectangleDegreesValueProperty.json b/Schema/ValueProperties/CartographicRectangleDegreesValueProperty.json index 28f4d6a3..b7cef79a 100644 --- a/Schema/ValueProperties/CartographicRectangleDegreesValueProperty.json +++ b/Schema/ValueProperties/CartographicRectangleDegreesValueProperty.json @@ -2,5 +2,5 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://analyticalgraphicsinc.github.io/czml-writer/Schema/ValueProperties/CartographicRectangleDegreesValueProperty.json", "title": "CartographicRectangleDegreesValueProperty", - "description": "The base schema for a property whose value may be written as a two dimensional region specified as `[WestLongitude, SouthLatitude, EastLongitude, NorthLatitude]`, with values in degrees." + "description": "The base schema for a property whose value may be written as a two-dimensional region specified as `[WestLongitude, SouthLatitude, EastLongitude, NorthLatitude]`, with values in degrees." } \ No newline at end of file diff --git a/Schema/ValueProperties/CartographicRectangleRadiansValueProperty.json b/Schema/ValueProperties/CartographicRectangleRadiansValueProperty.json index 3a414db3..d31358c2 100644 --- a/Schema/ValueProperties/CartographicRectangleRadiansValueProperty.json +++ b/Schema/ValueProperties/CartographicRectangleRadiansValueProperty.json @@ -2,5 +2,5 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://analyticalgraphicsinc.github.io/czml-writer/Schema/ValueProperties/CartographicRectangleRadiansValueProperty.json", "title": "CartographicRectangleRadiansValueProperty", - "description": "The base schema for a property whose value may be written as a two dimensional region specified as `[WestLongitude, SouthLatitude, EastLongitude, NorthLatitude]`, with values in radians." + "description": "The base schema for a property whose value may be written as a two-dimensional region specified as `[WestLongitude, SouthLatitude, EastLongitude, NorthLatitude]`, with values in radians." } \ No newline at end of file diff --git a/Schema/ValueProperties/ClassificationTypeValueProperty.json b/Schema/ValueProperties/ClassificationTypeValueProperty.json new file mode 100644 index 00000000..5fc99beb --- /dev/null +++ b/Schema/ValueProperties/ClassificationTypeValueProperty.json @@ -0,0 +1,6 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://analyticalgraphicsinc.github.io/czml-writer/Schema/ValueProperties/ClassificationTypeValueProperty.json", + "title": "ClassificationTypeValueProperty", + "description": "The base schema for a property whose value may be written as a classification type." +} \ No newline at end of file diff --git a/Schema/Values/CartographicRectangleDegreesValue.json b/Schema/Values/CartographicRectangleDegreesValue.json index 9a078711..20777d4b 100644 --- a/Schema/Values/CartographicRectangleDegreesValue.json +++ b/Schema/Values/CartographicRectangleDegreesValue.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://analyticalgraphicsinc.github.io/czml-writer/Schema/Values/CartographicRectangleDegreesValue.json", "title": "CartographicRectangleDegrees", - "description": "A two dimensional region specified as `[WestLongitude, SouthLatitude, EastLongitude, NorthLatitude]`, with values in degrees. If the array has four elements, the value is constant. If it has five or more elements, they are time-tagged samples arranged as `[Time, WestLongitude, SouthLatitude, EastLongitude, NorthLatitude, Time, WestLongitude, SouthLatitude, EastLongitude, NorthLatitude, ...]`, where Time is an ISO 8601 date and time string or seconds since epoch.", + "description": "A two-dimensional region specified as `[WestLongitude, SouthLatitude, EastLongitude, NorthLatitude]`, with values in degrees. If the array has four elements, the value is constant. If it has five or more elements, they are time-tagged samples arranged as `[Time, WestLongitude, SouthLatitude, EastLongitude, NorthLatitude, Time, WestLongitude, SouthLatitude, EastLongitude, NorthLatitude, ...]`, where Time is an ISO 8601 date and time string or seconds since epoch.", "type": "array", "czmlValue": true, "czmlExamples": [ diff --git a/Schema/Values/CartographicRectangleRadiansValue.json b/Schema/Values/CartographicRectangleRadiansValue.json index 812f7ea0..51378da3 100644 --- a/Schema/Values/CartographicRectangleRadiansValue.json +++ b/Schema/Values/CartographicRectangleRadiansValue.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://analyticalgraphicsinc.github.io/czml-writer/Schema/Values/CartographicRectangleRadiansValue.json", "title": "CartographicRectangleRadians", - "description": "A two dimensional region specified as `[WestLongitude, SouthLatitude, EastLongitude, NorthLatitude]`, with values in radians. If the array has four elements, the value is constant. If it has five or more elements, they are time-tagged samples arranged as `[Time, WestLongitude, SouthLatitude, EastLongitude, NorthLatitude, Time, WestLongitude, SouthLatitude, EastLongitude, NorthLatitude, ...]`, where Time is an ISO 8601 date and time string or seconds since epoch.", + "description": "A two-dimensional region specified as `[WestLongitude, SouthLatitude, EastLongitude, NorthLatitude]`, with values in radians. If the array has four elements, the value is constant. If it has five or more elements, they are time-tagged samples arranged as `[Time, WestLongitude, SouthLatitude, EastLongitude, NorthLatitude, Time, WestLongitude, SouthLatitude, EastLongitude, NorthLatitude, ...]`, where Time is an ISO 8601 date and time string or seconds since epoch.", "type": "array", "czmlValue": true } \ No newline at end of file diff --git a/Schema/Values/ClassificationTypeValue.json b/Schema/Values/ClassificationTypeValue.json new file mode 100644 index 00000000..4d4f9671 --- /dev/null +++ b/Schema/Values/ClassificationTypeValue.json @@ -0,0 +1,22 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://analyticalgraphicsinc.github.io/czml-writer/Schema/Values/ClassificationTypeValue.json", + "title": "ClassificationType", + "description": "Whether a classification affects terrain, 3D Tiles or both.", + "type": "string", + "czmlValue": true, + "oneOf": [ + { + "const": "TERRAIN", + "description": "Only terrain will be classified." + }, + { + "const": "CESIUM_3D_TILE", + "description": "Only 3D Tiles will be classified." + }, + { + "const": "BOTH", + "description": "Both terrain and 3D Tiles will be classified." + } + ] +} \ No newline at end of file diff --git a/Schema/Values/DistanceDisplayConditionValue.json b/Schema/Values/DistanceDisplayConditionValue.json index 9042852a..88be3f15 100644 --- a/Schema/Values/DistanceDisplayConditionValue.json +++ b/Schema/Values/DistanceDisplayConditionValue.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://analyticalgraphicsinc.github.io/czml-writer/Schema/Values/DistanceDisplayConditionValue.json", "title": "DistanceDisplayCondition", - "description": "Indicates the visibility of an object based on the distance to the camera, specified as two values `[NearDistance, FarDistance]`. If the array has two elements, the value is constant. If it has three or more elements, they are time-tagged samples arranged as `[Time, NearDistance, FarDistance, Time, NearDistance, FarDistance, ...]`, where Time is an ISO 8601 date and time string or seconds since epoch.", + "description": "A value indicating the visibility of an object based on the distance to the camera, specified as two values `[NearDistance, FarDistance]`. If the array has two elements, the value is constant. If it has three or more elements, they are time-tagged samples arranged as `[Time, NearDistance, FarDistance, Time, NearDistance, FarDistance, ...]`, where Time is an ISO 8601 date and time string or seconds since epoch.", "type": "array", "czmlValue": true, "czmlExamples": [ diff --git a/Schema/Wall.json b/Schema/Wall.json index d6251f08..0233a1f5 100644 --- a/Schema/Wall.json +++ b/Schema/Wall.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://analyticalgraphicsinc.github.io/czml-writer/Schema/Wall.json", "title": "Wall", - "description": "A two dimensional wall defined as a line strip and optional maximum and minimum heights, which conforms to the curvature of the globe and can be placed along the surface or at altitude.", + "description": "A two-dimensional wall defined as a line strip and optional maximum and minimum heights, which conforms to the curvature of the globe and can be placed along the surface or at altitude.", "type": "object", "properties": { "show": {