@map-colonies/react-components 3.11.0 → 3.12.3

package/dist/cesium-map/settings/settings.css

@@ -3,7 +3,8 @@
   gap: 8px;
 }
 
-.settingsIconContainer {
+.settingsIconContainer,
+.mapLegendToggleContainer {
   fill: #fff;
   width: 40px;
   height: 40px;
@@ -12,7 +13,8 @@
   border-radius: 4px;
 }
 
-.settingsIconContainer:hover {
+.settingsIconContainer:hover,
+.mapLegendToggleContainer:hover {
   background: #48b;
   border-color: #aef;
 }
@@ -35,6 +37,7 @@
 .settingsDialogPortal .mdc-dialog__container {
   align-items: unset;
 }
+
 .settingsDialogPortal .mdc-dialog .mdc-dialog__surface {
   max-height: unset;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@map-colonies/react-components",
-  "version": "3.11.0",
+  "version": "3.12.3",
   "module": "dist/index.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@here/quantized-mesh-decoder": "^1.2.8",
-    "@map-colonies/react-core": "^3.3.2",
+    "@map-colonies/react-core": "^3.3.4",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/pickers": "^3.2.10",
@@ -93,7 +93,7 @@
     "jest-enzyme": "^7.1.2",
     "react-test-renderer": "^16.13.1"
   },
-  "gitHead": "52e983d1180b9fc19719b68e4bbc8745cf5d4581",
+  "gitHead": "33c540f10086a5b076f026b6c8f2d5b800ce4d8f",
   "jest": {
     "coverageReporters": [
       "text",

package/src/lib/cesium-map/data-sources/drawings.data-source.tsx

@@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react';
 import { Cartesian3, Color, Rectangle, PolygonHierarchy } from 'cesium';
 import { FeatureCollection, GeoJSON } from 'geojson';
 import { CustomDataSourceProps } from 'resium/dist/types/src/CustomDataSource/CustomDataSource';
-
 import { DrawType } from '../../models';
 import { CesiumEntity } from '../entities/entity';
 import { CesiumEntityStaticDescription } from '../entities/entity.description';

package/src/lib/cesium-map/index.ts

@@ -5,3 +5,4 @@ export * from '../utils/projections';
 export * from './entities';
 export * from './data-sources';
 export * from './proxied.types';
+export * from './layers-manager';

package/src/lib/cesium-map/layers/imagery.layer.tsx

@@ -18,13 +18,18 @@ export const CesiumImageryLayer: React.FC<RCesiumImageryLayerProps> = (
   useLayoutEffect(() => {
     mapViewer.layersManager?.addMetaToLayer(
       meta,
-      (layer: ImageryLayer, idx: number): boolean => {
-        if (meta !== undefined) {
-          // eslint-disable-next-line
-          return (layer as any)._imageryProvider._resource._url === meta.url;
-        }
-        return false;
-      }
+      /* eslint-disable */
+      meta.searchLayerPredicate ??
+        ((layer: ImageryLayer, idx: number): boolean => {
+          if (meta !== undefined) {
+            return (
+              (layer as any)._imageryProvider._resource._url ===
+              meta.options.url
+            );
+          }
+          return false;
+        })
+      /* eslint-enable */
     );
   }, [meta, mapViewer]);
 

package/src/lib/cesium-map/layers-manager.ts

@@ -4,6 +4,7 @@ import {
   UrlTemplateImageryProvider,
   WebMapServiceImageryProvider,
   WebMapTileServiceImageryProvider,
+  Event,
 } from 'cesium';
 import { get } from 'lodash';
 import { Feature, Point, Polygon } from 'geojson';
@@ -17,6 +18,7 @@ import {
 import { CesiumViewer } from './map';
 import { IBaseMap } from './settings/settings';
 import { pointToGeoJSON } from './tools/geojson/point.geojson';
+import { IMapLegend } from './map-legend';
 
 const INC = 1;
 const DEC = -1;
@@ -48,15 +50,34 @@ export interface IVectorLayer {
   url: string;
 }
 
+export type LegendExtractor = (layers: (any & { meta: any })[]) => IMapLegend[];
+
 class LayerManager {
   public mapViewer: CesiumViewer;
 
+  public legendsList: IMapLegend[];
+  public layerUpdated: Event;
   private readonly layers: ICesiumImageryLayer[];
+  private readonly legendsExtractor?: LegendExtractor;
 
-  public constructor(mapViewer: CesiumViewer) {
+  public constructor(
+    mapViewer: CesiumViewer,
+    legendsExtractor?: LegendExtractor,
+    onLayersUpdate?: () => void
+  ) {
     this.mapViewer = mapViewer;
     // eslint-disable-next-line
     this.layers = (this.mapViewer.imageryLayers as any)._layers;
+    this.legendsList = [];
+    this.legendsExtractor = legendsExtractor;
+    this.layerUpdated = new Event();
+    if (onLayersUpdate) {
+      this.layerUpdated.addEventListener(onLayersUpdate, this);
+    }
+    this.mapViewer.imageryLayers.layerRemoved.addEventListener(() => {
+      this.setLegends();
+      this.layerUpdated.raiseEvent();
+    });
   }
 
   /* eslint-disable */
@@ -67,6 +88,8 @@ class LayerManager {
     const layer = this.layers.find(layerPredicate);
     if (layer) {
       layer.meta = meta;
+      this.setLegends();
+      this.layerUpdated.raiseEvent();
     }
   }
   /* eslint-enable */
@@ -287,6 +310,12 @@ class LayerManager {
     });
   }
 
+  private setLegends(): void {
+    if (typeof this.legendsExtractor !== 'undefined') {
+      this.legendsList = this.legendsExtractor(this.layers);
+    }
+  }
+
   private getBaseLayersCount(): number {
     const baseLayers = this.layers.filter((layer) => {
       const parentId = get(layer.meta, 'parentBasetMapId') as string;

package/src/lib/cesium-map/map-legend/MapLegend.css

@@ -0,0 +1,135 @@
+.mapLegendSidebarContainer {
+  width: 340px;
+  height: 100%;
+  position: relative;
+  overflow-y: auto;
+  overflow-x: hidden;
+  font-size: 16px;
+}
+
+/* Disable drawer animation */
+
+.mapLegendSidebarContainer.mdc-drawer--animate {
+  transform: translateX(0) !important;
+  transition: none !important;
+}
+
+.mapLegendSidebarContainer.mdc-drawer--dismissible {
+  position: relative;
+}
+
+div.MuiPaper-root {
+  transition: none !important;
+}
+
+.mapLegendCloseBtn {
+  position: absolute;
+  top: 0;
+  right: 0;
+  cursor: pointer;
+  width: 50px;
+  height: 50px;
+  padding: 20px;
+  font-size: 24px;
+}
+
+body[dir='rtl'] .mapLegendCloseBtn {
+  right: unset;
+  left: 0;
+}
+
+.mapLegendToggleContainer {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.mapLegendIcon {
+  width: 2.5rem;
+  height: 2.5rem;
+}
+
+.sidebarHeaderContainer {
+  text-align: center;
+  margin-top: 40px;
+}
+
+.sidebarTitle {
+  font-size: 1.5rem;
+  font-weight: bold;
+}
+
+.mapLegend {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+  padding: 10px 14px;
+}
+
+.layerNameContainer {
+  width: 90%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.layerName {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.legendImg {
+  width: 90%;
+  height: 150px;
+  border: 1px solid black;
+  border-radius: 5px;
+  object-fit: cover;
+  cursor: pointer;
+}
+
+.legendActionsContainer {
+  display: flex;
+  flex-direction: row;
+  align-self: center;
+}
+
+.legendAction:not(:last-child)::after {
+  content: '|';
+  margin: 0px 4px;
+}
+
+.mapLegendsList {
+  display: flex;
+  flex-direction: column;
+  padding: 20px 0px;
+  width: 100%;
+  height: 90%;
+}
+
+.legendAction {
+  text-decoration: underline;
+  cursor: pointer;
+  font-size: 1.1rem;
+  transition: all 0.1s ease-in-out;
+  width: max-content;
+}
+
+.legendAction:hover {
+  filter: brightness(1.2);
+}
+
+.noLegendsContainer {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.noLegendsMsg {
+  text-align: center;
+}

package/src/lib/cesium-map/map-legend/MapLegend.tsx

@@ -0,0 +1,92 @@
+import React, { useCallback } from 'react';
+import { Tooltip } from '@map-colonies/react-core';
+import { Box } from '../../box';
+
+import './MapLegend.css';
+
+export interface IMapLegend {
+  layer?: string;
+  legendDoc?: string;
+  legendImg?: string;
+  legend?: Record<string, unknown>[];
+}
+interface MapLegendProps {
+  legend: IMapLegend;
+  docText?: string;
+  imgText?: string;
+}
+
+export const MapLegend: React.FC<MapLegendProps> = ({
+  legend: { legendImg, legendDoc, layer },
+  docText,
+  imgText,
+}) => {
+  const handleLegendImgOpen = useCallback(() => {
+    // Open image in a new tab.
+    window.open(legendImg, '_blank');
+  }, [legendImg]);
+
+  const handleLegendDocOpen = useCallback(() => {
+    // Open doc in a new tab.
+    window.open(legendDoc, '_blank');
+  }, [legendDoc]);
+
+  const renderLayerName = useCallback(() => {
+    const MAX_LAYER_NAME_LENGTH = 15;
+
+    const layerNameContainer = (
+      <Box className="layerNameContainer">
+        <h3
+          style={{ maxWidth: `${MAX_LAYER_NAME_LENGTH}ch` }}
+          className="layerName"
+        >
+          {layer}
+        </h3>
+      </Box>
+    );
+
+    if ((layer ?? '').length > MAX_LAYER_NAME_LENGTH) {
+      return <Tooltip content={layer}>{layerNameContainer}</Tooltip>;
+    }
+
+    return layerNameContainer;
+  }, [layer]);
+
+  const renderLinks = useCallback(() => {
+    return [
+      typeof legendImg === 'string' && (
+        <a
+          className="legendAction"
+          href={legendImg}
+          target="_blank"
+          rel="noreferrer"
+        >
+          {imgText}
+        </a>
+      ),
+      typeof legendDoc === 'string' && (
+        <a
+          className="legendAction"
+          href={legendDoc}
+          target="_blank"
+          rel="noreferrer"
+        >
+          {docText}
+        </a>
+      ),
+    ];
+  }, [legendImg, imgText, legendDoc, docText]);
+
+  return (
+    <Box className="mapLegend">
+      {renderLayerName()}
+      <img
+        alt="Map Legend"
+        className="legendImg"
+        src={legendImg}
+        onClick={handleLegendImgOpen}
+      />
+      <Box className="legendActionsContainer">{renderLinks()}</Box>
+    </Box>
+  );
+};

package/src/lib/cesium-map/map-legend/MapLegendList.tsx

@@ -0,0 +1,47 @@
+import React, { useCallback } from 'react';
+import { Box } from '../../box';
+import { IMapLegend, MapLegend } from './MapLegend';
+
+import './MapLegend.css';
+
+interface MapLegendListProps {
+  legends: IMapLegend[];
+  actionsTexts: {
+    docText: string;
+    imgText: string;
+  };
+  noLegendsText: string;
+}
+
+export const MapLegendList: React.FC<MapLegendListProps> = ({
+  legends,
+  actionsTexts: { docText, imgText },
+  noLegendsText,
+}) => {
+  const handleNoLegends = useCallback(() => {
+    return (
+      <Box className="noLegendsContainer">
+        <h2 className="noLegendsMsg">{noLegendsText}</h2>
+      </Box>
+    );
+  }, [noLegendsText]);
+
+  const renderList = useCallback(() => {
+    if (!legends.length) {
+      return handleNoLegends();
+    }
+
+    return legends.map((legend, i) => {
+      return (
+        <MapLegend
+          key={`${legend.layer as string}_${i}`}
+          legend={legend}
+          docText={docText}
+          imgText={imgText}
+        />
+      );
+    });
+  }, [legends]);
+
+  return <Box className="mapLegendsList">{renderList()}</Box>;
+};

package/src/lib/cesium-map/map-legend/MapLegendSidebar.tsx

@@ -0,0 +1,55 @@
+import React from 'react';
+import {
+  Icon,
+  Drawer,
+  DrawerHeader,
+  DrawerTitle,
+  DrawerContent,
+} from '@map-colonies/react-core';
+import { IMapLegend } from './MapLegend';
+import { MapLegendList } from './MapLegendList';
+
+import './MapLegend.css';
+
+interface MapLegendSidebarProps {
+  isOpen: boolean;
+  toggleSidebar: () => void;
+  title?: string;
+  noLegendsText?: string;
+  actionsTexts?: { docText: string; imgText: string };
+  legends?: IMapLegend[];
+}
+
+export const MapLegendSidebar: React.FC<MapLegendSidebarProps> = ({
+  isOpen,
+  toggleSidebar,
+  title = 'Map Legends',
+  noLegendsText = 'No legends to display...',
+  actionsTexts = { docText: 'Docs', imgText: 'View Image' },
+  legends = [],
+}) => {
+  return isOpen ? (
+    <Drawer
+      className="mapLegendSidebarContainer"
+      modal={false}
+      dismissible={true}
+      open={isOpen}
+    >
+      <DrawerHeader className="sidebarHeaderContainer">
+        <DrawerTitle className="sidebarTitle">{title}</DrawerTitle>
+      </DrawerHeader>
+      <DrawerContent className="sidebarContent">
+        <Icon
+          onClick={toggleSidebar}
+          className="mapLegendCloseBtn"
+          icon={{ icon: 'close', size: 'small' }}
+        />
+        <MapLegendList
+          noLegendsText={noLegendsText}
+          legends={legends}
+          actionsTexts={actionsTexts}
+        />
+      </DrawerContent>
+    </Drawer>
+  ) : null;
+};

package/src/lib/cesium-map/map-legend/MapLegendToggle.tsx

@@ -0,0 +1,31 @@
+import React from 'react';
+import { Icon } from '@map-colonies/react-core';
+import { Box } from '../../box';
+import './MapLegend.css';
+
+interface MapLegendProps {
+  onClick: () => void;
+}
+
+const legendIcon = (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    enable-background="new 0 0 24 24"
+    height="24"
+    width="24"
+    viewBox="0 0 612 612"
+  >
+    <g xmlns="http://www.w3.org/2000/svg">
+      <path d="M322.4,173.9l-129,16.2l-4.6,21.4l25.3,4.7c16.5,3.9,19.8,9.9,16.2,26.4l-41.5,195.3c-10.9,50.5,5.9,74.3,45.5,74.3   c30.7,0,66.3-14.2,82.5-33.6l4.9-23.4c-11.3,9.9-27.7,13.9-38.6,13.9c-15.5,0-21.1-10.9-17.1-30L322.4,173.9z" />
+      <circle cx="270.1" cy="56.3" r="56.3" />
+    </g>
+  </svg>
+);
+
+export const MapLegendToggle: React.FC<MapLegendProps> = ({ onClick }) => {
+  return (
+    <Box onClick={onClick} className="mapLegendToggleContainer">
+      <Icon icon={legendIcon} className="mapLegendIcon" />
+    </Box>
+  );
+};

package/src/lib/cesium-map/map-legend/index.tsx

@@ -0,0 +1,3 @@
+export * from './MapLegendToggle';
+export * from './MapLegendSidebar';
+export type { IMapLegend } from './MapLegend';