{(!fileRejections.length && children) ?? (
<>
diff --git a/src/components/Tooltip/Tooltip.tsx b/src/components/Tooltip/Tooltip.tsx
index 658b16f..6afb02b 100644
--- a/src/components/Tooltip/Tooltip.tsx
+++ b/src/components/Tooltip/Tooltip.tsx
@@ -28,11 +28,7 @@ const Tooltip = (props: Props) => {
return (
<>
{"children" in props
- ? React.createElement(
- as,
- { type: "button", ref: setTriggerRef },
- props.children
- )
+ ? React.createElement(as, { ref: setTriggerRef }, props.children)
: props.renderTrigger(setTriggerRef)}
{typeof window !== "undefined" &&
ReactDOM.createPortal(
diff --git a/src/components/map/BigGeoJsonLayer.tsx b/src/components/map/BigGeoJsonLayer.tsx
index 4b49b00..c0ea1ba 100644
--- a/src/components/map/BigGeoJsonLayer.tsx
+++ b/src/components/map/BigGeoJsonLayer.tsx
@@ -6,23 +6,25 @@ import { GeoJSONProps } from "react-leaflet";
type BigGeoJsonLayerProps = {
data: GeoJSONProps["data"];
+ style?: object | Function;
};
const BigGeoJsonLayer = (props: BigGeoJsonLayerProps) => {
const context = useLeafletContext();
- const { data } = props;
+ const { data, style } = props;
useEffect(() => {
const container = context.layerContainer || context.map;
const layer = L.bigGeoJson(data, {
maxZoom: 16,
tolerance: 3,
debug: 0,
+ style: style,
});
container.addLayer(layer);
return () => {
container.removeLayer(layer);
};
- }, [data, context]);
+ }, [data, context, style]);
return null;
};
diff --git a/src/components/map/GeoRasterLayer.tsx b/src/components/map/GeoRasterLayer.tsx
index 696c055..fb8ad7b 100644
--- a/src/components/map/GeoRasterLayer.tsx
+++ b/src/components/map/GeoRasterLayer.tsx
@@ -19,7 +19,7 @@ const useGeoraster = (path: string) => {
const [georaster, setGeoraster] = React.useState
();
React.useEffect(() => {
- parseGeoraster(path, undefined, true)
+ parseGeoraster(path, undefined, false)
.then((res: GeoRaster) => {
setGeoraster(res);
})
@@ -33,18 +33,16 @@ const useGeoraster = (path: string) => {
type Props = {
path: string;
- colors?: string[];
} & Omit;
function GeoRasterLayer({
path,
- colors,
...options
}: Props): React.ReactElement | null {
const georaster = useGeoraster(path);
return georaster ? (
-
+
) : null;
}
diff --git a/src/components/map/Legend.tsx b/src/components/map/Legend.tsx
new file mode 100644
index 0000000..a343a2b
--- /dev/null
+++ b/src/components/map/Legend.tsx
@@ -0,0 +1,33 @@
+import clsx from "clsx";
+import { ReactNode } from "react";
+
+const POSITION_CLASSES = {
+ bottomleft: "leaflet-bottom leaflet-left",
+ bottomright: "leaflet-bottom leaflet-right",
+ topleft: "leaflet-top leaflet-left",
+ topright: "leaflet-top leaflet-right",
+};
+
+type Props = {
+ children: ReactNode;
+ className?: string;
+ position?: "bottomleft" | "bottomright" | "topleft" | "topright";
+};
+
+const Legend = (props: Props) => {
+ const { position = "bottomleft", children, className } = props;
+ return (
+
+ );
+};
+
+export default Legend;
diff --git a/src/components/map/MapEvents.tsx b/src/components/map/MapEvents.tsx
new file mode 100644
index 0000000..8b03e26
--- /dev/null
+++ b/src/components/map/MapEvents.tsx
@@ -0,0 +1,12 @@
+import { LeafletEventHandlerFnMap } from "leaflet";
+import { useMap, useMapEvents } from "react-leaflet";
+
+type MapEventsProps = LeafletEventHandlerFnMap;
+
+const MapEvents = (props: MapEventsProps) => {
+ const map = useMap();
+ useMapEvents(props);
+ return null;
+};
+
+export default MapEvents;
diff --git a/src/features/dataset/DatasetMetadataBlock.tsx b/src/features/dataset/DatasetMetadataBlock.tsx
index b8ae117..5047aee 100644
--- a/src/features/dataset/DatasetMetadataBlock.tsx
+++ b/src/features/dataset/DatasetMetadataBlock.tsx
@@ -7,6 +7,7 @@ import {
AccessmodFilesetStatus,
DatasetMetadataBlock_DatasetFragment,
} from "libs/graphql";
+import { isTruthy } from "libs/types";
import { useTranslation } from "next-i18next";
import { useMemo } from "react";
import ClassLabelsGrid from "./ClassLabelsGrid";
@@ -27,23 +28,69 @@ const DatasetMetadataBlock = ({ dataset }: DatasetMetadataBlockProps) => {
AccessmodFilesetRoleCode.LandCover,
AccessmodFilesetRoleCode.Stack,
].includes(dataset.role.code) && (
-
- <>
- {metadata.labels ? : "-"}
-
+
+ {metadata.labels?.length ? (
+
+ ) : (
+ "-"
+ )}
),
dataset.role.code === AccessmodFilesetRoleCode.Boundaries && (
-
+
{dataset.metadata.name_column ?? "-"}
),
dataset.role.code === AccessmodFilesetRoleCode.TransportNetwork && (
-
+
{dataset.metadata.category_column}
),
+ dataset.metadata.category_column &&
+ dataset.metadata.values?.[dataset.metadata.category_column] && (
+
+
+ {dataset.metadata.values[dataset.metadata.category_column].join(
+ ", "
+ )}
+
+
+ ),
+
+ (isTruthy(metadata?.min) || isTruthy(metadata?.max)) && (
+
+ [{metadata.min ?? "-"}, {metadata.max ?? "-"}]
+
+ ),
+ ["1p", "2p", "98p", "99p"].some((p) => p in metadata) && (
+
+
+
+
+ | {t("Percentile")} |
+ {t("Value")} |
+
+
+
+ {["1p", "2p", "98p", "99p"].map((percentile) => (
+
+ | {percentile} |
+ {percentile in metadata ? metadata[percentile] : "-"} |
+
+ ))}
+
+
+
+ ),
+ isTruthy(metadata.unique_values) && (
+
+ [{metadata.unique_values.join(", ")}]
+
+ ),
].filter(Boolean);
if (
diff --git a/src/features/dataset/DatasetViewer.tsx b/src/features/dataset/DatasetViewer.tsx
index c89c1c4..5ce80a5 100644
--- a/src/features/dataset/DatasetViewer.tsx
+++ b/src/features/dataset/DatasetViewer.tsx
@@ -15,7 +15,7 @@ type DatasetViewerProps = {
};
const DatasetViewer = (props: DatasetViewerProps) => {
- const { dataset, project } = props;
+ const { dataset } = props;
const { t } = useTranslation();
if (dataset.role.format === AccessmodFilesetFormat.Tabular) {
return ;
diff --git a/src/features/dataset/RasterDatasetMap/ClientContinuousRasterMap.tsx b/src/features/dataset/RasterDatasetMap/ClientContinuousRasterMap.tsx
new file mode 100644
index 0000000..1a8fe6a
--- /dev/null
+++ b/src/features/dataset/RasterDatasetMap/ClientContinuousRasterMap.tsx
@@ -0,0 +1,66 @@
+import chroma, { Scale } from "chroma-js";
+import clsx from "clsx";
+import Legend from "components/map/Legend";
+import { MapProps } from "components/map/Map";
+import { PixelValuesToColorFn } from "georaster-layer-for-leaflet";
+import { useCallback, useMemo } from "react";
+import ClientRasterMap from "./ClientRasterMap";
+
+type Props = MapProps & {
+ url?: string;
+ scale: string;
+ loading?: boolean;
+ min: number;
+ nodata: number;
+ max: number;
+};
+
+const ClientContinuousRasterMap = (props: Props) => {
+ const { url, loading, scale, nodata, min, max, ...delegated } = props;
+
+ const brewer: Scale = useMemo(
+ () => chroma.scale(scale).domain([min, max]),
+ [scale, min, max]
+ );
+
+ const pixelValuesToColorFn: PixelValuesToColorFn = useCallback(
+ (vals) => {
+ const [value, ..._] = vals;
+ if (value === nodata) return "";
+
+ return brewer(value).hex();
+ },
+ [brewer, nodata]
+ );
+
+ const legendColors = useMemo(() => {
+ return brewer.colors(3, "hex");
+ }, [brewer]);
+
+ return (
+
+
+
+ );
+};
+
+export default ClientContinuousRasterMap;
diff --git a/src/features/dataset/RasterDatasetMap/ClientDiscreteRasterMap.tsx b/src/features/dataset/RasterDatasetMap/ClientDiscreteRasterMap.tsx
new file mode 100644
index 0000000..1a6e21a
--- /dev/null
+++ b/src/features/dataset/RasterDatasetMap/ClientDiscreteRasterMap.tsx
@@ -0,0 +1,64 @@
+import chroma from "chroma-js";
+import Legend from "components/map/Legend";
+import { MapProps } from "components/map/Map";
+import { PixelValuesToColorFn } from "georaster-layer-for-leaflet";
+import { useCallback, useMemo } from "react";
+import ClientRasterMap from "./ClientRasterMap";
+
+type Props = MapProps & {
+ url?: string;
+ loading?: boolean;
+ scale: string;
+ nodata: number;
+ values: number[];
+ labels?: { [key: string]: string };
+};
+
+const ClientContinuousRasterMap = (props: Props) => {
+ const { url, loading, scale, nodata, labels, ...delegated } = props;
+
+ const uniqueValues = useMemo(() => {
+ return props.values.filter((v) => v !== nodata);
+ }, [props.values, nodata]);
+
+ const colors = useMemo(() => {
+ return chroma.scale(scale).colors(uniqueValues.length);
+ }, [scale, uniqueValues]);
+
+ const pixelValuesToColorFn: PixelValuesToColorFn = useCallback(
+ (vals) => {
+ const [value, ..._] = vals;
+ if (value === nodata) {
+ return "";
+ }
+
+ return colors[uniqueValues.indexOf(value)];
+ },
+ [colors, uniqueValues, nodata]
+ );
+
+ return (
+
+
+
+ );
+};
+
+export default ClientContinuousRasterMap;
diff --git a/src/features/dataset/RasterDatasetMap/ClientRasterMap.tsx b/src/features/dataset/RasterDatasetMap/ClientRasterMap.tsx
index 39ee2ac..e62846e 100644
--- a/src/features/dataset/RasterDatasetMap/ClientRasterMap.tsx
+++ b/src/features/dataset/RasterDatasetMap/ClientRasterMap.tsx
@@ -1,23 +1,47 @@
import chroma from "chroma-js";
import GeoRasterLayer from "components/map/GeoRasterLayer";
+import Legend from "components/map/Legend";
import Map, { MapProps } from "components/map/Map";
+import { PixelValuesToColorFn } from "georaster-layer-for-leaflet";
+import { FeatureGroup as LeafletFeatureGroup } from "leaflet";
+import { ReactNode, useCallback, useMemo, useRef } from "react";
+import { FeatureGroup } from "react-leaflet";
-type Props = {
+type Props = MapProps & {
url?: string;
loading?: boolean;
-} & MapProps;
+ children?: ReactNode;
+ pixelValuesToColorFn: PixelValuesToColorFn;
+};
const ClientRasterMap = (props: Props) => {
- const { url, loading, ...delegated } = props;
+ const { url, loading, pixelValuesToColorFn, children, ...delegated } = props;
+ const featureGroupRef = useRef(null);
+
+ const onLayerAdd = useCallback(
+ ({ layer }: { layer: any }) => {
+ if (featureGroupRef.current) {
+ layer._map.fitBounds(featureGroupRef.current.getBounds());
+ }
+ },
+ [featureGroupRef]
+ );
+
return (
);
diff --git a/src/features/dataset/RasterDatasetMap/RasterDatasetMap.tsx b/src/features/dataset/RasterDatasetMap/RasterDatasetMap.tsx
index 7a6e920..825a2d1 100644
--- a/src/features/dataset/RasterDatasetMap/RasterDatasetMap.tsx
+++ b/src/features/dataset/RasterDatasetMap/RasterDatasetMap.tsx
@@ -1,6 +1,10 @@
import { gql } from "@apollo/client";
-import { getFileDownloadUrl } from "libs/dataset";
-import { RasterDatasetMap_DatasetFragment } from "libs/graphql";
+import { getDatasetVisualizationUrl } from "libs/dataset";
+import {
+ AccessmodFilesetRoleCode,
+ RasterDatasetMap_DatasetFragment,
+} from "libs/graphql";
+import { useTranslation } from "next-i18next";
import dynamic from "next/dynamic";
import { useEffect, useMemo, useState } from "react";
@@ -8,46 +12,69 @@ type RasterDatasetMapProps = {
dataset: RasterDatasetMap_DatasetFragment;
};
-const DynamicClientRasterMap = dynamic(() => import("./ClientRasterMap"), {
- ssr: false,
-});
+const DynamicClientContinuousRasterMap = dynamic(
+ () => import("./ClientContinuousRasterMap"),
+ {
+ ssr: false,
+ }
+);
+const DynamicClientDiscreteRasterMap = dynamic(
+ () => import("./ClientDiscreteRasterMap"),
+ {
+ ssr: false,
+ }
+);
const RasterDatasetMap = ({ dataset }: RasterDatasetMapProps) => {
const [url, setUrl] = useState();
- const [loading, setLoading] = useState(false);
- const supportedFile = useMemo(
- () =>
- dataset.files.find((file) =>
- ["image/geotiff", "image/tiff", "image/geo+tiff"].includes(
- file.mimeType
- )
- ),
- [dataset]
- );
+ const { t } = useTranslation();
+ const [loading, setLoading] = useState(true);
useEffect(() => {
- if (supportedFile) {
- setLoading(true);
- getFileDownloadUrl(supportedFile.id).then(
- (url) => {
- setUrl(url);
- setLoading(false);
- },
- () => setLoading(false)
- );
- } else {
- console.warn("No supported raster file");
- }
- }, [supportedFile]);
+ setLoading(true);
+ getDatasetVisualizationUrl(dataset.id).then(async (url) => {
+ setLoading(false);
+ if (url) {
+ setUrl(url);
+ }
+ });
+ }, [dataset]);
+
+ const isContinuous = useMemo(() => {
+ return [
+ AccessmodFilesetRoleCode.Dem,
+ AccessmodFilesetRoleCode.Population,
+ AccessmodFilesetRoleCode.ZonalStatistics,
+ AccessmodFilesetRoleCode.TravelTimes,
+ ].includes(dataset.role.code);
+ }, [dataset]);
return (
- {!supportedFile ? (
+ {!url && !loading && (
- We do not support this type of dataset. Only tiff files are supported.
+ {t("The preview of this dataset is not yet ready")}
- ) : (
-
+ )}
+ {url && isContinuous && (
+
+ )}
+ {url && !isContinuous && (
+
)}
- {!supportedFile ? (
+ {isReady && !loading && !geoJSON && (
- We do not support this type of dataset. Only geojson files are
- supported.
+ {t("The preview of this dataset is not yet ready")}
- ) : (
+ )}
+ {(loading || geoJSON) && (
{
}
}
+export async function getDatasetVisualizationUrl(
+ datasetId: string
+): Promise {
+ const client = getApolloClient();
+ const { data } = await client.mutate<
+ GetDatasetVisualizationUrlMutation,
+ GetDatasetVisualizationUrlMutationVariables
+ >({
+ mutation: gql`
+ mutation GetDatasetVisualizationUrl(
+ $input: PrepareAccessmodFilesetVisualizationDownloadInput!
+ ) {
+ prepareAccessmodFilesetVisualizationDownload(input: $input) {
+ success
+ url
+ }
+ }
+ `,
+ variables: {
+ input: { id: datasetId },
+ },
+ });
+
+ return data?.prepareAccessmodFilesetVisualizationDownload.url ?? null;
+}
+
export function formatDatasetStatus(status: AccessmodFilesetStatus) {
switch (status) {
case AccessmodFilesetStatus.Invalid:
@@ -237,26 +265,36 @@ export function formatDatasetStatus(status: AccessmodFilesetStatus) {
}
}
+function detectDelimiter(text: string) {
+ const delimiters = [",", ";", "\t"];
+ const rows = text.split("\n");
+ if (rows.length >= 2) {
+ for (const delimiter of delimiters) {
+ if (
+ rows[0].split(delimiter) === rows[1].split(delimiter) &&
+ rows[0].split(delimiter).length > 0
+ ) {
+ return delimiter;
+ }
+ }
+ } else {
+ const repeats = delimiters.map((delimiter) => ({
+ delimiter,
+ times: rows[0].split(delimiter).length,
+ }));
+ repeats.sort((a, b) => b.times - a.times);
+ return repeats[0].delimiter;
+ }
+ return ",";
+}
+
export async function getTabularFileContent(
file: Pick
) {
- let textContent;
- try {
- textContent = sessionStorage.getItem(file.id);
- } catch (err) {
- console.error(err);
- }
- if (!textContent) {
- const downloadUrl = await getFileDownloadUrl(file.id);
- textContent = await fetch(downloadUrl).then((resp) => resp.text());
- }
-
- try {
- sessionStorage.setItem(file.id, textContent);
- } catch (err) {
- console.error(err);
- }
- return parse(textContent, { delimiter: ",", columns: true });
+ const downloadUrl = await getFileDownloadUrl(file.id);
+ const textContent = await fetch(downloadUrl).then((resp) => resp.text());
+ const delimiter = detectDelimiter(textContent);
+ return parse(textContent, { delimiter, columns: true });
}
export async function getVectorFileContent(
@@ -462,12 +500,16 @@ export function getDatasetDefaultMetadata(roleCode: AccessmodFilesetRoleCode) {
}
export type MetadataFormValues = {
+ [key: string]: any;
category_column?: string | null;
name_column?: string | null;
columns?: string[];
validation_error?: string;
values?: { [key: string]: string[] };
labels?: [string, string][];
+ min?: number;
+ max?: number;
+ unique_values?: number[];
};
export function toMetadataFormValues(
diff --git a/src/libs/file.ts b/src/libs/file.ts
index 894779c..3adf6b5 100644
--- a/src/libs/file.ts
+++ b/src/libs/file.ts
@@ -219,7 +219,6 @@ export { uploader };
export async function downloadURL(url: string, name: string) {
const anchor = document.createElement("a");
anchor.href = url;
- anchor.download = name;
document.body.appendChild(anchor);
anchor.click();
document.body.removeChild(anchor);
diff --git a/src/libs/graphql.ts b/src/libs/graphql.ts
index d6e086c..3786ad5 100644
--- a/src/libs/graphql.ts
+++ b/src/libs/graphql.ts
@@ -647,6 +647,7 @@ export type Mutation = {
logout: LogoutResult;
prepareAccessmodFileDownload: PrepareAccessmodFileDownloadResult;
prepareAccessmodFileUpload: PrepareAccessmodFileUploadResult;
+ prepareAccessmodFilesetVisualizationDownload: PrepareAccessmodFilesetVisualizationDownloadResult;
resetPassword: ResetPasswordResult;
setPassword: SetPasswordResult;
updateAccessmodAccessibilityAnalysis: UpdateAccessmodAccessibilityAnalysisResult;
@@ -749,6 +750,11 @@ export type MutationPrepareAccessmodFileUploadArgs = {
};
+export type MutationPrepareAccessmodFilesetVisualizationDownloadArgs = {
+ input: PrepareAccessmodFilesetVisualizationDownloadInput;
+};
+
+
export type MutationResetPasswordArgs = {
input: ResetPasswordInput;
};
@@ -838,6 +844,16 @@ export type PrepareAccessmodFileUploadResult = {
uploadUrl?: Maybe;
};
+export type PrepareAccessmodFilesetVisualizationDownloadInput = {
+ id: Scalars['String'];
+};
+
+export type PrepareAccessmodFilesetVisualizationDownloadResult = {
+ __typename?: 'PrepareAccessmodFilesetVisualizationDownloadResult';
+ success: Scalars['Boolean'];
+ url?: Maybe;
+};
+
export type Query = {
__typename?: 'Query';
accessmodAnalyses: AccessmodAnalysisPage;
@@ -848,6 +864,7 @@ export type Query = {
accessmodFilesets: AccessmodFilesetPage;
accessmodProject?: Maybe;
accessmodProjects: AccessmodProjectPage;
+ boundaries: Array;
countries: Array;
country?: Maybe;
me: Me;
@@ -904,6 +921,12 @@ export type QueryAccessmodProjectsArgs = {
};
+export type QueryBoundariesArgs = {
+ country_code: Scalars['String'];
+ level: Scalars['String'];
+};
+
+
export type QueryCountryArgs = {
alpha3?: InputMaybe;
code?: InputMaybe;
@@ -1135,6 +1158,16 @@ export type User = {
lastName?: Maybe;
};
+export type WhoBoundary = {
+ __typename?: 'WHOBoundary';
+ administrative_level: Scalars['Int'];
+ country: Country;
+ extent: Scalars['String'];
+ id: Scalars['String'];
+ name: Scalars['String'];
+ parent?: Maybe;
+};
+
export type WhoInfo = {
__typename?: 'WHOInfo';
defaultCRS: Scalars['Int'];
@@ -1323,7 +1356,7 @@ export type DatasetStatusIcon_DatasetFragment = { __typename?: 'AccessmodFileset
export type DatasetViewer_ProjectFragment = { __typename?: 'AccessmodProject', id: string };
-export type DatasetViewer_DatasetFragment = { __typename?: 'AccessmodFileset', id: string, role: { __typename?: 'AccessmodFilesetRole', id: string, code: AccessmodFilesetRoleCode, name: string, format: AccessmodFilesetFormat }, files: Array<{ __typename?: 'AccessmodFile', name: string, mimeType: string, id: string }> };
+export type DatasetViewer_DatasetFragment = { __typename?: 'AccessmodFileset', id: string, metadata: any, role: { __typename?: 'AccessmodFilesetRole', id: string, code: AccessmodFilesetRoleCode, name: string, format: AccessmodFilesetFormat }, files: Array<{ __typename?: 'AccessmodFile', name: string, mimeType: string, id: string }> };
export type DeleteDatasetMutationVariables = Exact<{
input: DeleteAccessmodFilesetInput;
@@ -1343,17 +1376,17 @@ export type PreviewDatasetDialogQueryVariables = Exact<{
}>;
-export type PreviewDatasetDialogQuery = { __typename?: 'Query', dataset?: { __typename?: 'AccessmodFileset', id: string, name: string, role: { __typename?: 'AccessmodFilesetRole', id: string, code: AccessmodFilesetRoleCode, name: string, format: AccessmodFilesetFormat }, files: Array<{ __typename?: 'AccessmodFile', id: string, name: string, mimeType: string }> } | null };
+export type PreviewDatasetDialogQuery = { __typename?: 'Query', dataset?: { __typename?: 'AccessmodFileset', id: string, name: string, metadata: any, role: { __typename?: 'AccessmodFilesetRole', id: string, code: AccessmodFilesetRoleCode, name: string, format: AccessmodFilesetFormat }, files: Array<{ __typename?: 'AccessmodFile', id: string, name: string, mimeType: string }> } | null };
export type PreviewDatasetDialog_ProjectFragment = { __typename?: 'AccessmodProject', id: string };
export type PreviewDatasetDialog_DatasetFragment = { __typename?: 'AccessmodFileset', id: string, name: string };
-export type RasterDatasetMap_DatasetFragment = { __typename?: 'AccessmodFileset', id: string, role: { __typename?: 'AccessmodFilesetRole', code: AccessmodFilesetRoleCode, format: AccessmodFilesetFormat }, files: Array<{ __typename?: 'AccessmodFile', id: string, name: string, mimeType: string }> };
+export type RasterDatasetMap_DatasetFragment = { __typename?: 'AccessmodFileset', id: string, metadata: any, role: { __typename?: 'AccessmodFilesetRole', code: AccessmodFilesetRoleCode } };
export type TabularDatasetTable_DatasetFragment = { __typename?: 'AccessmodFileset', role: { __typename?: 'AccessmodFilesetRole', format: AccessmodFilesetFormat, code: AccessmodFilesetRoleCode }, files: Array<{ __typename?: 'AccessmodFile', name: string, mimeType: string, id: string }> };
-export type VectorDatasetMap_DatasetFragment = { __typename?: 'AccessmodFileset', id: string, role: { __typename?: 'AccessmodFilesetRole', code: AccessmodFilesetRoleCode, format: AccessmodFilesetFormat }, files: Array<{ __typename?: 'AccessmodFile', id: string, name: string, mimeType: string }> };
+export type VectorDatasetMap_DatasetFragment = { __typename?: 'AccessmodFileset', id: string };
export type ChangeProjectOwnershipMutationVariables = Exact<{
input: CreateAccessmodProjectPermissionInput;
@@ -1579,6 +1612,13 @@ export type GetFileDownloadUrlMutationVariables = Exact<{
export type GetFileDownloadUrlMutation = { __typename?: 'Mutation', prepareAccessmodFileDownload: { __typename?: 'PrepareAccessmodFileDownloadResult', success: boolean, downloadUrl?: string | null } };
+export type GetDatasetVisualizationUrlMutationVariables = Exact<{
+ input: PrepareAccessmodFilesetVisualizationDownloadInput;
+}>;
+
+
+export type GetDatasetVisualizationUrlMutation = { __typename?: 'Mutation', prepareAccessmodFilesetVisualizationDownload: { __typename?: 'PrepareAccessmodFilesetVisualizationDownloadResult', success: boolean, url?: string | null } };
+
export type CreateDatasetMutationVariables = Exact<{
input: CreateAccessmodFilesetInput;
}>;
@@ -2058,28 +2098,14 @@ export const TabularDatasetTable_DatasetFragmentDoc = gql`
export const VectorDatasetMap_DatasetFragmentDoc = gql`
fragment VectorDatasetMap_dataset on AccessmodFileset {
id
- role {
- code
- format
- }
- files {
- id
- name
- mimeType
- }
}
`;
export const RasterDatasetMap_DatasetFragmentDoc = gql`
fragment RasterDatasetMap_dataset on AccessmodFileset {
id
+ metadata
role {
code
- format
- }
- files {
- id
- name
- mimeType
}
}
`;
@@ -3908,6 +3934,40 @@ export function useGetFileDownloadUrlMutation(baseOptions?: Apollo.MutationHookO
export type GetFileDownloadUrlMutationHookResult = ReturnType;
export type GetFileDownloadUrlMutationResult = Apollo.MutationResult;
export type GetFileDownloadUrlMutationOptions = Apollo.BaseMutationOptions;
+export const GetDatasetVisualizationUrlDocument = gql`
+ mutation GetDatasetVisualizationUrl($input: PrepareAccessmodFilesetVisualizationDownloadInput!) {
+ prepareAccessmodFilesetVisualizationDownload(input: $input) {
+ success
+ url
+ }
+}
+ `;
+export type GetDatasetVisualizationUrlMutationFn = Apollo.MutationFunction;
+
+/**
+ * __useGetDatasetVisualizationUrlMutation__
+ *
+ * To run a mutation, you first call `useGetDatasetVisualizationUrlMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useGetDatasetVisualizationUrlMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [getDatasetVisualizationUrlMutation, { data, loading, error }] = useGetDatasetVisualizationUrlMutation({
+ * variables: {
+ * input: // value for 'input'
+ * },
+ * });
+ */
+export function useGetDatasetVisualizationUrlMutation(baseOptions?: Apollo.MutationHookOptions) {
+ const options = {...defaultOptions, ...baseOptions}
+ return Apollo.useMutation(GetDatasetVisualizationUrlDocument, options);
+ }
+export type GetDatasetVisualizationUrlMutationHookResult = ReturnType;
+export type GetDatasetVisualizationUrlMutationResult = Apollo.MutationResult;
+export type GetDatasetVisualizationUrlMutationOptions = Apollo.BaseMutationOptions;
export const CreateDatasetDocument = gql`
mutation CreateDataset($input: CreateAccessmodFilesetInput!) {
createAccessmodFileset(input: $input) {
diff --git a/src/libs/map/BigGeoJSON.js b/src/libs/map/BigGeoJSON.js
index f131323..4de4c9f 100644
--- a/src/libs/map/BigGeoJSON.js
+++ b/src/libs/map/BigGeoJSON.js
@@ -1,6 +1,6 @@
// @ts-nocheck
-import L from "leaflet";
import geojsonvt from "geojson-vt";
+import L from "leaflet";
L.BigGeoJSON = L.GridLayer.extend({
options: {
@@ -34,10 +34,11 @@ L.BigGeoJSON = L.GridLayer.extend({
drawFeature: function (ctx, feature) {
ctx.beginPath();
- if (this.options.style)
+ if (this.options.style) {
this.options.style instanceof Function
- ? this.setStyle(ctx, this.options.style(feature.tags))
+ ? this.setStyle(ctx, this.options.style(feature))
: this.setStyle(ctx, this.options.style);
+ }
if (feature.type === 2 || feature.type === 3) {
for (var j = 0; j < feature.geometry.length; j++) {
var ring = feature.geometry[j];