Merge pull request #108 from UNopenGIS/rearrenge-directory-structure

refactor: move Combined to examples dir
UNopenGIS · Aug 3, 2024 · b35d61c · b35d61c
2 parents c868637 + 9f18236
commit b35d61c
Show file tree

Hide file tree

Showing 24 changed files with 47 additions and 44 deletions.
diff --git a/...ArmedConflictWithBaseMap/index.stories.ts → ...rmedConflict/WithBaseMap/index.stories.ts b/...ArmedConflictWithBaseMap/index.stories.ts → ...rmedConflict/WithBaseMap/index.stories.ts
@@ -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,

diff --git a/...mbined/ArmedConflictWithBaseMap/index.tsx → ...bined/ArmedConflict/WithBaseMap/index.tsx b/...mbined/ArmedConflictWithBaseMap/index.tsx → ...bined/ArmedConflict/WithBaseMap/index.tsx
@@ -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,

diff --git a/...tWithRwanda10AndOverture/index.stories.ts → ...ithOverture/WithRwanda10/index.stories.ts b/...tWithRwanda10AndOverture/index.stories.ts → ...ithOverture/WithRwanda10/index.stories.ts
@@ -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,
@@ -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 = {};
diff --git a/...ConflictWithRwanda10AndOverture/index.tsx → ...flict/WithOverture/WithRwanda10/index.tsx b/...ConflictWithRwanda10AndOverture/index.tsx → ...flict/WithOverture/WithRwanda10/index.tsx
@@ -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(() => {

diff --git a/...rmedConflictWithOverture/index.stories.ts → ...medConflict/WithOverture/index.stories.ts b/...rmedConflictWithOverture/index.stories.ts → ...medConflict/WithOverture/index.stories.ts
@@ -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,

diff --git a/...bined/ArmedConflictWithOverture/index.tsx → ...ined/ArmedConflict/WithOverture/index.tsx b/...bined/ArmedConflictWithOverture/index.tsx → ...ined/ArmedConflict/WithOverture/index.tsx
@@ -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,

diff --git a/...ed/OpenCellIdWithBaseMap/index.stories.ts → ...d/OpenCellId/WithBaseMap/index.stories.ts b/...ed/OpenCellIdWithBaseMap/index.stories.ts → ...d/OpenCellId/WithBaseMap/index.stories.ts
@@ -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,

diff --git a/.../Combined/OpenCellIdWithBaseMap/index.tsx → ...Combined/OpenCellId/WithBaseMap/index.tsx b/.../Combined/OpenCellIdWithBaseMap/index.tsx → ...Combined/OpenCellId/WithBaseMap/index.tsx
@@ -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,

diff --git a/...ined/OpenCellIdWithDEM1A/index.stories.ts → ...ned/OpenCellId/WithDEM1A/index.stories.ts b/...ined/OpenCellIdWithDEM1A/index.stories.ts → ...ned/OpenCellId/WithDEM1A/index.stories.ts
@@ -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,

diff --git a/...ts/Combined/OpenCellIdWithDEM1A/index.tsx → ...s/Combined/OpenCellId/WithDEM1A/index.tsx b/...ts/Combined/OpenCellIdWithDEM1A/index.tsx → ...s/Combined/OpenCellId/WithDEM1A/index.tsx
@@ -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,

diff --git a/...lIdWithDEM1AAndOverture/index.stories.tsx → .../WithOverture/WithDEM1A/index.stories.tsx b/...lIdWithDEM1AAndOverture/index.stories.tsx → .../WithOverture/WithDEM1A/index.stories.tsx
@@ -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,

diff --git a/.../OpenCellIdWithDEM1AAndOverture/index.tsx → ...enCellId/WithOverture/WithDEM1A/index.tsx b/.../OpenCellIdWithDEM1AAndOverture/index.tsx → ...enCellId/WithOverture/WithDEM1A/index.tsx
@@ -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,

diff --git a/...WithRwanda10AndOverture/index.stories.tsx → ...thOverture/WithRwanda10/index.stories.tsx b/...WithRwanda10AndOverture/index.stories.tsx → ...thOverture/WithRwanda10/index.stories.tsx
@@ -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,

diff --git a/...enCellIdWithRwanda10AndOverture/index.tsx → ...ellId/WithOverture/WithRwanda10/index.tsx b/...enCellIdWithRwanda10AndOverture/index.tsx → ...ellId/WithOverture/WithRwanda10/index.tsx
@@ -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,

diff --git a/.../OpenCellIdWithOverture/index.stories.tsx → ...OpenCellId/WithOverture/index.stories.tsx b/.../OpenCellIdWithOverture/index.stories.tsx → ...OpenCellId/WithOverture/index.stories.tsx
@@ -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,

diff --git a/...Combined/OpenCellIdWithOverture/index.tsx → ...ombined/OpenCellId/WithOverture/index.tsx b/...Combined/OpenCellIdWithOverture/index.tsx → ...ombined/OpenCellId/WithOverture/index.tsx
@@ -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,

diff --git a/...ithOpenCellIdAndOverture/index.stories.ts → ...hOverture/WithOpenCellId/index.stories.ts b/...ithOpenCellIdAndOverture/index.stories.ts → ...hOverture/WithOpenCellId/index.stories.ts
@@ -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,

diff --git a/...anduseWithOpenCellIdAndOverture/index.tsx → ...use/WithOverture/WithOpenCellId/index.tsx b/...anduseWithOpenCellIdAndOverture/index.tsx → ...use/WithOverture/WithOpenCellId/index.tsx
@@ -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,

diff --git a/...tianeLanduseWithOverture/index.stories.ts → ...ianeLanduse/WithOverture/index.stories.ts b/...tianeLanduseWithOverture/index.stories.ts → ...ianeLanduse/WithOverture/index.stories.ts
@@ -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,

diff --git a/...ed/VientianeLanduseWithOverture/index.tsx → ...d/VientianeLanduse/WithOverture/index.tsx b/...ed/VientianeLanduseWithOverture/index.tsx → ...d/VientianeLanduse/WithOverture/index.tsx
@@ -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,

diff --git a/...ined/VientianeLanduseMap/index.stories.ts → ...ombined/VientianeLanduse/index.stories.ts b/...ined/VientianeLanduseMap/index.stories.ts → ...ombined/VientianeLanduse/index.stories.ts
@@ -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,

diff --git a/...ts/Combined/VientianeLanduseMap/index.tsx → ...mples/Combined/VientianeLanduse/index.tsx b/...ts/Combined/VientianeLanduseMap/index.tsx → ...mples/Combined/VientianeLanduse/index.tsx
@@ -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,

diff --git a/...ents/Combined/RwandaMap/index.stories.tsx → ...mples/Stories/RwandaMap/index.stories.tsx b/...ents/Combined/RwandaMap/index.stories.tsx → ...mples/Stories/RwandaMap/index.stories.tsx
@@ -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,

diff --git a/src/components/Combined/RwandaMap/index.tsx → src/examples/Stories/RwandaMap/index.tsx b/src/components/Combined/RwandaMap/index.tsx → src/examples/Stories/RwandaMap/index.tsx
@@ -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,