Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: move Combined to examples dir #108

Merged
merged 1 commit into from
Aug 3, 2024
+47 −44
Merged

refactor: move Combined to examples dir #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...ArmedConflictWithBaseMap/index.stories.ts → ...rmedConflict/WithBaseMap/index.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Meta, StoryObj } from "@storybook/react";
import { ArmedConflictWithBaseMap } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { mapStyleOptions } from "../../../../components/mapStyleOptions";



const meta = {
component: ArmedConflictWithBaseMap,
Expand Down
2 changes: 1 addition & 1 deletion ...mbined/ArmedConflictWithBaseMap/index.tsx → ...bined/ArmedConflict/WithBaseMap/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { ArmedConflictPMTilesSource as source } from "../../../components/Datasets/ArmedConflict/source";
import { ArmedConflictPMTilesSource as source } from "../../../../components/Datasets/ArmedConflict/source";

export const ArmedConflictWithBaseMap: React.FC<{ mapStyle: string }> = ({
mapStyle,
Expand Down
11 changes: 6 additions & 5 deletions ...tWithRwanda10AndOverture/index.stories.ts → ...ithOverture/WithRwanda10/index.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Meta, StoryObj } from "@storybook/react";
import { ArmedConflictWithRwanda10AndOverture } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { ArmedConflictWithRwanda10WithOverture } from ".";
import { mapStyleOptions } from "../../../../../components/mapStyleOptions";


const meta = {
component: ArmedConflictWithRwanda10AndOverture,
component: ArmedConflictWithRwanda10WithOverture,
argTypes: {
mapStyle: {
options: mapStyleOptions,
Expand All @@ -19,9 +20,9 @@ const meta = {
bottomPanelHeight: 300,
},
},
} satisfies Meta<typeof ArmedConflictWithRwanda10AndOverture>;
} satisfies Meta<typeof ArmedConflictWithRwanda10WithOverture>;

export default meta;
type Story = StoryObj<typeof ArmedConflictWithRwanda10AndOverture>;
type Story = StoryObj<typeof ArmedConflictWithRwanda10WithOverture>;

export const Preview: Story = {};
8 changes: 4 additions & 4 deletions ...ConflictWithRwanda10AndOverture/index.tsx → ...flict/WithOverture/WithRwanda10/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { ArmedConflictPMTilesSource as dataSource } from "../../../components/Datasets/ArmedConflict/source";
import { Rwanda10PMTilesSource as terrainSource } from "../../../components/Datasets/Rwanda10/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../Datasets/OvertureMaps/source";
import { ArmedConflictPMTilesSource as dataSource } from "../../../../../components/Datasets/ArmedConflict/source";
import { Rwanda10PMTilesSource as terrainSource } from "../../../../../components/Datasets/Rwanda10/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../../../../components/Datasets/OvertureMaps/source";

export const ArmedConflictWithRwanda10AndOverture: React.FC<{ mapStyle: string }> = ({
export const ArmedConflictWithRwanda10WithOverture: React.FC<{ mapStyle: string }> = ({
mapStyle,
}) => {
useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion ...rmedConflictWithOverture/index.stories.ts → ...medConflict/WithOverture/index.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from "@storybook/react";
import { ArmedConflictWithOverture } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { mapStyleOptions } from "../../../../components/mapStyleOptions";

const meta = {
component: ArmedConflictWithOverture,
Expand Down
4 changes: 2 additions & 2 deletions ...bined/ArmedConflictWithOverture/index.tsx → ...ined/ArmedConflict/WithOverture/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { ArmedConflictPMTilesSource as dataSource } from "../../../components/Datasets/ArmedConflict/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../Datasets/OvertureMaps/source";
import { ArmedConflictPMTilesSource as dataSource } from "../../../../components/Datasets/ArmedConflict/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../../../components/Datasets/OvertureMaps/source";

export const ArmedConflictWithOverture: React.FC<{ mapStyle: string }> = ({
mapStyle,
Expand Down
2 changes: 1 addition & 1 deletion ...ed/OpenCellIdWithBaseMap/index.stories.ts → ...d/OpenCellId/WithBaseMap/index.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from "@storybook/react";
import { OpenCellIdWithBaseMap } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { mapStyleOptions } from "../../../../components/mapStyleOptions";

const meta = {
component: OpenCellIdWithBaseMap,
Expand Down
2 changes: 1 addition & 1 deletion .../Combined/OpenCellIdWithBaseMap/index.tsx → ...Combined/OpenCellId/WithBaseMap/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { OpenCellIdPMTilesSource as source } from "../../../components/Datasets/OpenCellId/source";
import { OpenCellIdPMTilesSource as source } from "../../../../components/Datasets/OpenCellId/source";

export const OpenCellIdWithBaseMap: React.FC<{ mapStyle: string }> = ({
mapStyle,
Expand Down
2 changes: 1 addition & 1 deletion ...ined/OpenCellIdWithDEM1A/index.stories.ts → ...ned/OpenCellId/WithDEM1A/index.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from "@storybook/react";
import { OpenCellIdWithDEM1A } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { mapStyleOptions } from "../../../../components/mapStyleOptions";

const meta = {
component: OpenCellIdWithDEM1A,
Expand Down
4 changes: 2 additions & 2 deletions ...ts/Combined/OpenCellIdWithDEM1A/index.tsx → ...s/Combined/OpenCellId/WithDEM1A/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { OpenCellIdPMTilesSource as dataSource } from "../../../components/Datasets/OpenCellId/source";
import { DEM1APMTilesSource as terrainSource } from "../../../components/Datasets/DEM1A/source";
import { OpenCellIdPMTilesSource as dataSource } from "../../../../components/Datasets/OpenCellId/source";
import { DEM1APMTilesSource as terrainSource } from "../../../../components/Datasets/DEM1A/source";

export const OpenCellIdWithDEM1A: React.FC<{ mapStyle: string }> = ({
mapStyle,
Expand Down
2 changes: 1 addition & 1 deletion ...lIdWithDEM1AAndOverture/index.stories.tsx → .../WithOverture/WithDEM1A/index.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from "@storybook/react";
import { OpenCellIdWithDEM1AAndOverture } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { mapStyleOptions } from "../../../../../components/mapStyleOptions";

const meta = {
component: OpenCellIdWithDEM1AAndOverture,
Expand Down
6 changes: 3 additions & 3 deletions .../OpenCellIdWithDEM1AAndOverture/index.tsx → ...enCellId/WithOverture/WithDEM1A/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { OpenCellIdPMTilesSource as dataSource } from "../../Datasets/OpenCellId/source";
import { DEM1APMTilesSource as terrainSource } from "../../Datasets/DEM1A/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../Datasets/OvertureMaps/source";
import { OpenCellIdPMTilesSource as dataSource } from "../../../../../components/Datasets/OpenCellId/source";
import { DEM1APMTilesSource as terrainSource } from "../../../../../components/Datasets/DEM1A/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../../../../components/Datasets/OvertureMaps/source";

export const OpenCellIdWithDEM1AAndOverture: React.FC<{ mapStyle: string }> = ({
mapStyle,
Expand Down
2 changes: 1 addition & 1 deletion ...WithRwanda10AndOverture/index.stories.tsx → ...thOverture/WithRwanda10/index.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from "@storybook/react";
import { OpenCellIdWithRwanda10AndOverture } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { mapStyleOptions } from "../../../../../components/mapStyleOptions";

const meta = {
component: OpenCellIdWithRwanda10AndOverture,
Expand Down
6 changes: 3 additions & 3 deletions ...enCellIdWithRwanda10AndOverture/index.tsx → ...ellId/WithOverture/WithRwanda10/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { OpenCellIdPMTilesSource as dataSource } from "../../../components/Datasets/OpenCellId/source";
import { Rwanda10PMTilesSource as terrainSource } from "../../../components/Datasets/Rwanda10/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../Datasets/OvertureMaps/source";
import { OpenCellIdPMTilesSource as dataSource } from "../../../../../components/Datasets/OpenCellId/source";
import { Rwanda10PMTilesSource as terrainSource } from "../../../../../components/Datasets/Rwanda10/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../../../../components/Datasets/OvertureMaps/source";

export const OpenCellIdWithRwanda10AndOverture: React.FC<{ mapStyle: string }> = ({
mapStyle,
Expand Down
2 changes: 1 addition & 1 deletion .../OpenCellIdWithOverture/index.stories.tsx → ...OpenCellId/WithOverture/index.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from "@storybook/react";
import { OpenCellIdWithOverture } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { mapStyleOptions } from "../../../../components/mapStyleOptions";

const meta = {
component: OpenCellIdWithOverture,
Expand Down
4 changes: 2 additions & 2 deletions ...Combined/OpenCellIdWithOverture/index.tsx → ...ombined/OpenCellId/WithOverture/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { OpenCellIdPMTilesSource as dataSource } from "../../Datasets/OpenCellId/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../Datasets/OvertureMaps/source";
import { OpenCellIdPMTilesSource as dataSource } from "../../../../components/Datasets/OpenCellId/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../../../components/Datasets/OvertureMaps/source";

export const OpenCellIdWithOverture: React.FC<{ mapStyle: string }> = ({
mapStyle,
Expand Down
2 changes: 1 addition & 1 deletion ...ithOpenCellIdAndOverture/index.stories.ts → ...hOverture/WithOpenCellId/index.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from "@storybook/react";
import { VientianeLanduseWithOpenCellIdAndOverture } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { mapStyleOptions } from "../../../../../components/mapStyleOptions";

const meta = {
component: VientianeLanduseWithOpenCellIdAndOverture,
Expand Down
6 changes: 3 additions & 3 deletions ...anduseWithOpenCellIdAndOverture/index.tsx → ...use/WithOverture/WithOpenCellId/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { VientianeLandusePMTilesSource as landuseDataSource } from "../../Datasets/VientianeLanduse/source";
import { OpenCellIdPMTilesSource as cellIdDataSource } from "../../Datasets/OpenCellId/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../Datasets/OvertureMaps/source";
import { VientianeLandusePMTilesSource as landuseDataSource } from "../../../../../components/Datasets/VientianeLanduse/source";
import { OpenCellIdPMTilesSource as cellIdDataSource } from "../../../../../components/Datasets/OpenCellId/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../../../../components/Datasets/OvertureMaps/source";

export const VientianeLanduseWithOpenCellIdAndOverture: React.FC<{ mapStyle: string }> = ({
mapStyle,
Expand Down
2 changes: 1 addition & 1 deletion ...tianeLanduseWithOverture/index.stories.ts → ...ianeLanduse/WithOverture/index.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from "@storybook/react";
import { VientianeLanduseWithOverture } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { mapStyleOptions } from "../../../../components/mapStyleOptions";

const meta = {
component: VientianeLanduseWithOverture,
Expand Down
4 changes: 2 additions & 2 deletions ...ed/VientianeLanduseWithOverture/index.tsx → ...d/VientianeLanduse/WithOverture/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { VientianeLandusePMTilesSource as dataSource } from "../../Datasets/VientianeLanduse/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../Datasets/OvertureMaps/source";
import { VientianeLandusePMTilesSource as dataSource } from "../../../../components/Datasets/VientianeLanduse/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../../../components/Datasets/OvertureMaps/source";

export const VientianeLanduseWithOverture: React.FC<{ mapStyle: string }> = ({
mapStyle,
Expand Down
2 changes: 1 addition & 1 deletion ...ined/VientianeLanduseMap/index.stories.ts → ...ombined/VientianeLanduse/index.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from "@storybook/react";
import { VientianeLanduseMap } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { mapStyleOptions } from "../../../components/mapStyleOptions";

const meta = {
component: VientianeLanduseMap,
Expand Down
2 changes: 1 addition & 1 deletion ...ts/Combined/VientianeLanduseMap/index.tsx → ...mples/Combined/VientianeLanduse/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { VientianeLandusePMTilesSource as dataSource } from "../../Datasets/VientianeLanduse/source";
import { VientianeLandusePMTilesSource as dataSource } from "../../../components/Datasets/VientianeLanduse/source";

export const VientianeLanduseMap: React.FC<{ mapStyle: string }> = ({
mapStyle,
Expand Down
2 changes: 1 addition & 1 deletion ...ents/Combined/RwandaMap/index.stories.tsx → ...mples/Stories/RwandaMap/index.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from "@storybook/react";
import { RwandaMap } from ".";
import { mapStyleOptions } from "../../mapStyleOptions";
import { mapStyleOptions } from "../../../components/mapStyleOptions";

const meta = {
component: RwandaMap,
Expand Down
8 changes: 4 additions & 4 deletions src/components/Combined/RwandaMap/index.tsx → src/examples/Stories/RwandaMap/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import maplibregl from "maplibre-gl";
import "maplibre-gl/dist/maplibre-gl.css";
import { Layer, Map, Source } from "react-map-gl/maplibre";
import { useEffect } from "react";
import { OpenCellIdPMTilesSource as cellDataSource } from "../../Datasets/OpenCellId/source";
import { ArmedConflictPMTilesSource as conflictDataSource } from "../../Datasets/ArmedConflict/source";
import { Rwanda10PMTilesSource as terrainSource } from "../../Datasets/Rwanda10/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../Datasets/OvertureMaps/source";
import { OpenCellIdPMTilesSource as cellDataSource } from "../../../components/Datasets/OpenCellId/source";
import { ArmedConflictPMTilesSource as conflictDataSource } from "../../../components/Datasets/ArmedConflict/source";
import { Rwanda10PMTilesSource as terrainSource } from "../../../components/Datasets/Rwanda10/source";
import { OvertureMapsTransportationOnlyPMTilesSource as transportationSource } from "../../../components/Datasets/OvertureMaps/source";

export const RwandaMap: React.FC<{ mapStyle: string }> = ({
mapStyle,
Expand Down