@jupytergis/base 0.8.0 → 0.8.1

package/lib/commands/index.js

@@ -85,6 +85,7 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
                 'VectorLayer',
                 'ShapefileLayer',
                 'WebGlLayer',
+                'VectorTileLayer',
             ].includes(selectedLayer.type);
             const isIdentifying = current.model.isIdentifying;
             if (isIdentifying && !canIdentify) {
@@ -98,7 +99,12 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
             if (!selectedLayer) {
                 return false;
             }
-            return ['VectorLayer', 'ShapefileLayer', 'WebGlLayer'].includes(selectedLayer.type);
+            return [
+                'VectorLayer',
+                'ShapefileLayer',
+                'WebGlLayer',
+                'VectorTileLayer',
+            ].includes(selectedLayer.type);
         }, execute: args => {
             const current = tracker.currentWidget;
             if (!current) {

package/lib/mainview/mainView.js

@@ -14,7 +14,7 @@ import { Heatmap as HeatmapLayer, Image as ImageLayer, Layer, Vector as VectorLa
 import TileLayer from 'ol/layer/Tile';
 import { fromLonLat, get as getProjection, toLonLat, transformExtent, } from 'ol/proj';
 import { register } from 'ol/proj/proj4.js';
-import RenderFeature from 'ol/render/Feature';
+import RenderFeature, { toGeometry } from 'ol/render/Feature';
 import { GeoTIFF as GeoTIFFSource, ImageTile as ImageTileSource, Vector as VectorSource, VectorTile as VectorTileSource, XYZ as XYZSource, Tile as TileSource, } from 'ol/source';
 import Static from 'ol/source/ImageStatic';
 import { Circle, Fill, Stroke, Style } from 'ol/style';
@@ -664,7 +664,8 @@ export class MainView extends React.Component {
         switch (source.type) {
             case 'RasterSource': {
                 const sourceParameters = source.parameters;
-                const pmTiles = sourceParameters.url.endsWith('.pmtiles');
+                const pmTiles = sourceParameters.url.endsWith('.pmtiles') ||
+                    sourceParameters.url.endsWith('pmtiles.gz');
                 const url = this.computeSourceUrl(source);
                 if (!pmTiles) {
                     newSource = new XYZSource({
@@ -697,7 +698,8 @@ export class MainView extends React.Component {
             }
             case 'VectorTileSource': {
                 const sourceParameters = source.parameters;
-                const pmTiles = sourceParameters.url.endsWith('.pmtiles');
+                const pmTiles = sourceParameters.url.endsWith('.pmtiles') ||
+                    sourceParameters.url.endsWith('pmtiles.gz');
                 const url = this.computeSourceUrl(source);
                 if (!pmTiles) {
                     newSource = new VectorTileSource({
@@ -720,7 +722,10 @@ export class MainView extends React.Component {
                     const tile = event.tile;
                     const features = tile.getFeatures();
                     if (features && features.length > 0) {
-                        this._model.syncTileFeatures({ sourceId: id, features });
+                        this._model.syncTileFeatures({
+                            sourceId: id,
+                            features,
+                        });
                     }
                 });
                 break;
@@ -1587,6 +1592,39 @@ export class MainView extends React.Component {
         const layerId = Object.keys(selectedLayer)[0];
         const jgisLayer = this._model.getLayer(layerId);
         switch (jgisLayer === null || jgisLayer === void 0 ? void 0 : jgisLayer.type) {
+            case 'VectorTileLayer': {
+                const geometries = [];
+                const features = [];
+                this._Map.forEachFeatureAtPixel(e.pixel, (feature) => {
+                    let geom;
+                    if (feature instanceof RenderFeature) {
+                        geom = toGeometry(feature);
+                    }
+                    else if ('getGeometry' in feature) {
+                        geom = feature.getGeometry();
+                    }
+                    const props = feature.getProperties();
+                    if (geom) {
+                        geometries.push(geom);
+                    }
+                    features.push(Object.assign({}, props));
+                    return true;
+                });
+                if (features.length > 0) {
+                    this._model.syncIdentifiedFeatures(features, this._mainViewModel.id);
+                }
+                if (geometries.length > 0) {
+                    for (const geom of geometries) {
+                        this._model.highlightFeatureSignal.emit(geom);
+                    }
+                }
+                else {
+                    const coordinate = this._Map.getCoordinateFromPixel(e.pixel);
+                    const point = new Point(coordinate);
+                    this._model.highlightFeatureSignal.emit(point);
+                }
+                break;
+            }
             case 'WebGlLayer': {
                 const layer = this.getLayer(layerId);
                 const data = layer.getData(e.pixel);

package/lib/panelview/leftpanel.js

@@ -1,12 +1,14 @@
+import { PageConfig } from '@jupyterlab/coreutils';
 import * as React from 'react';
 import { LayersBodyComponent } from './components/layers';
 import { PanelTabs, TabsContent, TabsList, TabsTrigger, } from '../shared/components/Tabs';
 import StacPanel from '../stacBrowser/components/StacPanel';
 import FilterComponent from './components/filter-panel/Filter';
 export const LeftPanel = (props) => {
+    const hideStacPanel = PageConfig.getOption('HIDE_STAC_PANEL') === 'true';
     const tabInfo = [
         { name: 'layers', title: 'Layers' },
-        { name: 'stac', title: 'Stac Browser' },
+        ...(hideStacPanel ? [] : [{ name: 'stac', title: 'Stac Browser' }]),
         { name: 'filters', title: 'Filters' },
     ];
     const [curTab, setCurTab] = React.useState(tabInfo[0].name);
@@ -24,8 +26,8 @@ export const LeftPanel = (props) => {
             })),
             React.createElement(TabsContent, { value: "layers", className: "jgis-panel-tab-content jp-gis-layerPanel" },
                 React.createElement(LayersBodyComponent, { model: props.model, commands: props.commands, state: props.state })),
-            React.createElement(TabsContent, { value: "stac" },
-                React.createElement(StacPanel, { model: props.model })),
+            !hideStacPanel && (React.createElement(TabsContent, { value: "stac" },
+                React.createElement(StacPanel, { model: props.model }))),
             React.createElement(TabsContent, { value: "filters", className: "jgis-panel-tab-content" },
                 React.createElement(FilterComponent, { model: props.model }),
                 ","))));

package/lib/panelview/rightpanel.js

@@ -1,13 +1,17 @@
+import { PageConfig } from '@jupyterlab/coreutils';
 import * as React from 'react';
 import { AnnotationsPanel } from './annotationPanel';
 import { IdentifyPanelComponent } from './components/identify-panel/IdentifyPanel';
 import { ObjectPropertiesReact } from './objectproperties';
 import { PanelTabs, TabsContent, TabsList, TabsTrigger, } from '../shared/components/Tabs';
 export const RightPanel = props => {
+    const hideAnnotationPanel = PageConfig.getOption('HIDE_ANNOTATION_PANEL') === 'true';
     const [selectedObjectProperties, setSelectedObjectProperties] = React.useState(undefined);
     const tabInfo = [
         { name: 'objectProperties', title: 'Object Properties' },
-        { name: 'annotations', title: 'Annotations' },
+        ...(hideAnnotationPanel
+            ? []
+            : [{ name: 'annotations', title: 'Annotations' }]),
         { name: 'identifyPanel', title: 'Identify Features' },
     ];
     const [curTab, setCurTab] = React.useState(tabInfo[0].name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/base",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "A JupyterLab extension for 3D modelling.",
   "keywords": [
     "jupyter",
@@ -44,7 +44,7 @@
     "@jupyter/collaboration": "^3.1.0",
     "@jupyter/react-components": "^0.16.6",
     "@jupyter/ydoc": "^2.0.0 || ^3.0.0",
-    "@jupytergis/schema": "^0.8.0",
+    "@jupytergis/schema": "^0.8.1",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",