@opensystemslab/map 0.6.1 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensystemslab/map",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "license": "OGL-UK-3.0",
   "private": false,
   "repository": {
@@ -42,16 +42,16 @@
     "@testing-library/user-event": "^14.4.3",
     "@types/node": "^18.6.3",
     "@types/proj4": "^2.5.2",
-    "@vitest/ui": "^0.23.2",
-    "happy-dom": "^6.0.4",
+    "@vitest/ui": "^0.26.1",
+    "happy-dom": "^8.1.0",
     "husky": "^8.0.1",
     "lint-staged": "^13.0.3",
     "prettier": "^2.3.2",
     "rollup-plugin-postcss-lit": "^2.0.0",
     "sass": "^1.44.0",
     "typescript": "^4.3.5",
-    "vite": "^3.0.4",
-    "vitest": "0.20.3",
+    "vite": "^4.0.0",
+    "vitest": "0.26.1",
     "wait-for-expect": "^3.0.2"
   },
   "engines": {

package/types/components/address-autocomplete/index.d.ts

@@ -11,6 +11,7 @@ export declare class AddressAutocomplete extends LitElement {
     label: string;
     initialAddress: string;
     osPlacesApiKey: string;
+    osProxyEndpoint: string;
     arrowStyle: ArrowStyleEnum;
     labelStyle: LabelStyleEnum;
     private _totalAddresses;

package/types/components/my-map/drawing.d.ts

@@ -1,9 +1,10 @@
 import { Draw, Modify, Snap } from "ol/interaction";
 import { Vector as VectorLayer } from "ol/layer";
 import { Vector as VectorSource } from "ol/source";
+export declare type DrawTypeEnum = "Polygon" | "Point";
 export declare type DrawPointerEnum = "crosshair" | "dot";
 export declare const drawingSource: VectorSource<import("ol/geom/Geometry").default>;
-export declare const drawingLayer: VectorLayer<VectorSource<import("ol/geom/Geometry").default>>;
-export declare function configureDraw(pointerStyle: DrawPointerEnum): Draw;
+export declare function configureDrawingLayer(drawType: DrawTypeEnum, pointColor: string): VectorLayer<VectorSource<import("ol/geom/Geometry").default>>;
+export declare function configureDraw(drawType: DrawTypeEnum, pointerStyle: DrawPointerEnum, pointColor: string): Draw;
 export declare const snap: Snap;
 export declare function configureModify(pointerStyle: DrawPointerEnum): Modify;

package/types/components/my-map/index.d.ts

@@ -1,10 +1,10 @@
 import { LitElement } from "lit";
 import Map from "ol/Map";
-import { DrawPointerEnum } from "./drawing";
+import { DrawPointerEnum, DrawTypeEnum } from "./drawing";
 import { ProjectionEnum } from "./projections";
 import { AreaUnitEnum } from "./utils";
 declare type MarkerImageEnum = "circle" | "pin";
-declare type ResetControlImageEnum = "unicode" | "reset" | "trash" | "erase";
+declare type ResetControlImageEnum = "unicode" | "trash";
 export declare class MyMap extends LitElement {
     static styles: import("lit").CSSResult;
     id: string;
@@ -15,6 +15,8 @@ export declare class MyMap extends LitElement {
     minZoom: number;
     maxZoom: number;
     drawMode: boolean;
+    drawType: DrawTypeEnum;
+    drawPointColor: string;
     drawGeojsonData: {
         type: string;
         geometry: {};
@@ -43,6 +45,7 @@ export declare class MyMap extends LitElement {
     osVectorTilesApiKey: string;
     osFeaturesApiKey: string;
     osCopyright: string;
+    osProxyEndpoint: string;
     hideResetControl: boolean;
     resetControlImage: ResetControlImageEnum;
     staticMode: boolean;

package/types/components/my-map/os-features.d.ts

@@ -7,6 +7,7 @@ export declare function makeFeatureLayer(color: string, featureFill: boolean, bo
  *   features containing the coordinates of the provided point
  * @param coord - xy coordinate
  * @param apiKey - Ordnance Survey Features API key, sign up here: https://osdatahub.os.uk/plans
+ * @param proxyEndpoint - Endpoint to proxy all requests to Ordnance Survey
  * @param supportClickFeatures - whether the featureSource should support `clickFeatures` mode or be cleared upfront
  */
-export declare function getFeaturesAtPoint(coord: Array<number>, apiKey: any, supportClickFeatures: boolean): void;
+export declare function getFeaturesAtPoint(coord: Array<number>, apiKey: any, proxyEndpoint: string, supportClickFeatures: boolean): void;

package/types/components/my-map/os-layers.d.ts

@@ -1,5 +1,5 @@
 import { Tile as TileLayer } from "ol/layer";
 import VectorTileLayer from "ol/layer/VectorTile";
-import { XYZ } from "ol/source";
-export declare function makeRasterBaseMap(copyright: string, apiKey?: string): TileLayer<XYZ>;
-export declare function makeOsVectorTileBaseMap(copyright: string, apiKey: string): VectorTileLayer;
+import { OSM } from "ol/source";
+export declare function makeRasterBaseMap(apiKey: string, proxyEndpoint: string, copyright: string): TileLayer<OSM>;
+export declare function makeOsVectorTileBaseMap(apiKey: string, proxyEndpoint: string, copyright: string): VectorTileLayer | undefined;

package/types/components/my-map/os-layers.test.d.ts

@@ -0,0 +1,10 @@
+import "./index";
+import type { IWindow } from "happy-dom";
+declare global {
+    interface Window extends IWindow {
+    }
+}
+declare global {
+    interface Window extends IWindow {
+    }
+}

package/types/lib/ordnanceSurvey.d.ts

@@ -0,0 +1,19 @@
+declare type OSServices = "xyz" | "vectorTile" | "vectorTileStyle" | "places" | "features";
+interface ServiceOptions {
+    service: OSServices;
+    apiKey: string;
+    proxyEndpoint: string;
+    params?: Record<string, string>;
+}
+export declare function constructURL(domain: string, path: string, params?: Record<string, string>): string;
+export declare function getOSServiceURL({ service, apiKey, params, }: Omit<ServiceOptions, "proxyEndpoint">): string;
+/**
+ * Generate a proxied OS service URL
+ * XXX: OS API key must be appended to requests by the proxy endpoint
+ */
+export declare function getProxyServiceURL({ service, proxyEndpoint, params, }: Omit<ServiceOptions, "apiKey">): string;
+/**
+ * Get either an OS service URL, or a proxied endpoint to an OS service URL
+ */
+export declare function getServiceURL({ service, apiKey, proxyEndpoint, params, }: ServiceOptions): string;
+export {};

package/types/lib/ordnanceSurvey.test.d.ts

@@ -0,0 +1 @@
+export {};

package/types/test-utils.d.ts

@@ -1,2 +1,3 @@
 export declare function getShadowRoot(customEl: string): ShadowRoot | null | undefined;
 export declare function getShadowRootEl(customEl: string, el: string): Element | null | undefined;
+export declare function setupMap(mapElement: any): Promise<void>;