Add preliminary support for openlayers 10.6.1

Author: Tino Desjardins

gwt-ol3-client/src/main/java/ol/OLFactory.java

@@ -81,8 +81,6 @@
 import ol.source.Osm;
 import ol.source.RasterOptions;
 import ol.source.Source;
-import ol.source.Stamen;
-import ol.source.StamenOptions;
 import ol.source.TileDebug;
 import ol.source.TileDebugOptions;
 import ol.source.TileWms;
@@ -939,10 +937,6 @@ public static TileCoord createTileCoord(double x, double y, double z) {
 
     /** Common **/
 
-    public static Stamen createStamenSource(StamenOptions stamenOptions) {
-        return new Stamen(stamenOptions);
-    };
-
     /**
      * Creates a new {@link Stroke} style.
      *

gwt-ol3-client/src/main/java/ol/source/Stamen.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2014, 2019 gwt-ol
+ * Copyright 2014, 2025 gwt-ol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,14 +75,6 @@ public class RegularShapeOptions implements Options {
     @JsProperty
     public native void setRotation(double rotation);
 
-    /**
-     * Inner radius of a star.
-     *
-     * @param radius1 radius
-     */
-    @JsProperty
-    public native void setRadius1(double radius1);
-
     /**
      * Outer radius of a star.
      *

gwt-ol3-client/src/main/java/ol/source/StamenOptions.java

@@ -29,7 +29,7 @@ public abstract class GwtOLBaseTestCase extends BaseTestCase {
     public GwtOLBaseTestCase() {
 
         super(Arrays.asList(
-                "//cdn.jsdelivr.net/npm/ol@7.5.2/dist/ol.min.js"),
+                "//cdn.jsdelivr.net/npm/ol@10.6.1/dist/ol.min.js"),
                 "ol.GwtOLTest",
                 10000);
     }

gwt-ol3-client/src/main/java/ol/style/RegularShapeOptions.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2014, 2019 gwt-ol
+ * Copyright 2014, 2025 gwt-ol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,16 +30,16 @@ public void testRegularShape() {
         injectUrlAndTest(() -> {
             RegularShapeOptions regularShapeOptions = new RegularShapeOptions();
             regularShapeOptions.setAngle(Math.PI / 4);
-            regularShapeOptions.setRadius1(4);
+            regularShapeOptions.setRadius(4);
             regularShapeOptions.setRadius2(3);
             regularShapeOptions.setRotation(Math.PI / 3);
             regularShapeOptions.setRotateWithView(false);
             assertNotNull(regularShapeOptions);
 
             RegularShape regularShape = new RegularShape(regularShapeOptions);
             assertNotNull(regularShape);
-            assertEquals(regularShape.getRadius(), 4d);
-            assertEquals(regularShape.getRadius2(), 3d);
+            assertEquals(4d, regularShape.getRadius());
+            assertEquals(3d, regularShape.getRadius2());
 
             regularShape.setOpacity(0.5);
             regularShape.setRotation(Math.PI);

gwt-ol3-client/src/test/java/ol/GwtOLBaseTestCase.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2014, 2021 gwt-ol
+ * Copyright 2014, 2025 gwt-ol
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 
 import ol.Coordinate;
 import ol.Feature;
-import ol.source.Stamen;
-import ol.source.StamenOptions;
+import ol.source.Osm;
 import ol.source.VectorOptions;
+import ol.source.XyzOptions;
 import ol.Map;
 import ol.MapOptions;
 import ol.OLFactory;
@@ -46,13 +46,14 @@ public class HeatmapExample implements Example {
     @Override
     public void show(String exampleId) {
 
-        StamenOptions stamenOptions = new StamenOptions();
-        stamenOptions.setLayer("toner");
+        // create a OSM-layer
+        XyzOptions osmSourceOptions = OLFactory.createOptions();
 
-        Stamen stamen = new Stamen(stamenOptions);
+        Osm osmSource = new Osm(osmSourceOptions);
+        LayerOptions osmLayerOptions = OLFactory.createOptions();
+        osmLayerOptions.setSource(osmSource);
 
-        LayerOptions rasterLayerOptions = OLFactory.createOptions();
-        rasterLayerOptions.setSource(stamen);
+        Tile osmLayer = new Tile(osmLayerOptions);
 
         VectorOptions vectorOptions = new VectorOptions();
         vectorOptions.setUrl("https://openlayers.org/en/latest/examples/data/kml/2012_Earthquakes_Mag5.kml");
@@ -63,8 +64,6 @@ public void show(String exampleId) {
 
         ol.source.Vector vectorSource = new ol.source.Vector(vectorOptions);
 
-        Tile stamenLayer = new Tile(rasterLayerOptions);
-
         HeatmapOptions heatmapOptions = new HeatmapOptions();
         heatmapOptions.setSource(vectorSource);
         heatmapOptions.setBlur(15);
@@ -102,7 +101,7 @@ public void show(String exampleId) {
         MousePosition mousePosition = new MousePosition();
         mousePosition.setCoordinateFormat(Coordinate.createStringXY(2));
         map.addControl(mousePosition);
-        map.addLayer(stamenLayer);
+        map.addLayer(osmLayer);
         map.addLayer(heatmapLayer);
 
     }

gwt-ol3-client/src/test/java/ol/style/RegularShapeTest.java

@@ -45,7 +45,6 @@ public enum OLExampleType {
     OverlayExample(new OverlayExample()),
     RasterExample(new RasterExample()),
     SelectFeaturesExample(new SelectFeaturesExample()),
-    TileExample(new TileExample()),
     TileWmsExample(new TileWmsExample()),
     WfsExample(new WfsExample()),
     WmsExample(new WmsExample()),

gwt-ol3-demo/src/main/java/com/github/tdesjardins/ol3/demo/client/example/HeatmapExample.java

@@ -3,8 +3,8 @@
 <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <link href="style.css" rel="stylesheet" type="text/css">
-    <link href="//cdn.jsdelivr.net/npm/ol@7.5.2/ol.min.css" rel="stylesheet" type="text/css">
-    <script src="//cdn.jsdelivr.net/npm/ol@7.5.2/dist/ol.min.js" type="text/javascript"></script>
+    <link href="//cdn.jsdelivr.net/npm/ol@10.6.1/ol.min.css" rel="stylesheet" type="text/css">
+    <script src="//cdn.jsdelivr.net/npm/ol@10.6.1/dist/ol.min.js" type="text/javascript"></script>
     <script src="demo.nocache.js" type="text/javascript"></script>
 
     <title>GWT-OL Playground</title>