@overmap-ai/core 1.0.60-forms-removal.3 → 1.0.60-forms-removal.5

package/dist/store/slices/projectFileSlice.d.ts

@@ -1,6 +1,5 @@
 import { Reducer } from "@reduxjs/toolkit";
-import L from "leaflet";
-import { ProjectFile, OvermapRootState, OvermapSelector } from "../../typings";
+import { ProjectFile, OvermapRootState, OvermapSelector, MultiPointGeometry } from "../../typings";
 export interface ProjectFileState {
     projectFiles: Record<string, ProjectFile>;
     activeProjectFileId: string | null;
@@ -28,7 +27,7 @@ export declare const projectFileSlice: import("@reduxjs/toolkit").Slice<ProjectF
         payload: boolean;
     }) => void;
     saveActiveProjectFileBounds: (state: import("immer/dist/internal.js").WritableDraft<ProjectFileState>, action: {
-        payload: [L.LatLngTuple, L.LatLngTuple];
+        payload: MultiPointGeometry;
     }) => void;
     setActiveProjectFileId: (state: import("immer/dist/internal.js").WritableDraft<ProjectFileState>, action: {
         payload: string | null;
@@ -44,7 +43,7 @@ export declare const projectFileSlice: import("@reduxjs/toolkit").Slice<ProjectF
 export declare const addOrReplaceProjectFiles: import("@reduxjs/toolkit").ActionCreatorWithPayload<ProjectFile[], "projectFiles/addOrReplaceProjectFiles">, addOrReplaceProjectFile: import("@reduxjs/toolkit").ActionCreatorWithPayload<ProjectFile, "projectFiles/addOrReplaceProjectFile">, setProjectFileVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     fileId: string;
     visible: boolean;
-}, "projectFiles/setProjectFileVisible">, setIsImportingProjectFile: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "projectFiles/setIsImportingProjectFile">, setActiveProjectFileId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string | null, "projectFiles/setActiveProjectFileId">, saveActiveProjectFileBounds: import("@reduxjs/toolkit").ActionCreatorWithPayload<[L.LatLngTuple, L.LatLngTuple], "projectFiles/saveActiveProjectFileBounds">, removeProjectFile: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "projectFiles/removeProjectFile">, removeProjectFilesOfProject: import("@reduxjs/toolkit").ActionCreatorWithPayload<number, "projectFiles/removeProjectFilesOfProject">, resetProjectFileObjectUrls: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"projectFiles/resetProjectFileObjectUrls">;
+}, "projectFiles/setProjectFileVisible">, setIsImportingProjectFile: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "projectFiles/setIsImportingProjectFile">, setActiveProjectFileId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string | null, "projectFiles/setActiveProjectFileId">, saveActiveProjectFileBounds: import("@reduxjs/toolkit").ActionCreatorWithPayload<MultiPointGeometry, "projectFiles/saveActiveProjectFileBounds">, removeProjectFile: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "projectFiles/removeProjectFile">, removeProjectFilesOfProject: import("@reduxjs/toolkit").ActionCreatorWithPayload<number, "projectFiles/removeProjectFilesOfProject">, resetProjectFileObjectUrls: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"projectFiles/resetProjectFileObjectUrls">;
 export declare const selectEnabledProjectFiles: (state: OvermapRootState) => Record<string, boolean | undefined>;
 export declare const selectProjectFileVisibility: OvermapSelector<Record<string, boolean>>;
 export declare const selectEnabledProjectFileMapping: (state: OvermapRootState) => Record<string, ProjectFile>;

package/dist/typings/models/{components.d.ts → assets.d.ts}

@@ -1,7 +1,6 @@
 import { IconModel, Model, OfflineModel } from "./base";
-import { Marker } from "./geo";
-export interface Asset extends OfflineModel {
-    marker: Marker | null;
+import { RequiredMarkableModel } from "./geo";
+export interface Asset extends OfflineModel, RequiredMarkableModel {
     asset_type: string;
     created_at?: string;
     label: string | null;

package/dist/typings/models/canvas.d.ts

@@ -0,0 +1,10 @@
+export interface CanvasModel {
+    canvas_marker_x: number;
+    canvas_marker_y: number;
+}
+export interface CanvasBoundedModel {
+    canvas_bounds_min_x: number;
+    canvas_bounds_min_y: number;
+    canvas_bounds_max_x: number;
+    canvas_bounds_max_y: number;
+}

package/dist/typings/models/forms.d.ts

@@ -1,7 +1,6 @@
 import { HTMLInputTypeAttribute } from "react";
 import { CreatedByModel, OfflineModel, Payload, SubmittedAtModel } from "./base";
 import { FileWithNameModel } from '../files';
-import { Marker } from "./geo";
 export interface BaseSerializedField<TIdentifier extends FieldTypeIdentifier = FieldTypeIdentifier> extends BaseSerializedObject<TIdentifier> {
     label: string;
     required: boolean;
@@ -80,7 +79,7 @@ export interface SerializedUploadField extends BaseSerializedField {
 export type ISerializedField = SerializedTextField | SerializedBooleanField | SerializedNumberField | SerializedDateField | SerializedStringField | SerializedSelectField | SerializedFieldSection | SerializedMultiStringField | SerializedMultiSelectField | SerializedUploadField | SerializedQrField;
 export type ISerializedOnlyField = Exclude<ISerializedField, SerializedFieldSection>;
 /** All the possible field values */
-export type FieldValue = string | number | boolean | string[] | File[] | Date | Marker | null;
+export type FieldValue = string | number | boolean | string[] | File[] | Date | null;
 export type FieldTypeIdentifier = "string" | "text" | "boolean" | "number" | "date" | "select" | "custom" | "section" | "multi-string" | "multi-select" | "upload" | "qr";
 export interface BaseSerializedObject<TIdentifier extends FieldTypeIdentifier = FieldTypeIdentifier> {
     description?: string | null;

package/dist/typings/models/geo.d.ts

@@ -1,10 +1,18 @@
 export type Coordinates = [number, number];
-export interface Geometry {
-    type: string;
+export interface PointGeometry {
+    type: "Point";
     coordinates: Coordinates;
 }
-export interface Marker {
-    type: "Feature";
-    geometry: Geometry;
-    properties: object;
+export interface MultiPointGeometry {
+    type: "MultiPoint";
+    coordinates: [Coordinates, Coordinates];
+}
+export interface RequiredBoundableModel {
+    geo_bounds: MultiPointGeometry;
+}
+export interface RequiredMarkableModel {
+    geo_marker: PointGeometry;
+}
+export interface MarkableModel {
+    geo_marker?: PointGeometry;
 }

package/dist/typings/models/index.d.ts

@@ -2,7 +2,8 @@ export * from "./access";
 export * from "./attachments";
 export * from "./base";
 export * from "./categories";
-export * from "./components";
+export * from "./assets";
+export * from "./canvas";
 export * from "./forms";
 export * from "./geo";
 export * from "./issues";

package/dist/typings/models/issues.d.ts

@@ -1,7 +1,7 @@
 import { CreatedByModel, Offline, OfflineModel } from "./base";
 import { IssuePriority, IssueStatus } from "../../enums";
 import { WorkspaceIndexedModel } from "./workspace";
-import { Marker } from "./geo";
+import { MarkableModel } from "./geo";
 import { CreatedUserForm, SubmittedUserForm, UserForm } from "./forms";
 import { User } from "./users";
 import { CSSColor } from "../colors";
@@ -27,7 +27,7 @@ export type Stored<TModel> = Created<TModel> | Submitted<TModel>;
  * Represents the properties you can always expect on any object representing an issue. These are the minimal details
  * required when creating an issue.
  */
-export interface Issue extends Pick<WorkspaceIndexedModel, "index_workspace"> {
+export interface Issue extends Pick<WorkspaceIndexedModel, "index_workspace">, MarkableModel {
     title?: string | null;
     description?: string | null;
     priority?: IssuePriority;
@@ -36,7 +36,6 @@ export interface Issue extends Pick<WorkspaceIndexedModel, "index_workspace"> {
     due_date?: string | Date | null;
     category?: string | null;
     visible_in_workspaces: string[];
-    marker?: Marker | null;
     issue_type?: string | null;
 }
 /**
@@ -57,7 +56,7 @@ export interface CreatedIssue extends SubmittedIssue, Pick<WorkspaceIndexedModel
     assigned_to: Exclude<Issue["assigned_to"], undefined>;
     due_date: Exclude<Issue["due_date"], undefined>;
     category: Exclude<Issue["category"], undefined>;
-    marker: Exclude<Issue["marker"], undefined>;
+    geo_marker: Exclude<Issue["geo_marker"], undefined>;
     created_at: string;
 }
 export interface IssueComment extends OfflineModel {

package/dist/typings/models/projects.d.ts

@@ -1,20 +1,18 @@
 import { Model, OfflineModel } from "./base";
-import L from "leaflet";
 import { FileWithNameModel } from "../files";
-export interface Project extends Model {
+import { RequiredBoundableModel } from "./geo";
+export interface Project extends Model, RequiredBoundableModel {
     id: number;
     name: string;
     owner_organization: number | null;
     owner_user: number | null;
-    bounds: [L.LatLngTuple, L.LatLngTuple] | undefined;
     invited?: boolean;
     issues_count?: number;
     form_submissions_count?: number;
 }
-export interface ProjectFile extends OfflineModel, FileWithNameModel {
+export interface ProjectFile extends OfflineModel, FileWithNameModel, RequiredBoundableModel {
     submitted_at: string;
     z_index: number;
-    bounds?: [L.LatLngTuple, L.LatLngTuple];
     project: number;
 }
 export type ProjectPayload = Omit<Project, "id" | "file" | "fileBlob">;

package/dist/utils/coordinates.d.ts

@@ -1,20 +1,17 @@
 import L from "leaflet";
-import { Coordinates, Geometry, Marker } from "../typings";
+import { Coordinates, MultiPointGeometry, PointGeometry } from "../typings";
 export declare const coordinatesToLiteral: (coordinates: Coordinates) => L.LatLngLiteral;
 export declare const literalToCoordinates: (literal: L.LatLngLiteral) => Coordinates;
 /**
  * Flip coordinates from [lng, lat] to [lat, lng]
  */
 export declare const flipCoordinates: (coordinates: L.LatLngTuple) => Coordinates;
-export declare const markerToCoordinates: (marker: Marker) => Coordinates;
 export declare function offsetPositionByMeters(originalPosition: L.LatLng, latMeters: number, lngMeters: number): L.LatLngLiteral;
-export declare const coordinatesToPointGeometry: (coordinates: Coordinates) => Geometry;
-export declare const createPointMarker: (coordinates: Coordinates) => Marker;
+export declare const createPointGeometry: (coordinates: Coordinates) => PointGeometry;
 export declare const coordinatesAreEqual: (a: Coordinates, b: Coordinates) => boolean;
 export declare const coordinatesToText: (coordinates: Coordinates | null | undefined, decimalPlaces?: number) => string;
 export declare const coordinatesToUrlText: (coordinates: Coordinates) => string;
-export declare const getMarkerCoordinates: (marker: Marker | null) => Coordinates | undefined;
-export declare const markerCoordinatesToText: (marker: Marker | null, decimalPlaces?: number) => string;
 export declare const openCoordsInGoogleMaps: (coordinates: Coordinates) => void;
 export declare const openDirectionsInGoogleMaps: (startingPoint: Coordinates, destination: Coordinates) => void;
-export declare const worldBounds: [L.LatLngTuple, L.LatLngTuple];
+export declare const worldBounds: MultiPointGeometry;
+export declare const createMultiPointGeometry: (coordinates: [Coordinates, Coordinates]) => MultiPointGeometry;

package/package.json

@@ -3,7 +3,7 @@
 	"description": "Core functionality for Overmap",
 	"author": "Wôrdn Inc.",
 	"license": "UNLICENSED",
-	"version": "1.0.60-forms-removal.3",
+	"version": "1.0.60-forms-removal.5",
 	"type": "module",
 	"main": "dist/overmap-core.umd.cjs",
 	"module": "dist/overmap-core.js",