@foodmarketmaker/mapag 0.0.48 → 0.0.49

package/index.d.ts

@@ -1,11 +1,11 @@
 import * as _angular_core from '@angular/core';
 import { NgZone, AfterViewInit, OnDestroy, ElementRef, Signal, OnInit } from '@angular/core';
-import * as maplibre_gl from 'maplibre-gl';
-import { StyleSpecification, Map as Map$1, SourceSpecification, LayerSpecification, GeoJSONFeature, MapMouseEvent, PointLike, MapTouchEvent, MapSourceDataEvent, MapGeoJSONFeature, Popup, ExpressionFilterSpecification, MapLayerMouseEvent as MapLayerMouseEvent$1, MapLayerTouchEvent as MapLayerTouchEvent$1, PositionAnchor, SymbolLayerSpecification, FillLayerSpecification, LineLayerSpecification, CircleLayerSpecification } from 'maplibre-gl';
+import { StyleSpecification, Map as Map$1, SourceSpecification, LayerSpecification, MapGeoJSONFeature, GeoJSONFeature, MapMouseEvent, Popup, LngLat, PointLike, MapTouchEvent, MapSourceDataEvent, ExpressionFilterSpecification, PositionAnchor, SymbolLayerSpecification, FillLayerSpecification, LineLayerSpecification, CircleLayerSpecification } from 'maplibre-gl';
 import * as rxjs from 'rxjs';
 import { Subject, Subscription } from 'rxjs';
 import * as geojson from 'geojson';
 import { Feature, MultiPolygon, BBox, Polygon } from 'geojson';
+import { Point } from 'kt-maplibre-gl';
 import MapboxDraw, { DrawCreateEvent } from 'maplibre-gl-draw';
 import * as _fortawesome_fontawesome_common_types from '@fortawesome/fontawesome-common-types';
 import { PMTiles } from 'pmtiles';
@@ -93,6 +93,7 @@ interface MapboxMapper {
     count: number;
     total: number;
     onStyleChange?(map: Map$1, svc: MapService): void;
+    renderPopup?(f: MapGeoJSONFeature): string | undefined;
 }
 declare class MapboxMapperGroup<T extends MapboxMapper> implements MapboxMapper {
     map: Map$1 | undefined;
@@ -108,6 +109,7 @@ declare class MapboxMapperGroup<T extends MapboxMapper> implements MapboxMapper
     onReady(map: Map$1, svc: MapService): void;
     reset(): void;
     clear(): void;
+    renderPopup(f: MapGeoJSONFeature): string | undefined;
 }
 interface LegendDesc {
     id: string;
@@ -229,6 +231,8 @@ declare class MapService {
     setDefaultCursor(): void;
     setCrosshairCursor(): void;
     setPointerCursor(): void;
+    currentPopup: Popup | null;
+    handleMapClick(point: Point, lngLat: LngLat): void;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<MapService, never>;
     static ɵprov: _angular_core.ɵɵInjectableDeclaration<MapService>;
 }
@@ -910,7 +914,7 @@ declare class AreaMapperMapper implements MapboxMapper {
     setAreaType(type: string): void;
     load(): Promise<void>;
     fixZoom(): void;
-    renderPopup(item: GeoJSONFeature): string;
+    renderPopup(feature: MapGeoJSONFeature): string | undefined;
     useStat(id: string, stats: {
         id: string;
         name: string;
@@ -1000,7 +1004,7 @@ interface MapAreaSelection {
 }
 declare function discoverLayers(pmtilesUrl: string): Promise<string[]>;
 declare function sampleTilesForLayers(pmtiles: PMTiles): Promise<string[]>;
-declare function pmtilesPixelInfo(url: string, map: Map$1, e: MapMouseEvent): Promise<Uint8ClampedArray | undefined>;
+declare function pmtilesPixelInfo(url: string, map: Map$1, lngLat: LngLat): Promise<Uint8ClampedArray | undefined>;
 declare function propertiesToTableHtml(properties: {
     [key: string]: any;
 }): string;
@@ -1227,6 +1231,7 @@ declare class CropSequenceMapper implements MapboxMapper {
     update(settings: Partial<CropSequenceSettings>): void;
     private _update;
     private create;
+    renderPopup(feature: MapGeoJSONFeature): string | undefined;
     lookupClass(code: string | number): string | undefined;
     lookup(code: string | number): CroplandType | undefined;
     onReady(map: Map$1, svc: MapService): Promise<void>;
@@ -1236,7 +1241,6 @@ declare class CropSequenceMapper implements MapboxMapper {
     count: number;
     total: number;
     map: Map$1 | undefined;
-    popup: Popup | null;
 }
 declare class CropSequenceSettings {
     visible: boolean;
@@ -1344,7 +1348,7 @@ declare class NaicsMapper implements MapboxMapper {
     private geoJsonUrl;
     private geoJsonResource;
     constructor(settings?: Partial<NaicsMapperSettings>, id?: string | undefined);
-    data: _angular_core.Signal<maplibre_gl.MapGeoJSONFeature[] | Feature<geojson.Geometry, geojson.GeoJsonProperties>[]>;
+    data: _angular_core.Signal<MapGeoJSONFeature[] | Feature<geojson.Geometry, geojson.GeoJsonProperties>[]>;
     update(settings: Partial<NaicsMapperSettings>): void;
     private _update;
     onReady(map: Map$1, svc: MapService): void;
@@ -1361,8 +1365,8 @@ declare class NaicsMapper implements MapboxMapper {
     filter(map: Map$1, settings: NaicsMapperSettings): void;
     getSettings(): NaicsMapperSettings;
     flyToFeature(f: Feature): void;
-    onClick: (e: MapLayerMouseEvent$1 | MapLayerTouchEvent$1) => Promise<void>;
-    renderPopup(f: Feature): string | undefined;
+    renderPopup(f: MapGeoJSONFeature): string | undefined;
+    renderInfo(f: Feature): string | undefined;
 }
 type NaicsCode = Partial<NaicsMapperSettings> & {
     ID: string;
@@ -1426,8 +1430,7 @@ declare class FoodhubMapper implements MapboxMapper {
     getFipsFilter(): string[] | undefined;
     filter(map: Map$1): void;
     getSettings(): FoodhubMapperSettings;
-    onClick: (e: MapLayerMouseEvent$1 | MapLayerTouchEvent$1) => void;
-    renderPopup(f: Feature): Promise<string | undefined>;
+    renderPopup(f: MapGeoJSONFeature): string | undefined;
     semiToComma(input: string | undefined): string | undefined;
 }
 interface FoodHub {
@@ -1682,6 +1685,7 @@ declare class HardinessMapper implements MapboxMapper {
     onStyleChange(map: Map$1, svc: MapService): Promise<void>;
     constructor(settings?: Partial<HardinessSettings>);
     create(): Promise<void>;
+    renderPopup(feature: MapGeoJSONFeature): string | undefined;
     update(newSettings: Partial<HardinessSettings>): void;
     private _update;
     legend: _angular_core.Signal<LegendItem[]>;
@@ -1874,8 +1878,8 @@ declare class NAASMapper implements MapboxMapper {
     onReady(map: Map$1, svc: MapService): void;
     reset(): void;
     clear(): void;
-    onClick: (e: MapMouseEvent | MapTouchEvent) => Promise<void>;
-    RenderPopup(feature: GeoJSON.Feature, state: any): Promise<string | undefined>;
+    renderPopup(feature: MapGeoJSONFeature): string | undefined;
+    RenderPopup(feature: GeoJSON.Feature, state: any): string | undefined;
 }
 declare function FipsFromDataSet(ds: TabularDataSetP, rowIndex: number): string | null;
 declare function DataSetFieldValue(ds: TabularDataSetP, rowIndex: number, field: string): string | number | null;
@@ -1932,7 +1936,7 @@ type PointData = {
     bboxFilter?: BBox;
 };
 interface PopupRenderer {
-    RenderPopup(feature: GeoJSON.Feature): Promise<string | undefined>;
+    RenderPopup(feature: GeoJSON.Feature): string | undefined;
 }
 declare function isGeoloader(obj: any): obj is Geoloader;
 declare function isMultiPolygon(obj: any): obj is MultiPolygon;
@@ -2010,7 +2014,8 @@ declare class PointDataMapper implements MapboxMapper {
     private geoJsonResource;
     dataCnt: number;
     constructor(popupRenderer?: PopupRenderer, settings?: Partial<PointDataMapperSettings>);
-    data: _angular_core.Signal<maplibre_gl.MapGeoJSONFeature[] | geojson.Feature<geojson.Geometry, geojson.GeoJsonProperties>[]>;
+    data: _angular_core.Signal<MapGeoJSONFeature[] | geojson.Feature<geojson.Geometry, geojson.GeoJsonProperties>[]>;
+    renderPopup(f: MapGeoJSONFeature): string | undefined;
     update(settings: Partial<PointDataMapperSettings>): void;
     private _update;
     private loadIcon;
@@ -2027,7 +2032,6 @@ declare class PointDataMapper implements MapboxMapper {
     private createCircleLayers;
     private createHeatLayers;
     private createIconLayers;
-    onClick: (e: MapLayerMouseEvent$1 | MapLayerTouchEvent$1) => Promise<void>;
     getSettings(): PointDataMapperSettings;
 }
 interface PointDataClusterProperties {
@@ -2059,6 +2063,7 @@ declare class RailroadsMapper implements MapboxMapper {
     updateUsageSettings(key: UsageKey, usageSettings: Partial<RailroadUsageSettings>): void;
     private _update;
     private create;
+    renderPopup(feature: MapGeoJSONFeature): string | undefined;
     fmtDistance(km: number | undefined): string;
     onReady(map: Map$1, svc: MapService): Promise<void>;
     reset(): void;
@@ -2181,6 +2186,7 @@ declare class WatershedMapper implements MapboxMapper {
     update(settings: Partial<WatershedSettings>): void;
     private _update;
     private create;
+    renderPopup(feature: MapGeoJSONFeature): string | undefined;
     onReady(map: Map$1, svc: MapService): Promise<void>;
     reset(): void;
     clear(): void;
@@ -2818,7 +2824,7 @@ declare class MMPanel implements OnDestroy {
 }
 declare class MarketMakerPopupRenderer implements PopupRenderer {
     RenderPopupSync(feature: GeoJSON.Feature): string | undefined;
-    RenderPopup(feature: GeoJSON.Feature): Promise<string | undefined>;
+    RenderPopup(feature: MapGeoJSONFeature): string | undefined;
     private getArrayProperty;
     private parseArrayProperty;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foodmarketmaker/mapag",
-  "version": "0.0.48",
+  "version": "0.0.49",
   "description": "Angular library for interactive maps with advanced geospatial features",
   "author": "Food Market Maker",
   "license": "MIT",