Merge pull request #643 from terrestris/update-ol

Update ol

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, GeoExt3 and OpenLayers > 3.
+BasiGX is an ExtJS package used to create modern GIS-Applications based on ExtJS 6, GeoExt 4 and OpenLayers 6.5.0.
 It consists of multiple components that helps the developer to put together a customized app quickly.
 
 ## Development requirements

examples/animation/index.html

@@ -18,7 +18,7 @@ <h1>BasiGX.util.Animate examples</h1>
  <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://cdnjs.cloudflare.com/ajax/libs/openlayers/4.3.2/ol.js"></script>
- <script src="https://geoext.github.io/geoext3/master/GeoExt.js"></script>
+ <script src="https://geoext.github.io/geoext/master/GeoExt.js"></script>
  <script>
  Ext.Loader.setConfig({
  enabled: true,

examples/i18n/index.html

@@ -19,7 +19,7 @@ <h1>Language Combo Example</h1>
 
  <script src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/ext-all.js"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/openlayers/4.3.2/ol.js"></script>
- <script src="https://geoext.github.io/geoext3/master/GeoExt.js"></script>
+ <script src="https://geoext.github.io/geoext/master/GeoExt.js"></script>
 
  <script>
  Ext.Loader.setConfig({

karma-conf.common.js

@@ -8,14 +8,16 @@ 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',
- 'https://cdnjs.cloudflare.com/ajax/libs/openlayers/4.6.5/ol.css',
- 'https://cdnjs.cloudflare.com/ajax/libs/openlayers/4.6.5/ol.js',
+ 'node_modules/@geoext/openlayers-legacy/dist/ol.css',
+ 'node_modules/@geoext/openlayers-legacy/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
  {
  pattern: 'node_modules/@geoext/geoext/src/**/*.js',
  included: true
  },
+ // GeoExt classic toolkit source files
  {
  pattern: 'node_modules/@geoext/geoext/classic/**/*.js',
  included: true

package.json

@@ -39,8 +39,8 @@
  },
  "output": "${package.dir}/build",
  "scripts": {
- "pretest": "npm run lint",
- "test": "karma start --single-run --reporters=mocha",
+ "test": "npm run lint && npm run test:spec",
+ "test:spec": "karma start --single-run --reporters=mocha",
  "test:watch": "karma start karma-watch.conf.js --reporters=mocha",
  "lint": "eslint -c .eslintrc src/ && eslint -c test/.eslintrc test/",
  "lint:fix": "eslint -c .eslintrc --fix src/ && eslint -c test/.eslintrc --fix test/",
@@ -57,14 +57,19 @@
  "type": "git",
  "url": "https://github.com/terrestris/BasiGX.git"
  },
+ "peerDependencies": {
+ "@geoext/geoext": "4.0.0",
+ "@geoext/openlayers-legacy": "6.5.2"
+ },
  "devDependencies": {
- "@geoext/geoext": "^3.4.0",
+ "@geoext/geoext": "4.0.0",
+ "@geoext/openlayers-legacy": "6.5.2",
  "copyfiles": "2.4.1",
  "coveralls": "3.1.0",
  "eslint": "7.18.0",
  "expect.js": "0.3.1",
- "karma": "6.0.2",
- "karma-chrome-launcher": "3.1.0",
+ "karma": "^6.3.2",
+ "karma-chrome-launcher": "^3.1.0",
  "karma-coverage": "2.0.3",
  "karma-expect": "1.1.3",
  "karma-mocha": "2.0.1",