Merge pull request #1955 from terrestris/revert-openlayers-types

Revert openlayers types

Author: simonseyock

package-lock.json

@@ -52,13 +52,12 @@
     "clean:test": "rimraf ./coverage/*",
     "clean:build": "rimraf ./build/*",
     "clean:dist": "rimraf ./dist/*",
-    "pretest": "npm run typecheck && npm run lint",
+    "pretest": "npm run lint",
     "test": "jest --maxWorkers=4 --coverage",
     "test:watch": "jest --watchAll",
     "coveralls": "cat coverage/lcov.info | coveralls",
     "prepublishOnly": "npm run build",
-    "typecheck": "tsc --noEmit --project tsconfig.json",
-    "lint:src": "eslint -c .eslintrc.js --ext ts,tsx src/",
+    "lint:src": "tsc --noEmit --project tsconfig.json && eslint -c .eslintrc.js --ext ts,tsx src/",
     "lint:styleguide": "eslint -c .eslintrc.styleguide.js --no-eslintrc --ext md src/",
     "lint": "npm run lint:styleguide && npm run lint:src",
     "lint:fix": "npm run lint:styleguide -- --fix && npm run lint:src -- --fix",
@@ -83,14 +82,19 @@
     "@ant-design/icons": "^4.2.1",
     "@terrestris/base-util": "^0.2.3",
     "@terrestris/ol-util": "^4.0.1",
+    "@types/lodash": "^4.14.155",
+    "@types/moment": "^2.13.0",
+    "@types/node": "^14.0.13",
+    "@types/react-dom": "^17.0.0",
+    "@types/react-rnd": "^8.0.0",
     "lodash": "^4.17.15",
     "moment": "^2.24.0",
     "proj4": "^2.6.0",
     "prop-types": "^15.7.2",
     "react-dom": "^16.12.0",
     "react-fa": "^5.0.0",
     "react-rnd": "^10.2.1",
-    "typescript": "^4.1.3"
+    "typescript": "^4.0.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.10.1",
@@ -102,15 +106,9 @@
     "@babel/preset-env": "^7.10.2",
     "@babel/preset-react": "^7.10.1",
     "@babel/preset-typescript": "^7.10.1",
-    "@hanreev/types-ol": "^3.4.2",
     "@types/enzyme": "^3.10.4",
     "@types/jest": "^26.0.0",
-    "@types/lodash": "^4.14.155",
-    "@types/moment": "^2.13.0",
-    "@types/node": "^14.0.13",
     "@types/react": "^16.9.38",
-    "@types/react-dom": "^17.0.0",
-    "@types/react-rnd": "^8.0.0",
     "@typescript-eslint/eslint-plugin": "^3.4.0",
     "@typescript-eslint/eslint-plugin-tslint": "^4.1.1",
     "@typescript-eslint/parser": "^3.4.0",
@@ -136,7 +134,7 @@
     "jest-environment-jsdom-fourteen": "^1.0.1",
     "less-loader": "^6.1.1",
     "np": "^7.0.0",
-    "ol": "^6.5.0",
+    "ol": "^6.4.1",
     "react": "^16.12.0",
     "react-docgen-typescript": "^1.17.1",
     "react-styleguidist": "^11.0.8",

package.json

@@ -12,19 +12,15 @@ import OlStyleStroke from 'ol/style/Stroke';
 import OlStyleFill from 'ol/style/Fill';
 import OlStyleCircle from 'ol/style/Circle';
 import OlStyleText from 'ol/style/Text';
+import OlInteraction from 'ol/interaction/Interaction';
 import OlInteractionDraw, { createBox } from 'ol/interaction/Draw';
 import OlInteractionSelect from 'ol/interaction/Select';
 import OlInteractionModify from 'ol/interaction/Modify';
 import OlInteractionTranslate from 'ol/interaction/Translate';
 import OlFeature from 'ol/Feature';
 import { never, singleClick } from 'ol/events/condition';
-import OlGeometry from 'ol/geom/Geometry';
-import { Select } from 'ol/interaction';
-import Draw from 'ol/interaction/Draw';
-import Modify from 'ol/interaction/Modify';
-import Translate from 'ol/interaction/Translate';
 
-import _isFunction from 'lodash/isFunction';
+const _isFunction = require('lodash/isFunction');
 
 import ToggleButton, { ToggleButtonProps } from '../ToggleButton/ToggleButton';
 import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
@@ -126,7 +122,7 @@ interface BaseProps {
   /**
    * Style object / style function for drawn feature.
    */
-  drawStyle?: OlStyleStyle | ((feature: OlFeature<OlGeometry>) => OlStyleStyle);
+  drawStyle?: OlStyleStyle | ((feature: OlFeature) => OlStyleStyle);
   /**
    * Listener function for the 'drawend' event of an ol.interaction.Draw.
    * See https://openlayers.org/en/latest/apidoc/module-ol_interaction_Draw-DrawEvent.html
@@ -255,25 +251,25 @@ class DigitizeButton extends React.Component<DigitizeButtonProps, DigitizeButton
    * The draw interaction.
    * @private
    */
-  _drawInteraction?: Draw;
+  _drawInteraction?: OlInteraction;
 
   /**
    * The select interaction.
    * @private
    */
-  _selectInteraction?: Select;
+  _selectInteraction?: OlInteraction;
 
   /**
    * The modify interaction.
    * @private
    */
-  _modifyInteraction?: Modify;
+  _modifyInteraction?: OlInteraction;
 
   /**
    * The translate interaction.
    * @private
    */
-  _translateInteraction?: Translate;
+  _translateInteraction?: OlInteraction;
 
   /**
    * Name of point draw type.
@@ -620,7 +616,7 @@ class DigitizeButton extends React.Component<DigitizeButtonProps, DigitizeButton
    * @param text Text for labeled feature (optional).
    * @return The style to use.
    */
-  getSelectedStyleFunction = (feature: OlFeature<OlGeometry>, res: number, text: string) => {
+  getSelectedStyleFunction = (feature: OlFeature, res: number, text: React.ReactText) => {
     const {
       selectFillColor,
       selectStrokeColor
@@ -1077,7 +1073,7 @@ class DigitizeButton extends React.Component<DigitizeButtonProps, DigitizeButton
    * @param feat The point feature to be styled with label.
    * @param onModalOkCbk Optional callback function.
    */
-  setTextOnFeature = (feat: OlFeature<OlGeometry>, onModalOkCbk: (feat: OlFeature<OlGeometry>, label: string) => void) => {
+  setTextOnFeature = (feat: OlFeature, onModalOkCbk: (feat: OlFeature, label: string) => void) => {
     const {
       maxLabelLineLength
     } = this.props;

src/Button/DigitizeButton/DigitizeButton.tsx

@@ -9,8 +9,6 @@ import OlLayerVector from 'ol/layer/Vector';
 import OlSourceVector from 'ol/source/Vector';
 import OlStyleStyle from 'ol/style/Style';
 import OlStyleIcon from 'ol/style/Icon';
-import Geometry from 'ol/geom/Geometry';
-import GeometryLayout from 'ol/geom/GeometryLayout';
 
 import ToggleButton, { ToggleButtonProps } from '../ToggleButton/ToggleButton';
 
@@ -127,7 +125,7 @@ class GeoLocationButton extends React.Component<GeoLocationButtonProps> {
    * The styleFunction for the geoLocationLayer. Shows a marker with arrow when
    * heading is not 0.
    */
-  _styleFunction = (feature: OlFeature<Geometry>) => {
+  _styleFunction = (feature: OlFeature) => {
     const heading = feature.get('heading');
     const src = heading !== 0 ? mapMarkerHeading : mapMarker;
     const rotation = heading !== 0 ? heading * Math.PI / 180 : 0;
@@ -170,7 +168,7 @@ class GeoLocationButton extends React.Component<GeoLocationButtonProps> {
     } = this.props;
     const allLayers = MapUtil.getAllLayers(map);
 
-    this._positions = new OlGeomLineString([], GeometryLayout.XYZM);
+    this._positions = new OlGeomLineString([], 'XYZM');
     this._geoLocationLayer.setStyle(this._styleFunction);
     if (!allLayers.includes(this._geoLocationLayer)) {
       map.addLayer(this._geoLocationLayer);