remove __implXxx, fix tilt control (#6)

mappable-world · Apr 25, 2024 · 9290d8a · 9290d8a
1 parent ca56943
commit 9290d8a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 35 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -173,18 +173,14 @@ 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;
 
     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);