@maplat/ui 0.11.11 → 0.12.0

package/dist/service-worker.js

@@ -3335,7 +3335,7 @@ This is generally NOT safe. Learn more at https://bit.ly/wb-precache`;
   registerRoute(
     /(?:maps\/.+\.json|pwa\/.+|pois\/.+\.json|apps\/.+\.json|tmbs\/.+\.jpg|images\/.+\.(?:png|jpg))$/,
     new StaleWhileRevalidate({
-      cacheName: `resourcesCache-${"2026-01-08-09-43"}`,
+      cacheName: `resourcesCache-${"2026-01-12-04-59"}`,
       plugins: [
         new ExpirationPlugin({
           maxAgeSeconds: 86400,

package/dist/types.d.ts

@@ -1,185 +1,195 @@
-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[];
-}
+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;
+    uiHooks?: MaplatUiHooks;
+}
+export interface MaplatUiHooks {
+    onSettingLoaded?: (context: unknown) => Promise<unknown> | unknown;
+    onAppdataReady?: (context: unknown) => Promise<unknown> | unknown;
+    onUiConfigure?: (context: unknown) => Promise<unknown> | unknown;
+    onCoreDomReady?: (context: unknown) => Promise<unknown> | unknown;
+    onUiDomReady?: (context: unknown) => Promise<unknown> | unknown;
+    onCoreReady?: (context: unknown) => Promise<unknown> | unknown;
+    onUiReady?: (context: unknown) => Promise<unknown> | unknown;
+}
+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_utils.d.ts

@@ -1,13 +1,13 @@
-import * as bsn from "bootstrap.native";
-export declare function createElement(domStr: string): ChildNode[];
-export declare function prepareModal(modalElm: Element | HTMLElement, options?: any): bsn.Modal;
-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 encBytes(bytes: number): string;
+import * as bsn from "bootstrap.native";
+export declare function createElement(domStr: string): ChildNode[];
+export declare function prepareModal(modalElm: Element | HTMLElement, options?: any): bsn.Modal;
+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 encBytes(bytes: number): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maplat/ui",
-  "version": "0.11.11",
+  "version": "0.12.0",
   "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.5",
     "@c4h/weiwudi": "^0.2.1",
-    "@maplat/core": "^0.12.6",
+    "@maplat/core": "0.13.0",
     "@turf/turf": "^7.3.1",
     "@types/page": "^1.11.9",
     "bootstrap.native": "^5.1.6",

package/src/browserlanguage.ts

@@ -0,0 +1,35 @@
+const browserLanguage = (): string => {
+  const navigator = window.navigator;
+  const ua = navigator.userAgent.toLowerCase();
+
+  try {
+    let lang;
+    // Chrome
+    if (ua.indexOf("chrome") != -1) {
+      lang = (
+        navigator.languages[0] ||
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (navigator as any).browserLanguage ||
+        navigator.language ||
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (navigator as any).userLanguage
+      ).split(";");
+      return lang[0];
+    }
+    // Other
+    else {
+      lang = // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (
+        (navigator as any).browserLanguage ||
+        navigator.language ||
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (navigator as any).userLanguage
+      ).split(";");
+      return lang[0];
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  } catch (_e) {
+    return "";
+  }
+};
+export default browserLanguage;

package/src/index.ts

@@ -77,6 +77,7 @@ export class MaplatUi extends EventTarget {
   lastClickCoordinate: Coordinate | undefined;
   lastGPSError: string | undefined;
   selectedMarkerNamespaceID: string | undefined;
+  lang = "ja";
 
   _t?: TFunction<"translation", undefined>;
   i18n?: i18n;
@@ -185,7 +186,6 @@ export class MaplatUi extends EventTarget {
           }
 
           this.restoring = false;
-          console.log(`[Debug] Calling updateUrl from ChangeMap`);
           this.updateUrl();
         }
         if (this.waitReadyBridge) {
@@ -223,16 +223,24 @@ export class MaplatUi extends EventTarget {
     if (!dataFragment || typeof dataFragment === "string")
       return dataFragment as string;
     const langs = Object.keys(dataFragment);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let key = langs.reduce((prev: any, curr, idx, arr) => {
-      if (curr == this.core!.appLang) {
-        prev = [dataFragment[curr], true];
-      } else if (!prev || (curr == "en" && !prev[1])) {
-        prev = [dataFragment[curr], false];
-      }
-      if (idx == arr.length - 1) return prev[0];
-      return prev;
-    }, undefined);
+
+    let key = langs.reduce(
+      (
+        prev: string | [string, boolean] | undefined,
+        curr: string,
+        idx: number,
+        arr: string[]
+      ) => {
+        if (curr == this.lang) {
+          prev = [dataFragment[curr], true];
+        } else if (!prev || (curr == "en" && !prev[1])) {
+          prev = [dataFragment[curr], false];
+        }
+        if (idx == arr.length - 1) return prev[0];
+        return prev;
+      },
+      undefined
+    );
 
     key = typeof key === "string" ? key : `${key}`;
     if (