@jupytergis/base 0.1.7 → 0.2.1

package/lib/formbuilder/objectform/geojsonsource.js

@@ -1,6 +1,6 @@
 import { showErrorMessage } from '@jupyterlab/apputils';
 import { Ajv } from 'ajv';
-import * as geojson from 'geojson-schema/GeoJSON.json';
+import * as geojson from '@jupytergis/schema/src/schema/geojson.json';
 import { BaseForm } from './baseform';
 /**
  * The form to modify a GeoJSON source.
@@ -45,36 +45,39 @@ export class GeoJSONSourcePropertiesForm extends BaseForm {
      * @param path - the path to validate.
      */
     async _validatePath(path) {
-        const extraErrors = {
-            path: {
-                __errors: []
+        var _a;
+        const extraErrors = this.state.extraErrors;
+        let error = '';
+        let valid = false;
+        if (path) {
+            try {
+                const geoJSONData = await this.props.model.readGeoJSON(path);
+                valid = this._validate(geoJSONData);
+                if (!valid) {
+                    error = `"${path}" is not a valid GeoJSON file`;
+                }
             }
-        };
-        this.props.model
-            .readGeoJSON(path)
-            .then(async (geoJSONData) => {
-            var _a;
-            const valid = this._validate(geoJSONData);
-            if (!valid) {
-                extraErrors.path.__errors = [`"${path}" is not a valid GeoJSON file`];
-                (_a = this._validate.errors) === null || _a === void 0 ? void 0 : _a.reverse().forEach(error => {
-                    extraErrors.path.__errors.push(error.message);
-                });
+            catch (e) {
+                error = `"${path}" is not a valid GeoJSON file: ${e}`;
             }
-            else {
-                delete extraErrors.path;
-            }
-            this.setState({ extraErrors });
-            if (this.props.formErrorSignal) {
-                this.props.formErrorSignal.emit(!valid);
-            }
-        })
-            .catch(e => {
-            extraErrors.path.__errors = [`Cannot read "${path}"`];
-            this.setState({ extraErrors });
-            if (this.props.formErrorSignal) {
-                this.props.formErrorSignal.emit(true);
-            }
-        });
+        }
+        else {
+            error = 'Path is required';
+        }
+        if (!valid) {
+            extraErrors.path = {
+                __errors: [error]
+            };
+            (_a = this._validate.errors) === null || _a === void 0 ? void 0 : _a.reverse().forEach(error => {
+                extraErrors.path.__errors.push(error.message);
+            });
+            this.setState(old => (Object.assign(Object.assign({}, old), { extraErrors })));
+        }
+        else {
+            this.setState(old => (Object.assign(Object.assign({}, old), { extraErrors: Object.assign(Object.assign({}, extraErrors), { path: { __errors: [] } }) })));
+        }
+        if (this.props.formErrorSignal) {
+            this.props.formErrorSignal.emit(!valid);
+        }
     }
 }

package/lib/formbuilder/objectform/geotiffsource.d.ts

@@ -0,0 +1,16 @@
+import { IChangeEvent, ISubmitEvent } from '@rjsf/core';
+import { BaseForm, IBaseFormProps } from './baseform';
+/**
+ * The form to modify a GeoTiff source.
+ */
+export declare class GeoTiffSourcePropertiesForm extends BaseForm {
+    constructor(props: IBaseFormProps);
+    protected onFormChange(e: IChangeEvent): void;
+    protected onFormSubmit(e: ISubmitEvent<any>): void;
+    /**
+     * Validate the URLs, ensuring that there is at least one object with required fields.
+     *
+     * @param urls - the URLs array to validate.
+     */
+    private _validateUrls;
+}

package/lib/formbuilder/objectform/geotiffsource.js

@@ -0,0 +1,71 @@
+import { showErrorMessage } from '@jupyterlab/apputils';
+import { BaseForm } from './baseform';
+/**
+ * The form to modify a GeoTiff source.
+ */
+export class GeoTiffSourcePropertiesForm extends BaseForm {
+    constructor(props) {
+        var _a, _b;
+        super(props);
+        this._validateUrls((_b = (_a = props.sourceData) === null || _a === void 0 ? void 0 : _a.urls) !== null && _b !== void 0 ? _b : []);
+    }
+    onFormChange(e) {
+        var _a;
+        super.onFormChange(e);
+        if ((_a = e.formData) === null || _a === void 0 ? void 0 : _a.urls) {
+            this._validateUrls(e.formData.urls);
+        }
+    }
+    onFormSubmit(e) {
+        var _a, _b, _c;
+        if (((_c = (_b = (_a = this.state.extraErrors) === null || _a === void 0 ? void 0 : _a.urls) === null || _b === void 0 ? void 0 : _b.__errors) === null || _c === void 0 ? void 0 : _c.length) >= 1) {
+            showErrorMessage('Invalid URLs', this.state.extraErrors.urls.__errors[0]);
+            return;
+        }
+        super.onFormSubmit(e);
+    }
+    /**
+     * Validate the URLs, ensuring that there is at least one object with required fields.
+     *
+     * @param urls - the URLs array to validate.
+     */
+    async _validateUrls(urls) {
+        const extraErrors = this.state.extraErrors;
+        const errors = [];
+        let valid = true;
+        if (urls && urls.length > 0) {
+            for (let i = 0; i < urls.length; i++) {
+                const { url, min, max } = urls[i];
+                if (!url || typeof url !== 'string' || url.trim() === '') {
+                    errors.push(`URL at index ${i} is required and must be a valid string.`);
+                    valid = false;
+                }
+                if (min === undefined || typeof min !== 'number') {
+                    errors.push(`Min value at index ${i} is required and must be a number.`);
+                    valid = false;
+                }
+                if (max === undefined || typeof max !== 'number') {
+                    errors.push(`Max value at index ${i} is required and must be a number.`);
+                    valid = false;
+                }
+                if (typeof min === 'number' && typeof max === 'number' && max <= min) {
+                    errors.push(`Max value at index ${i} must be greater than Min.`);
+                    valid = false;
+                }
+            }
+        }
+        else {
+            errors.push('At least one valid URL with min/max values is required.');
+            valid = false;
+        }
+        if (!valid) {
+            this.setState(old => (Object.assign(Object.assign({}, old), { extraErrors: Object.assign(Object.assign({}, extraErrors), { urls: { __errors: errors } }) })));
+        }
+        else {
+            this.setState(old => (Object.assign(Object.assign({}, old), { extraErrors: Object.assign(Object.assign({}, extraErrors), { urls: { __errors: [] } }) })));
+        }
+        if (this.props.formErrorSignal) {
+            this.props.formErrorSignal.emit(!valid);
+        }
+    }
+}

package/lib/index.d.ts

@@ -11,3 +11,4 @@ export * from './toolbar';
 export * from './tools';
 export * from './types';
 export * from './widget';
+export * from './annotations';

package/lib/index.js

@@ -11,3 +11,4 @@ export * from './toolbar';
 export * from './tools';
 export * from './types';
 export * from './widget';
+export * from './annotations';

package/lib/mainview/CollaboratorPointers.d.ts

@@ -0,0 +1,17 @@
+import { IDict, JgisCoordinates } from '@jupytergis/schema';
+import React from 'react';
+interface ICollaboratorPointersProps {
+    clients: IDict<ClientPointer>;
+}
+export type ClientPointer = {
+    username: string;
+    displayName: string;
+    color: string;
+    coordinates: JgisCoordinates;
+    lonLat: {
+        latitude: number;
+        longitude: number;
+    };
+};
+declare const CollaboratorPointers: ({ clients }: ICollaboratorPointersProps) => React.JSX.Element;
+export default CollaboratorPointers;

package/lib/mainview/CollaboratorPointers.js

@@ -0,0 +1,37 @@
+import { faArrowPointer, faWindowMinimize } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import React, { useState } from 'react';
+const CollaboratorPointers = ({ clients }) => {
+    const [isOpen, setIsOpen] = useState(false);
+    return (React.createElement(React.Fragment, null, clients &&
+        Object.values(clients).map(client => (React.createElement("div", { className: "jGIS-Popup-Wrapper", style: {
+                left: `${client.coordinates.x}px`,
+                top: `${client.coordinates.y}px`
+            } },
+            React.createElement("div", { key: client.username, className: "jGIS-Remote-Pointer", style: {
+                    color: client.color,
+                    cursor: 'pointer'
+                }, onClick: () => {
+                    setIsOpen(!isOpen);
+                } },
+                React.createElement(FontAwesomeIcon, { icon: faArrowPointer, className: "jGIS-Remote-Pointer-Icon" })),
+            React.createElement("div", { style: {
+                    visibility: isOpen ? 'visible' : 'hidden',
+                    background: client.color
+                }, className: "jGIS-Remote-Pointer-Popup jGIS-Floating-Pointer-Popup" },
+                React.createElement("div", { className: "jGIS-Popup-Topbar", onClick: () => {
+                        setIsOpen(false);
+                    } },
+                    React.createElement(FontAwesomeIcon, { icon: faWindowMinimize, className: "jGIS-Popup-TopBarIcon" })),
+                React.createElement("div", { className: "jGIS-Remote-Pointer-Popup-Name" }, client.displayName),
+                React.createElement("div", { className: "jGIS-Remote-Pointer-Popup-Coordinates" },
+                    React.createElement("br", null),
+                    "Pointer Location:",
+                    React.createElement("br", null),
+                    "Longitude: ",
+                    client.lonLat.longitude.toFixed(2),
+                    React.createElement("br", null),
+                    "Latitude: ",
+                    client.lonLat.latitude.toFixed(2))))))));
+};
+export default CollaboratorPointers;

package/lib/mainview/FollowIndicator.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import { User } from '@jupyterlab/services';
+interface IFollowIndicatorProps {
+    remoteUser: User.IIdentity | null | undefined;
+}
+export declare function FollowIndicator({ remoteUser }: IFollowIndicatorProps): React.JSX.Element | null;
+export {};

package/lib/mainview/FollowIndicator.js

@@ -0,0 +1,9 @@
+import React from 'react';
+export function FollowIndicator({ remoteUser }) {
+    return (remoteUser === null || remoteUser === void 0 ? void 0 : remoteUser.display_name) ? (React.createElement("div", { style: {
+            position: 'absolute',
+            top: 1,
+            right: 3,
+            background: remoteUser.color
+        } }, `Following ${remoteUser.display_name}`)) : null;
+}

package/lib/mainview/mainView.d.ts

@@ -1,8 +1,9 @@
-import { IJGISLayer, IJGISSource } from '@jupytergis/schema';
+import { IAnnotation, IDict, IJGISLayer, IJGISSource } from '@jupytergis/schema';
 import { User } from '@jupyterlab/services';
 import BaseLayer from 'ol/layer/Base';
 import * as React from 'react';
 import { MainViewModel } from './mainviewmodel';
+import { ClientPointer } from './CollaboratorPointers';
 interface IProps {
     viewModel: MainViewModel;
 }
@@ -12,13 +13,17 @@ interface IStates {
     lightTheme: boolean;
     remoteUser?: User.IIdentity | null;
     firstLoad: boolean;
+    annotations: IDict<IAnnotation>;
+    clientPointers: IDict<ClientPointer>;
 }
 export declare class MainView extends React.Component<IProps, IStates> {
     constructor(props: IProps);
     componentDidMount(): Promise<void>;
     componentWillUnmount(): void;
     generateScene(): Promise<void>;
+    addContextMenu: () => void;
     private _loadShapefileAsGeoJSON;
+    private _loadGeoTIFFWithCache;
     /**
      * Add a source in the map.
      *
@@ -46,6 +51,12 @@ export declare class MainView extends React.Component<IProps, IStates> {
      * @param layerIds - the list of layers in the depth order (beneath first).
      */
     updateLayers(layerIds: string[]): void;
+    /**
+     * Updates the position and existence of layers in the OL map based on the layer IDs.
+     *
+     * @param layerIds - An array of layer IDs that should be present on the map.
+     * @returns {} Nothing is returned.
+     */
     private _updateLayersImpl;
     /**
      * Build the map layer.
@@ -95,17 +106,39 @@ export declare class MainView extends React.Component<IProps, IStates> {
      * @param id Layer to retrieve
      */
     private getLayer;
+    /**
+     * Convenience method to get a specific layer index from OpenLayers Map
+     * @param id Layer to retrieve
+     */
+    private getLayerIndex;
     /**
      * Convenience method to get list layer IDs from the OpenLayers Map
      */
-    private getLayers;
+    private getLayerIDs;
+    /**
+     * Move layer `id` in the stack to `index`.
+     *
+     * @param id - id of the layer.
+     * @param index - expected index of the layer.
+     */
+    moveLayer(id: string, index: number): void;
     private _onLayersChanged;
     private _onLayerTreeChange;
     private _onSourcesChange;
     private _onSharedModelStateChange;
+    private _onSharedMetadataChanged;
+    private _computeAnnotationPosition;
+    private _updateAnnotation;
+    private _onZoomToAnnotation;
+    private _moveToPosition;
+    private _onPointerMove;
+    private _syncPointer;
+    private _identifyFeature;
     private _handleThemeChange;
     private _handleWindowResize;
     render(): JSX.Element;
+    private _clickCoords;
+    private _commands;
     private _initializedPosition;
     private divRef;
     private _Map;
@@ -115,5 +148,6 @@ export declare class MainView extends React.Component<IProps, IStates> {
     private _sources;
     private _sourceToLayerMap;
     private _documentPath?;
+    private _contextMenu;
 }
 export {};