Skip to content

Commit e35f7e2

Browse files
committed
refactor: Rename for clarity
1 parent 46909f2 commit e35f7e2

11 files changed

+14
-14
lines changed

app/charts/map/map-custom-layers-legend.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Box, Typography } from "@mui/material";
22
import uniq from "lodash/uniq";
33
import NextImage from "next/image";
44

5-
import { useWMTSorWMSLayers } from "@/charts/map/wms-endpoint-utils";
5+
import { useWMTSorWMSLayers } from "@/charts/map/wms-wmts-endpoint-utils";
66
import { DEFAULT_WMS_URL, ParsedWMSLayer } from "@/charts/map/wms-utils";
77
import {
88
DEFAULT_WMTS_URL,

app/charts/map/map.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import {
3131
import { MapState } from "@/charts/map/map-state";
3232
import { HoverObjectType, useMapTooltip } from "@/charts/map/map-tooltip";
3333
import { getMap, setMap } from "@/charts/map/ref";
34-
import { useWMTSorWMSLayers } from "@/charts/map/wms-endpoint-utils";
3534
import { DEFAULT_WMS_URL, getWMSTile } from "@/charts/map/wms-utils";
35+
import { useWMTSorWMSLayers } from "@/charts/map/wms-wmts-endpoint-utils";
3636
import { DEFAULT_WMTS_URL, getWMTSTile } from "@/charts/map/wmts-utils";
3737
import { useChartState } from "@/charts/shared/chart-state";
3838
import { useInteraction } from "@/charts/shared/use-interaction";

app/charts/map/wmts-providers-autocomplete.tsx renamed to app/charts/map/wms-wmts-providers-autocomplete.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { Alert, Autocomplete, TextField, Theme } from "@mui/material";
33
import { makeStyles } from "@mui/styles";
44
import { useMemo } from "react";
55

6-
import wmtsProvidersExtra_ from "@/charts/map/wmts-providers-extra.json";
7-
import wmtsProviders from "@/charts/map/wmts-providers.json";
6+
import wmsWmtsProvidersExtra_ from "@/charts/map/wms-wmts-providers-extra.json";
7+
import wmsWmtsProviders from "@/charts/map/wms-wmts-providers.json";
88
import { useFlag } from "@/flags";
99

10-
const wmtsProvidersExtra = wmtsProvidersExtra_ as Record<
10+
const wmsWmtsProvidersExtra = wmsWmtsProvidersExtra_ as Record<
1111
string,
1212
{ hidden?: boolean; note?: string }
1313
>;
@@ -44,12 +44,12 @@ const ProviderAutocomplete = ({
4444
onChange: (newValue: ProviderUrl | null) => void;
4545
}) => {
4646
const classes = useStyles();
47-
const extraInfo = value ? wmtsProvidersExtra[value] : undefined;
47+
const extraInfo = value ? wmsWmtsProvidersExtra[value] : undefined;
4848
const showExtraInfo = useFlag("wmts-show-extra-info");
4949
const options = useMemo(() => {
50-
return wmtsProviders
50+
return wmsWmtsProviders
5151
.filter((p) => {
52-
return !wmtsProvidersExtra[p] || !wmtsProvidersExtra[p].hidden;
52+
return !wmsWmtsProvidersExtra[p] || !wmsWmtsProvidersExtra[p].hidden;
5353
})
5454
.map((provider) => {
5555
const url = new URL(provider);

app/charts/map/wmts-selector.tsx renamed to app/charts/map/wms-wmts-selector.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import { useCallback, useMemo, useRef, useState } from "react";
1818
import createStore from "zustand";
1919

2020
import { CustomLayer } from "@/charts/map/types";
21-
import { useWMTSorWMSLayers } from "@/charts/map/wms-endpoint-utils";
2221
import { ParsedWMSLayer } from "@/charts/map/wms-utils";
23-
import ProviderAutocomplete from "@/charts/map/wmts-providers-autocomplete";
22+
import { useWMTSorWMSLayers } from "@/charts/map/wms-wmts-endpoint-utils";
23+
import ProviderAutocomplete from "@/charts/map/wms-wmts-providers-autocomplete";
2424
import { ParsedWMTSLayer } from "@/charts/map/wmts-utils";
2525
import { HintRed, Spinner } from "@/components/hint";
2626
import { Tree, useSelectTree } from "@/components/select-tree";

app/charts/map/wmts-playground.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { useMapStyle } from "@/charts/map/get-base-layer-style";
1919
import { DeckGLOverlay } from "@/charts/map/helpers";
2020
import { CustomLayer } from "@/charts/map/types";
2121
import { getWMSTile } from "@/charts/map/wms-utils";
22-
import WMTSSelector from "@/charts/map/wmts-selector";
22+
import WMTSSelector from "@/charts/map/wms-wmts-selector";
2323
import { getWMTSTile } from "@/charts/map/wmts-utils";
2424
import { Icon } from "@/icons";
2525
import { LocaleProvider } from "@/locales";

app/configurator/components/custom-layers-selector.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import {
1616
OnDragEndResponder,
1717
} from "react-beautiful-dnd";
1818

19-
import { useWMTSorWMSLayers } from "@/charts/map/wms-endpoint-utils";
2019
import { ParsedWMSLayer } from "@/charts/map/wms-utils";
21-
import WMTSSelector from "@/charts/map/wmts-selector";
20+
import { useWMTSorWMSLayers } from "@/charts/map/wms-wmts-endpoint-utils";
21+
import WMTSSelector from "@/charts/map/wms-wmts-selector";
2222
import { ParsedWMTSLayer } from "@/charts/map/wmts-utils";
2323
import { Switch } from "@/components/form";
2424
import { MoveDragButton } from "@/components/move-drag-button";

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"chromatic": "npx chromatic --build-script-name storybook:build -o app/public/storybook",
4949
"compare-screenshots": "npx tsx scripts/compare-screenshots.ts",
5050
"generate-json-schema": "tsx -r dotenv/config app/scripts/generate-json-schema.ts",
51-
"wmts-providers:scrape": "curl https://raw.githubusercontent.com/geoadmin/web-mapviewer/refs/heads/develop/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/external-providers.json | prettier --parser json > ./app/charts/map/wmts-providers.json"
51+
"wms-wmts-providers:scrape": "curl https://raw.githubusercontent.com/geoadmin/web-mapviewer/refs/heads/develop/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/external-providers.json | prettier --parser json > ./app/charts/map/wms-wmts-providers.json"
5252
},
5353
"dependencies": {
5454
"@babel/runtime": "^7.11.2",

0 commit comments

Comments
 (0)