venue-js 1.0.0-3 → 1.0.0-next.2

package/dist/index.d.mts

@@ -3,8 +3,8 @@ export { QueryObserver } from '@tanstack/query-core';
 import * as geojson from 'geojson';
 import { Position, Geometry, GeoJsonProperties, Feature, Point, Polygon, MultiPolygon, LineString, GeometryCollection } from 'geojson';
 import * as maptalks from 'maptalks';
-import { Coordinate, Map, MapViewType, MapAnimationOptionsType, HandlerFn, EventParams, MapPaddingType, Extent, Marker, ui, LineString as LineString$1, Polygon as Polygon$1, MultiPolygon as MultiPolygon$1, MultiLineString } from 'maptalks';
-import { BaseObject, ThreeLayer } from 'maptalks.three';
+import { Coordinate, Map, MapViewType, MapAnimationOptionsType, HandlerFn, EventParams, MapPaddingType, Extent } from 'maptalks';
+import { ThreeLayer, BaseObject } from 'maptalks.three';
 import { ExtrudePolygonOptionType } from 'maptalks.three/dist/type';
 import { SpriteMaterial, AmbientLight, DirectionalLight } from 'three';
 
@@ -627,6 +627,14 @@ type FeaturePopulatedResponseMap = {
 };
 type PopulatableFeatureType = keyof FeaturePopulatedResponseMap;
 
+type Value = string | boolean | number;
+type EqFilter = Value;
+type InFilter = {
+    $in: (Value)[];
+};
+type Filter = EqFilter | InFilter;
+type Filters = Record<string, Filter>;
+
 interface VenueClientOptions {
     projectId: string;
     apiKey: string;
@@ -638,6 +646,7 @@ interface FindParams {
 }
 interface FilterParams {
     populate?: boolean;
+    filters?: Filters;
 }
 interface PopulatedParams {
     populate: true;
@@ -715,7 +724,7 @@ declare class RendererManager extends EventTarget {
     private elementsByOrdinal;
     constructor(map: maptalks.Map, options: RendererManagerOptions);
     set dataClient(value: any);
-    getElementsByOrdinal: (ordinal: number) => (BaseObject | maptalks.Geometry | maptalks.ui.UIMarker)[];
+    getElementsByOrdinal: (ordinal: number) => any[];
     changeLevelByOrdinal(targetOrdinal: null | number | number[]): void;
     createMarker(coordinate: Position, ordinal: number, label: string): void;
 }
@@ -871,12 +880,12 @@ declare class IndoorMap extends EventTarget {
      * Change Level & animate to path / geometry / view / etc.
      * ================================== */
     changeLevelByOrdinal(ordinal: number | number[]): void;
-    getFeatureExtent: (feature: any, scaleFactor?: number) => Extent;
-    getExtentCenter: (extent: Extent) => maptalks.PositionType;
+    getFeatureExtent: (feature: any, scaleFactor?: number) => any;
+    getExtentCenter: (extent: Extent) => any;
     getExtentZoom: (extent: Extent, options?: {
         isFraction?: boolean;
         padding?: MapPaddingType;
-    }) => number;
+    }) => any;
     findVenueInView: () => {
         venueId: string;
         distance: number;
@@ -942,10 +951,10 @@ declare class IndoorMap extends EventTarget {
     /**
      * Other functions
      */
-    enableClick: () => Map | maptalks.ClassOptions;
-    disableClick: () => Map | maptalks.ClassOptions;
-    freeze: () => Map | maptalks.ClassOptions;
-    unfreeze: () => Map | maptalks.ClassOptions;
+    enableClick: () => any;
+    disableClick: () => any;
+    freeze: () => any;
+    unfreeze: () => any;
     /**
      * render (frame)
      */
@@ -956,8 +965,8 @@ declare class IndoorMap extends EventTarget {
             right: number;
             bottom: number;
         };
-    }) => Coordinate;
-    setMaxExtent(extent: Extent): Map;
+    }) => any;
+    setMaxExtent(extent: Extent): any;
     render(): void;
 }
 
@@ -1038,22 +1047,22 @@ declare function styledFeatureGenerator(mapTheme: any): {
     createVenue: (feature: any) => any;
     createLevel: (feature: any) => any;
     createUnit: (feature: any) => any;
-    createMarker: (feature: any) => Marker;
-    createOriginMarker: (feature: any) => Marker;
-    createDestinationPinMarker: (feature: any, mapConfig: any) => Marker;
-    createDestinationLogoMarker: (feature: any, mapConfig?: {}) => Marker;
-    createUserLocationMarker: (feature: any) => Marker;
-    createLastUserLocationMarker: (feature: any) => Marker;
-    createHighlightOccupantMarker: (feature: any, mapConfig: any) => Marker;
-    createHighlight2DAmenityMarkerFrom3DMarker: (feature: any, mapConfig: any) => Marker;
+    createMarker: (feature: any) => any;
+    createOriginMarker: (feature: any) => any;
+    createDestinationPinMarker: (feature: any, mapConfig: any) => any;
+    createDestinationLogoMarker: (feature: any, mapConfig?: {}) => any;
+    createUserLocationMarker: (feature: any) => any;
+    createLastUserLocationMarker: (feature: any) => any;
+    createHighlightOccupantMarker: (feature: any, mapConfig: any) => any;
+    createHighlight2DAmenityMarkerFrom3DMarker: (feature: any, mapConfig: any) => any;
     createKiosk: (feature: any) => any;
     createSection: (feature: any) => any;
-    createOccupant: (feature: any, location: any, mapConfig: any) => ui.UIMarker | Marker;
-    createOpening: (feature: any) => LineString$1;
+    createOccupant: (feature: any, location: any, mapConfig: any) => any;
+    createOpening: (feature: any) => any;
     createFixture: (feature: any) => any;
-    createLineStringFromGeometries: (geometries: any) => LineString$1;
+    createLineStringFromGeometries: (geometries: any) => any;
     create3DStepPath: (feature: any, threeLayer: any, option?: {}) => NavigationPath;
-    createDecoration: (decoration: any, options: any) => Polygon$1 | MultiPolygon$1 | LineString$1 | MultiLineString;
+    createDecoration: (decoration: any, options: any) => any;
     /** Three JS */
     create3DFootprint: (feature: any, threeLayer: any, options: any) => Promise<any[]>;
     create3DGroundLabel: (label: any, threeLayer: any) => GroundLabel;

package/dist/index.d.ts

@@ -3,8 +3,8 @@ export { QueryObserver } from '@tanstack/query-core';
 import * as geojson from 'geojson';
 import { Position, Geometry, GeoJsonProperties, Feature, Point, Polygon, MultiPolygon, LineString, GeometryCollection } from 'geojson';
 import * as maptalks from 'maptalks';
-import { Coordinate, Map, MapViewType, MapAnimationOptionsType, HandlerFn, EventParams, MapPaddingType, Extent, Marker, ui, LineString as LineString$1, Polygon as Polygon$1, MultiPolygon as MultiPolygon$1, MultiLineString } from 'maptalks';
-import { BaseObject, ThreeLayer } from 'maptalks.three';
+import { Coordinate, Map, MapViewType, MapAnimationOptionsType, HandlerFn, EventParams, MapPaddingType, Extent } from 'maptalks';
+import { ThreeLayer, BaseObject } from 'maptalks.three';
 import { ExtrudePolygonOptionType } from 'maptalks.three/dist/type';
 import { SpriteMaterial, AmbientLight, DirectionalLight } from 'three';
 
@@ -627,6 +627,14 @@ type FeaturePopulatedResponseMap = {
 };
 type PopulatableFeatureType = keyof FeaturePopulatedResponseMap;
 
+type Value = string | boolean | number;
+type EqFilter = Value;
+type InFilter = {
+    $in: (Value)[];
+};
+type Filter = EqFilter | InFilter;
+type Filters = Record<string, Filter>;
+
 interface VenueClientOptions {
     projectId: string;
     apiKey: string;
@@ -638,6 +646,7 @@ interface FindParams {
 }
 interface FilterParams {
     populate?: boolean;
+    filters?: Filters;
 }
 interface PopulatedParams {
     populate: true;
@@ -715,7 +724,7 @@ declare class RendererManager extends EventTarget {
     private elementsByOrdinal;
     constructor(map: maptalks.Map, options: RendererManagerOptions);
     set dataClient(value: any);
-    getElementsByOrdinal: (ordinal: number) => (BaseObject | maptalks.Geometry | maptalks.ui.UIMarker)[];
+    getElementsByOrdinal: (ordinal: number) => any[];
     changeLevelByOrdinal(targetOrdinal: null | number | number[]): void;
     createMarker(coordinate: Position, ordinal: number, label: string): void;
 }
@@ -871,12 +880,12 @@ declare class IndoorMap extends EventTarget {
      * Change Level & animate to path / geometry / view / etc.
      * ================================== */
     changeLevelByOrdinal(ordinal: number | number[]): void;
-    getFeatureExtent: (feature: any, scaleFactor?: number) => Extent;
-    getExtentCenter: (extent: Extent) => maptalks.PositionType;
+    getFeatureExtent: (feature: any, scaleFactor?: number) => any;
+    getExtentCenter: (extent: Extent) => any;
     getExtentZoom: (extent: Extent, options?: {
         isFraction?: boolean;
         padding?: MapPaddingType;
-    }) => number;
+    }) => any;
     findVenueInView: () => {
         venueId: string;
         distance: number;
@@ -942,10 +951,10 @@ declare class IndoorMap extends EventTarget {
     /**
      * Other functions
      */
-    enableClick: () => Map | maptalks.ClassOptions;
-    disableClick: () => Map | maptalks.ClassOptions;
-    freeze: () => Map | maptalks.ClassOptions;
-    unfreeze: () => Map | maptalks.ClassOptions;
+    enableClick: () => any;
+    disableClick: () => any;
+    freeze: () => any;
+    unfreeze: () => any;
     /**
      * render (frame)
      */
@@ -956,8 +965,8 @@ declare class IndoorMap extends EventTarget {
             right: number;
             bottom: number;
         };
-    }) => Coordinate;
-    setMaxExtent(extent: Extent): Map;
+    }) => any;
+    setMaxExtent(extent: Extent): any;
     render(): void;
 }
 
@@ -1038,22 +1047,22 @@ declare function styledFeatureGenerator(mapTheme: any): {
     createVenue: (feature: any) => any;
     createLevel: (feature: any) => any;
     createUnit: (feature: any) => any;
-    createMarker: (feature: any) => Marker;
-    createOriginMarker: (feature: any) => Marker;
-    createDestinationPinMarker: (feature: any, mapConfig: any) => Marker;
-    createDestinationLogoMarker: (feature: any, mapConfig?: {}) => Marker;
-    createUserLocationMarker: (feature: any) => Marker;
-    createLastUserLocationMarker: (feature: any) => Marker;
-    createHighlightOccupantMarker: (feature: any, mapConfig: any) => Marker;
-    createHighlight2DAmenityMarkerFrom3DMarker: (feature: any, mapConfig: any) => Marker;
+    createMarker: (feature: any) => any;
+    createOriginMarker: (feature: any) => any;
+    createDestinationPinMarker: (feature: any, mapConfig: any) => any;
+    createDestinationLogoMarker: (feature: any, mapConfig?: {}) => any;
+    createUserLocationMarker: (feature: any) => any;
+    createLastUserLocationMarker: (feature: any) => any;
+    createHighlightOccupantMarker: (feature: any, mapConfig: any) => any;
+    createHighlight2DAmenityMarkerFrom3DMarker: (feature: any, mapConfig: any) => any;
     createKiosk: (feature: any) => any;
     createSection: (feature: any) => any;
-    createOccupant: (feature: any, location: any, mapConfig: any) => ui.UIMarker | Marker;
-    createOpening: (feature: any) => LineString$1;
+    createOccupant: (feature: any, location: any, mapConfig: any) => any;
+    createOpening: (feature: any) => any;
     createFixture: (feature: any) => any;
-    createLineStringFromGeometries: (geometries: any) => LineString$1;
+    createLineStringFromGeometries: (geometries: any) => any;
     create3DStepPath: (feature: any, threeLayer: any, option?: {}) => NavigationPath;
-    createDecoration: (decoration: any, options: any) => Polygon$1 | MultiPolygon$1 | LineString$1 | MultiLineString;
+    createDecoration: (decoration: any, options: any) => any;
     /** Three JS */
     create3DFootprint: (feature: any, threeLayer: any, options: any) => Promise<any[]>;
     create3DGroundLabel: (label: any, threeLayer: any) => GroundLabel;

package/dist/index.js

@@ -439,6 +439,26 @@ var createPopulator = ({
   };
 };
 
+// src/data/utils/match-filters.ts
+function isInFilter(filter) {
+  return typeof filter === "object" && filter !== null && "$in" in filter && Array.isArray(filter.$in);
+}
+var someIntersect = (a, b) => a.some((v) => b.includes(v));
+function matchFilter(value, filter) {
+  if (Array.isArray(value)) {
+    if (isInFilter(filter)) return someIntersect(value, filter.$in);
+    return value.includes(filter);
+  } else {
+    if (isInFilter(filter)) return filter.$in.includes(value);
+    return value === filter;
+  }
+}
+function matchFilters(item, filters) {
+  return Object.entries(filters).every(([key, filter]) => {
+    return matchFilter(item.properties[key], filter);
+  });
+}
+
 // src/data/getDataClient.ts
 var getDataClient = (options) => {
   const observers = /* @__PURE__ */ new Map();
@@ -514,7 +534,12 @@ var getDataClient = (options) => {
     queryKey: [featureType, "list", params],
     queryFn: async () => {
       const features = await internalFilterByType(featureType);
-      return params.populate === true ? await Promise.all(features.map((f) => populator[featureType](f))) : features;
+      const filters = params.filters ?? {};
+      let result = features;
+      if (params.filters) {
+        result = features.filter((f) => matchFilters(f, filters));
+      }
+      return params.populate === true ? await Promise.all(result.map((f) => populator[featureType](f))) : result;
     },
     ...options2 ?? {}
   });
@@ -3382,9 +3407,11 @@ var createSVGPathFromMarkerSymbol2 = (style) => {
     fill = "#000000"
   } = style;
   const scale2 = markerWidth / 24;
+  const strokeWidth = 2;
+  const halfStrokeWidth = 0.5 * strokeWidth;
   if (Array.isArray(markerPath)) {
     return markerPath.map(
-      ({ path, fill: fill2 }) => `<path d="${path}" style="transform:translate(${markerDx}px, ${markerDy}px) scale(${scale2})" fill="${fill2}"/>`
+      ({ path, fill: fill2 }) => `<path d="${path}" style="transform:translate(${markerDx}px, ${markerDy}px) scale(${scale2})" fill="${fill2}" stroke="#ffffff" stroke-width="${strokeWidth}" />`
     );
   }
   return `<path d="${markerPath}" style="transform:translate(${markerDx}px, ${markerDy}px) scale(${scale2})" fill="${fill}" />`;
@@ -3399,7 +3426,6 @@ var createSpriteMaterialByLabelSymbol2 = (labelSymbol) => {
     const baseSVG = createSVGPathFromMarkerSymbol2(base);
     const iconSVG = icon ? createSVGPathFromMarkerSymbol2(icon) : "";
     const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="${viewBoxDimension}" height="${viewBoxDimension}">${baseSVG}${iconSVG}</svg>`;
-    console.log(svg);
     const textureLoader = new import_three7.TextureLoader();
     const scaleFactor = 200 / 24;
     svgToDataURL(svg, scaleFactor).then((png) => {
@@ -3489,14 +3515,12 @@ var Element3DRenderer = class extends EventTarget {
       markerType: "path",
       markerPath: [
         {
-          path: "M21.75 0H0.25V21.5H8.35L11.3 24L14.2 21.5H21.75V0Z",
+          path: "M20.775 1.2H1.225V20.35H8.215L11.3 22.8L14.385 20.35H20.775V1.2Z",
           fill: "#ff0000"
         }
       ],
       markerPathWidth: 24,
-      markerPathHeight: 24,
-      markerWidth: 30,
-      markerHeight: 30
+      markerPathHeight: 24
     };
     const markerSymbol = {
       markerType: "path",