@maplat/ui 0.11.0 → 0.11.1

package/dist/maplat_control.d.ts

@@ -1,55 +1,55 @@
-import { Control, Rotate, Zoom as BaseZoom } from 'ol/control';
-import { MaplatUi } from './index';
-import { ControlOptions } from './types';
-export declare let control_settings: Record<string, string>;
-export declare function setControlSettings(options: Record<string, string>): void;
-export declare class SliderNew extends Control {
-    constructor(opt_options: ControlOptions);
-    setMap(map: import('ol').Map): void;
-    setEnable(cond: boolean): void;
-    setValue(res: number): void;
-}
-export declare class CustomControl extends Control {
-    center_: import('ol/coordinate').Coordinate | undefined;
-    zoom_: number | undefined;
-    callResetNorth_: unknown;
-    lastRotation_: number;
-    label_: HTMLElement;
-    ui: MaplatUi;
-    moveTo_: boolean;
-    constructor(optOptions: ControlOptions);
-}
-export declare class GoHome extends CustomControl {
-    constructor(optOptions: ControlOptions);
-}
-export declare class SetGPS extends CustomControl {
-    constructor(optOptions: ControlOptions);
-}
-export declare class CompassRotate extends Rotate {
-    center_?: import('ol/coordinate').Coordinate;
-    zoom_?: number;
-    customLabel_: HTMLElement;
-    lastRotation_: number;
-    constructor(optOptions: ControlOptions);
-}
-export declare class Share extends CustomControl {
-    constructor(optOptions: ControlOptions);
-}
-export declare class Border extends CustomControl {
-    constructor(optOptions: ControlOptions);
-}
-export declare class Maplat extends CustomControl {
-    constructor(optOptions: ControlOptions);
-}
-export declare class Copyright extends CustomControl {
-    constructor(optOptions: ControlOptions);
-}
-export declare class HideMarker extends CustomControl {
-    constructor(optOptions: ControlOptions);
-}
-export declare class MarkerList extends CustomControl {
-    constructor(optOptions: ControlOptions);
-}
-export declare class Zoom extends BaseZoom {
-    constructor(options?: ControlOptions);
-}
+import { Control, Rotate, Zoom as BaseZoom } from 'ol/control';
+import { MaplatUi } from './index';
+import { ControlOptions } from './types';
+export declare let control_settings: Record<string, string>;
+export declare function setControlSettings(options: Record<string, string>): void;
+export declare class SliderNew extends Control {
+    constructor(opt_options: ControlOptions);
+    setMap(map: import('ol').Map): void;
+    setEnable(cond: boolean): void;
+    setValue(res: number): void;
+}
+export declare class CustomControl extends Control {
+    center_: import('ol/coordinate').Coordinate | undefined;
+    zoom_: number | undefined;
+    callResetNorth_: unknown;
+    lastRotation_: number;
+    label_: HTMLElement;
+    ui: MaplatUi;
+    moveTo_: boolean;
+    constructor(optOptions: ControlOptions);
+}
+export declare class GoHome extends CustomControl {
+    constructor(optOptions: ControlOptions);
+}
+export declare class SetGPS extends CustomControl {
+    constructor(optOptions: ControlOptions);
+}
+export declare class CompassRotate extends Rotate {
+    center_?: import('ol/coordinate').Coordinate;
+    zoom_?: number;
+    customLabel_: HTMLElement;
+    lastRotation_: number;
+    constructor(optOptions: ControlOptions);
+}
+export declare class Share extends CustomControl {
+    constructor(optOptions: ControlOptions);
+}
+export declare class Border extends CustomControl {
+    constructor(optOptions: ControlOptions);
+}
+export declare class Maplat extends CustomControl {
+    constructor(optOptions: ControlOptions);
+}
+export declare class Copyright extends CustomControl {
+    constructor(optOptions: ControlOptions);
+}
+export declare class HideMarker extends CustomControl {
+    constructor(optOptions: ControlOptions);
+}
+export declare class MarkerList extends CustomControl {
+    constructor(optOptions: ControlOptions);
+}
+export declare class Zoom extends BaseZoom {
+    constructor(options?: ControlOptions);
+}

package/dist/pointer_images.d.ts

@@ -1,2 +1,2 @@
-declare const pointer: Record<string, string>;
-export default pointer;
+declare const pointer: Record<string, string>;
+export default pointer;

package/dist/swiper_ex.d.ts

@@ -1,2 +1,2 @@
-import { default as Swiper } from 'swiper';
-export { Swiper };
+import { default as Swiper } from 'swiper';
+export { Swiper };

package/dist/types.d.ts

@@ -1,173 +1,185 @@
-import { Swiper as SwiperClass } from 'swiper';
-import { Control } from 'ol/control';
-import { MaplatUi } from './index';
-export interface MaplatAppOption {
-    appid?: string;
-    fake?: boolean;
-    pwaManifest?: boolean | string;
-    pwaWorker?: string;
-    pwaScope?: string;
-    overlay?: boolean;
-    enableHideMarker?: boolean;
-    enableMarkerList?: boolean;
-    enableBorder?: boolean;
-    enableCache?: boolean;
-    stateUrl?: boolean;
-    enableShare?: boolean;
-    enablePoiHtmlNoScroll?: boolean;
-    disableNoimage?: boolean;
-    alwaysGpsOn?: boolean;
-    mobileIF?: boolean;
-    debug?: boolean;
-    appEnvelope?: boolean;
-    mapboxToken?: string;
-    googleApiKey?: string;
-    lang?: string;
-    restore?: RestoreState;
-    restoreSession?: boolean;
-    presentationMode?: boolean;
-    northTop?: boolean;
-    mapboxgl?: unknown;
-    maplibregl?: unknown;
-    markerList?: boolean;
-    icon?: string;
-    translateUI?: boolean;
-}
-export interface RestoreState {
-    mapID?: string;
-    backgroundID?: string;
-    transparency?: number;
-    position?: {
-        rotation?: number;
-        zoom?: number;
-        x?: number;
-        y?: number;
-    };
-    showBorder?: boolean;
-    hideMarker?: boolean;
-    hideLayer?: string;
-    openedMarker?: string;
-}
-export interface MapSource {
-    mapID: string;
-    title?: string;
-    officialTitle?: string;
-    label?: string;
-    width?: number;
-    height?: number;
-    envelope?: {
-        geometry: {
-            coordinates: number[][][];
-        };
-    };
-    envelopeColor?: string;
-    envelopeAreaIndex?: number;
-    xy2SysCoord?: (xy: number[]) => Promise<number[]> | number[];
-    thumbnail?: string;
-}
-export interface MarkerData {
-    markerId: string;
-    lnglat?: number[];
-    title?: string;
-    icon?: string;
-    description?: string;
-    images?: string[];
-    image?: string | string[] | {
-        src: string;
-        desc?: string;
-    }[];
-    address?: string;
-    desc?: string;
-    url?: string;
-    html?: string;
-    directgo?: string | {
-        href: string;
-        blank?: boolean;
-    };
-    namespaceID?: string;
-    name?: string;
-}
-export interface ClickMarkersEvent {
-    pixel: number[];
-    coord: number[];
-    list: MarkerData[];
-}
-export interface ContextMenuInterface {
-    clear: () => void;
-    extend: (items: unknown[]) => void;
-    on: (event: string, handler: (e: unknown) => void) => void;
-    un: (event: string, handler: (e: unknown) => void) => void;
-    Internal?: {
-        openMenu: (pixel: number[], coord: number[]) => void;
-        closeMenu: () => void;
-        opened: boolean;
-    };
-}
-export interface ClickMarkersEvent {
-    pixel: number[];
-    coord: number[];
-    list: MarkerData[];
-}
-export type EventCallback = (event: unknown) => void;
-export type SwiperInstance = SwiperClass;
-export type SliderControl = Control & {
-    get(prop: string): number;
-    set(prop: string, value: number): void;
-    element?: HTMLElement;
-    setEnable(flag: boolean): void;
-};
-export interface RGB {
-    red: number;
-    green: number;
-    blue: number;
-}
-export interface ControlOptions {
-    target?: HTMLElement | string;
-    render?: (event: import('ol').MapEvent) => void;
-    className?: string;
-    tipLabel?: string;
-    initialValue?: number;
-    character?: string;
-    callback?: (this: Control) => void;
-    long_callback?: (this: Control) => void;
-    cls?: string;
-    ui?: MaplatUi;
-    zoomInLabel?: string | HTMLElement;
-    zoomOutLabel?: string | HTMLElement;
-    autoHide?: boolean;
-    label?: string | HTMLElement;
-    reverse?: boolean;
-}
-export interface ContextMenuItem {
-    text?: string;
-    classname?: string;
-    icon?: string;
-    callback?: (obj: {
-        coordinate: number[];
-        data: unknown;
-    }, map: unknown) => void;
-    data?: unknown;
-    items?: ContextMenuItem[];
-    separator?: boolean;
-}
-export interface ContextMenuOptions {
-    width?: number;
-    defaultItems?: boolean;
-    items?: ContextMenuItem[];
-    eventType?: string;
-}
-export interface ContextMenuInternalItem {
-    id: string;
-    submenu: number;
-    separator: boolean;
-    callback?: (obj: {
-        coordinate: number[];
-        data: unknown;
-    }, map: unknown) => void;
-    data?: unknown;
-}
-export interface ContextMenuEvent {
-    type: string;
-    pixel?: number[];
-    coordinate?: number[];
-}
+import { Swiper as SwiperClass } from 'swiper';
+import { Control } from 'ol/control';
+import { MaplatUi } from './index';
+export interface MaplatAppOption {
+    appid?: string;
+    fake?: boolean;
+    pwaManifest?: boolean | string;
+    pwaWorker?: string;
+    pwaScope?: string;
+    overlay?: boolean;
+    enableHideMarker?: boolean;
+    enableMarkerList?: boolean;
+    enableBorder?: boolean;
+    enableCache?: boolean;
+    stateUrl?: boolean;
+    enableShare?: boolean;
+    enablePoiHtmlNoScroll?: boolean;
+    disableNoimage?: boolean;
+    alwaysGpsOn?: boolean;
+    mobileIF?: boolean;
+    debug?: boolean;
+    appEnvelope?: boolean;
+    mapboxToken?: string;
+    googleApiKey?: string;
+    lang?: string;
+    restore?: RestoreState;
+    restoreSession?: boolean;
+    presentationMode?: boolean;
+    northTop?: boolean;
+    mapboxgl?: unknown;
+    maplibregl?: unknown;
+    markerList?: boolean;
+    icon?: string;
+    translateUI?: boolean;
+}
+export interface RestoreState {
+    mapID?: string;
+    backgroundID?: string;
+    transparency?: number;
+    position?: {
+        rotation?: number;
+        zoom?: number;
+        x?: number;
+        y?: number;
+    };
+    showBorder?: boolean;
+    hideMarker?: boolean;
+    hideLayer?: string;
+    openedMarker?: string;
+}
+export interface MapSource {
+    mapID: string;
+    title?: string;
+    officialTitle?: string;
+    label?: string;
+    width?: number;
+    height?: number;
+    envelope?: {
+        geometry: {
+            coordinates: number[][][];
+        };
+    };
+    envelopeColor?: string;
+    envelopeAreaIndex?: number;
+    xy2SysCoord?: (xy: number[]) => Promise<number[]> | number[];
+    thumbnail?: string;
+}
+export type MediaObject = {
+    src: string;
+    thumbnail?: string;
+    type?: string;
+    caption?: string;
+    desc?: string;
+    "fit-to-container"?: boolean;
+    "debug-mode"?: boolean;
+    "camera-position"?: string;
+    "camera-target"?: string;
+    "show-texture"?: boolean;
+    [key: string]: unknown;
+};
+export type MediaSetting = string | MediaObject;
+export interface MarkerData {
+    markerId: string;
+    lnglat?: number[];
+    title?: string;
+    icon?: string;
+    description?: string;
+    images?: string[];
+    image?: MediaSetting | MediaSetting[];
+    media?: MediaSetting | MediaSetting[];
+    address?: string;
+    desc?: string;
+    url?: string;
+    html?: string;
+    directgo?: string | {
+        href: string;
+        blank?: boolean;
+    };
+    namespaceID?: string;
+    name?: string;
+}
+export interface ClickMarkersEvent {
+    pixel: number[];
+    coord: number[];
+    list: MarkerData[];
+}
+export interface ContextMenuInterface {
+    clear: () => void;
+    extend: (items: unknown[]) => void;
+    on: (event: string, handler: (e: unknown) => void) => void;
+    un: (event: string, handler: (e: unknown) => void) => void;
+    Internal?: {
+        openMenu: (pixel: number[], coord: number[]) => void;
+        closeMenu: () => void;
+        opened: boolean;
+    };
+}
+export interface ClickMarkersEvent {
+    pixel: number[];
+    coord: number[];
+    list: MarkerData[];
+}
+export type EventCallback = (event: unknown) => void;
+export type SwiperInstance = SwiperClass;
+export type SliderControl = Control & {
+    get(prop: string): number;
+    set(prop: string, value: number): void;
+    element?: HTMLElement;
+    setEnable(flag: boolean): void;
+};
+export interface RGB {
+    red: number;
+    green: number;
+    blue: number;
+}
+export interface ControlOptions {
+    target?: HTMLElement | string;
+    render?: (event: import('ol').MapEvent) => void;
+    className?: string;
+    tipLabel?: string;
+    initialValue?: number;
+    character?: string;
+    callback?: (this: Control) => void;
+    long_callback?: (this: Control) => void;
+    cls?: string;
+    ui?: MaplatUi;
+    zoomInLabel?: string | HTMLElement;
+    zoomOutLabel?: string | HTMLElement;
+    autoHide?: boolean;
+    label?: string | HTMLElement;
+    reverse?: boolean;
+}
+export interface ContextMenuItem {
+    text?: string;
+    classname?: string;
+    icon?: string;
+    callback?: (obj: {
+        coordinate: number[];
+        data: unknown;
+    }, map: unknown) => void;
+    data?: unknown;
+    items?: ContextMenuItem[];
+    separator?: boolean;
+}
+export interface ContextMenuOptions {
+    width?: number;
+    defaultItems?: boolean;
+    items?: ContextMenuItem[];
+    eventType?: string;
+}
+export interface ContextMenuInternalItem {
+    id: string;
+    submenu: number;
+    separator: boolean;
+    callback?: (obj: {
+        coordinate: number[];
+        data: unknown;
+    }, map: unknown) => void;
+    data?: unknown;
+}
+export interface ContextMenuEvent {
+    type: string;
+    pixel?: number[];
+    coordinate?: number[];
+}

package/dist/ui_init.d.ts

@@ -1,4 +1,4 @@
-import { MaplatUi } from './index';
-import { MaplatAppOption } from './types';
-export declare const META_KEYS: string[];
-export declare function uiInit(ui: MaplatUi, appOption: MaplatAppOption): Promise<void>;
+import { MaplatUi } from './index';
+import { MaplatAppOption } from './types';
+export declare const META_KEYS: string[];
+export declare function uiInit(ui: MaplatUi, appOption: MaplatAppOption): Promise<void>;

package/dist/ui_marker.d.ts

@@ -1,9 +1,9 @@
-import { MaplatUi } from './index';
-import { MarkerData } from './types';
-export declare function poiWebControl(ui: MaplatUi, div: HTMLElement, data: MarkerData): (((_event?: Event) => void) | undefined)[] | undefined;
-export declare function handleMarkerAction(ui: MaplatUi, data: MarkerData): void;
-export declare function showContextMenu(ui: MaplatUi, list: MarkerData[]): void;
-export declare function xyToMapIDs(ui: MaplatUi, xy: any, threshold?: number): Promise<any>;
-export declare function setHideMarker(ui: MaplatUi, flag: boolean): void;
-export declare function checkOverlayID(ui: MaplatUi, mapID: string): boolean;
-export declare function handleMarkerActionById(_ui: MaplatUi, markerId: string): void;
+import { MaplatUi } from './index';
+import { MarkerData } from './types';
+export declare function poiWebControl(ui: MaplatUi, div: HTMLElement, data: MarkerData): undefined;
+export declare function handleMarkerAction(ui: MaplatUi, data: MarkerData): void;
+export declare function showContextMenu(ui: MaplatUi, list: MarkerData[]): void;
+export declare function xyToMapIDs(ui: MaplatUi, xy: any, threshold?: number): Promise<any>;
+export declare function setHideMarker(ui: MaplatUi, flag: boolean): void;
+export declare function checkOverlayID(ui: MaplatUi, mapID: string): boolean;
+export declare function handleMarkerActionById(_ui: MaplatUi, markerId: string): void;

package/dist/ui_utils.d.ts

@@ -1,9 +1,9 @@
-export declare function resolveRelativeLink(file: string, fallbackPath: string | null): string;
-export declare function ellips(mapDivDocument: HTMLElement): void;
-export declare function isMaplatSource(source: unknown): source is {
-    setGPSMarkerAsync: () => unknown;
-    constructor: {
-        isBasemap_?: boolean;
-    };
-};
-export declare function isBasemap(source: unknown): boolean;
+export declare function resolveRelativeLink(file: string, fallbackPath: string | null): string;
+export declare function ellips(mapDivDocument: HTMLElement): void;
+export declare function isMaplatSource(source: unknown): source is {
+    setGPSMarkerAsync: () => unknown;
+    constructor: {
+        isBasemap_?: boolean;
+    };
+};
+export declare function isBasemap(source: unknown): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maplat/ui",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Maplat is the cool Historical Map/Illustrated Map Viewer.\nIt can transform each map coordinates with nonlinear but homeomorphic projection and makes possible that the maps can collaborate with GPS/accurate maps, without distorting original maps.",
   "type": "module",
   "main": "dist/maplat-ui.umd.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@c4h/chuci": "0.2.4",
     "@c4h/weiwudi": "^0.2.0",
-    "@maplat/core": "0.12.0",
+    "@maplat/core": "0.12.1",
     "@maplat/transform": "^0.4.0",
     "@turf/turf": "^7.3.1",
     "@types/page": "^1.11.9",

package/src/index.ts

@@ -74,6 +74,7 @@ export class MaplatUi extends EventTarget {
   html_id_seed: string;
   lastClickPixel: Pixel | undefined;
   lastClickCoordinate: Coordinate | undefined;
+  lastGPSError: string | undefined;
 
   constructor(appOption: MaplatAppOption) {
     super();

package/src/maplat_control.ts

@@ -4,7 +4,6 @@ import { MapEvent } from "ol";
 
 import pointer from "./pointer_images";
 import { createElement, MaplatApp } from "@maplat/core";
-import * as bsn from "bootstrap.native";
 import { getIcon } from "./icons";
 import type { MaplatUi } from "./index";
 import type { ControlOptions } from "./types";
@@ -356,6 +355,10 @@ export class SetGPS extends CustomControl {
 
       if (core.alwaysGpsOn) {
         core.handleGPS(true);
+        if (self.ui.lastGPSError === "gps_out") {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          self.ui.core!.dispatchEvent(new CustomEvent("outOfMap") as any);
+        }
       } else {
         core.handleGPS(!currentlyEnabled);
       }
@@ -366,66 +369,6 @@ export class SetGPS extends CustomControl {
     this.ui = options.ui!;
     this.moveTo_ = false;
 
-    if (this.ui && this.ui.core) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      this.ui.core.addEventListener("gps_error", (evt: any) => {
-        console.log("GPS Error:", evt);
-        const errorMap: Record<string, string> = {
-          user_gps_deny: "app.user_gps_deny",
-          gps_miss: "app.gps_miss",
-          gps_timeout: "app.gps_timeout"
-        };
-
-        if (!this.ui.core) return;
-        (this.ui.core.mapDivDocument!.querySelector(
-          ".modal_title"
-        ) as HTMLElement)!.innerText = this.ui.core.t("app.gps_error");
-        (this.ui.core.mapDivDocument!.querySelector(
-          ".modal_gpsD_content"
-        ) as HTMLElement)!.innerText = this.ui.core.t(
-          errorMap[evt.detail] || "app.gps_error"
-        );
-        const modalElm =
-          this.ui.core.mapDivDocument!.querySelector(".modalBase")!;
-        const modal = new bsn.Modal(modalElm, {
-          root: this.ui.core.mapDivDocument
-        });
-        this.ui.modalSetting("gpsD");
-        modal.show();
-      });
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      this.ui.core.addEventListener("gps_result", (evt: any) => {
-        console.log("GPS Result:", evt);
-        if (evt.detail && evt.detail.error) {
-          const errorMap: Record<string, string> = {
-            user_gps_deny: "app.user_gps_deny",
-            gps_miss: "app.gps_miss",
-            gps_timeout: "app.gps_timeout",
-            gps_off: "app.out_of_map"
-          };
-
-          if (!this.ui.core) return;
-
-          (this.ui.core.mapDivDocument!.querySelector(
-            ".modal_title"
-          ) as HTMLElement)!.innerText = this.ui.core.t("app.gps_error");
-          (this.ui.core.mapDivDocument!.querySelector(
-            ".modal_gpsD_content"
-          ) as HTMLElement)!.innerText = this.ui.core.t(
-            errorMap[evt.detail.error] || "app.gps_error"
-          );
-          const modalElm =
-            this.ui.core.mapDivDocument!.querySelector(".modalBase")!;
-          const modal = new bsn.Modal(modalElm, {
-            root: this.ui.core.mapDivDocument
-          });
-          this.ui.modalSetting("gpsD");
-          modal.show();
-        }
-      });
-    }
-
     if (control_settings["gps"]) {
       const button = this.element.querySelector("button");
       if (button) button.style.backgroundColor = "rgba(0,0,0,0)";