From d4fe73cf47a9d0621f75afd54ad8d24a804f10cb Mon Sep 17 00:00:00 2001 From: iSergio Date: Mon, 15 May 2023 09:46:42 +0300 Subject: [PATCH] Added GeocoderService.credit and and attributions property to GeocoderService.Result to allow for geocoder services to attribute results --- .../cs/core/BingMapsGeocoderService.java | 23 +++++++++++++++---- .../cesiumjs/cs/core/IonGeocoderService.java | 23 +++++++++++++++---- .../cs/core/OpenCageGeocoderService.java | 19 +++++++++++++++ .../cs/core/PeliasGeocoderService.java | 19 +++++++++++++++ 4 files changed, 76 insertions(+), 8 deletions(-) diff --git a/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/BingMapsGeocoderService.java b/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/BingMapsGeocoderService.java index 20a936c1..c564e83f 100644 --- a/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/BingMapsGeocoderService.java +++ b/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/BingMapsGeocoderService.java @@ -16,10 +16,7 @@ package org.cesiumjs.cs.core; -import jsinterop.annotations.JsConstructor; -import jsinterop.annotations.JsMethod; -import jsinterop.annotations.JsOverlay; -import jsinterop.annotations.JsType; +import jsinterop.annotations.*; import org.cesiumjs.cs.core.options.BingMapsGeocoderServiceOptions; import org.cesiumjs.cs.promise.Promise; @@ -30,6 +27,24 @@ import org.cesiumjs.cs.promise.Promise; */ @JsType(isNative = true, namespace = "Cesium", name = "BingMapsGeocoderService") public class BingMapsGeocoderService implements GeocoderService { + /** + * Gets the credit to display after a geocode is performed. Typically this is used to credit the geocoder service. + */ + @JsProperty(name = "credit") + public native Credit credit(); + + /** + * The key for the Bing geocoder service + */ + @JsProperty(name = "key") + public native String key(); + + /** + * The URL endpoint for the Bing geocoder service + */ + @JsProperty(name = "url") + public native String url(); + @JsConstructor private BingMapsGeocoderService() { } diff --git a/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/IonGeocoderService.java b/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/IonGeocoderService.java index 01dd76ae..98dd2ee1 100644 --- a/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/IonGeocoderService.java +++ b/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/IonGeocoderService.java @@ -16,10 +16,7 @@ package org.cesiumjs.cs.core; -import jsinterop.annotations.JsConstructor; -import jsinterop.annotations.JsMethod; -import jsinterop.annotations.JsOverlay; -import jsinterop.annotations.JsType; +import jsinterop.annotations.*; import org.cesiumjs.cs.core.enums.GeocodeType; import org.cesiumjs.cs.core.options.IonGeocoderServiceOptions; import org.cesiumjs.cs.promise.Promise; @@ -32,6 +29,24 @@ import org.cesiumjs.cs.scene.Scene; */ @JsType(isNative = true, namespace = "Cesium", name = "IonGeocoderService") public class IonGeocoderService implements GeocoderService { + /** + * Gets the credit to display after a geocode is performed. Typically this is used to credit the geocoder service. + */ + @JsProperty(name = "credit") + public native Credit credit(); + + /** + * The key for the Bing geocoder service + */ + @JsProperty(name = "key") + public native String key(); + + /** + * The URL endpoint for the Bing geocoder service + */ + @JsProperty(name = "url") + public native String url(); + @JsConstructor private IonGeocoderService() { } diff --git a/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/OpenCageGeocoderService.java b/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/OpenCageGeocoderService.java index c3c1a15b..93191e0d 100644 --- a/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/OpenCageGeocoderService.java +++ b/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/OpenCageGeocoderService.java @@ -18,6 +18,7 @@ package org.cesiumjs.cs.core; import jsinterop.annotations.JsConstructor; import jsinterop.annotations.JsMethod; +import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import org.cesiumjs.cs.core.options.OpenCageGeocoderServiceOptions; import org.cesiumjs.cs.promise.Promise; @@ -30,6 +31,24 @@ import org.cesiumjs.cs.promise.Promise; */ @JsType(isNative = true, namespace = "Cesium", name = "OpenCageGeocoderService") public class OpenCageGeocoderService implements GeocoderService { + /** + * Gets the credit to display after a geocode is performed. Typically this is used to credit the geocoder service. + */ + @JsProperty(name = "credit") + public native Credit credit(); + + /** + * The key for the Bing geocoder service + */ + @JsProperty(name = "key") + public native String key(); + + /** + * The URL endpoint for the Bing geocoder service + */ + @JsProperty(name = "url") + public native String url(); + /** * @param resource The endpoint to the OpenCage server. diff --git a/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/PeliasGeocoderService.java b/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/PeliasGeocoderService.java index 5755c19d..cedc9cbf 100644 --- a/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/PeliasGeocoderService.java +++ b/cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/PeliasGeocoderService.java @@ -18,6 +18,7 @@ package org.cesiumjs.cs.core; import jsinterop.annotations.JsConstructor; import jsinterop.annotations.JsMethod; +import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import org.cesiumjs.cs.core.enums.GeocodeType; import org.cesiumjs.cs.promise.Promise; @@ -29,6 +30,24 @@ import org.cesiumjs.cs.promise.Promise; */ @JsType(isNative = true, namespace = "Cesium", name = "PeliasGeocoderService") public class PeliasGeocoderService implements GeocoderService { + /** + * Gets the credit to display after a geocode is performed. Typically this is used to credit the geocoder service. + */ + @JsProperty(name = "credit") + public native Credit credit(); + + /** + * The key for the Bing geocoder service + */ + @JsProperty(name = "key") + public native String key(); + + /** + * The URL endpoint for the Bing geocoder service + */ + @JsProperty(name = "url") + public native String url(); + /** * Provides geocoding via a Pelias server. * -- GitLab