Commit 529422e6 authored by iSergio's avatar iSergio
Browse files

Merge branch '1.87' into 'develop'

1.87

See merge request !13
parents 6d64de59 751747ad
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
    <parent>
        <artifactId>cesiumjs4gwt</artifactId>
        <groupId>org.cesiumjs</groupId>
        <version>1.86.0</version>
        <version>1.87.0</version>
    </parent>

    <name>CesiumJS GWT Wrapper</name>
+22 −0
Original line number Diff line number Diff line
@@ -244,6 +244,28 @@ public class Cartographic {
    @JsMethod
    public static native Cartographic fromRadians(double longitude, double latitude, double height, Cartographic result);

    /**
     * Creates a new Cartesian3 instance from a Cartographic input. The values in
     * the inputted object should be in radians.
     *
     * @param cartographic Input to be converted into a Cartesian3 output.
     * @return The position
     */
    @JsMethod
    public static native Cartesian3 toCartesian(Cartographic cartographic);

    /**
     * Creates a new Cartesian3 instance from a Cartographic input. The values in
     * the inputted object should be in radians.
     *
     * @param cartographic Input to be converted into a Cartesian3 output.
     * @param ellipsoid    The ellipsoid on which the position lies. Default:
     *                     {@link Ellipsoid#WGS84()}.
     * @return The position
     */
    @JsMethod
    public static native Cartesian3 toCartesian(Cartographic cartographic, Ellipsoid ellipsoid);

    /**
     * Creates a new Cartesian3 instance from a Cartographic input. The values in
     * the inputted object should be in radians.
+11 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import jsinterop.annotations.JsConstructor;
import jsinterop.annotations.JsPackage;
import jsinterop.annotations.JsProperty;
import jsinterop.annotations.JsType;
import org.cesiumjs.cs.core.Credit;
import org.cesiumjs.cs.core.Ellipsoid;

/**
@@ -48,6 +49,16 @@ public class KmlDataSourceLoadOptions {
     */
    @JsProperty
    public Ellipsoid ellipsoid;
    /**
     * A credit for the data source, which is displayed on the canvas.
     */
    @JsProperty
    public Credit credit;
    /**
     * A container for ScreenOverlay images.
     */
    @JsProperty
    public String screenOverlayContainer;

    /**
     * Options for
+8 −0
Original line number Diff line number Diff line
@@ -21051,6 +21051,7 @@ export namespace KmlDataSource {
     * @property [clampToGround = false] - true if we want the geometry features (Polygons, LineStrings and LinearRings) clamped to the ground.
     * @property [ellipsoid = Ellipsoid.WGS84] - The global ellipsoid used for geographical calculations.
     * @property [credit] - A credit for the data source, which is displayed on the canvas.
     * @property [screenOverlayContainer] - A container for ScreenOverlay images.
     */
    type LoadOptions = {
        camera: Camera;
@@ -21059,6 +21060,7 @@ export namespace KmlDataSource {
        clampToGround?: boolean;
        ellipsoid?: Ellipsoid;
        credit?: Credit | string;
        screenOverlayContainer?: Element | string;
    };
}
@@ -21166,13 +21168,19 @@ export class KmlDataSource {
     * @param [options.sourceUri] - Overrides the url to use for resolving relative links and other KML network features.
     * @param [options.clampToGround = false] - true if we want the geometry features (Polygons, LineStrings and LinearRings) clamped to the ground. If true, lines will use corridors so use Entity.corridor instead of Entity.polyline.
     * @param [options.ellipsoid = Ellipsoid.WGS84] - The global ellipsoid used for geographical calculations.
     * @param [options.screenOverlayContainer] - A container for ScreenOverlay images.
     * @returns A promise that will resolve to this instances once the KML is loaded.
     */
    load(data: Resource | string | Document | Blob, options?: {
        sourceUri?: Resource | string;
        clampToGround?: boolean;
        ellipsoid?: Ellipsoid;
        screenOverlayContainer?: Element | string;
    }): Promise<KmlDataSource>;
    /**
     * Cleans up any non-entity elements created by the data source. Currently this only affects ScreenOverlay elements.
     */
    destroy(): void;
    /**
     * Updates any NetworkLink that require updating.
     * @param time - The simulation time.
+90 −7

File changed.

Preview size limit exceeded, changes collapsed.

Loading