Commit 7545a007 authored by iSergio's avatar iSergio
Browse files

Merge branch '1.106' into 'develop' 

CesiumJS 1.106 release

See merge request !66
parents 72933009 e413c0ac

cesiumjs4gwt-main/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    <parent>

        <artifactId>cesiumjs4gwt</artifactId>

        <groupId>org.cesiumjs</groupId>

        <version>1.105.0</version>

        <version>1.106.0</version>

    </parent>



    <name>CesiumJS GWT Wrapper</name>

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/Cesium.java

+29 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import org.cesiumjs.cs.promise.Promise; 
import org.cesiumjs.cs.scene.Cesium3DTileset;

import org.cesiumjs.cs.scene.Material;

import org.cesiumjs.cs.scene.Scene;

import org.cesiumjs.cs.scene.options.Cesium3DTilesetOptions;

import org.cesiumjs.cs.widgets.Command;



/**
@@ -293,6 +294,34 @@ public class Cesium { 
    @JsMethod(namespace = "Cesium", name = "createOsmBuildings")

    public static native Cesium3DTileset createOsmBuildings(CreateOsmBuildingsOptions options);



    /**

     *  Creates a Cesium3DTileset instance for the Google Photorealistic 3D Tiles tileset.

     * @return Cesium3DTileset instance

     */

    @JsMethod(namespace = "Cesium", name = "createGooglePhotorealistic3DTileset")

    public static native Promise<Cesium3DTileset, Void> createGooglePhotorealistic3DTileset();



    /**

     *  Creates a Cesium3DTileset instance for the Google Photorealistic 3D Tiles tileset.

     * @param key Your API key to access Google Photorealistic 3D Tiles. See

     *            https://developers.google.com/maps/documentation/javascript/get-api-key for instructions on how to

     *            create your own key.

     * @return Cesium3DTileset instance

     */

    @JsMethod(namespace = "Cesium", name = "createGooglePhotorealistic3DTileset")

    public static native Promise<Cesium3DTileset, Void> createGooglePhotorealistic3DTileset(String key);



    /**

     *  Creates a Cesium3DTileset instance for the Google Photorealistic 3D Tiles tileset.

     * @param key Your API key to access Google Photorealistic 3D Tiles. See

     *            https://developers.google.com/maps/documentation/javascript/get-api-key for instructions on how to

     *            create your own key.

     * @param options An object describing initialization options.

     * @return Cesium3DTileset instance

     */

    @JsMethod(namespace = "Cesium", name = "createGooglePhotorealistic3DTileset")

    public static native Promise<Cesium3DTileset, Void> createGooglePhotorealistic3DTileset(String key, Cesium3DTilesetOptions options);



    @JsFunction

    public interface Function {

        Object function(Object... args);

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/scene/Cesium3DTileset.java

+51 −0
Original line number Diff line number Diff line
@@ -554,6 +554,57 @@ public class Cesium3DTileset { 
        return new Cesium3DTileset(options);

    }



    /**

     * Creates a 3D Tiles tileset, used for streaming massive heterogeneous 3D geospatial datasets, from a Cesium ion asset ID.

     * @param assetId The Cesium ion asset id.

     * @return Cesium3DTileset

     */

    @JsMethod

    public static native Promise<Cesium3DTileset, Void> fromIonAssetId(Number assetId);



    /**

     * Creates a 3D Tiles tileset, used for streaming massive heterogeneous 3D geospatial datasets, from a Cesium ion asset ID.

     * @param assetId The Cesium ion asset id.

     * @param options An object describing initialization options

     * @return Cesium3DTileset

     */

    @JsMethod

    public static native Promise<Cesium3DTileset, Void> fromIonAssetId(Number assetId, Cesium3DTilesetOptions options);



    /**

     * Creates a 3D Tiles tileset, used for streaming massive heterogeneous 3D geospatial datasets.

     * @param resource The url to a tileset JSON file.

     * @return Cesium3DTileset

     */

    @JsMethod

    public static native Promise<Cesium3DTileset, Void> fromUrl(Resource resource);



    /**

     * Creates a 3D Tiles tileset, used for streaming massive heterogeneous 3D geospatial datasets.

     * @param resource The url to a tileset JSON file.

     * @param options An object describing initialization options

     * @return Cesium3DTileset

     */

    @JsMethod

    public static native Promise<Cesium3DTileset, Void> fromUrl(Resource resource, Cesium3DTilesetOptions options);



    /**

     * Creates a 3D Tiles tileset, used for streaming massive heterogeneous 3D geospatial datasets.

     * @param url The url to a tileset JSON file.

     * @return Cesium3DTileset

     */

    @JsMethod

    public static native Promise<Cesium3DTileset, Void> fromUrl(String url);



    /**

     * Creates a 3D Tiles tileset, used for streaming massive heterogeneous 3D geospatial datasets.

     * @param url The url to a tileset JSON file.

     * @param options An object describing initialization options

     * @return Cesium3DTileset

     */

    @JsMethod

    public static native Promise<Cesium3DTileset, Void> fromUrl(String url, Cesium3DTilesetOptions options);



    /**

     * Provides a hook to override the method used to request the tileset json

     * useful when fetching tilesets from remote servers

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/scene/GoogleMaps.java

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 iSergio, Gis4Fun.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package org.cesiumjs.cs.scene;



import jsinterop.annotations.JsProperty;

import jsinterop.annotations.JsType;

import org.cesiumjs.cs.core.Resource;



@JsType(isNative = true, namespace = "Cesium", name = "GoogleMaps")

public class GoogleMaps {

    /**

     * Gets or sets the default Google Maps API key.

     */

    @JsProperty

    public static String defaultApiKey;



    /**

     * Gets or sets the default Google Map Tiles API endpoint.

     * Default: https://tile.googleapis.com/v1/

     */

    @JsProperty

    public static String mapTilesApiEndpoint;



    /**

     * Gets or sets the default Google Map Tiles API endpoint.

     * Default: https://tile.googleapis.com/v1/

     */

    @JsProperty(name = "mapTilesApiEndpoint")

    public static Resource mapTilesApiEndpointResource;

}

cesiumjs4gwt-main/src/main/resources/org/cesiumjs/public/cs/Cesium/Cesium.js

+4068 −4093

File changed.

Preview size limit exceeded, changes collapsed.