@@ -25,18 +25,22 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
25
25
private OnCameraMoveListener onCameraMoveListener ;
26
26
private OnCameraIdleListener onCameraIdleListener ;
27
27
28
+ @ Deprecated
28
29
void setOnCameraMoveStartedListener (OnCameraMoveStartedListener onCameraMoveStartedListener ) {
29
30
this .onCameraMoveStartedListener = onCameraMoveStartedListener ;
30
31
}
31
32
33
+ @ Deprecated
32
34
void setOnCameraMoveCanceledListener (OnCameraMoveCanceledListener onCameraMoveCanceledListener ) {
33
35
this .onCameraMoveCanceledListener = onCameraMoveCanceledListener ;
34
36
}
35
37
38
+ @ Deprecated
36
39
void setOnCameraMoveListener (OnCameraMoveListener onCameraMoveListener ) {
37
40
this .onCameraMoveListener = onCameraMoveListener ;
38
41
}
39
42
43
+ @ Deprecated
40
44
void setOnCameraIdleListener (OnCameraIdleListener onCameraIdleListener ) {
41
45
this .onCameraIdleListener = onCameraIdleListener ;
42
46
}
@@ -46,12 +50,14 @@ public void onCameraMoveStarted(int reason) {
46
50
if (!idle ) {
47
51
return ;
48
52
}
49
-
50
53
idle = false ;
54
+
55
+ // deprecated API
51
56
if (onCameraMoveStartedListener != null ) {
52
57
onCameraMoveStartedListener .onCameraMoveStarted (reason );
53
58
}
54
59
60
+ // new API
55
61
if (!onCameraMoveStartedListenerList .isEmpty ()) {
56
62
for (OnCameraMoveStartedListener cameraMoveStartedListener : onCameraMoveStartedListenerList ) {
57
63
cameraMoveStartedListener .onCameraMoveStarted (reason );
@@ -61,11 +67,13 @@ public void onCameraMoveStarted(int reason) {
61
67
62
68
@ Override
63
69
public void onCameraMove () {
70
+ // deprecated API
64
71
if (onCameraMoveListener != null && !idle ) {
65
72
onCameraMoveListener .onCameraMove ();
66
73
}
67
74
68
- if (!onCameraMoveListenerList .isEmpty ()) {
75
+ // new API
76
+ if (!onCameraMoveListenerList .isEmpty () && !idle ) {
69
77
for (OnCameraMoveListener cameraMoveListener : onCameraMoveListenerList ) {
70
78
cameraMoveListener .onCameraMove ();
71
79
}
@@ -74,11 +82,13 @@ public void onCameraMove() {
74
82
75
83
@ Override
76
84
public void onCameraMoveCanceled () {
85
+ // deprecated API
77
86
if (onCameraMoveCanceledListener != null && !idle ) {
78
87
onCameraMoveCanceledListener .onCameraMoveCanceled ();
79
88
}
80
89
81
- if (!onCameraMoveCanceledListenerList .isEmpty ()) {
90
+ // new API
91
+ if (!onCameraMoveCanceledListenerList .isEmpty () && !idle ) {
82
92
for (OnCameraMoveCanceledListener cameraMoveCanceledListener : onCameraMoveCanceledListenerList ) {
83
93
cameraMoveCanceledListener .onCameraMoveCanceled ();
84
94
}
@@ -89,10 +99,12 @@ public void onCameraMoveCanceled() {
89
99
public void onCameraIdle () {
90
100
if (!idle ) {
91
101
idle = true ;
102
+ // deprecated API
92
103
if (onCameraIdleListener != null ) {
93
104
onCameraIdleListener .onCameraIdle ();
94
105
}
95
106
107
+ // new API
96
108
if (!onCameraIdleListenerList .isEmpty ()) {
97
109
for (OnCameraIdleListener cameraIdleListener : onCameraIdleListenerList ) {
98
110
cameraIdleListener .onCameraIdle ();
0 commit comments