@mappedin/mappedin-js 5.9.1 → 5.10.1

package/lib/esm/renderer/index.d.ts

@@ -3,16 +3,17 @@
 //   ../three
 //   ../@tweenjs/tween.js
 //   ../minisearch
-//   ../geojson
+//   ../@mappedin/mvf
 
 declare module '@mappedin/mappedin-js' {
     import { MapView } from '@mappedin/mappedin-js/renderer/public/MapView';
-    import { getVenue, getVenueBundle, Mappedin, downloadBundle, getVenueBundleURL, downloadVenueBundleMVF, MappedinDestinationSet, MappedinMap, TGetVenueBundleOptions, TGetVenueOptions } from '@mappedin/mappedin-js/get-venue';
+    import { getVenue, getVenueMVF, getVenueBundle, Mappedin, downloadBundle, getVenueBundleURL, downloadVenueBundleMVF, MappedinDestinationSet, MappedinMap, TGetVenueBundleOptions, TGetVenueOptions } from '@mappedin/mappedin-js/get-venue';
     import { PositionUpdater } from '@mappedin/mappedin-js/renderer/internal/Mappedin.BlueDot/Mappedin.BlueDot.core';
     import type { TMapViewOptions } from '@mappedin/mappedin-js/renderer/MapView.types';
     import { MARKER_ANCHOR } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Marker';
-    export type { Marker } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Markers';
-    export type { Path } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths';
+    export { E_SDK_LOG_LEVEL, setLoggerLevel } from '@mappedin/mappedin-js/--/common/Mappedin.Logger';
+    export type { Marker } from '@mappedin/mappedin-js/renderer/private/controllers/MarkersController';
+    export type { Path } from '@mappedin/mappedin-js/renderer/private/controllers/PathsController';
     export { BEARING_TYPE, ACTION_TYPE } from '@mappedin/mappedin-js/navigator';
     export type { IDirectionsResult, E_MESSAGES as E_GET_DIRECTIONS_MESSAGES } from '@mappedin/mappedin-js/navigator';
     export type { IFlatLabels, FlatLabels } from '@mappedin/mappedin-js/renderer/public/api/FlatLabels';
@@ -41,9 +42,9 @@ declare module '@mappedin/mappedin-js' {
         */
     function showVenue<T extends Mappedin>(el: HTMLElement, venue: T, options?: TMapViewOptions): Promise<MapView>;
     export { COLLISION_RANKING_TIERS, STATE, E_SDK_EVENT, E_BLUEDOT_STATE_REASON, E_BLUEDOT_MARKER_STATE, E_BLUEDOT_EVENT, E_BLUEDOT_STATE, E_CAMERA_EVENT, E_CAMERA_DIRECTION, SAFE_AREA_INSET_TYPE, ANIMATION_TWEENS, CAMERA_EASING_MODE, } from '@mappedin/mappedin-js/renderer/MapView.enums';
-    export { getVenue, getVenueBundle, showVenue, downloadBundle, getVenueBundleURL, downloadVenueBundleMVF, PositionUpdater, MappedinDestinationSet, MARKER_ANCHOR, };
+    export { getVenue, getVenueMVF, getVenueBundle, showVenue, downloadBundle, getVenueBundleURL, downloadVenueBundleMVF, PositionUpdater, MappedinDestinationSet, MARKER_ANCHOR, };
     import DefaultAssetManager from '@mappedin/mappedin-js/renderer/internal/Mappedin.AssetManager';
-    import { TTileManagerOptions } from '@mappedin/mappedin-js/renderer/layers/Outdoor-Context/Mappedin.TileManager';
+    import { TTileManagerOptions } from '@mappedin/mappedin-js/renderer/internal/outdoor-context/Mappedin.TileManager';
     /**
         * @internal
         */
@@ -61,7 +62,7 @@ declare module '@mappedin/mappedin-js' {
     export type { TMappedinInitializeOptions };
     export * from '@mappedin/mappedin-js/renderer/MapView.types';
     export type { MapView } from '@mappedin/mappedin-js/renderer/public/MapView';
-    export type { TSafeAreaInsets, TCameraTargets, TFocusOnCameraOptions, TCameraTransform, TCameraAnimationOptions, default as Camera, } from '@mappedin/mappedin-js/renderer/Camera';
+    export type { TSafeAreaInsets, TCameraTargets, TFocusOnCameraOptions, TCameraTransform, TCameraAnimationOptions, default as CameraController, } from '@mappedin/mappedin-js/renderer/private/controllers/CameraController';
     export type { TGetVenueOptions, TShowVenueOptions, TMappedinOfflineSearchOptions, TMappedinOfflineSearchResult, TMappedinOfflineSearchSuggestions, TMappedinOfflineAllSearchMatch, TMappedinOfflineSearchAllOptions, } from '@mappedin/mappedin-js/get-venue';
     export { Mappedin, MappedinDirections, MappedinLocation, MappedinPolygon, MappedinNode, MappedinCategory, MappedinMap, MappedinEvent, MappedinMapGroup, MappedinVenue, MappedinVortex, MappedinNavigatable, MappedinCoordinate, OfflineSearch, MAP_RENDER_MODE, setFetchFn, MappedinCollectionType, } from '@mappedin/mappedin-js/get-venue';
     /**
@@ -85,12 +86,12 @@ declare module '@mappedin/mappedin-js' {
     /**
         * @internal
         */
-    OpenStreetMapOutdoorContext, } from './layers/Outdoor-Context/Outdoor-Context.provider';
+    OpenStreetMapOutdoorContext, } from './internal/outdoor-context/Outdoor-Context.provider';
     export type { 
     /**
         * @internal
         */
-    IOutdoorContextProvider, } from './layers/Outdoor-Context/Outdoor-Context.provider';
+    IOutdoorContextProvider, } from './internal/outdoor-context/Outdoor-Context.provider';
 }
 
 declare module '@mappedin/mappedin-js/renderer/public/MapView' {
@@ -100,16 +101,16 @@ declare module '@mappedin/mappedin-js/renderer/public/MapView' {
     import { E_SDK_EVENT_PAYLOAD, TCreateMarkerOptions, TLabelAllLocationFlatLabelOptions, TLabelAllLocationFloatingLabelOptions, TMapViewOptions, TPathOptions, TCreateTooltipCommonOptions, TCreateTooltipOptions, TMapClickEvent } from '@mappedin/mappedin-js/renderer/MapView.types';
     import { E_SDK_EVENT, STATE } from '@mappedin/mappedin-js/renderer/MapView.enums';
     import SmartTooltip from '@mappedin/mappedin-js/renderer/internal/Mappedin.SmartTooltip';
-    import Camera from '@mappedin/mappedin-js/renderer/Camera';
-    import { Marker } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Markers';
+    import { Marker } from '@mappedin/mappedin-js/renderer/private/controllers/MarkersController';
     import { PubSub } from '@mappedin/mappedin-js/renderer/internal/pub-sub.typed';
-    import BlueDotLayer from '@mappedin/mappedin-js/renderer/layers/BlueDot';
-    import JourneyLayer from '@mappedin/mappedin-js/renderer/layers/Journey';
+    import Journey from '@mappedin/mappedin-js/renderer/public/api/Journey';
     import { TGetPolygonsAtCoordinateOptions } from '@mappedin/mappedin-js/renderer';
     import { IFlatLabels } from '@mappedin/mappedin-js/renderer/public/api/FlatLabels';
     import { IFloatingLabels } from '@mappedin/mappedin-js/renderer/public/api/FloatingLabels';
-    import { MarkersLayer } from '@mappedin/mappedin-js/renderer/layers/Markers';
-    import { PathsLayer } from '@mappedin/mappedin-js/renderer/layers/Paths';
+    import { Markers } from '@mappedin/mappedin-js/renderer/public/api/Markers';
+    import { Paths } from '@mappedin/mappedin-js/renderer/public/api/Paths';
+    import { BlueDot } from '@mappedin/mappedin-js/renderer/public/api/BlueDot';
+    import { Camera } from '@mappedin/mappedin-js/renderer/public/api/Camera';
     export enum INTERNAL_EVENT {
             ON_FIRST_MAP_LOADED = 0,
             TEXTURE_LOADED = 1,
@@ -175,14 +176,13 @@ declare module '@mappedin/mappedin-js/renderer/public/MapView' {
     };
     export class MapView extends PubSub<E_SDK_EVENT_PAYLOAD, E_SDK_EVENT> {
             #private;
-            currentPath?: MappedinNode[];
-            BlueDot: BlueDotLayer;
-            Journey: JourneyLayer;
+            Journey: Journey;
             Camera: Camera;
             FlatLabels: IFlatLabels<void>;
             FloatingLabels: IFloatingLabels<void>;
-            Markers: MarkersLayer;
-            Paths: PathsLayer;
+            Markers: Markers;
+            Paths: Paths;
+            BlueDot: BlueDot;
             options: TMapViewOptions;
             constructor(container: HTMLElement, venue: Mappedin, options?: TMapViewOptions & {
                     onFirstMapLoaded: () => void;
@@ -469,6 +469,7 @@ declare module '@mappedin/mappedin-js/renderer/public/MapView' {
 declare module '@mappedin/mappedin-js/get-venue' {
     import type { TGetVenueOptions } from '@mappedin/mappedin-js/get-venue/Mappedin.types';
     import { Mappedin } from '@mappedin/mappedin-js/get-venue/Mappedin';
+    export { E_SDK_LOG_LEVEL, setLoggerLevel } from '@mappedin/mappedin-js/--/common/Mappedin.Logger';
     /**
         * This is how we can avoid bundling in node-fetch (via isomorphic fetch),
         * which keeps popping up in security advisories
@@ -601,12 +602,7 @@ declare module '@mappedin/mappedin-js/get-venue' {
     /**
         * @internal
         */
-    export function downloadVenueBundleMVF(options: TGetVenueBundleOptions, 
-    /**
-        * use Web Workers to speed up MVF parsing. This is likely only benefitial for larger venues,
-        * and may be determental to smaller ones, hence it is off by default
-        */
-    useWorker?: boolean): Promise<unknown>;
+    export function downloadVenueBundleMVF(options: TGetVenueBundleOptions): Promise<unknown>;
     /**
         * Returns a {@link Mappedin} object hydrated with JSON data.
         * @param {string|Object} mappedinSerializableData A JSON string or object representing a venue.
@@ -623,7 +619,6 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.BlueDot/Mappedi
     import { PubSub, IPubSub } from '@mappedin/mappedin-js/renderer/internal/pub-sub';
     import { MappedinMap, MappedinNode } from '@mappedin/mappedin-js/get-venue';
     import { TGeolocationObject } from '@mappedin/mappedin-js/renderer/MapView.types';
-    import { MapView } from '@mappedin/mappedin-js/renderer';
     import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
     import BlueDotManager from '@mappedin/mappedin-js/renderer/internal/blue-dot-manager';
     export const DEFAULT_BLUE_DOT_COLOR = "#2266ff";
@@ -700,6 +695,7 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.BlueDot/Mappedi
             enableBlueDot: (options?: TEnableBlueDotOptions) => void;
             disableBlueDot: () => void;
             enableBlueDotOptions: TEnableBlueDotOptions;
+            enabled: boolean;
             state: TBlueDotStateChange;
             /**
             Whether blue dot should be allowed with missing floor level information.
@@ -769,13 +765,12 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.BlueDot/Mappedi
     export const FALLBACK_TO_GPS_TIMEOUT = 10000;
     type TBlueDotProps = {
             data: any;
-            mapView: MapView;
             core: ICore;
             manager: BlueDotManager;
     };
     export type TLatLonProps = [number, number];
     const BlueDot: {
-            ({ data, mapView, core, manager }: TBlueDotProps): IBlueDotCore;
+            ({ data, core, manager }: TBlueDotProps): IBlueDotCore;
             FakeGeolocation: typeof FakeGeolocation;
     };
     export default BlueDot;
@@ -788,7 +783,7 @@ declare module '@mappedin/mappedin-js/renderer/MapView.types' {
     import { TOOLTIP_ANCHOR } from '@mappedin/mappedin-js/renderer/internal/Mappedin.SmartTooltip';
     import type { Euler, Object3D, Vector3 } from 'three';
     import { GEOLOCATION_STATUS, COLLISION_RANKING_TIERS, STATE, MARKER_ANCHOR, E_SDK_EVENT, E_BLUEDOT_EVENT, E_CAMERA_EVENT, MAP_RENDER_MODE, CAMERA_EASING_MODE } from '@mappedin/mappedin-js/renderer/MapView.enums';
-    import { Path } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths';
+    import { Path } from '@mappedin/mappedin-js/renderer/private/controllers/PathsController';
     export type { TEnableBlueDotOptions, TFloatingLabelAppearance };
     /**
     An extension of the GeolocationPosition type.
@@ -1410,8 +1405,8 @@ declare module '@mappedin/mappedin-js/renderer/MapView.types' {
                 */
             [E_CAMERA_EVENT.TILT_CHANGED]: number;
     };
-    export type { default as BlueDotLayer } from '@mappedin/mappedin-js/renderer/layers/BlueDot';
-    export type { default as JourneyLayer } from '@mappedin/mappedin-js/renderer/layers/Journey';
+    export type { default as BlueDotController } from '@mappedin/mappedin-js/renderer/private/controllers/BlueDotController';
+    export type { default as Journey } from '@mappedin/mappedin-js/renderer/public/api/Journey';
 }
 
 declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.Marker' {
@@ -1421,60 +1416,48 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.Marker' {
     import { Vector3 } from 'three';
     import { TColliderStrategy } from '@mappedin/mappedin-js/renderer/internal/Mappedin.SmartCollider';
     /**
-      *
-      * A Marker is an html element that allows users to attach an image or text to a MappedinNode, while interacting (colliding) with other elements.
-      *
-      * Make your own and add it directly to the map with {{#crossLink "MapView/createSmartMarker:method"}}{{/crossLink}}, or use the constructor and add it when you want.
-      *
-      * You will need to specify at least `options.position`, `options.contentHtml` and `options.map`.
-      *
-      *
-      * @class Marker
-      *
-      * @constructor
-      * @param options {Object} Passes on options (e.g. contentHtml, position, map, padding, defaultAnchorType, enabledAnchorTypes, collisionRank) to MapView.Tooltip's options argument.
-      * @param [options.contentHtml] Use mappedin's default tooltip styling with custom inner html content
-      * @param [options.id] If omitted, an id will be generated automatically
-      * @param [options.position] should be something you got from {{#crossLink "MapView/getPositionPolygon:method"}}{{/crossLink}} or {{#crossLink "MapView/getPositionNode:method"}}{{/crossLink}}.
-      * @param [options.anchor] Anchor point to node
-      * @param [options.map] The map ID where the tooltip should be displayed
-      * @param [options.collisionRank]  The rank of the object used when comparing colliders to determine which should be shown.
-      */
+        * @hidden
+        * @internal
+        */
     export type TSmartMarkerOptions = {
-        contentHtml?: string;
-        position: Vector3;
-        mapId: string;
-        id?: string;
-        anchor?: MARKER_ANCHOR;
-        collisionRank?: COLLISION_RANKING_TIERS;
+            contentHtml?: string;
+            position: Vector3;
+            mapId: string;
+            id?: string;
+            anchor?: MARKER_ANCHOR;
+            collisionRank?: COLLISION_RANKING_TIERS;
     };
     type TTooltipStyle = {
-        top?: string;
-        left?: string;
+            top?: string;
+            left?: string;
     };
     export enum MARKER_ANCHOR {
-        CENTER = 0,
-        TOP = 1,
-        BOTTOM = 2,
-        LEFT = 3,
-        RIGHT = 4
+            CENTER = 0,
+            TOP = 1,
+            BOTTOM = 2,
+            LEFT = 3,
+            RIGHT = 4
     }
+    /**
+        * @hidden
+        * @internal
+        */
     class InternalMarker extends HTMLCollider implements IHTMLCollider {
-        _el: Element | null;
-        style: TTooltipStyle;
-        polygon: any;
-        constructor(options: TSmartMarkerOptions);
-        get strategies(): TColliderStrategy[];
-        colliderDidMount(): void;
-        setAction(action: any): void;
-        colliderDidNotFindAHome(): void;
-        colliderDidGoOffscreen(): void;
-        colliderDidUpdateVisiblity(): void;
+            _el: Element | null;
+            style: TTooltipStyle;
+            polygon: any;
+            constructor(options: TSmartMarkerOptions);
+            get strategies(): TColliderStrategy[];
+            colliderDidMount(): void;
+            setAction(action: any): void;
+            colliderDidNotFindAHome(): void;
+            colliderDidGoOffscreen(): void;
+            colliderDidUpdateVisiblity(): void;
     }
     export default InternalMarker;
 }
 
-declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.Markers' {
+declare module '@mappedin/mappedin-js/renderer/private/controllers/MarkersController' {
     import { MappedinCoordinate, MappedinNode } from '@mappedin/mappedin-js/get-venue';
     import { TCreateMarkerOptions, TAnimationOptions } from '@mappedin/mappedin-js/renderer';
     import InternalMarker from '@mappedin/mappedin-js/renderer/internal/Mappedin.Marker';
@@ -1545,10 +1528,14 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.Markers' {
     export default MarkersController;
 }
 
-declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths' {
+declare module '@mappedin/mappedin-js/renderer/private/controllers/PathsController' {
     import { TPathOptions, MappedinNode } from '@mappedin/mappedin-js/renderer';
     import { ANIMATION_TWEENS } from '@mappedin/mappedin-js/renderer/MapView.enums';
     import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
+    /**
+        * @hidden
+        * @internal
+        */
     export type TPathOptionsInternal = TPathOptions & {
             curve?: typeof ANIMATION_TWEENS;
             drawConnectionSegments?: boolean;
@@ -1556,6 +1543,10 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths' {
                     curve?: typeof ANIMATION_TWEENS;
             };
     };
+    /**
+        * @hidden
+        * @internal
+        */
     export type TInternalPathSegment = {
             id: string;
             nodes: MappedinNode[];
@@ -1585,6 +1576,9 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths' {
             get nodes(): MappedinNode[];
     }
     /**
+        * @hidden
+        * @internal
+        *
         * Represents all the segments created for a single call to drawPath()
         */
     export class InternalPath {
@@ -1594,6 +1588,10 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths' {
             options: TPathOptionsInternal;
             constructor(nodes: MappedinNode[], pathSegments: TInternalPathSegment[], options: TPathOptionsInternal);
     }
+    /**
+        * @hidden
+        * @internal
+        */
     class PathsController {
             #private;
             constructor(core: ICore);
@@ -1661,6 +1659,7 @@ declare module '@mappedin/mappedin-js/navigator' {
     export { Navigator, NavigationGraph };
     export type { IDirectionsResult } from '@mappedin/mappedin-js/navigator/Navigator';
     export { E_MESSAGES } from '@mappedin/mappedin-js/navigator/Navigator';
+    export { E_SDK_LOG_LEVEL, setLoggerLevel } from '@mappedin/mappedin-js/--/common/Mappedin.Logger';
 }
 
 declare module '@mappedin/mappedin-js/renderer/public/api/FlatLabels' {
@@ -1960,14 +1959,13 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.AssetManager' {
     }
 }
 
-declare module '@mappedin/mappedin-js/renderer/layers/Outdoor-Context/Mappedin.TileManager' {
+declare module '@mappedin/mappedin-js/renderer/internal/outdoor-context/Mappedin.TileManager' {
     import { Box3 } from 'three';
     import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
     import { MappedinCoordinate, MappedinMap } from '@mappedin/mappedin-js/renderer/index.rn';
     import Object3D from '@mappedin/mappedin-js/renderer/internal/object3D.destroy';
-    import { MapView } from '@mappedin/mappedin-js/renderer/public/MapView';
-    import { Tile } from '@mappedin/mappedin-js/renderer/layers/Outdoor-Context/Mappedin.Tile';
-    import { IOutdoorContextProvider } from '@mappedin/mappedin-js/renderer/layers/Outdoor-Context/Outdoor-Context.provider';
+    import { Tile } from '@mappedin/mappedin-js/renderer/internal/outdoor-context/Mappedin.Tile';
+    import { IOutdoorContextProvider } from '@mappedin/mappedin-js/renderer/internal/outdoor-context/Outdoor-Context.provider';
     export enum TILE_RENDER_MODES {
             NORMAL = 0,
             AGGRESSIVE = 1
@@ -1991,7 +1989,7 @@ declare module '@mappedin/mappedin-js/renderer/layers/Outdoor-Context/Mappedin.T
             currentAbortController: AbortController;
             attributionEl: HTMLDivElement;
             outdoorContextProvider: IOutdoorContextProvider;
-            constructor(mapView: MapView, core: ICore);
+            constructor(core: ICore);
             createAttributionEl(): void;
             renderVisibleTiles: () => void;
             _renderVisibleTiles(): void;
@@ -2076,7 +2074,7 @@ declare module '@mappedin/mappedin-js/get-venue/MappedinDirections' {
     export {};
 }
 
-declare module '@mappedin/mappedin-js/renderer/Camera' {
+declare module '@mappedin/mappedin-js/renderer/private/controllers/CameraController' {
     import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
     import { MappedinNode, MappedinPolygon, MappedinCoordinate } from '@mappedin/mappedin-js/get-venue';
     import { PubSub } from '@mappedin/mappedin-js/renderer/internal/pub-sub.typed';
@@ -2120,80 +2118,27 @@ declare module '@mappedin/mappedin-js/renderer/Camera' {
     /**
         * The Camera object specifies a view of the map and allows manipulation of that view.
         */
-    class Camera extends PubSub<CAMERA_EVENT_PAYLOAD, E_CAMERA_EVENT> {
+    class CameraController extends PubSub<CAMERA_EVENT_PAYLOAD, E_CAMERA_EVENT> {
             #private;
+            core: ICore;
+            currentAnimation?: Promise<undefined>;
             /**
                 *
                 * @private
                 */
             constructor(core: ICore);
-            /**
-                * The current camera animation, if any. Resolves when the animation finishes.
-                */
-            get currentAnimation(): Promise<undefined> | undefined;
-            /**
-                * Current Camera zoom (in meters)
-                */
             get zoom(): number;
-            /**
-                * Current Camera rotation (in radians) from north
-                */
             get rotation(): number;
-            /**
-                * Current camera tilt angle (in radians), relative to a top-down view.
-                *
-                * ex: 0 means the camera is facing top-down, π/2 means the camera is
-                * facing directly from the side.
-                */
             get tilt(): number;
-            /**
-                * Get the minimum distance (in meters) the camera is allowed to get to the ground.
-                */
             get minZoom(): number;
-            /**
-                * Set the minimum distance (in meters) the camera is allowed to get to the ground.
-                */
             set minZoom(meters: number);
-            /**
-                * Get the maximum distance (in meters) the camera is allowed to get from the ground.
-                */
             get maxZoom(): number;
-            /**
-                * Set the maximum distance (in meters) the camera is allowed to get from the ground.
-                */
             set maxZoom(meters: number);
-            /**
-                * Get the current maximum tilt angle (in radians) the camera is allowed to use.
-                */
             get maxTilt(): number;
-            /**
-                * Sets the maximum tilt angle (in radians) the camera is allowed to use.
-                *
-                * Tilt angle must be between 0 and π/2 radians. It will be clamped within
-                * this range if it exceeds it on either end.
-                *
-                * As tilt angle approaches π/2 radians, this will impact overall touch controls
-                * and should be used sparingly.
-                */
             set maxTilt(radians: number);
-            /**
-                * Get the current camera position, which is at the center of the map.
-                * @returns the position as a coordinate
-                */
             get position(): MappedinCoordinate;
-            /**
-                * User camera interactions
-                */
             interactions: {
-                    /**
-                        * Enable all user interactions. This does not affect programmatic
-                        * Camera controls, such as `set` and `focusOn`
-                        */
                     enable: () => void;
-                    /**
-                        * Disable all user interactions. This does not affect programmatic
-                        * Camera controls, such as `set` and `focusOn`
-                        */
                     disable: () => void;
             };
             setSafeAreaInsets(insets: {
@@ -2202,7 +2147,7 @@ declare module '@mappedin/mappedin-js/renderer/Camera' {
                     bottom: number;
                     right: number;
             }): void;
-            getSafeAreaInsets(): import("./MapView.types").TPadding;
+            getSafeAreaInsets(): import("../../MapView.types").TPadding;
             /**
                 * Focus the Camera view on a collection of targets and animate to that state.
                 * @returns a Promise that resolves when the animation finishes, or rejects when it is cancelled.
@@ -2228,7 +2173,7 @@ declare module '@mappedin/mappedin-js/renderer/Camera' {
                 */
             cancelAnimation(): void;
     }
-    export default Camera;
+    export default CameraController;
 }
 
 declare module '@mappedin/mappedin-js/renderer/bundle-asset-manager' {
@@ -2343,50 +2288,18 @@ declare module '@mappedin/mappedin-js/renderer/internal/pub-sub.typed' {
     }
 }
 
-declare module '@mappedin/mappedin-js/renderer/layers/BlueDot' {
-    import { MapView } from '@mappedin/mappedin-js/renderer/public/MapView';
-    import { E_BLUEDOT_EVENT_PAYLOAD, E_BLUEDOT_EVENT } from '@mappedin/mappedin-js/renderer';
-    import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
-    import { TEnableBlueDotOptions } from '@mappedin/mappedin-js/renderer/MapView.types';
-    import { PubSub } from '@mappedin/mappedin-js/renderer/internal/pub-sub.typed';
-    import EventSystemLayer from '@mappedin/mappedin-js/renderer/layers/EventSystem';
-    /**
-        * Blue Dot Layer used for controlling the Blue Dot and listening to Blue Dot state change and position update events. Use the {@link on}-method to set listeners for {@link TBlueDotStateChange} and {@link TBlueDotPositionUpdate} events.
-        */
-    class BlueDotLayer extends PubSub<E_BLUEDOT_EVENT_PAYLOAD, E_BLUEDOT_EVENT> {
-            #private;
-            /**
-                * @private
-                */
-            constructor(mapView: MapView, core: ICore, eventsLayer: EventSystemLayer);
-            on<EVENT_NAME extends E_BLUEDOT_EVENT>(eventName: EVENT_NAME, fn: (payload: E_BLUEDOT_EVENT_PAYLOAD[EVENT_NAME] extends {
-                    data: null;
-            } ? E_BLUEDOT_EVENT_PAYLOAD[EVENT_NAME]['data'] : E_BLUEDOT_EVENT_PAYLOAD[EVENT_NAME]) => void): void;
-            off<EVENT_NAME extends E_BLUEDOT_EVENT>(eventName: EVENT_NAME, fn: (payload: E_BLUEDOT_EVENT_PAYLOAD[EVENT_NAME]) => void): void;
-            /**
-                * Enables Blue Dot. BlueDot then emits {@link TBlueDotStateChange} and {@link TBlueDotPositionUpdate} events via {@link E_BLUEDOT_EVENT}
-                */
-            enable(options?: TEnableBlueDotOptions): void;
-            /**
-                * Disables Blue Dot and stops emitting events.
-                */
-            disable(): void;
-    }
-    export default BlueDotLayer;
-}
-
-declare module '@mappedin/mappedin-js/renderer/layers/Journey' {
-    import { MapView, TJourneyOptions } from '@mappedin/mappedin-js/renderer';
+declare module '@mappedin/mappedin-js/renderer/public/api/Journey' {
+    import { TJourneyOptions } from '@mappedin/mappedin-js/renderer';
     import { MappedinDirections } from '@mappedin/mappedin-js/get-venue';
-    import { Journey } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Journey';
+    import { JourneyController } from '@mappedin/mappedin-js/renderer/private/controllers/JourneyController';
+    import { Path } from '@mappedin/mappedin-js/renderer/private/controllers/PathsController';
     import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
-    import { Path } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths';
-    class JourneyLayer {
+    class Journey {
             #private;
             /**
                 * @private
                 */
-            constructor(mapView: MapView, core: ICore);
+            constructor(core: ICore);
             /**
                 * Draw a Journey based on directions. Example usage:
                 *
@@ -2400,7 +2313,7 @@ declare module '@mappedin/mappedin-js/renderer/layers/Journey' {
                 *
                 * Use options to set connection (such as elevators and escalators) HTML tooltip template, departure and destination marker templates, path style and polygon higlight color. If no options are set, sane defaults are used to draw markers, tooltips and polygon highlights.
                 */
-            draw(directions: MappedinDirections | MappedinDirections[], options?: TJourneyOptions): Journey;
+            draw(directions: MappedinDirections | MappedinDirections[], options?: TJourneyOptions): JourneyController;
             /**
                 * Set the step of a multipart Journey
                 */
@@ -2414,17 +2327,18 @@ declare module '@mappedin/mappedin-js/renderer/layers/Journey' {
                 */
             clear(): void;
     }
-    export default JourneyLayer;
+    export default Journey;
 }
 
 declare module '@mappedin/mappedin-js/renderer' {
     import { MapView } from '@mappedin/mappedin-js/renderer/public/MapView';
-    import { getVenue, getVenueBundle, Mappedin, downloadBundle, getVenueBundleURL, downloadVenueBundleMVF, MappedinDestinationSet, MappedinMap, TGetVenueBundleOptions, TGetVenueOptions } from '@mappedin/mappedin-js/get-venue';
+    import { getVenue, getVenueMVF, getVenueBundle, Mappedin, downloadBundle, getVenueBundleURL, downloadVenueBundleMVF, MappedinDestinationSet, MappedinMap, TGetVenueBundleOptions, TGetVenueOptions } from '@mappedin/mappedin-js/get-venue';
     import { PositionUpdater } from '@mappedin/mappedin-js/renderer/internal/Mappedin.BlueDot/Mappedin.BlueDot.core';
     import type { TMapViewOptions } from '@mappedin/mappedin-js/renderer/MapView.types';
     import { MARKER_ANCHOR } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Marker';
-    export type { Marker } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Markers';
-    export type { Path } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths';
+    export { E_SDK_LOG_LEVEL, setLoggerLevel } from '@mappedin/mappedin-js/--/common/Mappedin.Logger';
+    export type { Marker } from '@mappedin/mappedin-js/renderer/private/controllers/MarkersController';
+    export type { Path } from '@mappedin/mappedin-js/renderer/private/controllers/PathsController';
     export { BEARING_TYPE, ACTION_TYPE } from '@mappedin/mappedin-js/navigator';
     export type { IDirectionsResult, E_MESSAGES as E_GET_DIRECTIONS_MESSAGES } from '@mappedin/mappedin-js/navigator';
     export type { IFlatLabels, FlatLabels } from '@mappedin/mappedin-js/renderer/public/api/FlatLabels';
@@ -2453,9 +2367,9 @@ declare module '@mappedin/mappedin-js/renderer' {
         */
     function showVenue<T extends Mappedin>(el: HTMLElement, venue: T, options?: TMapViewOptions): Promise<MapView>;
     export { COLLISION_RANKING_TIERS, STATE, E_SDK_EVENT, E_BLUEDOT_STATE_REASON, E_BLUEDOT_MARKER_STATE, E_BLUEDOT_EVENT, E_BLUEDOT_STATE, E_CAMERA_EVENT, E_CAMERA_DIRECTION, SAFE_AREA_INSET_TYPE, ANIMATION_TWEENS, CAMERA_EASING_MODE, } from '@mappedin/mappedin-js/renderer/MapView.enums';
-    export { getVenue, getVenueBundle, showVenue, downloadBundle, getVenueBundleURL, downloadVenueBundleMVF, PositionUpdater, MappedinDestinationSet, MARKER_ANCHOR, };
+    export { getVenue, getVenueMVF, getVenueBundle, showVenue, downloadBundle, getVenueBundleURL, downloadVenueBundleMVF, PositionUpdater, MappedinDestinationSet, MARKER_ANCHOR, };
     import DefaultAssetManager from '@mappedin/mappedin-js/renderer/internal/Mappedin.AssetManager';
-    import { TTileManagerOptions } from '@mappedin/mappedin-js/renderer/layers/Outdoor-Context/Mappedin.TileManager';
+    import { TTileManagerOptions } from '@mappedin/mappedin-js/renderer/internal/outdoor-context/Mappedin.TileManager';
     /**
         * @internal
         */
@@ -2473,7 +2387,7 @@ declare module '@mappedin/mappedin-js/renderer' {
     export type { TMappedinInitializeOptions };
     export * from '@mappedin/mappedin-js/renderer/MapView.types';
     export type { MapView } from '@mappedin/mappedin-js/renderer/public/MapView';
-    export type { TSafeAreaInsets, TCameraTargets, TFocusOnCameraOptions, TCameraTransform, TCameraAnimationOptions, default as Camera, } from '@mappedin/mappedin-js/renderer/Camera';
+    export type { TSafeAreaInsets, TCameraTargets, TFocusOnCameraOptions, TCameraTransform, TCameraAnimationOptions, default as CameraController, } from '@mappedin/mappedin-js/renderer/private/controllers/CameraController';
     export type { TGetVenueOptions, TShowVenueOptions, TMappedinOfflineSearchOptions, TMappedinOfflineSearchResult, TMappedinOfflineSearchSuggestions, TMappedinOfflineAllSearchMatch, TMappedinOfflineSearchAllOptions, } from '@mappedin/mappedin-js/get-venue';
     export { Mappedin, MappedinDirections, MappedinLocation, MappedinPolygon, MappedinNode, MappedinCategory, MappedinMap, MappedinEvent, MappedinMapGroup, MappedinVenue, MappedinVortex, MappedinNavigatable, MappedinCoordinate, OfflineSearch, MAP_RENDER_MODE, setFetchFn, MappedinCollectionType, } from '@mappedin/mappedin-js/get-venue';
     /**
@@ -2497,20 +2411,20 @@ declare module '@mappedin/mappedin-js/renderer' {
     /**
         * @internal
         */
-    OpenStreetMapOutdoorContext, } from './layers/Outdoor-Context/Outdoor-Context.provider';
+    OpenStreetMapOutdoorContext, } from './internal/outdoor-context/Outdoor-Context.provider';
     export type { 
     /**
         * @internal
         */
-    IOutdoorContextProvider, } from './layers/Outdoor-Context/Outdoor-Context.provider';
+    IOutdoorContextProvider, } from './internal/outdoor-context/Outdoor-Context.provider';
 }
 
-declare module '@mappedin/mappedin-js/renderer/layers/Markers' {
+declare module '@mappedin/mappedin-js/renderer/public/api/Markers' {
     import { TAnimationOptions } from '@mappedin/mappedin-js/renderer';
     import { MappedinCoordinate, MappedinNode } from '@mappedin/mappedin-js/get-venue';
     import { TCreateMarkerOptions } from '@mappedin/mappedin-js/renderer/index.rn';
-    import MarkersController, { Marker } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Markers';
-    export class MarkersLayer {
+    import MarkersController, { Marker } from '@mappedin/mappedin-js/renderer/private/controllers/MarkersController';
+    export class Markers {
             #private;
             constructor(markersController: MarkersController);
             get markers(): Marker[];
@@ -2547,14 +2461,14 @@ declare module '@mappedin/mappedin-js/renderer/layers/Markers' {
     }
 }
 
-declare module '@mappedin/mappedin-js/renderer/layers/Paths' {
+declare module '@mappedin/mappedin-js/renderer/public/api/Paths' {
     import { MappedinNode } from '@mappedin/mappedin-js/get-venue';
     import { TPathOptions } from '@mappedin/mappedin-js/renderer/index.rn';
-    import PathsController, { Path } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths';
+    import PathsController, { Path } from '@mappedin/mappedin-js/renderer/private/controllers/PathsController';
     /**
         * Add and remove paths from maps.
         */
-    export class PathsLayer {
+    export class Paths {
             #private;
             constructor(pathsController: PathsController);
             /**
@@ -2571,7 +2485,7 @@ declare module '@mappedin/mappedin-js/renderer/layers/Paths' {
             /**
                 * Remove a path from all maps it exists on.
                 *
-                * @param path A {@link Path} instance returned from {@link PathsLayer.add}.
+                * @param path A {@link Path} instance returned from {@link Paths.add}.
                 */
             remove(path: Path): void;
             /**
@@ -2581,6 +2495,135 @@ declare module '@mappedin/mappedin-js/renderer/layers/Paths' {
     }
 }
 
+declare module '@mappedin/mappedin-js/renderer/public/api/BlueDot' {
+    import { BlueDotController, TEnableBlueDotOptions } from '@mappedin/mappedin-js/renderer/MapView.types';
+    export class BlueDot {
+            #private;
+            constructor(controller: BlueDotController);
+            on: BlueDotController['on'];
+            off: BlueDotController['off'];
+            /**
+                * Enables Blue Dot. BlueDot then emits {@link TBlueDotStateChange} and {@link TBlueDotPositionUpdate} events via {@link E_BLUEDOT_EVENT}
+                */
+            enable(options?: TEnableBlueDotOptions): void;
+            /**
+                * Disables Blue Dot and stops emitting events.
+                */
+            disable(): void;
+    }
+}
+
+declare module '@mappedin/mappedin-js/renderer/public/api/Camera' {
+    import { E_CAMERA_DIRECTION } from '@mappedin/mappedin-js/renderer/MapView.enums';
+    import CameraController, { TCameraAnimationOptions, TCameraTargets, TCameraTransform, TFocusOnCameraOptions } from '@mappedin/mappedin-js/renderer/private/controllers/CameraController';
+    export class Camera {
+            #private;
+            constructor(controller: CameraController);
+            on: CameraController['on'];
+            off: CameraController['off'];
+            /**
+                * The current camera animation, if any. Resolves when the animation finishes.
+                */
+            get currentAnimation(): Promise<undefined> | undefined;
+            /**
+                * Current Camera zoom (in meters)
+                */
+            get zoom(): number;
+            /**
+                * Current Camera rotation (in radians) from north
+                */
+            get rotation(): number;
+            /**
+                * Current camera tilt angle (in radians), relative to a top-down view.
+                *
+                * ex: 0 means the camera is facing top-down, π/2 means the camera is
+                * facing directly from the side.
+                */
+            get tilt(): number;
+            /**
+                * Get the minimum distance (in meters) the camera is allowed to get to the ground.
+                */
+            get minZoom(): number;
+            /**
+                * Set the minimum distance (in meters) the camera is allowed to get to the ground.
+                */
+            set minZoom(meters: number);
+            /**
+                * Get the maximum distance (in meters) the camera is allowed to get from the ground.
+                */
+            get maxZoom(): number;
+            /**
+                * Set the maximum distance (in meters) the camera is allowed to get from the ground.
+                */
+            set maxZoom(meters: number);
+            /**
+                * Get the current maximum tilt angle (in radians) the camera is allowed to use.
+                */
+            get maxTilt(): number;
+            /**
+                * Sets the maximum tilt angle (in radians) the camera is allowed to use.
+                *
+                * Tilt angle must be between 0 and π/2 radians. It will be clamped within
+                * this range if it exceeds it on either end.
+                *
+                * As tilt angle approaches π/2 radians, this will impact overall touch controls
+                * and should be used sparingly.
+                */
+            set maxTilt(radians: number);
+            /**
+                * Get the current camera position, which is at the center of the map.
+                * @returns the position as a coordinate
+                */
+            get position(): import("../..").MappedinCoordinate;
+            /**
+                * User camera interactions
+                */
+            interactions: {
+                    /**
+                        * Enable all user interactions. This does not affect programmatic
+                        * Camera controls, such as `set` and `focusOn`
+                        */
+                    enable: () => void;
+                    /**
+                        * Disable all user interactions. This does not affect programmatic
+                        * Camera controls, such as `set` and `focusOn`
+                        */
+                    disable: () => void;
+            };
+            setSafeAreaInsets(insets: {
+                    top: number;
+                    left: number;
+                    bottom: number;
+                    right: number;
+            }): void;
+            getSafeAreaInsets(): import("../..").TPadding;
+            /**
+                * Focus the Camera view on a collection of targets and animate to that state.
+                * @returns a Promise that resolves when the animation finishes, or rejects when it is cancelled.
+                */
+            focusOn(targets: TCameraTargets, options?: TFocusOnCameraOptions & TCameraAnimationOptions): Promise<any>;
+            /**
+                * Set the Camera's view to a new state.
+                */
+            set(transform: TCameraTransform): void;
+            /**
+                * Animate the Camera's view to smoothly transition to a new state over time.
+                *
+                * @returns a Promise that resolves when the animation finishes, or rejects when it is cancelled.
+                */
+            animate(transform: TCameraTransform, options?: TCameraAnimationOptions): Promise<undefined>;
+            /**
+                * Moves the Camera view in a relative direction by a given distance in meters.
+                * @returns a Promise that resolves when the translation animation finishes, or rejects when it is cancelled.
+                */
+            translate(direction: E_CAMERA_DIRECTION, distance: number, options?: TCameraAnimationOptions): Promise<unknown>;
+            /**
+                * Cancel the currently active Camera animation.
+                */
+            cancelAnimation(): void;
+    }
+}
+
 declare module '@mappedin/mappedin-js/get-venue/Mappedin.types' {
     export type TGetVenueOptions = {
             accessToken?: string;
@@ -4319,7 +4362,7 @@ declare module '@mappedin/mappedin-js/renderer/internal/pub-sub' {
 }
 
 declare module '@mappedin/mappedin-js/renderer/private/Core.interface' {
-    import { TPadding } from '@mappedin/mappedin-js/renderer';
+    import { BlueDotController, CameraController, STATE, TPadding } from '@mappedin/mappedin-js/renderer';
     import { MappedinMap, Mappedin, MappedinCoordinate, MappedinPolygon, MappedinNode } from '@mappedin/mappedin-js/get-venue';
     import { Vector2, Vector3, Mesh } from 'three';
     import { changeListenerFn, TGetPolygonsAtCoordinateOptions, TMapViewOptions } from '@mappedin/mappedin-js/renderer/MapView.types';
@@ -4331,9 +4374,17 @@ declare module '@mappedin/mappedin-js/renderer/private/Core.interface' {
     import { PubSub } from '@mappedin/mappedin-js/renderer/internal/pub-sub.typed';
     import { FlatLabel } from '@mappedin/mappedin-js/renderer/internal/Mappedin.LabelAtlas';
     import MapObject from '@mappedin/mappedin-js/renderer/internal/Mappedin.MapObject';
-    import PathsController from '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths';
+    import PathsController from '@mappedin/mappedin-js/renderer/private/controllers/PathsController';
     import FloatingLabelsController from '@mappedin/mappedin-js/renderer/private/controllers/FloatingLabelsController';
     import FlatLabelsController from '@mappedin/mappedin-js/renderer/private/controllers/FlatLabelsController';
+    import PolygonColorsController from '@mappedin/mappedin-js/renderer/private/controllers/PolygonColorsController';
+    import MarkersController from '@mappedin/mappedin-js/renderer/private/controllers/MarkersController';
+    import PolygonInteractionController from '@mappedin/mappedin-js/renderer/private/controllers/PolygonInteractionController';
+    import TooltipsController from '@mappedin/mappedin-js/renderer/private/controllers/TooltipsController';
+    import PolygonStatesController from '@mappedin/mappedin-js/renderer/private/controllers/PolygonStatesController';
+    import PolygonImagesController from '@mappedin/mappedin-js/renderer/private/controllers/PolygonImagesController';
+    import ThreeDMarkersController from '@mappedin/mappedin-js/renderer/private/controllers/ThreeDMarkersController';
+    import EventSystem from '@mappedin/mappedin-js/renderer/private/controllers/EventSystem';
     export type TFocusOptionsLegacy = {
             /**
                 * An array of Nodes to focus in on
@@ -4389,9 +4440,25 @@ declare module '@mappedin/mappedin-js/renderer/private/Core.interface' {
             /**
                 * Controllers
                 */
+            eventSystem: EventSystem;
             floatingLabels: FloatingLabelsController;
             flatLabels: FlatLabelsController;
             paths: PathsController;
+            polygonColors: PolygonColorsController;
+            polygonInteraction: PolygonInteractionController;
+            polygonStates: PolygonStatesController;
+            polygonImages: PolygonImagesController;
+            markers: MarkersController;
+            tooltips: TooltipsController;
+            threeDMarkers: ThreeDMarkersController;
+            blueDot: BlueDotController;
+            camera: CameraController;
+            state: STATE;
+            options: TMapViewOptions & {
+                    onDataLoaded?: (data: Mappedin) => void;
+                    onFirstMapLoaded?: (data: Mappedin) => void;
+            };
+            currentPath?: MappedinNode[];
             referenceMap: MappedinMap;
             taskScheduler: TaskScheduler;
             sceneManager: SceneManager | undefined;
@@ -4492,7 +4559,7 @@ declare module '@mappedin/mappedin-js/renderer/private/Core.interface' {
                 * @param hoverableMeshChildren
                 * @param options {@link TGetPolygonsAtCoordinateOptions}
                 */
-            getPolygonsAtScreenCoordinate(coordinate: Vector2, hoverableMeshChildren: any[], options?: TGetPolygonsAtCoordinateOptions): MappedinPolygon[];
+            getPolygonsAtScreenCoordinate(x: number, y: number, options?: TGetPolygonsAtCoordinateOptions): MappedinPolygon[];
             /**
                 * Returns all polygons at the specified screen coordinate.
                 *
@@ -4500,7 +4567,7 @@ declare module '@mappedin/mappedin-js/renderer/private/Core.interface' {
                 * @param hoverableMeshChildren
                 * @param options {@link TGetPolygonsAtCoordinateOptions}
                 */
-            getPolygonsAtCoordinate(coordinate: MappedinCoordinate, hoverableMeshChildren: any[], options?: TGetPolygonsAtCoordinateOptions): MappedinPolygon[];
+            getPolygonsAtCoordinate(coordinate: MappedinCoordinate, options?: TGetPolygonsAtCoordinateOptions): MappedinPolygon[];
             currentInteractionEvent: INTERNAL_EVENT | undefined;
             interactivePolygons: Record<string, boolean>;
             highlightedPolygons: Record<string, string>;
@@ -4549,6 +4616,8 @@ declare module '@mappedin/mappedin-js/renderer/private/Core.interface' {
             focusOn(focusOptions: TFocusOptionsLegacy): Tween;
             canvasWidth: number;
             canvasHeight: number;
+            setState(state: STATE): Promise<void>;
+            getNearestNodeByScreenCoordinate(x: number, y: number, mapOrMapId?: MappedinMap | MappedinMap['id']): MappedinNode;
             destroy(): void;
     }
 }
@@ -4561,7 +4630,6 @@ declare module '@mappedin/mappedin-js/renderer/internal/blue-dot-manager' {
     /**
         * @private
         * An interface for showing a position (typically the user's position) on a 3D map.
-        * Constructed automatically by {{#crossLink "MapView3D"}}{{/crossLink}}.
         *
         * @class BlueDotManager
         */
@@ -4570,8 +4638,7 @@ declare module '@mappedin/mappedin-js/renderer/internal/blue-dot-manager' {
                 * @param [options.minRadius] The ring around the blue dot will only be drawn if `options.radius` is greater than or equal to this value, in metres. Must be >= 0.
                 * @param [options.radiusUpdateInterval] The width of radius update steps, in metres. For example, if interval is 3 and assume `minRadius` is 8, then the radius will be updated on 8, 11, 14, 17, etc. Must be >= 0.
                 */
-            constructor({ mapView, threeDMarkerLayer, core, minRadius, maxRadius, radiusUpdateInterval, radiusTweenOptions, }?: {
-                    mapView: any;
+            constructor({ threeDMarkerLayer, core, minRadius, maxRadius, radiusUpdateInterval, radiusTweenOptions, }?: {
                     threeDMarkerLayer: any;
                     core: any;
                     minRadius?: number | undefined;
@@ -4582,7 +4649,6 @@ declare module '@mappedin/mappedin-js/renderer/internal/blue-dot-manager' {
                             easing: any;
                     } | undefined;
             });
-            mapView: any;
             threeDMarkerLayer: any;
             core: any;
             minRadius: number;
@@ -4841,7 +4907,7 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.FloatingLabel'
             enable(updateEngine?: boolean): void;
             get totalTextBoxHeight(): number;
             get totalTextBoxWidth(): number;
-            get totalMarkerSize(): number;
+            get totalMarkerSize(): any;
             get strategies(): TColliderStrategy[];
             getCachedSymbol(orientation: any, textAlign: any, xCoordinate: any): any;
             invalidate(): void;
@@ -4861,6 +4927,32 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.FloatingLabel'
     export default FloatingLabel;
 }
 
+declare module '@mappedin/mappedin-js/renderer/private/controllers/BlueDotController' {
+    import { E_BLUEDOT_EVENT_PAYLOAD, E_BLUEDOT_EVENT } from '@mappedin/mappedin-js/renderer';
+    import { IBlueDotCore } from '@mappedin/mappedin-js/renderer/internal/Mappedin.BlueDot/Mappedin.BlueDot.core';
+    import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
+    import { TEnableBlueDotOptions } from '@mappedin/mappedin-js/renderer/MapView.types';
+    import { PubSub } from '@mappedin/mappedin-js/renderer/internal/pub-sub.typed';
+    /**
+        * @hidden
+        * @internal
+        *
+        * Blue Dot Layer used for controlling the Blue Dot and listening to Blue Dot state change and position update events. Use the {@link on}-method to set listeners for {@link TBlueDotStateChange} and {@link TBlueDotPositionUpdate} events.
+        */
+    class BlueDotController extends PubSub<E_BLUEDOT_EVENT_PAYLOAD, E_BLUEDOT_EVENT> {
+            #private;
+            core: ICore;
+            blueDotCore: IBlueDotCore;
+            /**
+                * @private
+                */
+            constructor(core: ICore);
+            enable(options?: TEnableBlueDotOptions): void;
+            disable(): void;
+    }
+    export default BlueDotController;
+}
+
 declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.HTMLCollider' {
     import BaseCollider, { ICollider } from '@mappedin/mappedin-js/renderer/internal/Mappedin.SmartCollider';
     export type TRange = [number, number, number, number];
@@ -5225,18 +5317,18 @@ declare module '@mappedin/mappedin-js/renderer/index.rn' {
     export type { IDirectionsResult, E_MESSAGES as E_GET_DIRECTIONS_MESSAGES } from '@mappedin/mappedin-js/navigator';
     export type { TGetVenueBundleOptions, TGetVenueOptions, TMappedinDirective, TShowVenueOptions, TMappedinOfflineSearchOptions, TMappedinOfflineSearchResult, TMappedinOfflineSearchSuggestions, TMappedinOfflineSearchAllOptions, TMappedinOfflineAllSearchMatch, } from '@mappedin/mappedin-js/get-venue';
     export { MappedinLocation, MappedinPolygon, MappedinNode, MappedinCategory, MappedinMap, MappedinEvent, MappedinMapGroup, MappedinVenue, MappedinVortex, MappedinDirections, MappedinNavigatable, MappedinCoordinate, MappedinRankings, OfflineSearch, MappedinCollectionType, } from '@mappedin/mappedin-js/get-venue';
-    export type { TSafeAreaInsets, TCameraTargets, TFocusOnCameraOptions, TCameraTransform, TCameraAnimationOptions, } from '@mappedin/mappedin-js/renderer/Camera';
+    export type { TSafeAreaInsets, TCameraTargets, TFocusOnCameraOptions, TCameraTransform, TCameraAnimationOptions, } from '@mappedin/mappedin-js/renderer/private/controllers/CameraController';
 }
 
 declare module '@mappedin/mappedin-js/renderer/internal/object3D.destroy' {
     export default Object3D;
 }
 
-declare module '@mappedin/mappedin-js/renderer/layers/Outdoor-Context/Mappedin.Tile' {
+declare module '@mappedin/mappedin-js/renderer/internal/outdoor-context/Mappedin.Tile' {
     import { Texture, Mesh, MeshBasicMaterial } from 'three';
     import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
     import { MappedinCoordinate, MappedinMap } from '@mappedin/mappedin-js/renderer/index.rn';
-    import { TileManager } from '@mappedin/mappedin-js/renderer/layers/Outdoor-Context/Mappedin.TileManager';
+    import { TileManager } from '@mappedin/mappedin-js/renderer/internal/outdoor-context/Mappedin.TileManager';
     export class Tile {
         #private;
         center: MappedinCoordinate;
@@ -5264,7 +5356,7 @@ declare module '@mappedin/mappedin-js/renderer/layers/Outdoor-Context/Mappedin.T
     }
 }
 
-declare module '@mappedin/mappedin-js/renderer/layers/Outdoor-Context/Outdoor-Context.provider' {
+declare module '@mappedin/mappedin-js/renderer/internal/outdoor-context/Outdoor-Context.provider' {
     /**
         * @experimental
         * The universal outdoor context interface
@@ -5334,93 +5426,13 @@ declare module '@mappedin/mappedin-js/renderer/layers/Outdoor-Context/Outdoor-Co
     }
 }
 
-declare module '@mappedin/mappedin-js/renderer/layers/EventSystem' {
-    import { Object3D, Color } from 'three';
-    import { MapView } from '@mappedin/mappedin-js/renderer';
-    import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
-    import BlueDotManager from '@mappedin/mappedin-js/renderer/internal/blue-dot-manager';
-    import { Path } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths';
-    class EventSystemLayer {
-        mapView: MapView;
-        core: ICore;
-        blueDotManager?: BlueDotManager;
-        rendererDomElement: any;
-        currentHover: string | null;
-        hoverLabel: any;
-        hoverColor: Color;
-        options: {
-            disableHover: boolean;
-        };
-        blueDot?: Object3D;
-        constructor(mapView: MapView, core: ICore);
-        setBlueDotManager: (blueDotManager: any) => void;
-        touchCount: number;
-        zoomOut(): void;
-        zoomIn(event: any): void;
-        onPointerMove: (event: any) => void;
-        onPointerUp: (event: any) => void;
-        /**
-          * We've confirmed that a map click has occured, so handle that here
-          */
-        handleMapClick(event: any): void;
-        onPointerDown: (event: any) => void;
-        incrementTouches: (event: any) => void;
-        decrementTouches: (event: any) => void;
-        clearMouse: () => void;
-        getMousePos: (event: any) => {
-            x: number;
-            y: number;
-        };
-        getScaledMousePos: (event: any) => {
-            x: number;
-            y: number;
-        };
-        cursorPos: {
-            x: number;
-            y: number;
-        };
-        mouse: {
-            x: number;
-            y: number;
-        };
-        mouseDownStart: {
-            time: number;
-            clientX: number;
-            clientY: number;
-        };
-        scaledCursorPos: {
-            x: number;
-            y: number;
-        };
-        hasTouched: boolean;
-        calculateMouseCoordinates: (event: any) => void;
-        getMouseRayIntersects: (objects: Object3D | Object3D[]) => any;
-        detectCollidersUnderMouse: () => any;
-        detectPolygonsUnderMouse: () => string[];
-        detectPathsUnderMouse: () => Path[];
-        detectMapsUnderMouse: () => any;
-        getMouseMapPosition: () => {
-            x: number;
-            y: number;
-        };
-        checkMouseIntersectsBlueDot: () => boolean;
-        doHoverEffect: () => void;
-        onPolygonHoverOut: (polygonId: any) => false | undefined;
-        onPolygonHoverOver: (polygon: any) => false | undefined;
-        setHoverColor: (color: string) => void;
-        destroy(): void;
-    }
-    export default EventSystemLayer;
-}
-
-declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.Journey' {
+declare module '@mappedin/mappedin-js/renderer/private/controllers/JourneyController' {
     import type Directive from '@mappedin/mappedin-js/navigator/Directive';
     import type INode from '@mappedin/mappedin-js/navigator/interfaces/INode';
     import { TJourneyOptions } from '@mappedin/mappedin-js/renderer/MapView.types';
     import { MappedinDirections } from '@mappedin/mappedin-js/get-venue';
-    import { MapView } from '@mappedin/mappedin-js/renderer';
     import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
-    import { Path } from '@mappedin/mappedin-js/renderer/internal/Mappedin.Paths';
+    import { Path } from '@mappedin/mappedin-js/renderer/private/controllers/PathsController';
     export type TMappedinDirections = {
         distance: number;
         path: INode[];
@@ -5434,244 +5446,40 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.Journey' {
       *
       * @internal
       */
-    export class Journey {
+    export class JourneyController {
         #private;
         distance: number;
         accessible: boolean;
+        core: ICore;
         get isMultiFloor(): boolean;
         get mapIdsInvolvedInJourney(): string[];
-        constructor(directions: MappedinDirections | MappedinDirections[], options: TJourneyOptions | undefined, mapView: MapView, core: ICore);
+        constructor(directions: MappedinDirections | MappedinDirections[], options: TJourneyOptions | undefined, core: ICore);
         setStep: (step: any) => void;
         setStepByPath: (path: Path) => void;
-        static instance: Journey | null;
-        static create(directions: MappedinDirections | MappedinDirections[], options: any, mapView: MapView, core: ICore): Journey;
+        static instance: JourneyController | null;
+        static create(directions: MappedinDirections | MappedinDirections[], options: any, core: ICore): JourneyController;
         destroy(): void;
     }
 }
 
 declare module '@mappedin/mappedin-js/get-venue/Mappedin.MVF.types' {
-    import { FeatureCollection, Polygon, Point, MultiPolygon, Position } from 'geojson';
-    type ManifestFile = {
-            type: 'file';
-            name: string;
-    };
-    type ManifestFolder = {
-            type: 'folder';
-            name: string;
-            children: ManifestFile[];
-    };
-    type OpeningHours = {
-            opens: string;
-            closes: string;
-            dayOfWeek: string;
-            validFrom?: string;
-            validThrough?: string;
-    };
-    type Image = {
-            original?: string;
-            xlarge?: string;
-            xxlarge?: string;
-            medium?: string;
-            '140x140'?: string;
-            xsmall?: string;
-            xxsmall?: string;
-            '66x66'?: string;
-            small?: string;
-            large?: string;
-    };
-    type PolygonImage = string;
-    type Phone = {
-            number: string;
-            extension?: string;
-    };
-    type Link = {
-            label: string;
-            url: string;
-    };
-    type Social = {
-            facebook?: string;
-            twitter?: string;
-            instagram?: string;
-            website?: string;
-    };
-    type LocationState = {
-            type: string;
-            start?: string;
-            end?: string;
-    };
-    type SiblingGroup = {
-            label: string;
-            siblings: string[];
-    };
-    export type MILocationProperties = {
-            id: string;
-            address?: string | null;
-            categories: string[];
-            description?: string | null;
-            email?: string | null;
-            externalId?: string | null;
-            hours?: OpeningHours[] | null;
-            links?: Link[] | null;
-            logo?: Image | null;
-            name: string;
-            phone?: Phone | null;
-            picture?: Image | null;
-            services?: string | null;
-            siblingGroups?: SiblingGroup[] | null;
-            social?: Social | null;
-            spaces?: TLocationSpaceReference[] | null;
-            states?: LocationState[] | null;
-            type: string;
-    };
-    export type MICategoryProperties = {
-            id: string;
-            name: string;
-            picture?: Image;
-    };
-    export type MIBuildingProperties = {
-            id: string;
-            name: string;
-            venue: string;
-    };
-    export type MILevelProperties = {
-            id: string;
-            abbreviation?: string;
-            building?: string;
-            elevation?: number;
-            name: string;
-    };
-    export type MIPolygonlikeProperties = {
-            id: string;
-            altitude?: string;
-            color?: string;
-            externalId?: string | null;
-            height?: string;
-            layer?: string;
-            level: string;
-            parent?: string | null;
-    };
-    type TPseudoNodeSpaceReference = {
-            node: string;
-            map: string;
-    };
-    export type TRealSpaceReference = {
-            id: string;
-            map: string;
-    };
-    type TLocationSpaceReference = TPseudoNodeSpaceReference | TRealSpaceReference;
-    export type TEntrances = {
-            id: string;
-            level: string;
-    };
-    export type MISpaceProperties = MIPolygonlikeProperties & {
-            entrances: TEntrances[];
-    };
-    export type MIObstructionProperties = MIPolygonlikeProperties;
-    export type MIConnectionProperties = {
-            id: string;
-            accessible: boolean;
-            destinations: string[];
-            level: string;
-            multiplier: number;
-            name: string;
-            type: string;
-            weight: number;
-    };
-    export type MINodeProperties = {
-            id: string;
-            accessible: boolean;
-            externalId: string | null;
-            level: string;
-            multiplier: number;
-            neighbors: string[];
-            weight: number;
-    };
-    export type MIManifestProperties = {
-            name: string;
-            folder_struct: (ManifestFolder | ManifestFile)[];
-            version: string;
-            time: string;
-    };
-    export type MIStyle = {
-            id: string;
-            /** The altitude of the bottom of the geometry, in metres. */
-            altitude: number;
-            color: string;
-            height: number;
-            image?: PolygonImage;
-            opacity: number;
-    };
-    export type MIImageInstance = {
-            /** The local path or URL of the image. */
-            path: string;
-            /** The position of the centre of the image, in [long, lat] form. */
-            position: Position;
-            /** The altitude of the image, in metres. */
-            altitude: number;
-            /** Euler angles representing the rotation of the image, in degrees. Angles are in XYZ order. */
-            rotation: {
-                    x: number;
-                    y: number;
-                    z: number;
-            };
-            /** The size of the image, in metres. */
-            size: {
-                    x: number;
-                    y: number;
-            };
-            /** The portion of the image to display. */
-            viewBox: {
-                    top: number;
-                    left: number;
-                    width: number;
-                    height: number;
-            };
-            /**
-                * A space or obstruction to associate this image with. If provided,
-                * changes to the polygon's visibility will affect this image.
-                * */
-            polygonId?: string;
-    };
-    export type MIGeoJSONManifestCollection = FeatureCollection<Point, MIManifestProperties>;
-    export type MIGeoJSONBuildingCollection = FeatureCollection<Polygon, MIBuildingProperties>;
-    export type MIGeoJSONConnectionCollection = FeatureCollection<Point, MIConnectionProperties>;
-    export type MIGeoJSONLevelCollection = FeatureCollection<Polygon | MultiPolygon, MILevelProperties>;
-    export type MIGeoJSONSpaceCollection = FeatureCollection<Polygon, MISpaceProperties>;
-    export type MIGeoJSONObstructionCollection = FeatureCollection<Polygon, MIObstructionProperties>;
-    export type MIGeoJSONNodeCollection = FeatureCollection<Point, MINodeProperties>;
-    export type MIGeoJSONLocationCollection = FeatureCollection<null, MILocationProperties>;
-    export type MIGeoJSONCategoryCollection = FeatureCollection<null, MICategoryProperties>;
+    import { ManifestCollection, NodeCollection, ObstructionCollection, SpaceCollection, Connections, Maps, EntranceCollection, MapStacks, StyleCollection } from '@mappedin/mvf';
     export type WithIDs<T> = Map<string, T>;
-    export type MIStyleCollection = MIStyle[];
-    /**
-        * A mapping of polygon IDs to style IDs;
-        */
-    export type MIPolygonStyle = {
-            [key in string]: string;
-    };
-    export type MIImageInstanceCollection = MIImageInstance[];
     /**
-        * The entire data collection for an MVF, in a single JSON collection.
-        *
-        */
-    export type MVFDataJSON = {
-            connection: WithIDs<MIGeoJSONConnectionCollection>;
-            level: WithIDs<MIGeoJSONLevelCollection>;
-            node: WithIDs<MIGeoJSONNodeCollection>;
-            obstruction: WithIDs<MIGeoJSONObstructionCollection>;
-            space: WithIDs<MIGeoJSONSpaceCollection>;
-            building: MIGeoJSONBuildingCollection;
-            category: MIGeoJSONCategoryCollection;
-            style: MIStyleCollection;
-            polygonStyle: WithIDs<MIPolygonStyle>;
-            imageInstance: WithIDs<MIImageInstanceCollection>;
-            location: MIGeoJSONLocationCollection;
-            manifest: MIGeoJSONManifestCollection;
-    };
-    export type MVFData = MVFDataJSON & {
-            imageBinaries: WithIDs<Uint8Array>;
+      * The entire data collection for an MVF, in a single JSON collection.
+      *
+      */
+    export type MVFData = {
+        obstruction: WithIDs<ObstructionCollection>;
+        space: WithIDs<SpaceCollection>;
+        node: WithIDs<NodeCollection>;
+        entrance: WithIDs<EntranceCollection>;
+        connection: Connections;
+        map: Maps;
+        mapstack: MapStacks;
+        manifest: ManifestCollection;
+        style: StyleCollection;
     };
-    export {};
 }
 
 declare module '@mappedin/mappedin-js/get-venue/MappedinLocationRankings' {
@@ -6266,7 +6074,7 @@ declare module '@mappedin/mappedin-js/get-venue/Mappedin.TaskScheduler' {
 
 declare module '@mappedin/mappedin-js/renderer/MapView.SceneManager' {
     import { MappedinMap } from '@mappedin/mappedin-js/get-venue';
-    import { TCameraTransform, TCameraAnimationOptions } from '@mappedin/mappedin-js/renderer/Camera';
+    import { TCameraTransform, TCameraAnimationOptions } from '@mappedin/mappedin-js/renderer/private/controllers/CameraController';
     import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
     import MapViewScene from '@mappedin/mappedin-js/renderer/MapView.Scene';
     export type TSceneTransitionOptions = {
@@ -6578,6 +6386,175 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.MapObject' {
     import { FrameTaskGroup } from "@mappedin/mappedin-js/get-venue/Mappedin.TaskScheduler";
 }
 
+declare module '@mappedin/mappedin-js/renderer/private/controllers/PolygonColorsController' {
+    import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
+    class PolygonColorsController {
+        #private;
+        constructor(core: ICore);
+        setPolygonColor(polygon: any, color: any): void;
+        clearPolygonColor(polygon: any): void;
+        clearAllPolygonColors(): void;
+    }
+    export default PolygonColorsController;
+}
+
+declare module '@mappedin/mappedin-js/renderer/private/controllers/PolygonInteractionController' {
+    import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
+    class PolygonInteractionController {
+        #private;
+        constructor(core: ICore);
+        addInteractivePolygon(polygon: any): void;
+        addInteractivePolygonsForAllLocations(options: any): void;
+        removeInteractivePolygon(polygon: any): void;
+        removeAllInteractivePolygons(): void;
+    }
+    export default PolygonInteractionController;
+}
+
+declare module '@mappedin/mappedin-js/renderer/private/controllers/TooltipsController' {
+    import { MappedinCoordinate, TCreateTooltipCommonOptions, TCreateTooltipOptions } from '@mappedin/mappedin-js/renderer';
+    import { MappedinNode } from '@mappedin/mappedin-js/get-venue';
+    import SmartTooltip from '@mappedin/mappedin-js/renderer/internal/Mappedin.SmartTooltip';
+    import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
+    class TooltipsController {
+            #private;
+            constructor(core: ICore);
+            createTooltip(nodeOrCoordinate: MappedinNode | MappedinCoordinate, 
+            /**
+                * Html that will be placed inside a wrapper with its own styling in the tooltip
+                */
+            contentHtml: string, options?: TCreateTooltipOptions): SmartTooltip;
+            createCustomTooltip(nodeOrCoordinate: MappedinNode | MappedinCoordinate, 
+            /**
+                * Html that will be displayed by the tooltip without any added styling
+                */
+            contentHtml: string, selector: string, options?: TCreateTooltipCommonOptions): SmartTooltip;
+            /**
+                * Removes a {@link Tooltip} you have added previously.
+                *
+                * @param tooltip {Tooltip} A Tooltip that has previously been returned from {@link IMapView3D.createTooltip}.
+                */
+            removeTooltip(tooltipOrTooltipId: SmartTooltip | SmartTooltip['id']): void;
+            removeAllTooltips(): void;
+    }
+    export default TooltipsController;
+}
+
+declare module '@mappedin/mappedin-js/renderer/private/controllers/PolygonStatesController' {
+    import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
+    class PolygonStatesController {
+        #private;
+        constructor(core: ICore);
+        updateClosedStateForPolygon(options: any): void;
+        openAllPolygons(): void;
+        destroy(): void;
+    }
+    export default PolygonStatesController;
+}
+
+declare module '@mappedin/mappedin-js/renderer/private/controllers/PolygonImagesController' {
+    import { MappedinPolygon } from '@mappedin/mappedin-js/renderer';
+    import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
+    class PolygonImagesController {
+        #private;
+        constructor(core: ICore);
+        enableImageFlippingForAllLocations(options: any): void;
+        enableImageFlippingForPolygon(polygon: MappedinPolygon): void;
+        disableImageFlippingForAllPolygons(): void;
+    }
+    export default PolygonImagesController;
+}
+
+declare module '@mappedin/mappedin-js/renderer/private/controllers/ThreeDMarkersController' {
+    import { TCreateThreeDMarkerOptions } from '@mappedin/mappedin-js/renderer';
+    import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
+    import { ThreeJSMarkerHandle } from '@mappedin/mappedin-js/renderer/internal/Mappedin.MapObject';
+    class ThreeDMarkersController {
+        #private;
+        constructor(core: ICore);
+        createThreeJSMarker(options: TCreateThreeDMarkerOptions): ThreeJSMarkerHandle;
+        removeThreeJSMarker(markerHandle: ThreeJSMarkerHandle): boolean;
+        removeAllThreeJSMarkers(): void;
+    }
+    export default ThreeDMarkersController;
+}
+
+declare module '@mappedin/mappedin-js/renderer/private/controllers/EventSystem' {
+    import { Object3D, Color } from 'three';
+    import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
+    import BlueDotManager from '@mappedin/mappedin-js/renderer/internal/blue-dot-manager';
+    import { Path } from '@mappedin/mappedin-js/renderer/private/controllers/PathsController';
+    class EventSystem {
+        core: ICore;
+        blueDotManager?: BlueDotManager;
+        rendererDomElement: any;
+        currentHover: string | null;
+        hoverLabel: any;
+        hoverColor: Color;
+        options: {
+            disableHover: boolean;
+        };
+        constructor(core: ICore);
+        setBlueDotManager: (blueDotManager: any) => void;
+        touchCount: number;
+        zoomOut(): void;
+        zoomIn(event: any): void;
+        onPointerMove: (event: any) => void;
+        onPointerUp: (event: any) => void;
+        /**
+          * We've confirmed that a map click has occured, so handle that here
+          */
+        handleMapClick(event: any): void;
+        onPointerDown: (event: any) => void;
+        incrementTouches: (event: any) => void;
+        decrementTouches: (event: any) => void;
+        clearMouse: () => void;
+        getMousePos: (event: any) => {
+            x: number;
+            y: number;
+        };
+        getScaledMousePos: (event: any) => {
+            x: number;
+            y: number;
+        };
+        cursorPos: {
+            x: number;
+            y: number;
+        };
+        mouse: {
+            x: number;
+            y: number;
+        };
+        mouseDownStart: {
+            time: number;
+            clientX: number;
+            clientY: number;
+        };
+        scaledCursorPos: {
+            x: number;
+            y: number;
+        };
+        hasTouched: boolean;
+        calculateMouseCoordinates: (event: any) => void;
+        getMouseRayIntersects: (objects: Object3D | Object3D[]) => any;
+        detectCollidersUnderMouse: () => any;
+        detectPolygonsUnderMouse: () => string[];
+        detectPathsUnderMouse: () => Path[];
+        detectMapsUnderMouse: () => any;
+        getMouseMapPosition: () => {
+            x: number;
+            y: number;
+        };
+        checkMouseIntersectsBlueDot: () => boolean;
+        doHoverEffect: () => void;
+        onPolygonHoverOut: (polygonId: any) => false | undefined;
+        onPolygonHoverOver: (polygon: any) => false | undefined;
+        setHoverColor: (color: string) => void;
+        destroy(): void;
+    }
+    export default EventSystem;
+}
+
 declare module '@mappedin/mappedin-js/renderer/internal/shave-text' {
     export type TDrawFn = (ctx: CanvasRenderingContext2D, x: number, y: number) => void;
     type TShave = (str: string, size: number, maxWidth: number, maxLines?: number, lineHeight?: number, options?: {
@@ -6595,7 +6572,7 @@ declare module '@mappedin/mappedin-js/renderer/internal/shave-text' {
 declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.SmartCollisionEngine' {
     import './Mappedin.SmartCollisionEngine.scss';
     import { ICollider, TRange, TColliderPosition } from '@mappedin/mappedin-js/renderer/internal/Mappedin.SmartCollider';
-    import { MappedinMap, MapView } from '@mappedin/mappedin-js/renderer';
+    import { MappedinMap } from '@mappedin/mappedin-js/renderer';
     import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
     import { Rectangle, QuadTree } from '@mappedin/mappedin-js/renderer/internal/quad-tree';
     export const COLLIDER_STRATEGY_LOW_PRIORITY = "LOW_PRIORITY";
@@ -6615,10 +6592,9 @@ declare module '@mappedin/mappedin-js/renderer/internal/Mappedin.SmartCollisionE
         offscreenRanges: TRange[];
         get sortedColliders(): ICollider[];
         initialized: boolean;
-        mapView: MapView;
         core: ICore;
         screen: Rectangle;
-        constructor(mapView: any, core: ICore);
+        constructor(core: ICore);
         beginUpdate(): void;
         init: (container: HTMLDivElement, projectFn: (position: TColliderPosition, mapId: MappedinMap['id']) => {
             x: number;
@@ -6760,6 +6736,13 @@ declare module '@mappedin/mappedin-js/renderer/MapView.Scene' {
     import { ICore } from '@mappedin/mappedin-js/renderer/private/Core.interface';
     import MapObject from '@mappedin/mappedin-js/renderer/internal/Mappedin.MapObject';
     import { TSceneTransitionOptions } from '@mappedin/mappedin-js/renderer/MapView.SceneManager';
+    export function getPanBoundsForObject(mapObject: MapObject, currentPanBounds: any): {
+        min: any;
+        max: any;
+        margin: any;
+        radius: any;
+        center: any;
+    };
     class MapViewScene {
         #private;
         maps: MappedinMap[];