Skip to content
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

feat: remove duplicate of OfflinePackStatus type #542

Merged
merged 3 commits into from
Dec 8, 2024
Merged

feat: remove duplicate of OfflinePackStatus type #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1f1fec
feat: remove duplicate OfflinePackStatus type
KiwiKilian Dec 8, 2024
0eab3f8
chore: replace type in example
KiwiKilian Dec 8, 2024
0ee00b2
Merge branch 'beta' into feat/remove-duplicate-offline-pack-status
KiwiKilian Dec 8, 2024
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
9 changes: 3 additions & 6 deletions packages/examples/src/examples/Map/CreateOfflineRegion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import geoViewport from "@mapbox/geo-viewport";
import MapLibreGL, {
OfflinePack,
type OfflinePackError,
type OfflineProgressStatus,
type OfflinePackStatus,
} from "@maplibre/maplibre-react-native";
import { useEffect, useState } from "react";
import {
Expand Down Expand Up @@ -69,7 +69,7 @@ function getRegionDownloadState(downloadState: OfflinePackDownloadState) {

export default function CreateOfflineRegion() {
const [offlineRegionStatus, setOfflineRegionStatus] =
useState<OfflineProgressStatus | null>(null);
useState<OfflinePackStatus | null>(null);
const [offlinePack, setOfflinePack] = useState<OfflinePack | null>(null);
const [isLoading, setIsLoading] = useState(true);

Expand All @@ -79,10 +79,7 @@ export default function CreateOfflineRegion() {
};
}, []);

function onDownloadProgress(
pack: OfflinePack,
status: OfflineProgressStatus,
) {
function onDownloadProgress(pack: OfflinePack, status: OfflinePackStatus) {
setOfflinePack(pack);
setOfflineRegionStatus(status);
}
Expand Down
5 changes: 1 addition & 4 deletions src/MapLibreRN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ export {
type Location,
} from "./modules/location/locationManager";
export { default as offlineManager } from "./modules/offline/offlineManager";
export type {
OfflineProgressStatus,
OfflinePackError,
} from "./modules/offline/offlineManager";
export type { OfflinePackError } from "./modules/offline/offlineManager";
export type { OfflinePackStatus } from "./modules/offline/OfflinePack";
export { default as OfflinePack } from "./modules/offline/OfflinePack";
export { default as OfflineCreatePackOptions } from "./modules/offline/OfflineCreatePackOptions";
Expand Down
2 changes: 1 addition & 1 deletion src/modules/offline/OfflinePack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export type OfflinePackStatus = {
percentage: number;
completedResourceCount: number;
completedResourceSize: number;
completedTileSize: number;
completedTileCount: number;
completedTileSize: number;
requiredResourceCount: number;
};

Expand Down
20 changes: 3 additions & 17 deletions src/modules/offline/offlineManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import OfflineCreatePackOptions, {
type OfflineCreatePackInputOptions,
} from "./OfflineCreatePackOptions";
import OfflinePack from "./OfflinePack";
import OfflinePack, { type OfflinePackStatus } from "./OfflinePack";
import { isUndefined, isFunction, isAndroid } from "../../utils";

const MapLibreRN = NativeModules.MLRNModule;
Expand All @@ -16,17 +16,6 @@ export const OfflineModuleEventEmitter = new NativeEventEmitter(
MLRNOfflineModule,
);

export type OfflineProgressStatus = {
name: string;
state: number;
percentage: number;
completedResourceSize: number;
completedTileCount: number;
completedResourceCount: number;
requiredResourceCount: number;
completedTileSize: number;
};

export type OfflinePackError = {
name: string;
message: string;
Expand All @@ -37,13 +26,10 @@ type ErrorEvent = {
};

type ProgressEvent = {
payload: OfflineProgressStatus;
payload: OfflinePackStatus;
};

type ProgressListener = (
pack: OfflinePack,
status: OfflineProgressStatus,
) => void;
type ProgressListener = (pack: OfflinePack, status: OfflinePackStatus) => void;
type ErrorListener = (pack: OfflinePack, err: OfflinePackError) => void;

/**
Expand Down
Loading