Merge pull request #714 from KaiVolland/ol7

Upgrade to ol7
terrestris · Mar 31, 2023 · 84ee2c6 · 84ee2c6
2 parents e28c59b + 3bd2835
commit 84ee2c6
Show file tree

Hide file tree

Showing 10 changed files with 1,536 additions and 7,860 deletions.
diff --git a/Readme.md b/Readme.md
@@ -4,7 +4,7 @@
 
 …pronounced `ˈbeɪsɪks/`, like the english word `basics`.
 
-BasiGX is an ExtJS package used to create modern GIS-Applications based on ExtJS 6, GeoExt 4 and OpenLayers 6.5.0.
+BasiGX is an ExtJS package used to create modern GIS-Applications based on ExtJS 6, GeoExt 5 and OpenLayers 7.
 It consists of multiple components that helps the developer to put together a customized app quickly.
 
 ## Development requirements

diff --git a/examples/animation/index.html b/examples/animation/index.html
@@ -9,15 +9,15 @@
  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/resources/theme-neptune-all.css">
  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/resources/theme-neptune-all_1.css">
  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/resources/theme-neptune-all_2.css">
- <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/css/ol.css" type="text/css">
+ <link rel="stylesheet" href="../../node_modules/ol/ol.css" type="text/css">
 </head>
 <body>
  <h1>BasiGX.util.Animate examples</h1>
  <p>Click on a feature to see the current animation in effect.</p>
  <p>Note that the js is not minified so it is readable. See <a href="animate.js">animate.js</a>.</p>
  <div id="map"></div>
  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/ext-all.js"></script>
- <script src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/build/ol.js"></script>
+ <script src="../../node_modules/ol/dist/ol.js"></script>
  <script src="https://geoext.github.io/geoext/master/GeoExt.js"></script>
  <script>
  Ext.Loader.setConfig({

diff --git a/examples/i18n/index.html b/examples/i18n/index.html
@@ -9,7 +9,7 @@
  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/resources/theme-neptune-all.css">
  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/resources/theme-neptune-all_1.css">
  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/resources/theme-neptune-all_2.css">
- <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/css/ol.css" type="text/css">
+ <link rel="stylesheet" href="../../node_modules/ol/ol.css" type="text/css">
 
 </head>
 <body style="width:100%; height:100%;">
@@ -18,7 +18,7 @@ <h1>Language Combo Example</h1>
  <div id="map"></div>
 
  <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/ext-all.js"></script>
- <script src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.5.0/build/ol.js"></script>
+ <script src="../../node_modules/ol/dist/ol.js"></script>
  <script src="https://geoext.github.io/geoext/master/GeoExt.js"></script>
 
  <script>

diff --git a/karma-conf.common.js b/karma-conf.common.js
@@ -8,8 +8,8 @@ module.exports = function(config) {
  'https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-neptune/resources/theme-neptune-all_1.css',
  'https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-neptune/resources/theme-neptune-all_2.css',
  'https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/classic/theme-neptune/resources/theme-neptune-all.css',
- 'node_modules/@geoext/openlayers-legacy/dist/ol.css',
- 'node_modules/@geoext/openlayers-legacy/dist/ol.js',
+ 'node_modules/ol/ol.css',
+ 'node_modules/ol/dist/ol.js',
  'https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/ext-all.js',
  'https://cdnjs.cloudflare.com/ajax/libs/extjs/6.2.0/packages/ux/classic/ux.js',
  // GeoExt source files

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -63,14 +63,14 @@
  },
  "peerDependencies": {
  "@geoext/geoext": "4.1.0",
- "@geoext/openlayers-legacy": "6.15.1"
+ "ol": ">=7"
  },
  "devDependencies": {
- "@geoext/geoext": "4.1.0",
- "@geoext/openlayers-legacy": "6.15.1",
+ "@geoext/geoext": "5.0.0",
+ "ol": "^7.3.0",
  "copyfiles": "2.4.1",
  "coveralls": "3.1.1",
- "eslint": "8.25.0",
+ "eslint": "8.37.0",
  "expect.js": "0.3.1",
  "karma": "6.4.1",
  "karma-chrome-launcher": "3.1.1",
@@ -79,13 +79,13 @@
  "karma-mocha": "2.0.1",
  "karma-mocha-reporter": "2.2.5",
  "karma-sinon": "1.0.5",
- "mocha": "10.0.0",
+ "mocha": "10.2.0",
  "np": "7.7.0",
- "open-cli": "7.1.0",
+ "open-cli": "7.2.0",
  "puppeteer": "18.2.1",
  "rimraf": "3.0.2",
- "serve": "14.1.2",
+ "serve": "14.2.0",
  "sinon": "14.0.1",
- "uglify-js": "3.17.3"
+ "uglify-js": "3.17.4"
  }
 }
diff --git a/src/olExt/TransformInteraction.js b/src/olExt/TransformInteraction.js
@@ -29,7 +29,7 @@ Ext.define('BasiGX.olExt.TransformInteraction', {
  // some basic sanity checks
  if (!ol || !ol.interaction || !ol.interaction.Pointer) {
  Ext.log.error('Cannot define `ol.interaction.Transform`: Not ' +
- 'all needed OpenLayers 3 classes present.');
+ 'all needed OpenLayers classes present.');
  return;
  } else if ('Transform' in ol.interaction) {
  Ext.log.error('Cannot define `ol.interaction.Transform`: It is ' +

diff --git a/src/util/Layer.js b/src/util/Layer.js
@@ -80,8 +80,7 @@ Ext.define('BasiGX.util.Layer', {
  if (matchingLayer) {
  return false;
  }
- if (layer.get(key) === val &&
- layer instanceof ol.layer.Base) {
+ if (layer.get(key) === val && layer instanceof ol.layer.Base) {
  matchingLayer = layer;
  return false;
  } else if (layer instanceof ol.layer.Group) {

diff --git a/src/view/form/Print.js b/src/view/form/Print.js
@@ -545,7 +545,7 @@ Ext.define('BasiGX.view.form.Print', {
  ) !== false); // may be undefined for certain layers
 
  if (isChecked && hasName && nonOpaque && inTree) {
- if (layer instanceof ol.layer.Vector &&
+ if (layer instanceof ol.layer.BaseVector &&
  layer.getSource().getFeatures().length < 1) {
  return false;
  }

diff --git a/src/view/grid/FeatureGrid.js b/src/view/grid/FeatureGrid.js
@@ -153,8 +153,8 @@ Ext.define('BasiGX.view.grid.FeatureGrid', {
  */
  saveReminderDelay: 10 * 60 * 1000,
  /**
- * An example GeoJSON feature object that will be used to extract the schema
- * in case no features are in the store.
+ * An example GeoJSON feature object that will be used to extract the
+ * schema in case no features are in the store.
  */
  exampleFeature: null
  },