Merge pull request #716 from KaiVolland/ol7

Updates openlayers to v7
geoext · Dec 15, 2022 · d3dd7c3 · d3dd7c3
2 parents 13fe4a3 + d3d6099
commit d3dd7c3
Show file tree

Hide file tree

Showing 28 changed files with 513 additions and 64 deletions.
diff --git a/.github/workflows/on-push-master.yml b/.github/workflows/on-push-master.yml
@@ -102,8 +102,8 @@ jobs:
         cp -r resources master/
         cp -r src master/
         cp -r classic master/
-        cp -r node_modules/@geoext/openlayers-legacy master/resources/
-        find master/examples -type f -name "*.html" -exec sed -i 's|../../node_modules/@geoext/openlayers-legacy|../../resources/openlayers-legacy|g' {} +
+        cp -r node_modules/ol master/resources/
+        find master/examples -type f -name "*.html" -exec sed -i 's|../../node_modules/ol|g' {} +
         cp /tmp/sencha-workspace/packages/geoext3/build/*js master/
         npm run generate:docs:master
         npm run generate:docs-w-ext:master

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,20 +1,27 @@
 Next Version
 ------------
 
+v5.0.0
+------
+
+BREAKING CHANGES:
+
+Updates openlayers to v7.1.0
+
 
 v4.0.0
 ------
 
 BREAKING CHANGES:
-- If a features store is configured with a layer this layer needs to be an `ol.layer.Vector` with an `ol.source.Vector` 
+- If a features store is configured with a layer this layer needs to be an `ol.layer.Vector` with an `ol.source.Vector`
 with a `ol.Collection`. That means, if you used it like this before, it will now throw an Error:
 ```js
 Ext.create('GeoExt.data.store.Features', {
   layer: new ol.layer.Vector({
     source: new ol.source.Vector()
   })
 });
-``` 
+```
 If you change it to the following code it will work and keep the elements of the store, and the layer in sync.
 ```js
 Ext.create('GeoExt.data.store.Features', {
@@ -24,8 +31,8 @@ Ext.create('GeoExt.data.store.Features', {
     })
   })
 });
-``` 
-- The OpenLayers version was updated to v6.5.0. To use this version run `npm i @geoext/openlayers-legacy` and include the
+```
+- The OpenLayers version was updated to v6.5.0. To use this version run `npm i ol` and include the
 `ol.js` and `ol.css` files from there.
 - Due to the OpenLayers update the OverviewMap no longer can use the same layers as the main map and always has to be
 provided own layers.

diff --git a/README.md b/README.md
@@ -13,13 +13,14 @@ GeoExt is Open Source and enables building desktop-like GIS applications through
 
 Version 3 of GeoExt was the successor to the GeoExt 2.x-series and has been built atop the following versions of its base libraries: OpenLayers v3.x / v4.x and ExtJS 6.
 
-With version 4 GeoExt supports the newest official installment v6.x of OpenLayers and ExtJS 6.2. 
+With version 4 GeoExt supports the newest official installment v6.x of OpenLayers and ExtJS 6.2.
 
 We are trying hard to keep up with developments on both our parent libraries.
-The current state of GeoExt is compatible with ExtJS 6.2.0 and OpenLayers 6.5.0. This state is released as GeoExt v4.0.0.
+The current state of GeoExt is compatible with ExtJS 6.2.0 and OpenLayers 7.1.0. This state is released as GeoExt v4.0.0.
 
 | OpenLayers       | ExtJS | GeoExt         |
 | ---------------- | ----- | -------------- |
+| 7.1.0            | 6.2.0 | 5.0.x          |
 | 6.5.0            | 6.2.0 | 4.0.x          |
 | 4.6.5            | 6.2.0 | 3.4.0 & 3.3.x & 3.2.0  |
 | 3.20.1 / 4.3.x   | 6.2.0 | 3.1.0          |

diff --git a/examples/component/map.html b/examples/component/map.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>GeoExt.component.Map Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -20,7 +20,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/component/overviewMap.html b/examples/component/overviewMap.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>GeoExt.component.OverviewMap Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -27,7 +27,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
             Ext.Loader.setConfig({

diff --git a/examples/component/overviewMap.js b/examples/component/overviewMap.js
@@ -36,7 +36,7 @@ Ext.application({
 
         olMap = new ol.Map({
             layers: [layer1],
-            interactions: ol.interaction.defaults().extend([
+            interactions: ol.interaction.defaults.defaults().extend([
                 new ol.interaction.DragRotateAndZoom()
             ]),
             view: new ol.View({

diff --git a/examples/features/grid-filter.html b/examples/features/grid-filter.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Feature Grid with filtering Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -30,7 +30,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/features/grid-map-selection.html b/examples/features/grid-map-selection.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Feature Grid Map Selection Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -20,7 +20,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/features/grid-paging.html b/examples/features/grid-paging.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>WFS Feature Grid with Paging Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -22,7 +22,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/features/grid-spatial-filter.html b/examples/features/grid-spatial-filter.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Feature Grid with spatial filtering</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -20,7 +20,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/features/grid.html b/examples/features/grid.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Feature Grid Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -25,7 +25,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/filtered-heatmap/filtered-heatmap.html b/examples/filtered-heatmap/filtered-heatmap.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Filtered FeatureStore Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -20,7 +20,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/geocoder/geocoder-combo.html b/examples/geocoder/geocoder-combo.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Geocoder Combo Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -20,7 +20,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/mapviewform/mapviewform.html b/examples/mapviewform/mapviewform.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Map View Form Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -18,7 +18,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/modern-layerlist/modern-layerlist.html b/examples/modern-layerlist/modern-layerlist.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
     <title>Layer List Modern Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/modern/theme-ios/resources/theme-ios-all.css"/>
 </head>
 
@@ -24,7 +24,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-modern-all-debug.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/modern-layerlist/modern-layerlist.js b/examples/modern-layerlist/modern-layerlist.js
@@ -3,7 +3,6 @@ Ext.require([
     'GeoExt.data.store.Layers',
     'Ext.panel.Panel',
     'Ext.grid.Grid',
-    'Ext.Viewport',
     'Ext.Toolbar',
     'Ext.Button',
     'Ext.TabPanel'

diff --git a/examples/modern-map/modern-map.html b/examples/modern-map/modern-map.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
     <title>GeoExt.component.Map Modern Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/modern/theme-ios/resources/theme-ios-all.css"/>
 </head>
 
@@ -22,7 +22,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-modern-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/modern-map/modern-map.js b/examples/modern-map/modern-map.js
@@ -1,7 +1,6 @@
 Ext.require([
     'GeoExt.component.Map',
     'Ext.panel.Panel',
-    'Ext.Viewport',
     'Ext.Toolbar',
     'Ext.Button',
     'Ext.TabPanel'

diff --git a/examples/popup/gx-popup.html b/examples/popup/gx-popup.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Popup Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 
     <link rel="stylesheet" type="text/css" href="../../resources/css/gx-popup.css">
@@ -40,7 +40,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/print/basic-mapfish.html b/examples/print/basic-mapfish.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>GeoExt.data.MapfishPrintProvider Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -30,7 +30,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/renderer/renderer.html b/examples/renderer/renderer.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>GeoExt.component.FeatureRenderer Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
     <style type="text/css">
          #swatches {
@@ -91,7 +91,7 @@ <h2>Custom Feature Rendering</h2>
             })
         </textarea><br>
         <button id="render">render</button>
-        <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+        <script src="../../node_modules/ol/dist/ol.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
         <script>
             Ext.Loader.setConfig({

diff --git a/examples/state/stateful-map.html b/examples/state/stateful-map.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Stateful Map Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -20,7 +20,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
         Ext.Loader.setConfig({

diff --git a/examples/tree/panel.html b/examples/tree/panel.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>TreeStore Example</title>
-    <link rel="stylesheet" type="text/css" href="../../node_modules/@geoext/openlayers-legacy/dist/ol.css">
+    <link rel="stylesheet" type="text/css" href="../../node_modules/ol/ol.css">
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-crisp/resources/theme-crisp-all.css"/>
 </head>
 
@@ -20,7 +20,7 @@
         </p>
     </div>
 
-    <script src="../../node_modules/@geoext/openlayers-legacy/dist/ol.js"></script>
+    <script src="../../node_modules/ol/dist/ol.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js"></script>
     <script>
             Ext.Loader.setConfig({