Merge branch '1.93' into 'develop' (e4a3a50d) · Commits · iSergio / cesiumjs4gwt

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.92.0</version>
		<version>1.93.0</version>
		</parent>

		<name>CesiumJS GWT Wrapper</name>

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/datasources/GeoJsonDataSource.java

+51 −0

Original line number	Diff line number	Diff line
		@@ -244,6 +244,57 @@ public class GeoJsonDataSource implements DataSource {
		@JsMethod
		public static native Promise<GeoJsonDataSource, String> load(Resource data);

		/**
		* Asynchronously loads the provided GeoJSON or TopoJSON data, without replacing any existing data.
		* @param data resource to be loaded
		* @param options An object specifying configuration options
		* @return a promise that will resolve when the GeoJSON is loaded.
		*/
		@JsMethod
		public static native Promise<GeoJsonDataSource, String> process(Resource data, GeoJsonDataSourceOptions options);

		/**
		* Asynchronously loads the provided GeoJSON or TopoJSON data, without replacing any existing data.
		* @param data url to be loaded
		* @param options An object specifying configuration options
		* @return a promise that will resolve when the GeoJSON is loaded.
		*/
		@JsMethod
		public static native Promise<GeoJsonDataSource, String> process(String data, GeoJsonDataSourceOptions options);

		/**
		* Asynchronously loads the provided GeoJSON or TopoJSON data, without replacing any existing data.
		* @param data GeoJSON object, or TopoJSON object to be loaded
		* @param options An object specifying configuration options
		* @return a promise that will resolve when the GeoJSON is loaded.
		*/
		@JsMethod
		public static native Promise<GeoJsonDataSource, String> process(JsObject data, GeoJsonDataSourceOptions options);

		/**
		* Asynchronously loads the provided GeoJSON or TopoJSON data, without replacing any existing data.
		* @param data resource to be loaded
		* @return a promise that will resolve when the GeoJSON is loaded.
		*/
		@JsMethod
		public static native Promise<GeoJsonDataSource, String> process(Resource data);

		/**
		* Asynchronously loads the provided GeoJSON or TopoJSON data, without replacing any existing data.
		* @param data url to be loaded
		* @return a promise that will resolve when the GeoJSON is loaded.
		*/
		@JsMethod
		public static native Promise<GeoJsonDataSource, String> process(String data);

		/**
		* Asynchronously loads the provided GeoJSON or TopoJSON data, without replacing any existing data.
		* @param data GeoJSON object, or TopoJSON object to be loaded
		* @return a promise that will resolve when the GeoJSON is loaded.
		*/
		@JsMethod
		public static native Promise<GeoJsonDataSource, String> process(JsObject data);

		@Override
		@JsMethod
		@JsIgnore

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/datasources/KmlDataSource.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package org.cesiumjs.cs.datasources;

		import com.google.gwt.canvas.client.Canvas;
		import jsinterop.annotations.JsConstructor;
		import jsinterop.annotations.JsMethod;
		import jsinterop.annotations.JsProperty;
		@@ -28,6 +29,7 @@ import org.cesiumjs.cs.datasources.options.KmlDataSourceLoadOptions;
		import org.cesiumjs.cs.datasources.options.KmlDataSourceLoadStaticOptions;
		import org.cesiumjs.cs.datasources.options.KmlDataSourceOptions;
		import org.cesiumjs.cs.promise.Promise;
		import org.cesiumjs.cs.scene.Camera;

		/**
		* @author Serge Silaev aka iSergio
		@@ -35,6 +37,17 @@ import org.cesiumjs.cs.promise.Promise;
		// TODO: Examples, Blobs, Documents
		@JsType(isNative = true, namespace = "Cesium", name = "KmlDataSource")
		public class KmlDataSource implements DataSource {
		/**
		* The position and orientation of this Camera will be used to populate various camera parameters when making
		* network requests. Camera movement will determine when to trigger NetworkLink refresh if viewRefreshMode is onStop.
		*/
		@JsProperty
		public Camera camera;
		/**
		* The current size of this Canvas will be used to populate the Link parameters for client height and width.
		*/
		@JsProperty
		public Canvas canvas;
		/**
		* Gets an event that will be raised when the underlying data changes.
		*/

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/datasources/options/KmlDataSourceOptions.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,10 @@ public class KmlDataSourceOptions {
		protected KmlDataSourceOptions() {
		}

		private static KmlDataSourceOptions create() {
		return new KmlDataSourceOptions();
		}

		/**
		* Create instance options for {@link org.cesiumjs.cs.datasources.KmlDataSource}
		*

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/scene/experimental/ModelExperimental.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,14 @@ public class ModelExperimental {
		*/
		@JsProperty
		public boolean debugShowBoundingVolume;
		/**
		* This property is for debugging only; it is not for production use nor is it optimized.
		* Draws the model in wireframe.
		*
		* Default: false
		*/
		@JsProperty
		public boolean debugWireframe;
		/**
		* The index into the list of primitive feature IDs used for picking and styling. For EXT_feature_metadata,
		* feature ID attributes are listed before feature ID textures. If both per-primitive and per-instance feature