fix: Added back Mapbox.UserTrackingModes#2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfazekas merged 1 commit into from
Sep 25, 2022
Merged

fix: Added back Mapbox.UserTrackingModes #2242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/Camera.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ return (
|   animationMode | `union` | `none` | `false` | The easing or path the camera uses to animate to a new configuration. |
| allowUpdates | `boolean` | `none` | `false` | Whether the camera should send any configuration to the native module. Prevents unnecessary tile<br/>fetching and improves performance when the map is not visible. Defaults to `true`. |
| triggerKey | `string \| number` | `none` | `false` | Any arbitrary primitive value that, when changed, causes the camera to retry moving to its target<br/>configuration. (Not yet implemented.) |
| onUserTrackingModeChange | `UserTrackingModeChangeCallback` | `none` | `false` | Executes when user tracking mode changes. |
| onUserTrackingModeChange | `func` | `none` | `false` | Executes when user tracking mode changes.<br/>*signature:*`(event:MapboxGLEvent) => void` |

## methods
### setCamera()
Expand Down
7 changes: 5 additions & 2 deletions docs/docs.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -696,9 +696,12 @@
{
"name": "onUserTrackingModeChange",
"required": false,
"type": "UserTrackingModeChangeCallback",
"type": {
"name": "func",
"funcSignature": "(event:MapboxGLEvent) => void"
},
"default": "none",
"description": "Executes when user tracking mode changes."
"description": "Executes when user tracking mode changes.\n*signature:*`(event:MapboxGLEvent) => void`"
}
],
"fileNameWithExt": "Camera.tsx",
Expand Down
9 changes: 2 additions & 7 deletions index.d.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,14 @@ import {
CameraBoundsWithPadding as _CameraBoundsWithPadding,
CameraStops as _CameraStops,
CameraAnimationMode as _CameraAnimationMode,
type UserTrackingMode as _UserTrackingMode,
type UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
} from './javascript/components/Camera';
import { MarkerView as _MarkerView } from './javascript/components/MarkerView';
import { PointAnnotation as _PointAnnotation } from './javascript/components/PointAnnotation';
import { Atmosphere as _Atmosphere } from './javascript/components/Atmosphere';
import type {
MapboxGLEvent as _MapboxGLEvent,
UserTrackingMode as _UserTrackingMode,
UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
AnimatedPoint as _AnimatedPoint,
AnimatedShape as _AnimatedShape,
} from './javascript/types/index';
Expand DownExpand Up@@ -482,11 +482,6 @@ declare namespace MapboxGL {
/**
* Constants
*/
enum UserTrackingModes {
Follow = 'normal',
FollowWithHeading = 'compass',
FollowWithCourse = 'course',
}

enum InterpolationMode {
Exponential = 0,
Expand Down
32 changes: 25 additions & 7 deletions ios/RCTMGL-v10/RCTMGLCamera.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,10 @@ enum CameraMode: String, CaseIterable {
case flight, ease, linear, none
}

enum UserTrackingMode: String {
case none,compass, course, normal
}

struct CameraUpdateItem {
var camera: CameraOptions
var mode: CameraMode
Expand DownExpand Up@@ -133,7 +137,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
_updateCameraFromTrackingMode()
}
}
@objc var followUserMode: NSString? {
@objc var followUserMode: String? {
didSet {
_updateCameraFromTrackingMode()
}
Expand DownExpand Up@@ -192,11 +196,22 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
}
}

func _disableUsetTracking(_ map: MapView) {
map.viewport.idle()
map.location.removeLocationConsumer(consumer: self)
}

func _updateCameraFromTrackingMode() {
withMapView { map in
guard self.followUserLocation else {
map.viewport.idle()
map.location.removeLocationConsumer(consumer: self)
let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? "none")
guard let userTrackingMode = userTrackingMode else {
Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
self._disableUsetTracking(map)
return
}

guard self.followUserLocation && userTrackingMode != .none else {
self._disableUsetTracking(map)
return
}

Expand All@@ -207,17 +222,20 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
map.location.addLocationConsumer(newConsumer: self)
var trackingModeChanged = false
var followOptions = FollowPuckViewportStateOptions()
if (self.followUserMode == "compass") {
switch userTrackingMode {
case .none:
Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
case .compass:
map.location.options.puckBearingEnabled = true
map.location.options.puckBearingSource = PuckBearingSource.heading
followOptions.bearing = FollowPuckViewportStateBearing.heading
trackingModeChanged = true
} else if (self.followUserMode == "course") {
case .course:
map.location.options.puckBearingEnabled = true
map.location.options.puckBearingSource = PuckBearingSource.course
followOptions.bearing = FollowPuckViewportStateBearing.course
trackingModeChanged = true
} else if (self.followUserMode == "normal") {
case .normal:
map.location.options.puckBearingEnabled = false
followOptions.bearing = nil
trackingModeChanged = true
Expand Down
8 changes: 8 additions & 0 deletions ios/RCTMGL-v10/RCTMGLLogging.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,14 @@ class Logger {
static func log(level: LogLevel, message: String, error: Error) {
sharedInstance.log(level: level, message: "\(message) - error: \(error.localizedDescription) \(error)")
}

static func error(_ message: String) {
log(level: .error, message: message)
}

static func assert(_ message: String) {
log(level: .error, message: "Assertion failure: \(message)")
}
}

func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {
Expand Down
18 changes: 17 additions & 1 deletion javascript/components/Camera.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,27 @@ import React, {
import { NativeModules, requireNativeComponent } from 'react-native';
import { Position } from '@turf/helpers';

import { UserTrackingModeChangeCallback, UserTrackingMode } from '../types';
import { MapboxGLEvent } from '../types';
import { makeLatLngBounds, makePoint } from '../utils/geoUtils';

const NativeModule = NativeModules.MGLModule;

export const enum UserTrackingMode {
Follow = 'normal',
FollowWithHeading = 'compass',
FollowWithCourse = 'course',
}

export type UserTrackingModeChangeCallback = (
event: MapboxGLEvent<
'usertrackingmodechange',
{
followUserLocation: boolean;
followUserMode: UserTrackingMode | null;
}
>,
) => void;

/**
* Converts the provided React Native animation mode into the corresponding native enum value.
*/
Expand Down
4 changes: 2 additions & 2 deletions javascript/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { NativeModules } from 'react-native';

import { Camera } from './components/Camera';
import { Camera, UserTrackingModes } from './components/Camera';
import { Atmosphere } from './components/Atmosphere';
import MapView from './components/MapView';
import Light from './components/Light';
Expand DownExpand Up@@ -45,7 +45,7 @@ const MapboxGL = { ...NativeModules.MGLModule };

// static methods
MapboxGL.requestAndroidLocationPermissions = requestAndroidLocationPermissions;
MapboxGL.UserTrackingModes = Camera.UserTrackingModes;
MapboxGL.UserTrackingModes = UserTrackingModes;

// components
MapboxGL.MapView = MapView;
Expand Down
14 changes: 0 additions & 14 deletions javascript/types/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,20 +10,6 @@ export type MapboxGLEvent<
V = Element,
> = SyntheticEvent<V, { type: T; payload: P }>;

// Camera.

export type UserTrackingMode = 'normal' | 'compass' | 'course';

export type UserTrackingModeChangeCallback = (
event: MapboxGLEvent<
'usertrackingmodechange',
{
followUserLocation: boolean;
followUserMode: UserTrackingMode | null;
}
>,
) => void;

// Animated.

export interface AnimatedPoint extends GeoJsonObject {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: Added back Mapbox.UserTrackingModes#2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mfazekas
merged 1 commit into

from

Sep 25, 2022
 Merged


fix: Added back Mapbox.UserTrackingModes
#2242
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/Camera.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ return (
| &nbsp;&nbsp;animationMode | `union` | `none` | `false` | The easing or path the camera uses to animate to a new configuration. |
| allowUpdates | `boolean` | `none` | `false` | Whether the camera should send any configuration to the native module. Prevents unnecessary tile<br/>fetching and improves performance when the map is not visible. Defaults to `true`. |
| triggerKey | `string \| number` | `none` | `false` | Any arbitrary primitive value that, when changed, causes the camera to retry moving to its target<br/>configuration. (Not yet implemented.) |
| onUserTrackingModeChange | `UserTrackingModeChangeCallback` | `none` | `false` | Executes when user tracking mode changes. |
| onUserTrackingModeChange | `func` | `none` | `false` | Executes when user tracking mode changes.<br/>*signature:*`(event:MapboxGLEvent) => void` |

## methods
### setCamera()
Expand Down

7 changes: 5 additions & 2 deletions
docs/docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -696,9 +696,12 @@
 {
 "name": "onUserTrackingModeChange",
 "required": false,
 "type": "UserTrackingModeChangeCallback",
 "type": {
 "name": "func",
 "funcSignature": "(event:MapboxGLEvent) => void"
 },
 "default": "none",
 "description": "Executes when user tracking mode changes."
 "description": "Executes when user tracking mode changes.\n*signature:*`(event:MapboxGLEvent) => void`"
 }
 ],
 "fileNameWithExt": "Camera.tsx",
Expand Down

9 changes: 2 additions & 7 deletions
index.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,14 @@ import {
 CameraBoundsWithPadding as _CameraBoundsWithPadding,
 CameraStops as _CameraStops,
 CameraAnimationMode as _CameraAnimationMode,
 type UserTrackingMode as _UserTrackingMode,
 type UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
} from './javascript/components/Camera';
import { MarkerView as _MarkerView } from './javascript/components/MarkerView';
import { PointAnnotation as _PointAnnotation } from './javascript/components/PointAnnotation';
import { Atmosphere as _Atmosphere } from './javascript/components/Atmosphere';
import type {
 MapboxGLEvent as _MapboxGLEvent,
 UserTrackingMode as _UserTrackingMode,
 UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
 AnimatedPoint as _AnimatedPoint,
 AnimatedShape as _AnimatedShape,
} from './javascript/types/index';
Expand DownExpand Up@@ -482,11 +482,6 @@ declare namespace MapboxGL {
 /**
 * Constants
 */
 enum UserTrackingModes {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
 }

 enum InterpolationMode {
 Exponential = 0,
Expand Down

32 changes: 25 additions & 7 deletions
ios/RCTMGL-v10/RCTMGLCamera.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,10 @@ enum CameraMode: String, CaseIterable {
 case flight, ease, linear, none
}

enum UserTrackingMode: String {
 case none,compass, course, normal
}

struct CameraUpdateItem {
 var camera: CameraOptions
 var mode: CameraMode
Expand DownExpand Up@@ -133,7 +137,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 _updateCameraFromTrackingMode()
 }
 }
 @objc var followUserMode: NSString? {
 @objc var followUserMode: String? {
 didSet {
 _updateCameraFromTrackingMode()
 }
Expand DownExpand Up@@ -192,11 +196,22 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 }
 }

 func _disableUsetTracking(_ map: MapView) {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 }

 func _updateCameraFromTrackingMode() {
 withMapView { map in
 guard self.followUserLocation else {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? "none")
 guard let userTrackingMode = userTrackingMode else {
 Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
 self._disableUsetTracking(map)
 return
 }

 guard self.followUserLocation && userTrackingMode != .none else {
 self._disableUsetTracking(map)
 return
 }

Expand All@@ -207,17 +222,20 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 map.location.addLocationConsumer(newConsumer: self)
 var trackingModeChanged = false
 var followOptions = FollowPuckViewportStateOptions()
 if (self.followUserMode == "compass") {
 switch userTrackingMode {
 case .none:
 Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
 case .compass:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.heading
 followOptions.bearing = FollowPuckViewportStateBearing.heading
 trackingModeChanged = true
} else if (self.followUserMode == "course") {
case .course:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.course
 followOptions.bearing = FollowPuckViewportStateBearing.course
 trackingModeChanged = true
} else if (self.followUserMode == "normal") {
case .normal:
 map.location.options.puckBearingEnabled = false
 followOptions.bearing = nil
 trackingModeChanged = true
Expand Down

8 changes: 8 additions & 0 deletions
ios/RCTMGL-v10/RCTMGLLogging.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,14 @@ class Logger {
 static func log(level: LogLevel, message: String, error: Error) {
 sharedInstance.log(level: level, message: "\(message) - error: \(error.localizedDescription) \(error)")
 }

 static func error(_ message: String) {
 log(level: .error, message: message)
 }

 static func assert(_ message: String) {
 log(level: .error, message: "Assertion failure: \(message)")
 }
}

func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {
Expand Down

18 changes: 17 additions & 1 deletion
javascript/components/Camera.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,27 @@ import React, {
import { NativeModules, requireNativeComponent } from 'react-native';
import { Position } from '@turf/helpers';

import { UserTrackingModeChangeCallback, UserTrackingMode } from '../types';
import { MapboxGLEvent } from '../types';
import { makeLatLngBounds, makePoint } from '../utils/geoUtils';

const NativeModule = NativeModules.MGLModule;

export const enum UserTrackingMode {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
}

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

/**
 * Converts the provided React Native animation mode into the corresponding native enum value.
 */
Expand Down

4 changes: 2 additions & 2 deletions
javascript/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { NativeModules } from 'react-native';

import { Camera } from './components/Camera';
import { Camera, UserTrackingModes } from './components/Camera';
import { Atmosphere } from './components/Atmosphere';
import MapView from './components/MapView';
import Light from './components/Light';
Expand DownExpand Up@@ -45,7 +45,7 @@ const MapboxGL = { ...NativeModules.MGLModule };

// static methods
MapboxGL.requestAndroidLocationPermissions = requestAndroidLocationPermissions;
MapboxGL.UserTrackingModes = Camera.UserTrackingModes;
MapboxGL.UserTrackingModes = UserTrackingModes;

// components
MapboxGL.MapView = MapView;
Expand Down

14 changes: 0 additions & 14 deletions
javascript/types/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,20 +10,6 @@ export type MapboxGLEvent<
 V = Element,
> = SyntheticEvent<V, { type: T; payload: P }>;

// Camera.

export type UserTrackingMode = 'normal' | 'compass' | 'course';

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

// Animated.

export interface AnimatedPoint extends GeoJsonObject {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: Added back Mapbox.UserTrackingModes#2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mfazekas
merged 1 commit into

from

Sep 25, 2022
 Merged


fix: Added back Mapbox.UserTrackingModes
#2242
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/Camera.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ return (
| &nbsp;&nbsp;animationMode | `union` | `none` | `false` | The easing or path the camera uses to animate to a new configuration. |
| allowUpdates | `boolean` | `none` | `false` | Whether the camera should send any configuration to the native module. Prevents unnecessary tile<br/>fetching and improves performance when the map is not visible. Defaults to `true`. |
| triggerKey | `string \| number` | `none` | `false` | Any arbitrary primitive value that, when changed, causes the camera to retry moving to its target<br/>configuration. (Not yet implemented.) |
| onUserTrackingModeChange | `UserTrackingModeChangeCallback` | `none` | `false` | Executes when user tracking mode changes. |
| onUserTrackingModeChange | `func` | `none` | `false` | Executes when user tracking mode changes.<br/>*signature:*`(event:MapboxGLEvent) => void` |

## methods
### setCamera()
Expand Down

7 changes: 5 additions & 2 deletions
docs/docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -696,9 +696,12 @@
 {
 "name": "onUserTrackingModeChange",
 "required": false,
 "type": "UserTrackingModeChangeCallback",
 "type": {
 "name": "func",
 "funcSignature": "(event:MapboxGLEvent) => void"
 },
 "default": "none",
 "description": "Executes when user tracking mode changes."
 "description": "Executes when user tracking mode changes.\n*signature:*`(event:MapboxGLEvent) => void`"
 }
 ],
 "fileNameWithExt": "Camera.tsx",
Expand Down

9 changes: 2 additions & 7 deletions
index.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,14 @@ import {
 CameraBoundsWithPadding as _CameraBoundsWithPadding,
 CameraStops as _CameraStops,
 CameraAnimationMode as _CameraAnimationMode,
 type UserTrackingMode as _UserTrackingMode,
 type UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
} from './javascript/components/Camera';
import { MarkerView as _MarkerView } from './javascript/components/MarkerView';
import { PointAnnotation as _PointAnnotation } from './javascript/components/PointAnnotation';
import { Atmosphere as _Atmosphere } from './javascript/components/Atmosphere';
import type {
 MapboxGLEvent as _MapboxGLEvent,
 UserTrackingMode as _UserTrackingMode,
 UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
 AnimatedPoint as _AnimatedPoint,
 AnimatedShape as _AnimatedShape,
} from './javascript/types/index';
Expand DownExpand Up@@ -482,11 +482,6 @@ declare namespace MapboxGL {
 /**
 * Constants
 */
 enum UserTrackingModes {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
 }

 enum InterpolationMode {
 Exponential = 0,
Expand Down

32 changes: 25 additions & 7 deletions
ios/RCTMGL-v10/RCTMGLCamera.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,10 @@ enum CameraMode: String, CaseIterable {
 case flight, ease, linear, none
}

enum UserTrackingMode: String {
 case none,compass, course, normal
}

struct CameraUpdateItem {
 var camera: CameraOptions
 var mode: CameraMode
Expand DownExpand Up@@ -133,7 +137,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 _updateCameraFromTrackingMode()
 }
 }
 @objc var followUserMode: NSString? {
 @objc var followUserMode: String? {
 didSet {
 _updateCameraFromTrackingMode()
 }
Expand DownExpand Up@@ -192,11 +196,22 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 }
 }

 func _disableUsetTracking(_ map: MapView) {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 }

 func _updateCameraFromTrackingMode() {
 withMapView { map in
 guard self.followUserLocation else {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? "none")
 guard let userTrackingMode = userTrackingMode else {
 Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
 self._disableUsetTracking(map)
 return
 }

 guard self.followUserLocation && userTrackingMode != .none else {
 self._disableUsetTracking(map)
 return
 }

Expand All@@ -207,17 +222,20 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 map.location.addLocationConsumer(newConsumer: self)
 var trackingModeChanged = false
 var followOptions = FollowPuckViewportStateOptions()
 if (self.followUserMode == "compass") {
 switch userTrackingMode {
 case .none:
 Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
 case .compass:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.heading
 followOptions.bearing = FollowPuckViewportStateBearing.heading
 trackingModeChanged = true
} else if (self.followUserMode == "course") {
case .course:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.course
 followOptions.bearing = FollowPuckViewportStateBearing.course
 trackingModeChanged = true
} else if (self.followUserMode == "normal") {
case .normal:
 map.location.options.puckBearingEnabled = false
 followOptions.bearing = nil
 trackingModeChanged = true
Expand Down

8 changes: 8 additions & 0 deletions
ios/RCTMGL-v10/RCTMGLLogging.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,14 @@ class Logger {
 static func log(level: LogLevel, message: String, error: Error) {
 sharedInstance.log(level: level, message: "\(message) - error: \(error.localizedDescription) \(error)")
 }

 static func error(_ message: String) {
 log(level: .error, message: message)
 }

 static func assert(_ message: String) {
 log(level: .error, message: "Assertion failure: \(message)")
 }
}

func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {
Expand Down

18 changes: 17 additions & 1 deletion
javascript/components/Camera.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,27 @@ import React, {
import { NativeModules, requireNativeComponent } from 'react-native';
import { Position } from '@turf/helpers';

import { UserTrackingModeChangeCallback, UserTrackingMode } from '../types';
import { MapboxGLEvent } from '../types';
import { makeLatLngBounds, makePoint } from '../utils/geoUtils';

const NativeModule = NativeModules.MGLModule;

export const enum UserTrackingMode {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
}

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

/**
 * Converts the provided React Native animation mode into the corresponding native enum value.
 */
Expand Down

4 changes: 2 additions & 2 deletions
javascript/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { NativeModules } from 'react-native';

import { Camera } from './components/Camera';
import { Camera, UserTrackingModes } from './components/Camera';
import { Atmosphere } from './components/Atmosphere';
import MapView from './components/MapView';
import Light from './components/Light';
Expand DownExpand Up@@ -45,7 +45,7 @@ const MapboxGL = { ...NativeModules.MGLModule };

// static methods
MapboxGL.requestAndroidLocationPermissions = requestAndroidLocationPermissions;
MapboxGL.UserTrackingModes = Camera.UserTrackingModes;
MapboxGL.UserTrackingModes = UserTrackingModes;

// components
MapboxGL.MapView = MapView;
Expand Down

14 changes: 0 additions & 14 deletions
javascript/types/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,20 +10,6 @@ export type MapboxGLEvent<
 V = Element,
> = SyntheticEvent<V, { type: T; payload: P }>;

// Camera.

export type UserTrackingMode = 'normal' | 'compass' | 'course';

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

// Animated.

export interface AnimatedPoint extends GeoJsonObject {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: Added back Mapbox.UserTrackingModes#2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mfazekas
merged 1 commit into

from

Sep 25, 2022
 Merged


fix: Added back Mapbox.UserTrackingModes
#2242
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/Camera.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ return (
| &nbsp;&nbsp;animationMode | `union` | `none` | `false` | The easing or path the camera uses to animate to a new configuration. |
| allowUpdates | `boolean` | `none` | `false` | Whether the camera should send any configuration to the native module. Prevents unnecessary tile<br/>fetching and improves performance when the map is not visible. Defaults to `true`. |
| triggerKey | `string \| number` | `none` | `false` | Any arbitrary primitive value that, when changed, causes the camera to retry moving to its target<br/>configuration. (Not yet implemented.) |
| onUserTrackingModeChange | `UserTrackingModeChangeCallback` | `none` | `false` | Executes when user tracking mode changes. |
| onUserTrackingModeChange | `func` | `none` | `false` | Executes when user tracking mode changes.<br/>*signature:*`(event:MapboxGLEvent) => void` |

## methods
### setCamera()
Expand Down

7 changes: 5 additions & 2 deletions
docs/docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -696,9 +696,12 @@
 {
 "name": "onUserTrackingModeChange",
 "required": false,
 "type": "UserTrackingModeChangeCallback",
 "type": {
 "name": "func",
 "funcSignature": "(event:MapboxGLEvent) => void"
 },
 "default": "none",
 "description": "Executes when user tracking mode changes."
 "description": "Executes when user tracking mode changes.\n*signature:*`(event:MapboxGLEvent) => void`"
 }
 ],
 "fileNameWithExt": "Camera.tsx",
Expand Down

9 changes: 2 additions & 7 deletions
index.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,14 @@ import {
 CameraBoundsWithPadding as _CameraBoundsWithPadding,
 CameraStops as _CameraStops,
 CameraAnimationMode as _CameraAnimationMode,
 type UserTrackingMode as _UserTrackingMode,
 type UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
} from './javascript/components/Camera';
import { MarkerView as _MarkerView } from './javascript/components/MarkerView';
import { PointAnnotation as _PointAnnotation } from './javascript/components/PointAnnotation';
import { Atmosphere as _Atmosphere } from './javascript/components/Atmosphere';
import type {
 MapboxGLEvent as _MapboxGLEvent,
 UserTrackingMode as _UserTrackingMode,
 UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
 AnimatedPoint as _AnimatedPoint,
 AnimatedShape as _AnimatedShape,
} from './javascript/types/index';
Expand DownExpand Up@@ -482,11 +482,6 @@ declare namespace MapboxGL {
 /**
 * Constants
 */
 enum UserTrackingModes {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
 }

 enum InterpolationMode {
 Exponential = 0,
Expand Down

32 changes: 25 additions & 7 deletions
ios/RCTMGL-v10/RCTMGLCamera.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,10 @@ enum CameraMode: String, CaseIterable {
 case flight, ease, linear, none
}

enum UserTrackingMode: String {
 case none,compass, course, normal
}

struct CameraUpdateItem {
 var camera: CameraOptions
 var mode: CameraMode
Expand DownExpand Up@@ -133,7 +137,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 _updateCameraFromTrackingMode()
 }
 }
 @objc var followUserMode: NSString? {
 @objc var followUserMode: String? {
 didSet {
 _updateCameraFromTrackingMode()
 }
Expand DownExpand Up@@ -192,11 +196,22 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 }
 }

 func _disableUsetTracking(_ map: MapView) {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 }

 func _updateCameraFromTrackingMode() {
 withMapView { map in
 guard self.followUserLocation else {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? "none")
 guard let userTrackingMode = userTrackingMode else {
 Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
 self._disableUsetTracking(map)
 return
 }

 guard self.followUserLocation && userTrackingMode != .none else {
 self._disableUsetTracking(map)
 return
 }

Expand All@@ -207,17 +222,20 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 map.location.addLocationConsumer(newConsumer: self)
 var trackingModeChanged = false
 var followOptions = FollowPuckViewportStateOptions()
 if (self.followUserMode == "compass") {
 switch userTrackingMode {
 case .none:
 Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
 case .compass:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.heading
 followOptions.bearing = FollowPuckViewportStateBearing.heading
 trackingModeChanged = true
} else if (self.followUserMode == "course") {
case .course:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.course
 followOptions.bearing = FollowPuckViewportStateBearing.course
 trackingModeChanged = true
} else if (self.followUserMode == "normal") {
case .normal:
 map.location.options.puckBearingEnabled = false
 followOptions.bearing = nil
 trackingModeChanged = true
Expand Down

8 changes: 8 additions & 0 deletions
ios/RCTMGL-v10/RCTMGLLogging.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,14 @@ class Logger {
 static func log(level: LogLevel, message: String, error: Error) {
 sharedInstance.log(level: level, message: "\(message) - error: \(error.localizedDescription) \(error)")
 }

 static func error(_ message: String) {
 log(level: .error, message: message)
 }

 static func assert(_ message: String) {
 log(level: .error, message: "Assertion failure: \(message)")
 }
}

func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {
Expand Down

18 changes: 17 additions & 1 deletion
javascript/components/Camera.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,27 @@ import React, {
import { NativeModules, requireNativeComponent } from 'react-native';
import { Position } from '@turf/helpers';

import { UserTrackingModeChangeCallback, UserTrackingMode } from '../types';
import { MapboxGLEvent } from '../types';
import { makeLatLngBounds, makePoint } from '../utils/geoUtils';

const NativeModule = NativeModules.MGLModule;

export const enum UserTrackingMode {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
}

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

/**
 * Converts the provided React Native animation mode into the corresponding native enum value.
 */
Expand Down

4 changes: 2 additions & 2 deletions
javascript/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { NativeModules } from 'react-native';

import { Camera } from './components/Camera';
import { Camera, UserTrackingModes } from './components/Camera';
import { Atmosphere } from './components/Atmosphere';
import MapView from './components/MapView';
import Light from './components/Light';
Expand DownExpand Up@@ -45,7 +45,7 @@ const MapboxGL = { ...NativeModules.MGLModule };

// static methods
MapboxGL.requestAndroidLocationPermissions = requestAndroidLocationPermissions;
MapboxGL.UserTrackingModes = Camera.UserTrackingModes;
MapboxGL.UserTrackingModes = UserTrackingModes;

// components
MapboxGL.MapView = MapView;
Expand Down

14 changes: 0 additions & 14 deletions
javascript/types/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,20 +10,6 @@ export type MapboxGLEvent<
 V = Element,
> = SyntheticEvent<V, { type: T; payload: P }>;

// Camera.

export type UserTrackingMode = 'normal' | 'compass' | 'course';

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

// Animated.

export interface AnimatedPoint extends GeoJsonObject {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: Added back Mapbox.UserTrackingModes#2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mfazekas
merged 1 commit into

from

Sep 25, 2022
 Merged


fix: Added back Mapbox.UserTrackingModes
#2242
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/Camera.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ return (
| &nbsp;&nbsp;animationMode | `union` | `none` | `false` | The easing or path the camera uses to animate to a new configuration. |
| allowUpdates | `boolean` | `none` | `false` | Whether the camera should send any configuration to the native module. Prevents unnecessary tile<br/>fetching and improves performance when the map is not visible. Defaults to `true`. |
| triggerKey | `string \| number` | `none` | `false` | Any arbitrary primitive value that, when changed, causes the camera to retry moving to its target<br/>configuration. (Not yet implemented.) |
| onUserTrackingModeChange | `UserTrackingModeChangeCallback` | `none` | `false` | Executes when user tracking mode changes. |
| onUserTrackingModeChange | `func` | `none` | `false` | Executes when user tracking mode changes.<br/>*signature:*`(event:MapboxGLEvent) => void` |

## methods
### setCamera()
Expand Down

7 changes: 5 additions & 2 deletions
docs/docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -696,9 +696,12 @@
 {
 "name": "onUserTrackingModeChange",
 "required": false,
 "type": "UserTrackingModeChangeCallback",
 "type": {
 "name": "func",
 "funcSignature": "(event:MapboxGLEvent) => void"
 },
 "default": "none",
 "description": "Executes when user tracking mode changes."
 "description": "Executes when user tracking mode changes.\n*signature:*`(event:MapboxGLEvent) => void`"
 }
 ],
 "fileNameWithExt": "Camera.tsx",
Expand Down

9 changes: 2 additions & 7 deletions
index.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,14 @@ import {
 CameraBoundsWithPadding as _CameraBoundsWithPadding,
 CameraStops as _CameraStops,
 CameraAnimationMode as _CameraAnimationMode,
 type UserTrackingMode as _UserTrackingMode,
 type UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
} from './javascript/components/Camera';
import { MarkerView as _MarkerView } from './javascript/components/MarkerView';
import { PointAnnotation as _PointAnnotation } from './javascript/components/PointAnnotation';
import { Atmosphere as _Atmosphere } from './javascript/components/Atmosphere';
import type {
 MapboxGLEvent as _MapboxGLEvent,
 UserTrackingMode as _UserTrackingMode,
 UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
 AnimatedPoint as _AnimatedPoint,
 AnimatedShape as _AnimatedShape,
} from './javascript/types/index';
Expand DownExpand Up@@ -482,11 +482,6 @@ declare namespace MapboxGL {
 /**
 * Constants
 */
 enum UserTrackingModes {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
 }

 enum InterpolationMode {
 Exponential = 0,
Expand Down

32 changes: 25 additions & 7 deletions
ios/RCTMGL-v10/RCTMGLCamera.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,10 @@ enum CameraMode: String, CaseIterable {
 case flight, ease, linear, none
}

enum UserTrackingMode: String {
 case none,compass, course, normal
}

struct CameraUpdateItem {
 var camera: CameraOptions
 var mode: CameraMode
Expand DownExpand Up@@ -133,7 +137,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 _updateCameraFromTrackingMode()
 }
 }
 @objc var followUserMode: NSString? {
 @objc var followUserMode: String? {
 didSet {
 _updateCameraFromTrackingMode()
 }
Expand DownExpand Up@@ -192,11 +196,22 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 }
 }

 func _disableUsetTracking(_ map: MapView) {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 }

 func _updateCameraFromTrackingMode() {
 withMapView { map in
 guard self.followUserLocation else {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? "none")
 guard let userTrackingMode = userTrackingMode else {
 Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
 self._disableUsetTracking(map)
 return
 }

 guard self.followUserLocation && userTrackingMode != .none else {
 self._disableUsetTracking(map)
 return
 }

Expand All@@ -207,17 +222,20 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 map.location.addLocationConsumer(newConsumer: self)
 var trackingModeChanged = false
 var followOptions = FollowPuckViewportStateOptions()
 if (self.followUserMode == "compass") {
 switch userTrackingMode {
 case .none:
 Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
 case .compass:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.heading
 followOptions.bearing = FollowPuckViewportStateBearing.heading
 trackingModeChanged = true
} else if (self.followUserMode == "course") {
case .course:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.course
 followOptions.bearing = FollowPuckViewportStateBearing.course
 trackingModeChanged = true
} else if (self.followUserMode == "normal") {
case .normal:
 map.location.options.puckBearingEnabled = false
 followOptions.bearing = nil
 trackingModeChanged = true
Expand Down

8 changes: 8 additions & 0 deletions
ios/RCTMGL-v10/RCTMGLLogging.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,14 @@ class Logger {
 static func log(level: LogLevel, message: String, error: Error) {
 sharedInstance.log(level: level, message: "\(message) - error: \(error.localizedDescription) \(error)")
 }

 static func error(_ message: String) {
 log(level: .error, message: message)
 }

 static func assert(_ message: String) {
 log(level: .error, message: "Assertion failure: \(message)")
 }
}

func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {
Expand Down

18 changes: 17 additions & 1 deletion
javascript/components/Camera.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,27 @@ import React, {
import { NativeModules, requireNativeComponent } from 'react-native';
import { Position } from '@turf/helpers';

import { UserTrackingModeChangeCallback, UserTrackingMode } from '../types';
import { MapboxGLEvent } from '../types';
import { makeLatLngBounds, makePoint } from '../utils/geoUtils';

const NativeModule = NativeModules.MGLModule;

export const enum UserTrackingMode {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
}

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

/**
 * Converts the provided React Native animation mode into the corresponding native enum value.
 */
Expand Down

4 changes: 2 additions & 2 deletions
javascript/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { NativeModules } from 'react-native';

import { Camera } from './components/Camera';
import { Camera, UserTrackingModes } from './components/Camera';
import { Atmosphere } from './components/Atmosphere';
import MapView from './components/MapView';
import Light from './components/Light';
Expand DownExpand Up@@ -45,7 +45,7 @@ const MapboxGL = { ...NativeModules.MGLModule };

// static methods
MapboxGL.requestAndroidLocationPermissions = requestAndroidLocationPermissions;
MapboxGL.UserTrackingModes = Camera.UserTrackingModes;
MapboxGL.UserTrackingModes = UserTrackingModes;

// components
MapboxGL.MapView = MapView;
Expand Down

14 changes: 0 additions & 14 deletions
javascript/types/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,20 +10,6 @@ export type MapboxGLEvent<
 V = Element,
> = SyntheticEvent<V, { type: T; payload: P }>;

// Camera.

export type UserTrackingMode = 'normal' | 'compass' | 'course';

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

// Animated.

export interface AnimatedPoint extends GeoJsonObject {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: Added back Mapbox.UserTrackingModes#2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mfazekas
merged 1 commit into

from

Sep 25, 2022
 Merged


fix: Added back Mapbox.UserTrackingModes
#2242
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/Camera.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ return (
| &nbsp;&nbsp;animationMode | `union` | `none` | `false` | The easing or path the camera uses to animate to a new configuration. |
| allowUpdates | `boolean` | `none` | `false` | Whether the camera should send any configuration to the native module. Prevents unnecessary tile<br/>fetching and improves performance when the map is not visible. Defaults to `true`. |
| triggerKey | `string \| number` | `none` | `false` | Any arbitrary primitive value that, when changed, causes the camera to retry moving to its target<br/>configuration. (Not yet implemented.) |
| onUserTrackingModeChange | `UserTrackingModeChangeCallback` | `none` | `false` | Executes when user tracking mode changes. |
| onUserTrackingModeChange | `func` | `none` | `false` | Executes when user tracking mode changes.<br/>*signature:*`(event:MapboxGLEvent) => void` |

## methods
### setCamera()
Expand Down

7 changes: 5 additions & 2 deletions
docs/docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -696,9 +696,12 @@
 {
 "name": "onUserTrackingModeChange",
 "required": false,
 "type": "UserTrackingModeChangeCallback",
 "type": {
 "name": "func",
 "funcSignature": "(event:MapboxGLEvent) => void"
 },
 "default": "none",
 "description": "Executes when user tracking mode changes."
 "description": "Executes when user tracking mode changes.\n*signature:*`(event:MapboxGLEvent) => void`"
 }
 ],
 "fileNameWithExt": "Camera.tsx",
Expand Down

9 changes: 2 additions & 7 deletions
index.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,14 @@ import {
 CameraBoundsWithPadding as _CameraBoundsWithPadding,
 CameraStops as _CameraStops,
 CameraAnimationMode as _CameraAnimationMode,
 type UserTrackingMode as _UserTrackingMode,
 type UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
} from './javascript/components/Camera';
import { MarkerView as _MarkerView } from './javascript/components/MarkerView';
import { PointAnnotation as _PointAnnotation } from './javascript/components/PointAnnotation';
import { Atmosphere as _Atmosphere } from './javascript/components/Atmosphere';
import type {
 MapboxGLEvent as _MapboxGLEvent,
 UserTrackingMode as _UserTrackingMode,
 UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
 AnimatedPoint as _AnimatedPoint,
 AnimatedShape as _AnimatedShape,
} from './javascript/types/index';
Expand DownExpand Up@@ -482,11 +482,6 @@ declare namespace MapboxGL {
 /**
 * Constants
 */
 enum UserTrackingModes {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
 }

 enum InterpolationMode {
 Exponential = 0,
Expand Down

32 changes: 25 additions & 7 deletions
ios/RCTMGL-v10/RCTMGLCamera.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,10 @@ enum CameraMode: String, CaseIterable {
 case flight, ease, linear, none
}

enum UserTrackingMode: String {
 case none,compass, course, normal
}

struct CameraUpdateItem {
 var camera: CameraOptions
 var mode: CameraMode
Expand DownExpand Up@@ -133,7 +137,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 _updateCameraFromTrackingMode()
 }
 }
 @objc var followUserMode: NSString? {
 @objc var followUserMode: String? {
 didSet {
 _updateCameraFromTrackingMode()
 }
Expand DownExpand Up@@ -192,11 +196,22 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 }
 }

 func _disableUsetTracking(_ map: MapView) {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 }

 func _updateCameraFromTrackingMode() {
 withMapView { map in
 guard self.followUserLocation else {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? "none")
 guard let userTrackingMode = userTrackingMode else {
 Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
 self._disableUsetTracking(map)
 return
 }

 guard self.followUserLocation && userTrackingMode != .none else {
 self._disableUsetTracking(map)
 return
 }

Expand All@@ -207,17 +222,20 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 map.location.addLocationConsumer(newConsumer: self)
 var trackingModeChanged = false
 var followOptions = FollowPuckViewportStateOptions()
 if (self.followUserMode == "compass") {
 switch userTrackingMode {
 case .none:
 Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
 case .compass:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.heading
 followOptions.bearing = FollowPuckViewportStateBearing.heading
 trackingModeChanged = true
} else if (self.followUserMode == "course") {
case .course:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.course
 followOptions.bearing = FollowPuckViewportStateBearing.course
 trackingModeChanged = true
} else if (self.followUserMode == "normal") {
case .normal:
 map.location.options.puckBearingEnabled = false
 followOptions.bearing = nil
 trackingModeChanged = true
Expand Down

8 changes: 8 additions & 0 deletions
ios/RCTMGL-v10/RCTMGLLogging.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,14 @@ class Logger {
 static func log(level: LogLevel, message: String, error: Error) {
 sharedInstance.log(level: level, message: "\(message) - error: \(error.localizedDescription) \(error)")
 }

 static func error(_ message: String) {
 log(level: .error, message: message)
 }

 static func assert(_ message: String) {
 log(level: .error, message: "Assertion failure: \(message)")
 }
}

func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {
Expand Down

18 changes: 17 additions & 1 deletion
javascript/components/Camera.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,27 @@ import React, {
import { NativeModules, requireNativeComponent } from 'react-native';
import { Position } from '@turf/helpers';

import { UserTrackingModeChangeCallback, UserTrackingMode } from '../types';
import { MapboxGLEvent } from '../types';
import { makeLatLngBounds, makePoint } from '../utils/geoUtils';

const NativeModule = NativeModules.MGLModule;

export const enum UserTrackingMode {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
}

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

/**
 * Converts the provided React Native animation mode into the corresponding native enum value.
 */
Expand Down

4 changes: 2 additions & 2 deletions
javascript/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { NativeModules } from 'react-native';

import { Camera } from './components/Camera';
import { Camera, UserTrackingModes } from './components/Camera';
import { Atmosphere } from './components/Atmosphere';
import MapView from './components/MapView';
import Light from './components/Light';
Expand DownExpand Up@@ -45,7 +45,7 @@ const MapboxGL = { ...NativeModules.MGLModule };

// static methods
MapboxGL.requestAndroidLocationPermissions = requestAndroidLocationPermissions;
MapboxGL.UserTrackingModes = Camera.UserTrackingModes;
MapboxGL.UserTrackingModes = UserTrackingModes;

// components
MapboxGL.MapView = MapView;
Expand Down

14 changes: 0 additions & 14 deletions
javascript/types/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,20 +10,6 @@ export type MapboxGLEvent<
 V = Element,
> = SyntheticEvent<V, { type: T; payload: P }>;

// Camera.

export type UserTrackingMode = 'normal' | 'compass' | 'course';

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

// Animated.

export interface AnimatedPoint extends GeoJsonObject {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: Added back Mapbox.UserTrackingModes#2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mfazekas
merged 1 commit into

from

Sep 25, 2022
 Merged


fix: Added back Mapbox.UserTrackingModes
#2242
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/Camera.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ return (
| &nbsp;&nbsp;animationMode | `union` | `none` | `false` | The easing or path the camera uses to animate to a new configuration. |
| allowUpdates | `boolean` | `none` | `false` | Whether the camera should send any configuration to the native module. Prevents unnecessary tile<br/>fetching and improves performance when the map is not visible. Defaults to `true`. |
| triggerKey | `string \| number` | `none` | `false` | Any arbitrary primitive value that, when changed, causes the camera to retry moving to its target<br/>configuration. (Not yet implemented.) |
| onUserTrackingModeChange | `UserTrackingModeChangeCallback` | `none` | `false` | Executes when user tracking mode changes. |
| onUserTrackingModeChange | `func` | `none` | `false` | Executes when user tracking mode changes.<br/>*signature:*`(event:MapboxGLEvent) => void` |

## methods
### setCamera()
Expand Down

7 changes: 5 additions & 2 deletions
docs/docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -696,9 +696,12 @@
 {
 "name": "onUserTrackingModeChange",
 "required": false,
 "type": "UserTrackingModeChangeCallback",
 "type": {
 "name": "func",
 "funcSignature": "(event:MapboxGLEvent) => void"
 },
 "default": "none",
 "description": "Executes when user tracking mode changes."
 "description": "Executes when user tracking mode changes.\n*signature:*`(event:MapboxGLEvent) => void`"
 }
 ],
 "fileNameWithExt": "Camera.tsx",
Expand Down

9 changes: 2 additions & 7 deletions
index.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,14 @@ import {
 CameraBoundsWithPadding as _CameraBoundsWithPadding,
 CameraStops as _CameraStops,
 CameraAnimationMode as _CameraAnimationMode,
 type UserTrackingMode as _UserTrackingMode,
 type UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
} from './javascript/components/Camera';
import { MarkerView as _MarkerView } from './javascript/components/MarkerView';
import { PointAnnotation as _PointAnnotation } from './javascript/components/PointAnnotation';
import { Atmosphere as _Atmosphere } from './javascript/components/Atmosphere';
import type {
 MapboxGLEvent as _MapboxGLEvent,
 UserTrackingMode as _UserTrackingMode,
 UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
 AnimatedPoint as _AnimatedPoint,
 AnimatedShape as _AnimatedShape,
} from './javascript/types/index';
Expand DownExpand Up@@ -482,11 +482,6 @@ declare namespace MapboxGL {
 /**
 * Constants
 */
 enum UserTrackingModes {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
 }

 enum InterpolationMode {
 Exponential = 0,
Expand Down

32 changes: 25 additions & 7 deletions
ios/RCTMGL-v10/RCTMGLCamera.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,10 @@ enum CameraMode: String, CaseIterable {
 case flight, ease, linear, none
}

enum UserTrackingMode: String {
 case none,compass, course, normal
}

struct CameraUpdateItem {
 var camera: CameraOptions
 var mode: CameraMode
Expand DownExpand Up@@ -133,7 +137,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 _updateCameraFromTrackingMode()
 }
 }
 @objc var followUserMode: NSString? {
 @objc var followUserMode: String? {
 didSet {
 _updateCameraFromTrackingMode()
 }
Expand DownExpand Up@@ -192,11 +196,22 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 }
 }

 func _disableUsetTracking(_ map: MapView) {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 }

 func _updateCameraFromTrackingMode() {
 withMapView { map in
 guard self.followUserLocation else {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? "none")
 guard let userTrackingMode = userTrackingMode else {
 Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
 self._disableUsetTracking(map)
 return
 }

 guard self.followUserLocation && userTrackingMode != .none else {
 self._disableUsetTracking(map)
 return
 }

Expand All@@ -207,17 +222,20 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 map.location.addLocationConsumer(newConsumer: self)
 var trackingModeChanged = false
 var followOptions = FollowPuckViewportStateOptions()
 if (self.followUserMode == "compass") {
 switch userTrackingMode {
 case .none:
 Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
 case .compass:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.heading
 followOptions.bearing = FollowPuckViewportStateBearing.heading
 trackingModeChanged = true
} else if (self.followUserMode == "course") {
case .course:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.course
 followOptions.bearing = FollowPuckViewportStateBearing.course
 trackingModeChanged = true
} else if (self.followUserMode == "normal") {
case .normal:
 map.location.options.puckBearingEnabled = false
 followOptions.bearing = nil
 trackingModeChanged = true
Expand Down

8 changes: 8 additions & 0 deletions
ios/RCTMGL-v10/RCTMGLLogging.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,14 @@ class Logger {
 static func log(level: LogLevel, message: String, error: Error) {
 sharedInstance.log(level: level, message: "\(message) - error: \(error.localizedDescription) \(error)")
 }

 static func error(_ message: String) {
 log(level: .error, message: message)
 }

 static func assert(_ message: String) {
 log(level: .error, message: "Assertion failure: \(message)")
 }
}

func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {
Expand Down

18 changes: 17 additions & 1 deletion
javascript/components/Camera.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,27 @@ import React, {
import { NativeModules, requireNativeComponent } from 'react-native';
import { Position } from '@turf/helpers';

import { UserTrackingModeChangeCallback, UserTrackingMode } from '../types';
import { MapboxGLEvent } from '../types';
import { makeLatLngBounds, makePoint } from '../utils/geoUtils';

const NativeModule = NativeModules.MGLModule;

export const enum UserTrackingMode {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
}

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

/**
 * Converts the provided React Native animation mode into the corresponding native enum value.
 */
Expand Down

4 changes: 2 additions & 2 deletions
javascript/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { NativeModules } from 'react-native';

import { Camera } from './components/Camera';
import { Camera, UserTrackingModes } from './components/Camera';
import { Atmosphere } from './components/Atmosphere';
import MapView from './components/MapView';
import Light from './components/Light';
Expand DownExpand Up@@ -45,7 +45,7 @@ const MapboxGL = { ...NativeModules.MGLModule };

// static methods
MapboxGL.requestAndroidLocationPermissions = requestAndroidLocationPermissions;
MapboxGL.UserTrackingModes = Camera.UserTrackingModes;
MapboxGL.UserTrackingModes = UserTrackingModes;

// components
MapboxGL.MapView = MapView;
Expand Down

14 changes: 0 additions & 14 deletions
javascript/types/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,20 +10,6 @@ export type MapboxGLEvent<
 V = Element,
> = SyntheticEvent<V, { type: T; payload: P }>;

// Camera.

export type UserTrackingMode = 'normal' | 'compass' | 'course';

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

// Animated.

export interface AnimatedPoint extends GeoJsonObject {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: Added back Mapbox.UserTrackingModes#2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mfazekas
merged 1 commit into

from

Sep 25, 2022
 Merged


fix: Added back Mapbox.UserTrackingModes
#2242
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
docs/Camera.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ return (
| &nbsp;&nbsp;animationMode | `union` | `none` | `false` | The easing or path the camera uses to animate to a new configuration. |
| allowUpdates | `boolean` | `none` | `false` | Whether the camera should send any configuration to the native module. Prevents unnecessary tile<br/>fetching and improves performance when the map is not visible. Defaults to `true`. |
| triggerKey | `string \| number` | `none` | `false` | Any arbitrary primitive value that, when changed, causes the camera to retry moving to its target<br/>configuration. (Not yet implemented.) |
| onUserTrackingModeChange | `UserTrackingModeChangeCallback` | `none` | `false` | Executes when user tracking mode changes. |
| onUserTrackingModeChange | `func` | `none` | `false` | Executes when user tracking mode changes.<br/>*signature:*`(event:MapboxGLEvent) => void` |

## methods
### setCamera()
Expand Down

7 changes: 5 additions & 2 deletions
docs/docs.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -696,9 +696,12 @@
 {
 "name": "onUserTrackingModeChange",
 "required": false,
 "type": "UserTrackingModeChangeCallback",
 "type": {
 "name": "func",
 "funcSignature": "(event:MapboxGLEvent) => void"
 },
 "default": "none",
 "description": "Executes when user tracking mode changes."
 "description": "Executes when user tracking mode changes.\n*signature:*`(event:MapboxGLEvent) => void`"
 }
 ],
 "fileNameWithExt": "Camera.tsx",
Expand Down

9 changes: 2 additions & 7 deletions
index.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,14 @@ import {
 CameraBoundsWithPadding as _CameraBoundsWithPadding,
 CameraStops as _CameraStops,
 CameraAnimationMode as _CameraAnimationMode,
 type UserTrackingMode as _UserTrackingMode,
 type UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
} from './javascript/components/Camera';
import { MarkerView as _MarkerView } from './javascript/components/MarkerView';
import { PointAnnotation as _PointAnnotation } from './javascript/components/PointAnnotation';
import { Atmosphere as _Atmosphere } from './javascript/components/Atmosphere';
import type {
 MapboxGLEvent as _MapboxGLEvent,
 UserTrackingMode as _UserTrackingMode,
 UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
 AnimatedPoint as _AnimatedPoint,
 AnimatedShape as _AnimatedShape,
} from './javascript/types/index';
Expand DownExpand Up@@ -482,11 +482,6 @@ declare namespace MapboxGL {
 /**
 * Constants
 */
 enum UserTrackingModes {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
 }

 enum InterpolationMode {
 Exponential = 0,
Expand Down

32 changes: 25 additions & 7 deletions
ios/RCTMGL-v10/RCTMGLCamera.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,10 @@ enum CameraMode: String, CaseIterable {
 case flight, ease, linear, none
}

enum UserTrackingMode: String {
 case none,compass, course, normal
}

struct CameraUpdateItem {
 var camera: CameraOptions
 var mode: CameraMode
Expand DownExpand Up@@ -133,7 +137,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 _updateCameraFromTrackingMode()
 }
 }
 @objc var followUserMode: NSString? {
 @objc var followUserMode: String? {
 didSet {
 _updateCameraFromTrackingMode()
 }
Expand DownExpand Up@@ -192,11 +196,22 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 }
 }

 func _disableUsetTracking(_ map: MapView) {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 }

 func _updateCameraFromTrackingMode() {
 withMapView { map in
 guard self.followUserLocation else {
 map.viewport.idle()
 map.location.removeLocationConsumer(consumer: self)
 let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? "none")
 guard let userTrackingMode = userTrackingMode else {
 Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
 self._disableUsetTracking(map)
 return
 }

 guard self.followUserLocation && userTrackingMode != .none else {
 self._disableUsetTracking(map)
 return
 }

Expand All@@ -207,17 +222,20 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
 map.location.addLocationConsumer(newConsumer: self)
 var trackingModeChanged = false
 var followOptions = FollowPuckViewportStateOptions()
 if (self.followUserMode == "compass") {
 switch userTrackingMode {
 case .none:
 Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
 case .compass:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.heading
 followOptions.bearing = FollowPuckViewportStateBearing.heading
 trackingModeChanged = true
} else if (self.followUserMode == "course") {
case .course:
 map.location.options.puckBearingEnabled = true
 map.location.options.puckBearingSource = PuckBearingSource.course
 followOptions.bearing = FollowPuckViewportStateBearing.course
 trackingModeChanged = true
} else if (self.followUserMode == "normal") {
case .normal:
 map.location.options.puckBearingEnabled = false
 followOptions.bearing = nil
 trackingModeChanged = true
Expand Down

8 changes: 8 additions & 0 deletions
ios/RCTMGL-v10/RCTMGLLogging.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,14 @@ class Logger {
 static func log(level: LogLevel, message: String, error: Error) {
 sharedInstance.log(level: level, message: "\(message) - error: \(error.localizedDescription) \(error)")
 }

 static func error(_ message: String) {
 log(level: .error, message: message)
 }

 static func assert(_ message: String) {
 log(level: .error, message: "Assertion failure: \(message)")
 }
}

func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {
Expand Down

18 changes: 17 additions & 1 deletion
javascript/components/Camera.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,11 +9,27 @@ import React, {
import { NativeModules, requireNativeComponent } from 'react-native';
import { Position } from '@turf/helpers';

import { UserTrackingModeChangeCallback, UserTrackingMode } from '../types';
import { MapboxGLEvent } from '../types';
import { makeLatLngBounds, makePoint } from '../utils/geoUtils';

const NativeModule = NativeModules.MGLModule;

export const enum UserTrackingMode {
 Follow = 'normal',
 FollowWithHeading = 'compass',
 FollowWithCourse = 'course',
}

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

/**
 * Converts the provided React Native animation mode into the corresponding native enum value.
 */
Expand Down

4 changes: 2 additions & 2 deletions
javascript/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { NativeModules } from 'react-native';

import { Camera } from './components/Camera';
import { Camera, UserTrackingModes } from './components/Camera';
import { Atmosphere } from './components/Atmosphere';
import MapView from './components/MapView';
import Light from './components/Light';
Expand DownExpand Up@@ -45,7 +45,7 @@ const MapboxGL = { ...NativeModules.MGLModule };

// static methods
MapboxGL.requestAndroidLocationPermissions = requestAndroidLocationPermissions;
MapboxGL.UserTrackingModes = Camera.UserTrackingModes;
MapboxGL.UserTrackingModes = UserTrackingModes;

// components
MapboxGL.MapView = MapView;
Expand Down

14 changes: 0 additions & 14 deletions
javascript/types/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,20 +10,6 @@ export type MapboxGLEvent<
 V = Element,
> = SyntheticEvent<V, { type: T; payload: P }>;

// Camera.

export type UserTrackingMode = 'normal' | 'compass' | 'course';

export type UserTrackingModeChangeCallback = (
 event: MapboxGLEvent<
 'usertrackingmodechange',
 {
 followUserLocation: boolean;
 followUserMode: UserTrackingMode | null;
 }
 >,
) => void;

// Animated.

export interface AnimatedPoint extends GeoJsonObject {
Expand Down