From 9290d8ab921c8ba5c96e0918f8f943ee75422488 Mon Sep 17 00:00:00 2001
From: matthew44-mappable
 <155086725+matthew44-mappable@users.noreply.github.com>
Date: Thu, 25 Apr 2024 13:20:21 +0300
Subject: [PATCH] remove __implXxx, fix tilt control (#6)

---
 package-lock.json                                  | 14 +++++++-------
 package.json                                       |  2 +-
 src/controls/MMapGeolocationControl/index.ts       |  4 ----
 src/controls/MMapRotateControl/index.ts            |  4 ----
 .../MMapRotateTiltControl/MMapTiltControl.ts       |  6 +++---
 src/controls/MMapRotateTiltControl/index.ts        |  4 ----
 src/controls/MMapTiltControl/index.ts              | 10 +++-------
 src/controls/MMapZoomControl/index.ts              |  6 +-----
 8 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6cf72e1..3ff122b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
             "license": "Apache-2",
             "devDependencies": {
                 "@mappable-world/mappable-cli": "^0.0.32",
-                "@mappable-world/mappable-types": "^0.0.16",
+                "@mappable-world/mappable-types": "^0.0.18",
                 "@types/got": "9.6.12",
                 "@types/jest": "29.5.3",
                 "@types/jsdom": "21.1.1",
@@ -1276,9 +1276,9 @@
             }
         },
         "node_modules/@mappable-world/mappable-types": {
-            "version": "0.0.16",
-            "resolved": "https://registry.npmjs.org/@mappable-world/mappable-types/-/mappable-types-0.0.16.tgz",
-            "integrity": "sha512-jvj5BSLWHf8cMZ3Lw+oPN5zveT3ksZBtcYFU+4bsKVfsh3xYtg8k6BQO5sagc4dwW8Ar2YtOYYen2pi420gjtw==",
+            "version": "0.0.18",
+            "resolved": "https://registry.npmjs.org/@mappable-world/mappable-types/-/mappable-types-0.0.18.tgz",
+            "integrity": "sha512-GmrnldWko8c7tCh5/2fc9UrjhEWkqI1YZhNZwdDrJs8NGh/0pSUuiJhnhm3ocH1SN18CCdhcsgTqmZ2d6vQ9KA==",
             "dev": true,
             "peerDependencies": {
                 "@types/react": "16-18",
@@ -10289,9 +10289,9 @@
             }
         },
         "@mappable-world/mappable-types": {
-            "version": "0.0.16",
-            "resolved": "https://registry.npmjs.org/@mappable-world/mappable-types/-/mappable-types-0.0.16.tgz",
-            "integrity": "sha512-jvj5BSLWHf8cMZ3Lw+oPN5zveT3ksZBtcYFU+4bsKVfsh3xYtg8k6BQO5sagc4dwW8Ar2YtOYYen2pi420gjtw==",
+            "version": "0.0.18",
+            "resolved": "https://registry.npmjs.org/@mappable-world/mappable-types/-/mappable-types-0.0.18.tgz",
+            "integrity": "sha512-GmrnldWko8c7tCh5/2fc9UrjhEWkqI1YZhNZwdDrJs8NGh/0pSUuiJhnhm3ocH1SN18CCdhcsgTqmZ2d6vQ9KA==",
             "dev": true
         },
         "@nodelib/fs.scandir": {
diff --git a/package.json b/package.json
index 7175062..c1f2ca6 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     },
     "devDependencies": {
         "@mappable-world/mappable-cli": "^0.0.32",
-        "@mappable-world/mappable-types": "^0.0.16",
+        "@mappable-world/mappable-types": "^0.0.18",
         "@types/got": "9.6.12",
         "@types/jest": "29.5.3",
         "@types/jsdom": "21.1.1",
diff --git a/src/controls/MMapGeolocationControl/index.ts b/src/controls/MMapGeolocationControl/index.ts
index b488d25..356bd5c 100644
--- a/src/controls/MMapGeolocationControl/index.ts
+++ b/src/controls/MMapGeolocationControl/index.ts
@@ -59,10 +59,6 @@ class MMapGeolocationControl extends mappable.MMapGroupEntity<MMapGeolocationCon
         this._handleGeolocationClick = this._handleGeolocationClick.bind(this);
     }
 
-    protected __implGetDefaultProps(): DefaultProps {
-        return MMapGeolocationControl.defaultProps;
-    }
-
     private _timeout: number;
     private _setLoading(loading: boolean): void {
         this._loading = loading;
diff --git a/src/controls/MMapRotateControl/index.ts b/src/controls/MMapRotateControl/index.ts
index 5c83b70..6d1da29 100644
--- a/src/controls/MMapRotateControl/index.ts
+++ b/src/controls/MMapRotateControl/index.ts
@@ -35,10 +35,6 @@ export class MMapRotateControl extends mappable.MMapComplexEntity<MMapRotateCont
     private _control!: MMapControl;
     private _rotateControl!: InternalRotateControl;
 
-    protected __implGetDefaultProps() {
-        return MMapRotateControl.defaultProps;
-    }
-
     constructor(props: MMapRotateControlProps) {
         super(props);
     }
diff --git a/src/controls/MMapRotateTiltControl/MMapTiltControl.ts b/src/controls/MMapRotateTiltControl/MMapTiltControl.ts
index f2c482d..edd9e15 100644
--- a/src/controls/MMapRotateTiltControl/MMapTiltControl.ts
+++ b/src/controls/MMapRotateTiltControl/MMapTiltControl.ts
@@ -1,7 +1,7 @@
 import type {MMapListener} from '@mappable-world/mappable-types';
 import {MMapCameraRequest} from '@mappable-world/mappable-types/imperative/MMap';
 import type {MMapRotateTiltControlProps} from '.';
-import {CLICK_TOLERANCE_PX, Position, degToRad, radToDeg, toggleTilt} from '../utils/angle-utils';
+import {CLICK_TOLERANCE_PX, Position, radToDeg, toggleTilt} from '../utils/angle-utils';
 import './MMapTiltControl.css';
 
 const TILT_CONTROL_CLASS = 'mappable--rotate-tilt_tilt';
@@ -54,8 +54,8 @@ export class MMapTiltControl extends mappable.MMapComplexEntity<MMapRotateTiltCo
             tilt,
             tiltRange: {max, min}
         } = this.root;
-        const targetTiltDeg = toggleTilt(radToDeg(tilt), min, max);
-        this.root.setCamera({tilt: degToRad(targetTiltDeg), duration, easing});
+        const targetTiltDeg = toggleTilt(tilt, min, max);
+        this.root.setCamera({tilt: targetTiltDeg, duration, easing});
     };
 
     private _onTiltStart = (event: MouseEvent) => {
diff --git a/src/controls/MMapRotateTiltControl/index.ts b/src/controls/MMapRotateTiltControl/index.ts
index 4d98dee..7a3bbc1 100644
--- a/src/controls/MMapRotateTiltControl/index.ts
+++ b/src/controls/MMapRotateTiltControl/index.ts
@@ -35,10 +35,6 @@ export class MMapRotateTiltControl extends mappable.MMapComplexEntity<MMapRotate
     private _tiltControl!: MMapTiltControl;
     private _control!: MMapControl;
 
-    protected __implGetDefaultProps() {
-        return MMapRotateTiltControl.defaultProps;
-    }
-
     constructor(props: MMapRotateTiltControlProps) {
         super(props);
     }
diff --git a/src/controls/MMapTiltControl/index.ts b/src/controls/MMapTiltControl/index.ts
index d580275..9b721ad 100644
--- a/src/controls/MMapTiltControl/index.ts
+++ b/src/controls/MMapTiltControl/index.ts
@@ -1,6 +1,6 @@
 import type {EasingFunctionDescription, MMapControl, MMapListener} from '@mappable-world/mappable-types';
 import {MMapCameraRequest} from '@mappable-world/mappable-types/imperative/MMap';
-import {CLICK_TOLERANCE_PX, Position, degToRad, radToDeg, toggleTilt} from '../utils/angle-utils';
+import {CLICK_TOLERANCE_PX, Position, radToDeg, toggleTilt} from '../utils/angle-utils';
 import {MMapTiltControlVuefyOptions} from './vue';
 
 import './index.css';
@@ -39,10 +39,6 @@ export class MMapTiltControl extends mappable.MMapComplexEntity<MMapTiltControlP
         super(props);
     }
 
-    protected __implGetDefaultProps() {
-        return MMapTiltControl.defaultProps;
-    }
-
     protected _onAttach(): void {
         this._control = new mappable.MMapControl({transparent: true});
         this._tiltControl = new InternalTiltControl(this._props);
@@ -123,8 +119,8 @@ class InternalTiltControl extends mappable.MMapComplexEntity<MMapTiltControlProp
             tilt,
             tiltRange: {min, max}
         } = this.root;
-        const targetTiltDeg = toggleTilt(radToDeg(tilt), min, max);
-        this.root.setCamera({tilt: degToRad(targetTiltDeg), duration, easing});
+        const targetTiltDeg = toggleTilt(tilt, min, max);
+        this.root.setCamera({tilt: targetTiltDeg, duration, easing});
     };
 
     private _onTiltStart = (event: MouseEvent) => {
diff --git a/src/controls/MMapZoomControl/index.ts b/src/controls/MMapZoomControl/index.ts
index e5d8394..eef9bdf 100644
--- a/src/controls/MMapZoomControl/index.ts
+++ b/src/controls/MMapZoomControl/index.ts
@@ -173,7 +173,7 @@ class MMapZoomCommonControl extends mappable.MMapGroupEntity<MMapZoomControlProp
  * map.addChild(controls);
  * ```
  */
-class MMapZoomControl extends mappable.MMapComplexEntity<MMapZoomControlProps> {
+class MMapZoomControl extends mappable.MMapComplexEntity<MMapZoomControlProps, DefaultProps> {
     static [mappable.optionsKeyVuefy] = MMapZoomControlVuefyOptions;
 
     static defaultProps = defaultProps;
@@ -181,10 +181,6 @@ class MMapZoomControl extends mappable.MMapComplexEntity<MMapZoomControlProps> {
     private _control!: MMapControl;
     private _zoom!: MMapZoomCommonControl;
 
-    protected __implGetDefaultProps(): DefaultProps {
-        return MMapZoomControl.defaultProps;
-    }
-
     protected override _onAttach(): void {
         this._zoom = new MMapZoomCommonControl(this._props);
         this._control = new mappable.MMapControl().addChild(this._zoom);