From 0481c428f664897ae566fe9fa338b473f6d736c1 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Fri, 27 Nov 2020 22:24:19 +0900
Subject: [PATCH 001/138] =?UTF-8?q?[refactor]=20=EA=B3=B5=ED=86=B5=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=85=20=EB=B6=84=EB=A5=98,=20=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기능유형/세부유형/스타일 관련 상태는 계속해서 사용하므로 store/common/type 으로 이동하였음
- 기존 상태 구조는 세부 유형의 타입에 따라서 예외처리가 빈번하게 발생해서 불필요한 복잡도가 증가하였음. 따라서 Label이 text, icon으로 한 depth 더 들어가지 않고 동일하게 처리될 수 있도록 속성 수정함
- 이를 반영해서 초기 속성 불러오는 함수도 수정하고, 함수명도 조금 더 직관적이도록 수정하였음
---
 src/store/common/properties.ts | 52 ++++++++++------------------------
 src/store/common/type.ts       | 43 ++++++++++++++++++++++++----
 2 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/src/store/common/properties.ts b/src/store/common/properties.ts
index 6b784e0..a3f2d16 100644
--- a/src/store/common/properties.ts
+++ b/src/store/common/properties.ts
@@ -1,23 +1,6 @@
-export interface StyleType {
-  isChanged: boolean;
-  visibility: string;
-  color: string;
-  weight: number;
-  saturation: number;
-  lightness: number;
-}
+import { StyleType, ElementType, FeatureType } from './type';
 
-export interface CommonType {
-  fill: StyleType;
-  stroke: StyleType;
-}
-
-export interface LabelType {
-  text: CommonType;
-  icon: StyleType;
-}
-
-const style: StyleType = {
+export const style: StyleType = {
   isChanged: false,
   visibility: 'inherit',
   color: '#000000',
@@ -26,27 +9,22 @@ const style: StyleType = {
   lightness: 0,
 };
 
-const getStyle = (): StyleType => {
+const getDefaultStyle = (): StyleType => {
   return JSON.parse(JSON.stringify(style));
 };
 
-const label = {
-  text: {
-    fill: getStyle(),
-    stroke: getStyle(),
-  },
-  icon: getStyle(),
-};
-
-const section = {
-  fill: getStyle(),
-  stroke: getStyle(),
-};
-
-export const getLabel = (): LabelType => {
-  return JSON.parse(JSON.stringify(label));
+const getDefaultElement = (): ElementType => {
+  return {
+    fill: getDefaultStyle(),
+    stroke: getDefaultStyle(),
+  };
 };
 
-export const getSection = (): CommonType => {
-  return JSON.parse(JSON.stringify(section));
+export const getDefaultFeature = (): FeatureType => {
+  return {
+    isChanged: false,
+    section: getDefaultElement(),
+    labelText: getDefaultElement(),
+    labelIcon: getDefaultStyle(),
+  };
 };
diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index ab7a6e0..3882ddb 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -1,9 +1,40 @@
-import { LabelType, CommonType } from './properties';
+export type ElementNameType = 'section' | 'labelText' | 'labelIcon';
+export type SubElementNameType = 'fill' | 'stroke';
 
+export type FeatureNameOneType = 'water' | 'marker';
+export type FeatureNameMultiType =
+  | 'poi'
+  | 'administrative'
+  | 'landscape'
+  | 'road'
+  | 'transit';
+export type FeatureNameType = FeatureNameMultiType | FeatureNameOneType;
+
+export interface StyleType {
+  isChanged: boolean;
+  visibility: string;
+  color: string;
+  weight: number;
+  saturation: number;
+  lightness: number;
+}
+export interface ElementType {
+  fill: StyleType;
+  stroke: StyleType;
+}
+export interface FeatureType {
+  isChanged: boolean;
+  section: ElementType;
+  labelText: ElementType;
+  labelIcon: StyleType;
+}
 export interface FeatureState {
-  [name: string]: {
-    isChanged: boolean;
-    section: CommonType;
-    label: LabelType;
-  };
+  [name: string]: FeatureType;
 }
+
+export type ActionPayload = {
+  feature: string;
+  element: ElementNameType;
+  subElement?: SubElementNameType;
+  style: StyleType;
+};

From 71516e80135bb1f7b40957226a99c9163c91fe89 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Fri, 27 Nov 2020 22:28:53 +0900
Subject: [PATCH 002/138] =?UTF-8?q?[refactor]=20=EC=83=81=ED=83=9C=20?=
 =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0?=
 =?UTF-8?q?=EB=A5=B8=20=EA=B3=B5=ED=86=B5=20Action,=20Reducer=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 요소 유형에 따라서 다른 Action으로 분류할 필요성이 없어졌고, 코드 중복을 줄이기 위해서 SET을 하나의 액션으로 분류하였음
- 리듀서 또한 코드 중복이 많아서 함께 SET으로 통합해서 처리하였음
---
 src/store/common/action.ts  | 47 ++++++++++---------------------------
 src/store/common/reducer.ts | 43 ++++++++-------------------------
 2 files changed, 23 insertions(+), 67 deletions(-)

diff --git a/src/store/common/action.ts b/src/store/common/action.ts
index 8ed6d3a..26ac171 100644
--- a/src/store/common/action.ts
+++ b/src/store/common/action.ts
@@ -1,49 +1,28 @@
-import { StyleType } from './properties';
+import { ActionPayload } from './type';
 
 export const INIT = 'INIT' as const;
+export const SET = 'SET' as const;
 export const SET_SECTION = 'SET_SECTION' as const;
 export const SET_LABEL_TEXT = 'SET_LABEL_TEXT' as const;
 export const SET_LABEL_ICON = 'SET_LABEL_ICON' as const;
 
-export type ElementType = 'fill' | 'stroke';
 export interface SetType {
-  type: typeof SET_SECTION | typeof SET_LABEL_ICON | typeof SET_LABEL_TEXT;
-  payload: {
-    feature: string;
-    element?: ElementType;
-    style: StyleType;
-  };
+  type: typeof SET;
+  payload: ActionPayload;
 }
 
 export const init = (): { type: typeof INIT } => ({
   type: INIT,
 });
 
-export const setSection = (
-  feature: string,
-  element: ElementType,
-  style: StyleType
-): SetType => ({
-  type: SET_SECTION,
-  payload: { feature, style, element },
+export const setStyle = ({
+  feature,
+  element,
+  subElement,
+  style,
+}: ActionPayload): SetType => ({
+  type: SET,
+  payload: { feature, element, subElement, style },
 });
 
-export const setLabelText = (
-  feature: string,
-  element: ElementType,
-  style: StyleType
-): SetType => ({
-  type: SET_LABEL_TEXT,
-  payload: { feature, style, element },
-});
-
-export const setLabelIcon = (feature: string, style: StyleType): SetType => ({
-  type: SET_LABEL_ICON,
-  payload: { feature, style },
-});
-
-export type ActionType =
-  | ReturnType<typeof init>
-  | ReturnType<typeof setSection>
-  | ReturnType<typeof setLabelText>
-  | ReturnType<typeof setLabelIcon>;
+export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
diff --git a/src/store/common/reducer.ts b/src/store/common/reducer.ts
index 1f8ead7..61ceddc 100644
--- a/src/store/common/reducer.ts
+++ b/src/store/common/reducer.ts
@@ -1,14 +1,8 @@
 import renderingData from '../../utils/rendering-data/featureTypeData';
 
 import { FeatureState } from './type';
-import { getLabel, getSection } from './properties';
-import {
-  INIT,
-  SET_SECTION,
-  SET_LABEL_TEXT,
-  SET_LABEL_ICON,
-  ActionType,
-} from './action';
+import { getDefaultFeature } from './properties';
+import { INIT, SET, ActionType } from './action';
 
 interface ReducerType {
   (state: FeatureState, action: ActionType): FeatureState;
@@ -21,11 +15,7 @@ export default function getReducer(IDX: number): ReducerType {
   ];
 
   const initialState = subFeatures.reduce((acc: FeatureState, cur: string) => {
-    acc[cur] = {
-      isChanged: false,
-      section: getSection(),
-      label: getLabel(),
-    };
+    acc[cur] = getDefaultFeature();
     return acc;
   }, {});
 
@@ -38,31 +28,18 @@ export default function getReducer(IDX: number): ReducerType {
     switch (action.type) {
       case INIT:
         return initialState;
-      case SET_SECTION: {
-        const { feature, element, style } = action.payload;
+      case SET: {
+        const { feature, element, subElement, style } = action.payload;
         if (!featureTypes.includes(feature)) return state;
 
         const newState = JSON.parse(JSON.stringify(state));
-        newState[feature].section[element as string] = style;
 
-        return newState;
-      }
-      case SET_LABEL_TEXT: {
-        const { feature, element, style } = action.payload;
-        if (!featureTypes.includes(feature)) return state;
-
-        const newState = JSON.parse(JSON.stringify(state));
-        newState[feature].label.text[element as string] = style;
-
-        return newState;
-      }
-      case SET_LABEL_ICON: {
-        const { feature, style } = action.payload;
-        if (!featureTypes.includes(feature)) return state;
-
-        const newState = JSON.parse(JSON.stringify(state));
-        newState[feature].icon = style;
+        if (element === 'labelIcon') {
+          newState[feature][element] = style;
+          return newState;
+        }
 
+        newState[feature][element][subElement as string] = style;
         return newState;
       }
       default:

From a1c3576ad7a10bd2df6e2db6e652ef987fc328d1 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Fri, 27 Nov 2020 22:33:44 +0900
Subject: [PATCH 003/138] =?UTF-8?q?[refactor]=20=EC=83=81=ED=83=9C=20?=
 =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0?=
 =?UTF-8?q?=EB=A5=B8=20=EB=AC=BC,=20=EB=A7=88=EC=BB=A4=20Aciton,=20Reducer?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 공통 Reducer와 동일하게 중복되는 함수를 제거하도록 조정하였음
- 그런데 공통 Action과 물, 마커 Action의 처리에 있어서 feature를 다른 단위로 취급하는 버그가 아직 남아있음
- 위 이슈를 해결하기 위해서 Aciton을 Reducer 별로 다르게 표기하던지, payload에 항목을 하나 상위 기능 유형을 추가할 필요가 있을 것 같음
---
 src/store/style/markerReducer.ts | 60 +++++++-------------------------
 src/store/style/waterReducer.ts  | 60 +++++++-------------------------
 2 files changed, 26 insertions(+), 94 deletions(-)

diff --git a/src/store/style/markerReducer.ts b/src/store/style/markerReducer.ts
index a77d19e..95553f0 100644
--- a/src/store/style/markerReducer.ts
+++ b/src/store/style/markerReducer.ts
@@ -1,62 +1,28 @@
-import {
-  getLabel,
-  getSection,
-  LabelType,
-  CommonType,
-} from '../common/properties';
+import { getDefaultFeature } from '../common/properties';
+import { FeatureType } from '../common/type';
+import { INIT, SET, ActionType } from '../common/action';
 
-import {
-  INIT,
-  SET_SECTION,
-  SET_LABEL_TEXT,
-  SET_LABEL_ICON,
-  ActionType,
-} from '../common/action';
-
-export interface MarkerType {
-  isChanged: boolean;
-  section: CommonType;
-  label: LabelType;
-}
-
-const initialState = {
-  isChanged: false,
-  section: getSection(),
-  label: getLabel(),
-};
+const initialState = getDefaultFeature();
 
 export default function markerReducer(
-  state: MarkerType = initialState,
+  state: FeatureType = initialState,
   action: ActionType
-): MarkerType {
+): FeatureType {
   switch (action.type) {
     case INIT:
       return initialState;
-    case SET_SECTION: {
-      const { feature, element, style } = action.payload;
-      if (feature !== 'marker') return state;
-
-      const newState = JSON.parse(JSON.stringify(state));
-      newState.section[element as string] = style;
-
-      return newState;
-    }
-    case SET_LABEL_TEXT: {
-      const { feature, element, style } = action.payload;
+    case SET: {
+      const { feature, element, subElement, style } = action.payload;
       if (feature !== 'marker') return state;
 
       const newState = JSON.parse(JSON.stringify(state));
-      newState.label.text[element as string] = style;
 
-      return newState;
-    }
-    case SET_LABEL_ICON: {
-      const { feature, style } = action.payload;
-      if (feature !== 'marker') return state;
-
-      const newState = JSON.parse(JSON.stringify(state));
-      newState.icon = style;
+      if (element === 'labelIcon') {
+        newState[element] = style;
+        return newState;
+      }
 
+      newState[element][subElement as string] = style;
       return newState;
     }
     default:
diff --git a/src/store/style/waterReducer.ts b/src/store/style/waterReducer.ts
index 6c84d50..0ae8b94 100644
--- a/src/store/style/waterReducer.ts
+++ b/src/store/style/waterReducer.ts
@@ -1,62 +1,28 @@
-import {
-  getLabel,
-  getSection,
-  LabelType,
-  CommonType,
-} from '../common/properties';
+import { getDefaultFeature } from '../common/properties';
+import { FeatureType } from '../common/type';
+import { INIT, SET, ActionType } from '../common/action';
 
-import {
-  INIT,
-  SET_SECTION,
-  SET_LABEL_TEXT,
-  SET_LABEL_ICON,
-  ActionType,
-} from '../common/action';
-
-export interface WaterType {
-  isChanged: boolean;
-  section: CommonType;
-  label: LabelType;
-}
-
-const initialState = {
-  isChanged: false,
-  section: getSection(),
-  label: getLabel(),
-};
+const initialState = getDefaultFeature();
 
 export default function waterReducer(
-  state: WaterType = initialState,
+  state: FeatureType = initialState,
   action: ActionType
-): WaterType {
+): FeatureType {
   switch (action.type) {
     case INIT:
       return initialState;
-    case SET_SECTION: {
-      const { feature, element, style } = action.payload;
-      if (feature !== 'water') return state;
-
-      const newState = JSON.parse(JSON.stringify(state));
-      newState.section[element as string] = style;
-
-      return newState;
-    }
-    case SET_LABEL_TEXT: {
-      const { feature, element, style } = action.payload;
+    case SET: {
+      const { feature, element, subElement, style } = action.payload;
       if (feature !== 'water') return state;
 
       const newState = JSON.parse(JSON.stringify(state));
-      newState.label.text[element as string] = style;
 
-      return newState;
-    }
-    case SET_LABEL_ICON: {
-      const { feature, style } = action.payload;
-      if (feature !== 'water') return state;
-
-      const newState = JSON.parse(JSON.stringify(state));
-      newState.icon = style;
+      if (element === 'labelIcon') {
+        newState[element] = style;
+        return newState;
+      }
 
+      newState[element][subElement as string] = style;
       return newState;
     }
     default:

From 9bdaa3dc1b27cd003a1a7cf2abb9d36a92d73fea Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Fri, 27 Nov 2020 22:55:11 +0900
Subject: [PATCH 004/138] =?UTF-8?q?[refactor]=20=EA=B3=B5=ED=86=B5=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=85=20=EB=B6=84=EB=A5=98=20=EB=8B=A4=EB=A5=B8?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=8F=84=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- store/common/type으로 분류된 타입들 import 경로 수정함
- 기능 유형 인터페이스 2개로 분리되어 있었는데, 둘다 사용하는 경우가 많아서 하나로 통합된 interface도 하나더 정의해 import하도록 하였음
---
 .../Sidebar/SidebarContentMore/DetailType.tsx |  6 +++--
 .../SidebarContentMore/FeatureType.tsx        |  4 +++-
 .../SidebarContentMore/FeatureTypeItem.tsx    |  9 +++-----
 src/hooks/sidebar/useDetailType.ts            | 22 ++++++++-----------
 src/hooks/sidebar/useFeatureTypeItem.ts       | 12 +++-------
 src/utils/rendering-data/featureTypeData.ts   | 10 ++-------
 6 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index 82a93db..c347351 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -6,7 +6,9 @@ import useSidebarType, {
 import ListItem, { paddingStepType, paddingStep } from './DetailTypeItem';
 import useDetailType from '../../../hooks/sidebar/useDetailType';
 import Styler from './Styler';
-import { FeatureNameType } from '../../../utils/rendering-data/featureTypeData';
+import {
+  FeatureNameType,
+} from '../../../store/common/type';
 
 interface PaddingProp {
   padding: paddingStepType;
@@ -58,7 +60,7 @@ const CheckRight = styled.div`
 `;
 
 interface DetailTypeProps {
-  featureName: string;
+  featureName: FeatureNameType;
   subFeatureName: string;
 }
 
diff --git a/src/components/Sidebar/SidebarContentMore/FeatureType.tsx b/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
index ed38902..da87cae 100644
--- a/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
@@ -6,6 +6,8 @@ import DetailType from './DetailType';
 import useSidebarType, {
   SidebarHookType,
 } from '../../../hooks/sidebar/useSidebarType';
+import { FeatureNameType } from '../../../store/common/type';
+
 import FeatureTypeItem from './FeatureTypeItem';
 
 interface WrapperProps {
@@ -51,7 +53,7 @@ function FeatureType(): React.ReactElement {
         ))}
       </FeatureTypeWrapper>
       <DetailType
-        featureName={sidebarTypeName}
+        featureName={sidebarTypeName as FeatureNameType}
         subFeatureName={sidebarSubTypeName}
       />
     </>
diff --git a/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx b/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx
index bd16082..cf44206 100644
--- a/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx
+++ b/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx
@@ -1,10 +1,7 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
-import {
-  FeaturesType,
-  FeatureNameType,
-  FeatureNameOneType,
-} from '../../../utils/rendering-data/featureTypeData';
+import { FeaturesType } from '../../../utils/rendering-data/featureTypeData';
+import { FeatureNameType } from '../../../store/common/type';
 import useFeatureTypeItemHook from '../../../hooks/sidebar/useFeatureTypeItem';
 
 interface ListProps {
@@ -61,7 +58,7 @@ const Pointer = styled.span`
 `;
 
 interface FeatureTypeItemProps {
-  typeKey: FeatureNameType | FeatureNameOneType;
+  typeKey: FeatureNameType;
   typeName: string;
   features: FeaturesType[];
   sidebarTypeName: string;
diff --git a/src/hooks/sidebar/useDetailType.ts b/src/hooks/sidebar/useDetailType.ts
index e0e9a8f..7ba7ecc 100644
--- a/src/hooks/sidebar/useDetailType.ts
+++ b/src/hooks/sidebar/useDetailType.ts
@@ -3,21 +3,17 @@ import { RootState } from '../../store';
 import {
   FeatureNameType,
   FeatureNameOneType,
-} from '../../utils/rendering-data/featureTypeData';
-import { CommonType, LabelType } from '../../store/common/properties';
-
-interface DetailType {
-  section: CommonType;
-  label: LabelType;
-}
+  FeatureNameMultiType,
+  FeatureType,
+} from '../../store/common/type';
 
 interface UseDetailTypeProps {
-  featureName: string;
+  featureName: FeatureNameType;
   subFeatureName: string;
 }
 
-interface UseDetailTypeType {
-  detail: DetailType;
+export interface UseDetailHookType {
+  detail: FeatureType;
 }
 
 const dummyDetail = {
@@ -28,7 +24,7 @@ const dummyDetail = {
 function useDetailType({
   featureName,
   subFeatureName,
-}: UseDetailTypeProps): UseDetailTypeType {
+}: UseDetailTypeProps): UseDetailHookType {
   const detail = useSelector<RootState>((state) => {
     if (!featureName) {
       return dummyDetail;
@@ -37,8 +33,8 @@ function useDetailType({
       return state[featureName as FeatureNameOneType];
     }
 
-    return state[featureName as FeatureNameType][subFeatureName];
-  }) as DetailType;
+    return state[featureName as FeatureNameMultiType][subFeatureName];
+  }) as FeatureType;
 
   return {
     detail,
diff --git a/src/hooks/sidebar/useFeatureTypeItem.ts b/src/hooks/sidebar/useFeatureTypeItem.ts
index b4b1fbe..994c51a 100644
--- a/src/hooks/sidebar/useFeatureTypeItem.ts
+++ b/src/hooks/sidebar/useFeatureTypeItem.ts
@@ -1,19 +1,13 @@
 import { useSelector } from 'react-redux';
 import { RootState } from '../../store';
-import { FeatureState } from '../../store/common/type';
-
-import {
-  FeatureNameType,
-  FeatureNameOneType,
-} from '../../utils/rendering-data/featureTypeData';
+import { FeatureState, FeatureNameType } from '../../store/common/type';
 
 interface useFeatureTypeItemType {
-  // 나중에 | 연산으로 다양한 타입으로 수정 필요
   featureList: FeatureState;
 }
 
 export interface useFeatureTypeItemProps {
-  featureName: FeatureNameType | FeatureNameOneType;
+  featureName: FeatureNameType;
 }
 
 function useFeatureTypeItem({
@@ -21,7 +15,7 @@ function useFeatureTypeItem({
 }: useFeatureTypeItemProps): useFeatureTypeItemType {
   const featureList = useSelector<RootState>(
     (state) => state[featureName]
-  ) as FeatureState; // 나중에 다양한 타입으로 수정 필요
+  ) as FeatureState;
 
   return {
     featureList,
diff --git a/src/utils/rendering-data/featureTypeData.ts b/src/utils/rendering-data/featureTypeData.ts
index 5492066..51893c5 100644
--- a/src/utils/rendering-data/featureTypeData.ts
+++ b/src/utils/rendering-data/featureTypeData.ts
@@ -1,17 +1,11 @@
-export type FeatureNameOneType = 'water' | 'marker';
-export type FeatureNameType =
-  | 'poi'
-  | 'administrative'
-  | 'landscape'
-  | 'road'
-  | 'transit';
+import { FeatureNameType } from '../../store/common/type';
 
 export interface FeaturesType {
   key: string;
   name: string;
 }
 export interface DataType {
-  typeKey: FeatureNameType | FeatureNameOneType;
+  typeKey: FeatureNameType;
   typeName: string;
   features: FeaturesType[];
 }

From 4d823805e9b0e3125cb6d696aa7cc1bc35899a6a Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Fri, 27 Nov 2020 23:04:41 +0900
Subject: [PATCH 005/138] =?UTF-8?q?[fix]=20=EC=84=B8=EB=B6=80=20=EC=9C=A0?=
 =?UTF-8?q?=ED=98=95=20=EC=82=AC=EC=9D=B4=EB=93=9C=EB=B0=94=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EA=B4=80=EB=A0=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 세부 유형 선택 중인 상태을 상위, 하위 요소를 구분해서 상태를 저장하도록 수정함
- 세부 유형을 클릭하면 상위/하위 요소 상태 업데이트하도록 수정함
- 리팩토링 후 ListItem 컴포넌트 내부에서 사용하지 않는 속성은 제거하고, UI로 표시될 텍스트만 남겼음
- 수정한 함수를 Hook으로 분리, 하드코딩된 유형을 분리 등의 리팩토링이 요구됨
---
 .../Sidebar/SidebarContentMore/DetailType.tsx | 75 +++++++++++--------
 .../SidebarContentMore/DetailTypeItem.tsx     | 16 +---
 2 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index c347351..f9b5131 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -4,10 +4,14 @@ import useSidebarType, {
   SidebarHookType,
 } from '../../../hooks/sidebar/useSidebarType';
 import ListItem, { paddingStepType, paddingStep } from './DetailTypeItem';
-import useDetailType from '../../../hooks/sidebar/useDetailType';
+import useDetailType, {
+  UseDetailHookType,
+} from '../../../hooks/sidebar/useDetailType';
 import Styler from './Styler';
 import {
   FeatureNameType,
+  ElementNameType,
+  SubElementNameType,
 } from '../../../store/common/type';
 
 interface PaddingProp {
@@ -70,12 +74,35 @@ function DetailType({
 }: DetailTypeProps): React.ReactElement {
   const {
     sidebarTypeName,
+    sidebarSubTypeName,
     sidebarTypeClickHandler,
+    sidebarSubTypeClickHandler,
   }: SidebarHookType = useSidebarType();
 
   const {
-    detail: { section, label },
-  } = useDetailType({ featureName, subFeatureName });
+    detail: { section, labelText, labelIcon },
+  }: UseDetailHookType = useDetailType({
+    featureName,
+    subFeatureName,
+  });
+
+  const styleClickHandler = (
+    elementName: ElementNameType,
+    subElementName?: SubElementNameType
+  ) => {
+    sidebarTypeClickHandler(elementName);
+    if (subElementName) sidebarSubTypeClickHandler(subElementName);
+  };
+
+  const getIsSelected = (
+    elementName: ElementNameType,
+    subElementName?: SubElementNameType
+  ) => {
+    if (!subElementName) return sidebarTypeName === elementName;
+    return (
+      sidebarTypeName === elementName && sidebarSubTypeName === subElementName
+    );
+  };
 
   if (!featureName) {
     return <></>;
@@ -89,57 +116,45 @@ function DetailType({
           <Text padding="first">구역</Text>
           {section?.fill.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
-            detailName={sidebarTypeName}
+            isSelected={getIsSelected('section', 'fill')}
             padding="second"
-            clickHandler={(name) => {
-              return sidebarTypeClickHandler(name as FeatureNameType);
-            }}
+            clickHandler={() => styleClickHandler('section', 'fill')}
             name="채우기"
-            parent="구역"
           />
           {section?.stroke.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
-            detailName={sidebarTypeName}
+            isSelected={
+              sidebarTypeName === 'section' && sidebarSubTypeName === 'stroke'
+            }
             padding="second"
-            clickHandler={(name) => {
-              sidebarTypeClickHandler(name as FeatureNameType);
-            }}
+            clickHandler={() => styleClickHandler('section', 'stroke')}
             name="윤곽선"
-            parent="구역"
           />
         </List>
         <List>
           <Text padding="first">라벨</Text>
           <List>
             <Text padding="second">텍스트</Text>
-            {label?.text.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+            {labelText.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
             <ListItem
-              detailName={sidebarTypeName}
+              isSelected={getIsSelected('labelText', 'fill')}
               padding="third"
-              clickHandler={(name) => {
-                sidebarTypeClickHandler(name as FeatureNameType);
-              }}
+              clickHandler={() => styleClickHandler('labelText', 'fill')}
               name="채우기"
-              parent="텍스트"
             />
-            {label?.text.stroke.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+            {labelText.stroke.isChanged ? <CheckRight>✓</CheckRight> : <></>}
             <ListItem
-              detailName={sidebarTypeName}
+              isSelected={getIsSelected('labelText', 'stroke')}
               padding="third"
-              clickHandler={(name) => {
-                sidebarTypeClickHandler(name as FeatureNameType);
-              }}
+              clickHandler={() => styleClickHandler('labelText', 'stroke')}
               name="윤곽선"
-              parent="텍스트"
             />
           </List>
-          {label?.icon.isChanged ? <Check>✓</Check> : <></>}
+          {labelIcon.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
-            detailName={sidebarTypeName}
+            isSelected={getIsSelected('labelIcon')}
             padding="second"
-            clickHandler={(name) => {
-              sidebarTypeClickHandler(name as FeatureNameType);
-            }}
+            clickHandler={() => styleClickHandler('labelIcon')}
             name="아이콘"
           />
         </List>
diff --git a/src/components/Sidebar/SidebarContentMore/DetailTypeItem.tsx b/src/components/Sidebar/SidebarContentMore/DetailTypeItem.tsx
index cd03501..b7a16a1 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailTypeItem.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailTypeItem.tsx
@@ -4,11 +4,10 @@ import styled from '../../../utils/styles/styled';
 export type paddingStepType = 'first' | 'second' | 'third';
 
 interface ListItemProps {
+  isSelected: boolean;
   padding: paddingStepType;
-  clickHandler: (name: string) => void;
+  clickHandler: () => void;
   name: string;
-  parent?: string;
-  detailName: string;
 }
 
 interface PaddingProp {
@@ -46,20 +45,13 @@ const Item = styled.li<ItemProps>`
 const Pointer = styled.span``;
 
 function DetailTypeItem({
+  isSelected,
   padding,
   clickHandler,
   name,
-  parent,
-  detailName,
 }: ListItemProps): React.ReactElement {
   return (
-    <Item
-      isSelected={detailName === `${parent} ${name}`}
-      padding={padding}
-      onClick={() => {
-        clickHandler(`${parent} ${name}`);
-      }}
-    >
+    <Item isSelected={isSelected} padding={padding} onClick={clickHandler}>
       <span>{name}</span>
       <Pointer>{'>'}</Pointer>
     </Item>

From 096b76b670859338e4eac57ea51a8dabcfe6f336 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Fri, 27 Nov 2020 23:08:24 +0900
Subject: [PATCH 006/138] =?UTF-8?q?[feat]=20Style=20=EC=A0=84=EC=97=AD=20?=
 =?UTF-8?q?=EC=83=81=ED=83=9C=20=EC=A1=B0=ED=9A=8C=EB=A5=BC=20=EC=9C=84?=
 =?UTF-8?q?=ED=95=9C=20Hook=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- useDetailType과 유사한 방법으로 useStyleType Hook을 구현함
- useStyle의 경우에는 현재 선택중인 기능/세부 유형 정보도 모두 필요해 Styler 컴포넌트가 상위 컴포넌트에서 전달받도록 수정함
---
 .../Sidebar/SidebarContentMore/DetailType.tsx |  7 ++-
 .../Sidebar/SidebarContentMore/Styler.tsx     | 28 ++++++++++-
 src/hooks/sidebar/useStyleType.ts             | 50 +++++++++++++++++++
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 src/hooks/sidebar/useStyleType.ts

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index f9b5131..7cdf04f 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -159,7 +159,12 @@ function DetailType({
           />
         </List>
       </DetailWrapper>
-      <Styler detailName={sidebarTypeName} />
+      <Styler
+        featureName={featureName}
+        subFeatureName={subFeatureName}
+        detailName={sidebarTypeName as ElementNameType}
+        subDetailName={sidebarSubTypeName as SubElementNameType}
+      />
     </>
   );
 }
diff --git a/src/components/Sidebar/SidebarContentMore/Styler.tsx b/src/components/Sidebar/SidebarContentMore/Styler.tsx
index 20a54fa..3104cdf 100644
--- a/src/components/Sidebar/SidebarContentMore/Styler.tsx
+++ b/src/components/Sidebar/SidebarContentMore/Styler.tsx
@@ -1,5 +1,14 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
+import {
+  FeatureNameType,
+  ElementNameType,
+  SubElementNameType,
+} from '../../../store/common/type';
+import useStyleType, {
+  UseStyleHookType,
+} from '../../../hooks/sidebar/useStyleType';
+
 import ColorStyle from './ColorStyle';
 import WeightStyle from './WeightStyle';
 import SaturationStyle from './SaturationStyle';
@@ -31,10 +40,25 @@ const Hr = styled.hr`
 `;
 
 interface StylerProps {
-  detailName: string;
+  featureName: FeatureNameType;
+  subFeatureName: string;
+  detailName: ElementNameType;
+  subDetailName?: SubElementNameType;
 }
 
-function Styler({ detailName }: StylerProps): React.ReactElement {
+function Styler({
+  featureName,
+  subFeatureName,
+  detailName,
+  subDetailName,
+}: StylerProps): React.ReactElement {
+  const { style }: UseStyleHookType = useStyleType({
+    featureName,
+    subFeatureName,
+    detailName,
+    subDetailName,
+  });
+
   if (!detailName) {
     return <></>;
   }
diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
new file mode 100644
index 0000000..8193591
--- /dev/null
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -0,0 +1,50 @@
+import { useSelector } from 'react-redux';
+import { RootState } from '../../store';
+import {
+  FeatureNameType,
+  FeatureNameOneType,
+  FeatureNameMultiType,
+  StyleType,
+  ElementNameType,
+  SubElementNameType,
+} from '../../store/common/type';
+import { style as dummyStyle } from '../../store/common/properties';
+
+interface UseStyleTypeProps {
+  featureName: FeatureNameType;
+  subFeatureName: string;
+  detailName: ElementNameType;
+  subDetailName?: SubElementNameType;
+}
+
+export interface UseStyleHookType {
+  style: StyleType;
+}
+
+function useStyleType({
+  featureName,
+  subFeatureName,
+  detailName,
+  subDetailName,
+}: UseStyleTypeProps): UseStyleHookType {
+  const style = useSelector<RootState>((state) => {
+    if (!detailName) {
+      return dummyStyle;
+    }
+    let feature;
+    if (featureName === 'water' || featureName === 'marker') {
+      feature = state[featureName as FeatureNameOneType];
+    } else {
+      feature = state[featureName as FeatureNameMultiType][subFeatureName];
+    }
+
+    if (detailName === 'labelIcon') return feature.labelIcon;
+    return feature[detailName][subDetailName as SubElementNameType];
+  }) as StyleType;
+
+  return {
+    style,
+  };
+}
+
+export default useStyleType;

From 7ac0e00f0cfe8de577440bbd51c9facc3300d4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Sat, 28 Nov 2020 12:07:42 +0900
Subject: [PATCH 007/138] =?UTF-8?q?[feat]=20redux-devtool-extension?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- redux를 크롬에서 확인하기 위한 redux-devtool-extension을 추가함
---
 package-lock.json  | 5 +++++
 package.json       | 3 ++-
 src/store/index.ts | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 06b1252..e34ecd1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13270,6 +13270,11 @@
         "symbol-observable": "^1.2.0"
       }
     },
+    "redux-devtools-extension": {
+      "version": "2.13.8",
+      "resolved": "https://registry.npmjs.org/redux-devtools-extension/-/redux-devtools-extension-2.13.8.tgz",
+      "integrity": "sha512-8qlpooP2QqPtZHQZRhx3x3OP5skEV1py/zUdMY28WNAocbafxdG2tRD1MWE7sp8obGMNYuLWanhhQ7EQvT1FBg=="
+    },
     "regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
diff --git a/package.json b/package.json
index 1b7db12..7f40996 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "@types/node": "^12.19.4",
     "@types/react": "^16.9.56",
     "@types/react-dom": "^16.9.9",
-    "dotenv": "^8.2.0", 
+    "dotenv": "^8.2.0",
     "emotion-reset": "^2.0.7",
     "emotion-theming": "^10.0.27",
     "mapbox-gl": "^1.12.0",
@@ -21,6 +21,7 @@
     "react-redux": "^7.2.2",
     "react-scripts": "4.0.0",
     "redux": "^4.0.5",
+    "redux-devtools-extension": "^2.13.8",
     "typescript": "^4.0.5",
     "web-vitals": "^0.2.4"
   },
diff --git a/src/store/index.ts b/src/store/index.ts
index bef4662..58142cc 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,4 +1,5 @@
 import { combineReducers, createStore } from 'redux';
+import { composeWithDevTools } from 'redux-devtools-extension';
 import map from './map/reducer';
 import poi from './style/poiReducer';
 import transit from './style/transitReducer';
@@ -18,7 +19,8 @@ const rootReducer = combineReducers({
   water,
   marker,
 });
-const store = createStore(rootReducer);
+
+const store = createStore(rootReducer, composeWithDevTools());
 
 export type RootState = ReturnType<typeof rootReducer>;
 

From 8271c4441d4c40fe1817cf46789ce4095af0c23d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Sat, 28 Nov 2020 15:03:00 +0900
Subject: [PATCH 008/138] =?UTF-8?q?[feat]=20typeCheck=20utils=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 여러 타입들을 체크할 수 잇는 파일 생성
- 다른 타입체크 상황이 생기면 추가 예정
---
 src/utils/typeCheck.ts | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/utils/typeCheck.ts

diff --git a/src/utils/typeCheck.ts b/src/utils/typeCheck.ts
new file mode 100644
index 0000000..469e681
--- /dev/null
+++ b/src/utils/typeCheck.ts
@@ -0,0 +1,8 @@
+import { FeatureNameType, FeatureNameSingleType } from '../store/common/type';
+
+export function featureNameTypeCheck(
+  name: FeatureNameType
+): name is FeatureNameSingleType {
+  if (name === 'water' || name === 'marker') return true;
+  return false;
+}

From b756e80e608f4a2c36468dfdf5aea32b777a9420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Sat, 28 Nov 2020 15:04:53 +0900
Subject: [PATCH 009/138] =?UTF-8?q?[refactor]=20=EC=8A=A4=ED=83=80?=
 =?UTF-8?q?=EC=9D=BC=20=EB=B3=80=EA=B2=BD=20=EC=8B=9C=20=EA=B0=80=EC=9E=A5?=
 =?UTF-8?q?=20=EC=83=81=EC=9C=84=20feature=EB=8F=84=20=EA=B0=99=EC=9D=B4?=
 =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=EB=B0=9B=EB=8F=84=EB=A1=9D=20=ED=95=A8=20?=
 =?UTF-8?q?|=20action=20Type=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 스타일 변경 할 때 가장 상위 feature도 payload값으로 같이 입력받음(구별 위함)
- action Type의 위치를 다른 type들이 같이 있는 파일 안으로 이동
---
 src/store/common/action.ts       |  8 ++------
 src/store/common/reducer.ts      | 24 +++++++++++++++---------
 src/store/common/type.ts         | 10 +++++++---
 src/store/style/markerReducer.ts |  6 +++---
 src/store/style/waterReducer.ts  |  6 +++---
 5 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/store/common/action.ts b/src/store/common/action.ts
index 26ac171..3ba56c9 100644
--- a/src/store/common/action.ts
+++ b/src/store/common/action.ts
@@ -2,9 +2,6 @@ import { ActionPayload } from './type';
 
 export const INIT = 'INIT' as const;
 export const SET = 'SET' as const;
-export const SET_SECTION = 'SET_SECTION' as const;
-export const SET_LABEL_TEXT = 'SET_LABEL_TEXT' as const;
-export const SET_LABEL_ICON = 'SET_LABEL_ICON' as const;
 
 export interface SetType {
   type: typeof SET;
@@ -17,12 +14,11 @@ export const init = (): { type: typeof INIT } => ({
 
 export const setStyle = ({
   feature,
+  subFeature,
   element,
   subElement,
   style,
 }: ActionPayload): SetType => ({
   type: SET,
-  payload: { feature, element, subElement, style },
+  payload: { feature, subFeature, element, subElement, style },
 });
-
-export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
diff --git a/src/store/common/reducer.ts b/src/store/common/reducer.ts
index 61ceddc..a5a353f 100644
--- a/src/store/common/reducer.ts
+++ b/src/store/common/reducer.ts
@@ -1,8 +1,8 @@
 import renderingData from '../../utils/rendering-data/featureTypeData';
 
-import { FeatureState } from './type';
+import { FeatureState, ActionType, SubElementNameType } from './type';
 import { getDefaultFeature } from './properties';
-import { INIT, SET, ActionType } from './action';
+import { INIT, SET } from './action';
 
 interface ReducerType {
   (state: FeatureState, action: ActionType): FeatureState;
@@ -19,8 +19,6 @@ export default function getReducer(IDX: number): ReducerType {
     return acc;
   }, {});
 
-  const featureTypes = renderingData[IDX].features.map((v) => v.key);
-
   return function reducer(
     state: FeatureState = initialState,
     action: ActionType
@@ -29,17 +27,25 @@ export default function getReducer(IDX: number): ReducerType {
       case INIT:
         return initialState;
       case SET: {
-        const { feature, element, subElement, style } = action.payload;
-        if (!featureTypes.includes(feature)) return state;
+        const {
+          feature,
+          subFeature,
+          element,
+          subElement,
+          style,
+        } = action.payload;
+        if (feature === renderingData[IDX].typeKey) return state;
 
-        const newState = JSON.parse(JSON.stringify(state));
+        const newState: FeatureState = JSON.parse(JSON.stringify(state));
 
         if (element === 'labelIcon') {
-          newState[feature][element] = style;
+          newState[subFeature as string][element] = style;
           return newState;
         }
 
-        newState[feature][element][subElement as string] = style;
+        newState[subFeature as string][element][
+          subElement as SubElementNameType
+        ] = style;
         return newState;
       }
       default:
diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index 3882ddb..30a4ab6 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -1,14 +1,17 @@
+import { init, setStyle } from './action';
+
+export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
 export type ElementNameType = 'section' | 'labelText' | 'labelIcon';
 export type SubElementNameType = 'fill' | 'stroke';
 
-export type FeatureNameOneType = 'water' | 'marker';
+export type FeatureNameSingleType = 'water' | 'marker';
 export type FeatureNameMultiType =
   | 'poi'
   | 'administrative'
   | 'landscape'
   | 'road'
   | 'transit';
-export type FeatureNameType = FeatureNameMultiType | FeatureNameOneType;
+export type FeatureNameType = FeatureNameMultiType | FeatureNameSingleType;
 
 export interface StyleType {
   isChanged: boolean;
@@ -33,7 +36,8 @@ export interface FeatureState {
 }
 
 export type ActionPayload = {
-  feature: string;
+  feature: FeatureNameType;
+  subFeature?: string;
   element: ElementNameType;
   subElement?: SubElementNameType;
   style: StyleType;
diff --git a/src/store/style/markerReducer.ts b/src/store/style/markerReducer.ts
index 95553f0..061e7ad 100644
--- a/src/store/style/markerReducer.ts
+++ b/src/store/style/markerReducer.ts
@@ -1,6 +1,6 @@
 import { getDefaultFeature } from '../common/properties';
-import { FeatureType } from '../common/type';
-import { INIT, SET, ActionType } from '../common/action';
+import { FeatureType, ActionType, SubElementNameType } from '../common/type';
+import { INIT, SET } from '../common/action';
 
 const initialState = getDefaultFeature();
 
@@ -22,7 +22,7 @@ export default function markerReducer(
         return newState;
       }
 
-      newState[element][subElement as string] = style;
+      newState[element][subElement as SubElementNameType] = style;
       return newState;
     }
     default:
diff --git a/src/store/style/waterReducer.ts b/src/store/style/waterReducer.ts
index 0ae8b94..b0eef3f 100644
--- a/src/store/style/waterReducer.ts
+++ b/src/store/style/waterReducer.ts
@@ -1,6 +1,6 @@
 import { getDefaultFeature } from '../common/properties';
-import { FeatureType } from '../common/type';
-import { INIT, SET, ActionType } from '../common/action';
+import { FeatureType, ActionType, SubElementNameType } from '../common/type';
+import { INIT, SET } from '../common/action';
 
 const initialState = getDefaultFeature();
 
@@ -22,7 +22,7 @@ export default function waterReducer(
         return newState;
       }
 
-      newState[element][subElement as string] = style;
+      newState[element][subElement as SubElementNameType] = style;
       return newState;
     }
     default:

From ce64a6ffbf583005cd42e23287c78e87aaaca325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Sat, 28 Nov 2020 15:07:42 +0900
Subject: [PATCH 010/138] =?UTF-8?q?[refactor]=20hook=EC=97=90=EC=84=9C=20f?=
 =?UTF-8?q?eaturename=EC=B2=98=EB=A6=AC=ED=95=A0=20=EB=95=8C=20util?=
 =?UTF-8?q?=EC=97=90=20=EC=9E=88=EB=8A=94=20=EB=AA=A8=EB=93=88=EB=A1=9C=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=85=20=EC=B2=B4=ED=81=AC=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- hook에서 featureName이 single인지 multi인지 체크할 때 utils에 있는 typecheck함수로 확인함
---
 src/hooks/sidebar/useDetailType.ts | 14 +++++---------
 src/hooks/sidebar/useStyleType.ts  |  9 ++++-----
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/hooks/sidebar/useDetailType.ts b/src/hooks/sidebar/useDetailType.ts
index 7ba7ecc..8706250 100644
--- a/src/hooks/sidebar/useDetailType.ts
+++ b/src/hooks/sidebar/useDetailType.ts
@@ -1,11 +1,7 @@
 import { useSelector } from 'react-redux';
 import { RootState } from '../../store';
-import {
-  FeatureNameType,
-  FeatureNameOneType,
-  FeatureNameMultiType,
-  FeatureType,
-} from '../../store/common/type';
+import { featureNameTypeCheck } from '../../utils/typeCheck';
+import { FeatureNameType, FeatureType } from '../../store/common/type';
 
 interface UseDetailTypeProps {
   featureName: FeatureNameType;
@@ -29,11 +25,11 @@ function useDetailType({
     if (!featureName) {
       return dummyDetail;
     }
-    if (featureName === 'water' || featureName === 'marker') {
-      return state[featureName as FeatureNameOneType];
+    if (featureNameTypeCheck(featureName)) {
+      return state[featureName];
     }
 
-    return state[featureName as FeatureNameMultiType][subFeatureName];
+    return state[featureName][subFeatureName];
   }) as FeatureType;
 
   return {
diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index 8193591..2739f0d 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -1,9 +1,8 @@
 import { useSelector } from 'react-redux';
 import { RootState } from '../../store';
+import { featureNameTypeCheck } from '../../utils/typeCheck';
 import {
   FeatureNameType,
-  FeatureNameOneType,
-  FeatureNameMultiType,
   StyleType,
   ElementNameType,
   SubElementNameType,
@@ -32,10 +31,10 @@ function useStyleType({
       return dummyStyle;
     }
     let feature;
-    if (featureName === 'water' || featureName === 'marker') {
-      feature = state[featureName as FeatureNameOneType];
+    if (featureNameTypeCheck(featureName)) {
+      feature = state[featureName];
     } else {
-      feature = state[featureName as FeatureNameMultiType][subFeatureName];
+      feature = state[featureName][subFeatureName];
     }
 
     if (detailName === 'labelIcon') return feature.labelIcon;

From 02e57862e3f91d756448e998c96657f2a2b26f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Sat, 28 Nov 2020 17:35:00 +0900
Subject: [PATCH 011/138] =?UTF-8?q?[feat]=20=EC=A7=80=EB=8F=84=EC=9D=98=20?=
 =?UTF-8?q?=EB=9D=BC=EB=B2=A8=EB=93=A4=20=ED=95=9C=EA=B5=AD=EC=96=B4?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B2=88=EC=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 지도의 라벨들을 한국어로 번역하였다
---
 src/store/map/initializeMap.ts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/store/map/initializeMap.ts b/src/store/map/initializeMap.ts
index 28c3414..71aaa73 100644
--- a/src/store/map/initializeMap.ts
+++ b/src/store/map/initializeMap.ts
@@ -6,6 +6,20 @@ import dotenv from 'dotenv';
 const LNG = 128;
 const LAT = 36.5;
 const ZOOM = 7;
+const LABELS = [
+  'country-label',
+  'settlement-label',
+  'road-label',
+  'state-label',
+  'settlement-subdivision-label',
+  'airport-label',
+  'transit-label',
+  'water-point-label',
+  'water-line-label',
+  'waterway-label',
+  'natural-point-label',
+  'natural-line-label',
+];
 
 dotenv.config();
 mapboxgl.accessToken = process.env.REACT_APP_ACCESS_TOKEN as string;
@@ -14,6 +28,12 @@ interface InitializeMapProps {
   mapRef: RefObject<HTMLDivElement>;
 }
 
+function translate(map: mapboxgl.Map) {
+  LABELS.forEach((label) => {
+    map.setLayoutProperty(label, 'text-field', ['get', 'name_ko']);
+  });
+}
+
 function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
   const map = new mapboxgl.Map({
     container: mapRef.current as HTMLDivElement,
@@ -32,6 +52,10 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
     'bottom-right'
   );
 
+  map.on('load', () => {
+    translate(map);
+  });
+
   return map;
 }
 

From bd51316a46f77f62151a47c74a5ff78a295d5845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Sat, 28 Nov 2020 17:36:25 +0900
Subject: [PATCH 012/138] =?UTF-8?q?[fix]=20=EC=9E=90=EC=9E=98=ED=95=9C=20?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=EB=93=A4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- LightnessStyleWrapper의 이름 변경 (wrapper제거)
- properties에서 weight값 변경
- reducer에서 자신에게맞는 action이 왔는지 필터링 하는 부분 수정
---
 .../LightnessStyleWrapper.tsx                 | 40 -------------------
 src/store/common/properties.ts                |  2 +-
 src/store/common/reducer.ts                   |  4 +-
 3 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 src/components/Sidebar/SidebarContentMore/LightnessStyleWrapper.tsx

diff --git a/src/components/Sidebar/SidebarContentMore/LightnessStyleWrapper.tsx b/src/components/Sidebar/SidebarContentMore/LightnessStyleWrapper.tsx
deleted file mode 100644
index e922c9a..0000000
--- a/src/components/Sidebar/SidebarContentMore/LightnessStyleWrapper.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import styled from '../../../utils/styles/styled';
-import { Range } from '../SidebarContentFewer/DepthItem';
-
-const LightnessWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  margin: 15px 0;
-`;
-
-const LightnessTitle = styled.label`
-  margin-bottom: 10px;
-  font-size: 1.7rem;
-  font-weight: 600;
-  color: ${(props) => props.theme.GREY};
-`;
-
-const LightnessControlBar = styled(Range)`
-  width: 100%;
-  height: 2px;
-`;
-
-function LightnessStyleWrapper(): React.ReactElement {
-  return (
-    <div>
-      <LightnessWrapper>
-        <LightnessTitle htmlFor="styler__lightness">밝기</LightnessTitle>
-        <LightnessControlBar
-          type="range"
-          min="-100"
-          max="100"
-          step="5"
-          id="styler__lightness"
-        />
-      </LightnessWrapper>
-    </div>
-  );
-}
-
-export default LightnessStyleWrapper;
diff --git a/src/store/common/properties.ts b/src/store/common/properties.ts
index a3f2d16..f4956d9 100644
--- a/src/store/common/properties.ts
+++ b/src/store/common/properties.ts
@@ -4,7 +4,7 @@ export const style: StyleType = {
   isChanged: false,
   visibility: 'inherit',
   color: '#000000',
-  weight: 50,
+  weight: 4,
   saturation: 0,
   lightness: 0,
 };
diff --git a/src/store/common/reducer.ts b/src/store/common/reducer.ts
index a5a353f..47df899 100644
--- a/src/store/common/reducer.ts
+++ b/src/store/common/reducer.ts
@@ -34,7 +34,8 @@ export default function getReducer(IDX: number): ReducerType {
           subElement,
           style,
         } = action.payload;
-        if (feature === renderingData[IDX].typeKey) return state;
+
+        if (feature !== renderingData[IDX].typeKey) return state;
 
         const newState: FeatureState = JSON.parse(JSON.stringify(state));
 
@@ -46,6 +47,7 @@ export default function getReducer(IDX: number): ReducerType {
         newState[subFeature as string][element][
           subElement as SubElementNameType
         ] = style;
+
         return newState;
       }
       default:

From a7532ba9d87ee807e7bcff8588027f2e01bfdbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Sat, 28 Nov 2020 17:38:25 +0900
Subject: [PATCH 013/138] =?UTF-8?q?[refactor]=20DetailType=20=EC=BB=B4?=
 =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=EC=99=80=20=ED=9B=85=EC=9D=84=20?=
 =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- DetailType에 있는 로직관련 코드를 hook으로 옮기었다.
---
 .../Sidebar/SidebarContentMore/DetailType.tsx | 33 +++++---------
 src/hooks/sidebar/useDetailType.ts            | 43 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index 7cdf04f..b34ae0d 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -24,7 +24,6 @@ const DetailWrapper = styled.div`
   padding: 20px;
 
   overflow-y: scroll;
-  background-color: ${(props) => props.theme.WHITE};
   border-left: 1px solid ${(props) => props.theme.LIGHTGREY};
 `;
 
@@ -81,29 +80,17 @@ function DetailType({
 
   const {
     detail: { section, labelText, labelIcon },
+    styleClickHandler,
+    checkIsSelected,
   }: UseDetailHookType = useDetailType({
+    sidebarTypeClickHandler,
+    sidebarSubTypeClickHandler,
+    sidebarTypeName,
+    sidebarSubTypeName,
     featureName,
     subFeatureName,
   });
 
-  const styleClickHandler = (
-    elementName: ElementNameType,
-    subElementName?: SubElementNameType
-  ) => {
-    sidebarTypeClickHandler(elementName);
-    if (subElementName) sidebarSubTypeClickHandler(subElementName);
-  };
-
-  const getIsSelected = (
-    elementName: ElementNameType,
-    subElementName?: SubElementNameType
-  ) => {
-    if (!subElementName) return sidebarTypeName === elementName;
-    return (
-      sidebarTypeName === elementName && sidebarSubTypeName === subElementName
-    );
-  };
-
   if (!featureName) {
     return <></>;
   }
@@ -116,7 +103,7 @@ function DetailType({
           <Text padding="first">구역</Text>
           {section?.fill.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
-            isSelected={getIsSelected('section', 'fill')}
+            isSelected={checkIsSelected('section', 'fill')}
             padding="second"
             clickHandler={() => styleClickHandler('section', 'fill')}
             name="채우기"
@@ -137,14 +124,14 @@ function DetailType({
             <Text padding="second">텍스트</Text>
             {labelText.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
             <ListItem
-              isSelected={getIsSelected('labelText', 'fill')}
+              isSelected={checkIsSelected('labelText', 'fill')}
               padding="third"
               clickHandler={() => styleClickHandler('labelText', 'fill')}
               name="채우기"
             />
             {labelText.stroke.isChanged ? <CheckRight>✓</CheckRight> : <></>}
             <ListItem
-              isSelected={getIsSelected('labelText', 'stroke')}
+              isSelected={checkIsSelected('labelText', 'stroke')}
               padding="third"
               clickHandler={() => styleClickHandler('labelText', 'stroke')}
               name="윤곽선"
@@ -152,7 +139,7 @@ function DetailType({
           </List>
           {labelIcon.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
-            isSelected={getIsSelected('labelIcon')}
+            isSelected={checkIsSelected('labelIcon')}
             padding="second"
             clickHandler={() => styleClickHandler('labelIcon')}
             name="아이콘"
diff --git a/src/hooks/sidebar/useDetailType.ts b/src/hooks/sidebar/useDetailType.ts
index 8706250..99bda37 100644
--- a/src/hooks/sidebar/useDetailType.ts
+++ b/src/hooks/sidebar/useDetailType.ts
@@ -1,15 +1,32 @@
 import { useSelector } from 'react-redux';
 import { RootState } from '../../store';
 import { featureNameTypeCheck } from '../../utils/typeCheck';
-import { FeatureNameType, FeatureType } from '../../store/common/type';
+import {
+  FeatureNameType,
+  ElementNameType,
+  SubElementNameType,
+  FeatureType,
+} from '../../store/common/type';
 
 interface UseDetailTypeProps {
   featureName: FeatureNameType;
   subFeatureName: string;
+  sidebarTypeName: string;
+  sidebarSubTypeName: string;
+  sidebarTypeClickHandler: (name: string) => void;
+  sidebarSubTypeClickHandler: (name: string) => void;
 }
 
 export interface UseDetailHookType {
   detail: FeatureType;
+  styleClickHandler: (
+    elementName: ElementNameType,
+    subElementName?: SubElementNameType
+  ) => void;
+  checkIsSelected: (
+    elementName: ElementNameType,
+    subElementName?: SubElementNameType
+  ) => boolean;
 }
 
 const dummyDetail = {
@@ -20,6 +37,10 @@ const dummyDetail = {
 function useDetailType({
   featureName,
   subFeatureName,
+  sidebarTypeName,
+  sidebarSubTypeName,
+  sidebarTypeClickHandler,
+  sidebarSubTypeClickHandler,
 }: UseDetailTypeProps): UseDetailHookType {
   const detail = useSelector<RootState>((state) => {
     if (!featureName) {
@@ -32,8 +53,28 @@ function useDetailType({
     return state[featureName][subFeatureName];
   }) as FeatureType;
 
+  const styleClickHandler = (
+    elementName: ElementNameType,
+    subElementName?: SubElementNameType
+  ) => {
+    sidebarTypeClickHandler(elementName);
+    if (subElementName) sidebarSubTypeClickHandler(subElementName);
+  };
+
+  const checkIsSelected = (
+    elementName: ElementNameType,
+    subElementName?: SubElementNameType
+  ) => {
+    if (!subElementName) return sidebarTypeName === elementName;
+    return (
+      sidebarTypeName === elementName && sidebarSubTypeName === subElementName
+    );
+  };
+
   return {
     detail,
+    styleClickHandler,
+    checkIsSelected,
   };
 }
 

From 2e60a823d86579839e8614c9d25c5d0bb927de22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Sat, 28 Nov 2020 17:39:55 +0900
Subject: [PATCH 014/138] =?UTF-8?q?[feat]=20Style=EC=BB=B4=ED=8F=AC?=
 =?UTF-8?q?=EB=84=8C=ED=8A=B8=EC=97=90=EC=84=9C=20=ED=95=98=EC=9C=84?=
 =?UTF-8?q?=EB=A1=9C=20style=EC=9D=84=20prop=EC=9C=BC=EB=A1=9C=20=EC=A0=84?=
 =?UTF-8?q?=EB=8B=AC=20/=20hook=EC=97=90=20dispatch=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- style컴포넌트에서 각 하위 컴포넌트들로 필요한 style속성들을 props로 전달하였다
- hook에 dispatch를 이용해서 상태를 변경시키는 로직을 추가하였다
---
 .../Sidebar/SidebarContentMore/Styler.tsx     | 17 ++++++----
 src/hooks/sidebar/useStyleType.ts             | 32 ++++++++++++++++---
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/Styler.tsx b/src/components/Sidebar/SidebarContentMore/Styler.tsx
index 3104cdf..e6b1391 100644
--- a/src/components/Sidebar/SidebarContentMore/Styler.tsx
+++ b/src/components/Sidebar/SidebarContentMore/Styler.tsx
@@ -12,7 +12,7 @@ import useStyleType, {
 import ColorStyle from './ColorStyle';
 import WeightStyle from './WeightStyle';
 import SaturationStyle from './SaturationStyle';
-import LightnessStyleWrapper from './LightnessStyleWrapper';
+import LightnessStyle from './LightnessStyle';
 import VisibilityStyle from './VisibilityStyle';
 
 const StylerWrapper = styled.div`
@@ -52,7 +52,10 @@ function Styler({
   detailName,
   subDetailName,
 }: StylerProps): React.ReactElement {
-  const { style }: UseStyleHookType = useStyleType({
+  const {
+    styleElement: { visibility, color, weight, saturation, lightness },
+    onStyleChange,
+  }: UseStyleHookType = useStyleType({
     featureName,
     subFeatureName,
     detailName,
@@ -66,13 +69,13 @@ function Styler({
   return (
     <StylerWrapper>
       <StylerTitle>스타일</StylerTitle>
-      <VisibilityStyle />
+      <VisibilityStyle visibility={visibility} onStyleChange={onStyleChange} />
       <Hr />
-      <ColorStyle />
+      <ColorStyle color={color} onStyleChange={onStyleChange} />
       <Hr />
-      <WeightStyle />
-      <SaturationStyle />
-      <LightnessStyleWrapper />
+      <WeightStyle weight={weight} onStyleChange={onStyleChange} />
+      <SaturationStyle saturation={saturation} onStyleChange={onStyleChange} />
+      <LightnessStyle lightness={lightness} onStyleChange={onStyleChange} />
     </StylerWrapper>
   );
 }
diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index 2739f0d..d485785 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -1,4 +1,5 @@
-import { useSelector } from 'react-redux';
+import { useSelector, useDispatch } from 'react-redux';
+import { useCallback } from 'react';
 import { RootState } from '../../store';
 import { featureNameTypeCheck } from '../../utils/typeCheck';
 import {
@@ -7,6 +8,7 @@ import {
   ElementNameType,
   SubElementNameType,
 } from '../../store/common/type';
+import { setStyle } from '../../store/common/action';
 import { style as dummyStyle } from '../../store/common/properties';
 
 interface UseStyleTypeProps {
@@ -17,7 +19,8 @@ interface UseStyleTypeProps {
 }
 
 export interface UseStyleHookType {
-  style: StyleType;
+  styleElement: StyleType;
+  onStyleChange: (key: string, value: string | number) => void;
 }
 
 function useStyleType({
@@ -26,7 +29,9 @@ function useStyleType({
   detailName,
   subDetailName,
 }: UseStyleTypeProps): UseStyleHookType {
-  const style = useSelector<RootState>((state) => {
+  const dispatch = useDispatch();
+
+  const styleElement = useSelector<RootState>((state) => {
     if (!detailName) {
       return dummyStyle;
     }
@@ -41,8 +46,27 @@ function useStyleType({
     return feature[detailName][subDetailName as SubElementNameType];
   }) as StyleType;
 
+  const onStyleChange = useCallback(
+    (key: string, value: string | number) => {
+      dispatch(
+        setStyle({
+          feature: featureName,
+          subFeature: subFeatureName,
+          element: detailName,
+          subElement: subDetailName,
+          style: {
+            ...styleElement,
+            [key]: value,
+          },
+        })
+      );
+    },
+    [featureName, subFeatureName, detailName, subDetailName, styleElement]
+  );
+
   return {
-    style,
+    styleElement,
+    onStyleChange,
   };
 }
 

From bd686326fd3563bed074bcdc55a9b4a5a5814e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Sat, 28 Nov 2020 17:41:29 +0900
Subject: [PATCH 015/138] =?UTF-8?q?[feat]=20=EA=B0=81=20Style=EC=84=B8?=
 =?UTF-8?q?=EB=B6=80=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=EB=93=A4?=
 =?UTF-8?q?=EC=97=90=EA=B2=8C=20=EC=83=81=EC=9C=84=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=B0=9B=EC=9D=80=20props=EB=A1=9C=20=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=EC=99=80=20=EC=83=81=ED=83=9C=EB=B3=80=EA=B2=BD=EC=9D=84=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 각 Style세부 컴포넌트들이 상위에서 props로 store의 상태와 상태를 변경시키기 위한 함수를 받음
- Visibility컴포넌트를 제외하고는 useInputRange hook을 이용해서 상태를 변경시킴
- Visibility컴포넌트는 onClick으로 동작하기 때문에 바로 상태를 변경시키는 로직을 붙여줌

- useInputRange는 기존 input range/color변경 마다 dispatch발생을 방지하기 위해서 mouseUp/blur 와 onchange이벤트를 이용해서 사용자의 동작이 끝났을 때 dispatch를 보내도록 해준다
---
 .../Sidebar/SidebarContentMore/ColorStyle.tsx | 42 ++++++++++---
 .../SidebarContentMore/LightnessStyle.tsx     | 57 ++++++++++++++++++
 .../SidebarContentMore/SaturationStyle.tsx    | 19 +++++-
 .../SidebarContentMore/VisibilityStyle.tsx    | 59 +++++++++++++++++--
 .../SidebarContentMore/WeightStyle.tsx        | 19 +++++-
 src/hooks/common/useInputRange.ts             | 39 ++++++++++++
 6 files changed, 220 insertions(+), 15 deletions(-)
 create mode 100644 src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
 create mode 100644 src/hooks/common/useInputRange.ts

diff --git a/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx b/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
index 66aae9b..c791208 100644
--- a/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
@@ -1,29 +1,57 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
+import useInputRange from '../../../hooks/common/useInputRange';
 
-const ColorWrapper = styled.div``;
+const ColorWrapper = styled.div`
+  display: flex;
+  flex-wrap: wrap;
+`;
 
 const ColorTitle = styled.label`
-  margin-bottom: 10px;
+  margin: auto 0;
   font-size: 1.7rem;
   font-weight: 600;
   color: ${(props) => props.theme.GREY};
 `;
 
-const ColorCode = styled.div``;
+const ColorCode = styled.div`
+  margin: auto 0 auto 5px;
+  font-size: 1.3rem;
+  font-weight: 600;
+  color: ${(props) => props.theme.LIGHTGREY};
+`;
 
 const ColorPalette = styled.input`
-  margin: 10px 20px;
+  margin: 20px 20px 10px 20px;
   width: 100px;
   height: 40px;
 `;
 
-function ColorStyle(): React.ReactElement {
+interface ColorStyleProps {
+  color: string;
+  onStyleChange: (key: string, value: string | number) => void;
+}
+
+function ColorStyle({
+  color,
+  onStyleChange,
+}: ColorStyleProps): React.ReactElement {
+  const { curRange, rangeChangeHandler, rangeMouseUpHandler } = useInputRange({
+    range: color,
+    onStyleChange,
+  });
+
   return (
     <ColorWrapper>
       <ColorTitle htmlFor="styler__color">색상</ColorTitle>
-      <ColorCode />
-      <ColorPalette type="color" id="styler__color" />
+      <ColorCode>{curRange}</ColorCode>
+      <ColorPalette
+        type="color"
+        id="styler__color"
+        onChange={rangeChangeHandler}
+        onBlur={() => rangeMouseUpHandler('color')}
+        value={curRange}
+      />
     </ColorWrapper>
   );
 }
diff --git a/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx b/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
new file mode 100644
index 0000000..5e23985
--- /dev/null
+++ b/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import styled from '../../../utils/styles/styled';
+import { Range } from '../SidebarContentFewer/DepthItem';
+import useInputRange from '../../../hooks/common/useInputRange';
+
+const LightnessWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  margin: 15px 0;
+`;
+
+const LightnessTitle = styled.label`
+  margin-bottom: 10px;
+  font-size: 1.7rem;
+  font-weight: 600;
+  color: ${(props) => props.theme.GREY};
+`;
+
+const LightnessControlBar = styled(Range)`
+  width: 100%;
+  height: 2px;
+`;
+
+interface LightnessPropsInterface {
+  lightness: number;
+  onStyleChange: (key: string, value: string | number) => void;
+}
+
+function LightnessStyle({
+  lightness,
+  onStyleChange,
+}: LightnessPropsInterface): React.ReactElement {
+  const { curRange, rangeChangeHandler, rangeMouseUpHandler } = useInputRange({
+    range: lightness,
+    onStyleChange,
+  });
+
+  return (
+    <div>
+      <LightnessWrapper>
+        <LightnessTitle htmlFor="styler__lightness">밝기</LightnessTitle>
+        <LightnessControlBar
+          type="range"
+          min="-100"
+          max="100"
+          step="5"
+          id="styler__lightness"
+          value={curRange}
+          onChange={(e) => rangeChangeHandler(e)}
+          onMouseUp={() => rangeMouseUpHandler('lightness')}
+        />
+      </LightnessWrapper>
+    </div>
+  );
+}
+
+export default LightnessStyle;
diff --git a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
index c3e389b..f4f541a 100644
--- a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
 import { Range } from '../SidebarContentFewer/DepthItem';
+import useInputRange from '../../../hooks/common/useInputRange';
 
 const SaturationWrapper = styled.div`
   display: flex;
@@ -20,7 +21,20 @@ const SaturationControlBar = styled(Range)`
   height: 2px;
 `;
 
-function SaturationStyle(): React.ReactElement {
+interface SaturationStyleProps {
+  saturation: number;
+  onStyleChange: (key: string, value: string | number) => void;
+}
+
+function SaturationStyle({
+  saturation,
+  onStyleChange,
+}: SaturationStyleProps): React.ReactElement {
+  const { curRange, rangeChangeHandler, rangeMouseUpHandler } = useInputRange({
+    range: saturation,
+    onStyleChange,
+  });
+
   return (
     <SaturationWrapper>
       <SaturationTitle htmlFor="styler__saturation">채도</SaturationTitle>
@@ -30,6 +44,9 @@ function SaturationStyle(): React.ReactElement {
         max="100"
         step="5"
         id="styler__saturation"
+        value={curRange}
+        onChange={(e) => rangeChangeHandler(e)}
+        onMouseUp={() => rangeMouseUpHandler('saturation')}
       />
     </SaturationWrapper>
   );
diff --git a/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx b/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
index 760f4cc..0a99cbf 100644
--- a/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
@@ -1,6 +1,10 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
 
+interface CheckedProp {
+  checked: boolean;
+}
+
 const VisibilityWrapper = styled.div`
   display: flex;
   flex-direction: column;
@@ -13,19 +17,62 @@ const VisibilityTitle = styled.h2`
   margin: 10px 0;
 `;
 
-const VisilityItem = styled.div`
-  font-size: 1.6rem;
+const VisibilityItem = styled.div`
+  display: flex;
+  align-items: center;
+  font-size: 1.5rem;
   margin: 5px 10px;
   cursor: pointer;
 `;
 
-function VisibilityStyle(): React.ReactElement {
+const Checkbox = styled.div<CheckedProp>`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-right: 10px;
+  width: 18px;
+  height: 18px;
+  border-radius: 9px;
+  background-color: ${(props) =>
+    props.checked ? props.theme.GREEN : 'lightgray'};
+`;
+
+const Circle = styled.div<CheckedProp>`
+  width: 10px;
+  height: 10px;
+  border-radius: 5px;
+  background-color: ${(props) => (props.checked ? 'white' : 'lightgray')};
+`;
+
+interface VisibilityStyleProps {
+  visibility: string;
+  onStyleChange: (key: string, value: string | number) => void;
+}
+
+function VisibilityStyle({
+  visibility,
+  onStyleChange,
+}: VisibilityStyleProps): React.ReactElement {
+  const list = [
+    { title: '상위요소 상속', value: 'inherit' },
+    { title: '보임', value: 'visibility' },
+    { title: '숨김', value: 'invisibility' },
+  ];
+
   return (
     <VisibilityWrapper>
       <VisibilityTitle>가시성</VisibilityTitle>
-      <VisilityItem>상위요소 상속</VisilityItem>
-      <VisilityItem>보임</VisilityItem>
-      <VisilityItem>숨김</VisilityItem>
+      {list.map((item) => (
+        <VisibilityItem
+          key={item.value}
+          onClick={() => onStyleChange('visibility', item.value)}
+        >
+          <Checkbox checked={visibility === item.value}>
+            <Circle checked={visibility === item.value} />
+          </Checkbox>
+          {item.title}
+        </VisibilityItem>
+      ))}
     </VisibilityWrapper>
   );
 }
diff --git a/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx b/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
index 3e97412..dc66cf8 100644
--- a/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
 import { Range } from '../SidebarContentFewer/DepthItem';
+import useInputRange from '../../../hooks/common/useInputRange';
 
 const WeightWrapper = styled.div`
   display: flex;
@@ -20,7 +21,20 @@ const WeightControlBar = styled(Range)`
   height: 2px;
 `;
 
-function WeightStyle(): React.ReactElement {
+interface WeightStyleProps {
+  weight: number;
+  onStyleChange: (key: string, value: string | number) => void;
+}
+
+function WeightStyle({
+  weight,
+  onStyleChange,
+}: WeightStyleProps): React.ReactElement {
+  const { curRange, rangeChangeHandler, rangeMouseUpHandler } = useInputRange({
+    range: weight,
+    onStyleChange,
+  });
+
   return (
     <WeightWrapper>
       <WeightTitle htmlFor="styler__weight">굵기</WeightTitle>
@@ -30,6 +44,9 @@ function WeightStyle(): React.ReactElement {
         max="8"
         step="0.5"
         id="styler__weight"
+        value={curRange}
+        onChange={rangeChangeHandler}
+        onMouseUp={() => rangeMouseUpHandler('weight')}
       />
     </WeightWrapper>
   );
diff --git a/src/hooks/common/useInputRange.ts b/src/hooks/common/useInputRange.ts
new file mode 100644
index 0000000..d82a72c
--- /dev/null
+++ b/src/hooks/common/useInputRange.ts
@@ -0,0 +1,39 @@
+import React, { useState, useEffect } from 'react';
+
+interface UseInputRangeProps {
+  range: string | number;
+  onStyleChange: (key: string, value: string | number) => void;
+}
+
+interface InputRangeHookType {
+  curRange: string | number;
+  rangeChangeHandler: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  rangeMouseUpHandler: (key: string) => void;
+}
+
+function useInputRange({
+  range,
+  onStyleChange,
+}: UseInputRangeProps): InputRangeHookType {
+  const [curRange, setCurRange] = useState<string | number>(range);
+
+  useEffect(() => {
+    setCurRange(range);
+  }, [range]);
+
+  const rangeChangeHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setCurRange(e.target.value);
+  };
+
+  const rangeMouseUpHandler = (key: string) => {
+    onStyleChange(key, curRange);
+  };
+
+  return {
+    curRange,
+    rangeChangeHandler,
+    rangeMouseUpHandler,
+  };
+}
+
+export default useInputRange;

From 5e06ccea3ae68a8feef833dd5200cf7aa16b8221 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 14:54:34 +0900
Subject: [PATCH 016/138] =?UTF-8?q?[refactor]=20=EC=9D=BC=EB=B6=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-  객체 직접 참조하지 않고 함수를 이용하도록 하였음
- 불필요한 내용 삭제
---
 src/hooks/sidebar/useStyleType.ts | 4 ++--
 src/store/common/properties.ts    | 4 ++--
 src/store/index.ts                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index d485785..aa108ec 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -9,7 +9,7 @@ import {
   SubElementNameType,
 } from '../../store/common/type';
 import { setStyle } from '../../store/common/action';
-import { style as dummyStyle } from '../../store/common/properties';
+import { getDefaultStyle } from '../../store/common/properties';
 
 interface UseStyleTypeProps {
   featureName: FeatureNameType;
@@ -33,7 +33,7 @@ function useStyleType({
 
   const styleElement = useSelector<RootState>((state) => {
     if (!detailName) {
-      return dummyStyle;
+      return getDefaultStyle();
     }
     let feature;
     if (featureNameTypeCheck(featureName)) {
diff --git a/src/store/common/properties.ts b/src/store/common/properties.ts
index f4956d9..af69f33 100644
--- a/src/store/common/properties.ts
+++ b/src/store/common/properties.ts
@@ -1,6 +1,6 @@
 import { StyleType, ElementType, FeatureType } from './type';
 
-export const style: StyleType = {
+const style: StyleType = {
   isChanged: false,
   visibility: 'inherit',
   color: '#000000',
@@ -9,7 +9,7 @@ export const style: StyleType = {
   lightness: 0,
 };
 
-const getDefaultStyle = (): StyleType => {
+export const getDefaultStyle = (): StyleType => {
   return JSON.parse(JSON.stringify(style));
 };
 
diff --git a/src/store/index.ts b/src/store/index.ts
index 58142cc..5f90824 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,5 +1,5 @@
 import { combineReducers, createStore } from 'redux';
-import { composeWithDevTools } from 'redux-devtools-extension';
+
 import map from './map/reducer';
 import poi from './style/poiReducer';
 import transit from './style/transitReducer';
@@ -20,7 +20,7 @@ const rootReducer = combineReducers({
   marker,
 });
 
-const store = createStore(rootReducer, composeWithDevTools());
+const store = createStore(rootReducer);
 
 export type RootState = ReturnType<typeof rootReducer>;
 

From f0fd854d3f302893446fb207955032ea59bd8ffb Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 14:57:03 +0900
Subject: [PATCH 017/138] =?UTF-8?q?[feat]=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=83=81=ED=83=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- isChanged 관련 공통 함수 구현
- 기능 유형, 스타일 변화 상태 reducer에서 체크하도록 하였음
- 위 함수에 요구되는 공통 타입 분리
---
 src/store/common/compareStyle.ts | 27 +++++++++++++++++++++++++++
 src/store/common/reducer.ts      | 28 ++++++++++++++++++++++------
 src/store/common/type.ts         | 12 ++++++++++++
 3 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 src/store/common/compareStyle.ts

diff --git a/src/store/common/compareStyle.ts b/src/store/common/compareStyle.ts
new file mode 100644
index 0000000..12748ff
--- /dev/null
+++ b/src/store/common/compareStyle.ts
@@ -0,0 +1,27 @@
+import { getDefaultStyle } from './properties';
+import { StyleType, StyleKeyType, objType } from './type';
+
+export function checkStyleIsChanged(targetStyle: StyleType): boolean {
+  const defaultStyle: StyleType = getDefaultStyle();
+  const keys = Object.keys(defaultStyle) as StyleKeyType[];
+
+  const filteredKeys = keys.filter(
+    (key) => key === 'isChanged' || defaultStyle[key] === targetStyle[key]
+  );
+  return keys.length !== filteredKeys.length;
+}
+
+export function checkFeatureIsChanged(targetFeature: objType): boolean {
+  const keys = Object.keys(targetFeature);
+  for (let i = 0; i < keys.length; i += 1) {
+    if (
+      typeof targetFeature[keys[i]] === 'object' &&
+      checkFeatureIsChanged(targetFeature[keys[i]]) === true
+    ) {
+      return true;
+    }
+
+    if (Object.values(targetFeature).includes(true)) return true;
+  }
+  return false;
+}
diff --git a/src/store/common/reducer.ts b/src/store/common/reducer.ts
index 47df899..f6abe48 100644
--- a/src/store/common/reducer.ts
+++ b/src/store/common/reducer.ts
@@ -1,8 +1,15 @@
 import renderingData from '../../utils/rendering-data/featureTypeData';
 
-import { FeatureState, ActionType, SubElementNameType } from './type';
+import {
+  FeatureState,
+  FeatureType,
+  ActionType,
+  SubElementNameType,
+  objType,
+} from './type';
 import { getDefaultFeature } from './properties';
 import { INIT, SET } from './action';
+import { checkStyleIsChanged, checkFeatureIsChanged } from './compareStyle';
 
 interface ReducerType {
   (state: FeatureState, action: ActionType): FeatureState;
@@ -37,16 +44,25 @@ export default function getReducer(IDX: number): ReducerType {
 
         if (feature !== renderingData[IDX].typeKey) return state;
 
+        style.isChanged = checkStyleIsChanged(style);
         const newState: FeatureState = JSON.parse(JSON.stringify(state));
+        const newFeature: FeatureType = newState[subFeature as string];
 
+        let prevIsChanged;
         if (element === 'labelIcon') {
-          newState[subFeature as string][element] = style;
-          return newState;
+          prevIsChanged = newFeature[element].isChanged;
+          newFeature[element] = style;
+        } else {
+          prevIsChanged =
+            newFeature[element][subElement as SubElementNameType].isChanged;
+          newFeature[element][subElement as SubElementNameType] = style;
         }
 
-        newState[subFeature as string][element][
-          subElement as SubElementNameType
-        ] = style;
+        if (prevIsChanged !== style.isChanged) {
+          delete (newFeature as objType).isChanged;
+          const featureIsChanged = checkFeatureIsChanged(newFeature);
+          newFeature.isChanged = featureIsChanged;
+        }
 
         return newState;
       }
diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index 30a4ab6..2367bbf 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -13,6 +13,18 @@ export type FeatureNameMultiType =
   | 'transit';
 export type FeatureNameType = FeatureNameMultiType | FeatureNameSingleType;
 
+export type StyleKeyType =
+  | 'visibility'
+  | 'color'
+  | 'weight'
+  | 'saturation'
+  | 'lightness'
+  | 'isChanged';
+
+export interface objType {
+  [name: string]: any;
+}
+
 export interface StyleType {
   isChanged: boolean;
   visibility: string;

From 7a5a02175e6acbf02dd518733b83f17a32e1622f Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 15:20:41 +0900
Subject: [PATCH 018/138] =?UTF-8?q?[refactor]=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=9C=A0=ED=98=95=20=EA=B5=AC=EC=A1=B0=20=ED=86=B5=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - View에서 marker, all을 예외처리 복잡도가 증가됨
- 이를 해결하기 위해서 marker, water도 다른 기능 유형과 구조 통일시키고, 관련 타입을 사용하던 함수를 수정하였음
---
 .../Sidebar/SidebarContentMore/DetailType.tsx          |  6 +++---
 src/hooks/sidebar/useDetailType.ts                     |  4 ----
 src/hooks/sidebar/useStyleType.ts                      | 10 ++--------
 src/store/common/type.ts                               |  8 ++++----
 src/utils/typeCheck.ts                                 |  8 --------
 5 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 src/utils/typeCheck.ts

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index b34ae0d..1d8cc67 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -122,14 +122,14 @@ function DetailType({
           <Text padding="first">라벨</Text>
           <List>
             <Text padding="second">텍스트</Text>
-            {labelText.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+            {labelText?.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
             <ListItem
               isSelected={checkIsSelected('labelText', 'fill')}
               padding="third"
               clickHandler={() => styleClickHandler('labelText', 'fill')}
               name="채우기"
             />
-            {labelText.stroke.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+            {labelText?.stroke.isChanged ? <CheckRight>✓</CheckRight> : <></>}
             <ListItem
               isSelected={checkIsSelected('labelText', 'stroke')}
               padding="third"
@@ -137,7 +137,7 @@ function DetailType({
               name="윤곽선"
             />
           </List>
-          {labelIcon.isChanged ? <Check>✓</Check> : <></>}
+          {labelIcon?.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
             isSelected={checkIsSelected('labelIcon')}
             padding="second"
diff --git a/src/hooks/sidebar/useDetailType.ts b/src/hooks/sidebar/useDetailType.ts
index 99bda37..802dfbd 100644
--- a/src/hooks/sidebar/useDetailType.ts
+++ b/src/hooks/sidebar/useDetailType.ts
@@ -1,6 +1,5 @@
 import { useSelector } from 'react-redux';
 import { RootState } from '../../store';
-import { featureNameTypeCheck } from '../../utils/typeCheck';
 import {
   FeatureNameType,
   ElementNameType,
@@ -46,9 +45,6 @@ function useDetailType({
     if (!featureName) {
       return dummyDetail;
     }
-    if (featureNameTypeCheck(featureName)) {
-      return state[featureName];
-    }
 
     return state[featureName][subFeatureName];
   }) as FeatureType;
diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index aa108ec..c0491dc 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -1,7 +1,6 @@
 import { useSelector, useDispatch } from 'react-redux';
 import { useCallback } from 'react';
 import { RootState } from '../../store';
-import { featureNameTypeCheck } from '../../utils/typeCheck';
 import {
   FeatureNameType,
   StyleType,
@@ -35,14 +34,9 @@ function useStyleType({
     if (!detailName) {
       return getDefaultStyle();
     }
-    let feature;
-    if (featureNameTypeCheck(featureName)) {
-      feature = state[featureName];
-    } else {
-      feature = state[featureName][subFeatureName];
-    }
+    const feature = state[featureName][subFeatureName];
 
-    if (detailName === 'labelIcon') return feature.labelIcon;
+    if (detailName === 'labelIcon') return feature[detailName];
     return feature[detailName][subDetailName as SubElementNameType];
   }) as StyleType;
 
diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index 2367bbf..a7296d0 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -4,14 +4,14 @@ export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
 export type ElementNameType = 'section' | 'labelText' | 'labelIcon';
 export type SubElementNameType = 'fill' | 'stroke';
 
-export type FeatureNameSingleType = 'water' | 'marker';
-export type FeatureNameMultiType =
+export type FeatureNameType =
   | 'poi'
   | 'administrative'
   | 'landscape'
   | 'road'
-  | 'transit';
-export type FeatureNameType = FeatureNameMultiType | FeatureNameSingleType;
+  | 'transit'
+  | 'water'
+  | 'marker';
 
 export type StyleKeyType =
   | 'visibility'
diff --git a/src/utils/typeCheck.ts b/src/utils/typeCheck.ts
deleted file mode 100644
index 469e681..0000000
--- a/src/utils/typeCheck.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { FeatureNameType, FeatureNameSingleType } from '../store/common/type';
-
-export function featureNameTypeCheck(
-  name: FeatureNameType
-): name is FeatureNameSingleType {
-  if (name === 'water' || name === 'marker') return true;
-  return false;
-}

From 2fe145c817b9544d570517b788efc717dd39795f Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 15:21:35 +0900
Subject: [PATCH 019/138] =?UTF-8?q?[refactor]=20=EB=A7=88=EC=BB=A4,=20?=
 =?UTF-8?q?=EB=AC=BC=20=EA=B3=B5=ED=86=B5=20=EB=A6=AC=EB=93=80=EC=84=9C=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기능 유형 구조 동일하게 변화됨에 따라 동일한 리듀서를 사용할 수 있게 되었음
---
 src/store/style/markerReducer.ts | 33 ++++----------------------------
 src/store/style/waterReducer.ts  | 33 ++++----------------------------
 2 files changed, 8 insertions(+), 58 deletions(-)

diff --git a/src/store/style/markerReducer.ts b/src/store/style/markerReducer.ts
index 061e7ad..df4afda 100644
--- a/src/store/style/markerReducer.ts
+++ b/src/store/style/markerReducer.ts
@@ -1,31 +1,6 @@
-import { getDefaultFeature } from '../common/properties';
-import { FeatureType, ActionType, SubElementNameType } from '../common/type';
-import { INIT, SET } from '../common/action';
+import getReducer from '../common/reducer';
 
-const initialState = getDefaultFeature();
+const MARKER_IDX = 6;
+const markerReducer = getReducer(MARKER_IDX);
 
-export default function markerReducer(
-  state: FeatureType = initialState,
-  action: ActionType
-): FeatureType {
-  switch (action.type) {
-    case INIT:
-      return initialState;
-    case SET: {
-      const { feature, element, subElement, style } = action.payload;
-      if (feature !== 'marker') return state;
-
-      const newState = JSON.parse(JSON.stringify(state));
-
-      if (element === 'labelIcon') {
-        newState[element] = style;
-        return newState;
-      }
-
-      newState[element][subElement as SubElementNameType] = style;
-      return newState;
-    }
-    default:
-      return state;
-  }
-}
+export default markerReducer;
diff --git a/src/store/style/waterReducer.ts b/src/store/style/waterReducer.ts
index b0eef3f..527d57b 100644
--- a/src/store/style/waterReducer.ts
+++ b/src/store/style/waterReducer.ts
@@ -1,31 +1,6 @@
-import { getDefaultFeature } from '../common/properties';
-import { FeatureType, ActionType, SubElementNameType } from '../common/type';
-import { INIT, SET } from '../common/action';
+import getReducer from '../common/reducer';
 
-const initialState = getDefaultFeature();
+const WATER_IDX = 5;
+const waterReducer = getReducer(WATER_IDX);
 
-export default function waterReducer(
-  state: FeatureType = initialState,
-  action: ActionType
-): FeatureType {
-  switch (action.type) {
-    case INIT:
-      return initialState;
-    case SET: {
-      const { feature, element, subElement, style } = action.payload;
-      if (feature !== 'water') return state;
-
-      const newState = JSON.parse(JSON.stringify(state));
-
-      if (element === 'labelIcon') {
-        newState[element] = style;
-        return newState;
-      }
-
-      newState[element][subElement as SubElementNameType] = style;
-      return newState;
-    }
-    default:
-      return state;
-  }
-}
+export default waterReducer;

From c2bbc66b821744992224e2a040412e7895ec32d2 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 15:42:57 +0900
Subject: [PATCH 020/138] =?UTF-8?q?[refactor]=20=EC=8A=A4=ED=83=80?=
 =?UTF-8?q?=EC=9D=BC=20=EC=83=81=ED=83=9C=20=EB=A6=AC=EB=93=80=EC=84=9C=20?=
 =?UTF-8?q?=ED=95=98=EB=82=98=EB=A1=9C=20=ED=86=B5=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/common/reducer.ts              | 73 ------------------------
 src/store/style/administrativeReducer.ts |  6 --
 src/store/style/landscapeReducer.ts      |  6 --
 src/store/style/markerReducer.ts         |  6 --
 src/store/style/poiReducer.ts            |  6 --
 src/store/style/reducer.ts               | 25 ++++++++
 src/store/style/roadReducer.ts           |  6 --
 src/store/style/transitReducer.ts        |  6 --
 src/store/style/waterReducer.ts          |  6 --
 9 files changed, 25 insertions(+), 115 deletions(-)
 delete mode 100644 src/store/common/reducer.ts
 delete mode 100644 src/store/style/administrativeReducer.ts
 delete mode 100644 src/store/style/landscapeReducer.ts
 delete mode 100644 src/store/style/markerReducer.ts
 delete mode 100644 src/store/style/poiReducer.ts
 create mode 100644 src/store/style/reducer.ts
 delete mode 100644 src/store/style/roadReducer.ts
 delete mode 100644 src/store/style/transitReducer.ts
 delete mode 100644 src/store/style/waterReducer.ts

diff --git a/src/store/common/reducer.ts b/src/store/common/reducer.ts
deleted file mode 100644
index f6abe48..0000000
--- a/src/store/common/reducer.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import renderingData from '../../utils/rendering-data/featureTypeData';
-
-import {
-  FeatureState,
-  FeatureType,
-  ActionType,
-  SubElementNameType,
-  objType,
-} from './type';
-import { getDefaultFeature } from './properties';
-import { INIT, SET } from './action';
-import { checkStyleIsChanged, checkFeatureIsChanged } from './compareStyle';
-
-interface ReducerType {
-  (state: FeatureState, action: ActionType): FeatureState;
-}
-
-export default function getReducer(IDX: number): ReducerType {
-  const subFeatures = [
-    'all',
-    ...(renderingData[IDX].features?.map((v) => v.key) as string[]),
-  ];
-
-  const initialState = subFeatures.reduce((acc: FeatureState, cur: string) => {
-    acc[cur] = getDefaultFeature();
-    return acc;
-  }, {});
-
-  return function reducer(
-    state: FeatureState = initialState,
-    action: ActionType
-  ): FeatureState {
-    switch (action.type) {
-      case INIT:
-        return initialState;
-      case SET: {
-        const {
-          feature,
-          subFeature,
-          element,
-          subElement,
-          style,
-        } = action.payload;
-
-        if (feature !== renderingData[IDX].typeKey) return state;
-
-        style.isChanged = checkStyleIsChanged(style);
-        const newState: FeatureState = JSON.parse(JSON.stringify(state));
-        const newFeature: FeatureType = newState[subFeature as string];
-
-        let prevIsChanged;
-        if (element === 'labelIcon') {
-          prevIsChanged = newFeature[element].isChanged;
-          newFeature[element] = style;
-        } else {
-          prevIsChanged =
-            newFeature[element][subElement as SubElementNameType].isChanged;
-          newFeature[element][subElement as SubElementNameType] = style;
-        }
-
-        if (prevIsChanged !== style.isChanged) {
-          delete (newFeature as objType).isChanged;
-          const featureIsChanged = checkFeatureIsChanged(newFeature);
-          newFeature.isChanged = featureIsChanged;
-        }
-
-        return newState;
-      }
-      default:
-        return state;
-    }
-  };
-}
diff --git a/src/store/style/administrativeReducer.ts b/src/store/style/administrativeReducer.ts
deleted file mode 100644
index 9062941..0000000
--- a/src/store/style/administrativeReducer.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import getReducer from '../common/reducer';
-
-const ADMINISTRATIVE_IDX = 2;
-const administrativeReducer = getReducer(ADMINISTRATIVE_IDX);
-
-export default administrativeReducer;
diff --git a/src/store/style/landscapeReducer.ts b/src/store/style/landscapeReducer.ts
deleted file mode 100644
index c2b3d99..0000000
--- a/src/store/style/landscapeReducer.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import getReducer from '../common/reducer';
-
-const LANDSCAPE_IDX = 3;
-const landscapeReducer = getReducer(LANDSCAPE_IDX);
-
-export default landscapeReducer;
diff --git a/src/store/style/markerReducer.ts b/src/store/style/markerReducer.ts
deleted file mode 100644
index df4afda..0000000
--- a/src/store/style/markerReducer.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import getReducer from '../common/reducer';
-
-const MARKER_IDX = 6;
-const markerReducer = getReducer(MARKER_IDX);
-
-export default markerReducer;
diff --git a/src/store/style/poiReducer.ts b/src/store/style/poiReducer.ts
deleted file mode 100644
index df61e68..0000000
--- a/src/store/style/poiReducer.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import getReducer from '../common/reducer';
-
-const POI_IDX = 0;
-const poiReducer = getReducer(POI_IDX);
-
-export default poiReducer;
diff --git a/src/store/style/reducer.ts b/src/store/style/reducer.ts
new file mode 100644
index 0000000..4305bd1
--- /dev/null
+++ b/src/store/style/reducer.ts
@@ -0,0 +1,25 @@
+import getReducer from './getReducer';
+
+const INDEX = {
+  POI: 0,
+  ROAD: 1,
+  ADMINISTRATIVE: 2,
+  LANDSCAPE: 3,
+  TRANSIT: 4,
+  WATER: 5,
+  MARKER: 6,
+};
+
+export const poiReducer = getReducer(INDEX.POI);
+
+export const roadReducer = getReducer(INDEX.ROAD);
+
+export const administrativeReducer = getReducer(INDEX.ADMINISTRATIVE);
+
+export const landscapeReducer = getReducer(INDEX.LANDSCAPE);
+
+export const transitReducer = getReducer(INDEX.TRANSIT);
+
+export const waterReducer = getReducer(INDEX.WATER);
+
+export const markerReducer = getReducer(INDEX.MARKER);
diff --git a/src/store/style/roadReducer.ts b/src/store/style/roadReducer.ts
deleted file mode 100644
index c8813ac..0000000
--- a/src/store/style/roadReducer.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import getReducer from '../common/reducer';
-
-const ROAD_IDX = 1;
-const roadReducer = getReducer(ROAD_IDX);
-
-export default roadReducer;
diff --git a/src/store/style/transitReducer.ts b/src/store/style/transitReducer.ts
deleted file mode 100644
index 961500d..0000000
--- a/src/store/style/transitReducer.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import getReducer from '../common/reducer';
-
-const TRANSIT_IDX = 4;
-const transitReducer = getReducer(TRANSIT_IDX);
-
-export default transitReducer;
diff --git a/src/store/style/waterReducer.ts b/src/store/style/waterReducer.ts
deleted file mode 100644
index 527d57b..0000000
--- a/src/store/style/waterReducer.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import getReducer from '../common/reducer';
-
-const WATER_IDX = 5;
-const waterReducer = getReducer(WATER_IDX);
-
-export default waterReducer;

From d95450788861a136a6a25e1774395ec16f152e1f Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 15:45:03 +0900
Subject: [PATCH 021/138] =?UTF-8?q?[chore]=20style=20=EC=83=81=ED=83=9C=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=ED=95=A8=EC=88=98=20store/common=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20store/style=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- common이 style 상태에만 해당되어서, store/map과 일관되도록 수정하였음.
---
 src/hooks/sidebar/useStyleType.ts           |  4 +-
 src/store/common/type.ts                    |  2 +-
 src/store/index.ts                          | 16 +++--
 src/store/{common => style}/action.ts       |  2 +-
 src/store/{common => style}/compareStyle.ts |  2 +-
 src/store/style/getReducer.ts               | 73 +++++++++++++++++++++
 src/store/{common => style}/properties.ts   |  2 +-
 7 files changed, 88 insertions(+), 13 deletions(-)
 rename src/store/{common => style}/action.ts (89%)
 rename src/store/{common => style}/compareStyle.ts (92%)
 create mode 100644 src/store/style/getReducer.ts
 rename src/store/{common => style}/properties.ts (89%)

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index c0491dc..b6bf5d7 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -7,8 +7,8 @@ import {
   ElementNameType,
   SubElementNameType,
 } from '../../store/common/type';
-import { setStyle } from '../../store/common/action';
-import { getDefaultStyle } from '../../store/common/properties';
+import { setStyle } from '../../store/style/action';
+import { getDefaultStyle } from '../../store/style/properties';
 
 interface UseStyleTypeProps {
   featureName: FeatureNameType;
diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index a7296d0..3e65f44 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -1,4 +1,4 @@
-import { init, setStyle } from './action';
+import { init, setStyle } from '../style/action';
 
 export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
 export type ElementNameType = 'section' | 'labelText' | 'labelIcon';
diff --git a/src/store/index.ts b/src/store/index.ts
index 5f90824..439bf20 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,13 +1,15 @@
 import { combineReducers, createStore } from 'redux';
 
 import map from './map/reducer';
-import poi from './style/poiReducer';
-import transit from './style/transitReducer';
-import water from './style/waterReducer';
-import marker from './style/markerReducer';
-import road from './style/roadReducer';
-import landscape from './style/landscapeReducer';
-import administrative from './style/administrativeReducer';
+import {
+  poiReducer as poi,
+  transitReducer as transit,
+  landscapeReducer as landscape,
+  administrativeReducer as administrative,
+  roadReducer as road,
+  waterReducer as water,
+  markerReducer as marker,
+} from './style/reducer';
 
 const rootReducer = combineReducers({
   map,
diff --git a/src/store/common/action.ts b/src/store/style/action.ts
similarity index 89%
rename from src/store/common/action.ts
rename to src/store/style/action.ts
index 3ba56c9..441ec31 100644
--- a/src/store/common/action.ts
+++ b/src/store/style/action.ts
@@ -1,4 +1,4 @@
-import { ActionPayload } from './type';
+import { ActionPayload } from '../common/type';
 
 export const INIT = 'INIT' as const;
 export const SET = 'SET' as const;
diff --git a/src/store/common/compareStyle.ts b/src/store/style/compareStyle.ts
similarity index 92%
rename from src/store/common/compareStyle.ts
rename to src/store/style/compareStyle.ts
index 12748ff..1fee4fa 100644
--- a/src/store/common/compareStyle.ts
+++ b/src/store/style/compareStyle.ts
@@ -1,5 +1,5 @@
 import { getDefaultStyle } from './properties';
-import { StyleType, StyleKeyType, objType } from './type';
+import { StyleType, StyleKeyType, objType } from '../common/type';
 
 export function checkStyleIsChanged(targetStyle: StyleType): boolean {
   const defaultStyle: StyleType = getDefaultStyle();
diff --git a/src/store/style/getReducer.ts b/src/store/style/getReducer.ts
new file mode 100644
index 0000000..7fcde3e
--- /dev/null
+++ b/src/store/style/getReducer.ts
@@ -0,0 +1,73 @@
+import renderingData from '../../utils/rendering-data/featureTypeData';
+
+import {
+  FeatureState,
+  FeatureType,
+  ActionType,
+  SubElementNameType,
+  objType,
+} from '../common/type';
+import { getDefaultFeature } from './properties';
+import { INIT, SET } from './action';
+import { checkStyleIsChanged, checkFeatureIsChanged } from './compareStyle';
+
+interface ReducerType {
+  (state: FeatureState, action: ActionType): FeatureState;
+}
+
+export default function getReducer(IDX: number): ReducerType {
+  const subFeatures = [
+    'all',
+    ...(renderingData[IDX].features?.map((v) => v.key) as string[]),
+  ];
+
+  const initialState = subFeatures.reduce((acc: FeatureState, cur: string) => {
+    acc[cur] = getDefaultFeature();
+    return acc;
+  }, {});
+
+  return function reducer(
+    state: FeatureState = initialState,
+    action: ActionType
+  ): FeatureState {
+    switch (action.type) {
+      case INIT:
+        return initialState;
+      case SET: {
+        const {
+          feature,
+          subFeature,
+          element,
+          subElement,
+          style,
+        } = action.payload;
+
+        if (feature !== renderingData[IDX].typeKey) return state;
+
+        style.isChanged = checkStyleIsChanged(style);
+        const newState: FeatureState = JSON.parse(JSON.stringify(state));
+        const newFeature: FeatureType = newState[subFeature as string];
+
+        let prevIsChanged;
+        if (element === 'labelIcon') {
+          prevIsChanged = newFeature[element].isChanged;
+          newFeature[element] = style;
+        } else {
+          prevIsChanged =
+            newFeature[element][subElement as SubElementNameType].isChanged;
+          newFeature[element][subElement as SubElementNameType] = style;
+        }
+
+        if (prevIsChanged !== style.isChanged) {
+          delete (newFeature as objType).isChanged;
+          const featureIsChanged = checkFeatureIsChanged(newFeature);
+          newFeature.isChanged = featureIsChanged;
+        }
+
+        return newState;
+      }
+      default:
+        return state;
+    }
+  };
+}
diff --git a/src/store/common/properties.ts b/src/store/style/properties.ts
similarity index 89%
rename from src/store/common/properties.ts
rename to src/store/style/properties.ts
index af69f33..1452926 100644
--- a/src/store/common/properties.ts
+++ b/src/store/style/properties.ts
@@ -1,4 +1,4 @@
-import { StyleType, ElementType, FeatureType } from './type';
+import { StyleType, ElementType, FeatureType } from '../common/type';
 
 const style: StyleType = {
   isChanged: false,

From dd8066f7812427b371f9f40fdf919b9c39551efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Mon, 30 Nov 2020 18:50:29 +0900
Subject: [PATCH 022/138] =?UTF-8?q?[fix]=20visibility=EC=9D=98=20value?=
 =?UTF-8?q?=EA=B0=92=EB=93=A4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 좀 더 편하게 처리를 하기 위해서 value값들을 알맞게 수정
---
 src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx | 4 ++--
 src/store/style/properties.ts                                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx b/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
index 0a99cbf..3ae1adb 100644
--- a/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
@@ -55,8 +55,8 @@ function VisibilityStyle({
 }: VisibilityStyleProps): React.ReactElement {
   const list = [
     { title: '상위요소 상속', value: 'inherit' },
-    { title: '보임', value: 'visibility' },
-    { title: '숨김', value: 'invisibility' },
+    { title: '보임', value: 'visible' },
+    { title: '숨김', value: 'none' },
   ];
 
   return (
diff --git a/src/store/style/properties.ts b/src/store/style/properties.ts
index 1452926..83b0051 100644
--- a/src/store/style/properties.ts
+++ b/src/store/style/properties.ts
@@ -3,8 +3,8 @@ import { StyleType, ElementType, FeatureType } from '../common/type';
 const style: StyleType = {
   isChanged: false,
   visibility: 'inherit',
-  color: '#000000',
-  weight: 4,
+  color: '#55bf40',
+  weight: 0,
   saturation: 0,
   lightness: 0,
 };

From c0e4e53d77e6c912716c2a09a7756a262a069585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Mon, 30 Nov 2020 18:51:24 +0900
Subject: [PATCH 023/138] =?UTF-8?q?[fix]=20=EC=9D=B4=EC=A0=84,=20=ED=98=84?=
 =?UTF-8?q?=EC=9E=AC=20=EC=83=81=ED=83=9C=20=EB=B9=84=EA=B5=90=ED=95=A0=20?=
 =?UTF-8?q?=EB=95=8C=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 이전과 현재 스타일의 상태를 비교할 때 자료형이 맞지않아 원하는대로 작동하지 않음
- string으로 처리를 해주어서 비교함
---
 src/store/style/compareStyle.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/store/style/compareStyle.ts b/src/store/style/compareStyle.ts
index 1fee4fa..b1587cc 100644
--- a/src/store/style/compareStyle.ts
+++ b/src/store/style/compareStyle.ts
@@ -6,7 +6,9 @@ export function checkStyleIsChanged(targetStyle: StyleType): boolean {
   const keys = Object.keys(defaultStyle) as StyleKeyType[];
 
   const filteredKeys = keys.filter(
-    (key) => key === 'isChanged' || defaultStyle[key] === targetStyle[key]
+    (key) =>
+      key === 'isChanged' ||
+      String(defaultStyle[key]) === String(targetStyle[key])
   );
   return keys.length !== filteredKeys.length;
 }

From f983e7d7902cd10c7acec2889b47660df6c082b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Mon, 30 Nov 2020 18:52:28 +0900
Subject: [PATCH 024/138] =?UTF-8?q?[feat]=20=EC=A7=80=EB=8F=84=EC=97=90=20?=
 =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=EC=9D=84=20=EC=A0=81=EC=9A=A9?=
 =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20=EB=AA=A8=EB=93=88?=
 =?UTF-8?q?=EC=9D=84=20=EB=A7=8C=EB=93=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 지도에 각각의 스타일들을 적용할 수 있게 여러 함수들을 모듈로 만듦
- 각각의 타입(symbol line polygon)마다 서로 다른 값들을 인자로 주어야 함
---
 src/utils/applyStyle.ts  | 62 ++++++++++++++++++++++++++++++++++++++++
 src/utils/colorFormat.ts | 42 +++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 src/utils/applyStyle.ts
 create mode 100644 src/utils/colorFormat.ts

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
new file mode 100644
index 0000000..3e301f0
--- /dev/null
+++ b/src/utils/applyStyle.ts
@@ -0,0 +1,62 @@
+import mapboxgl from 'mapbox-gl';
+import { hexToHSL } from './colorFormat';
+
+type colorType = 'fill-color' | 'line-color' | 'text-color' | 'text-halo-color';
+type weightType = 'line-width' | 'text-halo-width' | 'text-size';
+
+export function applyVisibility(
+  map: mapboxgl.Map,
+  layerName: string,
+  visibility: string
+): void {
+  map.setLayoutProperty(layerName, 'visibility', visibility);
+}
+
+export function applyColor(
+  map: mapboxgl.Map,
+  color: string,
+  type: colorType,
+  layerName: string
+): void {
+  const { h, s, l } = hexToHSL(color);
+  map.setPaintProperty(layerName, type, `hsl(${h}, ${s}, ${l})`);
+}
+
+export function applyWeight(
+  map: mapboxgl.Map,
+  weight: number,
+  layerName: string,
+  type: weightType
+): void {
+  map.setPaintProperty(layerName, type, weight * 2 + 1);
+}
+
+export function applySaturation(
+  map: mapboxgl.Map,
+  color: string,
+  saturation: number,
+  type: colorType,
+  layerName: string
+): void {
+  const { h, l } = hexToHSL(color);
+  map.setPaintProperty(
+    layerName,
+    type,
+    `hsl(${h}, ${50 + saturation / 2}, ${l})`
+  );
+}
+
+export function applyLightness(
+  map: mapboxgl.Map,
+  color: string,
+  layerName: string,
+  type: colorType,
+  lightness: number
+): void {
+  const { h, s } = hexToHSL(color);
+  map.setPaintProperty(
+    layerName,
+    type,
+    `hsl(${h}, ${s}, ${50 + lightness / 2})`
+  );
+}
diff --git a/src/utils/colorFormat.ts b/src/utils/colorFormat.ts
new file mode 100644
index 0000000..3333c05
--- /dev/null
+++ b/src/utils/colorFormat.ts
@@ -0,0 +1,42 @@
+/** https://css-tricks.com/converting-color-spaces-in-javascript/ */
+interface HexToHSLType {
+  h: number;
+  s: number;
+  l: number;
+}
+
+export function hexToHSL(color: string): HexToHSLType {
+  let r = parseInt(color.slice(1, 3), 10);
+  let g = parseInt(color.slice(3, 5), 10);
+  let b = parseInt(color.slice(5), 10);
+
+  r /= 255;
+  g /= 255;
+  b /= 255;
+  const cmin = Math.min(r, g, b);
+  const cmax = Math.max(r, g, b);
+  const delta = cmax - cmin;
+  let h = 0;
+  let s = 0;
+  let l = 0;
+
+  if (delta === 0) h = 0;
+  else if (cmax === r) h = ((g - b) / delta) % 6;
+  else if (cmax === g) h = (b - r) / delta + 2;
+  else h = (r - g) / delta + 4;
+
+  h = Math.round(h * 60);
+
+  if (h < 0) h += 360;
+
+  l = (cmax + cmin) / 2;
+  s = delta === 0 ? 0 : delta / (1 - Math.abs(2 * l - 1));
+  s = +(s * 100).toFixed(1);
+  l = +(l * 100).toFixed(1);
+
+  return {
+    h,
+    s,
+    l,
+  };
+}

From d2aa5d626a52f85f5bb6f1f9e4bf405f8fbf5161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Mon, 30 Nov 2020 18:54:00 +0900
Subject: [PATCH 025/138] =?UTF-8?q?[feat]=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=ED=9B=84=20=EA=B0=81=20=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=EB=93=A4=EC=9D=84=20=EB=B0=94=EA=BF=80=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EA=B2=8C=20utils=ED=8C=8C=EC=9D=BC=EC=97=90=20feature=EB=B3=84?=
 =?UTF-8?q?=EB=A1=9C=20=EB=82=98=EB=88=84=EC=96=B4=20=EB=86=93=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 스타일 변경 후 dispatch를 보내기 이전에 지도의 상태를 변경가능하게 feature단위로 파일을 만들어 놓고 useStyle훅에서 불러서 가져옴
- 각 파일들의 내부에서 레이어 변경 및 기타 다른 작업들을 진행하면 좋을듯
---
 src/hooks/sidebar/useStyleType.ts       | 11 ++++++++++-
 src/utils/map-styling/administrative.ts | 12 ++++++++++++
 src/utils/map-styling/index.ts          | 17 +++++++++++++++++
 src/utils/map-styling/landscape.ts      | 12 ++++++++++++
 src/utils/map-styling/marker.ts         | 12 ++++++++++++
 src/utils/map-styling/poi.ts            | 12 ++++++++++++
 src/utils/map-styling/road.ts           | 12 ++++++++++++
 src/utils/map-styling/transit.ts        | 12 ++++++++++++
 src/utils/map-styling/water.ts          | 12 ++++++++++++
 9 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 src/utils/map-styling/administrative.ts
 create mode 100644 src/utils/map-styling/index.ts
 create mode 100644 src/utils/map-styling/landscape.ts
 create mode 100644 src/utils/map-styling/marker.ts
 create mode 100644 src/utils/map-styling/poi.ts
 create mode 100644 src/utils/map-styling/road.ts
 create mode 100644 src/utils/map-styling/transit.ts
 create mode 100644 src/utils/map-styling/water.ts

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index b6bf5d7..530d538 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -1,3 +1,4 @@
+import mapboxgl from 'mapbox-gl';
 import { useSelector, useDispatch } from 'react-redux';
 import { useCallback } from 'react';
 import { RootState } from '../../store';
@@ -9,6 +10,7 @@ import {
 } from '../../store/common/type';
 import { setStyle } from '../../store/style/action';
 import { getDefaultStyle } from '../../store/style/properties';
+import * as mapStyling from '../../utils/map-styling';
 
 interface UseStyleTypeProps {
   featureName: FeatureNameType;
@@ -30,18 +32,25 @@ function useStyleType({
 }: UseStyleTypeProps): UseStyleHookType {
   const dispatch = useDispatch();
 
+  const map = useSelector<RootState>((state) => state.map.map) as mapboxgl.Map;
   const styleElement = useSelector<RootState>((state) => {
     if (!detailName) {
       return getDefaultStyle();
     }
     const feature = state[featureName][subFeatureName];
-
     if (detailName === 'labelIcon') return feature[detailName];
     return feature[detailName][subDetailName as SubElementNameType];
   }) as StyleType;
 
   const onStyleChange = useCallback(
     (key: string, value: string | number) => {
+      mapStyling[featureName]({
+        map,
+        subFeatureName,
+        detailName,
+        subDetailName: subDetailName as SubElementNameType,
+      });
+
       dispatch(
         setStyle({
           feature: featureName,
diff --git a/src/utils/map-styling/administrative.ts b/src/utils/map-styling/administrative.ts
new file mode 100644
index 0000000..a95b30d
--- /dev/null
+++ b/src/utils/map-styling/administrative.ts
@@ -0,0 +1,12 @@
+import { stylingProps } from './index';
+
+function administrativeStyling({
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+}: stylingProps): void {
+  console.log(1);
+}
+
+export default administrativeStyling;
diff --git a/src/utils/map-styling/index.ts b/src/utils/map-styling/index.ts
new file mode 100644
index 0000000..cf7b040
--- /dev/null
+++ b/src/utils/map-styling/index.ts
@@ -0,0 +1,17 @@
+import mapboxgl from 'mapbox-gl';
+import { ElementNameType, SubElementNameType } from '../../store/common/type';
+
+export interface stylingProps {
+  map: mapboxgl.Map;
+  subFeatureName: string;
+  detailName: ElementNameType;
+  subDetailName: SubElementNameType;
+}
+
+export { default as poi } from './poi';
+export { default as road } from './road';
+export { default as water } from './water';
+export { default as marker } from './marker';
+export { default as administrative } from './administrative';
+export { default as transit } from './transit';
+export { default as landscape } from './landscape';
diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
new file mode 100644
index 0000000..5ad0dd7
--- /dev/null
+++ b/src/utils/map-styling/landscape.ts
@@ -0,0 +1,12 @@
+import { stylingProps } from './index';
+
+function landscapeStyling({
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+}: stylingProps): void {
+  console.log(1);
+}
+
+export default landscapeStyling;
diff --git a/src/utils/map-styling/marker.ts b/src/utils/map-styling/marker.ts
new file mode 100644
index 0000000..99951c8
--- /dev/null
+++ b/src/utils/map-styling/marker.ts
@@ -0,0 +1,12 @@
+import { stylingProps } from './index';
+
+function markerStyling({
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+}: stylingProps): void {
+  console.log(1);
+}
+
+export default markerStyling;
diff --git a/src/utils/map-styling/poi.ts b/src/utils/map-styling/poi.ts
new file mode 100644
index 0000000..8b5f970
--- /dev/null
+++ b/src/utils/map-styling/poi.ts
@@ -0,0 +1,12 @@
+import { stylingProps } from './index';
+
+function poiStyling({
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+}: stylingProps): void {
+  console.log(1);
+}
+
+export default poiStyling;
diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
new file mode 100644
index 0000000..43b172d
--- /dev/null
+++ b/src/utils/map-styling/road.ts
@@ -0,0 +1,12 @@
+import { stylingProps } from '.';
+
+function roadStyling({
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+}: stylingProps): void {
+  console.log(1);
+}
+
+export default roadStyling;
diff --git a/src/utils/map-styling/transit.ts b/src/utils/map-styling/transit.ts
new file mode 100644
index 0000000..2bd583a
--- /dev/null
+++ b/src/utils/map-styling/transit.ts
@@ -0,0 +1,12 @@
+import { stylingProps } from '.';
+
+function transitStyling({
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+}: stylingProps): void {
+  console.log(1);
+}
+
+export default transitStyling;
diff --git a/src/utils/map-styling/water.ts b/src/utils/map-styling/water.ts
new file mode 100644
index 0000000..70a9d72
--- /dev/null
+++ b/src/utils/map-styling/water.ts
@@ -0,0 +1,12 @@
+import { stylingProps } from '.';
+
+function waterStyling({
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+}: stylingProps): void {
+  console.log(1);
+}
+
+export default waterStyling;

From a93427dd0cf8828ff359333b41b4c0a1af6aa6ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Mon, 30 Nov 2020 19:07:40 +0900
Subject: [PATCH 026/138] =?UTF-8?q?[refactor]=20=EB=84=98=EA=B2=A8?=
 =?UTF-8?q?=EC=A4=84=20=EB=95=8C=20=EC=9D=B8=EC=9E=90=EB=A1=9C=20style?=
 =?UTF-8?q?=EA=B0=92=EC=9D=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 넘겨줄 때 스타일 적용이 가능하도록 style을 추가함( 사실 빼먹었었음 )
---
 src/hooks/sidebar/useStyleType.ts       | 4 ++++
 src/utils/map-styling/administrative.ts | 1 +
 src/utils/map-styling/index.ts          | 7 ++++++-
 src/utils/map-styling/landscape.ts      | 1 +
 src/utils/map-styling/marker.ts         | 1 +
 src/utils/map-styling/poi.ts            | 1 +
 src/utils/map-styling/road.ts           | 1 +
 src/utils/map-styling/transit.ts        | 1 +
 src/utils/map-styling/water.ts          | 1 +
 9 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index 530d538..04ef08e 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -49,6 +49,10 @@ function useStyleType({
         subFeatureName,
         detailName,
         subDetailName: subDetailName as SubElementNameType,
+        style: {
+          ...styleElement,
+          [key]: value,
+        },
       });
 
       dispatch(
diff --git a/src/utils/map-styling/administrative.ts b/src/utils/map-styling/administrative.ts
index a95b30d..6032339 100644
--- a/src/utils/map-styling/administrative.ts
+++ b/src/utils/map-styling/administrative.ts
@@ -5,6 +5,7 @@ function administrativeStyling({
   subFeatureName,
   detailName,
   subDetailName,
+  style,
 }: stylingProps): void {
   console.log(1);
 }
diff --git a/src/utils/map-styling/index.ts b/src/utils/map-styling/index.ts
index cf7b040..59c7af9 100644
--- a/src/utils/map-styling/index.ts
+++ b/src/utils/map-styling/index.ts
@@ -1,11 +1,16 @@
 import mapboxgl from 'mapbox-gl';
-import { ElementNameType, SubElementNameType } from '../../store/common/type';
+import {
+  ElementNameType,
+  SubElementNameType,
+  StyleType,
+} from '../../store/common/type';
 
 export interface stylingProps {
   map: mapboxgl.Map;
   subFeatureName: string;
   detailName: ElementNameType;
   subDetailName: SubElementNameType;
+  style: StyleType;
 }
 
 export { default as poi } from './poi';
diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index 5ad0dd7..9282499 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -5,6 +5,7 @@ function landscapeStyling({
   subFeatureName,
   detailName,
   subDetailName,
+  style,
 }: stylingProps): void {
   console.log(1);
 }
diff --git a/src/utils/map-styling/marker.ts b/src/utils/map-styling/marker.ts
index 99951c8..051a573 100644
--- a/src/utils/map-styling/marker.ts
+++ b/src/utils/map-styling/marker.ts
@@ -5,6 +5,7 @@ function markerStyling({
   subFeatureName,
   detailName,
   subDetailName,
+  style,
 }: stylingProps): void {
   console.log(1);
 }
diff --git a/src/utils/map-styling/poi.ts b/src/utils/map-styling/poi.ts
index 8b5f970..e16d251 100644
--- a/src/utils/map-styling/poi.ts
+++ b/src/utils/map-styling/poi.ts
@@ -5,6 +5,7 @@ function poiStyling({
   subFeatureName,
   detailName,
   subDetailName,
+  style,
 }: stylingProps): void {
   console.log(1);
 }
diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
index 43b172d..85c72af 100644
--- a/src/utils/map-styling/road.ts
+++ b/src/utils/map-styling/road.ts
@@ -5,6 +5,7 @@ function roadStyling({
   subFeatureName,
   detailName,
   subDetailName,
+  style,
 }: stylingProps): void {
   console.log(1);
 }
diff --git a/src/utils/map-styling/transit.ts b/src/utils/map-styling/transit.ts
index 2bd583a..e66698b 100644
--- a/src/utils/map-styling/transit.ts
+++ b/src/utils/map-styling/transit.ts
@@ -5,6 +5,7 @@ function transitStyling({
   subFeatureName,
   detailName,
   subDetailName,
+  style,
 }: stylingProps): void {
   console.log(1);
 }
diff --git a/src/utils/map-styling/water.ts b/src/utils/map-styling/water.ts
index 70a9d72..e13fa2d 100644
--- a/src/utils/map-styling/water.ts
+++ b/src/utils/map-styling/water.ts
@@ -5,6 +5,7 @@ function waterStyling({
   subFeatureName,
   detailName,
   subDetailName,
+  style,
 }: stylingProps): void {
   console.log(1);
 }

From 305713cfcf30ae7bf00ea4d800fc653bd5b7b1f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Mon, 30 Nov 2020 19:08:23 +0900
Subject: [PATCH 027/138] =?UTF-8?q?[fix]=20hsl=EC=83=89=EC=83=81=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=8B=9C=EC=97=90=20=EB=B6=80=EC=A1=B1?=
 =?UTF-8?q?=ED=95=9C=20=EB=B6=80=EB=B6=84=EC=9D=B4=20=EC=9E=88=EC=96=B4?=
 =?UTF-8?q?=EC=84=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- hsl색상 변경시 부족한 부분이 많아서 수정을 함
- 1. s와 l엔 %를 붙여주어야 함
- 2. hex를 rgb로 변경 시 16진수에서 바꾸어 주어야함
---
 src/utils/applyStyle.ts  | 6 +++---
 src/utils/colorFormat.ts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index 3e301f0..a60c423 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -19,7 +19,7 @@ export function applyColor(
   layerName: string
 ): void {
   const { h, s, l } = hexToHSL(color);
-  map.setPaintProperty(layerName, type, `hsl(${h}, ${s}, ${l})`);
+  map.setPaintProperty(layerName, type, `hsl(${h}, ${s}%, ${l}%)`);
 }
 
 export function applyWeight(
@@ -42,7 +42,7 @@ export function applySaturation(
   map.setPaintProperty(
     layerName,
     type,
-    `hsl(${h}, ${50 + saturation / 2}, ${l})`
+    `hsl(${h}, ${50 + saturation / 2}%, ${l}%)`
   );
 }
 
@@ -57,6 +57,6 @@ export function applyLightness(
   map.setPaintProperty(
     layerName,
     type,
-    `hsl(${h}, ${s}, ${50 + lightness / 2})`
+    `hsl(${h}, ${s}%, ${50 + lightness / 2}%)`
   );
 }
diff --git a/src/utils/colorFormat.ts b/src/utils/colorFormat.ts
index 3333c05..9c4166f 100644
--- a/src/utils/colorFormat.ts
+++ b/src/utils/colorFormat.ts
@@ -6,9 +6,9 @@ interface HexToHSLType {
 }
 
 export function hexToHSL(color: string): HexToHSLType {
-  let r = parseInt(color.slice(1, 3), 10);
-  let g = parseInt(color.slice(3, 5), 10);
-  let b = parseInt(color.slice(5), 10);
+  let r = parseInt(color.slice(1, 3), 16);
+  let g = parseInt(color.slice(3, 5), 16);
+  let b = parseInt(color.slice(5), 16);
 
   r /= 255;
   g /= 255;

From 6d9e3f58841da4d3877346def5ca28bbd198ed7e Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 19:38:51 +0900
Subject: [PATCH 028/138] =?UTF-8?q?[feat]=20[#84]=20=EA=B2=BD=EA=B4=80=20?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EB=B8=94=20=EB=B6=84=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/map/layers/landscape.ts | 144 ++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 src/store/map/layers/landscape.ts

diff --git a/src/store/map/layers/landscape.ts b/src/store/map/layers/landscape.ts
new file mode 100644
index 0000000..376db32
--- /dev/null
+++ b/src/store/map/layers/landscape.ts
@@ -0,0 +1,144 @@
+export default [
+  {
+    id: 'landscape-humanmade',
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'grey',
+      'fill-opacity': 0.7,
+    },
+    filter: [
+      'in',
+      'type',
+      'civic',
+      'construction',
+      'gate',
+      'palace',
+      'parking',
+      'riverbank',
+      'station',
+      'steps',
+      'train_station',
+      'shrine',
+      'retaining_wall',
+      'smoking_area',
+      'city_gate',
+      'terrace',
+      'shelter',
+      'wall',
+      'fence',
+      'toll_booth',
+      'kerb',
+      'bench',
+      'footway',
+      'pedestrian',
+      'parking',
+    ],
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'black',
+      'fill-opacity': 0.5,
+    },
+    filter: ['in', 'type', 'retail', 'commercial'],
+    id: 'landscape-commercial',
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'black',
+      'fill-opacity': 0.5,
+    },
+    filter: [
+      'in',
+      'type',
+      'apartments',
+      'bunker',
+      'cathedral',
+      'chapel',
+      'childcare',
+      'chungmoo art hall',
+      'church',
+      'courthouse',
+      'government',
+      'hospital',
+      'hotel',
+      'house',
+      'kindergarten',
+      'public',
+      'ranger_station',
+      'residential',
+      'roof',
+      'school',
+      'shed',
+      'shelter',
+      'university',
+      'warehouse',
+      'company',
+      'conference_centre',
+      'pavilion',
+      'swimming_pool',
+      'office',
+      'dormitory',
+      'public_bath',
+      'community_centre',
+      'theatre',
+    ],
+    id: 'landscape-building',
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'darkgreen',
+      'fill-opacity': 0.5,
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      ['wood', 'scrub', 'bare_rock'],
+      true,
+      false,
+    ],
+    id: 'landscape-natural',
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'yellow',
+      'fill-opacity': 0.5,
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      ['sand', 'heath', 'grassland'],
+      true,
+      false,
+    ],
+    id: 'landscape-landcover',
+  },
+];

From 1f48c1a809e702282a80c81b31f95abea5408cbb Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 19:39:16 +0900
Subject: [PATCH 029/138] =?UTF-8?q?[feat]=20[#84]=20poi=20=EB=A0=88?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EB=B6=84=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/map/layers/poi.ts | 368 ++++++++++++++++++++++++++++++++++++
 1 file changed, 368 insertions(+)
 create mode 100644 src/store/map/layers/poi.ts

diff --git a/src/store/map/layers/poi.ts b/src/store/map/layers/poi.ts
new file mode 100644
index 0000000..5c5b6d2
--- /dev/null
+++ b/src/store/map/layers/poi.ts
@@ -0,0 +1,368 @@
+export default [
+  // POI - polygon start
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'skyblue',
+      'fill-opacity': 0.5,
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      ['arts_centre', 'fountain', 'gate', 'palace', 'chungmoo art hall'],
+      true,
+      false,
+    ],
+    id: 'poi-attraction-polygon',
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'skyblue',
+      'fill-opacity': 0.5,
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      [
+        'restaurant',
+        'cafe',
+        'marketplace',
+        'fast_food',
+        'bar',
+        'pub',
+        'casino',
+        'cinema',
+        '',
+      ],
+      true,
+      false,
+    ],
+    id: 'poi-business-polygon',
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'skyblue',
+      'fill-opacity': 0.5,
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      [
+        'fire_station',
+        'post_office',
+        'police',
+        'townhall',
+        'public',
+        'ranger_station',
+        'government',
+        'bunker',
+      ],
+      true,
+      false,
+    ],
+    id: 'poi-government-polygon',
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'lightgrey',
+      'fill-opacity': 0.5,
+    },
+    filter: ['match', ['get', 'type'], ['hospital', 'pharmacy'], true, false],
+    id: 'poi-medical-polygon',
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'red',
+      'fill-opacity': 0.5,
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      ['place_of_worship', 'cathedral', 'chapel', 'church'],
+      true,
+      false,
+    ],
+    id: 'poi-worship-polygon',
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'brown',
+      'fill-opacity': 0.5,
+    },
+    filter: [
+      'in',
+      'type',
+      'college',
+      'university',
+      'language_school',
+      'school',
+      'kindergarten',
+    ],
+    id: 'poi-school-polygon',
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'lightgrey',
+      'fill-opacity': 0.5,
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      ['toilets', 'social_facility', 'conference_centre'],
+      true,
+      false,
+    ],
+    id: 'poi-etc-polygon',
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'skyblue',
+      'fill-opacity': 0.5,
+    },
+    filter: ['match', ['get', 'type'], 'swimming_pool', true, false],
+    id: 'poi-sports-polygon',
+  },
+  // POI - polygon end
+  {
+    type: 'symbol',
+    source: 'poi_source',
+    'source-layer': 'poi',
+    layout: {
+      'text-field': ['get', 'name'],
+      visibility: 'visible',
+    },
+    paint: {
+      'text-color': 'brown',
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      ['milestone', 'arts_centre', 'fountain'],
+      true,
+      false,
+    ],
+    id: 'poi-attraction',
+  },
+  {
+    type: 'symbol',
+    source: 'poi_source',
+    'source-layer': 'poi',
+    layout: {
+      'text-field': ['get', 'name'],
+      visibility: 'visible',
+    },
+    paint: {
+      'text-color': 'blue',
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      [
+        'cinema',
+        'bar',
+        'post_box',
+        'restaurant',
+        'theatre',
+        'studio',
+        'bureau_de_change',
+        'marketplace',
+        'fast_food',
+        'toll_booth',
+        'charging_station',
+        'social_facility',
+        'nightclub',
+        'food_court',
+        'car_rental',
+        'bicycle_rental',
+        'pub',
+        'bank',
+        'ice_cream',
+        'fuel',
+      ],
+      true,
+      false,
+    ],
+    id: 'poi-business',
+  },
+  {
+    type: 'symbol',
+    source: 'poi_source',
+    'source-layer': 'poi',
+    layout: {
+      'text-field': ['get', 'name'],
+      visibility: 'visible',
+    },
+    paint: {
+      'text-color': 'green',
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      [
+        'townhall',
+        'social_centre',
+        'post_office',
+        'shelter',
+        'embassy',
+        'police',
+      ],
+      true,
+      false,
+    ],
+    id: 'poi-government',
+  },
+  {
+    type: 'symbol',
+    source: 'poi_source',
+    'source-layer': 'poi',
+    layout: {
+      'text-field': ['get', 'name'],
+      visibility: 'visible',
+    },
+    paint: {
+      'text-color': 'green',
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      ['hospital', 'doctors', 'clinic', 'dentist', 'pharmacy'],
+      true,
+      false,
+    ],
+    id: 'poi-medical',
+  },
+  {
+    type: 'symbol',
+    source: 'poi_source',
+    'source-layer': 'poi',
+    layout: {
+      'text-field': ['get', 'name'],
+      visibility: 'visible',
+    },
+    paint: {
+      'text-color': 'green',
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      ['waste_basket', 'tree', 'rest_area'],
+      true,
+      false,
+    ],
+    id: 'poi-park',
+  },
+  {
+    type: 'symbol',
+    source: 'poi_source',
+    'source-layer': 'poi',
+    layout: {
+      'text-field': ['get', 'name'],
+      visibility: 'visible',
+    },
+    paint: {
+      'text-color': 'green',
+    },
+    filter: ['match', ['get', 'type'], 'place_of_worship'],
+    id: 'poi-worship',
+  },
+  {
+    type: 'symbol',
+    source: 'poi_source',
+    'source-layer': 'poi',
+    layout: {
+      'text-field': ['get', 'name'],
+      visibility: 'visible',
+    },
+    paint: {
+      'text-color': 'green',
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      ['school', 'kindergarten', 'college'],
+      true,
+      false,
+    ],
+    id: 'poi-school',
+  },
+  {
+    type: 'symbol',
+    source: 'poi_source',
+    'source-layer': 'poi',
+    layout: {
+      'text-field': ['get', 'name'],
+      visibility: 'visible',
+    },
+    paint: {
+      'text-color': 'green',
+    },
+    filter: [
+      'in',
+      'type',
+      'parking',
+      'crossing',
+      'traffic_signal',
+      'mini_roundabout',
+      'bench',
+      'sally port',
+      'block',
+      'street_lamp',
+      'bollard',
+      'lift_gate',
+      'gate',
+      'elevator',
+      'toilets',
+      'water_point',
+      'spring',
+      'atm',
+    ],
+    id: 'poi-etc',
+  },
+];

From bc4987be3c5b031a2f50ae48ee26435c9ef983d7 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 19:39:37 +0900
Subject: [PATCH 030/138] =?UTF-8?q?[feat]=20[#84]=20=EB=8F=84=EB=A1=9C=20?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EB=B8=94=20=EB=B6=84=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/map/layers/road.ts | 67 ++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 src/store/map/layers/road.ts

diff --git a/src/store/map/layers/road.ts b/src/store/map/layers/road.ts
new file mode 100644
index 0000000..9219d2d
--- /dev/null
+++ b/src/store/map/layers/road.ts
@@ -0,0 +1,67 @@
+export default [
+  {
+    type: 'line',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'line-color': 'brown',
+      'line-width': 4,
+    },
+    filter: ['match', ['get', 'type'], 'city_wall', true, false],
+    id: 'city-wall',
+  },
+  {
+    type: 'line',
+    source: 'line_source',
+    'source-layer': 'line',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'line-color': '#ff00ff',
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      ['road', 'primary', 'secondary', 'teritiary'],
+      true,
+      false,
+    ],
+    id: 'road-arterial',
+  },
+  {
+    type: 'line',
+    source: 'line_source',
+    'source-layer': 'line',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'line-color': 'blue',
+    },
+    filter: [
+      'match',
+      ['get', 'type'],
+      ['cycleway', 'path', 'living_street', 'service'],
+      true,
+      false,
+    ],
+    id: 'road-local',
+  },
+  {
+    type: 'line',
+    source: 'line_source',
+    'source-layer': 'line',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'line-color': 'red',
+    },
+    filter: ['match', ['get', 'type'], ['pedestrian', 'footway'], true, false],
+    id: 'road-footway',
+  },
+];

From a31d6cf2b1d6735b272e68d7f329230100d33a96 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 19:39:55 +0900
Subject: [PATCH 031/138] =?UTF-8?q?[feat]=20[#84]=20=EA=B5=90=ED=86=B5=20?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EB=B8=94=20=EB=B6=84=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/map/layers/transit.ts | 56 +++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 src/store/map/layers/transit.ts

diff --git a/src/store/map/layers/transit.ts b/src/store/map/layers/transit.ts
new file mode 100644
index 0000000..72b9cd8
--- /dev/null
+++ b/src/store/map/layers/transit.ts
@@ -0,0 +1,56 @@
+export default [
+  {
+    type: 'line',
+    source: 'line_source',
+    'source-layer': 'line',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'line-color': 'yellow',
+    },
+    filter: ['==', ['get', 'type'], 'subway'],
+    id: 'transit-subway',
+  },
+  {
+    type: 'symbol',
+    source: 'poi_source',
+    'source-layer': 'poi',
+    layout: {
+      'text-field': ['get', 'name'],
+      visibility: 'visible',
+    },
+    paint: {
+      'text-color': 'green',
+    },
+    filter: ['==', ['get', 'type'], 'taxi'],
+    id: 'transit-bus',
+  },
+  {
+    type: 'line',
+    source: 'line_source',
+    'source-layer': 'line',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'line-color': 'black',
+    },
+    filter: ['==', ['get', 'type'], 'rail'],
+    id: 'transit-rail',
+  },
+  {
+    type: 'symbol',
+    source: 'poi_source',
+    'source-layer': 'poi',
+    layout: {
+      'text-field': ['get', 'name'],
+      visibility: 'visible',
+    },
+    paint: {
+      'text-color': 'pink',
+    },
+    filter: ['match', ['get', 'type'], ['taxi'], true, false],
+    id: 'transit-bus',
+  },
+];

From 6483b2a17e03b5e1cbd0d6d1bb65bbc9304860ac Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 19:40:08 +0900
Subject: [PATCH 032/138] =?UTF-8?q?[feat]=20[#84]=20=EB=AC=BC=20=EB=A0=88?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EB=B6=84=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/map/layers/water.ts | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/store/map/layers/water.ts

diff --git a/src/store/map/layers/water.ts b/src/store/map/layers/water.ts
new file mode 100644
index 0000000..3e8ad46
--- /dev/null
+++ b/src/store/map/layers/water.ts
@@ -0,0 +1,29 @@
+export default [
+  {
+    type: 'line',
+    source: 'line_source',
+    'source-layer': 'line',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'line-color': 'blue',
+    },
+    filter: ['match', ['get', 'type'], ['river', 'stream'], true, false],
+    id: 'water-section',
+  },
+  {
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': '#000000',
+      'fill-opacity': 0.5,
+    },
+    filter: ['==', ['get', 'type'], 'water'],
+    id: 'water-line',
+  },
+];

From 883834a06523b4d76200986935803d62ab99f0d4 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Mon, 30 Nov 2020 19:41:44 +0900
Subject: [PATCH 033/138] =?UTF-8?q?[feat]=20[#84]=20=EB=B6=84=EB=A5=98?=
 =?UTF-8?q?=EB=90=9C=20=EB=A0=88=EC=9D=B4=EB=B8=94=20=EB=A7=B5=EC=97=90=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 경도, 위도, 줌 서울 데이터를 기준으로 조정하였음
- 굵기, 색상, zoom 등 레이블 기본값의 수정이 필요함
---
 src/store/map/initializeMap.ts | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/store/map/initializeMap.ts b/src/store/map/initializeMap.ts
index 71aaa73..0aa0e35 100644
--- a/src/store/map/initializeMap.ts
+++ b/src/store/map/initializeMap.ts
@@ -2,10 +2,15 @@ import { RefObject } from 'react';
 import mapboxgl from 'mapbox-gl';
 import 'mapbox-gl/dist/mapbox-gl.css';
 import dotenv from 'dotenv';
+import road from './layers/road';
+import transit from './layers/transit';
+import poi from './layers/poi';
+import landscape from './layers/landscape';
+import water from './layers/water';
 
-const LNG = 128;
-const LAT = 36.5;
-const ZOOM = 7;
+const LNG = 126.978;
+const LAT = 37.5656;
+const ZOOM = 15.5;
 const LABELS = [
   'country-label',
   'settlement-label',
@@ -54,6 +59,27 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
 
   map.on('load', () => {
     translate(map);
+    map.addSource('polygon_source', {
+      type: 'vector',
+      tiles: ['http://110.93.147.18:8080/boostcamp/polygon/{x}/{y}/{z}'],
+    });
+    map.addSource('line_source', {
+      type: 'vector',
+      tiles: ['http://110.93.147.18:8080/boostcamp/line/{x}/{y}/{z}'],
+    });
+    map.addSource('poi_source', {
+      type: 'vector',
+      tiles: ['http:/110.93.147.18:8080/boostcamp/poi/{x}/{y}/{z}'],
+    });
+
+    const layers = [
+      ...road,
+      ...transit,
+      ...poi,
+      ...water,
+      ...landscape,
+    ] as mapboxgl.Layer[];
+    layers.forEach((layer: mapboxgl.Layer) => map.addLayer(layer));
   });
 
   return map;

From 69814ae7ea3c937370b0d2a7af9f4759fa969531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Mon, 30 Nov 2020 19:52:23 +0900
Subject: [PATCH 034/138] =?UTF-8?q?[feat]=20applyStyle=EC=9D=B8=EC=9E=90?=
 =?UTF-8?q?=EB=93=A4=20=EC=84=9C=EC=88=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- applyStyle의 매개변수들의 순서를 변경하였다.
- 나중에 object로 바꿀 필요 있을 듯
---
 src/utils/applyStyle.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index a60c423..940154e 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -14,9 +14,9 @@ export function applyVisibility(
 
 export function applyColor(
   map: mapboxgl.Map,
-  color: string,
+  layerName: string,
   type: colorType,
-  layerName: string
+  color: string
 ): void {
   const { h, s, l } = hexToHSL(color);
   map.setPaintProperty(layerName, type, `hsl(${h}, ${s}%, ${l}%)`);
@@ -24,19 +24,19 @@ export function applyColor(
 
 export function applyWeight(
   map: mapboxgl.Map,
-  weight: number,
   layerName: string,
-  type: weightType
+  type: weightType,
+  weight: number
 ): void {
   map.setPaintProperty(layerName, type, weight * 2 + 1);
 }
 
 export function applySaturation(
   map: mapboxgl.Map,
-  color: string,
-  saturation: number,
+  layerName: string,
   type: colorType,
-  layerName: string
+  color: string,
+  saturation: number
 ): void {
   const { h, l } = hexToHSL(color);
   map.setPaintProperty(
@@ -48,9 +48,9 @@ export function applySaturation(
 
 export function applyLightness(
   map: mapboxgl.Map,
-  color: string,
   layerName: string,
   type: colorType,
+  color: string,
   lightness: number
 ): void {
   const { h, s } = hexToHSL(color);

From 6e7c44c88a82593e97ae53fc880fe758d8f421d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Mon, 30 Nov 2020 22:52:43 +0900
Subject: [PATCH 035/138] =?UTF-8?q?[feat]=20=EB=A9=94=EC=9D=B8=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=EC=97=90=20=EC=82=AC=EC=9A=A9=ED=95=A0=20=EB=94=94?=
 =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EB=B0=8F=20=EC=BB=B4=ED=8F=AC=EB=84=8C?=
 =?UTF-8?q?=ED=8A=B8=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 메인화면에 사용할 컴포넌트를 canvas를 이용해서 구상해보았다
- 필요한 이미지 파일들 추가
- 기존과 동일하게 Canvas컴포넌트 생성 후 useCanvas hook으로 로직을 가져왔다
---
 public/images/logo.png     | Bin 0 -> 67065 bytes
 public/images/map.png      | Bin 0 -> 110518 bytes
 src/components/Canvas.tsx  |  41 +++++++
 src/hooks/useCanvas.ts     | 214 +++++++++++++++++++++++++++++++++++++
 src/pages/Entry.tsx        |  53 +++++++++
 src/utils/styles/styled.ts |   1 +
 6 files changed, 309 insertions(+)
 create mode 100644 public/images/logo.png
 create mode 100644 public/images/map.png
 create mode 100644 src/components/Canvas.tsx
 create mode 100644 src/hooks/useCanvas.ts
 create mode 100644 src/pages/Entry.tsx

diff --git a/public/images/logo.png b/public/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf548302449ff09717c84538748fd5805bd73336
GIT binary patch
literal 67065
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
SNnGFtki4|ARIP+j(EkGS0I%c#

literal 0
HcmV?d00001

diff --git a/public/images/map.png b/public/images/map.png
new file mode 100644
index 0000000000000000000000000000000000000000..03e4b734fb851c5d9231376c69e1666e7cfa7941
GIT binary patch
literal 110518
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
Y|NRG!f0Lxa4`5tV*Hf!fu?+uz04@cTegFUf

literal 0
HcmV?d00001

diff --git a/src/components/Canvas.tsx b/src/components/Canvas.tsx
new file mode 100644
index 0000000..9704827
--- /dev/null
+++ b/src/components/Canvas.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import styled from '../utils/styles/styled';
+import useCanvas from '../hooks/useCanvas';
+
+const Canvas = styled.canvas``;
+
+const Img = styled.img`
+  display: none;
+`;
+
+const CANVAS_WIDTH = 804;
+const CANVAS_HEIGHT = 420;
+
+function CanvasComponent(): React.ReactElement {
+  const { mapImgRef, logoImgRef, canvasRef, mouseDownHandler } = useCanvas();
+
+  return (
+    <>
+      <Img
+        src="/images/map.png"
+        alt="map"
+        crossOrigin="anonymous"
+        ref={mapImgRef}
+      />
+      <Img
+        src="/images/logo.png"
+        alt="logo"
+        crossOrigin="anonymous"
+        ref={logoImgRef}
+      />
+      <Canvas
+        onMouseDown={mouseDownHandler}
+        width={CANVAS_WIDTH}
+        height={CANVAS_HEIGHT}
+        ref={canvasRef}
+      />
+    </>
+  );
+}
+
+export default CanvasComponent;
diff --git a/src/hooks/useCanvas.ts b/src/hooks/useCanvas.ts
new file mode 100644
index 0000000..0280173
--- /dev/null
+++ b/src/hooks/useCanvas.ts
@@ -0,0 +1,214 @@
+/* eslint-disable no-param-reassign */
+/* eslint-disable no-continue */
+/* eslint-disable no-await-in-loop */
+/** 리팩토링 예정 */
+import React, { useEffect, useRef, useState, RefObject } from 'react';
+
+const X_PLUS = [0, 0, 1, -1, 1, -1, 1, -1];
+const Y_PLUS = [1, -1, 0, 0, 1, -1, -1, 1];
+const CANVAS_WIDTH = 804;
+const CANVAS_HEIGHT = 420;
+const PIXEL_UNIT = 5;
+const RENDERING_COUNT = 200;
+const MAP_OPTION = 'mapOption';
+const LOGO_OPTION = 'logoOption';
+
+interface useCanvasType {
+  mapImgRef: RefObject<HTMLImageElement>;
+  logoImgRef: RefObject<HTMLImageElement>;
+  canvasRef: RefObject<HTMLCanvasElement>;
+  mouseDownHandler: (e: React.MouseEvent<HTMLCanvasElement>) => void;
+}
+
+type OptionType = 'logoOption' | 'mapOption';
+interface DotInterface {
+  x: number;
+  y: number;
+  r: number;
+  g: number;
+  b: number;
+}
+
+function sleep(time: number) {
+  return new Promise((resolve) => setTimeout(resolve, time));
+}
+
+class Dot {
+  mapOption: DotInterface;
+
+  logoOption: DotInterface;
+
+  currentOption: OptionType;
+
+  constructor(mapOption: DotInterface, logoOption: DotInterface) {
+    this.mapOption = mapOption;
+    this.logoOption = logoOption;
+    this.currentOption = LOGO_OPTION;
+  }
+
+  draw(c: CanvasRenderingContext2D) {
+    const currentOption = this[this.currentOption];
+
+    c.beginPath();
+    c.fillStyle = `rgb(${currentOption.r}, ${currentOption.g}, ${currentOption.b})`;
+    c.rect(currentOption.x, currentOption.y, 4, 4);
+    // c.arc(currentOption.x, currentOption.y, 2, 0, 2 * Math.PI, false);
+    c.fill();
+  }
+}
+
+export default function useCanvas(): useCanvasType {
+  const canvasRef = useRef(document.createElement('canvas'));
+  const mapImgRef = useRef(document.createElement('img'));
+  const logoImgRef = useRef(document.createElement('img'));
+
+  const [dotsState, setDotsState] = useState<Array<Dot[]>>([]);
+  const [context, setContext] = useState<CanvasRenderingContext2D>();
+  const [nextOption, setNextOption] = useState<OptionType>('mapOption');
+
+  function drawCanvas(
+    ctx: CanvasRenderingContext2D | undefined = context,
+    dots = dotsState
+  ) {
+    if (ctx) {
+      ctx.clearRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
+      dots.forEach((dotRow) => {
+        dotRow.forEach((dot: Dot) => {
+          dot.draw(ctx);
+        });
+      });
+    }
+  }
+
+  function parseImageToPixels(
+    ctx: CanvasRenderingContext2D,
+    img: HTMLImageElement
+  ) {
+    const pixels = [];
+
+    ctx.drawImage(img, 0, 0);
+
+    const imageData = ctx.getImageData(
+      0,
+      0,
+      img.naturalWidth,
+      img.naturalHeight
+    ).data;
+
+    for (let i = 0; i < imageData.length; i += 4) {
+      const x = ((i / 4) % img.naturalWidth) + 1;
+      const y = Math.floor(i / img.naturalWidth / 4) + 1;
+      if (x % PIXEL_UNIT === 0 && y % PIXEL_UNIT === 0) {
+        pixels.push({
+          x,
+          y,
+          r: imageData[i],
+          g: imageData[i + 1],
+          b: imageData[i + 2],
+        });
+      }
+    }
+
+    return pixels;
+  }
+
+  async function initCanvas() {
+    const ctx = canvasRef.current.getContext('2d') as CanvasRenderingContext2D;
+
+    await sleep(100);
+    const logoPixels = parseImageToPixels(ctx, logoImgRef.current);
+    const mapPixels = parseImageToPixels(ctx, mapImgRef.current);
+
+    const dots = [];
+    for (let i = 0; i < mapImgRef.current.naturalHeight / PIXEL_UNIT; i += 1) {
+      const row = [];
+      for (let j = 0; j < mapImgRef.current.naturalWidth / PIXEL_UNIT; j += 1) {
+        const index = (mapImgRef.current.naturalWidth / PIXEL_UNIT) * i + j;
+        const mapOption = mapPixels[index];
+        const logoOption = logoPixels[index];
+
+        if (!mapOption) break;
+        const dot = new Dot(mapOption, logoOption);
+        row.push(dot);
+      }
+      if (row.length) {
+        dots.push(row);
+      }
+    }
+
+    setContext(ctx);
+    setDotsState(dots);
+    drawCanvas(ctx, dots);
+  }
+
+  function getCursorPosition(event: React.MouseEvent<HTMLCanvasElement>) {
+    const rect = canvasRef.current.getBoundingClientRect();
+    const x = event.clientX - rect.left;
+    const y = event.clientY - rect.top;
+    return { x, y };
+  }
+
+  async function changeCanvasOption(
+    option: OptionType,
+    point: { x: number; y: number }
+  ) {
+    const store: Array<number[]> = [[point.x, point.y]];
+    let count = 0;
+
+    while (store.length) {
+      const [x, y] = store.shift() as number[];
+      dotsState[x][y].currentOption = option;
+
+      for (let i = 0; i < X_PLUS.length; i += 1) {
+        const xx = x + X_PLUS[i];
+        const yy = y + Y_PLUS[i];
+
+        const maxPixelX = Math.floor(CANVAS_HEIGHT / PIXEL_UNIT) - 1;
+        const maxPixelY = Math.floor(CANVAS_WIDTH / PIXEL_UNIT);
+        if (xx >= maxPixelX || xx < 0 || yy >= maxPixelY || yy < 0) {
+          continue;
+        }
+
+        if (dotsState[xx][yy].currentOption !== option) {
+          const isExit = store.some((dot) => dot[0] === xx && dot[1] === yy);
+          if (!isExit) {
+            store.push([xx, yy]);
+          }
+        }
+      }
+
+      if (count === RENDERING_COUNT) {
+        await sleep(1);
+        count = 0;
+        drawCanvas();
+      }
+      count += 1;
+    }
+  }
+
+  const mouseDownHandler = async (e: React.MouseEvent<HTMLCanvasElement>) => {
+    const { x, y } = getCursorPosition(e);
+    /** 0부터 시작이라 1씩 빼줌, 좌표랑 배열이 반대라서 바꾸어서 넣어줌 */
+    const coorX = parseInt(String(y / PIXEL_UNIT), 10) - 1;
+    const coorY = parseInt(String(x / PIXEL_UNIT), 10) - 1;
+
+    await changeCanvasOption(nextOption, { x: coorX, y: coorY });
+    setNextOption(nextOption === MAP_OPTION ? LOGO_OPTION : MAP_OPTION);
+
+    drawCanvas();
+  };
+
+  useEffect(() => {
+    async function init() {
+      await initCanvas();
+    }
+    init();
+  }, []);
+
+  return {
+    mapImgRef,
+    logoImgRef,
+    canvasRef,
+    mouseDownHandler,
+  };
+}
diff --git a/src/pages/Entry.tsx b/src/pages/Entry.tsx
new file mode 100644
index 0000000..412aea8
--- /dev/null
+++ b/src/pages/Entry.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import Canvas from '../components/Canvas';
+import styled from '../utils/styles/styled';
+
+const BackGround = styled.div`
+  width: 100vw;
+  height: 100vh;
+
+  background-color: ${(props) => props.theme.DEEPGREY};
+`;
+
+const Container = styled.div`
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  height: 60%;
+
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+`;
+
+const StartButton = styled.button`
+  width: 250px;
+  height: 60px;
+
+  border: none;
+  border-radius: 40px;
+  font-size: 2.8rem;
+  font-weight: bold;
+
+  color: ${(props) => props.theme.GREEN};
+  background-color: ${(props) => props.theme.WHITE};
+  &:hover {
+    background-color: ${(props) => props.theme.GREEN};
+    color: ${(props) => props.theme.WHITE};
+  }
+`;
+
+function Entry(): React.ReactElement {
+  return (
+    <BackGround>
+      <Container>
+        <Canvas />
+        <StartButton>시작하기</StartButton>
+      </Container>
+    </BackGround>
+  );
+}
+
+export default Entry;
diff --git a/src/utils/styles/styled.ts b/src/utils/styles/styled.ts
index 3a95bf6..5059f75 100644
--- a/src/utils/styles/styled.ts
+++ b/src/utils/styles/styled.ts
@@ -10,6 +10,7 @@ export const theme: ThemeType = {
   LIGHTGREY: '#E0E0E0',
   GREY: '#9E9E9E',
   DARKGREY: '#616161',
+  DEEPGREY: '#434343',
   WHITE: '#FFFFFF',
   GOOGLE_GREY: '#f5f5f5',
 };

From d2cc7036242b53bed84929335ba79d037838cd22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 00:12:17 +0900
Subject: [PATCH 036/138] =?UTF-8?q?[feat]=20[#79]=20mapbox-poi=EB=B6=84?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- mapbox-poi를 사이트를 참조해서 분리해놓음
- 전체적인 형식은 기존 poi형식을 따름
---
 src/store/map/initializeMap.ts     | 10 +++--
 src/store/map/layers/mapbox-poi.ts | 70 ++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 src/store/map/layers/mapbox-poi.ts

diff --git a/src/store/map/initializeMap.ts b/src/store/map/initializeMap.ts
index 71aaa73..cf1e42a 100644
--- a/src/store/map/initializeMap.ts
+++ b/src/store/map/initializeMap.ts
@@ -2,10 +2,11 @@ import { RefObject } from 'react';
 import mapboxgl from 'mapbox-gl';
 import 'mapbox-gl/dist/mapbox-gl.css';
 import dotenv from 'dotenv';
+import mapboxPOI from './layers/mapbox-poi';
 
-const LNG = 128;
-const LAT = 36.5;
-const ZOOM = 7;
+const LNG = 126.978;
+const LAT = 37.5656;
+const ZOOM = 15.5;
 const LABELS = [
   'country-label',
   'settlement-label',
@@ -54,6 +55,9 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
 
   map.on('load', () => {
     translate(map);
+    map.removeLayer('poi-label');
+
+    (mapboxPOI as mapboxgl.Layer[]).forEach((layer) => map.addLayer(layer));
   });
 
   return map;
diff --git a/src/store/map/layers/mapbox-poi.ts b/src/store/map/layers/mapbox-poi.ts
new file mode 100644
index 0000000..5882534
--- /dev/null
+++ b/src/store/map/layers/mapbox-poi.ts
@@ -0,0 +1,70 @@
+const mapboxPoiNameAndColor = [
+  { name: 'food_and_drink', color: 'hsl(22, 55%, 55%)', layerName: 'food' },
+  { name: 'park_like', color: 'hsl(100, 45%, 37%)', layerName: 'park' },
+  { name: 'education', color: 'hsl(51, 40%, 40%)', layerName: 'education' },
+  { name: 'medical', color: 'hsl(340, 39%, 42%)', layerName: 'medical' },
+  {
+    name: 'arts_and_entertainment',
+    color: 'hsl(26, 25%, 32%)',
+    layerName: 'arts',
+  },
+  { name: 'building', color: 'hsl(26, 25%, 32%)', layerName: 'building' },
+  { name: 'general', color: 'hsl(26, 25%, 32%)', layerName: 'general' },
+  { name: 'historic', color: 'hsl(26, 25%, 32%)', layerName: 'historic' },
+  { name: 'industrial', color: 'hsl(26, 25%, 32%)', layerName: 'industrial' },
+  {
+    name: 'public_facilities',
+    color: 'hsl(26, 25%, 32%)',
+    layerName: 'public_facilities',
+  },
+  { name: 'religion', color: 'hsl(26, 25%, 32%)', layerName: 'religion' },
+  { name: 'store_like', color: 'hsl(26, 25%, 32%)', layerName: 'store_like' },
+];
+
+export default mapboxPoiNameAndColor.map((poi) => ({
+  id: `poi-${poi.name}-label`,
+  type: 'symbol',
+  source: 'composite',
+  'source-layer': 'poi_label',
+  metadata: {},
+  minzoom: 6,
+  filter: ['==', ['get', 'class'], poi.name],
+  layout: {
+    'text-size': 12,
+    'icon-image': [
+      'step',
+      ['zoom'],
+      ['concat', ['get', 'maki'], '-11'],
+      15,
+      ['concat', ['get', 'maki'], '-15'],
+    ],
+    'text-offset': [
+      'step',
+      ['zoom'],
+      [
+        'step',
+        ['get', 'sizerank'],
+        ['literal', [0, 0]],
+        5,
+        ['literal', [0, 0.75]],
+      ],
+      17,
+      [
+        'step',
+        ['get', 'sizerank'],
+        ['literal', [0, 0]],
+        13,
+        ['literal', [0, 0.75]],
+      ],
+    ],
+    'text-anchor': 'top',
+    'text-field': ['coalesce', ['get', 'name_ko'], ['get', 'name']],
+  },
+  paint: {
+    'icon-opacity': 1,
+    'text-halo-color': 'hsl(0, 0%, 100%)',
+    'text-halo-width': 0.5,
+    'text-halo-blur': 0.5,
+    'text-color': poi.color,
+  },
+}));

From 0b749de9e4877c643a75168e79a4b2d0bc75fe0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 11:11:28 +0900
Subject: [PATCH 037/138] =?UTF-8?q?[refactor]=20eslint=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- enum설정 중 알수 없는 에러가 자꾸떠서 껐다.
- 알아보니 tslint와 eslint가 충돌해서 난다고 함
---
 .eslintrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index e02b996..e8253b2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -18,6 +18,7 @@
     "react-hooks/exhaustive-deps": "off",
     "react/require-default-props": "off",
     "import/order": "off",
-    "import/prefer-default-export": "off"
+    "import/prefer-default-export": "off",
+    "no-shadow": "off"
   }
 }

From d0998fd9854217613f3dd1ddd1ee81c64b377a84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 11:13:17 +0900
Subject: [PATCH 038/138] =?UTF-8?q?[feat]=20Style=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=EB=93=A4=EC=9D=98=20?=
 =?UTF-8?q?=EB=A7=A4=EC=A7=81=20=EC=8A=A4=ED=8A=B8=EB=A7=81=EC=9D=84=20enu?=
 =?UTF-8?q?m=ED=99=9C=EC=9A=A9=ED=95=B4=EC=84=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Style관련 하위 컴포넌트들을 onClick이벤트가 발생할 때 넘겨주는 string값을 enum을 이용해서 제거하였다
---
 .../Sidebar/SidebarContentMore/ColorStyle.tsx |  3 +-
 .../Sidebar/SidebarContentMore/DetailType.tsx | 40 ++++++++++++++-----
 .../SidebarContentMore/LightnessStyle.tsx     |  5 ++-
 .../SidebarContentMore/SaturationStyle.tsx    |  5 ++-
 .../SidebarContentMore/VisibilityStyle.tsx    |  3 +-
 .../SidebarContentMore/WeightStyle.tsx        |  5 ++-
 6 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx b/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
index c791208..3db1a54 100644
--- a/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
 import useInputRange from '../../../hooks/common/useInputRange';
+import { StyleKeyName } from '../../../store/common/type';
 
 const ColorWrapper = styled.div`
   display: flex;
@@ -49,7 +50,7 @@ function ColorStyle({
         type="color"
         id="styler__color"
         onChange={rangeChangeHandler}
-        onBlur={() => rangeMouseUpHandler('color')}
+        onBlur={() => rangeMouseUpHandler(StyleKeyName.color)}
         value={curRange}
       />
     </ColorWrapper>
diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index 1d8cc67..2168c5f 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -12,6 +12,8 @@ import {
   FeatureNameType,
   ElementNameType,
   SubElementNameType,
+  ElementName,
+  SubElementName,
 } from '../../../store/common/type';
 
 interface PaddingProp {
@@ -103,18 +105,26 @@ function DetailType({
           <Text padding="first">구역</Text>
           {section?.fill.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
-            isSelected={checkIsSelected('section', 'fill')}
+            isSelected={checkIsSelected(
+              ElementName.section,
+              SubElementName.fill
+            )}
             padding="second"
-            clickHandler={() => styleClickHandler('section', 'fill')}
+            clickHandler={() => {
+              styleClickHandler(ElementName.section, SubElementName.fill);
+            }}
             name="채우기"
           />
           {section?.stroke.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
             isSelected={
-              sidebarTypeName === 'section' && sidebarSubTypeName === 'stroke'
+              sidebarTypeName === ElementName.section &&
+              sidebarSubTypeName === SubElementName.stroke
             }
             padding="second"
-            clickHandler={() => styleClickHandler('section', 'stroke')}
+            clickHandler={() => {
+              styleClickHandler(ElementName.section, SubElementName.stroke);
+            }}
             name="윤곽선"
           />
         </List>
@@ -124,24 +134,34 @@ function DetailType({
             <Text padding="second">텍스트</Text>
             {labelText?.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
             <ListItem
-              isSelected={checkIsSelected('labelText', 'fill')}
+              isSelected={checkIsSelected(
+                ElementName.labelText,
+                SubElementName.fill
+              )}
               padding="third"
-              clickHandler={() => styleClickHandler('labelText', 'fill')}
+              clickHandler={() => {
+                styleClickHandler(ElementName.labelText, SubElementName.fill);
+              }}
               name="채우기"
             />
             {labelText?.stroke.isChanged ? <CheckRight>✓</CheckRight> : <></>}
             <ListItem
-              isSelected={checkIsSelected('labelText', 'stroke')}
+              isSelected={checkIsSelected(
+                ElementName.labelText,
+                SubElementName.stroke
+              )}
               padding="third"
-              clickHandler={() => styleClickHandler('labelText', 'stroke')}
+              clickHandler={() => {
+                styleClickHandler(ElementName.labelText, SubElementName.stroke);
+              }}
               name="윤곽선"
             />
           </List>
           {labelIcon?.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
-            isSelected={checkIsSelected('labelIcon')}
+            isSelected={checkIsSelected(ElementName.labelIcon)}
             padding="second"
-            clickHandler={() => styleClickHandler('labelIcon')}
+            clickHandler={() => styleClickHandler(ElementName.labelIcon)}
             name="아이콘"
           />
         </List>
diff --git a/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx b/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
index 5e23985..155807e 100644
--- a/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import styled from '../../../utils/styles/styled';
 import { Range } from '../SidebarContentFewer/DepthItem';
 import useInputRange from '../../../hooks/common/useInputRange';
+import { StyleKeyName } from '../../../store/common/type';
 
 const LightnessWrapper = styled.div`
   display: flex;
@@ -22,7 +23,7 @@ const LightnessControlBar = styled(Range)`
 `;
 
 interface LightnessPropsInterface {
-  lightness: number;
+  lightness: string;
   onStyleChange: (key: string, value: string | number) => void;
 }
 
@@ -47,7 +48,7 @@ function LightnessStyle({
           id="styler__lightness"
           value={curRange}
           onChange={(e) => rangeChangeHandler(e)}
-          onMouseUp={() => rangeMouseUpHandler('lightness')}
+          onMouseUp={() => rangeMouseUpHandler(StyleKeyName.lightness)}
         />
       </LightnessWrapper>
     </div>
diff --git a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
index f4f541a..fb4635b 100644
--- a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import styled from '../../../utils/styles/styled';
 import { Range } from '../SidebarContentFewer/DepthItem';
 import useInputRange from '../../../hooks/common/useInputRange';
+import { StyleKeyName } from '../../../store/common/type';
 
 const SaturationWrapper = styled.div`
   display: flex;
@@ -22,7 +23,7 @@ const SaturationControlBar = styled(Range)`
 `;
 
 interface SaturationStyleProps {
-  saturation: number;
+  saturation: string;
   onStyleChange: (key: string, value: string | number) => void;
 }
 
@@ -46,7 +47,7 @@ function SaturationStyle({
         id="styler__saturation"
         value={curRange}
         onChange={(e) => rangeChangeHandler(e)}
-        onMouseUp={() => rangeMouseUpHandler('saturation')}
+        onMouseUp={() => rangeMouseUpHandler(StyleKeyName.saturation)}
       />
     </SaturationWrapper>
   );
diff --git a/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx b/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
index 3ae1adb..87bdb54 100644
--- a/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
+import { StyleKeyName } from '../../../store/common/type';
 
 interface CheckedProp {
   checked: boolean;
@@ -65,7 +66,7 @@ function VisibilityStyle({
       {list.map((item) => (
         <VisibilityItem
           key={item.value}
-          onClick={() => onStyleChange('visibility', item.value)}
+          onClick={() => onStyleChange(StyleKeyName.visibility, item.value)}
         >
           <Checkbox checked={visibility === item.value}>
             <Circle checked={visibility === item.value} />
diff --git a/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx b/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
index dc66cf8..762c537 100644
--- a/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import styled from '../../../utils/styles/styled';
 import { Range } from '../SidebarContentFewer/DepthItem';
 import useInputRange from '../../../hooks/common/useInputRange';
+import { StyleKeyName } from '../../../store/common/type';
 
 const WeightWrapper = styled.div`
   display: flex;
@@ -22,7 +23,7 @@ const WeightControlBar = styled(Range)`
 `;
 
 interface WeightStyleProps {
-  weight: number;
+  weight: string;
   onStyleChange: (key: string, value: string | number) => void;
 }
 
@@ -46,7 +47,7 @@ function WeightStyle({
         id="styler__weight"
         value={curRange}
         onChange={rangeChangeHandler}
-        onMouseUp={() => rangeMouseUpHandler('weight')}
+        onMouseUp={() => rangeMouseUpHandler(StyleKeyName.weight)}
       />
     </WeightWrapper>
   );

From 21eebab4d1b71266e4c9bda41f6bcdc5ed924828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 11:15:06 +0900
Subject: [PATCH 039/138] =?UTF-8?q?[refactor]=20enum=EC=9D=84=20=EC=9D=B4?=
 =?UTF-8?q?=EC=9A=A9=ED=95=B4=EC=84=9C=20=EB=A7=A4=EC=A7=81=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=EB=A7=81=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=EB=AA=85=20=EB=AA=85=EC=8B=9C=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- enum을 이용해서 매직스트링을 제거하고 명시적으로 표기
- 기존 변수명들 중 명시적이지않은 부분을 변경
---
 src/hooks/sidebar/useStyleType.ts |  3 ++-
 src/store/map/initializeMap.ts    | 20 +++++++++++++-------
 src/store/style/compareStyle.ts   |  5 ++---
 src/store/style/getReducer.ts     |  3 ++-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index 04ef08e..cc76e8a 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -7,6 +7,7 @@ import {
   StyleType,
   ElementNameType,
   SubElementNameType,
+  ElementName,
 } from '../../store/common/type';
 import { setStyle } from '../../store/style/action';
 import { getDefaultStyle } from '../../store/style/properties';
@@ -38,7 +39,7 @@ function useStyleType({
       return getDefaultStyle();
     }
     const feature = state[featureName][subFeatureName];
-    if (detailName === 'labelIcon') return feature[detailName];
+    if (detailName === ElementName.labelIcon) return feature[detailName];
     return feature[detailName][subDetailName as SubElementNameType];
   }) as StyleType;
 
diff --git a/src/store/map/initializeMap.ts b/src/store/map/initializeMap.ts
index 9ff6611..fcdbcfa 100644
--- a/src/store/map/initializeMap.ts
+++ b/src/store/map/initializeMap.ts
@@ -13,7 +13,7 @@ import mapboxPOI from './layers/mapbox-poi';
 const LNG = 126.978;
 const LAT = 37.5656;
 const ZOOM = 15.5;
-const LABELS = [
+const LABEL_LAYERS: string[] = [
   'country-label',
   'settlement-label',
   'road-label',
@@ -28,6 +28,12 @@ const LABELS = [
   'natural-line-label',
 ];
 
+enum Sources {
+  polygon = 'polygon_source',
+  line = 'line_source',
+  poi = 'poi_source',
+}
+
 dotenv.config();
 mapboxgl.accessToken = process.env.REACT_APP_ACCESS_TOKEN as string;
 
@@ -36,7 +42,7 @@ interface InitializeMapProps {
 }
 
 function translate(map: mapboxgl.Map) {
-  LABELS.forEach((label) => {
+  LABEL_LAYERS.forEach((label) => {
     map.setLayoutProperty(label, 'text-field', ['get', 'name_ko']);
   });
 }
@@ -63,26 +69,26 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
     translate(map);
     map.removeLayer('poi-label');
 
-    map.addSource('polygon_source', {
+    map.addSource(Sources.polygon, {
       type: 'vector',
       tiles: ['http://110.93.147.18:8080/boostcamp/polygon/{x}/{y}/{z}'],
     });
-    map.addSource('line_source', {
+    map.addSource(Sources.line, {
       type: 'vector',
       tiles: ['http://110.93.147.18:8080/boostcamp/line/{x}/{y}/{z}'],
     });
-    map.addSource('poi_source', {
+    map.addSource(Sources.poi, {
       type: 'vector',
       tiles: ['http:/110.93.147.18:8080/boostcamp/poi/{x}/{y}/{z}'],
     });
 
     const layers = [
-      ...mapboxPOI,
       ...road,
       ...transit,
-      ...poi,
       ...water,
       ...landscape,
+      ...mapboxPOI,
+      ...poi,
     ] as mapboxgl.Layer[];
     layers.forEach((layer: mapboxgl.Layer) => map.addLayer(layer));
   });
diff --git a/src/store/style/compareStyle.ts b/src/store/style/compareStyle.ts
index b1587cc..88459d7 100644
--- a/src/store/style/compareStyle.ts
+++ b/src/store/style/compareStyle.ts
@@ -1,5 +1,5 @@
 import { getDefaultStyle } from './properties';
-import { StyleType, StyleKeyType, objType } from '../common/type';
+import { StyleType, StyleKeyType, objType, StyleKeyName } from '../common/type';
 
 export function checkStyleIsChanged(targetStyle: StyleType): boolean {
   const defaultStyle: StyleType = getDefaultStyle();
@@ -7,8 +7,7 @@ export function checkStyleIsChanged(targetStyle: StyleType): boolean {
 
   const filteredKeys = keys.filter(
     (key) =>
-      key === 'isChanged' ||
-      String(defaultStyle[key]) === String(targetStyle[key])
+      key === StyleKeyName.isChanged || defaultStyle[key] === targetStyle[key]
   );
   return keys.length !== filteredKeys.length;
 }
diff --git a/src/store/style/getReducer.ts b/src/store/style/getReducer.ts
index 7fcde3e..e28724a 100644
--- a/src/store/style/getReducer.ts
+++ b/src/store/style/getReducer.ts
@@ -6,6 +6,7 @@ import {
   ActionType,
   SubElementNameType,
   objType,
+  ElementName,
 } from '../common/type';
 import { getDefaultFeature } from './properties';
 import { INIT, SET } from './action';
@@ -49,7 +50,7 @@ export default function getReducer(IDX: number): ReducerType {
         const newFeature: FeatureType = newState[subFeature as string];
 
         let prevIsChanged;
-        if (element === 'labelIcon') {
+        if (element === ElementName.labelIcon) {
           prevIsChanged = newFeature[element].isChanged;
           newFeature[element] = style;
         } else {

From 1056cd91d713931bf9cd947004458c95e644c145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 11:16:04 +0900
Subject: [PATCH 040/138] =?UTF-8?q?[refactor]=20map=EC=9D=98=20naver=20lay?=
 =?UTF-8?q?er=EB=93=A4=20=EC=A4=91=20=EC=88=98=EC=A0=95=EC=9D=B4=20?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=9C=20=EB=B6=80=EB=B6=84=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- naver layer들중에서 변수명이 겹치거나 선언이 잘못되어 있는 부분 수정
---
 src/store/map/layers/poi.ts     |  2 +-
 src/store/map/layers/transit.ts | 18 ++----------------
 src/store/map/layers/water.ts   | 24 ++++++++++++------------
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/store/map/layers/poi.ts b/src/store/map/layers/poi.ts
index 5c5b6d2..032a646 100644
--- a/src/store/map/layers/poi.ts
+++ b/src/store/map/layers/poi.ts
@@ -309,7 +309,7 @@ export default [
     paint: {
       'text-color': 'green',
     },
-    filter: ['match', ['get', 'type'], 'place_of_worship'],
+    filter: ['match', ['get', 'type'], ['place_of_worship'], true, false],
     id: 'poi-worship',
   },
   {
diff --git a/src/store/map/layers/transit.ts b/src/store/map/layers/transit.ts
index 72b9cd8..7828095 100644
--- a/src/store/map/layers/transit.ts
+++ b/src/store/map/layers/transit.ts
@@ -12,20 +12,6 @@ export default [
     filter: ['==', ['get', 'type'], 'subway'],
     id: 'transit-subway',
   },
-  {
-    type: 'symbol',
-    source: 'poi_source',
-    'source-layer': 'poi',
-    layout: {
-      'text-field': ['get', 'name'],
-      visibility: 'visible',
-    },
-    paint: {
-      'text-color': 'green',
-    },
-    filter: ['==', ['get', 'type'], 'taxi'],
-    id: 'transit-bus',
-  },
   {
     type: 'line',
     source: 'line_source',
@@ -48,9 +34,9 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'text-color': 'pink',
+      'text-color': 'green',
     },
-    filter: ['match', ['get', 'type'], ['taxi'], true, false],
+    filter: ['==', ['get', 'type'], 'taxi'],
     id: 'transit-bus',
   },
 ];
diff --git a/src/store/map/layers/water.ts b/src/store/map/layers/water.ts
index 3e8ad46..a4d6b9f 100644
--- a/src/store/map/layers/water.ts
+++ b/src/store/map/layers/water.ts
@@ -1,29 +1,29 @@
 export default [
   {
-    type: 'line',
-    source: 'line_source',
-    'source-layer': 'line',
+    type: 'fill',
+    source: 'polygon_source',
+    'source-layer': 'polygon',
     layout: {
       visibility: 'visible',
     },
     paint: {
-      'line-color': 'blue',
+      'fill-color': '#000000',
+      'fill-opacity': 0.5,
     },
-    filter: ['match', ['get', 'type'], ['river', 'stream'], true, false],
-    id: 'water-section',
+    filter: ['==', ['get', 'type'], 'water'],
+    id: 'water-polygon',
   },
   {
-    type: 'fill',
-    source: 'polygon_source',
-    'source-layer': 'polygon',
+    type: 'line',
+    source: 'line_source',
+    'source-layer': 'line',
     layout: {
       visibility: 'visible',
     },
     paint: {
-      'fill-color': '#000000',
-      'fill-opacity': 0.5,
+      'line-color': 'blue',
     },
-    filter: ['==', ['get', 'type'], 'water'],
+    filter: ['match', ['get', 'type'], ['river', 'stream'], true, false],
     id: 'water-line',
   },
 ];

From 78ce2888493fe17039a005fde387c90e371f0744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 11:16:46 +0900
Subject: [PATCH 041/138] =?UTF-8?q?[refactor]=20type=EB=93=A4=EC=A4=91?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20enum=EC=9C=BC=EB=A1=9C=20=EC=9E=AC?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=84=B1=EC=9D=84=20=EB=86=92=EC=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- type들중 enum으로 다른곳에서 활용 가능한 부분들을 묶음
---
 src/store/common/type.ts      | 63 ++++++++++++++++++++++-------------
 src/store/style/properties.ts |  6 ++--
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index 3e65f44..d2e169d 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -1,27 +1,42 @@
 import { init, setStyle } from '../style/action';
 
-export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
-export type ElementNameType = 'section' | 'labelText' | 'labelIcon';
-export type SubElementNameType = 'fill' | 'stroke';
-
-export type FeatureNameType =
-  | 'poi'
-  | 'administrative'
-  | 'landscape'
-  | 'road'
-  | 'transit'
-  | 'water'
-  | 'marker';
-
-export type StyleKeyType =
-  | 'visibility'
-  | 'color'
-  | 'weight'
-  | 'saturation'
-  | 'lightness'
-  | 'isChanged';
+export enum ElementName {
+  section = 'section',
+  labelText = 'labelText',
+  labelIcon = 'labelIcon',
+}
+
+export enum SubElementName {
+  fill = 'fill',
+  stroke = 'stroke',
+}
+
+export enum StyleKeyName {
+  visibility = 'visibility',
+  color = 'color',
+  weight = 'weight',
+  saturation = 'saturation',
+  lightness = 'lightness',
+  isChanged = 'isChanged',
+}
+
+export enum FeatureName {
+  poi = 'poi',
+  administrative = 'administrative',
+  landscape = 'landscape',
+  road = 'road',
+  transit = 'transit',
+  water = 'water',
+  marker = 'marker',
+}
+
+export type ElementNameType = keyof typeof ElementName;
+export type SubElementNameType = keyof typeof SubElementName;
+export type FeatureNameType = keyof typeof FeatureName;
+export type StyleKeyType = keyof typeof StyleKeyName;
 
 export interface objType {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [name: string]: any;
 }
 
@@ -29,9 +44,9 @@ export interface StyleType {
   isChanged: boolean;
   visibility: string;
   color: string;
-  weight: number;
-  saturation: number;
-  lightness: number;
+  weight: string;
+  saturation: string;
+  lightness: string;
 }
 export interface ElementType {
   fill: StyleType;
@@ -47,6 +62,8 @@ export interface FeatureState {
   [name: string]: FeatureType;
 }
 
+export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
+
 export type ActionPayload = {
   feature: FeatureNameType;
   subFeature?: string;
diff --git a/src/store/style/properties.ts b/src/store/style/properties.ts
index 83b0051..b1b3661 100644
--- a/src/store/style/properties.ts
+++ b/src/store/style/properties.ts
@@ -4,9 +4,9 @@ const style: StyleType = {
   isChanged: false,
   visibility: 'inherit',
   color: '#55bf40',
-  weight: 0,
-  saturation: 0,
-  lightness: 0,
+  weight: '0',
+  saturation: '0',
+  lightness: '0',
 };
 
 export const getDefaultStyle = (): StyleType => {

From 3ad1ea025eb370ae386411241641909e47f2ae81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 12:13:55 +0900
Subject: [PATCH 042/138] =?UTF-8?q?[refactor]=20poi=20layer=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20polygon=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- poi layer에서 polygon속성을 제거 후 landscape의 building레이어에 포함시켰다
---
 src/store/map/layers/landscape.ts |  33 +++++-
 src/store/map/layers/poi.ts       | 171 ------------------------------
 src/store/map/layers/water.ts     |   2 +-
 3 files changed, 32 insertions(+), 174 deletions(-)

diff --git a/src/store/map/layers/landscape.ts b/src/store/map/layers/landscape.ts
index 376db32..f9a9724 100644
--- a/src/store/map/layers/landscape.ts
+++ b/src/store/map/layers/landscape.ts
@@ -37,6 +37,8 @@ export default [
       'footway',
       'pedestrian',
       'parking',
+      'fountain',
+      'gate',
     ],
   },
   {
@@ -47,10 +49,25 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'fill-color': 'black',
+      'fill-color': 'skyblue',
       'fill-opacity': 0.5,
     },
-    filter: ['in', 'type', 'retail', 'commercial'],
+    filter: [
+      'match',
+      ['get', 'type'],
+      [
+        'restaurant',
+        'cafe',
+        'marketplace',
+        'fast_food',
+        'bar',
+        'pub',
+        'casino',
+        'cinema',
+      ],
+      true,
+      false,
+    ],
     id: 'landscape-commercial',
   },
   {
@@ -98,6 +115,18 @@ export default [
       'public_bath',
       'community_centre',
       'theatre',
+      'fire_station',
+      'post_office',
+      'police',
+      'townhall',
+      'public',
+      'college',
+      'language_school',
+      'arts_centre',
+      'palace',
+      'toilets',
+      'social_facility',
+      '',
     ],
     id: 'landscape-building',
   },
diff --git a/src/store/map/layers/poi.ts b/src/store/map/layers/poi.ts
index 032a646..7afc001 100644
--- a/src/store/map/layers/poi.ts
+++ b/src/store/map/layers/poi.ts
@@ -1,175 +1,4 @@
 export default [
-  // POI - polygon start
-  {
-    type: 'fill',
-    source: 'polygon_source',
-    'source-layer': 'polygon',
-    layout: {
-      visibility: 'visible',
-    },
-    paint: {
-      'fill-color': 'skyblue',
-      'fill-opacity': 0.5,
-    },
-    filter: [
-      'match',
-      ['get', 'type'],
-      ['arts_centre', 'fountain', 'gate', 'palace', 'chungmoo art hall'],
-      true,
-      false,
-    ],
-    id: 'poi-attraction-polygon',
-  },
-  {
-    type: 'fill',
-    source: 'polygon_source',
-    'source-layer': 'polygon',
-    layout: {
-      visibility: 'visible',
-    },
-    paint: {
-      'fill-color': 'skyblue',
-      'fill-opacity': 0.5,
-    },
-    filter: [
-      'match',
-      ['get', 'type'],
-      [
-        'restaurant',
-        'cafe',
-        'marketplace',
-        'fast_food',
-        'bar',
-        'pub',
-        'casino',
-        'cinema',
-        '',
-      ],
-      true,
-      false,
-    ],
-    id: 'poi-business-polygon',
-  },
-  {
-    type: 'fill',
-    source: 'polygon_source',
-    'source-layer': 'polygon',
-    layout: {
-      visibility: 'visible',
-    },
-    paint: {
-      'fill-color': 'skyblue',
-      'fill-opacity': 0.5,
-    },
-    filter: [
-      'match',
-      ['get', 'type'],
-      [
-        'fire_station',
-        'post_office',
-        'police',
-        'townhall',
-        'public',
-        'ranger_station',
-        'government',
-        'bunker',
-      ],
-      true,
-      false,
-    ],
-    id: 'poi-government-polygon',
-  },
-  {
-    type: 'fill',
-    source: 'polygon_source',
-    'source-layer': 'polygon',
-    layout: {
-      visibility: 'visible',
-    },
-    paint: {
-      'fill-color': 'lightgrey',
-      'fill-opacity': 0.5,
-    },
-    filter: ['match', ['get', 'type'], ['hospital', 'pharmacy'], true, false],
-    id: 'poi-medical-polygon',
-  },
-  {
-    type: 'fill',
-    source: 'polygon_source',
-    'source-layer': 'polygon',
-    layout: {
-      visibility: 'visible',
-    },
-    paint: {
-      'fill-color': 'red',
-      'fill-opacity': 0.5,
-    },
-    filter: [
-      'match',
-      ['get', 'type'],
-      ['place_of_worship', 'cathedral', 'chapel', 'church'],
-      true,
-      false,
-    ],
-    id: 'poi-worship-polygon',
-  },
-  {
-    type: 'fill',
-    source: 'polygon_source',
-    'source-layer': 'polygon',
-    layout: {
-      visibility: 'visible',
-    },
-    paint: {
-      'fill-color': 'brown',
-      'fill-opacity': 0.5,
-    },
-    filter: [
-      'in',
-      'type',
-      'college',
-      'university',
-      'language_school',
-      'school',
-      'kindergarten',
-    ],
-    id: 'poi-school-polygon',
-  },
-  {
-    type: 'fill',
-    source: 'polygon_source',
-    'source-layer': 'polygon',
-    layout: {
-      visibility: 'visible',
-    },
-    paint: {
-      'fill-color': 'lightgrey',
-      'fill-opacity': 0.5,
-    },
-    filter: [
-      'match',
-      ['get', 'type'],
-      ['toilets', 'social_facility', 'conference_centre'],
-      true,
-      false,
-    ],
-    id: 'poi-etc-polygon',
-  },
-  {
-    type: 'fill',
-    source: 'polygon_source',
-    'source-layer': 'polygon',
-    layout: {
-      visibility: 'visible',
-    },
-    paint: {
-      'fill-color': 'skyblue',
-      'fill-opacity': 0.5,
-    },
-    filter: ['match', ['get', 'type'], 'swimming_pool', true, false],
-    id: 'poi-sports-polygon',
-  },
-  // POI - polygon end
   {
     type: 'symbol',
     source: 'poi_source',
diff --git a/src/store/map/layers/water.ts b/src/store/map/layers/water.ts
index a4d6b9f..6b5642c 100644
--- a/src/store/map/layers/water.ts
+++ b/src/store/map/layers/water.ts
@@ -7,7 +7,7 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'fill-color': '#000000',
+      'fill-color': 'hsl(243, 57%, 50%)',
       'fill-opacity': 0.5,
     },
     filter: ['==', ['get', 'type'], 'water'],

From 6f36f5361e73a34316e9448a7fb7ed483392fd0a Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Tue, 1 Dec 2020 14:58:09 +0900
Subject: [PATCH 043/138] =?UTF-8?q?[fix]=20map-styling=EC=97=90=20?=
 =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20key=20=EC=A0=84=EB=8B=AC=EB=90=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- key를 통해 설정된 유형 구분하려고 함
- key의 타입을 StyleKeyName으로 지정
- 타입 지정에 따라 타입스크립트 관련 에러 발생했고, 해당 부분도 string에서 StyleKeyName으로 수정하였음
---
 src/components/Sidebar/SidebarContentMore/ColorStyle.tsx   | 2 +-
 .../Sidebar/SidebarContentMore/LightnessStyle.tsx          | 2 +-
 .../Sidebar/SidebarContentMore/SaturationStyle.tsx         | 2 +-
 .../Sidebar/SidebarContentMore/VisibilityStyle.tsx         | 2 +-
 src/components/Sidebar/SidebarContentMore/WeightStyle.tsx  | 2 +-
 src/hooks/common/useInputRange.ts                          | 7 ++++---
 src/hooks/sidebar/useStyleType.ts                          | 6 ++++--
 src/utils/map-styling/index.ts                             | 2 ++
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx b/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
index 3db1a54..6bba068 100644
--- a/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
@@ -30,7 +30,7 @@ const ColorPalette = styled.input`
 
 interface ColorStyleProps {
   color: string;
-  onStyleChange: (key: string, value: string | number) => void;
+  onStyleChange: (key: StyleKeyName, value: string | number) => void;
 }
 
 function ColorStyle({
diff --git a/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx b/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
index 155807e..28bc1d1 100644
--- a/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
@@ -24,7 +24,7 @@ const LightnessControlBar = styled(Range)`
 
 interface LightnessPropsInterface {
   lightness: string;
-  onStyleChange: (key: string, value: string | number) => void;
+  onStyleChange: (key: StyleKeyName, value: string | number) => void;
 }
 
 function LightnessStyle({
diff --git a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
index fb4635b..1f75552 100644
--- a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
@@ -24,7 +24,7 @@ const SaturationControlBar = styled(Range)`
 
 interface SaturationStyleProps {
   saturation: string;
-  onStyleChange: (key: string, value: string | number) => void;
+  onStyleChange: (key: StyleKeyName, value: string | number) => void;
 }
 
 function SaturationStyle({
diff --git a/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx b/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
index 87bdb54..9a5a186 100644
--- a/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
@@ -47,7 +47,7 @@ const Circle = styled.div<CheckedProp>`
 
 interface VisibilityStyleProps {
   visibility: string;
-  onStyleChange: (key: string, value: string | number) => void;
+  onStyleChange: (key: StyleKeyName, value: string | number) => void;
 }
 
 function VisibilityStyle({
diff --git a/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx b/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
index 762c537..b69c10d 100644
--- a/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
@@ -24,7 +24,7 @@ const WeightControlBar = styled(Range)`
 
 interface WeightStyleProps {
   weight: string;
-  onStyleChange: (key: string, value: string | number) => void;
+  onStyleChange: (key: StyleKeyName, value: string | number) => void;
 }
 
 function WeightStyle({
diff --git a/src/hooks/common/useInputRange.ts b/src/hooks/common/useInputRange.ts
index d82a72c..b3150e7 100644
--- a/src/hooks/common/useInputRange.ts
+++ b/src/hooks/common/useInputRange.ts
@@ -1,14 +1,15 @@
 import React, { useState, useEffect } from 'react';
+import { StyleKeyName } from '../../store/common/type';
 
 interface UseInputRangeProps {
   range: string | number;
-  onStyleChange: (key: string, value: string | number) => void;
+  onStyleChange: (key: StyleKeyName, value: string | number) => void;
 }
 
 interface InputRangeHookType {
   curRange: string | number;
   rangeChangeHandler: (e: React.ChangeEvent<HTMLInputElement>) => void;
-  rangeMouseUpHandler: (key: string) => void;
+  rangeMouseUpHandler: (key: StyleKeyName) => void;
 }
 
 function useInputRange({
@@ -25,7 +26,7 @@ function useInputRange({
     setCurRange(e.target.value);
   };
 
-  const rangeMouseUpHandler = (key: string) => {
+  const rangeMouseUpHandler = (key: StyleKeyName) => {
     onStyleChange(key, curRange);
   };
 
diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index cc76e8a..ed13175 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -8,6 +8,7 @@ import {
   ElementNameType,
   SubElementNameType,
   ElementName,
+  StyleKeyName,
 } from '../../store/common/type';
 import { setStyle } from '../../store/style/action';
 import { getDefaultStyle } from '../../store/style/properties';
@@ -22,7 +23,7 @@ interface UseStyleTypeProps {
 
 export interface UseStyleHookType {
   styleElement: StyleType;
-  onStyleChange: (key: string, value: string | number) => void;
+  onStyleChange: (key: StyleKeyName, value: string | number) => void;
 }
 
 function useStyleType({
@@ -44,12 +45,13 @@ function useStyleType({
   }) as StyleType;
 
   const onStyleChange = useCallback(
-    (key: string, value: string | number) => {
+    (key: StyleKeyName, value: string | number) => {
       mapStyling[featureName]({
         map,
         subFeatureName,
         detailName,
         subDetailName: subDetailName as SubElementNameType,
+        key,
         style: {
           ...styleElement,
           [key]: value,
diff --git a/src/utils/map-styling/index.ts b/src/utils/map-styling/index.ts
index 59c7af9..2685a4d 100644
--- a/src/utils/map-styling/index.ts
+++ b/src/utils/map-styling/index.ts
@@ -2,6 +2,7 @@ import mapboxgl from 'mapbox-gl';
 import {
   ElementNameType,
   SubElementNameType,
+  StyleKeyName,
   StyleType,
 } from '../../store/common/type';
 
@@ -10,6 +11,7 @@ export interface stylingProps {
   subFeatureName: string;
   detailName: ElementNameType;
   subDetailName: SubElementNameType;
+  key: StyleKeyName;
   style: StyleType;
 }
 

From 30ccf3f65194d0c6cdf65a5e556a8f6f0894c251 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Tue, 1 Dec 2020 14:59:24 +0900
Subject: [PATCH 044/138] =?UTF-8?q?[refactor]=20Mapbox=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=86=8D=EC=84=B1=20enum=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A7=80=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 세부 스타일 조정할 때 반복해서 사용되므로 enum으로 설정하였음
---
 src/utils/applyStyle.ts | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index 940154e..fef28fd 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -1,8 +1,22 @@
 import mapboxgl from 'mapbox-gl';
 import { hexToHSL } from './colorFormat';
 
-type colorType = 'fill-color' | 'line-color' | 'text-color' | 'text-halo-color';
-type weightType = 'line-width' | 'text-halo-width' | 'text-size';
+export enum ColorTypeName {
+  'fill-color' = 'fill-color',
+  'line-color' = 'line-color',
+  'text-color' = 'text-color',
+  'text-halo-color' = 'text-halo-color',
+}
+
+export enum WeightTypeName {
+  'line-width' = 'line-width',
+  'text-size' = 'text-size',
+  'text-halo-width' = 'text-halo-width',
+}
+
+type colorType = keyof typeof ColorTypeName;
+
+type weightType = keyof typeof WeightTypeName;
 
 export function applyVisibility(
   map: mapboxgl.Map,

From 6eda66c27e6a4c22abc9003d085dafb604a3e6e5 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Tue, 1 Dec 2020 15:55:53 +0900
Subject: [PATCH 045/138] =?UTF-8?q?[fix]=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=ED=95=A8=EC=88=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 텍스트 사이즈 조정은 상의 후 제거
- mapbox 속성에 따라서 set 함수 달라서 조정함
- 색상/채도/명도 중복되는 요소 많아서 하나로 조정
---
 src/utils/applyStyle.ts | 90 ++++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 42 deletions(-)

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index fef28fd..d2cef38 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -10,7 +10,6 @@ export enum ColorTypeName {
 
 export enum WeightTypeName {
   'line-width' = 'line-width',
-  'text-size' = 'text-size',
   'text-halo-width' = 'text-halo-width',
 }
 
@@ -18,59 +17,66 @@ type colorType = keyof typeof ColorTypeName;
 
 type weightType = keyof typeof WeightTypeName;
 
+interface ApplyColorProps {
+  map: mapboxgl.Map;
+  layerNames: string[];
+  color: string;
+  type: colorType;
+  saturation?: number;
+  lightness?: number;
+}
+
 export function applyVisibility(
   map: mapboxgl.Map,
-  layerName: string,
+  layerNames: string[],
   visibility: string
 ): void {
-  map.setLayoutProperty(layerName, 'visibility', visibility);
+  layerNames.forEach((layerName) => {
+    map.setLayoutProperty(layerName, 'visibility', visibility);
+  });
 }
 
-export function applyColor(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string
-): void {
+export function applyColor({
+  map,
+  layerNames,
+  color,
+  type,
+  saturation,
+  lightness,
+}: ApplyColorProps): void {
   const { h, s, l } = hexToHSL(color);
-  map.setPaintProperty(layerName, type, `hsl(${h}, ${s}%, ${l}%)`);
+  if (saturation) {
+    layerNames.forEach((layerName) => {
+      map.setPaintProperty(
+        layerName,
+        type,
+        `hsl(${h}, ${50 + saturation / 2}%, ${l}%)`
+      );
+    });
+    return;
+  }
+  if (lightness) {
+    layerNames.forEach((layerName) => {
+      map.setPaintProperty(
+        layerName,
+        type,
+        `hsl(${h}, ${s}%, ${50 + lightness / 2}%)`
+      );
+    });
+    return;
+  }
+  layerNames.forEach((layerName) => {
+    map.setPaintProperty(layerName, type, `hsl(${h}, ${s}%, ${l}%)`);
+  });
 }
 
 export function applyWeight(
   map: mapboxgl.Map,
-  layerName: string,
+  layerNames: string[],
   type: weightType,
   weight: number
 ): void {
-  map.setPaintProperty(layerName, type, weight * 2 + 1);
-}
-
-export function applySaturation(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string,
-  saturation: number
-): void {
-  const { h, l } = hexToHSL(color);
-  map.setPaintProperty(
-    layerName,
-    type,
-    `hsl(${h}, ${50 + saturation / 2}%, ${l}%)`
-  );
-}
-
-export function applyLightness(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string,
-  lightness: number
-): void {
-  const { h, s } = hexToHSL(color);
-  map.setPaintProperty(
-    layerName,
-    type,
-    `hsl(${h}, ${s}%, ${50 + lightness / 2}%)`
-  );
+  layerNames.forEach((layerName) => {
+    map.setPaintProperty(layerName, type, weight * 2 + 1);
+  });
 }

From de83978c7281a4a375fa64cc08e319a0b5e69b78 Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Tue, 1 Dec 2020 17:04:35 +0900
Subject: [PATCH 046/138] =?UTF-8?q?[fix]=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=ED=98=95=EC=8B=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 스타일 적용시 key값을 넘겨주는 것을 추가
---
 src/hooks/sidebar/useStyleType.ts | 1 +
 src/utils/map-styling/index.ts    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index cc76e8a..2227745 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -49,6 +49,7 @@ function useStyleType({
         map,
         subFeatureName,
         detailName,
+        key,
         subDetailName: subDetailName as SubElementNameType,
         style: {
           ...styleElement,
diff --git a/src/utils/map-styling/index.ts b/src/utils/map-styling/index.ts
index 59c7af9..9e203c1 100644
--- a/src/utils/map-styling/index.ts
+++ b/src/utils/map-styling/index.ts
@@ -9,6 +9,7 @@ export interface stylingProps {
   map: mapboxgl.Map;
   subFeatureName: string;
   detailName: ElementNameType;
+  key: string;
   subDetailName: SubElementNameType;
   style: StyleType;
 }

From c6f5695462bf3286d3aad16e3cfa32b6ff7ec67d Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Tue, 1 Dec 2020 17:05:36 +0900
Subject: [PATCH 047/138] =?UTF-8?q?[fix]=20applyColor=20=ED=98=95=EC=8B=9D?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- applyColor를 color, saturation, lightness 모두 변경가능하도록 수정
---
 src/utils/applyStyle.ts | 108 ++++++++++++++++++++++++----------------
 1 file changed, 64 insertions(+), 44 deletions(-)

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index 940154e..d362acf 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -1,62 +1,82 @@
 import mapboxgl from 'mapbox-gl';
 import { hexToHSL } from './colorFormat';
 
-type colorType = 'fill-color' | 'line-color' | 'text-color' | 'text-halo-color';
-type weightType = 'line-width' | 'text-halo-width' | 'text-size';
+export enum ColorTypeName {
+  'fill-color' = 'fill-color',
+  'line-color' = 'line-color',
+  'text-color' = 'text-color',
+  'text-halo-color' = 'text-halo-color',
+}
+
+export enum WeightTypeName {
+  'line-width' = 'line-width',
+  'text-size' = 'text-size',
+  'text-halo-width' = 'text-halo-width',
+}
+
+type colorType = keyof typeof ColorTypeName;
+type weightType = keyof typeof WeightTypeName;
+
+interface ApplyColorProps {
+  map: mapboxgl.Map;
+  layerNames: string[];
+  color: string;
+  type: colorType;
+  saturation?: string;
+  lightness?: string;
+}
 
 export function applyVisibility(
   map: mapboxgl.Map,
-  layerName: string,
+  layerNames: string[],
   visibility: string
 ): void {
-  map.setLayoutProperty(layerName, 'visibility', visibility);
+  layerNames.forEach((layerName) => {
+    if (visibility === 'inherit') {
+      map.setLayoutProperty(layerName, 'visibility', 'visible');
+    } else map.setLayoutProperty(layerName, 'visibility', visibility);
+  });
 }
 
-export function applyColor(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string
-): void {
+export function applyColor({
+  map,
+  layerNames,
+  color,
+  type,
+  saturation,
+  lightness,
+}: ApplyColorProps): void {
   const { h, s, l } = hexToHSL(color);
-  map.setPaintProperty(layerName, type, `hsl(${h}, ${s}%, ${l}%)`);
+  if (saturation) {
+    return layerNames.forEach((layerName) => {
+      map.setPaintProperty(
+        layerName,
+        type,
+        `hsl(${h}, ${50 + parseInt(saturation, 10) / 2}%, ${l}%)`
+      );
+    });
+  }
+  if (lightness) {
+    return layerNames.forEach((layerName) => {
+      map.setPaintProperty(
+        layerName,
+        type,
+        `hsl(${h}, ${s}%, ${50 + parseInt(lightness, 10) / 2}%)`
+      );
+    });
+  }
+  return layerNames.forEach((layerName) => {
+    map.setPaintProperty(layerName, type, `hsl(${h}, ${s}%, ${l}%)`);
+  });
 }
 
 export function applyWeight(
   map: mapboxgl.Map,
-  layerName: string,
+  layerNames: string[],
   type: weightType,
-  weight: number
-): void {
-  map.setPaintProperty(layerName, type, weight * 2 + 1);
-}
-
-export function applySaturation(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string,
-  saturation: number
-): void {
-  const { h, l } = hexToHSL(color);
-  map.setPaintProperty(
-    layerName,
-    type,
-    `hsl(${h}, ${50 + saturation / 2}%, ${l}%)`
-  );
-}
-
-export function applyLightness(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string,
-  lightness: number
+  weight: string
 ): void {
-  const { h, s } = hexToHSL(color);
-  map.setPaintProperty(
-    layerName,
-    type,
-    `hsl(${h}, ${s}%, ${50 + lightness / 2}%)`
-  );
+  layerNames.forEach((layerName) => {
+    map.setPaintProperty(layerName, type, parseInt(weight, 10) * 2 + 1);
+  });
 }

From 6ab2c818fed32bfa1d1dbaab9aa34dd9db778f5d Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Tue, 1 Dec 2020 17:06:32 +0900
Subject: [PATCH 048/138] =?UTF-8?q?[feat]=20[#81]=20=EC=A3=BC=EC=9A=94?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9C=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 주요도로 스타일 적용기능 추가
- inherit visibility는 아직 visible로만 처리
- line section fill or stroke에 대한 것은 동일하게 취급
---
 src/utils/map-styling/road.ts | 98 ++++++++++++++++++++++++++++++++++-
 1 file changed, 97 insertions(+), 1 deletion(-)

diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
index 85c72af..f95b92e 100644
--- a/src/utils/map-styling/road.ts
+++ b/src/utils/map-styling/road.ts
@@ -1,13 +1,109 @@
 import { stylingProps } from '.';
+import { applyVisibility, applyColor, applyWeight } from '../applyStyle';
+
+type KeyType = 'visibility' | 'color' | 'weight' | 'saturation' | 'lightness';
 
 function roadStyling({
   map,
   subFeatureName,
   detailName,
   subDetailName,
+  key,
   style,
 }: stylingProps): void {
-  console.log(1);
+  const { visibility, color, weight, saturation, lightness } = style;
+  const arterialLayerNames = [
+    'road-number-shield',
+    'road-exit-shield',
+    'road-label',
+    'road-arterial',
+  ];
+  const localLayerNames = ['ferry', 'ferry-auto', 'road-local'];
+  const sidewalkLayerNames = ['road-footway'];
+
+  /**
+   * visibility 가 바뀌는 것 우선은 여기에서 처리, inherit (visible 처리)
+   * color, saturation, lightness 한 함수로 처리
+   *   - section
+   *     - fill : line 'line-color', symbol, polygon 'fill-color'
+   *     - stroke : line 'case layer'의 색상, symbol 불변, polygon이면 불변
+   *   - label
+   *     - text fill: 'text-color', 'text-width'
+   *     - text stroke: 'text-halo-color', 'text-halo-width'
+   *
+   * cf. 채도와 밝기가 크게 달라지는 것 같지 않다.. line인 탓일까..?
+   */
+
+  /**
+   * highway : 분류 보류
+   * aterial: line이라 채우기 윤곽선은 한번에 처리, 채우기 윤곽선 확인완료, 아이콘 없음
+   * local
+   * sidewalk
+   */
+
+  if (subFeatureName === 'arterial') {
+    if (detailName === 'section' && key === 'visibility') {
+      applyVisibility(map, arterialLayerNames, visibility);
+    } else if (key === ('color' || 'saturation' || 'lightness')) {
+      if (detailName === 'section' && subDetailName === 'fill') {
+        applyColor({
+          map,
+          layerNames: ['road-arterial'],
+          color,
+          type: 'line-color',
+          saturation,
+          lightness,
+        });
+      } else if (detailName === 'labelText' && subDetailName === 'fill') {
+        applyColor({
+          map,
+          layerNames: ['road-number-shield', 'road-exit-shield', 'road-label'],
+          color,
+          type: 'text-color',
+          saturation,
+          lightness,
+        });
+      } else if (detailName === 'labelText' && subDetailName === 'stroke') {
+        applyColor({
+          map,
+          layerNames: ['road-label'],
+          color,
+          type: 'text-halo-color',
+          saturation,
+          lightness,
+        });
+      }
+    } else if (key === 'weight') {
+      if (detailName === 'section' && subDetailName === 'fill') {
+        applyWeight(map, ['road-arterial'], 'line-width', weight);
+      }
+      if (detailName === 'labelText' && subDetailName === 'stroke')
+        applyWeight(map, ['road-label'], 'text-halo-width', weight);
+    }
+  }
 }
 
+// if (subFeatureName === ('highway' || 'bicycle-road')) {
+//   /**
+//    * There is no highway layer and bicycle-road
+//    */
+// } else
+
+// else if (subFeatureName === 'local') {
+//   if (key === 'visibility') applyVisibility(map, localLayerNames, visibility);
+// } else if (subFeatureName === 'sidewalk') {
+//   // weight 관련 속성 없음
+//   if (key === 'visibility')
+//     applyVisibility(map, sidewalkLayerNames, visibility);
+//   if (key === ('color' || 'saturation' || 'lightness')) {
+//     applyColor({
+//       map,
+//       layerNames: sidewalkLayerNames,
+//       color,
+//       type: 'line-color',
+//       saturation,
+//       lightness,
+//     });
+//   }
+
 export default roadStyling;

From a5cb6eca0d1e785a9270ddeb8b3a0cd1b80db68e Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Tue, 1 Dec 2020 17:23:02 +0900
Subject: [PATCH 049/138] =?UTF-8?q?[feat]=20[#81]=20=EC=9D=BC=EB=B0=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9C=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20=EA=B0=80=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 일반도로 스타일 변경 가능
- 하지만 현재 존재하는 일반도로 레이어들이 section -> fill 관련 요소에만
의미있는 변경을 하는 데이터들
- 관련 데이터 추가 필요
---
 src/utils/map-styling/road.ts | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
index f95b92e..4c59070 100644
--- a/src/utils/map-styling/road.ts
+++ b/src/utils/map-styling/road.ts
@@ -35,9 +35,10 @@ function roadStyling({
    */
 
   /**
+   * 20.12.01.
    * highway : 분류 보류
    * aterial: line이라 채우기 윤곽선은 한번에 처리, 채우기 윤곽선 확인완료, 아이콘 없음
-   * local
+   * local: 지금 있는 것들은 section fill밖에 의미없음
    * sidewalk
    */
 
@@ -80,6 +81,28 @@ function roadStyling({
       if (detailName === 'labelText' && subDetailName === 'stroke')
         applyWeight(map, ['road-label'], 'text-halo-width', weight);
     }
+  } else if (subFeatureName === 'local') {
+    if (key === 'visibility') applyVisibility(map, localLayerNames, visibility);
+    else if (key === ('color' || 'saturation' || 'lightness')) {
+      if (detailName === 'section' && subDetailName === 'fill') {
+        applyColor({
+          map,
+          layerNames: ['ferry', 'ferry-auto', 'road-local'],
+          color,
+          type: 'line-color',
+          saturation,
+          lightness,
+        });
+      }
+    } else if (key === 'weight') {
+      if (detailName === 'section' && subDetailName === 'fill')
+        applyWeight(
+          map,
+          ['ferry', 'ferry-auto', 'road-local'],
+          'line-width',
+          weight
+        );
+    }
   }
 }
 

From 4383336f729a69c3a8e07a6b96a3ca2cef4e07cc Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Tue, 1 Dec 2020 19:34:52 +0900
Subject: [PATCH 050/138] =?UTF-8?q?[fix]=20=EC=8A=A4=ED=83=80=EC=9D=BC=20w?=
 =?UTF-8?q?eight=20=EC=86=8D=EC=84=B1=EA=B0=92=200=20=EC=98=88=EC=99=B8?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 0인 경우에는 보이지 않도록 수정 하였음
---
 src/utils/applyStyle.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index d2cef38..7f56716 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -76,7 +76,8 @@ export function applyWeight(
   type: weightType,
   weight: number
 ): void {
+  const weightValue = weight === 0 ? 0 : weight * 2 + 1;
   layerNames.forEach((layerName) => {
-    map.setPaintProperty(layerName, type, weight * 2 + 1);
+    map.setPaintProperty(layerName, type, weightValue);
   });
 }

From b2c986154d608a3fb1567ea88b4a0d1e8abd2b7e Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Tue, 1 Dec 2020 19:38:26 +0900
Subject: [PATCH 051/138] =?UTF-8?q?[fix]=20=EB=9E=9C=EB=8D=94=EB=A7=81=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- water way 지도상에 표시되지 않는 요소로 불필요해서 제거함
- 우리나라의 경우 맵박스는 시/구/동 구분이 되지 않아서 그외로 통합함
---
 src/store/map/layers/water.ts               | 13 -------------
 src/utils/rendering-data/featureTypeData.ts |  7 +++----
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/store/map/layers/water.ts b/src/store/map/layers/water.ts
index 6b5642c..9a5d5f4 100644
--- a/src/store/map/layers/water.ts
+++ b/src/store/map/layers/water.ts
@@ -13,17 +13,4 @@ export default [
     filter: ['==', ['get', 'type'], 'water'],
     id: 'water-polygon',
   },
-  {
-    type: 'line',
-    source: 'line_source',
-    'source-layer': 'line',
-    layout: {
-      visibility: 'visible',
-    },
-    paint: {
-      'line-color': 'blue',
-    },
-    filter: ['match', ['get', 'type'], ['river', 'stream'], true, false],
-    id: 'water-line',
-  },
 ];
diff --git a/src/utils/rendering-data/featureTypeData.ts b/src/utils/rendering-data/featureTypeData.ts
index 51893c5..747c971 100644
--- a/src/utils/rendering-data/featureTypeData.ts
+++ b/src/utils/rendering-data/featureTypeData.ts
@@ -41,10 +41,9 @@ const data: DataType[] = [
     typeKey: 'administrative',
     typeName: '행정구역',
     features: [
-      { key: 'countryLabel', name: '국가' },
-      { key: 'stateLabel', name: '도/주' },
-      { key: 'localityLabel', name: '시' },
-      { key: 'neighborLabel', name: '그외' },
+      { key: 'country', name: '국가' },
+      { key: 'state', name: '도/주' },
+      { key: 'locality', name: '그외' },
     ],
   },
   {

From 18bd08f076dd5efdae89be6204b7466204d3a99d Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Tue, 1 Dec 2020 19:45:30 +0900
Subject: [PATCH 052/138] =?UTF-8?q?[feat]=20=EB=AC=BC=20=EC=8A=A4=ED=83=80?=
 =?UTF-8?q?=EC=9D=BC=20=EC=84=A4=EC=A0=95=20=ED=95=A8=EC=88=98=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 물 구역-윤곽선, 라벨아이콘 포함되지 않음
---
 src/utils/map-styling/water.ts | 82 +++++++++++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 2 deletions(-)

diff --git a/src/utils/map-styling/water.ts b/src/utils/map-styling/water.ts
index e13fa2d..2261cb5 100644
--- a/src/utils/map-styling/water.ts
+++ b/src/utils/map-styling/water.ts
@@ -1,13 +1,91 @@
 import { stylingProps } from '.';
+import {
+  ElementName,
+  SubElementName,
+  StyleKeyName,
+} from '../../store/common/type';
+import {
+  ColorTypeName,
+  WeightTypeName,
+  applyVisibility,
+  applyColor,
+  applyWeight,
+} from '../applyStyle';
+
+const layers = {
+  polygon: ['water-polygon', 'water'],
+  symbol: ['water-line-label', 'water-point-label', 'waterway-label'],
+};
 
 function waterStyling({
   map,
-  subFeatureName,
   detailName,
   subDetailName,
+  key,
   style,
 }: stylingProps): void {
-  console.log(1);
+  if (detailName === ElementName.labelIcon) return;
+
+  if (detailName === ElementName.labelText) {
+    // labelText - fill
+    if (subDetailName === SubElementName.fill) {
+      if (key === StyleKeyName.weight) return;
+      if (key === StyleKeyName.visibility) {
+        const styleValue = style[key] === 'none' ? 'none' : 'visible';
+        applyVisibility(map, layers.symbol, styleValue);
+        return;
+      }
+
+      applyColor({
+        map,
+        layerNames: layers.symbol,
+        type: ColorTypeName['text-color'],
+        color: style.color,
+        [key]: style[key],
+      });
+      return;
+    }
+
+    // labelText - stroke
+    if (key === StyleKeyName.weight || key === StyleKeyName.visibility) {
+      const styleValue = style.visibility === 'none' ? 0 : Number(style.weight);
+      applyWeight(
+        map,
+        layers.symbol,
+        WeightTypeName['text-halo-width'],
+        styleValue
+      );
+      return;
+    }
+
+    applyColor({
+      map,
+      layerNames: layers.symbol,
+      type: ColorTypeName['text-halo-color'],
+      color: style.color,
+      [key]: style[key],
+    });
+    return;
+  }
+
+  // section - stroke
+  if (subDetailName === SubElementName.stroke || key === StyleKeyName.weight)
+    return;
+
+  // section - fill
+  if (key === StyleKeyName.visibility) {
+    const styleValue = style[key] === 'none' ? 'none' : 'visible';
+    applyVisibility(map, layers.polygon, styleValue);
+    return;
+  }
+
+  applyColor({
+    map,
+    layerNames: layers.polygon,
+    type: ColorTypeName['fill-color'],
+    color: style.color,
+    [key]: style[key],
+  });
 }
 
 export default waterStyling;

From 23bb6955b626fc4c6f5d07d0444defe08e8aa9b8 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Tue, 1 Dec 2020 19:47:13 +0900
Subject: [PATCH 053/138] =?UTF-8?q?[feat]=20=ED=96=89=EC=A0=95=EA=B5=AC?=
 =?UTF-8?q?=EC=97=AD=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=ED=95=A8=EC=88=98=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 은식님처럼 all도 묶어서 변수를 선언하였음
- 라벨아이콘, 구역 채우기 포함되지 않음
---
 src/utils/map-styling/administrative.ts | 124 +++++++++++++++++++++++-
 1 file changed, 122 insertions(+), 2 deletions(-)

diff --git a/src/utils/map-styling/administrative.ts b/src/utils/map-styling/administrative.ts
index 6032339..8bd318c 100644
--- a/src/utils/map-styling/administrative.ts
+++ b/src/utils/map-styling/administrative.ts
@@ -1,13 +1,133 @@
-import { stylingProps } from './index';
+import { stylingProps } from '.';
+import {
+  ElementName,
+  SubElementName,
+  StyleKeyName,
+} from '../../store/common/type';
+import {
+  ColorTypeName,
+  WeightTypeName,
+  applyVisibility,
+  applyColor,
+  applyWeight,
+} from '../applyStyle';
+
+type subFeatureNameType = 'country' | 'state' | 'locality' | 'all';
+
+const layers = {
+  country: {
+    line: [
+      'admin-0-boundary',
+      'admin-0-boundary-bg',
+      'admin-0-boundary-disputed',
+    ],
+    symbol: ['country-label'],
+  },
+  state: {
+    line: ['admin-1-boundary-bg', 'admin-1-boundary'],
+    symbol: ['state-label'],
+  },
+  locality: {
+    line: [],
+    symbol: ['settlement-label', 'settlement_subdivision-label'],
+  },
+  all: {
+    line: [
+      'admin-0-boundary',
+      'admin-0-boundary-bg',
+      'admin-0-boundary-disputed',
+      'admin-1-boundary-bg',
+      'admin-1-boundary',
+    ],
+    symbol: [
+      'country-label',
+      'settlement-label',
+      'settlement_subdivision-label',
+      'state-label',
+    ],
+  },
+};
 
 function administrativeStyling({
   map,
   subFeatureName,
   detailName,
   subDetailName,
+  key,
   style,
 }: stylingProps): void {
-  console.log(1);
+  const mappingLayers = layers[subFeatureName as subFeatureNameType];
+
+  if (detailName === ElementName.labelIcon) return;
+  if (detailName === ElementName.labelText) {
+    // labelText - fill
+    if (subDetailName === SubElementName.fill) {
+      if (key === StyleKeyName.weight) return;
+      if (key === StyleKeyName.visibility) {
+        const styleValue = style[key] === 'none' ? 'none' : 'visible';
+        applyVisibility(map, mappingLayers.symbol, styleValue);
+        return;
+      }
+
+      applyColor({
+        map,
+        layerNames: mappingLayers.symbol,
+        type: ColorTypeName['text-color'],
+        color: style.color,
+        [key]: style[key],
+      });
+      return;
+    }
+
+    // labelText - stroke
+    if (key === StyleKeyName.weight || key === StyleKeyName.visibility) {
+      const styleValue = style.visibility === 'none' ? 0 : Number(style.weight);
+      applyWeight(
+        map,
+        mappingLayers.symbol,
+        WeightTypeName['text-halo-width'],
+        styleValue
+      );
+      return;
+    }
+
+    applyColor({
+      map,
+      layerNames: mappingLayers.symbol,
+      type: ColorTypeName['text-halo-color'],
+      color: style.color,
+      [key]: style[key],
+    });
+    return;
+  }
+
+  // section - fill
+  if (
+    subFeatureName === 'locality' ||
+    subFeatureName === 'neighborhood' ||
+    subDetailName === SubElementName.fill
+  )
+    return;
+
+  // section - stroke
+  if (key === StyleKeyName.weight || key === StyleKeyName.visibility) {
+    const styleValue = style.visibility === 'none' ? 0 : Number(style.weight);
+    applyWeight(
+      map,
+      mappingLayers.line,
+      WeightTypeName['line-width'],
+      styleValue
+    );
+    return;
+  }
+
+  applyColor({
+    map,
+    layerNames: mappingLayers.line,
+    type: ColorTypeName['line-color'],
+    color: style.color,
+    [key]: style[key],
+  });
 }
 
 export default administrativeStyling;

From a5461956f9eb95dc88a4db8b68db42dbf5a92514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 21:22:48 +0900
Subject: [PATCH 054/138] =?UTF-8?q?[feat]=20=EB=A0=88=EC=9D=B4=EC=96=B4=20?=
 =?UTF-8?q?=EB=B3=84=EB=A1=9C=20=EC=83=89=EC=83=81=EC=9D=84=20=EC=A0=95?=
 =?UTF-8?q?=EB=A6=AC=ED=95=9C=20=ED=8C=8C=EC=9D=BC=EC=9D=84=20=EB=A7=8C?=
 =?UTF-8?q?=EB=93=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 맵박스와 네이버 레이어들의 색상입니다
- 일단 두가지 버전을 만들어놓고 채워나가면서 비교할 생각입니다.
---
 src/utils/rendering-data/layersColor.ts  | 49 ++++++++++++++++
 src/utils/rendering-data/layersColor2.ts | 72 ++++++++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 src/utils/rendering-data/layersColor.ts
 create mode 100644 src/utils/rendering-data/layersColor2.ts

diff --git a/src/utils/rendering-data/layersColor.ts b/src/utils/rendering-data/layersColor.ts
new file mode 100644
index 0000000..e364c19
--- /dev/null
+++ b/src/utils/rendering-data/layersColor.ts
@@ -0,0 +1,49 @@
+export default {
+  poi: {
+    landmark: {
+      'poi-attraction': 'hsl(26, 25%, 32%)',
+      'poi-arts-label': 'hsl(26, 25%, 32%)',
+      'poi-landmark-label': 'hsl(26, 25%, 32%)',
+    },
+    business: {
+      'poi-business': 'hsl(22, 55%, 55%)',
+      'poi-food-label': 'hsl(22, 55%, 55%)',
+      'poi-store-label': 'hsl(22, 55%, 55%)',
+    },
+    government: {
+      'poi-government': 'hsl(26, 25%, 32%)',
+      'poi-public-label': 'hsl(26, 25%, 32%)',
+      'poi-general-label': 'hsl(26, 25%, 32%)',
+    },
+    medical: {
+      'poi-medical': 'hsl(340, 39%, 42%)',
+      'poi-medical-label': 'hsl(340, 39%, 42%)',
+    },
+    park: {
+      'poi-park': 'hsl(100, 45%, 37%)',
+      'poi-park-label': 'hsl(100, 45%, 37%)',
+    },
+    worship: {
+      'poi-worship': 'hsl(26, 25%, 32%)',
+      'poi-religion-label': 'hsl(26, 25%, 32%)',
+    },
+    school: {
+      'poi-school': 'hsl(51, 40%, 40%)',
+      'poi-education-label': 'hsl(51, 40%, 40%)',
+    },
+    sports: {
+      'poi-sport-label': 'hsl(26, 25%, 32%)',
+    },
+    etc: {
+      'poi-etc': 'hsl(26, 25%, 32%)',
+      'poi-industrial': 'hsl(26, 25%, 32%)',
+      'poi-historic-label': 'hsl(26, 25%, 32%)',
+      'poi-building-label': 'hsl(26, 25%, 32%)',
+    },
+  },
+  road: {},
+  administrative: {},
+  landscape: {},
+  transit: {},
+  water: {},
+};
diff --git a/src/utils/rendering-data/layersColor2.ts b/src/utils/rendering-data/layersColor2.ts
new file mode 100644
index 0000000..3cd4fee
--- /dev/null
+++ b/src/utils/rendering-data/layersColor2.ts
@@ -0,0 +1,72 @@
+export default {
+  poi: {
+    landmark: {
+      labelText: {
+        fill: 'hsl(26, 25%, 32%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
+    },
+    business: {
+      labelText: {
+        fill: 'hsl(22, 55%, 55%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
+    },
+    government: {
+      labelText: {
+        fill: 'hsl(26, 25%, 32%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
+    },
+    medical: {
+      labelText: {
+        fill: 'hsl(340, 39%, 42%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
+    },
+    park: {
+      labelText: {
+        fill: 'hsl(100, 45%, 37%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
+    },
+    worship: {
+      labelText: {
+        fill: 'hsl(26, 25%, 32%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
+    },
+    school: {
+      labelText: {
+        fill: 'hsl(51, 40%, 40%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
+    },
+    sports: {
+      labelText: {
+        fill: 'hsl(26, 25%, 32%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
+    },
+    etc: {
+      labelText: {
+        fill: 'hsl(26, 25%, 32%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
+    },
+  },
+  road: {},
+  administrative: {},
+  landscape: {},
+  transit: {},
+  water: {},
+};

From 564481710c5db3597f0ddf0462d11b99728b3f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 21:24:00 +0900
Subject: [PATCH 055/138] =?UTF-8?q?[refactor]=20poi=20/=20mapbox-poi?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=96=B4=EB=93=A4=EC=97=90=EA=B2=8C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=EC=A0=81=EC=9D=B8=20=EC=86=8D=EC=84=B1=20?=
 =?UTF-8?q?=EB=B6=80=EC=97=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- poi레이어에게 윤곽선값을 주었다
- mapbox-poi레이어에게 좀 더 다양한 정보를 주었다.
---
 src/store/map/layers/mapbox-poi.ts |  8 ++++--
 src/store/map/layers/poi.ts        | 46 +++++++++++++++++++++++++-----
 2 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/src/store/map/layers/mapbox-poi.ts b/src/store/map/layers/mapbox-poi.ts
index 5882534..bf0e0a5 100644
--- a/src/store/map/layers/mapbox-poi.ts
+++ b/src/store/map/layers/mapbox-poi.ts
@@ -8,6 +8,7 @@ const mapboxPoiNameAndColor = [
     color: 'hsl(26, 25%, 32%)',
     layerName: 'arts',
   },
+  { name: 'landmark', color: 'hsl(26, 25%, 32%)', layerName: 'landmark' },
   { name: 'building', color: 'hsl(26, 25%, 32%)', layerName: 'building' },
   { name: 'general', color: 'hsl(26, 25%, 32%)', layerName: 'general' },
   { name: 'historic', color: 'hsl(26, 25%, 32%)', layerName: 'historic' },
@@ -15,14 +16,15 @@ const mapboxPoiNameAndColor = [
   {
     name: 'public_facilities',
     color: 'hsl(26, 25%, 32%)',
-    layerName: 'public_facilities',
+    layerName: 'public',
   },
   { name: 'religion', color: 'hsl(26, 25%, 32%)', layerName: 'religion' },
-  { name: 'store_like', color: 'hsl(26, 25%, 32%)', layerName: 'store_like' },
+  { name: 'store_like', color: 'hsl(22, 55%, 55%)', layerName: 'store' },
+  { name: 'sport_and_leisure', color: 'hsl(26, 25%, 32%)', layerName: 'sport' },
 ];
 
 export default mapboxPoiNameAndColor.map((poi) => ({
-  id: `poi-${poi.name}-label`,
+  id: `poi-${poi.layerName}-label`,
   type: 'symbol',
   source: 'composite',
   'source-layer': 'poi_label',
diff --git a/src/store/map/layers/poi.ts b/src/store/map/layers/poi.ts
index 7afc001..a28026c 100644
--- a/src/store/map/layers/poi.ts
+++ b/src/store/map/layers/poi.ts
@@ -4,11 +4,15 @@ export default [
     source: 'poi_source',
     'source-layer': 'poi',
     layout: {
+      'text-size': 12,
       'text-field': ['get', 'name'],
       visibility: 'visible',
     },
     paint: {
-      'text-color': 'brown',
+      'text-halo-color': 'hsl(0, 0%, 100%)',
+      'text-halo-width': 0.5,
+      'text-halo-blur': 0.5,
+      'text-color': 'hsl(26, 25%, 32%)',
     },
     filter: [
       'match',
@@ -24,11 +28,15 @@ export default [
     source: 'poi_source',
     'source-layer': 'poi',
     layout: {
+      'text-size': 12,
       'text-field': ['get', 'name'],
       visibility: 'visible',
     },
     paint: {
-      'text-color': 'blue',
+      'text-halo-color': 'hsl(0, 0%, 100%)',
+      'text-halo-width': 0.5,
+      'text-halo-blur': 0.5,
+      'text-color': 'hsl(22, 55%, 55%)',
     },
     filter: [
       'match',
@@ -65,11 +73,15 @@ export default [
     source: 'poi_source',
     'source-layer': 'poi',
     layout: {
+      'text-size': 12,
       'text-field': ['get', 'name'],
       visibility: 'visible',
     },
     paint: {
-      'text-color': 'green',
+      'text-halo-color': 'hsl(0, 0%, 100%)',
+      'text-halo-width': 0.5,
+      'text-halo-blur': 0.5,
+      'text-color': 'hsl(26, 25%, 32%)',
     },
     filter: [
       'match',
@@ -92,11 +104,15 @@ export default [
     source: 'poi_source',
     'source-layer': 'poi',
     layout: {
+      'text-size': 12,
       'text-field': ['get', 'name'],
       visibility: 'visible',
     },
     paint: {
-      'text-color': 'green',
+      'text-halo-color': 'hsl(0, 0%, 100%)',
+      'text-halo-width': 0.5,
+      'text-halo-blur': 0.5,
+      'text-color': 'hsl(340, 39%, 42%)',
     },
     filter: [
       'match',
@@ -112,11 +128,15 @@ export default [
     source: 'poi_source',
     'source-layer': 'poi',
     layout: {
+      'text-size': 12,
       'text-field': ['get', 'name'],
       visibility: 'visible',
     },
     paint: {
-      'text-color': 'green',
+      'text-halo-color': 'hsl(0, 0%, 100%)',
+      'text-halo-width': 0.5,
+      'text-halo-blur': 0.5,
+      'text-color': 'hsl(100, 45%, 37%)',
     },
     filter: [
       'match',
@@ -132,11 +152,15 @@ export default [
     source: 'poi_source',
     'source-layer': 'poi',
     layout: {
+      'text-size': 12,
       'text-field': ['get', 'name'],
       visibility: 'visible',
     },
     paint: {
-      'text-color': 'green',
+      'text-halo-color': 'hsl(0, 0%, 100%)',
+      'text-halo-width': 0.5,
+      'text-halo-blur': 0.5,
+      'text-color': 'hsl(26, 25%, 32%)',
     },
     filter: ['match', ['get', 'type'], ['place_of_worship'], true, false],
     id: 'poi-worship',
@@ -146,11 +170,15 @@ export default [
     source: 'poi_source',
     'source-layer': 'poi',
     layout: {
+      'text-size': 12,
       'text-field': ['get', 'name'],
       visibility: 'visible',
     },
     paint: {
-      'text-color': 'green',
+      'text-halo-color': 'hsl(0, 0%, 100%)',
+      'text-halo-width': 0.5,
+      'text-halo-blur': 0.5,
+      'text-color': 'hsl(51, 40%, 40%)',
     },
     filter: [
       'match',
@@ -166,10 +194,14 @@ export default [
     source: 'poi_source',
     'source-layer': 'poi',
     layout: {
+      'text-size': 12,
       'text-field': ['get', 'name'],
       visibility: 'visible',
     },
     paint: {
+      'text-halo-color': 'hsl(26, 25%, 32%)',
+      'text-halo-width': 0.5,
+      'text-halo-blur': 0.5,
       'text-color': 'green',
     },
     filter: [

From 47ad167af6547d5de0db9faef311084ce92b0032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 21:25:10 +0900
Subject: [PATCH 056/138] =?UTF-8?q?[refactor]=20=EC=8A=A4=ED=83=80?=
 =?UTF-8?q?=EC=9D=BC=EC=9D=84=20=EB=B0=94=EA=BE=B8=EB=8A=94=20=ED=95=A8?=
 =?UTF-8?q?=EC=88=98=EB=A5=BC=20=ED=98=B8=EC=B6=9C=ED=95=A0=20=EB=96=84=20?=
 =?UTF-8?q?key=EA=B0=92=EB=8F=84=20=EA=B0=99=EC=9D=B4=20=EB=84=98=EA=B2=A8?=
 =?UTF-8?q?=EC=A4=80=EB=8B=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기존 코드에서 스타일을 바꾸는 함수를 호출할 때 key값을 같이 넘겨준다.
- 어떤 값이 변경되었는지 알기 위함
---
 src/hooks/sidebar/useStyleType.ts | 1 +
 src/utils/map-styling/index.ts    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index cc76e8a..2227745 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -49,6 +49,7 @@ function useStyleType({
         map,
         subFeatureName,
         detailName,
+        key,
         subDetailName: subDetailName as SubElementNameType,
         style: {
           ...styleElement,
diff --git a/src/utils/map-styling/index.ts b/src/utils/map-styling/index.ts
index 59c7af9..1975482 100644
--- a/src/utils/map-styling/index.ts
+++ b/src/utils/map-styling/index.ts
@@ -8,6 +8,7 @@ import {
 export interface stylingProps {
   map: mapboxgl.Map;
   subFeatureName: string;
+  key: string;
   detailName: ElementNameType;
   subDetailName: SubElementNameType;
   style: StyleType;

From c1c15e4e33dbf70f988321d63c5d882447cde049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 21:26:28 +0900
Subject: [PATCH 057/138] =?UTF-8?q?[refactor]=20[#79]=20=EB=A1=9C=EC=A7=81?=
 =?UTF-8?q?=EC=9D=84=20=EC=A2=80=EB=8D=94=20=ED=9A=A8=EC=9C=A8=EC=A0=81?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EA=B5=AC=ED=98=84=ED=95=98=EA=B8=B0=20?=
 =?UTF-8?q?=EC=9C=84=ED=95=B4=EC=84=9C=20applyStyle=EC=9D=84=20=EB=A6=AC?=
 =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- applyStyle의 함수들을 공통 인터페이스를 사용해서 비구조화로 값을 받아올 수 있게 하였다.- 필요한 여러 타입들과 enum을 지정해주었다
- 색상에 관련된 함수 세개를 하나로 합쳤다
---
 src/utils/applyStyle.ts | 123 ++++++++++++++++++++++++----------------
 1 file changed, 74 insertions(+), 49 deletions(-)

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index 940154e..e646b8c 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -1,62 +1,87 @@
+/* eslint-disable consistent-return */
 import mapboxgl from 'mapbox-gl';
 import { hexToHSL } from './colorFormat';
 
-type colorType = 'fill-color' | 'line-color' | 'text-color' | 'text-halo-color';
-type weightType = 'line-width' | 'text-halo-width' | 'text-size';
+export enum ColorTypeName {
+  'fill-color' = 'fill-color',
+  'line-color' = 'line-color',
+  'text-color' = 'text-color',
+  'text-halo-color' = 'text-halo-color',
+}
+export enum WeightTypeName {
+  'line-width' = 'line-width',
+  'text-halo-width' = 'text-halo-width',
+  'icon-opacity' = 'icon-opacity',
+}
+export type colorType = keyof typeof ColorTypeName;
+export type weightType = keyof typeof WeightTypeName;
 
-export function applyVisibility(
-  map: mapboxgl.Map,
-  layerName: string,
-  visibility: string
-): void {
-  map.setLayoutProperty(layerName, 'visibility', visibility);
+interface ApplyColorProps {
+  map: mapboxgl.Map;
+  layerNames: string[];
+  color?: string;
+  type?: colorType | weightType;
+  saturation?: number;
+  lightness?: number;
+  weight?: string;
+  visibility?: string;
 }
 
-export function applyColor(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string
-): void {
+export function applyColor({
+  map,
+  layerNames,
+  color = '#000',
+  type,
+  saturation,
+  lightness,
+}: ApplyColorProps): void {
+  if (!type) return;
   const { h, s, l } = hexToHSL(color);
-  map.setPaintProperty(layerName, type, `hsl(${h}, ${s}%, ${l}%)`);
-}
 
-export function applyWeight(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: weightType,
-  weight: number
-): void {
-  map.setPaintProperty(layerName, type, weight * 2 + 1);
+  if (saturation) {
+    return layerNames.forEach((layerName) => {
+      map.setPaintProperty(
+        layerName,
+        type,
+        `hsl(${h}, ${50 + saturation / 2}%, ${l}%)`
+      );
+    });
+  }
+
+  if (lightness) {
+    return layerNames.forEach((layerName) => {
+      map.setPaintProperty(
+        layerName,
+        type,
+        `hsl(${h}, ${s}%, ${50 + lightness / 2}%)`
+      );
+    });
+  }
+
+  return layerNames.forEach((layerName) => {
+    map.setPaintProperty(layerName, type, `hsl(${h}, ${s}%, ${l}%)`);
+  });
 }
 
-export function applySaturation(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string,
-  saturation: number
-): void {
-  const { h, l } = hexToHSL(color);
-  map.setPaintProperty(
-    layerName,
-    type,
-    `hsl(${h}, ${50 + saturation / 2}%, ${l}%)`
-  );
+export function applyVisibility({
+  map,
+  layerNames,
+  visibility,
+}: ApplyColorProps): void {
+  layerNames.forEach((layerName) => {
+    map.setLayoutProperty(layerName, 'visibility', visibility);
+  });
 }
 
-export function applyLightness(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string,
-  lightness: number
-): void {
-  const { h, s } = hexToHSL(color);
-  map.setPaintProperty(
-    layerName,
-    type,
-    `hsl(${h}, ${s}%, ${50 + lightness / 2}%)`
-  );
+export function applyWeight({
+  map,
+  layerNames,
+  type,
+  weight,
+}: ApplyColorProps): void {
+  if (!type) return;
+
+  layerNames.forEach((layerName) => {
+    map.setPaintProperty(layerName, type, Number(weight));
+  });
 }

From 5ef0f4c9403a4e18698576907bab39825af3a0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Tue, 1 Dec 2020 21:29:31 +0900
Subject: [PATCH 058/138] =?UTF-8?q?[feat]=20[#79}=20poi=20feature=EB=A5=BC?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94?=
 =?UTF-8?q?=20=ED=95=A8=EC=88=98=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- POI를 수정할 수 있는 함수를 구현하였다.
- section(구역)이 들어오면 그냥 반환한다.
- 객체를 활용해서 불필요한 if문을 최대한 줄이고, 예외가 발생한 경우들만 if문으로 처리를 해주었다.
- 다른 분들과 코드가 엉킬 위험을 고려해 타입과 필요한 변수들을 한 파일에 작성하였다
---
 src/utils/map-styling/poi.ts | 195 ++++++++++++++++++++++++++++++++++-
 1 file changed, 194 insertions(+), 1 deletion(-)

diff --git a/src/utils/map-styling/poi.ts b/src/utils/map-styling/poi.ts
index e16d251..11011c0 100644
--- a/src/utils/map-styling/poi.ts
+++ b/src/utils/map-styling/poi.ts
@@ -1,4 +1,157 @@
+/* eslint-disable consistent-return */
 import { stylingProps } from './index';
+import {
+  applyColor,
+  applyWeight,
+  applyVisibility,
+  colorType,
+  weightType,
+  WeightTypeName,
+  ColorTypeName,
+} from '../applyStyle';
+import { StyleKeyType, ElementName } from '../../store/common/type';
+
+type PoiSubFeature =
+  | 'all'
+  | 'landmark'
+  | 'business'
+  | 'government'
+  | 'medical'
+  | 'park'
+  | 'worship'
+  | 'school'
+  | 'sports'
+  | 'etc';
+
+type POI_LAYERS_TYPE = {
+  [name in PoiSubFeature]: string[];
+};
+
+const VISIBLE = '1';
+const INVISIBLE = '0';
+const POI_LAYERS: POI_LAYERS_TYPE = {
+  all: [
+    'poi-attraction',
+    'poi-arts-label',
+    'poi-landmark-label',
+    'poi-business',
+    'poi-food-label',
+    'poi-store-label',
+    'poi-government',
+    'poi-public-label',
+    'poi-general-label',
+    'poi-medical',
+    'poi-medical-label',
+    'poi-park',
+    'poi-park-label',
+    'poi-worship',
+    'poi-religion-label',
+    'poi-school',
+    'poi-education-label',
+    'poi-sport-label',
+    'poi-etc',
+    'poi-industrial-label',
+    'poi-historic-label',
+    'poi-building-label',
+  ],
+  landmark: ['poi-attraction', 'poi-arts-label', 'poi-landmark-label'],
+  business: ['poi-business', 'poi-food-label', 'poi-store-label'],
+  government: ['poi-government', 'poi-public-label', 'poi-general-label'],
+  medical: ['poi-medical', 'poi-medical-label'],
+  park: ['poi-park', 'poi-park-label'],
+  worship: ['poi-worship', 'poi-religion-label'],
+  school: ['poi-school', 'poi-education-label'],
+  sports: ['poi-sport-label'],
+  etc: [
+    'poi-etc',
+    'poi-industrial-label',
+    'poi-historic-label',
+    'poi-building-label',
+  ],
+};
+
+const mappingDetailToFunc = {
+  labelText: {
+    fill: {
+      color: {
+        typeName: ColorTypeName['text-color'],
+        funcName: applyColor,
+      },
+      saturation: {
+        typeName: ColorTypeName['text-color'],
+        funcName: applyColor,
+      },
+      lightness: {
+        typeName: ColorTypeName['text-color'],
+        funcName: applyColor,
+      },
+      weight: {
+        typeName: null,
+        funcName: () => null,
+      },
+      visibility: {
+        typeName: 'what is my name?',
+        funcName: applyVisibility,
+      },
+      isChanged: {
+        typeName: null,
+        funcName: () => null,
+      },
+    },
+    stroke: {
+      color: {
+        typeName: ColorTypeName['text-halo-color'],
+        funcName: applyColor,
+      },
+      saturation: {
+        typeName: ColorTypeName['text-halo-color'],
+        funcName: applyColor,
+      },
+      lightness: {
+        typeName: ColorTypeName['text-halo-color'],
+        funcName: applyColor,
+      },
+      weight: {
+        typeName: WeightTypeName['text-halo-width'],
+        funcName: applyWeight,
+      },
+      visibility: {
+        typeName: WeightTypeName['text-halo-width'],
+        funcName: applyWeight,
+      },
+      isChanged: {
+        typeName: null,
+        funcName: () => null,
+      },
+    },
+  },
+  labelIcon: {
+    color: {
+      typeName: null,
+      funcName: () => null,
+    },
+    saturation: {
+      typeName: null,
+      funcName: () => null,
+    },
+    lightness: {
+      typeName: null,
+      funcName: () => null,
+    },
+    weight: {
+      typeName: null,
+      funcName: () => null,
+    },
+    visibility: {
+      typeName: WeightTypeName['icon-opacity'],
+      funcName: applyWeight,
+    },
+    isChanged: {
+      typeName: null,
+      funcName: () => null,
+    },
+  },
+};
 
 function poiStyling({
   map,
@@ -6,8 +159,48 @@ function poiStyling({
   detailName,
   subDetailName,
   style,
+  key,
 }: stylingProps): void {
-  console.log(1);
+  let type = null;
+  let func = null;
+
+  if (detailName === ElementName.section) return;
+  if (detailName === ElementName.labelText) {
+    const { typeName, funcName } = mappingDetailToFunc[detailName][
+      subDetailName
+    ][key as StyleKeyType];
+    type = typeName;
+    func = funcName;
+  } else {
+    const { typeName, funcName } = mappingDetailToFunc[detailName][
+      key as StyleKeyType
+    ];
+    type = typeName;
+    func = funcName;
+  }
+
+  if (!type) return;
+  if (
+    key === 'visibility' &&
+    (type === WeightTypeName['icon-opacity'] ||
+      type === WeightTypeName['text-halo-width'])
+  ) {
+    func({
+      map,
+      layerNames: POI_LAYERS[subFeatureName as PoiSubFeature],
+      type,
+      weight: style.visibility === 'none' ? INVISIBLE : VISIBLE,
+    });
+    return;
+  }
+
+  func({
+    map,
+    layerNames: POI_LAYERS[subFeatureName as PoiSubFeature],
+    type: type as weightType | colorType,
+    color: style.color,
+    [key]: style[key as StyleKeyType],
+  });
 }
 
 export default poiStyling;

From 5378371e98d4c030e816b6dd3be0ea3470676d1c Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Tue, 1 Dec 2020 22:52:30 +0900
Subject: [PATCH 059/138] =?UTF-8?q?[fix]=20string=20to=20number=20?=
 =?UTF-8?q?=EB=B3=80=ED=99=98=EB=B2=95=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- parseInt 에서 Number로 직접적인 변환
- 진수를 신경써주지 않아도 되는 변환이라 생각되어 변경
---
 src/utils/applyStyle.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index d362acf..f119703 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -52,7 +52,7 @@ export function applyColor({
       map.setPaintProperty(
         layerName,
         type,
-        `hsl(${h}, ${50 + parseInt(saturation, 10) / 2}%, ${l}%)`
+        `hsl(${h}, ${50 + Number(saturation) / 2}%, ${l}%)`
       );
     });
   }
@@ -61,7 +61,7 @@ export function applyColor({
       map.setPaintProperty(
         layerName,
         type,
-        `hsl(${h}, ${s}%, ${50 + parseInt(lightness, 10) / 2}%)`
+        `hsl(${h}, ${s}%, ${50 + Number(lightness) / 2}%)`
       );
     });
   }
@@ -77,6 +77,6 @@ export function applyWeight(
   weight: string
 ): void {
   layerNames.forEach((layerName) => {
-    map.setPaintProperty(layerName, type, parseInt(weight, 10) * 2 + 1);
+    map.setPaintProperty(layerName, type, Number(weight) * 2 + 1);
   });
 }

From c427262cac553abe3d26de1d38991199d1ede3c0 Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Tue, 1 Dec 2020 22:53:34 +0900
Subject: [PATCH 060/138] =?UTF-8?q?[fix]=20=EB=8F=84=EB=A1=9C=EC=9D=98=20?=
 =?UTF-8?q?=EC=9E=90=EC=A0=84=EA=B1=B0=20=EB=8F=84=EB=A1=9C=20=ED=95=AD?=
 =?UTF-8?q?=EB=AA=A9=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 자전거 도로에 해당하는 항목이 거의 존재하지 않아, 실효성이 없다고
판단되어 해당항목 삭제
---
 src/utils/rendering-data/featureTypeData.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/rendering-data/featureTypeData.ts b/src/utils/rendering-data/featureTypeData.ts
index 51893c5..059f15e 100644
--- a/src/utils/rendering-data/featureTypeData.ts
+++ b/src/utils/rendering-data/featureTypeData.ts
@@ -34,7 +34,6 @@ const data: DataType[] = [
       { key: 'arterial', name: '주요도로' },
       { key: 'local', name: '일반도로' },
       { key: 'sidewalk', name: '인도' },
-      { key: 'bicycle-road', name: '자전거도로' },
     ],
   },
   {

From 5c5a03c273e4df82076c7c9706a8530f270906de Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Tue, 1 Dec 2020 22:55:02 +0900
Subject: [PATCH 061/138] =?UTF-8?q?[feat]=20[#81]=20=EB=8F=84=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B8=EB=8F=84=20=ED=95=AD=EB=AA=A9=20=EC=8A=A4=ED=83=80?=
 =?UTF-8?q?=EC=9D=BC=20=EC=A0=81=EC=9A=A9=20=EA=B0=80=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 도로 인도 항목 스타일 적용 가능
- 하지만 현재 인도에 관한 레이어가 네이버 데이터밖에 없어, 인도에 관한
추가 데이터 필요(mapbox)
---
 src/utils/map-styling/road.ts | 107 ++++++++++++++++------------------
 1 file changed, 51 insertions(+), 56 deletions(-)

diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
index 4c59070..7a40419 100644
--- a/src/utils/map-styling/road.ts
+++ b/src/utils/map-styling/road.ts
@@ -3,6 +3,29 @@ import { applyVisibility, applyColor, applyWeight } from '../applyStyle';
 
 type KeyType = 'visibility' | 'color' | 'weight' | 'saturation' | 'lightness';
 
+/**
+ * visibility inherit 처리 applyStyle에서
+ * color, saturation, lightness 한 함수로 처리
+ *   - section
+ *     - fill : line 'line-color', symbol, polygon 'fill-color'
+ *     - stroke : line 'case layer'의 색상, symbol 불변, polygon이면 불변
+ *   - label
+ *     - text fill: 'text-color', 'text-width'
+ *     - text stroke: 'text-halo-color', 'text-halo-width'
+ *
+ */
+
+/**
+ * 20.12.01.
+ * highway : 분류 보류
+ * aterial: line이라 채우기 윤곽선은 한번에 처리, 채우기 윤곽선 확인완료, 아이콘 없음
+ * local: 지금 있는 것들은 section fill밖에 의미없음
+ * sidewalk: 확인 완료
+ *
+ * 색상을 변경하지 않은채로 채도나 밝기부터 선택하면 색상팔레트 색 기준으로 조정이 됨
+ * fix 필요
+ */
+
 function roadStyling({
   map,
   subFeatureName,
@@ -11,7 +34,7 @@ function roadStyling({
   key,
   style,
 }: stylingProps): void {
-  const { visibility, color, weight, saturation, lightness } = style;
+  const { visibility, color, weight } = style;
   const arterialLayerNames = [
     'road-number-shield',
     'road-exit-shield',
@@ -21,39 +44,21 @@ function roadStyling({
   const localLayerNames = ['ferry', 'ferry-auto', 'road-local'];
   const sidewalkLayerNames = ['road-footway'];
 
-  /**
-   * visibility 가 바뀌는 것 우선은 여기에서 처리, inherit (visible 처리)
-   * color, saturation, lightness 한 함수로 처리
-   *   - section
-   *     - fill : line 'line-color', symbol, polygon 'fill-color'
-   *     - stroke : line 'case layer'의 색상, symbol 불변, polygon이면 불변
-   *   - label
-   *     - text fill: 'text-color', 'text-width'
-   *     - text stroke: 'text-halo-color', 'text-halo-width'
-   *
-   * cf. 채도와 밝기가 크게 달라지는 것 같지 않다.. line인 탓일까..?
-   */
-
-  /**
-   * 20.12.01.
-   * highway : 분류 보류
-   * aterial: line이라 채우기 윤곽선은 한번에 처리, 채우기 윤곽선 확인완료, 아이콘 없음
-   * local: 지금 있는 것들은 section fill밖에 의미없음
-   * sidewalk
-   */
-
   if (subFeatureName === 'arterial') {
-    if (detailName === 'section' && key === 'visibility') {
+    if (
+      detailName === 'section' &&
+      subDetailName === 'fill' &&
+      key === 'visibility'
+    ) {
       applyVisibility(map, arterialLayerNames, visibility);
-    } else if (key === ('color' || 'saturation' || 'lightness')) {
+    } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
       if (detailName === 'section' && subDetailName === 'fill') {
         applyColor({
           map,
           layerNames: ['road-arterial'],
           color,
           type: 'line-color',
-          saturation,
-          lightness,
+          [key]: style[key as KeyType],
         });
       } else if (detailName === 'labelText' && subDetailName === 'fill') {
         applyColor({
@@ -61,8 +66,7 @@ function roadStyling({
           layerNames: ['road-number-shield', 'road-exit-shield', 'road-label'],
           color,
           type: 'text-color',
-          saturation,
-          lightness,
+          [key]: style[key as KeyType],
         });
       } else if (detailName === 'labelText' && subDetailName === 'stroke') {
         applyColor({
@@ -70,8 +74,7 @@ function roadStyling({
           layerNames: ['road-label'],
           color,
           type: 'text-halo-color',
-          saturation,
-          lightness,
+          [key]: style[key as KeyType],
         });
       }
     } else if (key === 'weight') {
@@ -83,15 +86,14 @@ function roadStyling({
     }
   } else if (subFeatureName === 'local') {
     if (key === 'visibility') applyVisibility(map, localLayerNames, visibility);
-    else if (key === ('color' || 'saturation' || 'lightness')) {
+    else if (key === 'color' || key === 'saturation' || key === 'lightness') {
       if (detailName === 'section' && subDetailName === 'fill') {
         applyColor({
           map,
           layerNames: ['ferry', 'ferry-auto', 'road-local'],
           color,
           type: 'line-color',
-          saturation,
-          lightness,
+          [key]: style[key as KeyType],
         });
       }
     } else if (key === 'weight') {
@@ -103,30 +105,23 @@ function roadStyling({
           weight
         );
     }
+  } else if (subFeatureName === 'sidewalk') {
+    if (key === 'visibility')
+      applyVisibility(map, sidewalkLayerNames, visibility);
+    else if (key === 'weight') {
+      if (detailName === 'section' && subDetailName === 'fill')
+        applyWeight(map, sidewalkLayerNames, 'line-width', weight);
+    } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
+      if (detailName === 'section' && subDetailName === 'fill')
+        applyColor({
+          map,
+          layerNames: sidewalkLayerNames,
+          color,
+          type: 'line-color',
+          [key]: style[key as KeyType],
+        });
+    }
   }
 }
 
-// if (subFeatureName === ('highway' || 'bicycle-road')) {
-//   /**
-//    * There is no highway layer and bicycle-road
-//    */
-// } else
-
-// else if (subFeatureName === 'local') {
-//   if (key === 'visibility') applyVisibility(map, localLayerNames, visibility);
-// } else if (subFeatureName === 'sidewalk') {
-//   // weight 관련 속성 없음
-//   if (key === 'visibility')
-//     applyVisibility(map, sidewalkLayerNames, visibility);
-//   if (key === ('color' || 'saturation' || 'lightness')) {
-//     applyColor({
-//       map,
-//       layerNames: sidewalkLayerNames,
-//       color,
-//       type: 'line-color',
-//       saturation,
-//       lightness,
-//     });
-//   }
-
 export default roadStyling;

From a7d67d4c09957b5bb60a9ab36ed73162324785c9 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Wed, 2 Dec 2020 00:20:21 +0900
Subject: [PATCH 062/138] =?UTF-8?q?[fix]=20neighborhood=20=ED=86=B5?=
 =?UTF-8?q?=ED=95=A9=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 수정을 빼먹어서 제거함
---
 src/utils/map-styling/administrative.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/utils/map-styling/administrative.ts b/src/utils/map-styling/administrative.ts
index 8bd318c..b41c3bc 100644
--- a/src/utils/map-styling/administrative.ts
+++ b/src/utils/map-styling/administrative.ts
@@ -102,11 +102,7 @@ function administrativeStyling({
   }
 
   // section - fill
-  if (
-    subFeatureName === 'locality' ||
-    subFeatureName === 'neighborhood' ||
-    subDetailName === SubElementName.fill
-  )
+  if (subFeatureName === 'locality' || subDetailName === SubElementName.fill)
     return;
 
   // section - stroke

From a8aa5b11616c82fa6b516a875fc64cacbfa73554 Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Wed, 2 Dec 2020 00:43:11 +0900
Subject: [PATCH 063/138] =?UTF-8?q?[fix]=20=EB=8F=84=EB=A1=9C=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EB=84=A4=EC=9D=B4=EB=B2=84=20=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=EC=97=90=20=EB=8C=80=ED=95=9C=20=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=96=B4=20=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 스타일 설정을 위한 속성들 추가
---
 src/store/map/layers/road.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/store/map/layers/road.ts b/src/store/map/layers/road.ts
index 9219d2d..e1ea102 100644
--- a/src/store/map/layers/road.ts
+++ b/src/store/map/layers/road.ts
@@ -22,6 +22,7 @@ export default [
     },
     paint: {
       'line-color': '#ff00ff',
+      'line-width': 1,
     },
     filter: [
       'match',
@@ -60,6 +61,7 @@ export default [
     },
     paint: {
       'line-color': 'red',
+      'line-width': 1,
     },
     filter: ['match', ['get', 'type'], ['pedestrian', 'footway'], true, false],
     id: 'road-footway',

From e090ff8cde3a0f5c565df0080d9c7a1d634e9240 Mon Sep 17 00:00:00 2001
From: gitgitwi <johnwi@knou.ac.kr>
Date: Wed, 2 Dec 2020 01:39:02 +0900
Subject: [PATCH 064/138] =?UTF-8?q?[FEAT]=20[#86]=20=EA=B5=90=ED=86=B5(tra?=
 =?UTF-8?q?nsit)=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A1=B0=EC=A0=95=20?=
 =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 교통 전체/항공/버스/전철/지하철 스타일 조정 기본 기능 구현
  - 샘플 데이터 레이어 + Mapbox 내장 레이어 변경

- TODO
  - 레이어에 없는 속성 변경 시 에러 관련 예외 처리
  - 전반적인 리팩토링 시급
---
 src/hooks/sidebar/useStyleType.ts |   1 +
 src/store/map/layers/transit.ts   |  26 ++++--
 src/utils/applyStyle.ts           | 119 ++++++++++++++++---------
 src/utils/map-styling/index.ts    |   1 +
 src/utils/map-styling/transit.ts  | 140 +++++++++++++++++++++++++++++-
 5 files changed, 240 insertions(+), 47 deletions(-)

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index cc76e8a..4dc1fe9 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -48,6 +48,7 @@ function useStyleType({
       mapStyling[featureName]({
         map,
         subFeatureName,
+        key,
         detailName,
         subDetailName: subDetailName as SubElementNameType,
         style: {
diff --git a/src/store/map/layers/transit.ts b/src/store/map/layers/transit.ts
index 7828095..18a3ae4 100644
--- a/src/store/map/layers/transit.ts
+++ b/src/store/map/layers/transit.ts
@@ -1,4 +1,17 @@
 export default [
+  {
+    type: 'fill',
+    source: 'composite',
+    'source-layer': 'landuse',
+    layout: {
+      visibility: 'visible',
+    },
+    paint: {
+      'fill-color': 'hsl(230, 100%, 44%)',
+    },
+    filter: ['in', 'class', 'airport'],
+    id: 'transit-airport',
+  },
   {
     type: 'line',
     source: 'line_source',
@@ -9,7 +22,7 @@ export default [
     paint: {
       'line-color': 'yellow',
     },
-    filter: ['==', ['get', 'type'], 'subway'],
+    filter: ['in', 'type', 'subway'],
     id: 'transit-subway',
   },
   {
@@ -22,7 +35,7 @@ export default [
     paint: {
       'line-color': 'black',
     },
-    filter: ['==', ['get', 'type'], 'rail'],
+    filter: ['in', 'type', 'rail'],
     id: 'transit-rail',
   },
   {
@@ -31,12 +44,15 @@ export default [
     'source-layer': 'poi',
     layout: {
       'text-field': ['get', 'name'],
+      'text-size': 12,
       visibility: 'visible',
     },
     paint: {
-      'text-color': 'green',
+      'text-halo-color': 'green',
+      'text-halo-width': 0.5,
+      'text-color': 'red',
     },
-    filter: ['==', ['get', 'type'], 'taxi'],
-    id: 'transit-bus',
+    filter: ['in', 'type', 'bus_stop'],
+    id: 'transit-bus-label',
   },
 ];
diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index 940154e..384e8e3 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -1,62 +1,99 @@
+/* eslint-disable no-debugger */
+/* eslint-disable no-case-declarations */
 import mapboxgl from 'mapbox-gl';
+import { StyleKeyName } from '../store/common/type';
 import { hexToHSL } from './colorFormat';
 
-type colorType = 'fill-color' | 'line-color' | 'text-color' | 'text-halo-color';
-type weightType = 'line-width' | 'text-halo-width' | 'text-size';
+export enum VisibilityType {
+  visibility = 'visibility',
+}
+
+export enum ColorTypeName {
+  'fill-color' = 'fill-color',
+  'line-color' = 'line-color',
+  'text-color' = 'text-color',
+  'text-halo-color' = 'text-halo-color',
+}
+export enum WeightTypeName {
+  'line-width' = 'line-width',
+  'text-size' = 'text-size',
+  'text-halo-width' = 'text-halo-width',
+}
+type ColorType = keyof typeof ColorTypeName;
+type WeightType = keyof typeof WeightTypeName;
+export type styleTypes = VisibilityType | ColorType | WeightType;
+
+interface ApplyColorProps {
+  map: mapboxgl.Map;
+  layerNames: string[];
+  color: string;
+  type: styleTypes;
+  saturation?: number;
+  lightness?: number;
+}
 
 export function applyVisibility(
   map: mapboxgl.Map,
-  layerName: string,
+  layerNames: string[],
   visibility: string
 ): void {
-  map.setLayoutProperty(layerName, 'visibility', visibility);
+  return layerNames.forEach((layerName) => {
+    map.setLayoutProperty(layerName, VisibilityType.visibility, visibility);
+  });
 }
 
-export function applyColor(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string
-): void {
+export function applyColor({
+  map,
+  layerNames,
+  type,
+  color,
+  saturation,
+  lightness,
+}: ApplyColorProps): void {
   const { h, s, l } = hexToHSL(color);
-  map.setPaintProperty(layerName, type, `hsl(${h}, ${s}%, ${l}%)`);
-}
 
-export function applyWeight(
-  map: mapboxgl.Map,
-  layerName: string,
-  type: weightType,
-  weight: number
-): void {
-  map.setPaintProperty(layerName, type, weight * 2 + 1);
+  if (saturation) {
+    return layerNames.forEach((layerName) => {
+      map.setPaintProperty(
+        layerName,
+        type,
+        `hsl(${h}, ${50 + saturation / 2}%, ${l}%)`
+      );
+    });
+  }
+  if (lightness) {
+    return layerNames.forEach((layerName) => {
+      map.setPaintProperty(
+        layerName,
+        type,
+        `hsl(${h}, ${s}%, ${50 + lightness / 2}%)`
+      );
+    });
+  }
+
+  return layerNames.forEach((layerName) => {
+    map.setPaintProperty(layerName, type, `hsl(${h}, ${s}%, ${l}%)`);
+  });
 }
 
-export function applySaturation(
+export function applyWeight(
   map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string,
-  saturation: number
+  layerNames: string[],
+  type: WeightType,
+  weight: string
 ): void {
-  const { h, l } = hexToHSL(color);
-  map.setPaintProperty(
-    layerName,
-    type,
-    `hsl(${h}, ${50 + saturation / 2}%, ${l}%)`
-  );
+  return layerNames.forEach((layerName) => {
+    map.setPaintProperty(layerName, type, +weight * 3 + 1);
+  });
 }
 
-export function applyLightness(
+export function applyTextSize(
   map: mapboxgl.Map,
-  layerName: string,
-  type: colorType,
-  color: string,
-  lightness: number
+  layerNames: string[],
+  type: WeightType,
+  size: string
 ): void {
-  const { h, s } = hexToHSL(color);
-  map.setPaintProperty(
-    layerName,
-    type,
-    `hsl(${h}, ${s}%, ${50 + lightness / 2}%)`
-  );
+  return layerNames.forEach((layerName) => {
+    map.setLayoutProperty(layerName, type, +size * 3);
+  });
 }
diff --git a/src/utils/map-styling/index.ts b/src/utils/map-styling/index.ts
index 59c7af9..1975482 100644
--- a/src/utils/map-styling/index.ts
+++ b/src/utils/map-styling/index.ts
@@ -8,6 +8,7 @@ import {
 export interface stylingProps {
   map: mapboxgl.Map;
   subFeatureName: string;
+  key: string;
   detailName: ElementNameType;
   subDetailName: SubElementNameType;
   style: StyleType;
diff --git a/src/utils/map-styling/transit.ts b/src/utils/map-styling/transit.ts
index e66698b..ef6d703 100644
--- a/src/utils/map-styling/transit.ts
+++ b/src/utils/map-styling/transit.ts
@@ -1,13 +1,151 @@
+/* eslint-disable no-nested-ternary */
+/* eslint-disable no-debugger */
+/* eslint-disable no-case-declarations */
 import { stylingProps } from '.';
+import { StyleKeyName, StyleType } from '../../store/common/type';
+import {
+  applyVisibility,
+  applyColor,
+  applyWeight,
+  applyTextSize,
+  ColorTypeName,
+  styleTypes,
+  WeightTypeName,
+} from '../../utils/applyStyle';
+
+const AirportLayerNames = [
+  'airport-label',
+
+  'aeroway-polygon',
+  'transit-airport',
+  'aeroway-line',
+];
+const BusLayerNames = ['transit-bus-label'];
+const RailLayerNames = ['transit-rail'];
+const SubwayLayerNames = ['transit-subway', 'transit-subway-label'];
+
+const AllLayerTypeKeys = [
+  ...AirportLayerNames,
+  ...BusLayerNames,
+  ...RailLayerNames,
+  ...SubwayLayerNames,
+  'transit-label',
+];
 
 function transitStyling({
   map,
   subFeatureName,
+  key,
   detailName,
   subDetailName,
   style,
 }: stylingProps): void {
-  console.log(1);
+  const layers =
+    subFeatureName === 'all'
+      ? [...AllLayerTypeKeys]
+      : subFeatureName === 'subway'
+      ? [...SubwayLayerNames]
+      : subFeatureName === 'bus'
+      ? [...BusLayerNames]
+      : subFeatureName === 'airport'
+      ? [...AirportLayerNames]
+      : [...RailLayerNames];
+
+  let layersByDetailName: string[];
+  let styleType: styleTypes;
+  debugger;
+  switch (detailName) {
+    case 'section':
+      layersByDetailName = layers.filter((layer) => !layer.includes('label'));
+      styleType =
+        subDetailName === 'stroke'
+          ? key === 'weight'
+            ? WeightTypeName['line-width']
+            : ColorTypeName['line-color']
+          : ColorTypeName['fill-color'];
+
+      break;
+    case 'labelText':
+      layersByDetailName = layers.filter((layer) => layer.includes('label'));
+      styleType =
+        subDetailName === 'stroke'
+          ? key === 'weight'
+            ? WeightTypeName['text-halo-width']
+            : ColorTypeName['text-halo-color']
+          : key === 'weight'
+          ? WeightTypeName['text-size']
+          : ColorTypeName['text-color'];
+      debugger;
+      break;
+    case 'labelIcon':
+      layersByDetailName = layers.filter((layer) => !layer.includes('label'));
+      styleType =
+        subDetailName === 'stroke'
+          ? ColorTypeName['line-color']
+          : ColorTypeName['fill-color'];
+      break;
+
+    default:
+      return;
+  }
+
+  const styleKey: StyleKeyName = key as StyleKeyName;
+  const { [styleKey]: value } = style;
+  let stylerFunction: (obj: any) => void;
+
+  switch (styleKey) {
+    case StyleKeyName.visibility:
+      stylerFunction = ({ layerNames }: { layerNames: string[] }) =>
+        applyVisibility(map, layerNames, value as string);
+      break;
+
+    case StyleKeyName.color:
+    case StyleKeyName.saturation:
+    case StyleKeyName.lightness:
+      const colorKey = StyleKeyName.color;
+      const satKey = StyleKeyName.saturation;
+      const ligKey = StyleKeyName.lightness;
+
+      const satureOrLight =
+        key === 'saturation'
+          ? { saturation: +style[satKey] }
+          : key === 'lightness'
+          ? { lightness: +style[ligKey] }
+          : {};
+      stylerFunction = ({ layerNames }: { layerNames: string[] }) =>
+        applyColor({
+          map,
+          layerNames,
+          type: styleType,
+          color: style[colorKey],
+          ...satureOrLight,
+        });
+      break;
+
+    case StyleKeyName.weight:
+      stylerFunction =
+        subDetailName !== 'fill'
+          ? ({ layerNames }: { layerNames: string[] }) =>
+              applyWeight(
+                map,
+                layerNames,
+                styleType as WeightTypeName,
+                value as string
+              )
+          : ({ layerNames }: { layerNames: string[] }) =>
+              applyTextSize(
+                map,
+                layerNames,
+                styleType as WeightTypeName,
+                value as string
+              );
+      break;
+
+    default:
+      return;
+  }
+
+  stylerFunction({ layerNames: layersByDetailName });
 }
 
 export default transitStyling;

From a214348355e36f013aa310b6c1e2664c66347388 Mon Sep 17 00:00:00 2001
From: tejava <goddrinktejava@gmail.com>
Date: Wed, 2 Dec 2020 02:17:56 +0900
Subject: [PATCH 065/138] =?UTF-8?q?[fix]=20subFeatureName=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=9D=BC=20=EB=A0=88=EC=9D=B4=EC=96=B4=EB=A5=BC=20?=
 =?UTF-8?q?=EC=9E=AC=EA=B5=AC=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

subFeatureName에 따라서 applyStyle이 일대일로 대응될 수 있도록 레이어를 변경
landscape-humanmade를 landscape-human-made로 변경
landscape-commercial을 landscape-building과 병합
---
 src/store/map/layers/landscape.ts | 50 ++++++++++++-------------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/src/store/map/layers/landscape.ts b/src/store/map/layers/landscape.ts
index f9a9724..9ef4661 100644
--- a/src/store/map/layers/landscape.ts
+++ b/src/store/map/layers/landscape.ts
@@ -1,6 +1,6 @@
 export default [
   {
-    id: 'landscape-humanmade',
+    id: 'landscape-human-made',
     type: 'fill',
     source: 'polygon_source',
     'source-layer': 'polygon',
@@ -49,37 +49,17 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'fill-color': 'skyblue',
-      'fill-opacity': 0.5,
-    },
-    filter: [
-      'match',
-      ['get', 'type'],
-      [
-        'restaurant',
-        'cafe',
-        'marketplace',
-        'fast_food',
-        'bar',
-        'pub',
-        'casino',
-        'cinema',
+      'fill-color': [
+        'interpolate',
+        ['linear'],
+        ['zoom'],
+        15,
+        'hsl(35, 11%, 86%)',
+        16,
+        'hsl(35, 7%, 85%)',
       ],
-      true,
-      false,
-    ],
-    id: 'landscape-commercial',
-  },
-  {
-    type: 'fill',
-    source: 'polygon_source',
-    'source-layer': 'polygon',
-    layout: {
-      visibility: 'visible',
-    },
-    paint: {
-      'fill-color': 'black',
-      'fill-opacity': 0.5,
+      'fill-opacity': ['interpolate', ['linear'], ['zoom'], 15, 0, 16, 1],
+      'fill-outline-color': 'hsl(35, 8%, 80%)',
     },
     filter: [
       'in',
@@ -126,6 +106,14 @@ export default [
       'palace',
       'toilets',
       'social_facility',
+      'restaurant',
+      'cafe',
+      'marketplace',
+      'fast_food',
+      'bar',
+      'pub',
+      'casino',
+      'cinema',
       '',
     ],
     id: 'landscape-building',

From b39fd7dc6d62fb64ea913bd4c55c02dc4d675baf Mon Sep 17 00:00:00 2001
From: tejava <goddrinktejava@gmail.com>
Date: Wed, 2 Dec 2020 05:01:26 +0900
Subject: [PATCH 066/138] =?UTF-8?q?[feat]=20all=EC=9D=84=20=EC=A0=9C?=
 =?UTF-8?q?=EC=99=B8=ED=95=9C=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A1=B0?=
 =?UTF-8?q?=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

각 레이어 이름에 landscape-를 더하여 속성을 지정,
이에 대한 설정을 각자 진행한다.
---
 src/utils/map-styling/landscape.ts | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index 9282499..4e49395 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -1,4 +1,10 @@
 import { stylingProps } from './index';
+import {
+  applyColor,
+  applyLightness,
+  applyVisibility,
+  applySaturation,
+} from '../applyStyle';
 
 function landscapeStyling({
   map,
@@ -7,7 +13,26 @@ function landscapeStyling({
   subDetailName,
   style,
 }: stylingProps): void {
-  console.log(1);
+  const layerName = `landscape-${subFeatureName}`;
+
+  if (detailName === 'section' && subDetailName === 'fill') {
+    applyColor(map, layerName, 'fill-color', style.color);
+    applyVisibility(map, layerName, style.visibility);
+    applyLightness(
+      map,
+      layerName,
+      'fill-color',
+      style.color,
+      Number(style.lightness)
+    );
+    applySaturation(
+      map,
+      layerName,
+      'fill-color',
+      style.color,
+      Number(style.saturation)
+    );
+  }
 }
 
 export default landscapeStyling;

From e0eb491492fbffe93e18209d3a5f8799d1b0ca77 Mon Sep 17 00:00:00 2001
From: tejava <goddrinktejava@gmail.com>
Date: Wed, 2 Dec 2020 06:43:14 +0900
Subject: [PATCH 067/138] =?UTF-8?q?[feat]=20[#83]=20all=EC=9D=84=20?=
 =?UTF-8?q?=ED=8F=AC=ED=95=A8=ED=95=9C=20=EA=B2=BD=EA=B4=80=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=A1=B0=EC=A0=95=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

all의 경우 모든 항목을 forEach로 순회하며 setPaintProperty를 한다
이를 위해서 setProperty를 하기 위한 구현 과정을 함수로 분리하였다
#93 에 따르면 변경사항이 전달되도록 하였다는데, 이를 이후에 리팩토링에 적용할 예정
현재는 모든 항목을 한번에 업데이트하고있다
---
 src/utils/map-styling/landscape.ts | 59 +++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index 4e49395..dec32f1 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -5,6 +5,40 @@ import {
   applyVisibility,
   applySaturation,
 } from '../applyStyle';
+import { StyleType } from '../../store/common/type';
+
+const SECTION = 'section';
+const FILL = 'fill';
+const ALL = 'all';
+
+const layers = ['human-made', 'building', 'natural', 'landcover'];
+
+interface applyStyleProps {
+  map: mapboxgl.Map;
+  subFeatureName: string;
+  style: StyleType;
+}
+
+function applyLandscapeStyle({ map, subFeatureName, style }: applyStyleProps) {
+  const layerName = `landscape-${subFeatureName}`;
+
+  applyColor(map, layerName, 'fill-color', style.color);
+  applyVisibility(map, layerName, style.visibility);
+  applyLightness(
+    map,
+    layerName,
+    'fill-color',
+    style.color,
+    Number(style.lightness)
+  );
+  applySaturation(
+    map,
+    layerName,
+    'fill-color',
+    style.color,
+    Number(style.saturation)
+  );
+}
 
 function landscapeStyling({
   map,
@@ -13,25 +47,16 @@ function landscapeStyling({
   subDetailName,
   style,
 }: stylingProps): void {
-  const layerName = `landscape-${subFeatureName}`;
+  if (detailName !== SECTION || subDetailName !== FILL) {
+    return;
+  }
 
-  if (detailName === 'section' && subDetailName === 'fill') {
-    applyColor(map, layerName, 'fill-color', style.color);
-    applyVisibility(map, layerName, style.visibility);
-    applyLightness(
-      map,
-      layerName,
-      'fill-color',
-      style.color,
-      Number(style.lightness)
-    );
-    applySaturation(
-      map,
-      layerName,
-      'fill-color',
-      style.color,
-      Number(style.saturation)
+  if (subFeatureName === ALL) {
+    layers.forEach((item) =>
+      applyLandscapeStyle({ map, subFeatureName: item, style })
     );
+  } else {
+    applyLandscapeStyle({ map, subFeatureName, style });
   }
 }
 

From a02a50072f3d91f4cac364f23db62b2336878fb7 Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Wed, 2 Dec 2020 14:03:03 +0900
Subject: [PATCH 068/138] =?UTF-8?q?[refactor]=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=ED=83=80=EC=9E=85=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 이름이 유사하고 쓰임이 같은 타입 제거
---
 src/store/common/type.ts | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index d2e169d..9ba1caa 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -1,17 +1,17 @@
 import { init, setStyle } from '../style/action';
 
-export enum ElementName {
+export enum ElementNameType {
   section = 'section',
   labelText = 'labelText',
   labelIcon = 'labelIcon',
 }
 
-export enum SubElementName {
+export enum SubElementNameType {
   fill = 'fill',
   stroke = 'stroke',
 }
 
-export enum StyleKeyName {
+export enum StyleKeyType {
   visibility = 'visibility',
   color = 'color',
   weight = 'weight',
@@ -20,7 +20,7 @@ export enum StyleKeyName {
   isChanged = 'isChanged',
 }
 
-export enum FeatureName {
+export enum FeatureNameType {
   poi = 'poi',
   administrative = 'administrative',
   landscape = 'landscape',
@@ -30,11 +30,6 @@ export enum FeatureName {
   marker = 'marker',
 }
 
-export type ElementNameType = keyof typeof ElementName;
-export type SubElementNameType = keyof typeof SubElementName;
-export type FeatureNameType = keyof typeof FeatureName;
-export type StyleKeyType = keyof typeof StyleKeyName;
-
 export interface objType {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [name: string]: any;
@@ -44,9 +39,9 @@ export interface StyleType {
   isChanged: boolean;
   visibility: string;
   color: string;
-  weight: string;
-  saturation: string;
-  lightness: string;
+  weight: number;
+  saturation: number;
+  lightness: number;
 }
 export interface ElementType {
   fill: StyleType;

From faadd1892132843e7b75756fe26bf56d4b51d50c Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Wed, 2 Dec 2020 14:03:55 +0900
Subject: [PATCH 069/138] =?UTF-8?q?[refactor]=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=ED=83=80=EC=9E=85=EC=A0=9C=EA=B1=B0?=
 =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20import=ED=95=9C=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=EB=93=A4=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 이전 commit의 중복되는 타입제거에 따라, 다른 파일에서 import 해주었던
type 변경
---
 .../Sidebar/SidebarContentMore/ColorStyle.tsx |   6 +-
 .../Sidebar/SidebarContentMore/DetailType.tsx |  42 +++--
 .../SidebarContentMore/LightnessStyle.tsx     |   8 +-
 .../SidebarContentMore/SaturationStyle.tsx    |   8 +-
 .../SidebarContentMore/VisibilityStyle.tsx    |   6 +-
 .../SidebarContentMore/WeightStyle.tsx        |   8 +-
 src/hooks/common/useInputRange.ts             |   8 +-
 src/hooks/sidebar/useStyleType.ts             |  11 +-
 src/store/style/compareStyle.ts               |   4 +-
 src/store/style/getReducer.ts                 |   4 +-
 src/store/style/properties.ts                 |   6 +-
 src/utils/applyStyle.ts                       |  46 +++---
 src/utils/map-styling/administrative.ts       |  58 +++----
 src/utils/map-styling/index.ts                |   6 +-
 src/utils/map-styling/landscape.ts            |  37 ++---
 src/utils/map-styling/poi.ts                  |  40 +++--
 src/utils/map-styling/road.ts                 |  92 ++++++-----
 src/utils/map-styling/transit.ts              | 152 +++++++++---------
 src/utils/map-styling/water.ts                |  57 ++++---
 src/utils/rendering-data/featureTypeData.ts   |  14 +-
 20 files changed, 311 insertions(+), 302 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx b/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
index 6bba068..f114141 100644
--- a/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/ColorStyle.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
 import useInputRange from '../../../hooks/common/useInputRange';
-import { StyleKeyName } from '../../../store/common/type';
+import { StyleKeyType } from '../../../store/common/type';
 
 const ColorWrapper = styled.div`
   display: flex;
@@ -30,7 +30,7 @@ const ColorPalette = styled.input`
 
 interface ColorStyleProps {
   color: string;
-  onStyleChange: (key: StyleKeyName, value: string | number) => void;
+  onStyleChange: (key: StyleKeyType, value: string | number) => void;
 }
 
 function ColorStyle({
@@ -50,7 +50,7 @@ function ColorStyle({
         type="color"
         id="styler__color"
         onChange={rangeChangeHandler}
-        onBlur={() => rangeMouseUpHandler(StyleKeyName.color)}
+        onBlur={() => rangeMouseUpHandler(StyleKeyType.color)}
         value={curRange}
       />
     </ColorWrapper>
diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index 2168c5f..133d776 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -12,8 +12,6 @@ import {
   FeatureNameType,
   ElementNameType,
   SubElementNameType,
-  ElementName,
-  SubElementName,
 } from '../../../store/common/type';
 
 interface PaddingProp {
@@ -106,24 +104,30 @@ function DetailType({
           {section?.fill.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
             isSelected={checkIsSelected(
-              ElementName.section,
-              SubElementName.fill
+              ElementNameType.section,
+              SubElementNameType.fill
             )}
             padding="second"
             clickHandler={() => {
-              styleClickHandler(ElementName.section, SubElementName.fill);
+              styleClickHandler(
+                ElementNameType.section,
+                SubElementNameType.fill
+              );
             }}
             name="채우기"
           />
           {section?.stroke.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
             isSelected={
-              sidebarTypeName === ElementName.section &&
-              sidebarSubTypeName === SubElementName.stroke
+              sidebarTypeName === ElementNameType.section &&
+              sidebarSubTypeName === SubElementNameType.stroke
             }
             padding="second"
             clickHandler={() => {
-              styleClickHandler(ElementName.section, SubElementName.stroke);
+              styleClickHandler(
+                ElementNameType.section,
+                SubElementNameType.stroke
+              );
             }}
             name="윤곽선"
           />
@@ -135,33 +139,39 @@ function DetailType({
             {labelText?.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
             <ListItem
               isSelected={checkIsSelected(
-                ElementName.labelText,
-                SubElementName.fill
+                ElementNameType.labelText,
+                SubElementNameType.fill
               )}
               padding="third"
               clickHandler={() => {
-                styleClickHandler(ElementName.labelText, SubElementName.fill);
+                styleClickHandler(
+                  ElementNameType.labelText,
+                  SubElementNameType.fill
+                );
               }}
               name="채우기"
             />
             {labelText?.stroke.isChanged ? <CheckRight>✓</CheckRight> : <></>}
             <ListItem
               isSelected={checkIsSelected(
-                ElementName.labelText,
-                SubElementName.stroke
+                ElementNameType.labelText,
+                SubElementNameType.stroke
               )}
               padding="third"
               clickHandler={() => {
-                styleClickHandler(ElementName.labelText, SubElementName.stroke);
+                styleClickHandler(
+                  ElementNameType.labelText,
+                  SubElementNameType.stroke
+                );
               }}
               name="윤곽선"
             />
           </List>
           {labelIcon?.isChanged ? <Check>✓</Check> : <></>}
           <ListItem
-            isSelected={checkIsSelected(ElementName.labelIcon)}
+            isSelected={checkIsSelected(ElementNameType.labelIcon)}
             padding="second"
-            clickHandler={() => styleClickHandler(ElementName.labelIcon)}
+            clickHandler={() => styleClickHandler(ElementNameType.labelIcon)}
             name="아이콘"
           />
         </List>
diff --git a/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx b/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
index 28bc1d1..11b96bd 100644
--- a/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/LightnessStyle.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from '../../../utils/styles/styled';
 import { Range } from '../SidebarContentFewer/DepthItem';
 import useInputRange from '../../../hooks/common/useInputRange';
-import { StyleKeyName } from '../../../store/common/type';
+import { StyleKeyType } from '../../../store/common/type';
 
 const LightnessWrapper = styled.div`
   display: flex;
@@ -23,8 +23,8 @@ const LightnessControlBar = styled(Range)`
 `;
 
 interface LightnessPropsInterface {
-  lightness: string;
-  onStyleChange: (key: StyleKeyName, value: string | number) => void;
+  lightness: number;
+  onStyleChange: (key: StyleKeyType, value: string | number) => void;
 }
 
 function LightnessStyle({
@@ -48,7 +48,7 @@ function LightnessStyle({
           id="styler__lightness"
           value={curRange}
           onChange={(e) => rangeChangeHandler(e)}
-          onMouseUp={() => rangeMouseUpHandler(StyleKeyName.lightness)}
+          onMouseUp={() => rangeMouseUpHandler(StyleKeyType.lightness)}
         />
       </LightnessWrapper>
     </div>
diff --git a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
index 1f75552..605a4cf 100644
--- a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from '../../../utils/styles/styled';
 import { Range } from '../SidebarContentFewer/DepthItem';
 import useInputRange from '../../../hooks/common/useInputRange';
-import { StyleKeyName } from '../../../store/common/type';
+import { StyleKeyType } from '../../../store/common/type';
 
 const SaturationWrapper = styled.div`
   display: flex;
@@ -23,8 +23,8 @@ const SaturationControlBar = styled(Range)`
 `;
 
 interface SaturationStyleProps {
-  saturation: string;
-  onStyleChange: (key: StyleKeyName, value: string | number) => void;
+  saturation: number;
+  onStyleChange: (key: StyleKeyType, value: string | number) => void;
 }
 
 function SaturationStyle({
@@ -47,7 +47,7 @@ function SaturationStyle({
         id="styler__saturation"
         value={curRange}
         onChange={(e) => rangeChangeHandler(e)}
-        onMouseUp={() => rangeMouseUpHandler(StyleKeyName.saturation)}
+        onMouseUp={() => rangeMouseUpHandler(StyleKeyType.saturation)}
       />
     </SaturationWrapper>
   );
diff --git a/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx b/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
index 9a5a186..d0fc9a0 100644
--- a/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/VisibilityStyle.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
-import { StyleKeyName } from '../../../store/common/type';
+import { StyleKeyType } from '../../../store/common/type';
 
 interface CheckedProp {
   checked: boolean;
@@ -47,7 +47,7 @@ const Circle = styled.div<CheckedProp>`
 
 interface VisibilityStyleProps {
   visibility: string;
-  onStyleChange: (key: StyleKeyName, value: string | number) => void;
+  onStyleChange: (key: StyleKeyType, value: string | number) => void;
 }
 
 function VisibilityStyle({
@@ -66,7 +66,7 @@ function VisibilityStyle({
       {list.map((item) => (
         <VisibilityItem
           key={item.value}
-          onClick={() => onStyleChange(StyleKeyName.visibility, item.value)}
+          onClick={() => onStyleChange(StyleKeyType.visibility, item.value)}
         >
           <Checkbox checked={visibility === item.value}>
             <Circle checked={visibility === item.value} />
diff --git a/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx b/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
index b69c10d..b345dff 100644
--- a/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/WeightStyle.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from '../../../utils/styles/styled';
 import { Range } from '../SidebarContentFewer/DepthItem';
 import useInputRange from '../../../hooks/common/useInputRange';
-import { StyleKeyName } from '../../../store/common/type';
+import { StyleKeyType } from '../../../store/common/type';
 
 const WeightWrapper = styled.div`
   display: flex;
@@ -23,8 +23,8 @@ const WeightControlBar = styled(Range)`
 `;
 
 interface WeightStyleProps {
-  weight: string;
-  onStyleChange: (key: StyleKeyName, value: string | number) => void;
+  weight: number;
+  onStyleChange: (key: StyleKeyType, value: string | number) => void;
 }
 
 function WeightStyle({
@@ -47,7 +47,7 @@ function WeightStyle({
         id="styler__weight"
         value={curRange}
         onChange={rangeChangeHandler}
-        onMouseUp={() => rangeMouseUpHandler(StyleKeyName.weight)}
+        onMouseUp={() => rangeMouseUpHandler(StyleKeyType.weight)}
       />
     </WeightWrapper>
   );
diff --git a/src/hooks/common/useInputRange.ts b/src/hooks/common/useInputRange.ts
index b3150e7..1b1bfc8 100644
--- a/src/hooks/common/useInputRange.ts
+++ b/src/hooks/common/useInputRange.ts
@@ -1,15 +1,15 @@
 import React, { useState, useEffect } from 'react';
-import { StyleKeyName } from '../../store/common/type';
+import { StyleKeyType } from '../../store/common/type';
 
 interface UseInputRangeProps {
   range: string | number;
-  onStyleChange: (key: StyleKeyName, value: string | number) => void;
+  onStyleChange: (key: StyleKeyType, value: string | number) => void;
 }
 
 interface InputRangeHookType {
   curRange: string | number;
   rangeChangeHandler: (e: React.ChangeEvent<HTMLInputElement>) => void;
-  rangeMouseUpHandler: (key: StyleKeyName) => void;
+  rangeMouseUpHandler: (key: StyleKeyType) => void;
 }
 
 function useInputRange({
@@ -26,7 +26,7 @@ function useInputRange({
     setCurRange(e.target.value);
   };
 
-  const rangeMouseUpHandler = (key: StyleKeyName) => {
+  const rangeMouseUpHandler = (key: StyleKeyType) => {
     onStyleChange(key, curRange);
   };
 
diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index 9f68346..b4929d4 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -5,10 +5,9 @@ import { RootState } from '../../store';
 import {
   FeatureNameType,
   StyleType,
+  StyleKeyType,
   ElementNameType,
   SubElementNameType,
-  ElementName,
-  StyleKeyName,
 } from '../../store/common/type';
 import { setStyle } from '../../store/style/action';
 import { getDefaultStyle } from '../../store/style/properties';
@@ -23,7 +22,7 @@ interface UseStyleTypeProps {
 
 export interface UseStyleHookType {
   styleElement: StyleType;
-  onStyleChange: (key: StyleKeyName, value: string | number) => void;
+  onStyleChange: (key: StyleKeyType, value: string | number) => void;
 }
 
 function useStyleType({
@@ -40,20 +39,18 @@ function useStyleType({
       return getDefaultStyle();
     }
     const feature = state[featureName][subFeatureName];
-    if (detailName === ElementName.labelIcon) return feature[detailName];
+    if (detailName === ElementNameType.labelIcon) return feature[detailName];
     return feature[detailName][subDetailName as SubElementNameType];
   }) as StyleType;
 
   const onStyleChange = useCallback(
-    (key: StyleKeyName, value: string | number) => {
+    (key: StyleKeyType, value: string | number) => {
       mapStyling[featureName]({
         map,
         subFeatureName,
         key,
         detailName,
-        key,
         subDetailName: subDetailName as SubElementNameType,
-        key,
         style: {
           ...styleElement,
           [key]: value,
diff --git a/src/store/style/compareStyle.ts b/src/store/style/compareStyle.ts
index 88459d7..7f8c506 100644
--- a/src/store/style/compareStyle.ts
+++ b/src/store/style/compareStyle.ts
@@ -1,5 +1,5 @@
 import { getDefaultStyle } from './properties';
-import { StyleType, StyleKeyType, objType, StyleKeyName } from '../common/type';
+import { StyleType, StyleKeyType, objType } from '../common/type';
 
 export function checkStyleIsChanged(targetStyle: StyleType): boolean {
   const defaultStyle: StyleType = getDefaultStyle();
@@ -7,7 +7,7 @@ export function checkStyleIsChanged(targetStyle: StyleType): boolean {
 
   const filteredKeys = keys.filter(
     (key) =>
-      key === StyleKeyName.isChanged || defaultStyle[key] === targetStyle[key]
+      key === StyleKeyType.isChanged || defaultStyle[key] === targetStyle[key]
   );
   return keys.length !== filteredKeys.length;
 }
diff --git a/src/store/style/getReducer.ts b/src/store/style/getReducer.ts
index e28724a..d32f05c 100644
--- a/src/store/style/getReducer.ts
+++ b/src/store/style/getReducer.ts
@@ -6,7 +6,7 @@ import {
   ActionType,
   SubElementNameType,
   objType,
-  ElementName,
+  ElementNameType,
 } from '../common/type';
 import { getDefaultFeature } from './properties';
 import { INIT, SET } from './action';
@@ -50,7 +50,7 @@ export default function getReducer(IDX: number): ReducerType {
         const newFeature: FeatureType = newState[subFeature as string];
 
         let prevIsChanged;
-        if (element === ElementName.labelIcon) {
+        if (element === ElementNameType.labelIcon) {
           prevIsChanged = newFeature[element].isChanged;
           newFeature[element] = style;
         } else {
diff --git a/src/store/style/properties.ts b/src/store/style/properties.ts
index b1b3661..83b0051 100644
--- a/src/store/style/properties.ts
+++ b/src/store/style/properties.ts
@@ -4,9 +4,9 @@ const style: StyleType = {
   isChanged: false,
   visibility: 'inherit',
   color: '#55bf40',
-  weight: '0',
-  saturation: '0',
-  lightness: '0',
+  weight: 0,
+  saturation: 0,
+  lightness: 0,
 };
 
 export const getDefaultStyle = (): StyleType => {
diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index bbcd645..42da7d0 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -2,49 +2,47 @@
 /* eslint-disable no-debugger */
 /* eslint-disable no-case-declarations */
 import mapboxgl from 'mapbox-gl';
-import { StyleKeyName } from '../store/common/type';
 import { hexToHSL } from './colorFormat';
 
-export enum ColorTypeName {
-  'fill-color' = 'fill-color',
-  'line-color' = 'line-color',
-  'text-color' = 'text-color',
-  'text-halo-color' = 'text-halo-color',
+export enum ColorType {
+  fill = 'fill-color',
+  line = 'line-color',
+  text = 'text-color',
+  textHalo = 'text-halo-color',
+  icon = 'icon-opacity',
 }
 
-export enum WeightTypeName {
-  'line-width' = 'line-width',
-  'text-halo-width' = 'text-halo-width',
-  'icon-opacity' = 'icon-opacity',
+export enum WeightType {
+  line = 'line-width',
+  textHalo = 'text-halo-width',
 }
-export type colorType = keyof typeof ColorTypeName;
-export type weightType = keyof typeof WeightTypeName;
 
-interface ApplyColorProps {
+interface ApplyProps {
   map: mapboxgl.Map;
   layerNames: string[];
   color?: string;
-  type?: colorType | weightType;
+  type?: StyleTypes;
   saturation?: number;
   lightness?: number;
-  weight?: string;
+  weight?: number;
   visibility?: string;
+}
 
-export enum visibilityType {
+export enum VisibilityType {
   visibility = 'visibility',
 }
 
-export type styleTypes = visibilityType | colorType | weightType;
+export type StyleTypes = VisibilityType | ColorType | WeightType;
 
 export function applyColor({
   map,
   layerNames,
-  color = '#000',
+  color,
   type,
   saturation,
   lightness,
-}: ApplyColorProps): void {
-  if (!type) return;
+}: ApplyProps): void {
+  if (!type || !color) return;
   const { h, s, l } = hexToHSL(color);
 
   if (saturation) {
@@ -76,8 +74,8 @@ export function applyVisibility({
   map,
   layerNames,
   visibility,
-}: ApplyColorProps): void {
-   layerNames.forEach((layerName) => {
+}: ApplyProps): void {
+  layerNames.forEach((layerName) => {
     if (visibility === 'inherit') {
       map.setLayoutProperty(layerName, 'visibility', 'visible');
     } else map.setLayoutProperty(layerName, 'visibility', visibility);
@@ -89,8 +87,8 @@ export function applyWeight({
   layerNames,
   type,
   weight,
-}: ApplyColorProps): void {
-  if (!type) return;
+}: ApplyProps): void {
+  if (!type || !weight) return;
 
   const weightValue = weight === 0 ? 0 : weight * 2 + 1;
   layerNames.forEach((layerName) => {
diff --git a/src/utils/map-styling/administrative.ts b/src/utils/map-styling/administrative.ts
index 8bd318c..459b846 100644
--- a/src/utils/map-styling/administrative.ts
+++ b/src/utils/map-styling/administrative.ts
@@ -1,12 +1,12 @@
 import { stylingProps } from '.';
 import {
-  ElementName,
-  SubElementName,
-  StyleKeyName,
+  ElementNameType,
+  SubElementNameType,
+  StyleKeyType,
 } from '../../store/common/type';
 import {
-  ColorTypeName,
-  WeightTypeName,
+  ColorType,
+  WeightType,
   applyVisibility,
   applyColor,
   applyWeight,
@@ -58,21 +58,25 @@ function administrativeStyling({
 }: stylingProps): void {
   const mappingLayers = layers[subFeatureName as subFeatureNameType];
 
-  if (detailName === ElementName.labelIcon) return;
-  if (detailName === ElementName.labelText) {
+  if (detailName === ElementNameType.labelIcon) return;
+  if (detailName === ElementNameType.labelText) {
     // labelText - fill
-    if (subDetailName === SubElementName.fill) {
-      if (key === StyleKeyName.weight) return;
-      if (key === StyleKeyName.visibility) {
+    if (subDetailName === SubElementNameType.fill) {
+      if (key === StyleKeyType.weight) return;
+      if (key === StyleKeyType.visibility) {
         const styleValue = style[key] === 'none' ? 'none' : 'visible';
-        applyVisibility(map, mappingLayers.symbol, styleValue);
+        applyVisibility({
+          map,
+          layerNames: mappingLayers.symbol,
+          visibility: styleValue,
+        });
         return;
       }
 
       applyColor({
         map,
         layerNames: mappingLayers.symbol,
-        type: ColorTypeName['text-color'],
+        type: ColorType.text,
         color: style.color,
         [key]: style[key],
       });
@@ -80,21 +84,21 @@ function administrativeStyling({
     }
 
     // labelText - stroke
-    if (key === StyleKeyName.weight || key === StyleKeyName.visibility) {
+    if (key === StyleKeyType.weight || key === StyleKeyType.visibility) {
       const styleValue = style.visibility === 'none' ? 0 : Number(style.weight);
-      applyWeight(
+      applyWeight({
         map,
-        mappingLayers.symbol,
-        WeightTypeName['text-halo-width'],
-        styleValue
-      );
+        layerNames: mappingLayers.symbol,
+        type: WeightType.textHalo,
+        weight: styleValue,
+      });
       return;
     }
 
     applyColor({
       map,
       layerNames: mappingLayers.symbol,
-      type: ColorTypeName['text-halo-color'],
+      type: ColorType.textHalo,
       color: style.color,
       [key]: style[key],
     });
@@ -105,26 +109,26 @@ function administrativeStyling({
   if (
     subFeatureName === 'locality' ||
     subFeatureName === 'neighborhood' ||
-    subDetailName === SubElementName.fill
+    subDetailName === SubElementNameType.fill
   )
     return;
 
   // section - stroke
-  if (key === StyleKeyName.weight || key === StyleKeyName.visibility) {
+  if (key === StyleKeyType.weight || key === StyleKeyType.visibility) {
     const styleValue = style.visibility === 'none' ? 0 : Number(style.weight);
-    applyWeight(
+    applyWeight({
       map,
-      mappingLayers.line,
-      WeightTypeName['line-width'],
-      styleValue
-    );
+      layerNames: mappingLayers.line,
+      type: WeightType.line,
+      weight: styleValue,
+    });
     return;
   }
 
   applyColor({
     map,
     layerNames: mappingLayers.line,
-    type: ColorTypeName['line-color'],
+    type: ColorType.line,
     color: style.color,
     [key]: style[key],
   });
diff --git a/src/utils/map-styling/index.ts b/src/utils/map-styling/index.ts
index d45bbc0..1b259cf 100644
--- a/src/utils/map-styling/index.ts
+++ b/src/utils/map-styling/index.ts
@@ -2,18 +2,16 @@ import mapboxgl from 'mapbox-gl';
 import {
   ElementNameType,
   SubElementNameType,
-  StyleKeyName,
+  StyleKeyType,
   StyleType,
 } from '../../store/common/type';
 
 export interface stylingProps {
   map: mapboxgl.Map;
   subFeatureName: string;
-  key: string;
   detailName: ElementNameType;
-  key: string;
   subDetailName: SubElementNameType;
-  key: StyleKeyName;
+  key: StyleKeyType;
   style: StyleType;
 }
 
diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index dec32f1..48ee551 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -1,10 +1,5 @@
 import { stylingProps } from './index';
-import {
-  applyColor,
-  applyLightness,
-  applyVisibility,
-  applySaturation,
-} from '../applyStyle';
+import { applyColor, applyVisibility, ColorType } from '../applyStyle';
 import { StyleType } from '../../store/common/type';
 
 const SECTION = 'section';
@@ -20,24 +15,24 @@ interface applyStyleProps {
 }
 
 function applyLandscapeStyle({ map, subFeatureName, style }: applyStyleProps) {
-  const layerName = `landscape-${subFeatureName}`;
+  const layerNames = [`landscape-${subFeatureName}`];
 
-  applyColor(map, layerName, 'fill-color', style.color);
-  applyVisibility(map, layerName, style.visibility);
-  applyLightness(
+  applyColor({ map, layerNames, type: ColorType.fill, color: style.color });
+  applyVisibility({ map, layerNames, visibility: style.visibility });
+  applyColor({
     map,
-    layerName,
-    'fill-color',
-    style.color,
-    Number(style.lightness)
-  );
-  applySaturation(
+    layerNames,
+    type: ColorType.fill,
+    color: style.color,
+    lightness: Number(style.lightness),
+  });
+  applyColor({
     map,
-    layerName,
-    'fill-color',
-    style.color,
-    Number(style.saturation)
-  );
+    layerNames,
+    type: ColorType.fill,
+    color: style.color,
+    saturation: Number(style.saturation),
+  });
 }
 
 function landscapeStyling({
diff --git a/src/utils/map-styling/poi.ts b/src/utils/map-styling/poi.ts
index 11011c0..a7acf1f 100644
--- a/src/utils/map-styling/poi.ts
+++ b/src/utils/map-styling/poi.ts
@@ -4,12 +4,11 @@ import {
   applyColor,
   applyWeight,
   applyVisibility,
-  colorType,
-  weightType,
-  WeightTypeName,
-  ColorTypeName,
+  WeightType,
+  ColorType,
+  StyleTypes,
 } from '../applyStyle';
-import { StyleKeyType, ElementName } from '../../store/common/type';
+import { StyleKeyType, ElementNameType } from '../../store/common/type';
 
 type PoiSubFeature =
   | 'all'
@@ -27,8 +26,8 @@ type POI_LAYERS_TYPE = {
   [name in PoiSubFeature]: string[];
 };
 
-const VISIBLE = '1';
-const INVISIBLE = '0';
+const VISIBLE = 1;
+const INVISIBLE = 0;
 const POI_LAYERS: POI_LAYERS_TYPE = {
   all: [
     'poi-attraction',
@@ -74,15 +73,15 @@ const mappingDetailToFunc = {
   labelText: {
     fill: {
       color: {
-        typeName: ColorTypeName['text-color'],
+        typeName: ColorType.text,
         funcName: applyColor,
       },
       saturation: {
-        typeName: ColorTypeName['text-color'],
+        typeName: ColorType.text,
         funcName: applyColor,
       },
       lightness: {
-        typeName: ColorTypeName['text-color'],
+        typeName: ColorType.text,
         funcName: applyColor,
       },
       weight: {
@@ -100,23 +99,23 @@ const mappingDetailToFunc = {
     },
     stroke: {
       color: {
-        typeName: ColorTypeName['text-halo-color'],
+        typeName: ColorType.textHalo,
         funcName: applyColor,
       },
       saturation: {
-        typeName: ColorTypeName['text-halo-color'],
+        typeName: ColorType.textHalo,
         funcName: applyColor,
       },
       lightness: {
-        typeName: ColorTypeName['text-halo-color'],
+        typeName: ColorType.textHalo,
         funcName: applyColor,
       },
       weight: {
-        typeName: WeightTypeName['text-halo-width'],
+        typeName: WeightType.textHalo,
         funcName: applyWeight,
       },
       visibility: {
-        typeName: WeightTypeName['text-halo-width'],
+        typeName: WeightType.textHalo,
         funcName: applyWeight,
       },
       isChanged: {
@@ -143,7 +142,7 @@ const mappingDetailToFunc = {
       funcName: () => null,
     },
     visibility: {
-      typeName: WeightTypeName['icon-opacity'],
+      typeName: ColorType.icon,
       funcName: applyWeight,
     },
     isChanged: {
@@ -164,8 +163,8 @@ function poiStyling({
   let type = null;
   let func = null;
 
-  if (detailName === ElementName.section) return;
-  if (detailName === ElementName.labelText) {
+  if (detailName === ElementNameType.section) return;
+  if (detailName === ElementNameType.labelText) {
     const { typeName, funcName } = mappingDetailToFunc[detailName][
       subDetailName
     ][key as StyleKeyType];
@@ -182,8 +181,7 @@ function poiStyling({
   if (!type) return;
   if (
     key === 'visibility' &&
-    (type === WeightTypeName['icon-opacity'] ||
-      type === WeightTypeName['text-halo-width'])
+    (type === ColorType.icon || type === WeightType.textHalo)
   ) {
     func({
       map,
@@ -197,7 +195,7 @@ function poiStyling({
   func({
     map,
     layerNames: POI_LAYERS[subFeatureName as PoiSubFeature],
-    type: type as weightType | colorType,
+    type: type as StyleTypes,
     color: style.color,
     [key]: style[key as StyleKeyType],
   });
diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
index 7a40419..aaf310a 100644
--- a/src/utils/map-styling/road.ts
+++ b/src/utils/map-styling/road.ts
@@ -1,30 +1,12 @@
 import { stylingProps } from '.';
-import { applyVisibility, applyColor, applyWeight } from '../applyStyle';
-
-type KeyType = 'visibility' | 'color' | 'weight' | 'saturation' | 'lightness';
-
-/**
- * visibility inherit 처리 applyStyle에서
- * color, saturation, lightness 한 함수로 처리
- *   - section
- *     - fill : line 'line-color', symbol, polygon 'fill-color'
- *     - stroke : line 'case layer'의 색상, symbol 불변, polygon이면 불변
- *   - label
- *     - text fill: 'text-color', 'text-width'
- *     - text stroke: 'text-halo-color', 'text-halo-width'
- *
- */
-
-/**
- * 20.12.01.
- * highway : 분류 보류
- * aterial: line이라 채우기 윤곽선은 한번에 처리, 채우기 윤곽선 확인완료, 아이콘 없음
- * local: 지금 있는 것들은 section fill밖에 의미없음
- * sidewalk: 확인 완료
- *
- * 색상을 변경하지 않은채로 채도나 밝기부터 선택하면 색상팔레트 색 기준으로 조정이 됨
- * fix 필요
- */
+import {
+  applyVisibility,
+  applyColor,
+  applyWeight,
+  ColorType,
+  WeightType,
+} from '../applyStyle';
+import { StyleKeyType } from '../../store/common/type';
 
 function roadStyling({
   map,
@@ -50,75 +32,91 @@ function roadStyling({
       subDetailName === 'fill' &&
       key === 'visibility'
     ) {
-      applyVisibility(map, arterialLayerNames, visibility);
+      applyVisibility({ map, layerNames: arterialLayerNames, visibility });
     } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
       if (detailName === 'section' && subDetailName === 'fill') {
         applyColor({
           map,
           layerNames: ['road-arterial'],
           color,
-          type: 'line-color',
-          [key]: style[key as KeyType],
+          type: ColorType.line,
+          [key]: style[key as StyleKeyType],
         });
       } else if (detailName === 'labelText' && subDetailName === 'fill') {
         applyColor({
           map,
           layerNames: ['road-number-shield', 'road-exit-shield', 'road-label'],
           color,
-          type: 'text-color',
-          [key]: style[key as KeyType],
+          type: ColorType.text,
+          [key]: style[key as StyleKeyType],
         });
       } else if (detailName === 'labelText' && subDetailName === 'stroke') {
         applyColor({
           map,
           layerNames: ['road-label'],
           color,
-          type: 'text-halo-color',
-          [key]: style[key as KeyType],
+          type: ColorType.textHalo,
+          [key]: style[key as StyleKeyType],
         });
       }
     } else if (key === 'weight') {
       if (detailName === 'section' && subDetailName === 'fill') {
-        applyWeight(map, ['road-arterial'], 'line-width', weight);
+        applyWeight({
+          map,
+          layerNames: ['road-arterial'],
+          type: WeightType.line,
+          weight,
+        });
       }
       if (detailName === 'labelText' && subDetailName === 'stroke')
-        applyWeight(map, ['road-label'], 'text-halo-width', weight);
+        applyWeight({
+          map,
+          layerNames: ['road-label'],
+          type: ColorType.textHalo,
+          weight,
+        });
     }
   } else if (subFeatureName === 'local') {
-    if (key === 'visibility') applyVisibility(map, localLayerNames, visibility);
+    if (key === 'visibility')
+      applyVisibility({ map, layerNames: localLayerNames, visibility });
     else if (key === 'color' || key === 'saturation' || key === 'lightness') {
       if (detailName === 'section' && subDetailName === 'fill') {
         applyColor({
           map,
           layerNames: ['ferry', 'ferry-auto', 'road-local'],
           color,
-          type: 'line-color',
-          [key]: style[key as KeyType],
+          type: ColorType.line,
+          [key]: style[key as StyleKeyType],
         });
       }
     } else if (key === 'weight') {
       if (detailName === 'section' && subDetailName === 'fill')
-        applyWeight(
+        applyWeight({
           map,
-          ['ferry', 'ferry-auto', 'road-local'],
-          'line-width',
-          weight
-        );
+          layerNames: ['ferry', 'ferry-auto', 'road-local'],
+          type: WeightType.line,
+          weight,
+        });
     }
   } else if (subFeatureName === 'sidewalk') {
     if (key === 'visibility')
-      applyVisibility(map, sidewalkLayerNames, visibility);
+      applyVisibility({ map, layerNames: sidewalkLayerNames, visibility });
     else if (key === 'weight') {
       if (detailName === 'section' && subDetailName === 'fill')
-        applyWeight(map, sidewalkLayerNames, 'line-width', weight);
+        applyWeight({
+          map,
+          layerNames: sidewalkLayerNames,
+          type: WeightType.line,
+          weight,
+        });
     } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
       if (detailName === 'section' && subDetailName === 'fill')
         applyColor({
           map,
           layerNames: sidewalkLayerNames,
           color,
-          type: 'line-color',
-          [key]: style[key as KeyType],
+          type: ColorType.line,
+          [key]: style[key as StyleKeyType],
         });
     }
   }
diff --git a/src/utils/map-styling/transit.ts b/src/utils/map-styling/transit.ts
index ef6d703..6f84c12 100644
--- a/src/utils/map-styling/transit.ts
+++ b/src/utils/map-styling/transit.ts
@@ -1,21 +1,22 @@
 /* eslint-disable no-nested-ternary */
-/* eslint-disable no-debugger */
 /* eslint-disable no-case-declarations */
 import { stylingProps } from '.';
-import { StyleKeyName, StyleType } from '../../store/common/type';
+import {
+  StyleKeyType,
+  ElementNameType,
+  SubElementNameType,
+} from '../../store/common/type';
 import {
   applyVisibility,
   applyColor,
   applyWeight,
-  applyTextSize,
-  ColorTypeName,
-  styleTypes,
-  WeightTypeName,
+  ColorType,
+  WeightType,
+  StyleTypes,
 } from '../../utils/applyStyle';
 
 const AirportLayerNames = [
   'airport-label',
-
   'aeroway-polygon',
   'transit-airport',
   'aeroway-line',
@@ -40,71 +41,80 @@ function transitStyling({
   subDetailName,
   style,
 }: stylingProps): void {
-  const layers =
-    subFeatureName === 'all'
-      ? [...AllLayerTypeKeys]
-      : subFeatureName === 'subway'
-      ? [...SubwayLayerNames]
-      : subFeatureName === 'bus'
-      ? [...BusLayerNames]
-      : subFeatureName === 'airport'
-      ? [...AirportLayerNames]
-      : [...RailLayerNames];
+  let layers: string[];
+  switch (subFeatureName) {
+    case 'all':
+      layers = [...AllLayerTypeKeys];
+      break;
+    case 'subway':
+      layers = [...SubwayLayerNames];
+      break;
+    case 'bus':
+      layers = [...BusLayerNames];
+      break;
+    case 'airport':
+      layers = [...AirportLayerNames];
+      break;
+    case 'rail':
+      layers = [...RailLayerNames];
+      break;
+    default:
+      return;
+  }
 
   let layersByDetailName: string[];
-  let styleType: styleTypes;
-  debugger;
+  let styleType: StyleTypes;
+
   switch (detailName) {
-    case 'section':
+    case ElementNameType.section:
       layersByDetailName = layers.filter((layer) => !layer.includes('label'));
       styleType =
-        subDetailName === 'stroke'
-          ? key === 'weight'
-            ? WeightTypeName['line-width']
-            : ColorTypeName['line-color']
-          : ColorTypeName['fill-color'];
+        subDetailName === SubElementNameType.stroke
+          ? key === StyleKeyType.weight
+            ? WeightType.line
+            : ColorType.line
+          : ColorType.fill;
 
       break;
-    case 'labelText':
+    case ElementNameType.labelText:
       layersByDetailName = layers.filter((layer) => layer.includes('label'));
       styleType =
-        subDetailName === 'stroke'
-          ? key === 'weight'
-            ? WeightTypeName['text-halo-width']
-            : ColorTypeName['text-halo-color']
-          : key === 'weight'
-          ? WeightTypeName['text-size']
-          : ColorTypeName['text-color'];
-      debugger;
+        subDetailName === SubElementNameType.stroke
+          ? key === StyleKeyType.weight
+            ? WeightType.textHalo
+            : ColorType.textHalo
+          : ColorType.text;
       break;
-    case 'labelIcon':
+    case ElementNameType.labelIcon:
       layersByDetailName = layers.filter((layer) => !layer.includes('label'));
       styleType =
-        subDetailName === 'stroke'
-          ? ColorTypeName['line-color']
-          : ColorTypeName['fill-color'];
+        subDetailName === SubElementNameType.stroke
+          ? ColorType.line
+          : ColorType.fill;
       break;
 
     default:
       return;
   }
 
-  const styleKey: StyleKeyName = key as StyleKeyName;
+  const styleKey: StyleKeyType = key as StyleKeyType;
   const { [styleKey]: value } = style;
-  let stylerFunction: (obj: any) => void;
 
   switch (styleKey) {
-    case StyleKeyName.visibility:
-      stylerFunction = ({ layerNames }: { layerNames: string[] }) =>
-        applyVisibility(map, layerNames, value as string);
+    case StyleKeyType.visibility:
+      applyVisibility({
+        map,
+        layerNames: layersByDetailName,
+        visibility: value as string,
+      });
       break;
 
-    case StyleKeyName.color:
-    case StyleKeyName.saturation:
-    case StyleKeyName.lightness:
-      const colorKey = StyleKeyName.color;
-      const satKey = StyleKeyName.saturation;
-      const ligKey = StyleKeyName.lightness;
+    case StyleKeyType.color:
+    case StyleKeyType.saturation:
+    case StyleKeyType.lightness:
+      const colorKey = StyleKeyType.color;
+      const satKey = StyleKeyType.saturation;
+      const ligKey = StyleKeyType.lightness;
 
       const satureOrLight =
         key === 'saturation'
@@ -112,40 +122,30 @@ function transitStyling({
           : key === 'lightness'
           ? { lightness: +style[ligKey] }
           : {};
-      stylerFunction = ({ layerNames }: { layerNames: string[] }) =>
-        applyColor({
+      applyColor({
+        map,
+        layerNames: layersByDetailName,
+        type: styleType,
+        color: style[colorKey],
+        ...satureOrLight,
+      });
+      break;
+
+    case StyleKeyType.weight:
+      if (subDetailName !== 'fill') {
+        applyWeight({
           map,
-          layerNames,
-          type: styleType,
-          color: style[colorKey],
-          ...satureOrLight,
+          layerNames: layersByDetailName,
+          type: styleType as WeightType,
+          weight: value as number,
         });
-      break;
+      }
 
-    case StyleKeyName.weight:
-      stylerFunction =
-        subDetailName !== 'fill'
-          ? ({ layerNames }: { layerNames: string[] }) =>
-              applyWeight(
-                map,
-                layerNames,
-                styleType as WeightTypeName,
-                value as string
-              )
-          : ({ layerNames }: { layerNames: string[] }) =>
-              applyTextSize(
-                map,
-                layerNames,
-                styleType as WeightTypeName,
-                value as string
-              );
       break;
 
     default:
-      return;
+      break;
   }
-
-  stylerFunction({ layerNames: layersByDetailName });
 }
 
 export default transitStyling;
diff --git a/src/utils/map-styling/water.ts b/src/utils/map-styling/water.ts
index 2261cb5..a87215d 100644
--- a/src/utils/map-styling/water.ts
+++ b/src/utils/map-styling/water.ts
@@ -1,12 +1,12 @@
 import { stylingProps } from '.';
 import {
-  ElementName,
-  SubElementName,
-  StyleKeyName,
+  ElementNameType,
+  SubElementNameType,
+  StyleKeyType,
 } from '../../store/common/type';
 import {
-  ColorTypeName,
-  WeightTypeName,
+  ColorType,
+  WeightType,
   applyVisibility,
   applyColor,
   applyWeight,
@@ -24,22 +24,26 @@ function waterStyling({
   key,
   style,
 }: stylingProps): void {
-  if (detailName === ElementName.labelIcon) return;
+  if (detailName === ElementNameType.labelIcon) return;
 
-  if (detailName === ElementName.labelText) {
+  if (detailName === ElementNameType.labelText) {
     // labelText - fill
-    if (subDetailName === SubElementName.fill) {
-      if (key === StyleKeyName.weight) return;
-      if (key === StyleKeyName.visibility) {
+    if (subDetailName === SubElementNameType.fill) {
+      if (key === StyleKeyType.weight) return;
+      if (key === StyleKeyType.visibility) {
         const styleValue = style[key] === 'none' ? 'none' : 'visible';
-        applyVisibility(map, layers.symbol, styleValue);
+        applyVisibility({
+          map,
+          layerNames: layers.symbol,
+          visibility: styleValue,
+        });
         return;
       }
 
       applyColor({
         map,
         layerNames: layers.symbol,
-        type: ColorTypeName['text-color'],
+        type: ColorType.text,
         color: style.color,
         [key]: style[key],
       });
@@ -47,21 +51,21 @@ function waterStyling({
     }
 
     // labelText - stroke
-    if (key === StyleKeyName.weight || key === StyleKeyName.visibility) {
+    if (key === StyleKeyType.weight || key === StyleKeyType.visibility) {
       const styleValue = style.visibility === 'none' ? 0 : Number(style.weight);
-      applyWeight(
+      applyWeight({
         map,
-        layers.symbol,
-        WeightTypeName['text-halo-width'],
-        styleValue
-      );
+        layerNames: layers.symbol,
+        type: WeightType.textHalo,
+        weight: styleValue,
+      });
       return;
     }
 
     applyColor({
       map,
       layerNames: layers.symbol,
-      type: ColorTypeName['text-halo-color'],
+      type: ColorType.textHalo,
       color: style.color,
       [key]: style[key],
     });
@@ -69,20 +73,27 @@ function waterStyling({
   }
 
   // section - stroke
-  if (subDetailName === SubElementName.stroke || key === StyleKeyName.weight)
+  if (
+    subDetailName === SubElementNameType.stroke ||
+    key === StyleKeyType.weight
+  )
     return;
 
   // section - fill
-  if (key === StyleKeyName.visibility) {
+  if (key === StyleKeyType.visibility) {
     const styleValue = style[key] === 'none' ? 'none' : 'visible';
-    applyVisibility(map, layers.polygon, styleValue);
+    applyVisibility({
+      map,
+      layerNames: layers.polygon,
+      visibility: styleValue,
+    });
     return;
   }
 
   applyColor({
     map,
     layerNames: layers.polygon,
-    type: ColorTypeName['fill-color'],
+    type: ColorType.fill,
     color: style.color,
     [key]: style[key],
   });
diff --git a/src/utils/rendering-data/featureTypeData.ts b/src/utils/rendering-data/featureTypeData.ts
index b9c2380..fb7a5d5 100644
--- a/src/utils/rendering-data/featureTypeData.ts
+++ b/src/utils/rendering-data/featureTypeData.ts
@@ -12,7 +12,7 @@ export interface DataType {
 
 const data: DataType[] = [
   {
-    typeKey: 'poi',
+    typeKey: FeatureNameType.poi,
     typeName: 'POI',
     features: [
       { key: 'landmark', name: '랜드마크' },
@@ -27,7 +27,7 @@ const data: DataType[] = [
     ],
   },
   {
-    typeKey: 'road',
+    typeKey: FeatureNameType.road,
     typeName: '도로',
     features: [
       { key: 'highway', name: '고속도로' },
@@ -37,7 +37,7 @@ const data: DataType[] = [
     ],
   },
   {
-    typeKey: 'administrative',
+    typeKey: FeatureNameType.administrative,
     typeName: '행정구역',
     features: [
       { key: 'country', name: '국가' },
@@ -46,7 +46,7 @@ const data: DataType[] = [
     ],
   },
   {
-    typeKey: 'landscape',
+    typeKey: FeatureNameType.landscape,
     typeName: '경관',
     features: [
       { key: 'human-made', name: '인공물' },
@@ -57,7 +57,7 @@ const data: DataType[] = [
     ],
   },
   {
-    typeKey: 'transit',
+    typeKey: FeatureNameType.transit,
     typeName: '교통',
     features: [
       { key: 'airport', name: '공항' },
@@ -66,8 +66,8 @@ const data: DataType[] = [
       { key: 'subway', name: '지하철' },
     ],
   },
-  { typeKey: 'water', typeName: '물', features: [] },
-  { typeKey: 'marker', typeName: '마크', features: [] },
+  { typeKey: FeatureNameType.water, typeName: '물', features: [] },
+  { typeKey: FeatureNameType.marker, typeName: '마크', features: [] },
 ];
 
 export default data;

From d569ba31dc94faae6ff7929cbc3d4191eacc9cfa Mon Sep 17 00:00:00 2001
From: tejava <goddrinktejava@gmail.com>
Date: Wed, 2 Dec 2020 14:49:45 +0900
Subject: [PATCH 070/138] =?UTF-8?q?[fix]=20key=EA=B0=92=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=9D=BC=20=EC=83=88=EB=A1=9C=20=EB=A0=8C=EB=8D=94?=
 =?UTF-8?q?=EB=A7=81=EB=90=98=EB=8A=94=20=EB=B6=80=EB=B6=84=EC=9D=84=20?=
 =?UTF-8?q?=EC=B5=9C=EC=86=8C=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

기존의 구현은 key를 인자로 받지 못해 모든 요소를 재설정했다.
이를 막고자 PR에서 추가된 key를 기반으로 분기를 나누어 업데이트하도록 했다.
---
 src/utils/map-styling/landscape.ts | 64 ++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index 48ee551..1964333 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -1,6 +1,6 @@
 import { stylingProps } from './index';
 import { applyColor, applyVisibility, ColorType } from '../applyStyle';
-import { StyleType } from '../../store/common/type';
+import { StyleKeyType, StyleType } from '../../store/common/type';
 
 const SECTION = 'section';
 const FILL = 'fill';
@@ -11,28 +11,51 @@ const layers = ['human-made', 'building', 'natural', 'landcover'];
 interface applyStyleProps {
   map: mapboxgl.Map;
   subFeatureName: string;
+  key: StyleKeyType;
   style: StyleType;
 }
 
-function applyLandscapeStyle({ map, subFeatureName, style }: applyStyleProps) {
+function applyLandscapeStyle({
+  map,
+  subFeatureName,
+  key,
+  style,
+}: applyStyleProps): void {
   const layerNames = [`landscape-${subFeatureName}`];
 
-  applyColor({ map, layerNames, type: ColorType.fill, color: style.color });
-  applyVisibility({ map, layerNames, visibility: style.visibility });
-  applyColor({
-    map,
-    layerNames,
-    type: ColorType.fill,
-    color: style.color,
-    lightness: Number(style.lightness),
-  });
-  applyColor({
-    map,
-    layerNames,
-    type: ColorType.fill,
-    color: style.color,
-    saturation: Number(style.saturation),
-  });
+  switch (key) {
+    case 'color':
+      applyColor({
+        map,
+        layerNames,
+        type: ColorType.fill,
+        color: style.color,
+      });
+      break;
+    case 'visibility':
+      applyVisibility({ map, layerNames, visibility: style.visibility });
+      break;
+    case 'lightness':
+      applyColor({
+        map,
+        layerNames,
+        type: ColorType.fill,
+        color: style.color,
+        lightness: Number(style.lightness),
+      });
+      break;
+    case 'saturation':
+      applyColor({
+        map,
+        layerNames,
+        type: ColorType.fill,
+        color: style.color,
+        saturation: Number(style.saturation),
+      });
+      break;
+    default:
+      break;
+  }
 }
 
 function landscapeStyling({
@@ -40,6 +63,7 @@ function landscapeStyling({
   subFeatureName,
   detailName,
   subDetailName,
+  key,
   style,
 }: stylingProps): void {
   if (detailName !== SECTION || subDetailName !== FILL) {
@@ -48,10 +72,10 @@ function landscapeStyling({
 
   if (subFeatureName === ALL) {
     layers.forEach((item) =>
-      applyLandscapeStyle({ map, subFeatureName: item, style })
+      applyLandscapeStyle({ map, subFeatureName: item, key, style })
     );
   } else {
-    applyLandscapeStyle({ map, subFeatureName, style });
+    applyLandscapeStyle({ map, subFeatureName, key, style });
   }
 }
 

From dfa4f7b33e7d08dbcd59fd1be1175b5a3035f471 Mon Sep 17 00:00:00 2001
From: gitgitwi <johnwi@knou.ac.kr>
Date: Wed, 2 Dec 2020 15:10:08 +0900
Subject: [PATCH 071/138] =?UTF-8?q?[FIX]=20[#86]=20=EC=9D=BC=EB=B6=80=20ma?=
 =?UTF-8?q?pbox=20=EB=A0=88=EC=9D=B4=EC=96=B4=20=EC=95=88=EB=B3=B4?=
 =?UTF-8?q?=EC=9D=B4=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 관련 항목 transit layer data에 직접 추가
  - mapbox 의 관련 layer는 초기 실행시 삭제할 필요
- mapbox transit-label은 여전히 안되어서 삭제
---
 src/store/map/layers/transit.ts | 111 ++++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)

diff --git a/src/store/map/layers/transit.ts b/src/store/map/layers/transit.ts
index 18a3ae4..b15482d 100644
--- a/src/store/map/layers/transit.ts
+++ b/src/store/map/layers/transit.ts
@@ -12,6 +12,96 @@ export default [
     filter: ['in', 'class', 'airport'],
     id: 'transit-airport',
   },
+  {
+    id: 'mapbox-aeroway-polygon',
+    type: 'fill',
+    metadata: {},
+    source: 'composite',
+    'source-layer': 'aeroway',
+    minzoom: 11,
+    filter: [
+      'all',
+      ['==', ['geometry-type'], 'Polygon'],
+      ['match', ['get', 'type'], ['runway', 'taxiway', 'helipad'], true, false],
+    ],
+    layout: {},
+    paint: {
+      'fill-color': [
+        'interpolate',
+        ['linear'],
+        ['zoom'],
+        15,
+        'hsl(230, 23%, 82%)',
+        16,
+        'hsl(230, 37%, 84%)',
+      ],
+      'fill-opacity': ['interpolate', ['linear'], ['zoom'], 11, 0, 11.5, 1],
+    },
+  },
+  {
+    id: 'mapbox-aeroway-line',
+    type: 'line',
+    metadata: {},
+    source: 'composite',
+    'source-layer': 'aeroway',
+    minzoom: 9,
+    filter: ['==', ['geometry-type'], 'LineString'],
+    layout: {},
+    paint: {
+      'line-color': [
+        'interpolate',
+        ['linear'],
+        ['zoom'],
+        15,
+        'hsl(230, 23%, 82%)',
+        16,
+        'hsl(230, 37%, 84%)',
+      ],
+      'line-width': [
+        'interpolate',
+        ['exponential', 1.5],
+        ['zoom'],
+        9,
+        ['match', ['get', 'type'], 'runway', 1, 'taxiway', 0.5, 0.5],
+        18,
+        ['match', ['get', 'type'], 'runway', 80, 'taxiway', 20, 20],
+      ],
+    },
+  },
+  {
+    id: 'mapbox-airport-label',
+    type: 'symbol',
+    source: 'composite',
+    'source-layer': 'airport_label',
+    minzoom: 8,
+    layout: {
+      'text-size': 12,
+      'icon-image': [
+        'step',
+        ['get', 'sizerank'],
+        ['concat', ['get', 'maki'], '-15'],
+        9,
+        ['concat', ['get', 'maki'], '-11'],
+      ],
+      'text-offset': [0, 0.75],
+      'text-rotation-alignment': 'viewport',
+      'text-anchor': 'top',
+      'text-field': [
+        'step',
+        ['get', 'sizerank'],
+        ['coalesce', ['get', 'name_en'], ['get', 'name']],
+        15,
+        ['get', 'ref'],
+      ],
+      'text-max-width': 9,
+    },
+    paint: {
+      'text-color': 'hsl(0, 69%, 50%)',
+      'text-halo-color': 'hsl(0, 0%, 100%)',
+      'text-halo-width': 1,
+    },
+  },
+
   {
     type: 'line',
     source: 'line_source',
@@ -38,6 +128,27 @@ export default [
     filter: ['in', 'type', 'rail'],
     id: 'transit-rail',
   },
+  {
+    type: 'line',
+    source: 'composite',
+    'source-layer': 'road',
+    layout: {
+      visibility: 'visible',
+      'line-join': 'round',
+    },
+    minzoom: 13,
+
+    paint: {
+      'line-color': 'hsl(234, 20%, 30%)',
+      'line-width': 6,
+    },
+    filter: [
+      'all',
+      ['match', ['get', 'class'], ['major_rail', 'minor_rail'], true, false],
+      ['match', ['get', 'structure'], ['none', 'ford'], true, false],
+    ],
+    id: 'mapbox-rail-road',
+  },
   {
     type: 'symbol',
     source: 'poi_source',

From b98c0b5a87795f1cce3c6a48a7e1931be5af23ab Mon Sep 17 00:00:00 2001
From: gitgitwi <johnwi@knou.ac.kr>
Date: Wed, 2 Dec 2020 15:26:20 +0900
Subject: [PATCH 072/138] =?UTF-8?q?[PERF]=20[#86]=20=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=96=B4=20=EC=83=89=EC=83=81=20=EC=9D=BC=EB=B6=80=20=EC=A1=B0?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/map/layers/transit.ts | 37 ++++++++++-----------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/store/map/layers/transit.ts b/src/store/map/layers/transit.ts
index b15482d..aa0fe80 100644
--- a/src/store/map/layers/transit.ts
+++ b/src/store/map/layers/transit.ts
@@ -7,7 +7,7 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'fill-color': 'hsl(230, 100%, 44%)',
+      'fill-color': 'hsl(234, 20%, 30%)',
     },
     filter: ['in', 'class', 'airport'],
     id: 'transit-airport',
@@ -26,16 +26,7 @@ export default [
     ],
     layout: {},
     paint: {
-      'fill-color': [
-        'interpolate',
-        ['linear'],
-        ['zoom'],
-        15,
-        'hsl(230, 23%, 82%)',
-        16,
-        'hsl(230, 37%, 84%)',
-      ],
-      'fill-opacity': ['interpolate', ['linear'], ['zoom'], 11, 0, 11.5, 1],
+      'fill-color': 'hsl(40, 97%, 64%)',
     },
   },
   {
@@ -48,15 +39,7 @@ export default [
     filter: ['==', ['geometry-type'], 'LineString'],
     layout: {},
     paint: {
-      'line-color': [
-        'interpolate',
-        ['linear'],
-        ['zoom'],
-        15,
-        'hsl(230, 23%, 82%)',
-        16,
-        'hsl(230, 37%, 84%)',
-      ],
+      'line-color': 'hsl(230, 23%, 82%)',
       'line-width': [
         'interpolate',
         ['exponential', 1.5],
@@ -80,7 +63,7 @@ export default [
         'step',
         ['get', 'sizerank'],
         ['concat', ['get', 'maki'], '-15'],
-        9,
+        12,
         ['concat', ['get', 'maki'], '-11'],
       ],
       'text-offset': [0, 0.75],
@@ -110,7 +93,8 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'line-color': 'yellow',
+      'line-color': 'hsl(192, 70%, 43%)',
+      'line-width': 2,
     },
     filter: ['in', 'type', 'subway'],
     id: 'transit-subway',
@@ -123,7 +107,8 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'line-color': 'black',
+      'line-color': 'hsl(201, 100%, 14%)',
+      'line-width': 2,
     },
     filter: ['in', 'type', 'rail'],
     id: 'transit-rail',
@@ -159,9 +144,9 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'text-halo-color': 'green',
-      'text-halo-width': 0.5,
-      'text-color': 'red',
+      'text-halo-color': 'hsl(151, 24%, 60%)',
+      'text-halo-width': 1,
+      'text-color': 'hsl(13, 68%, 63%)',
     },
     filter: ['in', 'type', 'bus_stop'],
     id: 'transit-bus-label',

From 04bd78912f6e56f77817368289c936e7031fd15b Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Wed, 2 Dec 2020 16:18:07 +0900
Subject: [PATCH 073/138] =?UTF-8?q?[fix]=20mapbox=20road-label=20layer=20?=
 =?UTF-8?q?=EB=82=98=EB=88=84=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 각 요소들에 대하여 합쳐져있던 road-label layer를 각 카테고리별로
나누기
---
 src/store/map/initializeMap.ts |   2 +-
 src/store/map/layers/road.ts   | 202 +++++++++++++++++++++++++++++++++
 2 files changed, 203 insertions(+), 1 deletion(-)

diff --git a/src/store/map/initializeMap.ts b/src/store/map/initializeMap.ts
index fcdbcfa..108d186 100644
--- a/src/store/map/initializeMap.ts
+++ b/src/store/map/initializeMap.ts
@@ -16,7 +16,6 @@ const ZOOM = 15.5;
 const LABEL_LAYERS: string[] = [
   'country-label',
   'settlement-label',
-  'road-label',
   'state-label',
   'settlement-subdivision-label',
   'airport-label',
@@ -68,6 +67,7 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
   map.on('load', () => {
     translate(map);
     map.removeLayer('poi-label');
+    map.removeLayer('road-label');
 
     map.addSource(Sources.polygon, {
       type: 'vector',
diff --git a/src/store/map/layers/road.ts b/src/store/map/layers/road.ts
index e1ea102..805aaa0 100644
--- a/src/store/map/layers/road.ts
+++ b/src/store/map/layers/road.ts
@@ -66,4 +66,206 @@ export default [
     filter: ['match', ['get', 'type'], ['pedestrian', 'footway'], true, false],
     id: 'road-footway',
   },
+  {
+    id: 'road-arterial-label',
+    type: 'symbol',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: {},
+    minzoom: 10,
+    filter: [
+      'step',
+      ['zoom'],
+      [
+        'match',
+        ['get', 'class'],
+        ['motorway', 'trunk', 'primary', 'secondary'],
+        true,
+        false,
+      ],
+      12,
+      [
+        'match',
+        ['get', 'class'],
+        ['motorway', 'trunk', 'primary', 'secondary'],
+        true,
+        false,
+      ],
+    ],
+    layout: {
+      'text-size': [
+        'interpolate',
+        ['linear'],
+        ['zoom'],
+        10,
+        [
+          'match',
+          ['get', 'class'],
+          ['motorway', 'trunk', 'primary', 'secondary'],
+          10,
+          ['motorway_link', 'trunk_link', 'primary_link', 'secondary_link'],
+          9,
+          6.5,
+        ],
+        18,
+        [
+          'match',
+          ['get', 'class'],
+          ['motorway', 'trunk', 'primary', 'secondary'],
+          16,
+          ['motorway_link', 'trunk_link', 'primary_link', 'secondary_link'],
+          14,
+          13,
+        ],
+      ],
+      'text-max-angle': 30,
+      'text-font': ['DIN Offc Pro Regular', 'Arial Unicode MS Regular'],
+      'symbol-placement': 'line',
+      'text-padding': 1,
+      'text-rotation-alignment': 'map',
+      'text-pitch-alignment': 'viewport',
+      'text-field': ['coalesce', ['get', 'name_en'], ['get', 'name']],
+      'text-letter-spacing': 0.01,
+    },
+    paint: {
+      'text-color': [
+        'match',
+        ['get', 'class'],
+        'ferry',
+        'hsl(230, 48%, 44%)',
+        'hsl(0, 0%, 0%)',
+      ],
+      'text-halo-color': [
+        'match',
+        ['get', 'class'],
+        ['motorway', 'trunk'],
+        'hsla(0, 0%, 100%, 0.75)',
+        'hsl(0, 0%, 100%)',
+      ],
+      'text-halo-width': 1,
+      'text-halo-blur': 1,
+    },
+  },
+  {
+    id: 'road-local-label',
+    type: 'symbol',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: {},
+    minzoom: 10,
+    filter: [
+      'step',
+      ['zoom'],
+      ['match', ['get', 'class'], ['tertiary'], true, false],
+      12,
+      ['match', ['get', 'class'], ['tertiary', 'street'], true, false],
+    ],
+    layout: {
+      'text-size': [
+        'interpolate',
+        ['linear'],
+        ['zoom'],
+        10,
+        [
+          'match',
+          ['get', 'class'],
+          ['tertiary'],
+          10,
+          ['tertiary_link', 'street'],
+          9,
+          6.5,
+        ],
+        18,
+        [
+          'match',
+          ['get', 'class'],
+          ['tertiary'],
+          16,
+          ['tertiary_link', 'street'],
+          14,
+          13,
+        ],
+      ],
+      'text-max-angle': 30,
+      'text-font': ['DIN Offc Pro Regular', 'Arial Unicode MS Regular'],
+      'symbol-placement': 'line',
+      'text-padding': 1,
+      'text-rotation-alignment': 'map',
+      'text-pitch-alignment': 'viewport',
+      'text-field': ['coalesce', ['get', 'name_en'], ['get', 'name']],
+      'text-letter-spacing': 0.01,
+    },
+    paint: {
+      'text-color': [
+        'match',
+        ['get', 'class'],
+        'ferry',
+        'hsl(230, 48%, 44%)',
+        'hsl(0, 0%, 0%)',
+      ],
+      'text-halo-color': [
+        'match',
+        ['get', 'class'],
+        ['ferry'],
+        'hsla(0, 0%, 100%, 0.75)',
+        'hsl(0, 0%, 100%)',
+      ],
+      'text-halo-width': 1,
+      'text-halo-blur': 1,
+    },
+  },
+  {
+    id: 'road-sidewalk-label',
+    type: 'symbol',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: {},
+    minzoom: 10,
+    filter: [
+      'match',
+      ['get', 'class'],
+      ['pedestrian', 'street_limited'],
+      true,
+      false,
+    ],
+    layout: {
+      'text-size': [
+        'interpolate',
+        ['linear'],
+        ['zoom'],
+        10,
+        ['match', ['get', 'class'], ['pedestrian', 'street_limited'], 9, 6.5],
+        18,
+        ['match', ['get', 'class'], ['pedestrian', 'street_limited'], 14, 13],
+      ],
+      'text-max-angle': 30,
+      'text-font': ['DIN Offc Pro Regular', 'Arial Unicode MS Regular'],
+      'symbol-placement': 'line',
+      'text-padding': 1,
+      'text-rotation-alignment': 'map',
+      'text-pitch-alignment': 'viewport',
+      'text-field': ['coalesce', ['get', 'name_en'], ['get', 'name']],
+      'text-letter-spacing': 0.01,
+    },
+    paint: {
+      'text-color': [
+        'match',
+        ['get', 'class'],
+        'ferry',
+        'hsl(230, 48%, 44%)',
+        'hsl(0, 0%, 0%)',
+      ],
+      'text-halo-color': [
+        'match',
+        ['get', 'class'],
+        ['motorway', 'trunk'],
+        'hsla(0, 0%, 100%, 0.75)',
+        'ferry',
+        'hsl(196, 80%, 70%)',
+        'hsl(0, 0%, 100%)',
+      ],
+      'text-halo-width': 1,
+      'text-halo-blur': 1,
+    },
+  },
 ];

From 3cedc7f730515a0423b2bcc5eb9b830569f9cb7a Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Wed, 2 Dec 2020 16:19:10 +0900
Subject: [PATCH 074/138] =?UTF-8?q?[fix]=20=EA=B8=B0=EC=A1=B4=EC=9D=98=20h?=
 =?UTF-8?q?ighway=EB=A5=BC=20arterial=EB=A1=9C=20=EB=B3=91=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- highway를 arterial로 병합
---
 src/utils/rendering-data/featureTypeData.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/rendering-data/featureTypeData.ts b/src/utils/rendering-data/featureTypeData.ts
index fb7a5d5..7e6a4f7 100644
--- a/src/utils/rendering-data/featureTypeData.ts
+++ b/src/utils/rendering-data/featureTypeData.ts
@@ -30,7 +30,6 @@ const data: DataType[] = [
     typeKey: FeatureNameType.road,
     typeName: '도로',
     features: [
-      { key: 'highway', name: '고속도로' },
       { key: 'arterial', name: '주요도로' },
       { key: 'local', name: '일반도로' },
       { key: 'sidewalk', name: '인도' },

From f11b3419f638e151cf5de700ab6f3d87aaf270bd Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Wed, 2 Dec 2020 16:34:58 +0900
Subject: [PATCH 075/138] =?UTF-8?q?[feat]=20[#81]=20=EC=B9=B4=ED=85=8C?=
 =?UTF-8?q?=EA=B3=A0=EB=A6=AC=EB=B3=84=20=EB=82=98=EB=88=84=EC=96=B4?=
 =?UTF-8?q?=EC=A7=84=20road-label=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 수정된 road-label layer에 대한 스타일 적용
---
 src/utils/map-styling/road.ts | 129 +++++++++++++++++++++++++++-------
 1 file changed, 103 insertions(+), 26 deletions(-)

diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
index aaf310a..c8ac3e4 100644
--- a/src/utils/map-styling/road.ts
+++ b/src/utils/map-styling/road.ts
@@ -6,7 +6,11 @@ import {
   ColorType,
   WeightType,
 } from '../applyStyle';
-import { StyleKeyType } from '../../store/common/type';
+import {
+  StyleKeyType,
+  ElementNameType,
+  SubElementNameType,
+} from '../../store/common/type';
 
 function roadStyling({
   map,
@@ -20,19 +24,28 @@ function roadStyling({
   const arterialLayerNames = [
     'road-number-shield',
     'road-exit-shield',
-    'road-label',
     'road-arterial',
+    'road-arterial-label',
+  ];
+  const localLayerNames = [
+    'ferry',
+    'ferry-auto',
+    'road-local',
+    'road-local-label',
   ];
-  const localLayerNames = ['ferry', 'ferry-auto', 'road-local'];
-  const sidewalkLayerNames = ['road-footway'];
+  const sidewalkLayerNames = ['road-footway', 'road-sidewalk-label'];
 
   if (subFeatureName === 'arterial') {
-    if (
-      detailName === 'section' &&
-      subDetailName === 'fill' &&
-      key === 'visibility'
-    ) {
-      applyVisibility({ map, layerNames: arterialLayerNames, visibility });
+    if (key === 'visibility') {
+      if (
+        detailName === ElementNameType.section &&
+        subDetailName === SubElementNameType.fill
+      )
+        applyVisibility({
+          map,
+          layerNames: localLayerNames,
+          visibility,
+        });
     } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
       if (detailName === 'section' && subDetailName === 'fill') {
         applyColor({
@@ -45,15 +58,22 @@ function roadStyling({
       } else if (detailName === 'labelText' && subDetailName === 'fill') {
         applyColor({
           map,
-          layerNames: ['road-number-shield', 'road-exit-shield', 'road-label'],
+          layerNames: [
+            'road-number-shield',
+            'road-exit-shield',
+            'road-arterial-label',
+          ],
           color,
           type: ColorType.text,
           [key]: style[key as StyleKeyType],
         });
-      } else if (detailName === 'labelText' && subDetailName === 'stroke') {
+      } else if (
+        detailName === 'labelText' &&
+        subDetailName === SubElementNameType.stroke
+      ) {
         applyColor({
           map,
-          layerNames: ['road-label'],
+          layerNames: ['road-arterial-label'],
           color,
           type: ColorType.textHalo,
           [key]: style[key as StyleKeyType],
@@ -71,8 +91,8 @@ function roadStyling({
       if (detailName === 'labelText' && subDetailName === 'stroke')
         applyWeight({
           map,
-          layerNames: ['road-label'],
-          type: ColorType.textHalo,
+          layerNames: ['road-arterial-label'],
+          type: WeightType.textHalo,
           weight,
         });
     }
@@ -80,7 +100,7 @@ function roadStyling({
     if (key === 'visibility')
       applyVisibility({ map, layerNames: localLayerNames, visibility });
     else if (key === 'color' || key === 'saturation' || key === 'lightness') {
-      if (detailName === 'section' && subDetailName === 'fill') {
+      if (detailName === 'section' && subDetailName === 'fill')
         applyColor({
           map,
           layerNames: ['ferry', 'ferry-auto', 'road-local'],
@@ -88,6 +108,23 @@ function roadStyling({
           type: ColorType.line,
           [key]: style[key as StyleKeyType],
         });
+      else if (detailName === ElementNameType.labelText) {
+        if (subDetailName === SubElementNameType.fill)
+          applyColor({
+            map,
+            layerNames: ['road-local-label'],
+            color,
+            type: ColorType.text,
+            [key]: style[key as StyleKeyType],
+          });
+        else if (subDetailName === SubElementNameType.stroke)
+          applyColor({
+            map,
+            layerNames: ['road-local-label'],
+            color,
+            type: ColorType.textHalo,
+            [key]: style[key as StyleKeyType],
+          });
       }
     } else if (key === 'weight') {
       if (detailName === 'section' && subDetailName === 'fill')
@@ -97,18 +134,20 @@ function roadStyling({
           type: WeightType.line,
           weight,
         });
+      else if (detailName === ElementNameType.labelText) {
+        if (subDetailName === SubElementNameType.stroke)
+          applyWeight({
+            map,
+            layerNames: ['road-local-label'],
+            type: WeightType.textHalo,
+            weight,
+          });
+      }
     }
   } else if (subFeatureName === 'sidewalk') {
-    if (key === 'visibility')
-      applyVisibility({ map, layerNames: sidewalkLayerNames, visibility });
-    else if (key === 'weight') {
-      if (detailName === 'section' && subDetailName === 'fill')
-        applyWeight({
-          map,
-          layerNames: sidewalkLayerNames,
-          type: WeightType.line,
-          weight,
-        });
+    if (key === 'visibility') {
+      if (detailName === ElementNameType.labelText)
+        applyVisibility({ map, layerNames: sidewalkLayerNames, visibility });
     } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
       if (detailName === 'section' && subDetailName === 'fill')
         applyColor({
@@ -118,6 +157,44 @@ function roadStyling({
           type: ColorType.line,
           [key]: style[key as StyleKeyType],
         });
+      else if (detailName === ElementNameType.labelText) {
+        if (subDetailName === SubElementNameType.fill)
+          applyColor({
+            map,
+            layerNames: ['road-sidewalk-label'],
+            color,
+            type: ColorType.text,
+            [key]: style[key as StyleKeyType],
+          });
+        else if (subDetailName === SubElementNameType.stroke)
+          applyColor({
+            map,
+            layerNames: ['road-sidewalk-label'],
+            color,
+            type: ColorType.textHalo,
+            [key]: style[key as StyleKeyType],
+          });
+      }
+    } else if (key === 'weight') {
+      if (
+        detailName === ElementNameType.section &&
+        subDetailName === SubElementNameType.fill
+      )
+        applyWeight({
+          map,
+          layerNames: sidewalkLayerNames,
+          type: WeightType.line,
+          weight,
+        });
+      else if (detailName === ElementNameType.labelText) {
+        if (subDetailName === SubElementNameType.stroke)
+          applyWeight({
+            map,
+            layerNames: ['road-sidewalk-label'],
+            type: WeightType.textHalo,
+            weight,
+          });
+      }
     }
   }
 }

From 2fce5e84426c70178bd4e64bbeb977e2ee57fded Mon Sep 17 00:00:00 2001
From: gitgitwi <johnwi@knou.ac.kr>
Date: Wed, 2 Dec 2020 17:23:01 +0900
Subject: [PATCH 076/138] =?UTF-8?q?[FIX]=20[#86]=20=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=96=B4=EC=97=90=20=EC=97=86=EB=8A=94=20=EC=86=8D=EC=84=B1=20?=
 =?UTF-8?q?=EC=A1=B0=EC=A0=95=20=EC=8B=9C=20=EC=97=90=EB=9F=AC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기존 레이어에 없는 속성 조정 할 경우 mapbox 내부 에러로 아예 동작 멈추는 현상 발생
- layers array filtering으로 아예 해당하는 layera만 잘 넘겨주는 방식으로 변경하여 오류 수정
- 좀더 쉬운 layer filtering 위해 layer id 변경 및 지도 유형 별 array에서 속성별 array로 변경
---
 src/store/map/layers/transit.ts  |  15 ++--
 src/utils/map-styling/transit.ts | 133 ++++++++++++-------------------
 2 files changed, 59 insertions(+), 89 deletions(-)

diff --git a/src/store/map/layers/transit.ts b/src/store/map/layers/transit.ts
index aa0fe80..9e6fde7 100644
--- a/src/store/map/layers/transit.ts
+++ b/src/store/map/layers/transit.ts
@@ -1,5 +1,6 @@
 export default [
   {
+    id: 'mapbox-airport-polygon',
     type: 'fill',
     source: 'composite',
     'source-layer': 'landuse',
@@ -10,10 +11,9 @@ export default [
       'fill-color': 'hsl(234, 20%, 30%)',
     },
     filter: ['in', 'class', 'airport'],
-    id: 'transit-airport',
   },
   {
-    id: 'mapbox-aeroway-polygon',
+    id: 'mapbox-airport-aeroway-polygon',
     type: 'fill',
     metadata: {},
     source: 'composite',
@@ -30,7 +30,7 @@ export default [
     },
   },
   {
-    id: 'mapbox-aeroway-line',
+    id: 'mapbox-airport-aeroway-line',
     type: 'line',
     metadata: {},
     source: 'composite',
@@ -84,8 +84,8 @@ export default [
       'text-halo-width': 1,
     },
   },
-
   {
+    id: 'transit-subway-line',
     type: 'line',
     source: 'line_source',
     'source-layer': 'line',
@@ -97,9 +97,9 @@ export default [
       'line-width': 2,
     },
     filter: ['in', 'type', 'subway'],
-    id: 'transit-subway',
   },
   {
+    id: 'transit-rail-line',
     type: 'line',
     source: 'line_source',
     'source-layer': 'line',
@@ -111,9 +111,9 @@ export default [
       'line-width': 2,
     },
     filter: ['in', 'type', 'rail'],
-    id: 'transit-rail',
   },
   {
+    id: 'mapbox-rail-road-line',
     type: 'line',
     source: 'composite',
     'source-layer': 'road',
@@ -132,9 +132,9 @@ export default [
       ['match', ['get', 'class'], ['major_rail', 'minor_rail'], true, false],
       ['match', ['get', 'structure'], ['none', 'ford'], true, false],
     ],
-    id: 'mapbox-rail-road',
   },
   {
+    id: 'transit-bus-label',
     type: 'symbol',
     source: 'poi_source',
     'source-layer': 'poi',
@@ -149,6 +149,5 @@ export default [
       'text-color': 'hsl(13, 68%, 63%)',
     },
     filter: ['in', 'type', 'bus_stop'],
-    id: 'transit-bus-label',
   },
 ];
diff --git a/src/utils/map-styling/transit.ts b/src/utils/map-styling/transit.ts
index 6f84c12..4dae1a5 100644
--- a/src/utils/map-styling/transit.ts
+++ b/src/utils/map-styling/transit.ts
@@ -1,6 +1,8 @@
+/* eslint-disable no-debugger */
 /* eslint-disable no-nested-ternary */
 /* eslint-disable no-case-declarations */
 import { stylingProps } from '.';
+
 import {
   StyleKeyType,
   ElementNameType,
@@ -15,23 +17,17 @@ import {
   StyleTypes,
 } from '../../utils/applyStyle';
 
-const AirportLayerNames = [
-  'airport-label',
-  'aeroway-polygon',
-  'transit-airport',
-  'aeroway-line',
+const PolygonLayers = [
+  'mapbox-airport-aeroway-polygon',
+  'mapbox-airport-polygon',
 ];
-const BusLayerNames = ['transit-bus-label'];
-const RailLayerNames = ['transit-rail'];
-const SubwayLayerNames = ['transit-subway', 'transit-subway-label'];
-
-const AllLayerTypeKeys = [
-  ...AirportLayerNames,
-  ...BusLayerNames,
-  ...RailLayerNames,
-  ...SubwayLayerNames,
-  'transit-label',
+const LineLayers = [
+  'mapbox-airport-aeroway-line',
+  'transit-subway-line',
+  'transit-rail-line',
+  'mapbox-rail-road-line',
 ];
+const LabelLayers = ['mapbox-airport-label', 'transit-bus-label'];
 
 function transitStyling({
   map,
@@ -41,71 +37,34 @@ function transitStyling({
   subDetailName,
   style,
 }: stylingProps): void {
-  let layers: string[];
-  switch (subFeatureName) {
-    case 'all':
-      layers = [...AllLayerTypeKeys];
-      break;
-    case 'subway':
-      layers = [...SubwayLayerNames];
-      break;
-    case 'bus':
-      layers = [...BusLayerNames];
-      break;
-    case 'airport':
-      layers = [...AirportLayerNames];
-      break;
-    case 'rail':
-      layers = [...RailLayerNames];
-      break;
-    default:
-      return;
-  }
+  let layerNames: string[] =
+    subDetailName === SubElementNameType.fill
+      ? key === StyleKeyType.weight
+        ? []
+        : detailName === ElementNameType.labelText
+        ? [...LabelLayers]
+        : [...PolygonLayers]
+      : detailName === ElementNameType.labelText
+      ? [...LabelLayers]
+      : [...LineLayers];
 
-  let layersByDetailName: string[];
-  let styleType: StyleTypes;
+  layerNames =
+    subFeatureName === 'all'
+      ? layerNames
+      : layerNames.filter((layer) => layer.includes(subFeatureName));
 
-  switch (detailName) {
-    case ElementNameType.section:
-      layersByDetailName = layers.filter((layer) => !layer.includes('label'));
-      styleType =
-        subDetailName === SubElementNameType.stroke
-          ? key === StyleKeyType.weight
-            ? WeightType.line
-            : ColorType.line
-          : ColorType.fill;
+  if (layerNames.length === 0) return;
 
-      break;
-    case ElementNameType.labelText:
-      layersByDetailName = layers.filter((layer) => layer.includes('label'));
-      styleType =
-        subDetailName === SubElementNameType.stroke
-          ? key === StyleKeyType.weight
-            ? WeightType.textHalo
-            : ColorType.textHalo
-          : ColorType.text;
-      break;
-    case ElementNameType.labelIcon:
-      layersByDetailName = layers.filter((layer) => !layer.includes('label'));
-      styleType =
-        subDetailName === SubElementNameType.stroke
-          ? ColorType.line
-          : ColorType.fill;
-      break;
-
-    default:
-      return;
-  }
-
-  const styleKey: StyleKeyType = key as StyleKeyType;
-  const { [styleKey]: value } = style;
+  const styleKey = key as StyleKeyType;
+  const { [styleKey]: styleValue } = style;
+  let styleType: StyleTypes;
 
   switch (styleKey) {
     case StyleKeyType.visibility:
       applyVisibility({
         map,
-        layerNames: layersByDetailName,
-        visibility: value as string,
+        layerNames,
+        visibility: styleValue as string,
       });
       break;
 
@@ -116,6 +75,15 @@ function transitStyling({
       const satKey = StyleKeyType.saturation;
       const ligKey = StyleKeyType.lightness;
 
+      styleType =
+        detailName === ElementNameType.labelText
+          ? subDetailName === SubElementNameType.fill
+            ? ColorType.text
+            : ColorType.textHalo
+          : subDetailName === SubElementNameType.fill
+          ? ColorType.fill
+          : ColorType.line;
+
       const satureOrLight =
         key === 'saturation'
           ? { saturation: +style[satKey] }
@@ -124,7 +92,7 @@ function transitStyling({
           : {};
       applyColor({
         map,
-        layerNames: layersByDetailName,
+        layerNames,
         type: styleType,
         color: style[colorKey],
         ...satureOrLight,
@@ -132,20 +100,23 @@ function transitStyling({
       break;
 
     case StyleKeyType.weight:
-      if (subDetailName !== 'fill') {
-        applyWeight({
-          map,
-          layerNames: layersByDetailName,
-          type: styleType as WeightType,
-          weight: value as number,
-        });
-      }
+      styleType =
+        detailName === ElementNameType.labelText
+          ? WeightType.textHalo
+          : WeightType.line;
+      applyWeight({
+        map,
+        layerNames,
+        type: styleType,
+        weight: styleValue as number,
+      });
 
       break;
 
     default:
       break;
   }
+  debugger;
 }
 
 export default transitStyling;

From 96656d0ea5a2def3af24ca243823181609de1540 Mon Sep 17 00:00:00 2001
From: gitgitwi <johnwi@knou.ac.kr>
Date: Wed, 2 Dec 2020 17:48:28 +0900
Subject: [PATCH 077/138] =?UTF-8?q?[REFACTOR]=20[#86]=20debugger=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C,=20=EB=A0=88=EC=9D=B4=EC=96=B4=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=20filter=20=EB=B0=A9=EC=8B=9D=20=ED=86=B5?=
 =?UTF-8?q?=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- debugger 코드 삭제
- layer data 가져오는 방식 `in..type` -> `==/match..get..` 으로 변경
---
 src/store/map/layers/transit.ts  | 8 ++++----
 src/utils/map-styling/transit.ts | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/store/map/layers/transit.ts b/src/store/map/layers/transit.ts
index 9e6fde7..93d66ee 100644
--- a/src/store/map/layers/transit.ts
+++ b/src/store/map/layers/transit.ts
@@ -10,7 +10,7 @@ export default [
     paint: {
       'fill-color': 'hsl(234, 20%, 30%)',
     },
-    filter: ['in', 'class', 'airport'],
+    filter: ['==', ['get', 'class'], 'airport'],
   },
   {
     id: 'mapbox-airport-aeroway-polygon',
@@ -96,7 +96,7 @@ export default [
       'line-color': 'hsl(192, 70%, 43%)',
       'line-width': 2,
     },
-    filter: ['in', 'type', 'subway'],
+    filter: ['==', ['get', 'type'], 'subway'],
   },
   {
     id: 'transit-rail-line',
@@ -110,7 +110,7 @@ export default [
       'line-color': 'hsl(201, 100%, 14%)',
       'line-width': 2,
     },
-    filter: ['in', 'type', 'rail'],
+    filter: ['match', ['get', 'type'], 'rail'],
   },
   {
     id: 'mapbox-rail-road-line',
@@ -148,6 +148,6 @@ export default [
       'text-halo-width': 1,
       'text-color': 'hsl(13, 68%, 63%)',
     },
-    filter: ['in', 'type', 'bus_stop'],
+    filter: ['==', ['get', 'type'], 'bus_stop'],
   },
 ];
diff --git a/src/utils/map-styling/transit.ts b/src/utils/map-styling/transit.ts
index 4dae1a5..7051bd4 100644
--- a/src/utils/map-styling/transit.ts
+++ b/src/utils/map-styling/transit.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-debugger */
 /* eslint-disable no-nested-ternary */
 /* eslint-disable no-case-declarations */
 import { stylingProps } from '.';
@@ -116,7 +115,6 @@ function transitStyling({
     default:
       break;
   }
-  debugger;
 }
 
 export default transitStyling;

From d00f5521953a92a44adb1e36724f2fa9bb8356b6 Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Wed, 2 Dec 2020 17:50:36 +0900
Subject: [PATCH 078/138] =?UTF-8?q?[refactor]=20road=20styling=20=EB=A6=AC?=
 =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기존에 한 파일에서 작업하고 있던 road styling 작업 카테고리별로 분류
---
 .../map-styling/road-categories/arterial.ts   | 117 ++++++++++
 .../map-styling/road-categories/local.ts      | 112 +++++++++
 .../map-styling/road-categories/sidewalk.ts   | 112 +++++++++
 src/utils/map-styling/road.ts                 | 212 +++---------------
 4 files changed, 368 insertions(+), 185 deletions(-)
 create mode 100644 src/utils/map-styling/road-categories/arterial.ts
 create mode 100644 src/utils/map-styling/road-categories/local.ts
 create mode 100644 src/utils/map-styling/road-categories/sidewalk.ts

diff --git a/src/utils/map-styling/road-categories/arterial.ts b/src/utils/map-styling/road-categories/arterial.ts
new file mode 100644
index 0000000..36ca1f9
--- /dev/null
+++ b/src/utils/map-styling/road-categories/arterial.ts
@@ -0,0 +1,117 @@
+import { stylingProps } from '../index';
+import {
+  StyleKeyType,
+  ElementNameType,
+  SubElementNameType,
+} from '../../../store/common/type';
+import {
+  applyVisibility,
+  applyColor,
+  applyWeight,
+  ColorType,
+  WeightType,
+} from '../../applyStyle';
+
+export const arterialLayerNames = {
+  all: [
+    'road-arterial',
+    'road-number-shield',
+    'road-exit-shield',
+    'road-arterial-label',
+  ],
+  polygon: [],
+  line: ['road-arterial'],
+  text: {
+    all: ['road-number-shield', 'road-exit-shield', 'road-arterial-label'],
+    hasStroke: ['road-arterial-label'],
+    noStroke: ['road-number-shield', 'road-exit-shield'],
+  },
+  icon: [],
+};
+
+function arterialStyling({
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+  key,
+  style,
+}: stylingProps): void {
+  const { visibility, color, weight } = style;
+
+  if (key === 'visibility') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill)
+        applyVisibility({
+          map,
+          layerNames: arterialLayerNames.line,
+          visibility,
+        });
+    } else if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.fill)
+        applyVisibility({
+          map,
+          layerNames: arterialLayerNames.text.noStroke,
+          visibility,
+        });
+      else if (subDetailName === SubElementNameType.stroke)
+        applyVisibility({
+          map,
+          layerNames: arterialLayerNames.text.hasStroke,
+          visibility,
+        });
+    }
+  } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyColor({
+          map,
+          layerNames: arterialLayerNames.line,
+          color,
+          type: ColorType.line,
+          [key]: style[key as StyleKeyType],
+        });
+      }
+    } else if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyColor({
+          map,
+          layerNames: arterialLayerNames.text.all,
+          color,
+          type: ColorType.text,
+          [key]: style[key as StyleKeyType],
+        });
+      } else if (subDetailName === SubElementNameType.stroke) {
+        applyColor({
+          map,
+          layerNames: arterialLayerNames.text.hasStroke,
+          color,
+          type: ColorType.textHalo,
+          [key]: style[key as StyleKeyType],
+        });
+      }
+    }
+  } else if (key === 'weight') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyWeight({
+          map,
+          layerNames: arterialLayerNames.line,
+          type: WeightType.line,
+          weight,
+        });
+      }
+    }
+    if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.stroke)
+        applyWeight({
+          map,
+          layerNames: arterialLayerNames.text.hasStroke,
+          type: WeightType.textHalo,
+          weight,
+        });
+    }
+  }
+}
+
+export default arterialStyling;
diff --git a/src/utils/map-styling/road-categories/local.ts b/src/utils/map-styling/road-categories/local.ts
new file mode 100644
index 0000000..c83aa15
--- /dev/null
+++ b/src/utils/map-styling/road-categories/local.ts
@@ -0,0 +1,112 @@
+import { stylingProps } from '../index';
+import {
+  StyleKeyType,
+  ElementNameType,
+  SubElementNameType,
+} from '../../../store/common/type';
+import {
+  applyVisibility,
+  applyColor,
+  applyWeight,
+  ColorType,
+  WeightType,
+} from '../../applyStyle';
+
+const localLayerNames = {
+  all: ['ferry', 'ferry-auto', 'road-local', 'road-local-label'],
+  polygon: [],
+  line: ['ferry', 'ferry-auto', 'road-local'],
+  text: {
+    all: ['road-local-label'],
+    hasStroke: ['road-local-label'],
+    noStroke: [],
+  },
+  icon: [],
+};
+
+function localStyling({
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+  key,
+  style,
+}: stylingProps): void {
+  const { visibility, color, weight } = style;
+
+  if (key === 'visibility') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill)
+        applyVisibility({
+          map,
+          layerNames: localLayerNames.line,
+          visibility,
+        });
+    } else if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.fill)
+        applyVisibility({
+          map,
+          layerNames: localLayerNames.text.noStroke,
+          visibility,
+        });
+      else if (subDetailName === SubElementNameType.stroke)
+        applyVisibility({
+          map,
+          layerNames: localLayerNames.text.hasStroke,
+          visibility,
+        });
+    }
+  } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
+    if (detailName === 'section') {
+      if (subDetailName === 'fill') {
+        applyColor({
+          map,
+          layerNames: localLayerNames.line,
+          color,
+          type: ColorType.line,
+          [key]: style[key as StyleKeyType],
+        });
+      }
+    } else if (detailName === 'labelText') {
+      if (subDetailName === SubElementNameType.fill) {
+        applyColor({
+          map,
+          layerNames: localLayerNames.text.all,
+          color,
+          type: ColorType.text,
+          [key]: style[key as StyleKeyType],
+        });
+      } else if (subDetailName === SubElementNameType.stroke) {
+        applyColor({
+          map,
+          layerNames: localLayerNames.text.hasStroke,
+          color,
+          type: ColorType.textHalo,
+          [key]: style[key as StyleKeyType],
+        });
+      }
+    }
+  } else if (key === 'weight') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyWeight({
+          map,
+          layerNames: localLayerNames.line,
+          type: WeightType.line,
+          weight,
+        });
+      }
+    }
+    if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.stroke)
+        applyWeight({
+          map,
+          layerNames: localLayerNames.text.hasStroke,
+          type: WeightType.textHalo,
+          weight,
+        });
+    }
+  }
+}
+
+export default localStyling;
diff --git a/src/utils/map-styling/road-categories/sidewalk.ts b/src/utils/map-styling/road-categories/sidewalk.ts
new file mode 100644
index 0000000..d3e5030
--- /dev/null
+++ b/src/utils/map-styling/road-categories/sidewalk.ts
@@ -0,0 +1,112 @@
+import { stylingProps } from '../index';
+import {
+  StyleKeyType,
+  ElementNameType,
+  SubElementNameType,
+} from '../../../store/common/type';
+import {
+  applyVisibility,
+  applyColor,
+  applyWeight,
+  ColorType,
+  WeightType,
+} from '../../applyStyle';
+
+const sidewalkLayerNames = {
+  all: ['road-footway', 'road-sidewalk-label'],
+  polygon: [],
+  line: ['road-footway'],
+  text: {
+    all: ['road-sidewalk-label'],
+    hasStroke: ['road-sidewalk-label'],
+    noStroke: [],
+  },
+  icon: [],
+};
+
+function sidewalkStyling({
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+  key,
+  style,
+}: stylingProps): void {
+  const { visibility, color, weight } = style;
+
+  if (key === 'visibility') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill)
+        applyVisibility({
+          map,
+          layerNames: sidewalkLayerNames.line,
+          visibility,
+        });
+    } else if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.fill)
+        applyVisibility({
+          map,
+          layerNames: sidewalkLayerNames.text.noStroke,
+          visibility,
+        });
+      else if (subDetailName === SubElementNameType.stroke)
+        applyVisibility({
+          map,
+          layerNames: sidewalkLayerNames.text.hasStroke,
+          visibility,
+        });
+    }
+  } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
+    if (detailName === 'section') {
+      if (subDetailName === 'fill') {
+        applyColor({
+          map,
+          layerNames: sidewalkLayerNames.line,
+          color,
+          type: ColorType.line,
+          [key]: style[key as StyleKeyType],
+        });
+      }
+    } else if (detailName === 'labelText') {
+      if (subDetailName === SubElementNameType.fill) {
+        applyColor({
+          map,
+          layerNames: sidewalkLayerNames.text.all,
+          color,
+          type: ColorType.text,
+          [key]: style[key as StyleKeyType],
+        });
+      } else if (subDetailName === SubElementNameType.stroke) {
+        applyColor({
+          map,
+          layerNames: sidewalkLayerNames.text.hasStroke,
+          color,
+          type: ColorType.textHalo,
+          [key]: style[key as StyleKeyType],
+        });
+      }
+    }
+  } else if (key === 'weight') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyWeight({
+          map,
+          layerNames: sidewalkLayerNames.line,
+          type: WeightType.line,
+          weight,
+        });
+      }
+    }
+    if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.stroke)
+        applyWeight({
+          map,
+          layerNames: sidewalkLayerNames.text.hasStroke,
+          type: WeightType.textHalo,
+          weight,
+        });
+    }
+  }
+}
+
+export default sidewalkStyling;
diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
index c8ac3e4..016678f 100644
--- a/src/utils/map-styling/road.ts
+++ b/src/utils/map-styling/road.ts
@@ -1,16 +1,7 @@
 import { stylingProps } from '.';
-import {
-  applyVisibility,
-  applyColor,
-  applyWeight,
-  ColorType,
-  WeightType,
-} from '../applyStyle';
-import {
-  StyleKeyType,
-  ElementNameType,
-  SubElementNameType,
-} from '../../store/common/type';
+import arterialStyling from './road-categories/arterial';
+import localStyling from './road-categories/local';
+import sidewalkStyling from './road-categories/sidewalk';
 
 function roadStyling({
   map,
@@ -20,182 +11,33 @@ function roadStyling({
   key,
   style,
 }: stylingProps): void {
-  const { visibility, color, weight } = style;
-  const arterialLayerNames = [
-    'road-number-shield',
-    'road-exit-shield',
-    'road-arterial',
-    'road-arterial-label',
-  ];
-  const localLayerNames = [
-    'ferry',
-    'ferry-auto',
-    'road-local',
-    'road-local-label',
-  ];
-  const sidewalkLayerNames = ['road-footway', 'road-sidewalk-label'];
-
   if (subFeatureName === 'arterial') {
-    if (key === 'visibility') {
-      if (
-        detailName === ElementNameType.section &&
-        subDetailName === SubElementNameType.fill
-      )
-        applyVisibility({
-          map,
-          layerNames: localLayerNames,
-          visibility,
-        });
-    } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
-      if (detailName === 'section' && subDetailName === 'fill') {
-        applyColor({
-          map,
-          layerNames: ['road-arterial'],
-          color,
-          type: ColorType.line,
-          [key]: style[key as StyleKeyType],
-        });
-      } else if (detailName === 'labelText' && subDetailName === 'fill') {
-        applyColor({
-          map,
-          layerNames: [
-            'road-number-shield',
-            'road-exit-shield',
-            'road-arterial-label',
-          ],
-          color,
-          type: ColorType.text,
-          [key]: style[key as StyleKeyType],
-        });
-      } else if (
-        detailName === 'labelText' &&
-        subDetailName === SubElementNameType.stroke
-      ) {
-        applyColor({
-          map,
-          layerNames: ['road-arterial-label'],
-          color,
-          type: ColorType.textHalo,
-          [key]: style[key as StyleKeyType],
-        });
-      }
-    } else if (key === 'weight') {
-      if (detailName === 'section' && subDetailName === 'fill') {
-        applyWeight({
-          map,
-          layerNames: ['road-arterial'],
-          type: WeightType.line,
-          weight,
-        });
-      }
-      if (detailName === 'labelText' && subDetailName === 'stroke')
-        applyWeight({
-          map,
-          layerNames: ['road-arterial-label'],
-          type: WeightType.textHalo,
-          weight,
-        });
-    }
+    arterialStyling({
+      map,
+      subFeatureName,
+      detailName,
+      subDetailName,
+      key,
+      style,
+    });
   } else if (subFeatureName === 'local') {
-    if (key === 'visibility')
-      applyVisibility({ map, layerNames: localLayerNames, visibility });
-    else if (key === 'color' || key === 'saturation' || key === 'lightness') {
-      if (detailName === 'section' && subDetailName === 'fill')
-        applyColor({
-          map,
-          layerNames: ['ferry', 'ferry-auto', 'road-local'],
-          color,
-          type: ColorType.line,
-          [key]: style[key as StyleKeyType],
-        });
-      else if (detailName === ElementNameType.labelText) {
-        if (subDetailName === SubElementNameType.fill)
-          applyColor({
-            map,
-            layerNames: ['road-local-label'],
-            color,
-            type: ColorType.text,
-            [key]: style[key as StyleKeyType],
-          });
-        else if (subDetailName === SubElementNameType.stroke)
-          applyColor({
-            map,
-            layerNames: ['road-local-label'],
-            color,
-            type: ColorType.textHalo,
-            [key]: style[key as StyleKeyType],
-          });
-      }
-    } else if (key === 'weight') {
-      if (detailName === 'section' && subDetailName === 'fill')
-        applyWeight({
-          map,
-          layerNames: ['ferry', 'ferry-auto', 'road-local'],
-          type: WeightType.line,
-          weight,
-        });
-      else if (detailName === ElementNameType.labelText) {
-        if (subDetailName === SubElementNameType.stroke)
-          applyWeight({
-            map,
-            layerNames: ['road-local-label'],
-            type: WeightType.textHalo,
-            weight,
-          });
-      }
-    }
+    localStyling({
+      map,
+      subFeatureName,
+      detailName,
+      subDetailName,
+      key,
+      style,
+    });
   } else if (subFeatureName === 'sidewalk') {
-    if (key === 'visibility') {
-      if (detailName === ElementNameType.labelText)
-        applyVisibility({ map, layerNames: sidewalkLayerNames, visibility });
-    } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
-      if (detailName === 'section' && subDetailName === 'fill')
-        applyColor({
-          map,
-          layerNames: sidewalkLayerNames,
-          color,
-          type: ColorType.line,
-          [key]: style[key as StyleKeyType],
-        });
-      else if (detailName === ElementNameType.labelText) {
-        if (subDetailName === SubElementNameType.fill)
-          applyColor({
-            map,
-            layerNames: ['road-sidewalk-label'],
-            color,
-            type: ColorType.text,
-            [key]: style[key as StyleKeyType],
-          });
-        else if (subDetailName === SubElementNameType.stroke)
-          applyColor({
-            map,
-            layerNames: ['road-sidewalk-label'],
-            color,
-            type: ColorType.textHalo,
-            [key]: style[key as StyleKeyType],
-          });
-      }
-    } else if (key === 'weight') {
-      if (
-        detailName === ElementNameType.section &&
-        subDetailName === SubElementNameType.fill
-      )
-        applyWeight({
-          map,
-          layerNames: sidewalkLayerNames,
-          type: WeightType.line,
-          weight,
-        });
-      else if (detailName === ElementNameType.labelText) {
-        if (subDetailName === SubElementNameType.stroke)
-          applyWeight({
-            map,
-            layerNames: ['road-sidewalk-label'],
-            type: WeightType.textHalo,
-            weight,
-          });
-      }
-    }
+    sidewalkStyling({
+      map,
+      subFeatureName,
+      detailName,
+      subDetailName,
+      key,
+      style,
+    });
   }
 }
 

From 7a8b6c90d8c521fcab97c4e27fda6c34e03842ab Mon Sep 17 00:00:00 2001
From: gitgitwi <johnwi@knou.ac.kr>
Date: Wed, 2 Dec 2020 17:57:23 +0900
Subject: [PATCH 079/138] =?UTF-8?q?[FIX]=20[#86]=20=EB=AF=B8=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84=20=EC=83=81=ED=83=9C=EC=9D=B8=20labelIcon=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=EB=A7=81=20early=20return?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/map-styling/transit.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/utils/map-styling/transit.ts b/src/utils/map-styling/transit.ts
index 7051bd4..c0e9cd9 100644
--- a/src/utils/map-styling/transit.ts
+++ b/src/utils/map-styling/transit.ts
@@ -36,6 +36,9 @@ function transitStyling({
   subDetailName,
   style,
 }: stylingProps): void {
+  // TODO: labelIcon 관련 구현
+  if (detailName === ElementNameType.labelIcon) return;
+
   let layerNames: string[] =
     subDetailName === SubElementNameType.fill
       ? key === StyleKeyType.weight

From 0c3ca513ca8e789da42ba044aab799eaa1ab72a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Wed, 2 Dec 2020 13:34:54 +0900
Subject: [PATCH 080/138] =?UTF-8?q?[feat]=20=EB=A0=88=EC=9D=B4=EC=96=B4=20?=
 =?UTF-8?q?=EB=B3=84=EB=A1=9C=20=EC=83=89=EC=83=81=20=EA=B0=92=20=EC=A0=95?=
 =?UTF-8?q?=EB=A6=AC=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/rendering-data/layerColor3.ts  | 38 +++++++++++++++++
 src/utils/rendering-data/layersColor.ts  | 52 +++++++++++++++++++++---
 src/utils/rendering-data/layersColor2.ts | 40 +++++++++++++++++-
 3 files changed, 122 insertions(+), 8 deletions(-)
 create mode 100644 src/utils/rendering-data/layerColor3.ts

diff --git a/src/utils/rendering-data/layerColor3.ts b/src/utils/rendering-data/layerColor3.ts
new file mode 100644
index 0000000..556eda7
--- /dev/null
+++ b/src/utils/rendering-data/layerColor3.ts
@@ -0,0 +1,38 @@
+export default {
+  'poi-attraction': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-arts-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-landmark-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-business': { color: 'hsl(22, 55%, 55%)', type: 'text' },
+  'poi-food-label': { color: 'hsl(22, 55%, 55%)', type: 'text' },
+  'poi-store-label': { color: 'hsl(22, 55%, 55%)', type: 'text' },
+  'poi-government': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-public-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-general-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-medical': { color: 'hsl(340, 39%, 42%)', type: 'text' },
+  'poi-medical-label': { color: 'hsl(340, 39%, 42%)', type: 'text' },
+  'poi-park': { color: 'hsl(100, 45%, 37%)', type: 'text' },
+  'poi-park-label': { color: 'hsl(100, 45%, 37%)', type: 'text' },
+  'poi-worship': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-religion-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-school': { color: 'hsl(51, 40%, 40%)', type: 'text' },
+  'poi-education-label': { color: 'hsl(51, 40%, 40%)', type: 'text' },
+  'poi-sport-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-etc': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-industrial-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-historic-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-building-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'admin-0-boundary': { color: 'hsl(230, 8%, 51%)', type: 'line' },
+  'admin-0-boundary-bg': { color: 'hsl(230, 8%, 51%)', type: 'line' },
+  'admin-0-boundary-disputed': { color: 'hsl(230, 8%, 51%)', type: 'line' },
+  'country-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  'admin-1-boundary-bg': { color: 'hsl(230, 14%, 77%)', type: 'line' },
+  'admin-1-boundary': { color: 'hsl(230, 14%, 77%)', type: 'line' },
+  'state-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  'settlement-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  'settlement-subdivision-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  water: { color: 'hsl(205, 87%, 76%)', type: 'fill' },
+  'water-polygon': { color: 'hsl(205, 87%, 76%)', type: 'fill' },
+  'water-line-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'water-point-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'waterway-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+};
diff --git a/src/utils/rendering-data/layersColor.ts b/src/utils/rendering-data/layersColor.ts
index e364c19..85a29ec 100644
--- a/src/utils/rendering-data/layersColor.ts
+++ b/src/utils/rendering-data/layersColor.ts
@@ -1,3 +1,4 @@
+// 어차피 레이어 하나 바꾸면 다 바뀔 건데 체크박스로 해둘 필요가 있을까??
 export default {
   poi: {
     landmark: {
@@ -36,14 +37,53 @@ export default {
     },
     etc: {
       'poi-etc': 'hsl(26, 25%, 32%)',
-      'poi-industrial': 'hsl(26, 25%, 32%)',
+      'poi-industrial-label': 'hsl(26, 25%, 32%)',
       'poi-historic-label': 'hsl(26, 25%, 32%)',
       'poi-building-label': 'hsl(26, 25%, 32%)',
     },
   },
-  road: {},
-  administrative: {},
-  landscape: {},
-  transit: {},
-  water: {},
+  road: {
+    highway: {},
+    arterial: {},
+    local: {},
+    sidewalk: {},
+    'bicycle-road': {},
+  },
+  administrative: {
+    country: {
+      'admin-0-boundary': 'hsl(230, 8%, 51%)',
+      'admin-0-boundary-bg': 'hsl(35, 12%, 89%)',
+      'admin-0-boundary-disputed': 'hsl(230, 8%, 51%)',
+      'country-label': 'hsl(0, 0%, 0%)',
+    },
+    state: {
+      'admin-1-boundary-bg': 'hsl(35, 12%, 89%)',
+      'admin-1-boundary': 'hsl(230, 14%, 77%)',
+      'state-label': 'hsl(0, 0%, 0%)',
+    },
+    locality: {
+      'settlement-label': 'hsl(0, 0%, 0%)',
+      'settlement-subdivision-label': 'hsl(230, 29%, 35%)',
+    },
+  },
+  landscape: {
+    'human-made': {},
+    building: {},
+    natural: {},
+    landcover: {},
+    mountain: {},
+  },
+  transit: {
+    airport: {},
+    bus: {},
+    rail: {},
+    subway: {},
+  },
+  water: {
+    water: 'hsl(205, 87%, 76%)',
+    'water-polygon': 'hsl(205, 87%, 76%)',
+    'water-line-label': 'hsl(230, 48%, 44%)',
+    'water-point-label': 'hsl(230, 48%, 44%)',
+    'waterway-label': 'hsl(230, 48%, 44%)',
+  },
 };
diff --git a/src/utils/rendering-data/layersColor2.ts b/src/utils/rendering-data/layersColor2.ts
index 3cd4fee..5014988 100644
--- a/src/utils/rendering-data/layersColor2.ts
+++ b/src/utils/rendering-data/layersColor2.ts
@@ -65,8 +65,44 @@ export default {
     },
   },
   road: {},
-  administrative: {},
+  administrative: {
+    country: {
+      section: {
+        fill: 'transparent',
+        stroke: 'hsl(230, 8%, 51%)',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    state: {
+      section: {
+        fill: 'transparent',
+        stroke: 'hsl(230, 14%, 77%)',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    locality: {
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+  },
   landscape: {},
   transit: {},
-  water: {},
+  water: {
+    section: {
+      fill: 'hsl(205, 87%, 76%)',
+      stroke: 'transparent',
+    },
+    labelText: {
+      fill: 'hsl(230, 48%, 44%)',
+      stroke: 'transparent',
+    },
+  },
 };

From 53ebeaa76af835b86e138f31ef7bbafb65ee8f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Wed, 2 Dec 2020 13:36:00 +0900
Subject: [PATCH 081/138] =?UTF-8?q?[feat]=20range=EB=A5=BC=20=EC=A1=B0?=
 =?UTF-8?q?=EC=A0=88=ED=95=98=EB=8A=94=20=EA=B2=83=EC=9D=84=20canvas?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A0=9C=EC=9E=91=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- range를 조절하는 것을 현재 canvas로 제작중이다
---
 .../Sidebar/SidebarContentMore/AAA.tsx        | 100 ++++++++++++++++++
 .../SidebarContentMore/SaturationStyle.tsx    |   2 +
 2 files changed, 102 insertions(+)
 create mode 100644 src/components/Sidebar/SidebarContentMore/AAA.tsx

diff --git a/src/components/Sidebar/SidebarContentMore/AAA.tsx b/src/components/Sidebar/SidebarContentMore/AAA.tsx
new file mode 100644
index 0000000..ff89423
--- /dev/null
+++ b/src/components/Sidebar/SidebarContentMore/AAA.tsx
@@ -0,0 +1,100 @@
+import React, { useRef, useEffect, useState } from 'react';
+import styled from '../../../utils/styles/styled';
+
+const Canvas = styled.canvas`
+  position: relative;
+
+  background-color: #eee;
+`;
+
+interface DrawRangeToCanvasProps {
+  x?: number;
+  y?: number;
+}
+
+interface AAAProps {
+  value: string | number;
+  onStyleChange: (key: string, value: string | number) => void;
+}
+
+function AAA({ value, onStyleChange }: AAAProps): React.ReactElement {
+  const canvasRef = useRef(document.createElement('canvas'));
+  const [foreRange, setForeRange] = useState(0);
+  const [backRange, setBackRange] = useState(0);
+  const [down, setDown] = useState(false);
+
+  function getCursorPosition(event: React.MouseEvent<HTMLCanvasElement>) {
+    const rect = canvasRef.current.getBoundingClientRect();
+    const x = event.clientX - rect.left;
+    return x;
+  }
+
+  const mouseDownHandler = (e: React.MouseEvent<HTMLCanvasElement>) => {
+    const x = getCursorPosition(e);
+    setDown(true);
+    drawRangeToCanvas({ x });
+  };
+
+  const mouseMoveHandler = (e: React.MouseEvent<HTMLCanvasElement>) => {
+    if (!down) return;
+
+    const x = getCursorPosition(e);
+    drawRangeToCanvas({ x });
+  };
+
+  const mouseUpHandler = (e: React.MouseEvent<HTMLCanvasElement>) => {
+    setDown(false);
+    const { width } = canvasRef.current;
+    const x = getCursorPosition(e);
+    if (x < width / 2) {
+      const a = Number(value) - (width / 2 - x) * foreRange;
+      console.log((width / 2 - x) * foreRange, width / 2 - x, foreRange);
+      onStyleChange('saturation', a);
+    } else {
+      const b = Number(value) + (x - width / 2) * backRange;
+      onStyleChange('saturation', b);
+    }
+  };
+
+  const drawRangeToCanvas = ({ x }: DrawRangeToCanvasProps) => {
+    const ctx = canvasRef.current.getContext('2d');
+    const { width, height } = canvasRef.current;
+
+    if (!ctx) return;
+    ctx?.clearRect(0, 0, width, height);
+
+    ctx.fillStyle = 'darkgray';
+    ctx.beginPath();
+    ctx.rect(0, height / 2, width * 2, 2);
+    ctx.fill();
+
+    ctx.fillStyle = '#3ECF5C';
+    ctx.beginPath();
+    ctx.arc(x || width / 2, height / 2, 10, 0, Math.PI * 2);
+    ctx.fill();
+  };
+
+  const setRange = () => {
+    const { width } = canvasRef.current;
+    setForeRange(width / 2 / (100 - Number(value)));
+    setBackRange(width / 2 / Number(value));
+  };
+
+  useEffect(() => {
+    setRange();
+    drawRangeToCanvas({});
+  }, []);
+
+  return (
+    <Canvas
+      width="170"
+      height="50"
+      ref={canvasRef}
+      onMouseDown={mouseDownHandler}
+      onMouseMove={mouseMoveHandler}
+      onMouseUp={mouseUpHandler}
+    />
+  );
+}
+
+export default AAA;
diff --git a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
index 605a4cf..961ee3c 100644
--- a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
@@ -3,6 +3,7 @@ import styled from '../../../utils/styles/styled';
 import { Range } from '../SidebarContentFewer/DepthItem';
 import useInputRange from '../../../hooks/common/useInputRange';
 import { StyleKeyType } from '../../../store/common/type';
+import AAA from './AAA';
 
 const SaturationWrapper = styled.div`
   display: flex;
@@ -49,6 +50,7 @@ function SaturationStyle({
         onChange={(e) => rangeChangeHandler(e)}
         onMouseUp={() => rangeMouseUpHandler(StyleKeyType.saturation)}
       />
+      {/* <AAA value="50" onStyleChange={onStyleChange} /> */}
     </SaturationWrapper>
   );
 }

From f9f6c0ef2fb02707da5794ffdff498eeca79d94c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Wed, 2 Dec 2020 19:52:32 +0900
Subject: [PATCH 082/138] =?UTF-8?q?[fix]=20range=EB=A5=BC=20=EC=A0=88?=
 =?UTF-8?q?=EB=8C=93=EA=B0=92=EC=9C=BC=EB=A1=9C=20=ED=95=98=EA=B8=B0?=
 =?UTF-8?q?=EB=A1=9C=20=ED=95=B4=EC=84=9C=20range=20canvas=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- range의 변화를 절댓값으로 주기로 해서 range canvas를 없애주었다
---
 .../Sidebar/SidebarContentMore/AAA.tsx        | 100 ------------------
 .../SidebarContentMore/SaturationStyle.tsx    |   2 -
 2 files changed, 102 deletions(-)
 delete mode 100644 src/components/Sidebar/SidebarContentMore/AAA.tsx

diff --git a/src/components/Sidebar/SidebarContentMore/AAA.tsx b/src/components/Sidebar/SidebarContentMore/AAA.tsx
deleted file mode 100644
index ff89423..0000000
--- a/src/components/Sidebar/SidebarContentMore/AAA.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React, { useRef, useEffect, useState } from 'react';
-import styled from '../../../utils/styles/styled';
-
-const Canvas = styled.canvas`
-  position: relative;
-
-  background-color: #eee;
-`;
-
-interface DrawRangeToCanvasProps {
-  x?: number;
-  y?: number;
-}
-
-interface AAAProps {
-  value: string | number;
-  onStyleChange: (key: string, value: string | number) => void;
-}
-
-function AAA({ value, onStyleChange }: AAAProps): React.ReactElement {
-  const canvasRef = useRef(document.createElement('canvas'));
-  const [foreRange, setForeRange] = useState(0);
-  const [backRange, setBackRange] = useState(0);
-  const [down, setDown] = useState(false);
-
-  function getCursorPosition(event: React.MouseEvent<HTMLCanvasElement>) {
-    const rect = canvasRef.current.getBoundingClientRect();
-    const x = event.clientX - rect.left;
-    return x;
-  }
-
-  const mouseDownHandler = (e: React.MouseEvent<HTMLCanvasElement>) => {
-    const x = getCursorPosition(e);
-    setDown(true);
-    drawRangeToCanvas({ x });
-  };
-
-  const mouseMoveHandler = (e: React.MouseEvent<HTMLCanvasElement>) => {
-    if (!down) return;
-
-    const x = getCursorPosition(e);
-    drawRangeToCanvas({ x });
-  };
-
-  const mouseUpHandler = (e: React.MouseEvent<HTMLCanvasElement>) => {
-    setDown(false);
-    const { width } = canvasRef.current;
-    const x = getCursorPosition(e);
-    if (x < width / 2) {
-      const a = Number(value) - (width / 2 - x) * foreRange;
-      console.log((width / 2 - x) * foreRange, width / 2 - x, foreRange);
-      onStyleChange('saturation', a);
-    } else {
-      const b = Number(value) + (x - width / 2) * backRange;
-      onStyleChange('saturation', b);
-    }
-  };
-
-  const drawRangeToCanvas = ({ x }: DrawRangeToCanvasProps) => {
-    const ctx = canvasRef.current.getContext('2d');
-    const { width, height } = canvasRef.current;
-
-    if (!ctx) return;
-    ctx?.clearRect(0, 0, width, height);
-
-    ctx.fillStyle = 'darkgray';
-    ctx.beginPath();
-    ctx.rect(0, height / 2, width * 2, 2);
-    ctx.fill();
-
-    ctx.fillStyle = '#3ECF5C';
-    ctx.beginPath();
-    ctx.arc(x || width / 2, height / 2, 10, 0, Math.PI * 2);
-    ctx.fill();
-  };
-
-  const setRange = () => {
-    const { width } = canvasRef.current;
-    setForeRange(width / 2 / (100 - Number(value)));
-    setBackRange(width / 2 / Number(value));
-  };
-
-  useEffect(() => {
-    setRange();
-    drawRangeToCanvas({});
-  }, []);
-
-  return (
-    <Canvas
-      width="170"
-      height="50"
-      ref={canvasRef}
-      onMouseDown={mouseDownHandler}
-      onMouseMove={mouseMoveHandler}
-      onMouseUp={mouseUpHandler}
-    />
-  );
-}
-
-export default AAA;
diff --git a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
index 961ee3c..605a4cf 100644
--- a/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
+++ b/src/components/Sidebar/SidebarContentMore/SaturationStyle.tsx
@@ -3,7 +3,6 @@ import styled from '../../../utils/styles/styled';
 import { Range } from '../SidebarContentFewer/DepthItem';
 import useInputRange from '../../../hooks/common/useInputRange';
 import { StyleKeyType } from '../../../store/common/type';
-import AAA from './AAA';
 
 const SaturationWrapper = styled.div`
   display: flex;
@@ -50,7 +49,6 @@ function SaturationStyle({
         onChange={(e) => rangeChangeHandler(e)}
         onMouseUp={() => rangeMouseUpHandler(StyleKeyType.saturation)}
       />
-      {/* <AAA value="50" onStyleChange={onStyleChange} /> */}
     </SaturationWrapper>
   );
 }

From 7ed5926f61b45f59789b309ba9a8040dc69e04a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Wed, 2 Dec 2020 19:53:21 +0900
Subject: [PATCH 083/138] =?UTF-8?q?[refactor]=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=EC=97=90=20=EA=B0=92=EC=9C=BC=EB=A1=9C=20defaultColor=EB=A5=BC?=
 =?UTF-8?q?=20=EC=A3=BC=EA=B8=B0=20=EC=9C=84=ED=95=B4=EC=84=9C=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=EC=9D=84=20=EC=A7=80=EC=A0=95=EC=A4=91=EC=9D=B4?=
 =?UTF-8?q?=EB=8B=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 초기에 값으로 defaultColor를 주기로 결정
- 타입에러가 많이나서 공유 후 개별적으로 해결해볼 예정
---
 src/store/common/type.ts                 |  51 ++++++-
 src/store/style/getReducer.ts            |  17 ++-
 src/store/style/properties.ts            | 112 +++++++++++++--
 src/utils/rendering-data/layersColor2.ts | 168 ++++++++++++++---------
 4 files changed, 263 insertions(+), 85 deletions(-)

diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index 9ba1caa..d19e689 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -1,5 +1,27 @@
 import { init, setStyle } from '../style/action';
 
+export interface nice {
+  poi:
+    | 'all'
+    | 'landmark'
+    | 'business'
+    | 'government'
+    | 'medical'
+    | 'park'
+    | 'worship'
+    | 'school'
+    | 'sports'
+    | 'etc';
+  road: 'all';
+  administrative: 'all' | 'country' | 'state' | 'locality';
+  landscape: 'all';
+  transit: 'all';
+  water: 'all';
+  marker: 'all';
+}
+
+export type hello = 'landmark';
+
 export enum ElementNameType {
   section = 'section',
   labelText = 'labelText',
@@ -43,15 +65,15 @@ export interface StyleType {
   saturation: number;
   lightness: number;
 }
-export interface ElementType {
+export interface SubElementType {
   fill: StyleType;
   stroke: StyleType;
 }
 export interface FeatureType {
   isChanged: boolean;
-  section: ElementType;
-  labelText: ElementType;
-  labelIcon: StyleType;
+  section: SubElementType | null;
+  labelText: SubElementType | null;
+  labelIcon: StyleType | null;
 }
 export interface FeatureState {
   [name: string]: FeatureType;
@@ -61,8 +83,27 @@ export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
 
 export type ActionPayload = {
   feature: FeatureNameType;
-  subFeature?: string;
+  subFeature: string;
   element: ElementNameType;
   subElement?: SubElementNameType;
   style: StyleType;
 };
+
+export interface HasPropertiesType {
+  featureType: FeatureNameType;
+  subFeatureType: string;
+}
+
+export interface PropertyType {
+  [subFeatureType: string]: {
+    [ElementNameType.section]?: {
+      fill: string;
+      stroke: string;
+    } | null;
+    [ElementNameType.labelText]?: {
+      fill: string;
+      stroke: string;
+    } | null;
+    [ElementNameType.labelIcon]?: string | null;
+  };
+}
diff --git a/src/store/style/getReducer.ts b/src/store/style/getReducer.ts
index d32f05c..f56d689 100644
--- a/src/store/style/getReducer.ts
+++ b/src/store/style/getReducer.ts
@@ -7,6 +7,7 @@ import {
   SubElementNameType,
   objType,
   ElementNameType,
+  SubElementType,
 } from '../common/type';
 import { getDefaultFeature } from './properties';
 import { INIT, SET } from './action';
@@ -23,7 +24,10 @@ export default function getReducer(IDX: number): ReducerType {
   ];
 
   const initialState = subFeatures.reduce((acc: FeatureState, cur: string) => {
-    acc[cur] = getDefaultFeature();
+    acc[cur] = getDefaultFeature({
+      featureType: renderingData[IDX].typeKey,
+      subFeatureType: cur,
+    });
     return acc;
   }, {});
 
@@ -51,12 +55,15 @@ export default function getReducer(IDX: number): ReducerType {
 
         let prevIsChanged;
         if (element === ElementNameType.labelIcon) {
-          prevIsChanged = newFeature[element].isChanged;
+          prevIsChanged = newFeature[element]?.isChanged;
           newFeature[element] = style;
         } else {
-          prevIsChanged =
-            newFeature[element][subElement as SubElementNameType].isChanged;
-          newFeature[element][subElement as SubElementNameType] = style;
+          prevIsChanged = (newFeature[element] as SubElementType)[
+            subElement as SubElementNameType
+          ].isChanged;
+          (newFeature[element] as SubElementType)[
+            subElement as SubElementNameType
+          ] = style;
         }
 
         if (prevIsChanged !== style.isChanged) {
diff --git a/src/store/style/properties.ts b/src/store/style/properties.ts
index 83b0051..d7e2e87 100644
--- a/src/store/style/properties.ts
+++ b/src/store/style/properties.ts
@@ -1,4 +1,46 @@
-import { StyleType, ElementType, FeatureType } from '../common/type';
+// import { StyleType, ElementType, FeatureType } from '../common/type';
+
+// const style: StyleType = {
+//   isChanged: false,
+//   visibility: 'inherit',
+//   color: '#55bf40',
+//   weight: 0,
+//   saturation: 0,
+//   lightness: 0,
+// };
+
+// export const getDefaultStyle = (): StyleType => {
+//   return JSON.parse(JSON.stringify(style));
+// };
+
+// const getDefaultElement = (): ElementType => {
+//   return {
+//     fill: getDefaultStyle(),
+//     stroke: getDefaultStyle(),
+//   };
+// };
+
+// export const getDefaultFeature = (): FeatureType => {
+//   return {
+//     isChanged: false,
+//     section: getDefaultElement(),
+//     labelText: getDefaultElement(),
+//     labelIcon: getDefaultStyle(),
+//   };
+// };
+
+import {
+  StyleType,
+  ElementNameType,
+  FeatureType,
+  FeatureNameType,
+  HasPropertiesType,
+  SubElementNameType,
+  PropertyType,
+  nice,
+} from '../common/type';
+
+import defaultStyle from '../../utils/rendering-data/layersColor2';
 
 const style: StyleType = {
   isChanged: false,
@@ -9,22 +51,70 @@ const style: StyleType = {
   lightness: 0,
 };
 
-export const getDefaultStyle = (): StyleType => {
-  return JSON.parse(JSON.stringify(style));
-};
+interface getDefaultStyleProps<T> {
+  featureType: FeatureNameType;
+  subFeatureType: T;
+  elementType: ElementNameType;
+  subElementType: SubElementNameType;
+}
 
-const getDefaultElement = (): ElementType => {
+export const getDefaultStyle = ({
+  featureType,
+  subFeatureType,
+  elementType,
+  subElementType,
+}: getDefaultStyleProps): StyleType => {
   return {
-    fill: getDefaultStyle(),
-    stroke: getDefaultStyle(),
+    ...JSON.parse(JSON.stringify(style)),
+    color: defaultStyle[featureType][subFeatureType],
+    // defaultStyle[featureType][subFeatureType][elementType][subElementType],
   };
 };
 
-export const getDefaultFeature = (): FeatureType => {
+export const getDefaultFeature = ({
+  featureType,
+  subFeatureType,
+}: HasPropertiesType): FeatureType => {
   return {
     isChanged: false,
-    section: getDefaultElement(),
-    labelText: getDefaultElement(),
-    labelIcon: getDefaultStyle(),
+    section: defaultStyle[featureType][subFeatureType][ElementNameType.section]
+      ? {
+          [SubElementNameType.fill]: getDefaultStyle({
+            featureType,
+            subFeatureType,
+            elementType: ElementNameType.section,
+            subElementType: SubElementNameType.fill,
+          }),
+          [SubElementNameType.stroke]: getDefaultStyle({
+            featureType,
+            subFeatureType,
+            elementType: ElementNameType.section,
+            subElementType: SubElementNameType.stroke,
+          }),
+        }
+      : null,
+    labelText: defaultStyle[featureType][subFeatureType][
+      ElementNameType.labelText
+    ]
+      ? {
+          [SubElementNameType.fill]: getDefaultStyle({
+            featureType,
+            subFeatureType,
+            elementType: ElementNameType.labelText,
+            subElementType: SubElementNameType.fill,
+          }),
+          [SubElementNameType.stroke]: getDefaultStyle({
+            featureType,
+            subFeatureType,
+            elementType: ElementNameType.labelText,
+            subElementType: SubElementNameType.stroke,
+          }),
+        }
+      : null,
+    labelIcon: defaultStyle[featureType][subFeatureType][
+      ElementNameType.labelIcon
+    ]
+      ? getDefaultStyle()
+      : null,
   };
 };
diff --git a/src/utils/rendering-data/layersColor2.ts b/src/utils/rendering-data/layersColor2.ts
index 5014988..ea12695 100644
--- a/src/utils/rendering-data/layersColor2.ts
+++ b/src/utils/rendering-data/layersColor2.ts
@@ -1,108 +1,148 @@
+import {
+  SubElementNameType,
+  ElementNameType,
+  FeatureNameType,
+  PropertyType,
+} from '../../store/common/type';
+
 export default {
-  poi: {
+  [FeatureNameType.poi]: {
+    all: {},
     landmark: {
-      labelText: {
-        fill: 'hsl(26, 25%, 32%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
       },
-      labelIcon: 'transparent',
+      [ElementNameType.labelIcon]: 'transparent',
     },
     business: {
-      labelText: {
-        fill: 'hsl(22, 55%, 55%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(22, 55%, 55%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
       },
-      labelIcon: 'transparent',
+      [ElementNameType.labelIcon]: 'transparent',
     },
     government: {
-      labelText: {
-        fill: 'hsl(26, 25%, 32%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
       },
-      labelIcon: 'transparent',
+      [ElementNameType.labelIcon]: 'transparent',
     },
     medical: {
-      labelText: {
-        fill: 'hsl(340, 39%, 42%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(340, 39%, 42%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
       },
-      labelIcon: 'transparent',
+      [ElementNameType.labelIcon]: 'transparent',
     },
     park: {
-      labelText: {
-        fill: 'hsl(100, 45%, 37%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(100, 45%, 37%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
       },
-      labelIcon: 'transparent',
+      [ElementNameType.labelIcon]: 'transparent',
     },
     worship: {
-      labelText: {
-        fill: 'hsl(26, 25%, 32%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
       },
-      labelIcon: 'transparent',
+      [ElementNameType.labelIcon]: 'transparent',
     },
     school: {
-      labelText: {
-        fill: 'hsl(51, 40%, 40%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(51, 40%, 40%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
       },
-      labelIcon: 'transparent',
+      [ElementNameType.labelIcon]: 'transparent',
     },
     sports: {
-      labelText: {
-        fill: 'hsl(26, 25%, 32%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
       },
-      labelIcon: 'transparent',
+      [ElementNameType.labelIcon]: 'transparent',
     },
     etc: {
-      labelText: {
-        fill: 'hsl(26, 25%, 32%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
       },
-      labelIcon: 'transparent',
+      [ElementNameType.labelIcon]: 'transparent',
     },
   },
-  road: {},
-  administrative: {
+  [FeatureNameType.road]: {
+    all: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+    },
+  },
+  [FeatureNameType.administrative]: {
+    all: {},
     country: {
-      section: {
-        fill: 'transparent',
-        stroke: 'hsl(230, 8%, 51%)',
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'hsl(230, 8%, 51%)',
       },
-      labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(0, 0%, 0%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
       },
     },
     state: {
-      section: {
-        fill: 'transparent',
-        stroke: 'hsl(230, 14%, 77%)',
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'hsl(230, 14%, 77%)',
       },
-      labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(0, 0%, 0%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
       },
     },
     locality: {
-      labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(0, 0%, 0%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
+      },
+    },
+  },
+  [FeatureNameType.landscape]: {
+    all: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+    },
+  },
+  [FeatureNameType.transit]: {
+    all: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
       },
     },
   },
-  landscape: {},
-  transit: {},
-  water: {
-    section: {
-      fill: 'hsl(205, 87%, 76%)',
-      stroke: 'transparent',
-    },
-    labelText: {
-      fill: 'hsl(230, 48%, 44%)',
-      stroke: 'transparent',
+  [FeatureNameType.water]: {
+    all: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(205, 87%, 76%)',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(230, 48%, 44%)',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+    },
+  },
+  [FeatureNameType.marker]: {
+    all: {
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
     },
   },
 };

From 347c72d8d5095c80f89ab162fc219a251ea3f6bb Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Wed, 2 Dec 2020 22:29:32 +0900
Subject: [PATCH 084/138] =?UTF-8?q?[fix]=20road-polygon=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=EB=B3=84=20=EB=82=98=EB=88=84?=
 =?UTF-8?q?=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기존 mapbox의 road-polygon layer 카테고리별 나누기
- 기존 local로 분류하였던 tertiary 관련 class, arterial로 변경
---
 src/store/map/initializeMap.ts |   1 +
 src/store/map/layers/road.ts   | 117 ++++++++++++++++++++++++---------
 2 files changed, 87 insertions(+), 31 deletions(-)

diff --git a/src/store/map/initializeMap.ts b/src/store/map/initializeMap.ts
index 108d186..265a122 100644
--- a/src/store/map/initializeMap.ts
+++ b/src/store/map/initializeMap.ts
@@ -68,6 +68,7 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
     translate(map);
     map.removeLayer('poi-label');
     map.removeLayer('road-label');
+    map.removeLayer('road-polygon');
 
     map.addSource(Sources.polygon, {
       type: 'vector',
diff --git a/src/store/map/layers/road.ts b/src/store/map/layers/road.ts
index 805aaa0..bc4d19a 100644
--- a/src/store/map/layers/road.ts
+++ b/src/store/map/layers/road.ts
@@ -79,7 +79,7 @@ export default [
       [
         'match',
         ['get', 'class'],
-        ['motorway', 'trunk', 'primary', 'secondary'],
+        ['motorway', 'trunk', 'primary', 'secondary', 'tertiary'],
         true,
         false,
       ],
@@ -87,7 +87,7 @@ export default [
       [
         'match',
         ['get', 'class'],
-        ['motorway', 'trunk', 'primary', 'secondary'],
+        ['motorway', 'trunk', 'primary', 'secondary', 'tertiary'],
         true,
         false,
       ],
@@ -101,9 +101,15 @@ export default [
         [
           'match',
           ['get', 'class'],
-          ['motorway', 'trunk', 'primary', 'secondary'],
+          ['motorway', 'trunk', 'primary', 'secondary', 'tertiary'],
           10,
-          ['motorway_link', 'trunk_link', 'primary_link', 'secondary_link'],
+          [
+            'motorway_link',
+            'trunk_link',
+            'primary_link',
+            'secondary_link',
+            'tertiary_link',
+          ],
           9,
           6.5,
         ],
@@ -111,9 +117,15 @@ export default [
         [
           'match',
           ['get', 'class'],
-          ['motorway', 'trunk', 'primary', 'secondary'],
+          ['motorway', 'trunk', 'primary', 'secondary', 'tertiary'],
           16,
-          ['motorway_link', 'trunk_link', 'primary_link', 'secondary_link'],
+          [
+            'motorway_link',
+            'trunk_link',
+            'primary_link',
+            'secondary_link',
+            'tertiary_link',
+          ],
           14,
           13,
         ],
@@ -153,38 +165,16 @@ export default [
     'source-layer': 'road',
     metadata: {},
     minzoom: 10,
-    filter: [
-      'step',
-      ['zoom'],
-      ['match', ['get', 'class'], ['tertiary'], true, false],
-      12,
-      ['match', ['get', 'class'], ['tertiary', 'street'], true, false],
-    ],
+    filter: ['match', ['get', 'class'], ['street'], true, false],
     layout: {
       'text-size': [
         'interpolate',
         ['linear'],
         ['zoom'],
         10,
-        [
-          'match',
-          ['get', 'class'],
-          ['tertiary'],
-          10,
-          ['tertiary_link', 'street'],
-          9,
-          6.5,
-        ],
+        ['match', ['get', 'class'], ['street'], 9, 6.5],
         18,
-        [
-          'match',
-          ['get', 'class'],
-          ['tertiary'],
-          16,
-          ['tertiary_link', 'street'],
-          14,
-          13,
-        ],
+        ['match', ['get', 'class'], ['street'], 14, 13],
       ],
       'text-max-angle': 30,
       'text-font': ['DIN Offc Pro Regular', 'Arial Unicode MS Regular'],
@@ -268,4 +258,69 @@ export default [
       'text-halo-blur': 1,
     },
   },
+  {
+    id: 'road-arterial-polygon',
+    type: 'fill',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: { 'mapbox:group': '1444855786460.0557' },
+    minzoom: 12,
+    filter: [
+      'all',
+      ['==', ['geometry-type'], 'Polygon'],
+      [
+        'match',
+        ['get', 'class'],
+        [
+          'primary',
+          'secondary',
+          'tertiary',
+          'primary_link',
+          'secondary_link',
+          'tertiary_link',
+        ],
+        true,
+        false,
+      ],
+      ['match', ['get', 'structure'], ['none', 'ford'], true, false],
+    ],
+    paint: {
+      'fill-color': 'hsl(0, 0%, 100%)',
+      'fill-outline-color': '#d6d9e6',
+    },
+  },
+  {
+    id: 'road-local-polygon',
+    type: 'fill',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: { 'mapbox:group': '1444855786460.0557' },
+    minzoom: 12,
+    filter: [
+      'all',
+      ['==', ['geometry-type'], 'Polygon'],
+      ['match', ['get', 'class'], ['street'], true, false],
+    ],
+    paint: {
+      'fill-color': 'hsl(0, 0%, 100%)',
+      'fill-outline-color': '#d6d9e6',
+    },
+  },
+  {
+    id: 'road-sidewalk-polygon',
+    type: 'fill',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: { 'mapbox:group': '1444855786460.0557' },
+    minzoom: 12,
+    filter: [
+      'all',
+      ['==', ['geometry-type'], 'Polygon'],
+      ['match', ['get', 'class'], ['street_limited'], true, false],
+    ],
+    paint: {
+      'fill-color': 'hsl(0, 0%, 100%)',
+      'fill-outline-color': '#d6d9e6',
+    },
+  },
 ];

From 30d25f4bfc0629d7b0e19035389cbaa05affac1f Mon Sep 17 00:00:00 2001
From: yyjjjj <lee.yeonjeong.lee@gmail.com>
Date: Wed, 2 Dec 2020 22:32:42 +0900
Subject: [PATCH 085/138] =?UTF-8?q?[refactor]=20[#81]=20road=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=A0=81=EC=9A=A9=20=EB=B0=A9=EC=8B=9D=20?=
 =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- layerNames 형식 세분화 및 통일
- src/utils/map-styling/road.ts에서 roadStyling 함수로 들어오는 subFeatureName과 스타일링 관련 함수로
전달해줄 layerNames를 mapping 해준다.
- 그 결과 같은 흐름을 공유하고 있는 스타일 적용 부분을 stylingCategory
함수를 재활용하여 처리할 수 있다.
---
 .../map-styling/road-categories/arterial.ts   | 119 ++-----------
 .../map-styling/road-categories/local.ts      | 108 +-----------
 .../map-styling/road-categories/sidewalk.ts   | 112 +------------
 .../road-categories/stylingCategory.ts        | 158 ++++++++++++++++++
 src/utils/map-styling/road.ts                 |  53 +++---
 5 files changed, 208 insertions(+), 342 deletions(-)
 create mode 100644 src/utils/map-styling/road-categories/stylingCategory.ts

diff --git a/src/utils/map-styling/road-categories/arterial.ts b/src/utils/map-styling/road-categories/arterial.ts
index 36ca1f9..bf9f685 100644
--- a/src/utils/map-styling/road-categories/arterial.ts
+++ b/src/utils/map-styling/road-categories/arterial.ts
@@ -1,17 +1,3 @@
-import { stylingProps } from '../index';
-import {
-  StyleKeyType,
-  ElementNameType,
-  SubElementNameType,
-} from '../../../store/common/type';
-import {
-  applyVisibility,
-  applyColor,
-  applyWeight,
-  ColorType,
-  WeightType,
-} from '../../applyStyle';
-
 export const arterialLayerNames = {
   all: [
     'road-arterial',
@@ -19,8 +5,22 @@ export const arterialLayerNames = {
     'road-exit-shield',
     'road-arterial-label',
   ],
-  polygon: [],
-  line: ['road-arterial'],
+  polygon: ['road-arterial-polygon'],
+  line: [
+    'road-arterial',
+    'road-primary',
+    'road-secondary-tertiary',
+    'road-motorway-trunk',
+    'road-minor',
+    'road-minor-low',
+  ],
+  stroke: [
+    'road-primary-case',
+    'road-secondary-tertiary-case',
+    'road-motorway-trunk-case',
+    'road-minor-case',
+    'road-minor-low',
+  ],
   text: {
     all: ['road-number-shield', 'road-exit-shield', 'road-arterial-label'],
     hasStroke: ['road-arterial-label'],
@@ -28,90 +28,3 @@ export const arterialLayerNames = {
   },
   icon: [],
 };
-
-function arterialStyling({
-  map,
-  subFeatureName,
-  detailName,
-  subDetailName,
-  key,
-  style,
-}: stylingProps): void {
-  const { visibility, color, weight } = style;
-
-  if (key === 'visibility') {
-    if (detailName === ElementNameType.section) {
-      if (subDetailName === SubElementNameType.fill)
-        applyVisibility({
-          map,
-          layerNames: arterialLayerNames.line,
-          visibility,
-        });
-    } else if (detailName === ElementNameType.labelText) {
-      if (subDetailName === SubElementNameType.fill)
-        applyVisibility({
-          map,
-          layerNames: arterialLayerNames.text.noStroke,
-          visibility,
-        });
-      else if (subDetailName === SubElementNameType.stroke)
-        applyVisibility({
-          map,
-          layerNames: arterialLayerNames.text.hasStroke,
-          visibility,
-        });
-    }
-  } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
-    if (detailName === ElementNameType.section) {
-      if (subDetailName === SubElementNameType.fill) {
-        applyColor({
-          map,
-          layerNames: arterialLayerNames.line,
-          color,
-          type: ColorType.line,
-          [key]: style[key as StyleKeyType],
-        });
-      }
-    } else if (detailName === ElementNameType.labelText) {
-      if (subDetailName === SubElementNameType.fill) {
-        applyColor({
-          map,
-          layerNames: arterialLayerNames.text.all,
-          color,
-          type: ColorType.text,
-          [key]: style[key as StyleKeyType],
-        });
-      } else if (subDetailName === SubElementNameType.stroke) {
-        applyColor({
-          map,
-          layerNames: arterialLayerNames.text.hasStroke,
-          color,
-          type: ColorType.textHalo,
-          [key]: style[key as StyleKeyType],
-        });
-      }
-    }
-  } else if (key === 'weight') {
-    if (detailName === ElementNameType.section) {
-      if (subDetailName === SubElementNameType.fill) {
-        applyWeight({
-          map,
-          layerNames: arterialLayerNames.line,
-          type: WeightType.line,
-          weight,
-        });
-      }
-    }
-    if (detailName === ElementNameType.labelText) {
-      if (subDetailName === SubElementNameType.stroke)
-        applyWeight({
-          map,
-          layerNames: arterialLayerNames.text.hasStroke,
-          type: WeightType.textHalo,
-          weight,
-        });
-    }
-  }
-}
-
-export default arterialStyling;
diff --git a/src/utils/map-styling/road-categories/local.ts b/src/utils/map-styling/road-categories/local.ts
index c83aa15..617961f 100644
--- a/src/utils/map-styling/road-categories/local.ts
+++ b/src/utils/map-styling/road-categories/local.ts
@@ -1,21 +1,8 @@
-import { stylingProps } from '../index';
-import {
-  StyleKeyType,
-  ElementNameType,
-  SubElementNameType,
-} from '../../../store/common/type';
-import {
-  applyVisibility,
-  applyColor,
-  applyWeight,
-  ColorType,
-  WeightType,
-} from '../../applyStyle';
-
-const localLayerNames = {
+export const localLayerNames = {
   all: ['ferry', 'ferry-auto', 'road-local', 'road-local-label'],
-  polygon: [],
-  line: ['ferry', 'ferry-auto', 'road-local'],
+  polygon: ['road-local-polygon'],
+  line: ['ferry', 'ferry-auto', 'road-local', 'road-street'],
+  stroke: ['road-street-case'],
   text: {
     all: ['road-local-label'],
     hasStroke: ['road-local-label'],
@@ -23,90 +10,3 @@ const localLayerNames = {
   },
   icon: [],
 };
-
-function localStyling({
-  map,
-  subFeatureName,
-  detailName,
-  subDetailName,
-  key,
-  style,
-}: stylingProps): void {
-  const { visibility, color, weight } = style;
-
-  if (key === 'visibility') {
-    if (detailName === ElementNameType.section) {
-      if (subDetailName === SubElementNameType.fill)
-        applyVisibility({
-          map,
-          layerNames: localLayerNames.line,
-          visibility,
-        });
-    } else if (detailName === ElementNameType.labelText) {
-      if (subDetailName === SubElementNameType.fill)
-        applyVisibility({
-          map,
-          layerNames: localLayerNames.text.noStroke,
-          visibility,
-        });
-      else if (subDetailName === SubElementNameType.stroke)
-        applyVisibility({
-          map,
-          layerNames: localLayerNames.text.hasStroke,
-          visibility,
-        });
-    }
-  } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
-    if (detailName === 'section') {
-      if (subDetailName === 'fill') {
-        applyColor({
-          map,
-          layerNames: localLayerNames.line,
-          color,
-          type: ColorType.line,
-          [key]: style[key as StyleKeyType],
-        });
-      }
-    } else if (detailName === 'labelText') {
-      if (subDetailName === SubElementNameType.fill) {
-        applyColor({
-          map,
-          layerNames: localLayerNames.text.all,
-          color,
-          type: ColorType.text,
-          [key]: style[key as StyleKeyType],
-        });
-      } else if (subDetailName === SubElementNameType.stroke) {
-        applyColor({
-          map,
-          layerNames: localLayerNames.text.hasStroke,
-          color,
-          type: ColorType.textHalo,
-          [key]: style[key as StyleKeyType],
-        });
-      }
-    }
-  } else if (key === 'weight') {
-    if (detailName === ElementNameType.section) {
-      if (subDetailName === SubElementNameType.fill) {
-        applyWeight({
-          map,
-          layerNames: localLayerNames.line,
-          type: WeightType.line,
-          weight,
-        });
-      }
-    }
-    if (detailName === ElementNameType.labelText) {
-      if (subDetailName === SubElementNameType.stroke)
-        applyWeight({
-          map,
-          layerNames: localLayerNames.text.hasStroke,
-          type: WeightType.textHalo,
-          weight,
-        });
-    }
-  }
-}
-
-export default localStyling;
diff --git a/src/utils/map-styling/road-categories/sidewalk.ts b/src/utils/map-styling/road-categories/sidewalk.ts
index d3e5030..6137a5a 100644
--- a/src/utils/map-styling/road-categories/sidewalk.ts
+++ b/src/utils/map-styling/road-categories/sidewalk.ts
@@ -1,21 +1,12 @@
-import { stylingProps } from '../index';
-import {
-  StyleKeyType,
-  ElementNameType,
-  SubElementNameType,
-} from '../../../store/common/type';
-import {
-  applyVisibility,
-  applyColor,
-  applyWeight,
-  ColorType,
-  WeightType,
-} from '../../applyStyle';
-
-const sidewalkLayerNames = {
+export const sidewalkLayerNames = {
   all: ['road-footway', 'road-sidewalk-label'],
-  polygon: [],
-  line: ['road-footway'],
+  polygon: [
+    'road-pedestrian-polygon-fill',
+    'road-pedestrian-polygon-pattern',
+    'road-sidewalk-polygon',
+  ],
+  line: ['road-footway', 'road-pedestrian', 'road-steps', 'road-path'],
+  stroke: ['road-pedestrian-case'],
   text: {
     all: ['road-sidewalk-label'],
     hasStroke: ['road-sidewalk-label'],
@@ -23,90 +14,3 @@ const sidewalkLayerNames = {
   },
   icon: [],
 };
-
-function sidewalkStyling({
-  map,
-  subFeatureName,
-  detailName,
-  subDetailName,
-  key,
-  style,
-}: stylingProps): void {
-  const { visibility, color, weight } = style;
-
-  if (key === 'visibility') {
-    if (detailName === ElementNameType.section) {
-      if (subDetailName === SubElementNameType.fill)
-        applyVisibility({
-          map,
-          layerNames: sidewalkLayerNames.line,
-          visibility,
-        });
-    } else if (detailName === ElementNameType.labelText) {
-      if (subDetailName === SubElementNameType.fill)
-        applyVisibility({
-          map,
-          layerNames: sidewalkLayerNames.text.noStroke,
-          visibility,
-        });
-      else if (subDetailName === SubElementNameType.stroke)
-        applyVisibility({
-          map,
-          layerNames: sidewalkLayerNames.text.hasStroke,
-          visibility,
-        });
-    }
-  } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
-    if (detailName === 'section') {
-      if (subDetailName === 'fill') {
-        applyColor({
-          map,
-          layerNames: sidewalkLayerNames.line,
-          color,
-          type: ColorType.line,
-          [key]: style[key as StyleKeyType],
-        });
-      }
-    } else if (detailName === 'labelText') {
-      if (subDetailName === SubElementNameType.fill) {
-        applyColor({
-          map,
-          layerNames: sidewalkLayerNames.text.all,
-          color,
-          type: ColorType.text,
-          [key]: style[key as StyleKeyType],
-        });
-      } else if (subDetailName === SubElementNameType.stroke) {
-        applyColor({
-          map,
-          layerNames: sidewalkLayerNames.text.hasStroke,
-          color,
-          type: ColorType.textHalo,
-          [key]: style[key as StyleKeyType],
-        });
-      }
-    }
-  } else if (key === 'weight') {
-    if (detailName === ElementNameType.section) {
-      if (subDetailName === SubElementNameType.fill) {
-        applyWeight({
-          map,
-          layerNames: sidewalkLayerNames.line,
-          type: WeightType.line,
-          weight,
-        });
-      }
-    }
-    if (detailName === ElementNameType.labelText) {
-      if (subDetailName === SubElementNameType.stroke)
-        applyWeight({
-          map,
-          layerNames: sidewalkLayerNames.text.hasStroke,
-          type: WeightType.textHalo,
-          weight,
-        });
-    }
-  }
-}
-
-export default sidewalkStyling;
diff --git a/src/utils/map-styling/road-categories/stylingCategory.ts b/src/utils/map-styling/road-categories/stylingCategory.ts
new file mode 100644
index 0000000..5e6b4f0
--- /dev/null
+++ b/src/utils/map-styling/road-categories/stylingCategory.ts
@@ -0,0 +1,158 @@
+import {
+  applyVisibility,
+  applyColor,
+  applyWeight,
+  ColorType,
+  WeightType,
+} from '../../applyStyle';
+import mapboxgl from 'mapbox-gl';
+import {
+  ElementNameType,
+  SubElementNameType,
+  StyleKeyType,
+  StyleType,
+} from '../../../store/common/type';
+
+export interface layerProps {
+  all: string[];
+  polygon: string[];
+  line: string[];
+  stroke: string[];
+  text: {
+    all: string[];
+    hasStroke: string[];
+    noStroke: string[];
+  };
+  icon: string[];
+}
+
+export interface catergoryStylingProps {
+  map: mapboxgl.Map;
+  subFeatureName: string;
+  detailName: ElementNameType;
+  subDetailName: SubElementNameType;
+  key: StyleKeyType;
+  style: StyleType;
+  layerNames: layerProps;
+}
+
+function stylingCategory({
+  layerNames,
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+  key,
+  style,
+}: catergoryStylingProps): void {
+  const { visibility, color, weight } = style;
+
+  if (key === 'visibility') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyVisibility({
+          map,
+          layerNames: layerNames.line,
+          visibility,
+        });
+        applyVisibility({
+          map,
+          layerNames: layerNames.polygon,
+          visibility,
+        });
+      } else if (subDetailName === SubElementNameType.stroke)
+        applyVisibility({
+          map,
+          layerNames: layerNames.stroke,
+          visibility,
+        });
+    } else if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.fill)
+        applyVisibility({
+          map,
+          layerNames: layerNames.text.noStroke,
+          visibility,
+        });
+      else if (subDetailName === SubElementNameType.stroke)
+        applyVisibility({
+          map,
+          layerNames: layerNames.text.hasStroke,
+          visibility,
+        });
+    }
+  } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyColor({
+          map,
+          layerNames: layerNames.line,
+          color,
+          type: ColorType.line,
+          [key]: style[key as StyleKeyType],
+        });
+        applyColor({
+          map,
+          layerNames: layerNames.polygon,
+          color,
+          type: ColorType.fill,
+          [key]: style[key as StyleKeyType],
+        });
+      } else if (subDetailName === SubElementNameType.stroke) {
+        applyColor({
+          map,
+          layerNames: layerNames.stroke,
+          color,
+          type: ColorType.line,
+          [key]: style[key as StyleKeyType],
+        });
+      }
+    } else if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyColor({
+          map,
+          layerNames: layerNames.text.all,
+          color,
+          type: ColorType.text,
+          [key]: style[key as StyleKeyType],
+        });
+      } else if (subDetailName === SubElementNameType.stroke) {
+        applyColor({
+          map,
+          layerNames: layerNames.text.hasStroke,
+          color,
+          type: ColorType.textHalo,
+          [key]: style[key as StyleKeyType],
+        });
+      }
+    }
+  } else if (key === 'weight') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyWeight({
+          map,
+          layerNames: layerNames.line,
+          type: WeightType.line,
+          weight,
+        });
+      } else if (subDetailName === SubElementNameType.stroke) {
+        applyWeight({
+          map,
+          layerNames: layerNames.stroke,
+          type: WeightType.line,
+          weight,
+        });
+      }
+    }
+    if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.stroke)
+        applyWeight({
+          map,
+          layerNames: layerNames.text.hasStroke,
+          type: WeightType.textHalo,
+          weight,
+        });
+    }
+  }
+}
+
+export default stylingCategory;
diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
index 016678f..578e815 100644
--- a/src/utils/map-styling/road.ts
+++ b/src/utils/map-styling/road.ts
@@ -1,7 +1,8 @@
 import { stylingProps } from '.';
-import arterialStyling from './road-categories/arterial';
-import localStyling from './road-categories/local';
-import sidewalkStyling from './road-categories/sidewalk';
+import { arterialLayerNames } from './road-categories/arterial';
+import { localLayerNames } from './road-categories/local';
+import { sidewalkLayerNames } from './road-categories/sidewalk';
+import stylingCategory from './road-categories/stylingCategory';
 
 function roadStyling({
   map,
@@ -11,34 +12,24 @@ function roadStyling({
   key,
   style,
 }: stylingProps): void {
-  if (subFeatureName === 'arterial') {
-    arterialStyling({
-      map,
-      subFeatureName,
-      detailName,
-      subDetailName,
-      key,
-      style,
-    });
-  } else if (subFeatureName === 'local') {
-    localStyling({
-      map,
-      subFeatureName,
-      detailName,
-      subDetailName,
-      key,
-      style,
-    });
-  } else if (subFeatureName === 'sidewalk') {
-    sidewalkStyling({
-      map,
-      subFeatureName,
-      detailName,
-      subDetailName,
-      key,
-      style,
-    });
-  }
+  type RoadSubFeatureType = 'arterial' | 'local' | 'sidewalk';
+
+  const mappingSubFeatureLayerNames = {
+    arterial: arterialLayerNames,
+    local: localLayerNames,
+    sidewalk: sidewalkLayerNames,
+  };
+
+  stylingCategory({
+    layerNames:
+      mappingSubFeatureLayerNames[subFeatureName as RoadSubFeatureType],
+    map,
+    subFeatureName,
+    detailName,
+    subDetailName,
+    key,
+    style,
+  });
 }
 
 export default roadStyling;

From 53c4eaf1f822c839411e5d16d17f7c63799ff85e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Wed, 2 Dec 2020 23:54:10 +0900
Subject: [PATCH 086/138] =?UTF-8?q?[feat]=20=EB=8B=A4=EC=96=91=ED=95=9C=20?=
 =?UTF-8?q?=EC=83=81=ED=99=A9=EC=97=90=20=EC=93=B0=EC=9D=BC=20=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=83=89=EC=83=81=EC=9D=84=20?=
 =?UTF-8?q?=EC=97=AC=EB=9F=AC=20=EA=B2=BD=EC=9A=B0=EC=9D=98=20=EC=88=98?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B6=84=EB=A6=AC=ED=95=98=EC=98=80=EB=8B=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- layersColor4는 default색을 정하는 것을 담당한다
- 다른 레이어들에게 교통을 추가하였다
---
 src/utils/rendering-data/layerColor3.ts  | 11 ++++
 src/utils/rendering-data/layersColor.ts  | 20 ++++--
 src/utils/rendering-data/layersColor2.ts | 64 ++++++++++++++++++-
 src/utils/rendering-data/layersColor4.ts | 78 ++++++++++++++++++++++++
 4 files changed, 166 insertions(+), 7 deletions(-)
 create mode 100644 src/utils/rendering-data/layersColor4.ts

diff --git a/src/utils/rendering-data/layerColor3.ts b/src/utils/rendering-data/layerColor3.ts
index 556eda7..34c54c9 100644
--- a/src/utils/rendering-data/layerColor3.ts
+++ b/src/utils/rendering-data/layerColor3.ts
@@ -35,4 +35,15 @@ export default {
   'water-line-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
   'water-point-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
   'waterway-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'mapbox-airport-aeroway-polygon': {
+    color: 'hsl(40, 97%, 64%)',
+    type: 'fill',
+  },
+  'mapbox-airport-polygon': { color: 'hsl(234, 20%, 30%)', type: 'fill' },
+  'mapbox-airport-aeroway-line': { color: 'hsl(230, 23%, 82%)', type: 'line' },
+  'mapbox-airport-label': { color: 'hsl(0, 69%, 50%)', type: 'text' },
+  'transit-bus-label': { color: 'hsl(13, 68%, 63%)', type: 'text' },
+  'mapbox-rail-road-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
+  'transit-rail-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
+  'transit-subway-line': { color: 'hsl(192, 70%, 43%)', type: 'line' },
 };
diff --git a/src/utils/rendering-data/layersColor.ts b/src/utils/rendering-data/layersColor.ts
index 85a29ec..29a3a54 100644
--- a/src/utils/rendering-data/layersColor.ts
+++ b/src/utils/rendering-data/layersColor.ts
@@ -74,10 +74,22 @@ export default {
     mountain: {},
   },
   transit: {
-    airport: {},
-    bus: {},
-    rail: {},
-    subway: {},
+    airport: {
+      'mapbox-airport-aeroway-polygon': 'hsl(40, 97%, 64%)',
+      'mapbox-airport-polygon': 'hsl(234, 20%, 30%)',
+      'mapbox-airport-aeroway-line': 'hsl(230, 23%, 82%)',
+      'mapbox-airport-label': 'hsl(0, 69%, 50%)',
+    },
+    bus: {
+      'transit-bus-label': 'hsl(13, 68%, 63%)',
+    },
+    rail: {
+      'mapbox-rail-road-line': 'hsl(234, 20%, 30%)',
+      'transit-rail-line': 'hsl(234, 20%, 30%)',
+    },
+    subway: {
+      'transit-subway-line': 'hsl(192, 70%, 43%)',
+    },
   },
   water: {
     water: 'hsl(205, 87%, 76%)',
diff --git a/src/utils/rendering-data/layersColor2.ts b/src/utils/rendering-data/layersColor2.ts
index ea12695..aa7c8a7 100644
--- a/src/utils/rendering-data/layersColor2.ts
+++ b/src/utils/rendering-data/layersColor2.ts
@@ -2,12 +2,17 @@ import {
   SubElementNameType,
   ElementNameType,
   FeatureNameType,
-  PropertyType,
 } from '../../store/common/type';
 
 export default {
   [FeatureNameType.poi]: {
-    all: {},
+    all: {
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+      [ElementNameType.labelIcon]: 'transparent',
+    },
     landmark: {
       [ElementNameType.labelText]: {
         [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
@@ -81,7 +86,16 @@ export default {
     },
   },
   [FeatureNameType.administrative]: {
-    all: {},
+    all: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+    },
     country: {
       [ElementNameType.section]: {
         [SubElementNameType.fill]: 'transparent',
@@ -123,6 +137,50 @@ export default {
         [SubElementNameType.fill]: 'transparent',
         [SubElementNameType.stroke]: 'transparent',
       },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+    },
+    airport: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(40, 97%, 64%)',
+        [SubElementNameType.stroke]: 'hsl(230, 23%, 82%)',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(0, 69%, 50%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
+      },
+    },
+    bus: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(13, 68%, 63%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
+      },
+    },
+    rail: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(234, 20%, 30%)',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+    },
+    subway: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(192, 70%, 43%)',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
     },
   },
   [FeatureNameType.water]: {
diff --git a/src/utils/rendering-data/layersColor4.ts b/src/utils/rendering-data/layersColor4.ts
new file mode 100644
index 0000000..33cea5b
--- /dev/null
+++ b/src/utils/rendering-data/layersColor4.ts
@@ -0,0 +1,78 @@
+interface LayersColorType {
+  [name: string]: string;
+}
+
+const layersColor: LayersColorType = {
+  'poi-all-labelText-fill': 'transparent',
+  'poi-all-labelText-stroke': 'transparent',
+  'poi-all-labelIcon': 'transparent',
+  'poi-landmark-labelText-fill': 'hsl(26, 25%, 32%)',
+  'poi-landmark-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'poi-landmark-labelIcon': 'transparent',
+  'poi-business-labelText-fill': 'hsl(22, 55%, 55%)',
+  'poi-business-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'poi-business-labelIcon': 'transparent',
+  'poi-government-labelText-fill': 'hsl(26, 25%, 32%)',
+  'poi-government-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'poi-government-labelIcon': 'transparent',
+  'poi-medical-labelText-fill': 'hsl(340, 39%, 42%)',
+  'poi-medical-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'poi-medical-labelIcon': 'transparent',
+  'poi-park-labelText-fill': 'hsl(100, 45%, 37%)',
+  'poi-park-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'poi-park-labelIcon': 'transparent',
+  'poi-worship-labelText-fill': 'hsl(26, 25%, 32%)',
+  'poi-worship-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'poi-worship-labelIcon': 'transparent',
+  'poi-school-labelText-fill': 'hsl(51, 40%, 40%)',
+  'poi-school-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'poi-school-labelIcon': 'transparent',
+  'poi-sports-labelText-fill': 'hsl(26, 25%, 32%)',
+  'poi-sports-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'poi-sports-labelIcon': 'transparent',
+  'poi-etc-labelText-fill': 'hsl(26, 25%, 32%)',
+  'poi-etc-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'poi-etc-labelIcon': 'transparent',
+  'administrative-all-section-fill': 'transparent',
+  'administrative-all-section-stroke': 'transparent',
+  'administrative-all-labelText-fill': 'transparent',
+  'administrative-all-labelText-stroke': 'transparent',
+  'administrative-country-section-fill': 'transparent',
+  'administrative-country-section-stroke': 'hsl(230, 8%, 51%)',
+  'administrative-country-labelText-fill': 'hsl(0, 0%, 0%)',
+  'administrative-country-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'administrative-state-section-fill': 'transparent',
+  'administrative-state-section-stroke': 'hsl(230, 14%, 77%)',
+  'administrative-state-labelText-fill': 'hsl(0, 0%, 0%)',
+  'administrative-state-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'administrative-locality-section-fill': 'transparent',
+  'administrative-locality-section-stroke': 'transparent',
+  'administrative-locality-labelText-fill': 'hsl(0, 0%, 0%)',
+  'administrative-locality-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'transit-all-section-fill': 'transparent',
+  'transit-all-section-stroke': 'transparent',
+  'transit-all-labelText-fill': 'transparent',
+  'transit-all-labelText-stroke': 'transparent',
+  'transit-airport-section-fill': 'hsl(40, 97%, 64%)',
+  'transit-airport-section-stroke': 'hsl(230, 23%, 82%)',
+  'transit-airport-labelText-fill': 'hsl(0, 69%, 50%)',
+  'transit-airport-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'transit-bus-section-fill': 'transparent',
+  'transit-bus-section-stroke': 'transparent',
+  'transit-bus-labelText-fill': 'hsl(13, 68%, 63%)',
+  'transit-bus-labelText-stroke': 'hsl(0, 0%, 100%)',
+  'transit-rail-section-fill': 'hsl(234, 20%, 30%)',
+  'transit-rail-section-stroke': 'transparent',
+  'transit-rail-labelText-fill': 'transparent',
+  'transit-rail-labelText-stroke': 'transparent',
+  'transit-subway-section-fill': 'hsl(192, 70%, 43%)',
+  'transit-subway-section-stroke': 'transparent',
+  'transit-subway-labelText-fill': 'transparent',
+  'transit-subway-labelText-stroke': 'transparent',
+  'water-all-section-fill': 'hsl(205, 87%, 76%)',
+  'water-all-section-stroke': 'transparent',
+  'water-all-labelText-fill': 'hsl(230, 48%, 44%)',
+  'water-all-labelText-stroke': 'transparent',
+};
+
+export default layersColor;

From d1fe9251ca388c0c13c733ff6b9cb048df22a53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Wed, 2 Dec 2020 23:56:13 +0900
Subject: [PATCH 087/138] =?UTF-8?q?[feat]=20[#72]=20hslToHEX=ED=95=A8?=
 =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- hsl에서 hex를 바꾸는 함수를 추가.
- 상태에는 hex값으로 넣어준다
---
 src/utils/colorFormat.ts | 53 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/src/utils/colorFormat.ts b/src/utils/colorFormat.ts
index 9c4166f..8cc4596 100644
--- a/src/utils/colorFormat.ts
+++ b/src/utils/colorFormat.ts
@@ -40,3 +40,56 @@ export function hexToHSL(color: string): HexToHSLType {
     l,
   };
 }
+
+export function hslToHEX(color: string): string {
+  if (color === 'transparent') return '#000000';
+  const hsl = color.match(/\d+/g)?.map((c) => Number(c)) as number[];
+
+  const h: number = hsl[0];
+  const s: number = hsl[1] / 100;
+  const l: number = hsl[2] / 100;
+
+  const c = (1 - Math.abs(2 * l - 1)) * s;
+  const x = c * (1 - Math.abs(((h / 60) % 2) - 1));
+  const m = l - c / 2;
+  let r = 0;
+  let g = 0;
+  let b = 0;
+
+  if (h >= 0 && h < 60) {
+    r = c;
+    g = x;
+    b = 0;
+  } else if (h >= 60 && h < 120) {
+    r = x;
+    g = c;
+    b = 0;
+  } else if (h >= 120 && h < 180) {
+    r = 0;
+    g = c;
+    b = x;
+  } else if (h >= 180 && h < 240) {
+    r = 0;
+    g = x;
+    b = c;
+  } else if (h >= 240 && h < 300) {
+    r = x;
+    g = 0;
+    b = c;
+  } else if (h >= 300 && h < 360) {
+    r = c;
+    g = 0;
+    b = x;
+  }
+  // Having obtained RGB, convert channels to hex
+  let stringR: string = Math.round((r + m) * 255).toString(16);
+  let stringG: string = Math.round((g + m) * 255).toString(16);
+  let stringB: string = Math.round((b + m) * 255).toString(16);
+
+  // Prepend 0s, if necessary
+  if (stringR.length === 1) stringR = `0${stringR}`;
+  if (stringG.length === 1) stringG = `0${stringG}`;
+  if (stringB.length === 1) stringB = `0${stringB}`;
+
+  return `#${stringR}${stringG}${stringB}`;
+}

From 5a6116bcc4d9f3019545038f5ab4b138c0614125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Wed, 2 Dec 2020 23:58:31 +0900
Subject: [PATCH 088/138] =?UTF-8?q?[refactor]=20=EC=A7=80=EB=8F=84=20?=
 =?UTF-8?q?=EC=B4=88=EA=B8=B0=EC=97=90=20=EC=84=B8=ED=8C=85=20=EC=8B=9C=20?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=96=B4=20=EC=83=89=EB=93=A4=EC=9D=84=20?=
 =?UTF-8?q?=EC=B9=A0=ED=95=B4=EC=A4=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 지도를 초기에 세팅할 때 레이어들의 색깔을 칠해주도록 하였다
- 레이어들의 색은 layersColor3의 파일을 이용한다
---
 src/store/common/type.ts       | 4 ++--
 src/store/map/initializeMap.ts | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index d19e689..7e25a68 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -90,8 +90,8 @@ export type ActionPayload = {
 };
 
 export interface HasPropertiesType {
-  featureType: FeatureNameType;
-  subFeatureType: string;
+  featureName: FeatureNameType;
+  subFeatureName: string;
 }
 
 export interface PropertyType {
diff --git a/src/store/map/initializeMap.ts b/src/store/map/initializeMap.ts
index fcdbcfa..9a89fde 100644
--- a/src/store/map/initializeMap.ts
+++ b/src/store/map/initializeMap.ts
@@ -10,6 +10,8 @@ import landscape from './layers/landscape';
 import water from './layers/water';
 import mapboxPOI from './layers/mapbox-poi';
 
+import initColor from '../../utils/rendering-data/layerColor3';
+
 const LNG = 126.978;
 const LAT = 37.5656;
 const ZOOM = 15.5;
@@ -91,6 +93,10 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
       ...poi,
     ] as mapboxgl.Layer[];
     layers.forEach((layer: mapboxgl.Layer) => map.addLayer(layer));
+
+    Object.entries(initColor).forEach(([key, value]) => {
+      map.setPaintProperty(key, `${value.type}-color`, value.color);
+    });
   });
 
   return map;

From 49be0eb7fcdf67d19a0e2595dea5df2013591dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Wed, 2 Dec 2020 23:59:53 +0900
Subject: [PATCH 089/138] =?UTF-8?q?[feat]=20=EC=B4=88=EA=B8=B0=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EC=8B=9C=20=EC=83=81=ED=83=9C=EC=97=90=20=EA=B0=81?=
 =?UTF-8?q?=20=EC=86=8D=EC=84=B1=EB=B3=84=EB=A1=9C=20=EC=83=89=EC=83=81?=
 =?UTF-8?q?=EC=9D=84=20=EC=A7=80=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- layersColor4를 이용해서 각 속성별로 초기에 색상을 지정해준다.
- 따라서 사이드바에서 옵션별로 색상이 다르게 표기된다.
- 채도와 명도 값도 맞춰서 조절해야 할 것 같다.
- section / labelText / labelIcon의 조절 여부에 따라서 feature마다 보여지는 세부설정 요소가 달라진다
---
 .../Sidebar/SidebarContentMore/DetailType.tsx | 130 ++++++++-------
 src/store/style/properties.ts                 | 151 ++++++++++--------
 2 files changed, 156 insertions(+), 125 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index 133d776..edda5c2 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -99,81 +99,103 @@ function DetailType({
     <>
       <DetailWrapper>
         <Title>세부 유형</Title>
-        <List>
-          <Text padding="first">구역</Text>
-          {section?.fill.isChanged ? <Check>✓</Check> : <></>}
-          <ListItem
-            isSelected={checkIsSelected(
-              ElementNameType.section,
-              SubElementNameType.fill
-            )}
-            padding="second"
-            clickHandler={() => {
-              styleClickHandler(
-                ElementNameType.section,
-                SubElementNameType.fill
-              );
-            }}
-            name="채우기"
-          />
-          {section?.stroke.isChanged ? <Check>✓</Check> : <></>}
-          <ListItem
-            isSelected={
-              sidebarTypeName === ElementNameType.section &&
-              sidebarSubTypeName === SubElementNameType.stroke
-            }
-            padding="second"
-            clickHandler={() => {
-              styleClickHandler(
-                ElementNameType.section,
-                SubElementNameType.stroke
-              );
-            }}
-            name="윤곽선"
-          />
-        </List>
-        <List>
-          <Text padding="first">라벨</Text>
+        {section ? (
           <List>
-            <Text padding="second">텍스트</Text>
-            {labelText?.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+            <Text padding="first">구역</Text>
+            {section?.fill.isChanged ? <Check>✓</Check> : <></>}
             <ListItem
               isSelected={checkIsSelected(
-                ElementNameType.labelText,
+                ElementNameType.section,
                 SubElementNameType.fill
               )}
-              padding="third"
+              padding="second"
               clickHandler={() => {
                 styleClickHandler(
-                  ElementNameType.labelText,
+                  ElementNameType.section,
                   SubElementNameType.fill
                 );
               }}
               name="채우기"
             />
-            {labelText?.stroke.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+            {section?.stroke.isChanged ? <Check>✓</Check> : <></>}
             <ListItem
-              isSelected={checkIsSelected(
-                ElementNameType.labelText,
-                SubElementNameType.stroke
-              )}
-              padding="third"
+              isSelected={
+                sidebarTypeName === ElementNameType.section &&
+                sidebarSubTypeName === SubElementNameType.stroke
+              }
+              padding="second"
               clickHandler={() => {
                 styleClickHandler(
-                  ElementNameType.labelText,
+                  ElementNameType.section,
                   SubElementNameType.stroke
                 );
               }}
               name="윤곽선"
             />
           </List>
-          {labelIcon?.isChanged ? <Check>✓</Check> : <></>}
-          <ListItem
-            isSelected={checkIsSelected(ElementNameType.labelIcon)}
-            padding="second"
-            clickHandler={() => styleClickHandler(ElementNameType.labelIcon)}
-            name="아이콘"
-          />
+        ) : (
+          <></>
+        )}
+        <List>
+          {labelText ? (
+            <>
+              <Text padding="first">라벨</Text>
+              <List>
+                <Text padding="second">텍스트</Text>
+                {labelText?.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+                <ListItem
+                  isSelected={checkIsSelected(
+                    ElementNameType.labelText,
+                    SubElementNameType.fill
+                  )}
+                  padding="third"
+                  clickHandler={() => {
+                    styleClickHandler(
+                      ElementNameType.labelText,
+                      SubElementNameType.fill
+                    );
+                  }}
+                  name="채우기"
+                />
+                {labelText?.stroke.isChanged ? (
+                  <CheckRight>✓</CheckRight>
+                ) : (
+                  <></>
+                )}
+                <ListItem
+                  isSelected={checkIsSelected(
+                    ElementNameType.labelText,
+                    SubElementNameType.stroke
+                  )}
+                  padding="third"
+                  clickHandler={() => {
+                    styleClickHandler(
+                      ElementNameType.labelText,
+                      SubElementNameType.stroke
+                    );
+                  }}
+                  name="윤곽선"
+                />
+              </List>
+            </>
+          ) : (
+            <></>
+          )}
+          {labelIcon ? (
+            <>
+              {labelIcon.isChanged ? <Check>✓</Check> : <></>}
+              <ListItem
+                isSelected={checkIsSelected(ElementNameType.labelIcon)}
+                padding="second"
+                clickHandler={() => {
+                  styleClickHandler(ElementNameType.labelIcon);
+                }}
+                name="아이콘"
+              />
+            </>
+          ) : (
+            <></>
+          )}
         </List>
       </DetailWrapper>
       <Styler
diff --git a/src/store/style/properties.ts b/src/store/style/properties.ts
index d7e2e87..add1e15 100644
--- a/src/store/style/properties.ts
+++ b/src/store/style/properties.ts
@@ -1,34 +1,3 @@
-// import { StyleType, ElementType, FeatureType } from '../common/type';
-
-// const style: StyleType = {
-//   isChanged: false,
-//   visibility: 'inherit',
-//   color: '#55bf40',
-//   weight: 0,
-//   saturation: 0,
-//   lightness: 0,
-// };
-
-// export const getDefaultStyle = (): StyleType => {
-//   return JSON.parse(JSON.stringify(style));
-// };
-
-// const getDefaultElement = (): ElementType => {
-//   return {
-//     fill: getDefaultStyle(),
-//     stroke: getDefaultStyle(),
-//   };
-// };
-
-// export const getDefaultFeature = (): FeatureType => {
-//   return {
-//     isChanged: false,
-//     section: getDefaultElement(),
-//     labelText: getDefaultElement(),
-//     labelIcon: getDefaultStyle(),
-//   };
-// };
-
 import {
   StyleType,
   ElementNameType,
@@ -36,11 +5,10 @@ import {
   FeatureNameType,
   HasPropertiesType,
   SubElementNameType,
-  PropertyType,
-  nice,
 } from '../common/type';
+import { hslToHEX } from '../../utils/colorFormat';
 
-import defaultStyle from '../../utils/rendering-data/layersColor2';
+import defaultStyle from '../../utils/rendering-data/layersColor4';
 
 const style: StyleType = {
   isChanged: false,
@@ -51,70 +19,111 @@ const style: StyleType = {
   lightness: 0,
 };
 
-interface getDefaultStyleProps<T> {
-  featureType: FeatureNameType;
-  subFeatureType: T;
-  elementType: ElementNameType;
-  subElementType: SubElementNameType;
+interface getDefaultStyleProps {
+  featureName: FeatureNameType;
+  subFeatureName: string;
+  elementName: ElementNameType;
+  subElementName?: SubElementNameType;
 }
 
+const featuresDetailOption = {
+  poi: {
+    hasSection: false,
+    hasLabelText: true,
+    hasLabelIcon: true,
+  },
+  road: {
+    hasSection: true,
+    hasLabelText: true,
+    hasLabelIcon: true,
+  },
+  administrative: {
+    hasSection: true,
+    hasLabelText: true,
+    hasLabelIcon: false,
+  },
+  landscape: {
+    hasSection: true,
+    hasLabelText: true,
+    hasLabelIcon: false,
+  },
+  transit: {
+    hasSection: true,
+    hasLabelText: true,
+    hasLabelIcon: false,
+  },
+  water: {
+    hasSection: true,
+    hasLabelText: true,
+    hasLabelIcon: false,
+  },
+  marker: {
+    hasSection: false,
+    hasLabelText: true,
+    hasLabelIcon: true,
+  },
+};
+
 export const getDefaultStyle = ({
-  featureType,
-  subFeatureType,
-  elementType,
-  subElementType,
+  featureName,
+  subFeatureName,
+  elementName,
+  subElementName,
 }: getDefaultStyleProps): StyleType => {
+  const color =
+    defaultStyle[
+      `${featureName}-${subFeatureName}-${elementName}-${subElementName || ''}`
+    ];
   return {
     ...JSON.parse(JSON.stringify(style)),
-    color: defaultStyle[featureType][subFeatureType],
-    // defaultStyle[featureType][subFeatureType][elementType][subElementType],
+    color: color ? hslToHEX(color) : '#000000',
   };
 };
 
 export const getDefaultFeature = ({
-  featureType,
-  subFeatureType,
+  featureName,
+  subFeatureName,
 }: HasPropertiesType): FeatureType => {
   return {
     isChanged: false,
-    section: defaultStyle[featureType][subFeatureType][ElementNameType.section]
+    section: featuresDetailOption[featureName].hasSection
       ? {
           [SubElementNameType.fill]: getDefaultStyle({
-            featureType,
-            subFeatureType,
-            elementType: ElementNameType.section,
-            subElementType: SubElementNameType.fill,
+            featureName,
+            subFeatureName,
+            elementName: ElementNameType.section,
+            subElementName: SubElementNameType.fill,
           }),
           [SubElementNameType.stroke]: getDefaultStyle({
-            featureType,
-            subFeatureType,
-            elementType: ElementNameType.section,
-            subElementType: SubElementNameType.stroke,
+            featureName,
+            subFeatureName,
+            elementName: ElementNameType.section,
+            subElementName: SubElementNameType.stroke,
           }),
         }
       : null,
-    labelText: defaultStyle[featureType][subFeatureType][
-      ElementNameType.labelText
-    ]
+    labelText: featuresDetailOption[featureName].hasLabelText
       ? {
           [SubElementNameType.fill]: getDefaultStyle({
-            featureType,
-            subFeatureType,
-            elementType: ElementNameType.labelText,
-            subElementType: SubElementNameType.fill,
+            featureName,
+            subFeatureName,
+            elementName: ElementNameType.labelText,
+            subElementName: SubElementNameType.fill,
           }),
           [SubElementNameType.stroke]: getDefaultStyle({
-            featureType,
-            subFeatureType,
-            elementType: ElementNameType.labelText,
-            subElementType: SubElementNameType.stroke,
+            featureName,
+            subFeatureName,
+            elementName: ElementNameType.labelText,
+            subElementName: SubElementNameType.stroke,
           }),
         }
       : null,
-    labelIcon: defaultStyle[featureType][subFeatureType][
-      ElementNameType.labelIcon
-    ]
-      ? getDefaultStyle()
+    labelIcon: featuresDetailOption[featureName].hasLabelIcon
+      ? getDefaultStyle({
+          featureName,
+          subFeatureName,
+          elementName: ElementNameType.labelIcon,
+        })
       : null,
   };
 };

From 0dbef9696b236ca05b3ebe9ff9cbb8a7168508a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 00:01:27 +0900
Subject: [PATCH 090/138] =?UTF-8?q?[refactor]=20[#72]=20=EC=9D=B4=EC=A0=84?=
 =?UTF-8?q?=20=EC=BB=A4=EB=B0=8B=EC=97=90=20=EB=94=B0=EB=9D=BC=EC=84=9C=20?=
 =?UTF-8?q?getDefaultStyle=ED=95=A8=EC=88=98=20=ED=98=B8=EC=B6=9C=20?=
 =?UTF-8?q?=EC=8B=9C=20=ED=8C=94=EC=9A=94=ED=95=B4=EC=A7=84=20=EA=B0=92?=
 =?UTF-8?q?=EB=93=A4=EC=9D=84=20=EB=84=98=EA=B2=A8=EC=A4=80=EB=8B=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 이전 커밋의 getDefaultStyle함수 변경으로 인해서 호출 하는 각 부분에서 필요로하는 인자를 넘겨준다
---
 src/hooks/sidebar/useStyleType.ts |  7 ++++++-
 src/store/style/compareStyle.ts   | 32 ++++++++++++++++++++++++++++---
 src/store/style/getReducer.ts     | 12 +++++++++---
 3 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index b4929d4..96e4b7f 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -36,7 +36,12 @@ function useStyleType({
   const map = useSelector<RootState>((state) => state.map.map) as mapboxgl.Map;
   const styleElement = useSelector<RootState>((state) => {
     if (!detailName) {
-      return getDefaultStyle();
+      return getDefaultStyle({
+        featureName,
+        subFeatureName,
+        elementName: detailName,
+        subElementName: subDetailName,
+      });
     }
     const feature = state[featureName][subFeatureName];
     if (detailName === ElementNameType.labelIcon) return feature[detailName];
diff --git a/src/store/style/compareStyle.ts b/src/store/style/compareStyle.ts
index 7f8c506..25717e7 100644
--- a/src/store/style/compareStyle.ts
+++ b/src/store/style/compareStyle.ts
@@ -1,8 +1,34 @@
 import { getDefaultStyle } from './properties';
-import { StyleType, StyleKeyType, objType } from '../common/type';
+import {
+  StyleType,
+  StyleKeyType,
+  objType,
+  FeatureNameType,
+  ElementNameType,
+  SubElementNameType,
+} from '../common/type';
 
-export function checkStyleIsChanged(targetStyle: StyleType): boolean {
-  const defaultStyle: StyleType = getDefaultStyle();
+interface CheckStyleIsChangedProps {
+  targetStyle: StyleType;
+  featureName: FeatureNameType;
+  subFeatureName: string;
+  elementName: ElementNameType;
+  subElementName?: SubElementNameType;
+}
+
+export function checkStyleIsChanged({
+  targetStyle,
+  featureName,
+  subFeatureName,
+  elementName,
+  subElementName,
+}: CheckStyleIsChangedProps): boolean {
+  const defaultStyle: StyleType = getDefaultStyle({
+    featureName,
+    subFeatureName,
+    elementName,
+    subElementName,
+  });
   const keys = Object.keys(defaultStyle) as StyleKeyType[];
 
   const filteredKeys = keys.filter(
diff --git a/src/store/style/getReducer.ts b/src/store/style/getReducer.ts
index f56d689..9ebe131 100644
--- a/src/store/style/getReducer.ts
+++ b/src/store/style/getReducer.ts
@@ -25,8 +25,8 @@ export default function getReducer(IDX: number): ReducerType {
 
   const initialState = subFeatures.reduce((acc: FeatureState, cur: string) => {
     acc[cur] = getDefaultFeature({
-      featureType: renderingData[IDX].typeKey,
-      subFeatureType: cur,
+      featureName: renderingData[IDX].typeKey,
+      subFeatureName: cur,
     });
     return acc;
   }, {});
@@ -49,7 +49,13 @@ export default function getReducer(IDX: number): ReducerType {
 
         if (feature !== renderingData[IDX].typeKey) return state;
 
-        style.isChanged = checkStyleIsChanged(style);
+        style.isChanged = checkStyleIsChanged({
+          targetStyle: style,
+          featureName: feature,
+          subFeatureName: subFeature,
+          elementName: element,
+          subElementName: subElement,
+        });
         const newState: FeatureState = JSON.parse(JSON.stringify(state));
         const newFeature: FeatureType = newState[subFeature as string];
 

From 60da312cb337155bfb13bc31f9d2849fc8d23a49 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 00:05:15 +0900
Subject: [PATCH 091/138] =?UTF-8?q?[fix]=20=EA=B3=B5=ED=86=B5=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 중복해서 프로퍼티로 사용되는 타입을 FeaturePropsType, ElementPropsType으로 분리해 주었음
- 기본 스타일 상태를 갖고 있는 layerColor 데이터의 타입과 동일하게 PropertyType 맞춤
- PropertyType 속성값으로 기존에 선언된 enum을 사용하도록 수정함
---
 src/store/common/type.ts | 60 +++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 38 deletions(-)

diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index d19e689..9c5a48d 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -1,25 +1,5 @@
 import { init, setStyle } from '../style/action';
 
-export interface nice {
-  poi:
-    | 'all'
-    | 'landmark'
-    | 'business'
-    | 'government'
-    | 'medical'
-    | 'park'
-    | 'worship'
-    | 'school'
-    | 'sports'
-    | 'etc';
-  road: 'all';
-  administrative: 'all' | 'country' | 'state' | 'locality';
-  landscape: 'all';
-  transit: 'all';
-  water: 'all';
-  marker: 'all';
-}
-
 export type hello = 'landmark';
 
 export enum ElementNameType {
@@ -79,31 +59,35 @@ export interface FeatureState {
   [name: string]: FeatureType;
 }
 
-export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
+export interface FeaturePropsType {
+  feature: FeatureNameType;
+  subFeature: string;
+}
 
-export type ActionPayload = {
+export interface ElementPropsType extends FeaturePropsType {
   feature: FeatureNameType;
   subFeature: string;
   element: ElementNameType;
   subElement?: SubElementNameType;
+}
+
+export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
+
+export interface ActionPayload extends ElementPropsType {
   style: StyleType;
-};
+}
 
-export interface HasPropertiesType {
-  featureType: FeatureNameType;
-  subFeatureType: string;
+export interface StylePropsType {
+  [SubElementNameType.fill]: string;
+  [SubElementNameType.stroke]: string;
 }
 
-export interface PropertyType {
-  [subFeatureType: string]: {
-    [ElementNameType.section]?: {
-      fill: string;
-      stroke: string;
-    } | null;
-    [ElementNameType.labelText]?: {
-      fill: string;
-      stroke: string;
-    } | null;
-    [ElementNameType.labelIcon]?: string | null;
+export type PropertyType = {
+  [featureName in FeatureNameType]: {
+    [subFeatureName: string]: {
+      [ElementNameType.section]?: StylePropsType | null;
+      [ElementNameType.labelText]?: StylePropsType | null;
+      [ElementNameType.labelIcon]?: string | null;
+    };
   };
-}
+};

From eb73f4b7f59e8334c7ec484cd9cc10ab2178dda0 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 00:07:24 +0900
Subject: [PATCH 092/138] =?UTF-8?q?[fix]=20=EA=B8=B0=EB=B3=B8=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=ED=8C=8C=EC=9D=BC=20=EA=B2=B0=EC=A0=95,?=
 =?UTF-8?q?=20=EC=9E=84=EC=8B=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=82=BD?=
 =?UTF-8?q?=EC=9E=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- store 초기화할 때 데이터가 필요해서 임시로 데이터를 넣었음
- layerColor2를 사용하기로 결정해서 다른 파일 삭제하고 파일명 수정함
---
 src/utils/rendering-data/layerColor3.ts  |  38 ---
 src/utils/rendering-data/layersColor.ts  | 320 +++++++++++++++++++----
 src/utils/rendering-data/layersColor2.ts | 148 -----------
 3 files changed, 268 insertions(+), 238 deletions(-)
 delete mode 100644 src/utils/rendering-data/layerColor3.ts
 delete mode 100644 src/utils/rendering-data/layersColor2.ts

diff --git a/src/utils/rendering-data/layerColor3.ts b/src/utils/rendering-data/layerColor3.ts
deleted file mode 100644
index 556eda7..0000000
--- a/src/utils/rendering-data/layerColor3.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-export default {
-  'poi-attraction': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-arts-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-landmark-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-business': { color: 'hsl(22, 55%, 55%)', type: 'text' },
-  'poi-food-label': { color: 'hsl(22, 55%, 55%)', type: 'text' },
-  'poi-store-label': { color: 'hsl(22, 55%, 55%)', type: 'text' },
-  'poi-government': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-public-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-general-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-medical': { color: 'hsl(340, 39%, 42%)', type: 'text' },
-  'poi-medical-label': { color: 'hsl(340, 39%, 42%)', type: 'text' },
-  'poi-park': { color: 'hsl(100, 45%, 37%)', type: 'text' },
-  'poi-park-label': { color: 'hsl(100, 45%, 37%)', type: 'text' },
-  'poi-worship': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-religion-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-school': { color: 'hsl(51, 40%, 40%)', type: 'text' },
-  'poi-education-label': { color: 'hsl(51, 40%, 40%)', type: 'text' },
-  'poi-sport-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-etc': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-industrial-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-historic-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-building-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'admin-0-boundary': { color: 'hsl(230, 8%, 51%)', type: 'line' },
-  'admin-0-boundary-bg': { color: 'hsl(230, 8%, 51%)', type: 'line' },
-  'admin-0-boundary-disputed': { color: 'hsl(230, 8%, 51%)', type: 'line' },
-  'country-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
-  'admin-1-boundary-bg': { color: 'hsl(230, 14%, 77%)', type: 'line' },
-  'admin-1-boundary': { color: 'hsl(230, 14%, 77%)', type: 'line' },
-  'state-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
-  'settlement-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
-  'settlement-subdivision-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
-  water: { color: 'hsl(205, 87%, 76%)', type: 'fill' },
-  'water-polygon': { color: 'hsl(205, 87%, 76%)', type: 'fill' },
-  'water-line-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
-  'water-point-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
-  'waterway-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
-};
diff --git a/src/utils/rendering-data/layersColor.ts b/src/utils/rendering-data/layersColor.ts
index 85a29ec..74b4e41 100644
--- a/src/utils/rendering-data/layersColor.ts
+++ b/src/utils/rendering-data/layersColor.ts
@@ -1,89 +1,305 @@
-// 어차피 레이어 하나 바꾸면 다 바뀔 건데 체크박스로 해둘 필요가 있을까??
-export default {
+import { PropertyType } from '../../store/common/type';
+
+const data: PropertyType = {
   poi: {
+    all: {
+      // 임시
+      labelText: {
+        fill: 'hsl(26, 25%, 32%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
+    },
     landmark: {
-      'poi-attraction': 'hsl(26, 25%, 32%)',
-      'poi-arts-label': 'hsl(26, 25%, 32%)',
-      'poi-landmark-label': 'hsl(26, 25%, 32%)',
+      labelText: {
+        fill: 'hsl(26, 25%, 32%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
     },
     business: {
-      'poi-business': 'hsl(22, 55%, 55%)',
-      'poi-food-label': 'hsl(22, 55%, 55%)',
-      'poi-store-label': 'hsl(22, 55%, 55%)',
+      labelText: {
+        fill: 'hsl(22, 55%, 55%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
     },
     government: {
-      'poi-government': 'hsl(26, 25%, 32%)',
-      'poi-public-label': 'hsl(26, 25%, 32%)',
-      'poi-general-label': 'hsl(26, 25%, 32%)',
+      labelText: {
+        fill: 'hsl(26, 25%, 32%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
     },
     medical: {
-      'poi-medical': 'hsl(340, 39%, 42%)',
-      'poi-medical-label': 'hsl(340, 39%, 42%)',
+      labelText: {
+        fill: 'hsl(340, 39%, 42%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
     },
     park: {
-      'poi-park': 'hsl(100, 45%, 37%)',
-      'poi-park-label': 'hsl(100, 45%, 37%)',
+      labelText: {
+        fill: 'hsl(100, 45%, 37%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
     },
     worship: {
-      'poi-worship': 'hsl(26, 25%, 32%)',
-      'poi-religion-label': 'hsl(26, 25%, 32%)',
+      labelText: {
+        fill: 'hsl(26, 25%, 32%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
     },
     school: {
-      'poi-school': 'hsl(51, 40%, 40%)',
-      'poi-education-label': 'hsl(51, 40%, 40%)',
+      labelText: {
+        fill: 'hsl(51, 40%, 40%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
     },
     sports: {
-      'poi-sport-label': 'hsl(26, 25%, 32%)',
+      labelText: {
+        fill: 'hsl(26, 25%, 32%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
     },
     etc: {
-      'poi-etc': 'hsl(26, 25%, 32%)',
-      'poi-industrial-label': 'hsl(26, 25%, 32%)',
-      'poi-historic-label': 'hsl(26, 25%, 32%)',
-      'poi-building-label': 'hsl(26, 25%, 32%)',
+      labelText: {
+        fill: 'hsl(26, 25%, 32%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+      labelIcon: 'transparent',
     },
   },
+  // 임시
   road: {
-    highway: {},
-    arterial: {},
-    local: {},
-    sidewalk: {},
-    'bicycle-road': {},
+    all: {
+      section: {
+        fill: 'transparent',
+        stroke: 'hsl(230, 8%, 51%)',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    highway: {
+      section: {
+        fill: 'transparent',
+        stroke: 'hsl(230, 8%, 51%)',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    arterial: {
+      section: {
+        fill: 'transparent',
+        stroke: 'hsl(230, 8%, 51%)',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    local: {
+      section: {
+        fill: 'transparent',
+        stroke: 'hsl(230, 8%, 51%)',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    sidewalk: {
+      section: {
+        fill: 'transparent',
+        stroke: 'hsl(230, 8%, 51%)',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
   },
   administrative: {
+    all: {
+      section: {
+        fill: 'transparent',
+        stroke: 'hsl(230, 8%, 51%)',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
     country: {
-      'admin-0-boundary': 'hsl(230, 8%, 51%)',
-      'admin-0-boundary-bg': 'hsl(35, 12%, 89%)',
-      'admin-0-boundary-disputed': 'hsl(230, 8%, 51%)',
-      'country-label': 'hsl(0, 0%, 0%)',
+      section: {
+        fill: 'transparent',
+        stroke: 'hsl(230, 8%, 51%)',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
     },
     state: {
-      'admin-1-boundary-bg': 'hsl(35, 12%, 89%)',
-      'admin-1-boundary': 'hsl(230, 14%, 77%)',
-      'state-label': 'hsl(0, 0%, 0%)',
+      section: {
+        fill: 'transparent',
+        stroke: 'hsl(230, 14%, 77%)',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
     },
     locality: {
-      'settlement-label': 'hsl(0, 0%, 0%)',
-      'settlement-subdivision-label': 'hsl(230, 29%, 35%)',
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
     },
   },
+  // 임시
   landscape: {
-    'human-made': {},
-    building: {},
-    natural: {},
-    landcover: {},
-    mountain: {},
+    all: {
+      section: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    'human-made': {
+      section: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    building: {
+      section: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    natural: {
+      section: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    landcover: {
+      section: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    mountain: {
+      section: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
   },
   transit: {
-    airport: {},
-    bus: {},
-    rail: {},
-    subway: {},
+    all: {
+      section: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    airport: {
+      section: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    bus: {
+      section: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    rail: {
+      section: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
+    subway: {
+      section: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(0, 0%, 0%)',
+        stroke: 'hsl(0, 0%, 100%)',
+      },
+    },
   },
   water: {
-    water: 'hsl(205, 87%, 76%)',
-    'water-polygon': 'hsl(205, 87%, 76%)',
-    'water-line-label': 'hsl(230, 48%, 44%)',
-    'water-point-label': 'hsl(230, 48%, 44%)',
-    'waterway-label': 'hsl(230, 48%, 44%)',
+    all: {
+      section: {
+        fill: 'hsl(205, 87%, 76%)',
+        stroke: 'transparent',
+      },
+      labelText: {
+        fill: 'hsl(230, 48%, 44%)',
+        stroke: 'transparent',
+      },
+    },
+  },
+  marker: {
+    all: {
+      labelText: {
+        fill: 'transparent',
+        stroke: 'transparent',
+      },
+    },
   },
 };
+
+export default data;
diff --git a/src/utils/rendering-data/layersColor2.ts b/src/utils/rendering-data/layersColor2.ts
deleted file mode 100644
index ea12695..0000000
--- a/src/utils/rendering-data/layersColor2.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import {
-  SubElementNameType,
-  ElementNameType,
-  FeatureNameType,
-  PropertyType,
-} from '../../store/common/type';
-
-export default {
-  [FeatureNameType.poi]: {
-    all: {},
-    landmark: {
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-      [ElementNameType.labelIcon]: 'transparent',
-    },
-    business: {
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(22, 55%, 55%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-      [ElementNameType.labelIcon]: 'transparent',
-    },
-    government: {
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-      [ElementNameType.labelIcon]: 'transparent',
-    },
-    medical: {
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(340, 39%, 42%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-      [ElementNameType.labelIcon]: 'transparent',
-    },
-    park: {
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(100, 45%, 37%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-      [ElementNameType.labelIcon]: 'transparent',
-    },
-    worship: {
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-      [ElementNameType.labelIcon]: 'transparent',
-    },
-    school: {
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(51, 40%, 40%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-      [ElementNameType.labelIcon]: 'transparent',
-    },
-    sports: {
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-      [ElementNameType.labelIcon]: 'transparent',
-    },
-    etc: {
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-      [ElementNameType.labelIcon]: 'transparent',
-    },
-  },
-  [FeatureNameType.road]: {
-    all: {
-      [ElementNameType.section]: {
-        [SubElementNameType.fill]: 'transparent',
-        [SubElementNameType.stroke]: 'transparent',
-      },
-    },
-  },
-  [FeatureNameType.administrative]: {
-    all: {},
-    country: {
-      [ElementNameType.section]: {
-        [SubElementNameType.fill]: 'transparent',
-        [SubElementNameType.stroke]: 'hsl(230, 8%, 51%)',
-      },
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(0, 0%, 0%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-    },
-    state: {
-      [ElementNameType.section]: {
-        [SubElementNameType.fill]: 'transparent',
-        [SubElementNameType.stroke]: 'hsl(230, 14%, 77%)',
-      },
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(0, 0%, 0%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-    },
-    locality: {
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(0, 0%, 0%)',
-        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
-      },
-    },
-  },
-  [FeatureNameType.landscape]: {
-    all: {
-      [ElementNameType.section]: {
-        [SubElementNameType.fill]: 'transparent',
-        [SubElementNameType.stroke]: 'transparent',
-      },
-    },
-  },
-  [FeatureNameType.transit]: {
-    all: {
-      [ElementNameType.section]: {
-        [SubElementNameType.fill]: 'transparent',
-        [SubElementNameType.stroke]: 'transparent',
-      },
-    },
-  },
-  [FeatureNameType.water]: {
-    all: {
-      [ElementNameType.section]: {
-        [SubElementNameType.fill]: 'hsl(205, 87%, 76%)',
-        [SubElementNameType.stroke]: 'transparent',
-      },
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'hsl(230, 48%, 44%)',
-        [SubElementNameType.stroke]: 'transparent',
-      },
-    },
-  },
-  [FeatureNameType.marker]: {
-    all: {
-      [ElementNameType.labelText]: {
-        [SubElementNameType.fill]: 'transparent',
-        [SubElementNameType.stroke]: 'transparent',
-      },
-    },
-  },
-};

From 99128feedcc2bd4e09b1daddb1101730193dbedc Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 00:09:00 +0900
Subject: [PATCH 093/138] =?UTF-8?q?[fix]=20=EC=84=B8=EB=B6=80=EC=9C=A0?=
 =?UTF-8?q?=ED=98=95=20=EC=9C=A0=EB=AC=B4=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기능 유형에 따라 필요하지 않는 세부유형은 표시되지 않도록 수정함
---
 .../Sidebar/SidebarContentMore/DetailType.tsx | 126 ++++++++++--------
 1 file changed, 71 insertions(+), 55 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index 133d776..5fe32fb 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -99,82 +99,98 @@ function DetailType({
     <>
       <DetailWrapper>
         <Title>세부 유형</Title>
-        <List>
-          <Text padding="first">구역</Text>
-          {section?.fill.isChanged ? <Check>✓</Check> : <></>}
-          <ListItem
-            isSelected={checkIsSelected(
-              ElementNameType.section,
-              SubElementNameType.fill
-            )}
-            padding="second"
-            clickHandler={() => {
-              styleClickHandler(
-                ElementNameType.section,
-                SubElementNameType.fill
-              );
-            }}
-            name="채우기"
-          />
-          {section?.stroke.isChanged ? <Check>✓</Check> : <></>}
-          <ListItem
-            isSelected={
-              sidebarTypeName === ElementNameType.section &&
-              sidebarSubTypeName === SubElementNameType.stroke
-            }
-            padding="second"
-            clickHandler={() => {
-              styleClickHandler(
-                ElementNameType.section,
-                SubElementNameType.stroke
-              );
-            }}
-            name="윤곽선"
-          />
-        </List>
-        <List>
-          <Text padding="first">라벨</Text>
+        {section ? (
           <List>
-            <Text padding="second">텍스트</Text>
-            {labelText?.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+            <Text padding="first">구역</Text>
+            {section?.fill.isChanged ? <Check>✓</Check> : <></>}
             <ListItem
               isSelected={checkIsSelected(
-                ElementNameType.labelText,
+                ElementNameType.section,
                 SubElementNameType.fill
               )}
-              padding="third"
+              padding="second"
               clickHandler={() => {
                 styleClickHandler(
-                  ElementNameType.labelText,
+                  ElementNameType.section,
                   SubElementNameType.fill
                 );
               }}
               name="채우기"
             />
-            {labelText?.stroke.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+            {section?.stroke.isChanged ? <Check>✓</Check> : <></>}
             <ListItem
-              isSelected={checkIsSelected(
-                ElementNameType.labelText,
-                SubElementNameType.stroke
-              )}
-              padding="third"
+              isSelected={
+                sidebarTypeName === ElementNameType.section &&
+                sidebarSubTypeName === SubElementNameType.stroke
+              }
+              padding="second"
               clickHandler={() => {
                 styleClickHandler(
-                  ElementNameType.labelText,
+                  ElementNameType.section,
                   SubElementNameType.stroke
                 );
               }}
               name="윤곽선"
             />
           </List>
-          {labelIcon?.isChanged ? <Check>✓</Check> : <></>}
-          <ListItem
-            isSelected={checkIsSelected(ElementNameType.labelIcon)}
-            padding="second"
-            clickHandler={() => styleClickHandler(ElementNameType.labelIcon)}
-            name="아이콘"
-          />
-        </List>
+        ) : (
+          <></>
+        )}
+        {labelText ? (
+          <List>
+            <Text padding="first">라벨</Text>
+            <List>
+              <Text padding="second">텍스트</Text>
+              {labelText?.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+              <ListItem
+                isSelected={checkIsSelected(
+                  ElementNameType.labelText,
+                  SubElementNameType.fill
+                )}
+                padding="third"
+                clickHandler={() => {
+                  styleClickHandler(
+                    ElementNameType.labelText,
+                    SubElementNameType.fill
+                  );
+                }}
+                name="채우기"
+              />
+              {labelText?.stroke.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+              <ListItem
+                isSelected={checkIsSelected(
+                  ElementNameType.labelText,
+                  SubElementNameType.stroke
+                )}
+                padding="third"
+                clickHandler={() => {
+                  styleClickHandler(
+                    ElementNameType.labelText,
+                    SubElementNameType.stroke
+                  );
+                }}
+                name="윤곽선"
+              />
+            </List>
+            {labelIcon ? (
+              <>
+                {labelIcon?.isChanged ? <Check>✓</Check> : <></>}
+                <ListItem
+                  isSelected={checkIsSelected(ElementNameType.labelIcon)}
+                  padding="second"
+                  clickHandler={() => {
+                    styleClickHandler(ElementNameType.labelIcon);
+                  }}
+                  name="아이콘"
+                />
+              </>
+            ) : (
+              <></>
+            )}
+          </List>
+        ) : (
+          <></>
+        )}
       </DetailWrapper>
       <Styler
         featureName={featureName}

From 1971640993eb8ed204ef6517f224b4aac2f4f3d0 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 00:14:05 +0900
Subject: [PATCH 094/138] =?UTF-8?q?[fix]=20=ED=83=80=EC=9E=85=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=20=EB=B0=9C=EC=83=9D=20=ED=95=B4=EA=B2=B0,=20?=
 =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=8D=BC=ED=8B=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- common/type에 선언된 타입으로 바꾸면서 속성명 바뀜
- 29줄 as StylePropsType 으로 타입 단언하여 에러 발생 제거함
---
 src/store/style/properties.ts | 117 ++++++++++++----------------------
 1 file changed, 40 insertions(+), 77 deletions(-)

diff --git a/src/store/style/properties.ts b/src/store/style/properties.ts
index d7e2e87..3a8892c 100644
--- a/src/store/style/properties.ts
+++ b/src/store/style/properties.ts
@@ -1,46 +1,14 @@
-// import { StyleType, ElementType, FeatureType } from '../common/type';
-
-// const style: StyleType = {
-//   isChanged: false,
-//   visibility: 'inherit',
-//   color: '#55bf40',
-//   weight: 0,
-//   saturation: 0,
-//   lightness: 0,
-// };
-
-// export const getDefaultStyle = (): StyleType => {
-//   return JSON.parse(JSON.stringify(style));
-// };
-
-// const getDefaultElement = (): ElementType => {
-//   return {
-//     fill: getDefaultStyle(),
-//     stroke: getDefaultStyle(),
-//   };
-// };
-
-// export const getDefaultFeature = (): FeatureType => {
-//   return {
-//     isChanged: false,
-//     section: getDefaultElement(),
-//     labelText: getDefaultElement(),
-//     labelIcon: getDefaultStyle(),
-//   };
-// };
-
 import {
   StyleType,
   ElementNameType,
   FeatureType,
-  FeatureNameType,
-  HasPropertiesType,
   SubElementNameType,
-  PropertyType,
-  nice,
+  FeaturePropsType,
+  ElementPropsType,
+  StylePropsType,
 } from '../common/type';
 
-import defaultStyle from '../../utils/rendering-data/layersColor2';
+import defaultStyle from '../../utils/rendering-data/layersColor';
 
 const style: StyleType = {
   isChanged: false,
@@ -51,70 +19,65 @@ const style: StyleType = {
   lightness: 0,
 };
 
-interface getDefaultStyleProps<T> {
-  featureType: FeatureNameType;
-  subFeatureType: T;
-  elementType: ElementNameType;
-  subElementType: SubElementNameType;
-}
-
 export const getDefaultStyle = ({
-  featureType,
-  subFeatureType,
-  elementType,
-  subElementType,
-}: getDefaultStyleProps): StyleType => {
+  feature,
+  subFeature,
+  element,
+  subElement,
+}: ElementPropsType): StyleType => {
+  const defaultColor = subElement
+    ? (defaultStyle[feature][subFeature][element] as StylePropsType)[subElement]
+    : defaultStyle[feature][subFeature][element];
   return {
     ...JSON.parse(JSON.stringify(style)),
-    color: defaultStyle[featureType][subFeatureType],
-    // defaultStyle[featureType][subFeatureType][elementType][subElementType],
+    color: defaultColor,
   };
 };
 
 export const getDefaultFeature = ({
-  featureType,
-  subFeatureType,
-}: HasPropertiesType): FeatureType => {
+  feature,
+  subFeature,
+}: FeaturePropsType): FeatureType => {
   return {
     isChanged: false,
-    section: defaultStyle[featureType][subFeatureType][ElementNameType.section]
+    section: defaultStyle[feature][subFeature][ElementNameType.section]
       ? {
           [SubElementNameType.fill]: getDefaultStyle({
-            featureType,
-            subFeatureType,
-            elementType: ElementNameType.section,
-            subElementType: SubElementNameType.fill,
+            feature,
+            subFeature,
+            element: ElementNameType.section,
+            subElement: SubElementNameType.fill,
           }),
           [SubElementNameType.stroke]: getDefaultStyle({
-            featureType,
-            subFeatureType,
-            elementType: ElementNameType.section,
-            subElementType: SubElementNameType.stroke,
+            feature,
+            subFeature,
+            element: ElementNameType.section,
+            subElement: SubElementNameType.stroke,
           }),
         }
       : null,
-    labelText: defaultStyle[featureType][subFeatureType][
-      ElementNameType.labelText
-    ]
+    labelText: defaultStyle[feature][subFeature][ElementNameType.labelText]
       ? {
           [SubElementNameType.fill]: getDefaultStyle({
-            featureType,
-            subFeatureType,
-            elementType: ElementNameType.labelText,
-            subElementType: SubElementNameType.fill,
+            feature,
+            subFeature,
+            element: ElementNameType.labelText,
+            subElement: SubElementNameType.fill,
           }),
           [SubElementNameType.stroke]: getDefaultStyle({
-            featureType,
-            subFeatureType,
-            elementType: ElementNameType.labelText,
-            subElementType: SubElementNameType.stroke,
+            feature,
+            subFeature,
+            element: ElementNameType.labelText,
+            subElement: SubElementNameType.stroke,
           }),
         }
       : null,
-    labelIcon: defaultStyle[featureType][subFeatureType][
-      ElementNameType.labelIcon
-    ]
-      ? getDefaultStyle()
+    labelIcon: defaultStyle[feature][subFeature][ElementNameType.labelIcon]
+      ? getDefaultStyle({
+          feature,
+          subFeature,
+          element: ElementNameType.labelIcon,
+        })
       : null,
   };
 };

From e3528e60ab3d68119c14a0d60cf7674608dde8ae Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 00:18:15 +0900
Subject: [PATCH 095/138] =?UTF-8?q?[fix]=20getDefaultStyle=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=20=ED=95=A8=EC=88=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- getDefaultStyle 수정에 맞춰서 전달하는 인자도 바꿈
---
 src/hooks/sidebar/useStyleType.ts |  7 ++++++-
 src/store/style/compareStyle.ts   | 25 ++++++++++++++++++++-----
 src/store/style/getReducer.ts     |  8 +++-----
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index b4929d4..21c6237 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -36,7 +36,12 @@ function useStyleType({
   const map = useSelector<RootState>((state) => state.map.map) as mapboxgl.Map;
   const styleElement = useSelector<RootState>((state) => {
     if (!detailName) {
-      return getDefaultStyle();
+      return getDefaultStyle({
+        feature: featureName,
+        subFeature: subFeatureName,
+        element: detailName,
+        subElement: subDetailName,
+      });
     }
     const feature = state[featureName][subFeatureName];
     if (detailName === ElementNameType.labelIcon) return feature[detailName];
diff --git a/src/store/style/compareStyle.ts b/src/store/style/compareStyle.ts
index 7f8c506..5d7cd21 100644
--- a/src/store/style/compareStyle.ts
+++ b/src/store/style/compareStyle.ts
@@ -1,13 +1,28 @@
 import { getDefaultStyle } from './properties';
-import { StyleType, StyleKeyType, objType } from '../common/type';
+import {
+  StyleType,
+  StyleKeyType,
+  objType,
+  ActionPayload,
+} from '../common/type';
 
-export function checkStyleIsChanged(targetStyle: StyleType): boolean {
-  const defaultStyle: StyleType = getDefaultStyle();
+export function checkStyleIsChanged({
+  feature,
+  subFeature,
+  element,
+  subElement,
+  style,
+}: ActionPayload): boolean {
+  const defaultStyle: StyleType = getDefaultStyle({
+    feature,
+    subFeature,
+    element,
+    subElement,
+  });
   const keys = Object.keys(defaultStyle) as StyleKeyType[];
 
   const filteredKeys = keys.filter(
-    (key) =>
-      key === StyleKeyType.isChanged || defaultStyle[key] === targetStyle[key]
+    (key) => key === StyleKeyType.isChanged || defaultStyle[key] === style[key]
   );
   return keys.length !== filteredKeys.length;
 }
diff --git a/src/store/style/getReducer.ts b/src/store/style/getReducer.ts
index f56d689..b835704 100644
--- a/src/store/style/getReducer.ts
+++ b/src/store/style/getReducer.ts
@@ -25,12 +25,11 @@ export default function getReducer(IDX: number): ReducerType {
 
   const initialState = subFeatures.reduce((acc: FeatureState, cur: string) => {
     acc[cur] = getDefaultFeature({
-      featureType: renderingData[IDX].typeKey,
-      subFeatureType: cur,
+      feature: renderingData[IDX].typeKey,
+      subFeature: cur,
     });
     return acc;
   }, {});
-
   return function reducer(
     state: FeatureState = initialState,
     action: ActionType
@@ -46,10 +45,9 @@ export default function getReducer(IDX: number): ReducerType {
           subElement,
           style,
         } = action.payload;
-
         if (feature !== renderingData[IDX].typeKey) return state;
 
-        style.isChanged = checkStyleIsChanged(style);
+        style.isChanged = checkStyleIsChanged(action.payload);
         const newState: FeatureState = JSON.parse(JSON.stringify(state));
         const newFeature: FeatureType = newState[subFeature as string];
 

From e9b5a8779ac928e7ba0a802d3e0708f949745e81 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 00:24:05 +0900
Subject: [PATCH 096/138] =?UTF-8?q?[fix]=20=ED=83=80=EC=9E=85=20=EC=83=81?=
 =?UTF-8?q?=EC=86=8D=ED=95=98=EB=A9=B4=EC=84=9C=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EB=90=9C=20=EB=B6=80=EB=B6=84=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/common/type.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index 9c5a48d..1b7dc90 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -65,8 +65,6 @@ export interface FeaturePropsType {
 }
 
 export interface ElementPropsType extends FeaturePropsType {
-  feature: FeatureNameType;
-  subFeature: string;
   element: ElementNameType;
   subElement?: SubElementNameType;
 }

From 73769d0f2e44c68ce53854a16bbffe7481627cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 00:38:59 +0900
Subject: [PATCH 097/138] =?UTF-8?q?[fix]=20[#76]=20weight=EC=9D=98=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC=EA=B0=80=20=EC=9E=98?=
 =?UTF-8?q?=EB=AA=BB=EB=90=98=EC=96=B4=EC=9E=88=EC=96=B4=EC=84=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- !weight로 검사하면 0일때를 걸러내게 된다. = 1로 undefined일 경우를 처리하였다
---
 src/utils/applyStyle.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index 42da7d0..15d41c4 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -86,9 +86,9 @@ export function applyWeight({
   map,
   layerNames,
   type,
-  weight,
+  weight = 1,
 }: ApplyProps): void {
-  if (!type || !weight) return;
+  if (!type) return;
 
   const weightValue = weight === 0 ? 0 : weight * 2 + 1;
   layerNames.forEach((layerName) => {

From 34d1340fb0ddb41500a5b50d2bb1d354738ac39a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 00:40:12 +0900
Subject: [PATCH 098/138] =?UTF-8?q?[fix]=20compareStyle=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=20=EC=97=90=EB=9F=AC=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 순환할 떄 null이 넘어가게될 경우가 생긴다. 그 때를 검사해서 null이면 false를 반환하였다
---
 src/store/style/compareStyle.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/store/style/compareStyle.ts b/src/store/style/compareStyle.ts
index 25717e7..292dcde 100644
--- a/src/store/style/compareStyle.ts
+++ b/src/store/style/compareStyle.ts
@@ -39,6 +39,9 @@ export function checkStyleIsChanged({
 }
 
 export function checkFeatureIsChanged(targetFeature: objType): boolean {
+  if (!targetFeature) {
+    return false;
+  }
   const keys = Object.keys(targetFeature);
   for (let i = 0; i < keys.length; i += 1) {
     if (

From 9c1e59fad0b142687c44a6758057c1836e5b4f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 00:40:45 +0900
Subject: [PATCH 099/138] =?UTF-8?q?[refactor]=20[#79]=20poi=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=EC=9D=84=20=EC=A1=B0=EA=B8=88=20=EB=8D=94=20=EA=B0=84?=
 =?UTF-8?q?=EB=8B=A8=ED=95=98=EA=B2=8C=20=EB=A6=AC=ED=8C=A9=ED=86=A0?=
 =?UTF-8?q?=EB=A7=81=20=ED=95=98=EC=98=80=EB=8B=A4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 타입스크릷트가 조금은 더 익숙해져서 필요없는 요소를 선언하지 않도록 고쳐보았다
---
 src/utils/map-styling/poi.ts | 42 ++++++------------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/src/utils/map-styling/poi.ts b/src/utils/map-styling/poi.ts
index a7acf1f..9f371b2 100644
--- a/src/utils/map-styling/poi.ts
+++ b/src/utils/map-styling/poi.ts
@@ -86,16 +86,12 @@ const mappingDetailToFunc = {
       },
       weight: {
         typeName: null,
-        funcName: () => null,
+        funcName: null,
       },
       visibility: {
         typeName: 'what is my name?',
         funcName: applyVisibility,
       },
-      isChanged: {
-        typeName: null,
-        funcName: () => null,
-      },
     },
     stroke: {
       color: {
@@ -118,37 +114,13 @@ const mappingDetailToFunc = {
         typeName: WeightType.textHalo,
         funcName: applyWeight,
       },
-      isChanged: {
-        typeName: null,
-        funcName: () => null,
-      },
     },
   },
   labelIcon: {
-    color: {
-      typeName: null,
-      funcName: () => null,
-    },
-    saturation: {
-      typeName: null,
-      funcName: () => null,
-    },
-    lightness: {
-      typeName: null,
-      funcName: () => null,
-    },
-    weight: {
-      typeName: null,
-      funcName: () => null,
-    },
     visibility: {
       typeName: ColorType.icon,
       funcName: applyWeight,
     },
-    isChanged: {
-      typeName: null,
-      funcName: () => null,
-    },
   },
 };
 
@@ -164,21 +136,19 @@ function poiStyling({
   let func = null;
 
   if (detailName === ElementNameType.section) return;
-  if (detailName === ElementNameType.labelText) {
+  if (detailName === ElementNameType.labelText && key !== 'isChanged') {
     const { typeName, funcName } = mappingDetailToFunc[detailName][
       subDetailName
-    ][key as StyleKeyType];
+    ][key];
     type = typeName;
     func = funcName;
-  } else {
-    const { typeName, funcName } = mappingDetailToFunc[detailName][
-      key as StyleKeyType
-    ];
+  } else if (detailName === ElementNameType.labelIcon && key === 'visibility') {
+    const { typeName, funcName } = mappingDetailToFunc[detailName][key];
     type = typeName;
     func = funcName;
   }
 
-  if (!type) return;
+  if (!type || !func) return;
   if (
     key === 'visibility' &&
     (type === ColorType.icon || type === WeightType.textHalo)

From 77f4af61e4052b048accabfe810f50805a7f95ec Mon Sep 17 00:00:00 2001
From: tejava <goddrinktejava@gmail.com>
Date: Thu, 3 Dec 2020 01:23:50 +0900
Subject: [PATCH 100/138] =?UTF-8?q?[fix]=20landscape=EC=9D=98=20=EC=9C=84?=
 =?UTF-8?q?=EC=B9=98=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

지도에서 지하철 등이 지나가는 경로가 빌딩에 가려지는 경우가 있습니다.
이를 방지하기 위해서 landscape를 보다 후순위로 조정하였습니다.
---
 src/store/map/initializeMap.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/map/initializeMap.ts b/src/store/map/initializeMap.ts
index fcdbcfa..4b4737b 100644
--- a/src/store/map/initializeMap.ts
+++ b/src/store/map/initializeMap.ts
@@ -84,9 +84,9 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
 
     const layers = [
       ...road,
+      ...landscape,
       ...transit,
       ...water,
-      ...landscape,
       ...mapboxPOI,
       ...poi,
     ] as mapboxgl.Layer[];

From 0b3b782a4868705ec0ff64930b4b4dd8c26303e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 01:32:45 +0900
Subject: [PATCH 101/138] =?UTF-8?q?[feat]=20[#72]=20=EC=83=89=EC=83=81?=
 =?UTF-8?q?=ED=8C=90=EB=93=A4=EC=97=90=EA=B2=8C=20=EB=8F=84=EB=A1=9C=20?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=96=B4=EB=93=A4=20=EC=97=85=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 색상판들에게 도로 레이어들을 추가하였다.
---
 src/utils/rendering-data/layerColor3.ts  | 37 ++++++++++++++++++++-
 src/utils/rendering-data/layersColor.ts  | 41 +++++++++++++++++++++---
 src/utils/rendering-data/layersColor2.ts | 36 ++++++++++++++++++++-
 3 files changed, 107 insertions(+), 7 deletions(-)

diff --git a/src/utils/rendering-data/layerColor3.ts b/src/utils/rendering-data/layerColor3.ts
index 34c54c9..0b65ba3 100644
--- a/src/utils/rendering-data/layerColor3.ts
+++ b/src/utils/rendering-data/layerColor3.ts
@@ -36,7 +36,7 @@ export default {
   'water-point-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
   'waterway-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
   'mapbox-airport-aeroway-polygon': {
-    color: 'hsl(40, 97%, 64%)',
+    color: 'hsl(234, 20%, 30%)',
     type: 'fill',
   },
   'mapbox-airport-polygon': { color: 'hsl(234, 20%, 30%)', type: 'fill' },
@@ -46,4 +46,39 @@ export default {
   'mapbox-rail-road-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
   'transit-rail-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
   'transit-subway-line': { color: 'hsl(192, 70%, 43%)', type: 'line' },
+  'road-arterial': 'hsl(0, 0%, 100%)',
+  'road-arterial-polygon': { color: 'hsl(0, 0%, 100%)', type: 'fill' },
+  'road-primary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-secondary-teritary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-motorway-trunk': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-minor': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-minor-low': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-primary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-secondary-teritary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-motorway-trunk-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-minor-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-number-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
+  'road-exit-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
+  'road-arterial-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
+  //
+  'road-local-polygon': { color: 'hsl(35, 14%, 93%)', type: 'fill' },
+  ferry: 'hsl(230, 48%, 44%)',
+  'ferry-auto': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  'road-local': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  'road-street': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  'road-street-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-local-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
+  //
+  'road-pedestrian-polygon-fill': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
+  'road-pedestrian-polygon-pattern': {
+    color: 'hsl(35, 10%, 83%)',
+    type: 'fill',
+  },
+  'road-sidewalk-polygon': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
+  'road-footway': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-pedestrian': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-steps': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-path': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-pedestrian-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-sidewalk-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
 };
diff --git a/src/utils/rendering-data/layersColor.ts b/src/utils/rendering-data/layersColor.ts
index 29a3a54..8f33b03 100644
--- a/src/utils/rendering-data/layersColor.ts
+++ b/src/utils/rendering-data/layersColor.ts
@@ -43,11 +43,42 @@ export default {
     },
   },
   road: {
-    highway: {},
-    arterial: {},
-    local: {},
-    sidewalk: {},
-    'bicycle-road': {},
+    arterial: {
+      'road-arterial': 'hsl(0, 0%, 100%)',
+      'road-arterial-polygon': 'hsl(0, 0%, 100%)',
+      'road-primary': 'hsl(0, 0%, 100%)',
+      'road-secondary-teritary': 'hsl(230, 24%, 87%)',
+      'road-motorway-trunk': 'hsl(26, 100%, 78%)',
+      'road-minor': 'hsl(0, 0%, 100%)',
+      'road-minor-low': 'hsl(0, 0%, 100%)',
+      'road-primary-case': 'hsl(230, 24%, 87%)',
+      'road-secondary-teritary-case': 'hsl(230, 24%, 87%)',
+      'road-motorway-trunk-case': 'hsl(0, 0%, 100%)',
+      'road-minor-case': 'hsl(230, 24%, 87%)',
+      'road-number-shield': 'hsl(0, 0%, 100%)',
+      'road-exit-shield': 'hsl(0, 0%, 100%)',
+      'road-arterial-label': 'hsl(230, 48%, 44%)',
+    },
+    local: {
+      'road-local-polygon': 'hsl(0, 0%, 100%)',
+      ferry: 'hsl(230, 48%, 44%)',
+      'ferry-auto': 'hsl(230, 73%, 63%)',
+      'road-local': 'hsl(230, 48%, 44%)',
+      'road-street': 'hsl(35, 14%, 93%)',
+      'road-street-case': 'hsl(230, 24%, 87%)',
+      'road-local-label': 'hsl(230, 48%, 44%)',
+    },
+    sidewalk: {
+      'road-pedestrian-polygon-fill': 'hsl(35, 10%, 83%)',
+      'road-pedestrian-polygon-pattern': 'hsl(35, 10%, 83%)',
+      'road-sidewalk-polygon': 'hsl(0, 0%, 100%)',
+      'road-footway': 'hsl(0, 0%, 100%)',
+      'road-pedestrian': 'hsl(0, 0%, 100%)',
+      'road-steps': 'hsl(0, 0%, 100%)',
+      'road-path': 'hsl(0, 0%, 100%)',
+      'road-pedestrian-case': 'hsl(230, 24%, 87%)',
+      'road-sidewalk-label': 'hsl(230, 48%, 44%)',
+    },
   },
   administrative: {
     country: {
diff --git a/src/utils/rendering-data/layersColor2.ts b/src/utils/rendering-data/layersColor2.ts
index aa7c8a7..0472d74 100644
--- a/src/utils/rendering-data/layersColor2.ts
+++ b/src/utils/rendering-data/layersColor2.ts
@@ -83,6 +83,40 @@ export default {
         [SubElementNameType.fill]: 'transparent',
         [SubElementNameType.stroke]: 'transparent',
       },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+    },
+    arterial: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(0, 0%, 100%)',
+        [SubElementNameType.stroke]: 'hsl(230, 24%, 87%)',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(230, 48%, 44%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
+      },
+    },
+    local: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(35, 14%, 93%)',
+        [SubElementNameType.stroke]: 'hsl(230, 24%, 87%)',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(230, 48%, 44%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
+      },
+    },
+    sidewalk: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(0, 0%, 100%)',
+        [SubElementNameType.stroke]: 'hsl(230, 24%, 87%)',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(230, 48%, 44%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
+      },
     },
   },
   [FeatureNameType.administrative]: {
@@ -144,7 +178,7 @@ export default {
     },
     airport: {
       [ElementNameType.section]: {
-        [SubElementNameType.fill]: 'hsl(40, 97%, 64%)',
+        [SubElementNameType.fill]: 'hsl(234, 20%, 30%)',
         [SubElementNameType.stroke]: 'hsl(230, 23%, 82%)',
       },
       [ElementNameType.labelText]: {

From dcda167964ecba19e4ce7975676e9341d4860b22 Mon Sep 17 00:00:00 2001
From: tejava <goddrinktejava@gmail.com>
Date: Thu, 3 Dec 2020 01:36:43 +0900
Subject: [PATCH 102/138] =?UTF-8?q?[feat]=20landscape=20=EC=83=81=EC=84=B8?=
 =?UTF-8?q?=20=EA=B5=AC=EB=B6=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

이전 구현 방식은 polygon만이 들어오는 가정을 했습니다.
기존 맵에서 line, label 등이 존재하는 것을 확인하여 수정하였습니다.
#93 을 참고하여 작성, 일관성을 추구하고자 하였습니다.
---
 src/utils/map-styling/landscape.ts | 333 ++++++++++++++++++++++++-----
 1 file changed, 275 insertions(+), 58 deletions(-)

diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index 1964333..f6df5ff 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -1,63 +1,229 @@
 import { stylingProps } from './index';
-import { applyColor, applyVisibility, ColorType } from '../applyStyle';
-import { StyleKeyType, StyleType } from '../../store/common/type';
+import {
+  applyColor,
+  applyWeight,
+  applyVisibility,
+  WeightType,
+  ColorType,
+  StyleTypes,
+} from '../applyStyle';
+import {
+  StyleKeyType,
+  ElementNameType,
+  StyleType,
+} from '../../store/common/type';
 
 const SECTION = 'section';
-const FILL = 'fill';
+const LABELTEXT = 'labelText';
+const LABELICON = 'labelIcon';
+
 const ALL = 'all';
 
-const layers = ['human-made', 'building', 'natural', 'landcover'];
+type LandscapeSubFeature =
+  | 'all'
+  | 'human-made'
+  | 'building'
+  | 'natural'
+  | 'landcover';
+
+const humanMadeLayers: string[] = ['landscape-human-made'];
+
+const buildingLayers: string[] = [
+  'landscape-building',
+  'building-outline',
+  'building',
+];
+
+const naturalLayers: string[] = ['landscape-natural'];
 
-interface applyStyleProps {
-  map: mapboxgl.Map;
-  subFeatureName: string;
-  key: StyleKeyType;
-  style: StyleType;
+const landcoverLayers: string[] = ['landscape-landcover'];
+
+interface SubDetailType {
+  fill: string[];
+  stroke: string[];
 }
 
-function applyLandscapeStyle({
-  map,
-  subFeatureName,
-  key,
-  style,
-}: applyStyleProps): void {
-  const layerNames = [`landscape-${subFeatureName}`];
-
-  switch (key) {
-    case 'color':
-      applyColor({
-        map,
-        layerNames,
-        type: ColorType.fill,
-        color: style.color,
-      });
-      break;
-    case 'visibility':
-      applyVisibility({ map, layerNames, visibility: style.visibility });
-      break;
-    case 'lightness':
-      applyColor({
-        map,
-        layerNames,
-        type: ColorType.fill,
-        color: style.color,
-        lightness: Number(style.lightness),
-      });
-      break;
-    case 'saturation':
-      applyColor({
-        map,
-        layerNames,
-        type: ColorType.fill,
-        color: style.color,
-        saturation: Number(style.saturation),
-      });
-      break;
-    default:
-      break;
-  }
+interface DetailType {
+  section: SubDetailType;
+  labelText: SubDetailType;
+  labelIcon: SubDetailType;
 }
 
+function makeSubDetail(
+  fillLayers: string[],
+  strokeLayers: string[]
+): SubDetailType {
+  return { fill: fillLayers, stroke: strokeLayers };
+}
+
+const layersByType: { [key in LandscapeSubFeature]: DetailType } = {
+  'human-made': {
+    [SECTION]: makeSubDetail([], []),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail([], []),
+  },
+  building: {
+    [SECTION]: makeSubDetail([], []),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail([], []),
+  },
+  natural: {
+    [SECTION]: makeSubDetail([], []),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail([], []),
+  },
+  landcover: {
+    [SECTION]: makeSubDetail([], []),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail([], []),
+  },
+  all: {
+    [SECTION]: makeSubDetail([], []),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail([], []),
+  },
+};
+
+const VISIBLE = 1;
+const INVISIBLE = 0;
+
+const mappingDetailToFunc = {
+  labelText: {
+    fill: {
+      color: {
+        typeName: ColorType.text,
+        funcName: applyColor,
+      },
+      saturation: {
+        typeName: ColorType.text,
+        funcName: applyColor,
+      },
+      lightness: {
+        typeName: ColorType.text,
+        funcName: applyColor,
+      },
+      weight: {
+        typeName: null,
+        funcName: () => null,
+      },
+      visibility: {
+        typeName: 'what is my name?',
+        funcName: applyVisibility,
+      },
+      isChanged: {
+        typeName: null,
+        funcName: () => null,
+      },
+    },
+    stroke: {
+      color: {
+        typeName: ColorType.textHalo,
+        funcName: applyColor,
+      },
+      saturation: {
+        typeName: ColorType.textHalo,
+        funcName: applyColor,
+      },
+      lightness: {
+        typeName: ColorType.textHalo,
+        funcName: applyColor,
+      },
+      weight: {
+        typeName: WeightType.textHalo,
+        funcName: applyWeight,
+      },
+      visibility: {
+        typeName: WeightType.textHalo,
+        funcName: applyWeight,
+      },
+      isChanged: {
+        typeName: null,
+        funcName: () => null,
+      },
+    },
+  },
+  labelIcon: {
+    color: {
+      typeName: null,
+      funcName: () => null,
+    },
+    saturation: {
+      typeName: null,
+      funcName: () => null,
+    },
+    lightness: {
+      typeName: null,
+      funcName: () => null,
+    },
+    weight: {
+      typeName: null,
+      funcName: () => null,
+    },
+    visibility: {
+      typeName: ColorType.icon,
+      funcName: applyWeight,
+    },
+    isChanged: {
+      typeName: null,
+      funcName: () => null,
+    },
+  },
+  section: {
+    fill: {
+      color: {
+        typeName: ColorType.fill,
+        funcName: applyColor,
+      },
+      saturation: {
+        typeName: ColorType.fill,
+        funcName: applyColor,
+      },
+      lightness: {
+        typeName: ColorType.fill,
+        funcName: applyColor,
+      },
+      weight: {
+        typeName: null,
+        funcName: () => null,
+      },
+      visibility: {
+        typeName: ColorType.fill,
+        funcName: applyVisibility,
+      },
+      isChanged: {
+        typeName: null,
+        funcName: () => null,
+      },
+    },
+    stroke: {
+      color: {
+        typeName: ColorType.line,
+        funcName: applyColor,
+      },
+      saturation: {
+        typeName: ColorType.line,
+        funcName: applyColor,
+      },
+      lightness: {
+        typeName: ColorType.line,
+        funcName: applyColor,
+      },
+      weight: {
+        typeName: WeightType.line,
+        funcName: applyWeight,
+      },
+      visibility: {
+        typeName: WeightType.line,
+        funcName: applyVisibility,
+      },
+      isChanged: {
+        typeName: null,
+        funcName: () => null,
+      },
+    },
+  },
+};
+
 function landscapeStyling({
   map,
   subFeatureName,
@@ -66,17 +232,68 @@ function landscapeStyling({
   key,
   style,
 }: stylingProps): void {
-  if (detailName !== SECTION || subDetailName !== FILL) {
-    return;
-  }
+  let type = null;
+  let func = null;
+
+  console.log(subFeatureName, detailName, subDetailName, key);
 
-  if (subFeatureName === ALL) {
-    layers.forEach((item) =>
-      applyLandscapeStyle({ map, subFeatureName: item, key, style })
-    );
+  if (
+    detailName === ElementNameType.section ||
+    detailName === ElementNameType.labelText
+  ) {
+    const { typeName, funcName } = mappingDetailToFunc[detailName][
+      subDetailName
+    ][key as StyleKeyType];
+    type = typeName;
+    func = funcName;
   } else {
-    applyLandscapeStyle({ map, subFeatureName, key, style });
+    const { typeName, funcName } = mappingDetailToFunc[detailName][
+      key as StyleKeyType
+    ];
+    type = typeName;
+    func = funcName;
+  }
+
+  if (!type) {
+    return;
+  }
+  if (
+    key === 'visibility' &&
+    (type === ColorType.icon || type === WeightType.textHalo)
+  ) {
+    func({
+      map,
+      layerNames:
+        layersByType[subFeatureName as LandscapeSubFeature][detailName][
+          subDetailName
+        ],
+      type,
+      weight: style.visibility === 'none' ? INVISIBLE : VISIBLE,
+    });
+    return;
+  }
+  if (key === 'visibility') {
+    console.log(func);
+    func({
+      map,
+      layerNames:
+        layersByType[subFeatureName as LandscapeSubFeature][detailName][
+          subDetailName
+        ],
+      visibility: style.visibility,
+    });
   }
+
+  func({
+    map,
+    layerNames:
+      layersByType[subFeatureName as LandscapeSubFeature][detailName][
+        subDetailName
+      ],
+    type: type as StyleTypes,
+    color: style.color,
+    [key]: style[key as StyleKeyType],
+  });
 }
 
 export default landscapeStyling;

From 6c66f971ef0a76f5ed9eb9c511c9598312561832 Mon Sep 17 00:00:00 2001
From: tejava <goddrinktejava@gmail.com>
Date: Thu, 3 Dec 2020 03:01:42 +0900
Subject: [PATCH 103/138] =?UTF-8?q?[feat]=20#83=20landscape=EC=9D=98=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

아직 일부 변하지 않는 부위가 존재합니다.
ex. 지붕에 그어진 선으로 보이는 부분이 아직 색이 변하지 않습니다.
어느 부위인지 확인하기가 어려워 추후 논의하고 싶습니다.
텍스트도 랜드마크와 일부 겹치는 경우가 많아 합쳐서 확인해야 한다
생각이 듭니다.
---
 src/utils/map-styling/landscape.ts | 74 +++++++++++++++++++-----------
 1 file changed, 48 insertions(+), 26 deletions(-)

diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index f6df5ff..0ebf009 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -17,26 +17,13 @@ const SECTION = 'section';
 const LABELTEXT = 'labelText';
 const LABELICON = 'labelIcon';
 
-const ALL = 'all';
-
 type LandscapeSubFeature =
   | 'all'
   | 'human-made'
   | 'building'
   | 'natural'
-  | 'landcover';
-
-const humanMadeLayers: string[] = ['landscape-human-made'];
-
-const buildingLayers: string[] = [
-  'landscape-building',
-  'building-outline',
-  'building',
-];
-
-const naturalLayers: string[] = ['landscape-natural'];
-
-const landcoverLayers: string[] = ['landscape-landcover'];
+  | 'landcover'
+  | 'mountain';
 
 interface SubDetailType {
   fill: string[];
@@ -56,32 +43,70 @@ function makeSubDetail(
   return { fill: fillLayers, stroke: strokeLayers };
 }
 
+const humanMadeSectionFill = ['landscape-human-made'];
+const humanMadeSectionStroke = ['pitch-outline'];
+
+const buildingSectionFill = ['landscape-building', 'building'];
+const buildingSectionStroke = ['building-outline'];
+const buildingLabel = ['building-number-label'];
+
+const naturalSectionFill = ['landscape-natural'];
+const naturalLabel = ['natural-point-label'];
+
+const landCoverSectionFill = [
+  'landscape-landcover',
+  'landcover',
+  'landuse',
+  'lang-structure-polygon',
+];
+const landCoverSectionStroke = ['lang-structure-line'];
+
+const mountainCoverSectionFill = ['hillshade'];
+
 const layersByType: { [key in LandscapeSubFeature]: DetailType } = {
   'human-made': {
-    [SECTION]: makeSubDetail([], []),
+    [SECTION]: makeSubDetail(humanMadeSectionFill, humanMadeSectionStroke),
     [LABELTEXT]: makeSubDetail([], []),
     [LABELICON]: makeSubDetail([], []),
   },
   building: {
-    [SECTION]: makeSubDetail([], []),
+    [SECTION]: makeSubDetail(buildingSectionFill, buildingSectionStroke),
     [LABELTEXT]: makeSubDetail([], []),
-    [LABELICON]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail(buildingLabel, buildingLabel),
   },
   natural: {
-    [SECTION]: makeSubDetail([], []),
+    [SECTION]: makeSubDetail(naturalSectionFill, []),
     [LABELTEXT]: makeSubDetail([], []),
-    [LABELICON]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail(naturalLabel, naturalLabel),
   },
   landcover: {
-    [SECTION]: makeSubDetail([], []),
+    [SECTION]: makeSubDetail(landCoverSectionFill, landCoverSectionStroke),
     [LABELTEXT]: makeSubDetail([], []),
     [LABELICON]: makeSubDetail([], []),
   },
-  all: {
-    [SECTION]: makeSubDetail([], []),
+  mountain: {
+    [SECTION]: makeSubDetail(mountainCoverSectionFill, []),
     [LABELTEXT]: makeSubDetail([], []),
     [LABELICON]: makeSubDetail([], []),
   },
+  all: {
+    [SECTION]: makeSubDetail(
+      [
+        ...humanMadeSectionFill,
+        ...buildingSectionFill,
+        ...naturalSectionFill,
+        ...landCoverSectionFill,
+        ...mountainCoverSectionFill,
+      ],
+      [
+        ...humanMadeSectionStroke,
+        ...buildingSectionStroke,
+        ...landCoverSectionStroke,
+      ]
+    ),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail([], [...buildingLabel, ...naturalLabel]),
+  },
 };
 
 const VISIBLE = 1;
@@ -235,8 +260,6 @@ function landscapeStyling({
   let type = null;
   let func = null;
 
-  console.log(subFeatureName, detailName, subDetailName, key);
-
   if (
     detailName === ElementNameType.section ||
     detailName === ElementNameType.labelText
@@ -273,7 +296,6 @@ function landscapeStyling({
     return;
   }
   if (key === 'visibility') {
-    console.log(func);
     func({
       map,
       layerNames:

From 03b82ca9dd210cf73f1a87e154ce90ad7d98b14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 10:30:54 +0900
Subject: [PATCH 104/138] =?UTF-8?q?[feat]=20layers=EC=83=89=EC=83=81=20?=
 =?UTF-8?q?=ED=8C=94=EB=A0=88=ED=8A=B8=EC=97=90=20=EA=B2=BD=EA=B4=80=20?=
 =?UTF-8?q?=EC=83=89=EC=83=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- layers색상 팔레트에 경관 색상을 추가하였다
---
 src/utils/rendering-data/layerColor3.ts  | 14 ++++++
 src/utils/rendering-data/layersColor.ts  | 29 ++++++++++---
 src/utils/rendering-data/layersColor2.ts | 54 ++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/src/utils/rendering-data/layerColor3.ts b/src/utils/rendering-data/layerColor3.ts
index 0b65ba3..89aba20 100644
--- a/src/utils/rendering-data/layerColor3.ts
+++ b/src/utils/rendering-data/layerColor3.ts
@@ -81,4 +81,18 @@ export default {
   'road-path': { color: 'hsl(35, 10%, 83%)', type: 'line' },
   'road-pedestrian-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
   'road-sidewalk-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
+  'landscape-human-made': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  'pitch-outline': { color: 'hsl(75, 57%, 84%)', type: 'fill' },
+  'landscape-building': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  building: { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  'building-outline': { color: 'hsl(35, 6%, 79%)', type: 'line' },
+  'building-number-label': { color: 'hsl(35, 2%, 69%)', type: 'text' },
+  'landscape-natural': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  'natural-point-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'landscape-landcover': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  landcover: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  landuse: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  'land-structure-polygon': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  'land-structure-line': { color: 'hsl(35, 12%, 89%)', type: 'line' },
+  hillshade: { color: 'hsl(56, 59%, 22%)', type: 'fill' },
 };
diff --git a/src/utils/rendering-data/layersColor.ts b/src/utils/rendering-data/layersColor.ts
index 8f33b03..a5a2629 100644
--- a/src/utils/rendering-data/layersColor.ts
+++ b/src/utils/rendering-data/layersColor.ts
@@ -98,11 +98,30 @@ export default {
     },
   },
   landscape: {
-    'human-made': {},
-    building: {},
-    natural: {},
-    landcover: {},
-    mountain: {},
+    'human-made': {
+      'landscape-human-made': 'hsl(35, 11%, 86%)',
+      'pitch-outline': 'hsl(75, 57%, 84%)',
+    },
+    building: {
+      'landscape-building': 'hsl(35, 11%, 86%)',
+      building: 'hsl(35, 11%, 86%)',
+      'building-outline': 'hsl(35, 6%, 79%)',
+      'building-number-label': 'hsl(35, 2%, 69%)',
+    },
+    natural: {
+      'landscape-natural': 'hsl(75, 62%, 81%)',
+      'natural-point-label': 'hsl(26, 25%, 32%)',
+    },
+    landcover: {
+      'landscape-landcover': 'hsl(75, 62%, 81%)',
+      landcover: 'hsl(75, 62%, 81%)',
+      landuse: 'hsl(100, 58%, 76%)',
+      'land-structure-polygon': 'hsl(35, 12%, 89%)',
+      'land-structure-line': 'hsl(35, 12%, 89%)',
+    },
+    mountain: {
+      hillshade: 'hsl(56, 59%, 22%)',
+    },
   },
   transit: {
     airport: {
diff --git a/src/utils/rendering-data/layersColor2.ts b/src/utils/rendering-data/layersColor2.ts
index 0472d74..67489bf 100644
--- a/src/utils/rendering-data/layersColor2.ts
+++ b/src/utils/rendering-data/layersColor2.ts
@@ -163,6 +163,60 @@ export default {
         [SubElementNameType.fill]: 'transparent',
         [SubElementNameType.stroke]: 'transparent',
       },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+    },
+    'human-made': {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(35, 11%, 86%)',
+        [SubElementNameType.stroke]: 'hsl(75, 57%, 84%)',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+    },
+    building: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(35, 11%, 86%)',
+        [SubElementNameType.stroke]: 'hsl(35, 6%, 79%)',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(35, 2%, 69%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
+      },
+    },
+    natural: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(75, 62%, 81%)',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'hsl(26, 25%, 32%)',
+        [SubElementNameType.stroke]: 'hsl(0, 0%, 100%)',
+      },
+    },
+    landcover: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(75, 62%, 81%)',
+        [SubElementNameType.stroke]: 'hsl(35, 12%, 89%)',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+    },
+    mountain: {
+      [ElementNameType.section]: {
+        [SubElementNameType.fill]: 'hsl(56, 59%, 22%)',
+        [SubElementNameType.stroke]: 'transparent',
+      },
+      [ElementNameType.labelText]: {
+        [SubElementNameType.fill]: 'transparent',
+        [SubElementNameType.stroke]: 'transparent',
+      },
     },
   },
   [FeatureNameType.transit]: {

From 3bcb4a69365f64d59c3b49f954a6075bd0b403f1 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 10:59:07 +0900
Subject: [PATCH 105/138] =?UTF-8?q?[fix]=20=EB=B8=8C=EB=9E=9C=EC=B9=9C=20?=
 =?UTF-8?q?=EB=B3=91=ED=95=A9=20=EC=B6=A9=EB=8F=8C=20=EC=9D=B4=EC=8A=88=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sidebar/SidebarContentMore/DetailType.tsx | 100 +++---
 src/store/map/initializeMap.ts                |  11 +-
 src/store/map/layers/road.ts                  | 257 ++++++++++++++
 src/store/map/layers/transit.ts               | 123 ++++++-
 src/store/style/compareStyle.ts               |   3 +
 src/store/style/properties.ts                 |   3 +-
 src/utils/applyStyle.ts                       |   4 +-
 src/utils/colorFormat.ts                      |  53 +++
 src/utils/map-styling/landscape.ts            | 333 ++++++++++++++++--
 src/utils/map-styling/poi.ts                  |  42 +--
 .../map-styling/road-categories/arterial.ts   |  30 ++
 .../map-styling/road-categories/local.ts      |  12 +
 .../map-styling/road-categories/sidewalk.ts   |  16 +
 .../road-categories/stylingCategory.ts        | 158 +++++++++
 src/utils/map-styling/road.ts                 | 132 ++-----
 src/utils/map-styling/transit.ts              | 132 +++----
 src/utils/rendering-data/featureTypeData.ts   |   1 -
 src/utils/rendering-data/layerColor3.ts       |  98 ++++++
 src/utils/rendering-data/layersColor.ts       | 109 +++---
 19 files changed, 1227 insertions(+), 390 deletions(-)
 create mode 100644 src/utils/map-styling/road-categories/arterial.ts
 create mode 100644 src/utils/map-styling/road-categories/local.ts
 create mode 100644 src/utils/map-styling/road-categories/sidewalk.ts
 create mode 100644 src/utils/map-styling/road-categories/stylingCategory.ts
 create mode 100644 src/utils/rendering-data/layerColor3.ts

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index 5fe32fb..edda5c2 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -136,61 +136,67 @@ function DetailType({
         ) : (
           <></>
         )}
-        {labelText ? (
-          <List>
-            <Text padding="first">라벨</Text>
-            <List>
-              <Text padding="second">텍스트</Text>
-              {labelText?.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
-              <ListItem
-                isSelected={checkIsSelected(
-                  ElementNameType.labelText,
-                  SubElementNameType.fill
-                )}
-                padding="third"
-                clickHandler={() => {
-                  styleClickHandler(
+        <List>
+          {labelText ? (
+            <>
+              <Text padding="first">라벨</Text>
+              <List>
+                <Text padding="second">텍스트</Text>
+                {labelText?.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
+                <ListItem
+                  isSelected={checkIsSelected(
                     ElementNameType.labelText,
                     SubElementNameType.fill
-                  );
-                }}
-                name="채우기"
-              />
-              {labelText?.stroke.isChanged ? <CheckRight>✓</CheckRight> : <></>}
-              <ListItem
-                isSelected={checkIsSelected(
-                  ElementNameType.labelText,
-                  SubElementNameType.stroke
+                  )}
+                  padding="third"
+                  clickHandler={() => {
+                    styleClickHandler(
+                      ElementNameType.labelText,
+                      SubElementNameType.fill
+                    );
+                  }}
+                  name="채우기"
+                />
+                {labelText?.stroke.isChanged ? (
+                  <CheckRight>✓</CheckRight>
+                ) : (
+                  <></>
                 )}
-                padding="third"
-                clickHandler={() => {
-                  styleClickHandler(
+                <ListItem
+                  isSelected={checkIsSelected(
                     ElementNameType.labelText,
                     SubElementNameType.stroke
-                  );
-                }}
-                name="윤곽선"
-              />
-            </List>
-            {labelIcon ? (
-              <>
-                {labelIcon?.isChanged ? <Check>✓</Check> : <></>}
-                <ListItem
-                  isSelected={checkIsSelected(ElementNameType.labelIcon)}
-                  padding="second"
+                  )}
+                  padding="third"
                   clickHandler={() => {
-                    styleClickHandler(ElementNameType.labelIcon);
+                    styleClickHandler(
+                      ElementNameType.labelText,
+                      SubElementNameType.stroke
+                    );
                   }}
-                  name="아이콘"
+                  name="윤곽선"
                 />
-              </>
-            ) : (
-              <></>
-            )}
-          </List>
-        ) : (
-          <></>
-        )}
+              </List>
+            </>
+          ) : (
+            <></>
+          )}
+          {labelIcon ? (
+            <>
+              {labelIcon.isChanged ? <Check>✓</Check> : <></>}
+              <ListItem
+                isSelected={checkIsSelected(ElementNameType.labelIcon)}
+                padding="second"
+                clickHandler={() => {
+                  styleClickHandler(ElementNameType.labelIcon);
+                }}
+                name="아이콘"
+              />
+            </>
+          ) : (
+            <></>
+          )}
+        </List>
       </DetailWrapper>
       <Styler
         featureName={featureName}
diff --git a/src/store/map/initializeMap.ts b/src/store/map/initializeMap.ts
index fcdbcfa..b5ad4b5 100644
--- a/src/store/map/initializeMap.ts
+++ b/src/store/map/initializeMap.ts
@@ -10,13 +10,14 @@ import landscape from './layers/landscape';
 import water from './layers/water';
 import mapboxPOI from './layers/mapbox-poi';
 
+import initColor from '../../utils/rendering-data/layerColor3';
+
 const LNG = 126.978;
 const LAT = 37.5656;
 const ZOOM = 15.5;
 const LABEL_LAYERS: string[] = [
   'country-label',
   'settlement-label',
-  'road-label',
   'state-label',
   'settlement-subdivision-label',
   'airport-label',
@@ -68,6 +69,8 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
   map.on('load', () => {
     translate(map);
     map.removeLayer('poi-label');
+    map.removeLayer('road-label');
+    map.removeLayer('road-polygon');
 
     map.addSource(Sources.polygon, {
       type: 'vector',
@@ -84,13 +87,17 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
 
     const layers = [
       ...road,
+      ...landscape,
       ...transit,
       ...water,
-      ...landscape,
       ...mapboxPOI,
       ...poi,
     ] as mapboxgl.Layer[];
     layers.forEach((layer: mapboxgl.Layer) => map.addLayer(layer));
+
+    Object.entries(initColor).forEach(([key, value]) => {
+      map.setPaintProperty(key, `${value.type}-color`, value.color);
+    });
   });
 
   return map;
diff --git a/src/store/map/layers/road.ts b/src/store/map/layers/road.ts
index e1ea102..bc4d19a 100644
--- a/src/store/map/layers/road.ts
+++ b/src/store/map/layers/road.ts
@@ -66,4 +66,261 @@ export default [
     filter: ['match', ['get', 'type'], ['pedestrian', 'footway'], true, false],
     id: 'road-footway',
   },
+  {
+    id: 'road-arterial-label',
+    type: 'symbol',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: {},
+    minzoom: 10,
+    filter: [
+      'step',
+      ['zoom'],
+      [
+        'match',
+        ['get', 'class'],
+        ['motorway', 'trunk', 'primary', 'secondary', 'tertiary'],
+        true,
+        false,
+      ],
+      12,
+      [
+        'match',
+        ['get', 'class'],
+        ['motorway', 'trunk', 'primary', 'secondary', 'tertiary'],
+        true,
+        false,
+      ],
+    ],
+    layout: {
+      'text-size': [
+        'interpolate',
+        ['linear'],
+        ['zoom'],
+        10,
+        [
+          'match',
+          ['get', 'class'],
+          ['motorway', 'trunk', 'primary', 'secondary', 'tertiary'],
+          10,
+          [
+            'motorway_link',
+            'trunk_link',
+            'primary_link',
+            'secondary_link',
+            'tertiary_link',
+          ],
+          9,
+          6.5,
+        ],
+        18,
+        [
+          'match',
+          ['get', 'class'],
+          ['motorway', 'trunk', 'primary', 'secondary', 'tertiary'],
+          16,
+          [
+            'motorway_link',
+            'trunk_link',
+            'primary_link',
+            'secondary_link',
+            'tertiary_link',
+          ],
+          14,
+          13,
+        ],
+      ],
+      'text-max-angle': 30,
+      'text-font': ['DIN Offc Pro Regular', 'Arial Unicode MS Regular'],
+      'symbol-placement': 'line',
+      'text-padding': 1,
+      'text-rotation-alignment': 'map',
+      'text-pitch-alignment': 'viewport',
+      'text-field': ['coalesce', ['get', 'name_en'], ['get', 'name']],
+      'text-letter-spacing': 0.01,
+    },
+    paint: {
+      'text-color': [
+        'match',
+        ['get', 'class'],
+        'ferry',
+        'hsl(230, 48%, 44%)',
+        'hsl(0, 0%, 0%)',
+      ],
+      'text-halo-color': [
+        'match',
+        ['get', 'class'],
+        ['motorway', 'trunk'],
+        'hsla(0, 0%, 100%, 0.75)',
+        'hsl(0, 0%, 100%)',
+      ],
+      'text-halo-width': 1,
+      'text-halo-blur': 1,
+    },
+  },
+  {
+    id: 'road-local-label',
+    type: 'symbol',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: {},
+    minzoom: 10,
+    filter: ['match', ['get', 'class'], ['street'], true, false],
+    layout: {
+      'text-size': [
+        'interpolate',
+        ['linear'],
+        ['zoom'],
+        10,
+        ['match', ['get', 'class'], ['street'], 9, 6.5],
+        18,
+        ['match', ['get', 'class'], ['street'], 14, 13],
+      ],
+      'text-max-angle': 30,
+      'text-font': ['DIN Offc Pro Regular', 'Arial Unicode MS Regular'],
+      'symbol-placement': 'line',
+      'text-padding': 1,
+      'text-rotation-alignment': 'map',
+      'text-pitch-alignment': 'viewport',
+      'text-field': ['coalesce', ['get', 'name_en'], ['get', 'name']],
+      'text-letter-spacing': 0.01,
+    },
+    paint: {
+      'text-color': [
+        'match',
+        ['get', 'class'],
+        'ferry',
+        'hsl(230, 48%, 44%)',
+        'hsl(0, 0%, 0%)',
+      ],
+      'text-halo-color': [
+        'match',
+        ['get', 'class'],
+        ['ferry'],
+        'hsla(0, 0%, 100%, 0.75)',
+        'hsl(0, 0%, 100%)',
+      ],
+      'text-halo-width': 1,
+      'text-halo-blur': 1,
+    },
+  },
+  {
+    id: 'road-sidewalk-label',
+    type: 'symbol',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: {},
+    minzoom: 10,
+    filter: [
+      'match',
+      ['get', 'class'],
+      ['pedestrian', 'street_limited'],
+      true,
+      false,
+    ],
+    layout: {
+      'text-size': [
+        'interpolate',
+        ['linear'],
+        ['zoom'],
+        10,
+        ['match', ['get', 'class'], ['pedestrian', 'street_limited'], 9, 6.5],
+        18,
+        ['match', ['get', 'class'], ['pedestrian', 'street_limited'], 14, 13],
+      ],
+      'text-max-angle': 30,
+      'text-font': ['DIN Offc Pro Regular', 'Arial Unicode MS Regular'],
+      'symbol-placement': 'line',
+      'text-padding': 1,
+      'text-rotation-alignment': 'map',
+      'text-pitch-alignment': 'viewport',
+      'text-field': ['coalesce', ['get', 'name_en'], ['get', 'name']],
+      'text-letter-spacing': 0.01,
+    },
+    paint: {
+      'text-color': [
+        'match',
+        ['get', 'class'],
+        'ferry',
+        'hsl(230, 48%, 44%)',
+        'hsl(0, 0%, 0%)',
+      ],
+      'text-halo-color': [
+        'match',
+        ['get', 'class'],
+        ['motorway', 'trunk'],
+        'hsla(0, 0%, 100%, 0.75)',
+        'ferry',
+        'hsl(196, 80%, 70%)',
+        'hsl(0, 0%, 100%)',
+      ],
+      'text-halo-width': 1,
+      'text-halo-blur': 1,
+    },
+  },
+  {
+    id: 'road-arterial-polygon',
+    type: 'fill',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: { 'mapbox:group': '1444855786460.0557' },
+    minzoom: 12,
+    filter: [
+      'all',
+      ['==', ['geometry-type'], 'Polygon'],
+      [
+        'match',
+        ['get', 'class'],
+        [
+          'primary',
+          'secondary',
+          'tertiary',
+          'primary_link',
+          'secondary_link',
+          'tertiary_link',
+        ],
+        true,
+        false,
+      ],
+      ['match', ['get', 'structure'], ['none', 'ford'], true, false],
+    ],
+    paint: {
+      'fill-color': 'hsl(0, 0%, 100%)',
+      'fill-outline-color': '#d6d9e6',
+    },
+  },
+  {
+    id: 'road-local-polygon',
+    type: 'fill',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: { 'mapbox:group': '1444855786460.0557' },
+    minzoom: 12,
+    filter: [
+      'all',
+      ['==', ['geometry-type'], 'Polygon'],
+      ['match', ['get', 'class'], ['street'], true, false],
+    ],
+    paint: {
+      'fill-color': 'hsl(0, 0%, 100%)',
+      'fill-outline-color': '#d6d9e6',
+    },
+  },
+  {
+    id: 'road-sidewalk-polygon',
+    type: 'fill',
+    source: 'composite',
+    'source-layer': 'road',
+    metadata: { 'mapbox:group': '1444855786460.0557' },
+    minzoom: 12,
+    filter: [
+      'all',
+      ['==', ['geometry-type'], 'Polygon'],
+      ['match', ['get', 'class'], ['street_limited'], true, false],
+    ],
+    paint: {
+      'fill-color': 'hsl(0, 0%, 100%)',
+      'fill-outline-color': '#d6d9e6',
+    },
+  },
 ];
diff --git a/src/store/map/layers/transit.ts b/src/store/map/layers/transit.ts
index 18a3ae4..93d66ee 100644
--- a/src/store/map/layers/transit.ts
+++ b/src/store/map/layers/transit.ts
@@ -1,5 +1,6 @@
 export default [
   {
+    id: 'mapbox-airport-polygon',
     type: 'fill',
     source: 'composite',
     'source-layer': 'landuse',
@@ -7,12 +8,84 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'fill-color': 'hsl(230, 100%, 44%)',
+      'fill-color': 'hsl(234, 20%, 30%)',
     },
-    filter: ['in', 'class', 'airport'],
-    id: 'transit-airport',
+    filter: ['==', ['get', 'class'], 'airport'],
   },
   {
+    id: 'mapbox-airport-aeroway-polygon',
+    type: 'fill',
+    metadata: {},
+    source: 'composite',
+    'source-layer': 'aeroway',
+    minzoom: 11,
+    filter: [
+      'all',
+      ['==', ['geometry-type'], 'Polygon'],
+      ['match', ['get', 'type'], ['runway', 'taxiway', 'helipad'], true, false],
+    ],
+    layout: {},
+    paint: {
+      'fill-color': 'hsl(40, 97%, 64%)',
+    },
+  },
+  {
+    id: 'mapbox-airport-aeroway-line',
+    type: 'line',
+    metadata: {},
+    source: 'composite',
+    'source-layer': 'aeroway',
+    minzoom: 9,
+    filter: ['==', ['geometry-type'], 'LineString'],
+    layout: {},
+    paint: {
+      'line-color': 'hsl(230, 23%, 82%)',
+      'line-width': [
+        'interpolate',
+        ['exponential', 1.5],
+        ['zoom'],
+        9,
+        ['match', ['get', 'type'], 'runway', 1, 'taxiway', 0.5, 0.5],
+        18,
+        ['match', ['get', 'type'], 'runway', 80, 'taxiway', 20, 20],
+      ],
+    },
+  },
+  {
+    id: 'mapbox-airport-label',
+    type: 'symbol',
+    source: 'composite',
+    'source-layer': 'airport_label',
+    minzoom: 8,
+    layout: {
+      'text-size': 12,
+      'icon-image': [
+        'step',
+        ['get', 'sizerank'],
+        ['concat', ['get', 'maki'], '-15'],
+        12,
+        ['concat', ['get', 'maki'], '-11'],
+      ],
+      'text-offset': [0, 0.75],
+      'text-rotation-alignment': 'viewport',
+      'text-anchor': 'top',
+      'text-field': [
+        'step',
+        ['get', 'sizerank'],
+        ['coalesce', ['get', 'name_en'], ['get', 'name']],
+        15,
+        ['get', 'ref'],
+      ],
+      'text-max-width': 9,
+    },
+    paint: {
+      'text-color': 'hsl(0, 69%, 50%)',
+      'text-halo-color': 'hsl(0, 0%, 100%)',
+      'text-halo-width': 1,
+    },
+  },
+  {
+    id: 'transit-subway-line',
     type: 'line',
     source: 'line_source',
     'source-layer': 'line',
@@ -20,12 +93,13 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'line-color': 'yellow',
+      'line-color': 'hsl(192, 70%, 43%)',
+      'line-width': 2,
     },
-    filter: ['in', 'type', 'subway'],
-    id: 'transit-subway',
+    filter: ['==', ['get', 'type'], 'subway'],
   },
   {
+    id: 'transit-rail-line',
     type: 'line',
     source: 'line_source',
     'source-layer': 'line',
@@ -33,12 +107,34 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'line-color': 'black',
+      'line-color': 'hsl(201, 100%, 14%)',
+      'line-width': 2,
+    },
+    filter: ['match', ['get', 'type'], 'rail'],
+  },
+  {
+    id: 'mapbox-rail-road-line',
+    type: 'line',
+    source: 'composite',
+    'source-layer': 'road',
+    layout: {
+      visibility: 'visible',
+      'line-join': 'round',
+    },
+    minzoom: 13,
+
+    paint: {
+      'line-color': 'hsl(234, 20%, 30%)',
+      'line-width': 6,
     },
-    filter: ['in', 'type', 'rail'],
-    id: 'transit-rail',
+    filter: [
+      'all',
+      ['match', ['get', 'class'], ['major_rail', 'minor_rail'], true, false],
+      ['match', ['get', 'structure'], ['none', 'ford'], true, false],
+    ],
   },
   {
+    id: 'transit-bus-label',
     type: 'symbol',
     source: 'poi_source',
     'source-layer': 'poi',
@@ -48,11 +144,10 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'text-halo-color': 'green',
-      'text-halo-width': 0.5,
-      'text-color': 'red',
+      'text-halo-color': 'hsl(151, 24%, 60%)',
+      'text-halo-width': 1,
+      'text-color': 'hsl(13, 68%, 63%)',
     },
-    filter: ['in', 'type', 'bus_stop'],
-    id: 'transit-bus-label',
+    filter: ['==', ['get', 'type'], 'bus_stop'],
   },
 ];
diff --git a/src/store/style/compareStyle.ts b/src/store/style/compareStyle.ts
index 5d7cd21..b675fb6 100644
--- a/src/store/style/compareStyle.ts
+++ b/src/store/style/compareStyle.ts
@@ -28,6 +28,9 @@ export function checkStyleIsChanged({
 }
 
 export function checkFeatureIsChanged(targetFeature: objType): boolean {
+  if (!targetFeature) {
+    return false;
+  }
   const keys = Object.keys(targetFeature);
   for (let i = 0; i < keys.length; i += 1) {
     if (
diff --git a/src/store/style/properties.ts b/src/store/style/properties.ts
index 3a8892c..5574b5a 100644
--- a/src/store/style/properties.ts
+++ b/src/store/style/properties.ts
@@ -7,6 +7,7 @@ import {
   ElementPropsType,
   StylePropsType,
 } from '../common/type';
+import { hslToHEX } from '../../utils/colorFormat';
 
 import defaultStyle from '../../utils/rendering-data/layersColor';
 
@@ -30,7 +31,7 @@ export const getDefaultStyle = ({
     : defaultStyle[feature][subFeature][element];
   return {
     ...JSON.parse(JSON.stringify(style)),
-    color: defaultColor,
+    color: defaultColor ? hslToHEX(defaultColor as string) : '#000000',
   };
 };
 
diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index 42da7d0..15d41c4 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -86,9 +86,9 @@ export function applyWeight({
   map,
   layerNames,
   type,
-  weight,
+  weight = 1,
 }: ApplyProps): void {
-  if (!type || !weight) return;
+  if (!type) return;
 
   const weightValue = weight === 0 ? 0 : weight * 2 + 1;
   layerNames.forEach((layerName) => {
diff --git a/src/utils/colorFormat.ts b/src/utils/colorFormat.ts
index 9c4166f..8cc4596 100644
--- a/src/utils/colorFormat.ts
+++ b/src/utils/colorFormat.ts
@@ -40,3 +40,56 @@ export function hexToHSL(color: string): HexToHSLType {
     l,
   };
 }
+
+export function hslToHEX(color: string): string {
+  if (color === 'transparent') return '#000000';
+  const hsl = color.match(/\d+/g)?.map((c) => Number(c)) as number[];
+
+  const h: number = hsl[0];
+  const s: number = hsl[1] / 100;
+  const l: number = hsl[2] / 100;
+
+  const c = (1 - Math.abs(2 * l - 1)) * s;
+  const x = c * (1 - Math.abs(((h / 60) % 2) - 1));
+  const m = l - c / 2;
+  let r = 0;
+  let g = 0;
+  let b = 0;
+
+  if (h >= 0 && h < 60) {
+    r = c;
+    g = x;
+    b = 0;
+  } else if (h >= 60 && h < 120) {
+    r = x;
+    g = c;
+    b = 0;
+  } else if (h >= 120 && h < 180) {
+    r = 0;
+    g = c;
+    b = x;
+  } else if (h >= 180 && h < 240) {
+    r = 0;
+    g = x;
+    b = c;
+  } else if (h >= 240 && h < 300) {
+    r = x;
+    g = 0;
+    b = c;
+  } else if (h >= 300 && h < 360) {
+    r = c;
+    g = 0;
+    b = x;
+  }
+  // Having obtained RGB, convert channels to hex
+  let stringR: string = Math.round((r + m) * 255).toString(16);
+  let stringG: string = Math.round((g + m) * 255).toString(16);
+  let stringB: string = Math.round((b + m) * 255).toString(16);
+
+  // Prepend 0s, if necessary
+  if (stringR.length === 1) stringR = `0${stringR}`;
+  if (stringG.length === 1) stringG = `0${stringG}`;
+  if (stringB.length === 1) stringB = `0${stringB}`;
+
+  return `#${stringR}${stringG}${stringB}`;
+}
diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index 48ee551..0ebf009 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -1,58 +1,321 @@
 import { stylingProps } from './index';
-import { applyColor, applyVisibility, ColorType } from '../applyStyle';
-import { StyleType } from '../../store/common/type';
+import {
+  applyColor,
+  applyWeight,
+  applyVisibility,
+  WeightType,
+  ColorType,
+  StyleTypes,
+} from '../applyStyle';
+import {
+  StyleKeyType,
+  ElementNameType,
+  StyleType,
+} from '../../store/common/type';
 
 const SECTION = 'section';
-const FILL = 'fill';
-const ALL = 'all';
+const LABELTEXT = 'labelText';
+const LABELICON = 'labelIcon';
 
-const layers = ['human-made', 'building', 'natural', 'landcover'];
+type LandscapeSubFeature =
+  | 'all'
+  | 'human-made'
+  | 'building'
+  | 'natural'
+  | 'landcover'
+  | 'mountain';
 
-interface applyStyleProps {
-  map: mapboxgl.Map;
-  subFeatureName: string;
-  style: StyleType;
+interface SubDetailType {
+  fill: string[];
+  stroke: string[];
 }
 
-function applyLandscapeStyle({ map, subFeatureName, style }: applyStyleProps) {
-  const layerNames = [`landscape-${subFeatureName}`];
+interface DetailType {
+  section: SubDetailType;
+  labelText: SubDetailType;
+  labelIcon: SubDetailType;
+}
 
-  applyColor({ map, layerNames, type: ColorType.fill, color: style.color });
-  applyVisibility({ map, layerNames, visibility: style.visibility });
-  applyColor({
-    map,
-    layerNames,
-    type: ColorType.fill,
-    color: style.color,
-    lightness: Number(style.lightness),
-  });
-  applyColor({
-    map,
-    layerNames,
-    type: ColorType.fill,
-    color: style.color,
-    saturation: Number(style.saturation),
-  });
+function makeSubDetail(
+  fillLayers: string[],
+  strokeLayers: string[]
+): SubDetailType {
+  return { fill: fillLayers, stroke: strokeLayers };
 }
 
+const humanMadeSectionFill = ['landscape-human-made'];
+const humanMadeSectionStroke = ['pitch-outline'];
+
+const buildingSectionFill = ['landscape-building', 'building'];
+const buildingSectionStroke = ['building-outline'];
+const buildingLabel = ['building-number-label'];
+
+const naturalSectionFill = ['landscape-natural'];
+const naturalLabel = ['natural-point-label'];
+
+const landCoverSectionFill = [
+  'landscape-landcover',
+  'landcover',
+  'landuse',
+  'lang-structure-polygon',
+];
+const landCoverSectionStroke = ['lang-structure-line'];
+
+const mountainCoverSectionFill = ['hillshade'];
+
+const layersByType: { [key in LandscapeSubFeature]: DetailType } = {
+  'human-made': {
+    [SECTION]: makeSubDetail(humanMadeSectionFill, humanMadeSectionStroke),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail([], []),
+  },
+  building: {
+    [SECTION]: makeSubDetail(buildingSectionFill, buildingSectionStroke),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail(buildingLabel, buildingLabel),
+  },
+  natural: {
+    [SECTION]: makeSubDetail(naturalSectionFill, []),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail(naturalLabel, naturalLabel),
+  },
+  landcover: {
+    [SECTION]: makeSubDetail(landCoverSectionFill, landCoverSectionStroke),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail([], []),
+  },
+  mountain: {
+    [SECTION]: makeSubDetail(mountainCoverSectionFill, []),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail([], []),
+  },
+  all: {
+    [SECTION]: makeSubDetail(
+      [
+        ...humanMadeSectionFill,
+        ...buildingSectionFill,
+        ...naturalSectionFill,
+        ...landCoverSectionFill,
+        ...mountainCoverSectionFill,
+      ],
+      [
+        ...humanMadeSectionStroke,
+        ...buildingSectionStroke,
+        ...landCoverSectionStroke,
+      ]
+    ),
+    [LABELTEXT]: makeSubDetail([], []),
+    [LABELICON]: makeSubDetail([], [...buildingLabel, ...naturalLabel]),
+  },
+};
+
+const VISIBLE = 1;
+const INVISIBLE = 0;
+
+const mappingDetailToFunc = {
+  labelText: {
+    fill: {
+      color: {
+        typeName: ColorType.text,
+        funcName: applyColor,
+      },
+      saturation: {
+        typeName: ColorType.text,
+        funcName: applyColor,
+      },
+      lightness: {
+        typeName: ColorType.text,
+        funcName: applyColor,
+      },
+      weight: {
+        typeName: null,
+        funcName: () => null,
+      },
+      visibility: {
+        typeName: 'what is my name?',
+        funcName: applyVisibility,
+      },
+      isChanged: {
+        typeName: null,
+        funcName: () => null,
+      },
+    },
+    stroke: {
+      color: {
+        typeName: ColorType.textHalo,
+        funcName: applyColor,
+      },
+      saturation: {
+        typeName: ColorType.textHalo,
+        funcName: applyColor,
+      },
+      lightness: {
+        typeName: ColorType.textHalo,
+        funcName: applyColor,
+      },
+      weight: {
+        typeName: WeightType.textHalo,
+        funcName: applyWeight,
+      },
+      visibility: {
+        typeName: WeightType.textHalo,
+        funcName: applyWeight,
+      },
+      isChanged: {
+        typeName: null,
+        funcName: () => null,
+      },
+    },
+  },
+  labelIcon: {
+    color: {
+      typeName: null,
+      funcName: () => null,
+    },
+    saturation: {
+      typeName: null,
+      funcName: () => null,
+    },
+    lightness: {
+      typeName: null,
+      funcName: () => null,
+    },
+    weight: {
+      typeName: null,
+      funcName: () => null,
+    },
+    visibility: {
+      typeName: ColorType.icon,
+      funcName: applyWeight,
+    },
+    isChanged: {
+      typeName: null,
+      funcName: () => null,
+    },
+  },
+  section: {
+    fill: {
+      color: {
+        typeName: ColorType.fill,
+        funcName: applyColor,
+      },
+      saturation: {
+        typeName: ColorType.fill,
+        funcName: applyColor,
+      },
+      lightness: {
+        typeName: ColorType.fill,
+        funcName: applyColor,
+      },
+      weight: {
+        typeName: null,
+        funcName: () => null,
+      },
+      visibility: {
+        typeName: ColorType.fill,
+        funcName: applyVisibility,
+      },
+      isChanged: {
+        typeName: null,
+        funcName: () => null,
+      },
+    },
+    stroke: {
+      color: {
+        typeName: ColorType.line,
+        funcName: applyColor,
+      },
+      saturation: {
+        typeName: ColorType.line,
+        funcName: applyColor,
+      },
+      lightness: {
+        typeName: ColorType.line,
+        funcName: applyColor,
+      },
+      weight: {
+        typeName: WeightType.line,
+        funcName: applyWeight,
+      },
+      visibility: {
+        typeName: WeightType.line,
+        funcName: applyVisibility,
+      },
+      isChanged: {
+        typeName: null,
+        funcName: () => null,
+      },
+    },
+  },
+};
+
 function landscapeStyling({
   map,
   subFeatureName,
   detailName,
   subDetailName,
+  key,
   style,
 }: stylingProps): void {
-  if (detailName !== SECTION || subDetailName !== FILL) {
-    return;
-  }
+  let type = null;
+  let func = null;
 
-  if (subFeatureName === ALL) {
-    layers.forEach((item) =>
-      applyLandscapeStyle({ map, subFeatureName: item, style })
-    );
+  if (
+    detailName === ElementNameType.section ||
+    detailName === ElementNameType.labelText
+  ) {
+    const { typeName, funcName } = mappingDetailToFunc[detailName][
+      subDetailName
+    ][key as StyleKeyType];
+    type = typeName;
+    func = funcName;
   } else {
-    applyLandscapeStyle({ map, subFeatureName, style });
+    const { typeName, funcName } = mappingDetailToFunc[detailName][
+      key as StyleKeyType
+    ];
+    type = typeName;
+    func = funcName;
   }
+
+  if (!type) {
+    return;
+  }
+  if (
+    key === 'visibility' &&
+    (type === ColorType.icon || type === WeightType.textHalo)
+  ) {
+    func({
+      map,
+      layerNames:
+        layersByType[subFeatureName as LandscapeSubFeature][detailName][
+          subDetailName
+        ],
+      type,
+      weight: style.visibility === 'none' ? INVISIBLE : VISIBLE,
+    });
+    return;
+  }
+  if (key === 'visibility') {
+    func({
+      map,
+      layerNames:
+        layersByType[subFeatureName as LandscapeSubFeature][detailName][
+          subDetailName
+        ],
+      visibility: style.visibility,
+    });
+  }
+
+  func({
+    map,
+    layerNames:
+      layersByType[subFeatureName as LandscapeSubFeature][detailName][
+        subDetailName
+      ],
+    type: type as StyleTypes,
+    color: style.color,
+    [key]: style[key as StyleKeyType],
+  });
 }
 
 export default landscapeStyling;
diff --git a/src/utils/map-styling/poi.ts b/src/utils/map-styling/poi.ts
index a7acf1f..9f371b2 100644
--- a/src/utils/map-styling/poi.ts
+++ b/src/utils/map-styling/poi.ts
@@ -86,16 +86,12 @@ const mappingDetailToFunc = {
       },
       weight: {
         typeName: null,
-        funcName: () => null,
+        funcName: null,
       },
       visibility: {
         typeName: 'what is my name?',
         funcName: applyVisibility,
       },
-      isChanged: {
-        typeName: null,
-        funcName: () => null,
-      },
     },
     stroke: {
       color: {
@@ -118,37 +114,13 @@ const mappingDetailToFunc = {
         typeName: WeightType.textHalo,
         funcName: applyWeight,
       },
-      isChanged: {
-        typeName: null,
-        funcName: () => null,
-      },
     },
   },
   labelIcon: {
-    color: {
-      typeName: null,
-      funcName: () => null,
-    },
-    saturation: {
-      typeName: null,
-      funcName: () => null,
-    },
-    lightness: {
-      typeName: null,
-      funcName: () => null,
-    },
-    weight: {
-      typeName: null,
-      funcName: () => null,
-    },
     visibility: {
       typeName: ColorType.icon,
       funcName: applyWeight,
     },
-    isChanged: {
-      typeName: null,
-      funcName: () => null,
-    },
   },
 };
 
@@ -164,21 +136,19 @@ function poiStyling({
   let func = null;
 
   if (detailName === ElementNameType.section) return;
-  if (detailName === ElementNameType.labelText) {
+  if (detailName === ElementNameType.labelText && key !== 'isChanged') {
     const { typeName, funcName } = mappingDetailToFunc[detailName][
       subDetailName
-    ][key as StyleKeyType];
+    ][key];
     type = typeName;
     func = funcName;
-  } else {
-    const { typeName, funcName } = mappingDetailToFunc[detailName][
-      key as StyleKeyType
-    ];
+  } else if (detailName === ElementNameType.labelIcon && key === 'visibility') {
+    const { typeName, funcName } = mappingDetailToFunc[detailName][key];
     type = typeName;
     func = funcName;
   }
 
-  if (!type) return;
+  if (!type || !func) return;
   if (
     key === 'visibility' &&
     (type === ColorType.icon || type === WeightType.textHalo)
diff --git a/src/utils/map-styling/road-categories/arterial.ts b/src/utils/map-styling/road-categories/arterial.ts
new file mode 100644
index 0000000..bf9f685
--- /dev/null
+++ b/src/utils/map-styling/road-categories/arterial.ts
@@ -0,0 +1,30 @@
+export const arterialLayerNames = {
+  all: [
+    'road-arterial',
+    'road-number-shield',
+    'road-exit-shield',
+    'road-arterial-label',
+  ],
+  polygon: ['road-arterial-polygon'],
+  line: [
+    'road-arterial',
+    'road-primary',
+    'road-secondary-tertiary',
+    'road-motorway-trunk',
+    'road-minor',
+    'road-minor-low',
+  ],
+  stroke: [
+    'road-primary-case',
+    'road-secondary-tertiary-case',
+    'road-motorway-trunk-case',
+    'road-minor-case',
+    'road-minor-low',
+  ],
+  text: {
+    all: ['road-number-shield', 'road-exit-shield', 'road-arterial-label'],
+    hasStroke: ['road-arterial-label'],
+    noStroke: ['road-number-shield', 'road-exit-shield'],
+  },
+  icon: [],
+};
diff --git a/src/utils/map-styling/road-categories/local.ts b/src/utils/map-styling/road-categories/local.ts
new file mode 100644
index 0000000..617961f
--- /dev/null
+++ b/src/utils/map-styling/road-categories/local.ts
@@ -0,0 +1,12 @@
+export const localLayerNames = {
+  all: ['ferry', 'ferry-auto', 'road-local', 'road-local-label'],
+  polygon: ['road-local-polygon'],
+  line: ['ferry', 'ferry-auto', 'road-local', 'road-street'],
+  stroke: ['road-street-case'],
+  text: {
+    all: ['road-local-label'],
+    hasStroke: ['road-local-label'],
+    noStroke: [],
+  },
+  icon: [],
+};
diff --git a/src/utils/map-styling/road-categories/sidewalk.ts b/src/utils/map-styling/road-categories/sidewalk.ts
new file mode 100644
index 0000000..6137a5a
--- /dev/null
+++ b/src/utils/map-styling/road-categories/sidewalk.ts
@@ -0,0 +1,16 @@
+export const sidewalkLayerNames = {
+  all: ['road-footway', 'road-sidewalk-label'],
+  polygon: [
+    'road-pedestrian-polygon-fill',
+    'road-pedestrian-polygon-pattern',
+    'road-sidewalk-polygon',
+  ],
+  line: ['road-footway', 'road-pedestrian', 'road-steps', 'road-path'],
+  stroke: ['road-pedestrian-case'],
+  text: {
+    all: ['road-sidewalk-label'],
+    hasStroke: ['road-sidewalk-label'],
+    noStroke: [],
+  },
+  icon: [],
+};
diff --git a/src/utils/map-styling/road-categories/stylingCategory.ts b/src/utils/map-styling/road-categories/stylingCategory.ts
new file mode 100644
index 0000000..5e6b4f0
--- /dev/null
+++ b/src/utils/map-styling/road-categories/stylingCategory.ts
@@ -0,0 +1,158 @@
+import {
+  applyVisibility,
+  applyColor,
+  applyWeight,
+  ColorType,
+  WeightType,
+} from '../../applyStyle';
+import mapboxgl from 'mapbox-gl';
+import {
+  ElementNameType,
+  SubElementNameType,
+  StyleKeyType,
+  StyleType,
+} from '../../../store/common/type';
+
+export interface layerProps {
+  all: string[];
+  polygon: string[];
+  line: string[];
+  stroke: string[];
+  text: {
+    all: string[];
+    hasStroke: string[];
+    noStroke: string[];
+  };
+  icon: string[];
+}
+
+export interface catergoryStylingProps {
+  map: mapboxgl.Map;
+  subFeatureName: string;
+  detailName: ElementNameType;
+  subDetailName: SubElementNameType;
+  key: StyleKeyType;
+  style: StyleType;
+  layerNames: layerProps;
+}
+
+function stylingCategory({
+  layerNames,
+  map,
+  subFeatureName,
+  detailName,
+  subDetailName,
+  key,
+  style,
+}: catergoryStylingProps): void {
+  const { visibility, color, weight } = style;
+
+  if (key === 'visibility') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyVisibility({
+          map,
+          layerNames: layerNames.line,
+          visibility,
+        });
+        applyVisibility({
+          map,
+          layerNames: layerNames.polygon,
+          visibility,
+        });
+      } else if (subDetailName === SubElementNameType.stroke)
+        applyVisibility({
+          map,
+          layerNames: layerNames.stroke,
+          visibility,
+        });
+    } else if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.fill)
+        applyVisibility({
+          map,
+          layerNames: layerNames.text.noStroke,
+          visibility,
+        });
+      else if (subDetailName === SubElementNameType.stroke)
+        applyVisibility({
+          map,
+          layerNames: layerNames.text.hasStroke,
+          visibility,
+        });
+    }
+  } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyColor({
+          map,
+          layerNames: layerNames.line,
+          color,
+          type: ColorType.line,
+          [key]: style[key as StyleKeyType],
+        });
+        applyColor({
+          map,
+          layerNames: layerNames.polygon,
+          color,
+          type: ColorType.fill,
+          [key]: style[key as StyleKeyType],
+        });
+      } else if (subDetailName === SubElementNameType.stroke) {
+        applyColor({
+          map,
+          layerNames: layerNames.stroke,
+          color,
+          type: ColorType.line,
+          [key]: style[key as StyleKeyType],
+        });
+      }
+    } else if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyColor({
+          map,
+          layerNames: layerNames.text.all,
+          color,
+          type: ColorType.text,
+          [key]: style[key as StyleKeyType],
+        });
+      } else if (subDetailName === SubElementNameType.stroke) {
+        applyColor({
+          map,
+          layerNames: layerNames.text.hasStroke,
+          color,
+          type: ColorType.textHalo,
+          [key]: style[key as StyleKeyType],
+        });
+      }
+    }
+  } else if (key === 'weight') {
+    if (detailName === ElementNameType.section) {
+      if (subDetailName === SubElementNameType.fill) {
+        applyWeight({
+          map,
+          layerNames: layerNames.line,
+          type: WeightType.line,
+          weight,
+        });
+      } else if (subDetailName === SubElementNameType.stroke) {
+        applyWeight({
+          map,
+          layerNames: layerNames.stroke,
+          type: WeightType.line,
+          weight,
+        });
+      }
+    }
+    if (detailName === ElementNameType.labelText) {
+      if (subDetailName === SubElementNameType.stroke)
+        applyWeight({
+          map,
+          layerNames: layerNames.text.hasStroke,
+          type: WeightType.textHalo,
+          weight,
+        });
+    }
+  }
+}
+
+export default stylingCategory;
diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
index aaf310a..578e815 100644
--- a/src/utils/map-styling/road.ts
+++ b/src/utils/map-styling/road.ts
@@ -1,12 +1,8 @@
 import { stylingProps } from '.';
-import {
-  applyVisibility,
-  applyColor,
-  applyWeight,
-  ColorType,
-  WeightType,
-} from '../applyStyle';
-import { StyleKeyType } from '../../store/common/type';
+import { arterialLayerNames } from './road-categories/arterial';
+import { localLayerNames } from './road-categories/local';
+import { sidewalkLayerNames } from './road-categories/sidewalk';
+import stylingCategory from './road-categories/stylingCategory';
 
 function roadStyling({
   map,
@@ -16,110 +12,24 @@ function roadStyling({
   key,
   style,
 }: stylingProps): void {
-  const { visibility, color, weight } = style;
-  const arterialLayerNames = [
-    'road-number-shield',
-    'road-exit-shield',
-    'road-label',
-    'road-arterial',
-  ];
-  const localLayerNames = ['ferry', 'ferry-auto', 'road-local'];
-  const sidewalkLayerNames = ['road-footway'];
+  type RoadSubFeatureType = 'arterial' | 'local' | 'sidewalk';
 
-  if (subFeatureName === 'arterial') {
-    if (
-      detailName === 'section' &&
-      subDetailName === 'fill' &&
-      key === 'visibility'
-    ) {
-      applyVisibility({ map, layerNames: arterialLayerNames, visibility });
-    } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
-      if (detailName === 'section' && subDetailName === 'fill') {
-        applyColor({
-          map,
-          layerNames: ['road-arterial'],
-          color,
-          type: ColorType.line,
-          [key]: style[key as StyleKeyType],
-        });
-      } else if (detailName === 'labelText' && subDetailName === 'fill') {
-        applyColor({
-          map,
-          layerNames: ['road-number-shield', 'road-exit-shield', 'road-label'],
-          color,
-          type: ColorType.text,
-          [key]: style[key as StyleKeyType],
-        });
-      } else if (detailName === 'labelText' && subDetailName === 'stroke') {
-        applyColor({
-          map,
-          layerNames: ['road-label'],
-          color,
-          type: ColorType.textHalo,
-          [key]: style[key as StyleKeyType],
-        });
-      }
-    } else if (key === 'weight') {
-      if (detailName === 'section' && subDetailName === 'fill') {
-        applyWeight({
-          map,
-          layerNames: ['road-arterial'],
-          type: WeightType.line,
-          weight,
-        });
-      }
-      if (detailName === 'labelText' && subDetailName === 'stroke')
-        applyWeight({
-          map,
-          layerNames: ['road-label'],
-          type: ColorType.textHalo,
-          weight,
-        });
-    }
-  } else if (subFeatureName === 'local') {
-    if (key === 'visibility')
-      applyVisibility({ map, layerNames: localLayerNames, visibility });
-    else if (key === 'color' || key === 'saturation' || key === 'lightness') {
-      if (detailName === 'section' && subDetailName === 'fill') {
-        applyColor({
-          map,
-          layerNames: ['ferry', 'ferry-auto', 'road-local'],
-          color,
-          type: ColorType.line,
-          [key]: style[key as StyleKeyType],
-        });
-      }
-    } else if (key === 'weight') {
-      if (detailName === 'section' && subDetailName === 'fill')
-        applyWeight({
-          map,
-          layerNames: ['ferry', 'ferry-auto', 'road-local'],
-          type: WeightType.line,
-          weight,
-        });
-    }
-  } else if (subFeatureName === 'sidewalk') {
-    if (key === 'visibility')
-      applyVisibility({ map, layerNames: sidewalkLayerNames, visibility });
-    else if (key === 'weight') {
-      if (detailName === 'section' && subDetailName === 'fill')
-        applyWeight({
-          map,
-          layerNames: sidewalkLayerNames,
-          type: WeightType.line,
-          weight,
-        });
-    } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
-      if (detailName === 'section' && subDetailName === 'fill')
-        applyColor({
-          map,
-          layerNames: sidewalkLayerNames,
-          color,
-          type: ColorType.line,
-          [key]: style[key as StyleKeyType],
-        });
-    }
-  }
+  const mappingSubFeatureLayerNames = {
+    arterial: arterialLayerNames,
+    local: localLayerNames,
+    sidewalk: sidewalkLayerNames,
+  };
+
+  stylingCategory({
+    layerNames:
+      mappingSubFeatureLayerNames[subFeatureName as RoadSubFeatureType],
+    map,
+    subFeatureName,
+    detailName,
+    subDetailName,
+    key,
+    style,
+  });
 }
 
 export default roadStyling;
diff --git a/src/utils/map-styling/transit.ts b/src/utils/map-styling/transit.ts
index 6f84c12..c0e9cd9 100644
--- a/src/utils/map-styling/transit.ts
+++ b/src/utils/map-styling/transit.ts
@@ -1,6 +1,7 @@
 /* eslint-disable no-nested-ternary */
 /* eslint-disable no-case-declarations */
 import { stylingProps } from '.';
+
 import {
   StyleKeyType,
   ElementNameType,
@@ -15,23 +16,17 @@ import {
   StyleTypes,
 } from '../../utils/applyStyle';
 
-const AirportLayerNames = [
-  'airport-label',
-  'aeroway-polygon',
-  'transit-airport',
-  'aeroway-line',
+const PolygonLayers = [
+  'mapbox-airport-aeroway-polygon',
+  'mapbox-airport-polygon',
 ];
-const BusLayerNames = ['transit-bus-label'];
-const RailLayerNames = ['transit-rail'];
-const SubwayLayerNames = ['transit-subway', 'transit-subway-label'];
-
-const AllLayerTypeKeys = [
-  ...AirportLayerNames,
-  ...BusLayerNames,
-  ...RailLayerNames,
-  ...SubwayLayerNames,
-  'transit-label',
+const LineLayers = [
+  'mapbox-airport-aeroway-line',
+  'transit-subway-line',
+  'transit-rail-line',
+  'mapbox-rail-road-line',
 ];
+const LabelLayers = ['mapbox-airport-label', 'transit-bus-label'];
 
 function transitStyling({
   map,
@@ -41,71 +36,37 @@ function transitStyling({
   subDetailName,
   style,
 }: stylingProps): void {
-  let layers: string[];
-  switch (subFeatureName) {
-    case 'all':
-      layers = [...AllLayerTypeKeys];
-      break;
-    case 'subway':
-      layers = [...SubwayLayerNames];
-      break;
-    case 'bus':
-      layers = [...BusLayerNames];
-      break;
-    case 'airport':
-      layers = [...AirportLayerNames];
-      break;
-    case 'rail':
-      layers = [...RailLayerNames];
-      break;
-    default:
-      return;
-  }
+  // TODO: labelIcon 관련 구현
+  if (detailName === ElementNameType.labelIcon) return;
 
-  let layersByDetailName: string[];
-  let styleType: StyleTypes;
+  let layerNames: string[] =
+    subDetailName === SubElementNameType.fill
+      ? key === StyleKeyType.weight
+        ? []
+        : detailName === ElementNameType.labelText
+        ? [...LabelLayers]
+        : [...PolygonLayers]
+      : detailName === ElementNameType.labelText
+      ? [...LabelLayers]
+      : [...LineLayers];
 
-  switch (detailName) {
-    case ElementNameType.section:
-      layersByDetailName = layers.filter((layer) => !layer.includes('label'));
-      styleType =
-        subDetailName === SubElementNameType.stroke
-          ? key === StyleKeyType.weight
-            ? WeightType.line
-            : ColorType.line
-          : ColorType.fill;
-
-      break;
-    case ElementNameType.labelText:
-      layersByDetailName = layers.filter((layer) => layer.includes('label'));
-      styleType =
-        subDetailName === SubElementNameType.stroke
-          ? key === StyleKeyType.weight
-            ? WeightType.textHalo
-            : ColorType.textHalo
-          : ColorType.text;
-      break;
-    case ElementNameType.labelIcon:
-      layersByDetailName = layers.filter((layer) => !layer.includes('label'));
-      styleType =
-        subDetailName === SubElementNameType.stroke
-          ? ColorType.line
-          : ColorType.fill;
-      break;
+  layerNames =
+    subFeatureName === 'all'
+      ? layerNames
+      : layerNames.filter((layer) => layer.includes(subFeatureName));
 
-    default:
-      return;
-  }
+  if (layerNames.length === 0) return;
 
-  const styleKey: StyleKeyType = key as StyleKeyType;
-  const { [styleKey]: value } = style;
+  const styleKey = key as StyleKeyType;
+  const { [styleKey]: styleValue } = style;
+  let styleType: StyleTypes;
 
   switch (styleKey) {
     case StyleKeyType.visibility:
       applyVisibility({
         map,
-        layerNames: layersByDetailName,
-        visibility: value as string,
+        layerNames,
+        visibility: styleValue as string,
       });
       break;
 
@@ -116,6 +77,15 @@ function transitStyling({
       const satKey = StyleKeyType.saturation;
       const ligKey = StyleKeyType.lightness;
 
+      styleType =
+        detailName === ElementNameType.labelText
+          ? subDetailName === SubElementNameType.fill
+            ? ColorType.text
+            : ColorType.textHalo
+          : subDetailName === SubElementNameType.fill
+          ? ColorType.fill
+          : ColorType.line;
+
       const satureOrLight =
         key === 'saturation'
           ? { saturation: +style[satKey] }
@@ -124,7 +94,7 @@ function transitStyling({
           : {};
       applyColor({
         map,
-        layerNames: layersByDetailName,
+        layerNames,
         type: styleType,
         color: style[colorKey],
         ...satureOrLight,
@@ -132,14 +102,16 @@ function transitStyling({
       break;
 
     case StyleKeyType.weight:
-      if (subDetailName !== 'fill') {
-        applyWeight({
-          map,
-          layerNames: layersByDetailName,
-          type: styleType as WeightType,
-          weight: value as number,
-        });
-      }
+      styleType =
+        detailName === ElementNameType.labelText
+          ? WeightType.textHalo
+          : WeightType.line;
+      applyWeight({
+        map,
+        layerNames,
+        type: styleType,
+        weight: styleValue as number,
+      });
 
       break;
 
diff --git a/src/utils/rendering-data/featureTypeData.ts b/src/utils/rendering-data/featureTypeData.ts
index fb7a5d5..7e6a4f7 100644
--- a/src/utils/rendering-data/featureTypeData.ts
+++ b/src/utils/rendering-data/featureTypeData.ts
@@ -30,7 +30,6 @@ const data: DataType[] = [
     typeKey: FeatureNameType.road,
     typeName: '도로',
     features: [
-      { key: 'highway', name: '고속도로' },
       { key: 'arterial', name: '주요도로' },
       { key: 'local', name: '일반도로' },
       { key: 'sidewalk', name: '인도' },
diff --git a/src/utils/rendering-data/layerColor3.ts b/src/utils/rendering-data/layerColor3.ts
new file mode 100644
index 0000000..89aba20
--- /dev/null
+++ b/src/utils/rendering-data/layerColor3.ts
@@ -0,0 +1,98 @@
+export default {
+  'poi-attraction': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-arts-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-landmark-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-business': { color: 'hsl(22, 55%, 55%)', type: 'text' },
+  'poi-food-label': { color: 'hsl(22, 55%, 55%)', type: 'text' },
+  'poi-store-label': { color: 'hsl(22, 55%, 55%)', type: 'text' },
+  'poi-government': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-public-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-general-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-medical': { color: 'hsl(340, 39%, 42%)', type: 'text' },
+  'poi-medical-label': { color: 'hsl(340, 39%, 42%)', type: 'text' },
+  'poi-park': { color: 'hsl(100, 45%, 37%)', type: 'text' },
+  'poi-park-label': { color: 'hsl(100, 45%, 37%)', type: 'text' },
+  'poi-worship': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-religion-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-school': { color: 'hsl(51, 40%, 40%)', type: 'text' },
+  'poi-education-label': { color: 'hsl(51, 40%, 40%)', type: 'text' },
+  'poi-sport-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-etc': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-industrial-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-historic-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-building-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'admin-0-boundary': { color: 'hsl(230, 8%, 51%)', type: 'line' },
+  'admin-0-boundary-bg': { color: 'hsl(230, 8%, 51%)', type: 'line' },
+  'admin-0-boundary-disputed': { color: 'hsl(230, 8%, 51%)', type: 'line' },
+  'country-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  'admin-1-boundary-bg': { color: 'hsl(230, 14%, 77%)', type: 'line' },
+  'admin-1-boundary': { color: 'hsl(230, 14%, 77%)', type: 'line' },
+  'state-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  'settlement-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  'settlement-subdivision-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  water: { color: 'hsl(205, 87%, 76%)', type: 'fill' },
+  'water-polygon': { color: 'hsl(205, 87%, 76%)', type: 'fill' },
+  'water-line-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'water-point-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'waterway-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'mapbox-airport-aeroway-polygon': {
+    color: 'hsl(234, 20%, 30%)',
+    type: 'fill',
+  },
+  'mapbox-airport-polygon': { color: 'hsl(234, 20%, 30%)', type: 'fill' },
+  'mapbox-airport-aeroway-line': { color: 'hsl(230, 23%, 82%)', type: 'line' },
+  'mapbox-airport-label': { color: 'hsl(0, 69%, 50%)', type: 'text' },
+  'transit-bus-label': { color: 'hsl(13, 68%, 63%)', type: 'text' },
+  'mapbox-rail-road-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
+  'transit-rail-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
+  'transit-subway-line': { color: 'hsl(192, 70%, 43%)', type: 'line' },
+  'road-arterial': 'hsl(0, 0%, 100%)',
+  'road-arterial-polygon': { color: 'hsl(0, 0%, 100%)', type: 'fill' },
+  'road-primary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-secondary-teritary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-motorway-trunk': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-minor': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-minor-low': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-primary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-secondary-teritary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-motorway-trunk-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-minor-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-number-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
+  'road-exit-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
+  'road-arterial-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
+  //
+  'road-local-polygon': { color: 'hsl(35, 14%, 93%)', type: 'fill' },
+  ferry: 'hsl(230, 48%, 44%)',
+  'ferry-auto': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  'road-local': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  'road-street': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  'road-street-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-local-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
+  //
+  'road-pedestrian-polygon-fill': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
+  'road-pedestrian-polygon-pattern': {
+    color: 'hsl(35, 10%, 83%)',
+    type: 'fill',
+  },
+  'road-sidewalk-polygon': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
+  'road-footway': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-pedestrian': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-steps': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-path': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-pedestrian-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-sidewalk-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
+  'landscape-human-made': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  'pitch-outline': { color: 'hsl(75, 57%, 84%)', type: 'fill' },
+  'landscape-building': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  building: { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  'building-outline': { color: 'hsl(35, 6%, 79%)', type: 'line' },
+  'building-number-label': { color: 'hsl(35, 2%, 69%)', type: 'text' },
+  'landscape-natural': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  'natural-point-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'landscape-landcover': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  landcover: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  landuse: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  'land-structure-polygon': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  'land-structure-line': { color: 'hsl(35, 12%, 89%)', type: 'line' },
+  hillshade: { color: 'hsl(56, 59%, 22%)', type: 'fill' },
+};
diff --git a/src/utils/rendering-data/layersColor.ts b/src/utils/rendering-data/layersColor.ts
index 74b4e41..0e23150 100644
--- a/src/utils/rendering-data/layersColor.ts
+++ b/src/utils/rendering-data/layersColor.ts
@@ -1,12 +1,11 @@
 import { PropertyType } from '../../store/common/type';
 
-const data: PropertyType = {
+const layersColor: PropertyType = {
   poi: {
     all: {
-      // 임시
       labelText: {
-        fill: 'hsl(26, 25%, 32%)',
-        stroke: 'hsl(0, 0%, 100%)',
+        fill: 'transparent',
+        stroke: 'transparent',
       },
       labelIcon: 'transparent',
     },
@@ -74,55 +73,44 @@ const data: PropertyType = {
       labelIcon: 'transparent',
     },
   },
-  // 임시
   road: {
     all: {
       section: {
         fill: 'transparent',
-        stroke: 'hsl(230, 8%, 51%)',
+        stroke: 'transparent',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
-      },
-    },
-    highway: {
-      section: {
         fill: 'transparent',
-        stroke: 'hsl(230, 8%, 51%)',
-      },
-      labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+        stroke: 'transparent',
       },
     },
     arterial: {
       section: {
-        fill: 'transparent',
-        stroke: 'hsl(230, 8%, 51%)',
+        fill: 'hsl(0, 0%, 100%)',
+        stroke: 'hsl(230, 24%, 87%)',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
+        fill: 'hsl(230, 48%, 44%)',
         stroke: 'hsl(0, 0%, 100%)',
       },
     },
     local: {
       section: {
-        fill: 'transparent',
-        stroke: 'hsl(230, 8%, 51%)',
+        fill: 'hsl(35, 14%, 93%)',
+        stroke: 'hsl(230, 24%, 87%)',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
+        fill: 'hsl(230, 48%, 44%)',
         stroke: 'hsl(0, 0%, 100%)',
       },
     },
     sidewalk: {
       section: {
-        fill: 'transparent',
-        stroke: 'hsl(230, 8%, 51%)',
+        fill: 'hsl(0, 0%, 100%)',
+        stroke: 'hsl(230, 24%, 87%)',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
+        fill: 'hsl(230, 48%, 44%)',
         stroke: 'hsl(0, 0%, 100%)',
       },
     },
@@ -131,11 +119,11 @@ const data: PropertyType = {
     all: {
       section: {
         fill: 'transparent',
-        stroke: 'hsl(230, 8%, 51%)',
+        stroke: 'transparent',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+        fill: 'transparent',
+        stroke: 'transparent',
       },
     },
     country: {
@@ -165,7 +153,6 @@ const data: PropertyType = {
       },
     },
   },
-  // 임시
   landscape: {
     all: {
       section: {
@@ -173,58 +160,58 @@ const data: PropertyType = {
         stroke: 'transparent',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+        fill: 'transparent',
+        stroke: 'transparent',
       },
     },
     'human-made': {
       section: {
-        fill: 'transparent',
-        stroke: 'transparent',
+        fill: 'hsl(35, 11%, 86%)',
+        stroke: 'hsl(75, 57%, 84%)',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+        fill: 'transparent',
+        stroke: 'transparent',
       },
     },
     building: {
       section: {
-        fill: 'transparent',
-        stroke: 'transparent',
+        fill: 'hsl(35, 11%, 86%)',
+        stroke: 'hsl(35, 6%, 79%)',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
+        fill: 'hsl(35, 2%, 69%)',
         stroke: 'hsl(0, 0%, 100%)',
       },
     },
     natural: {
       section: {
-        fill: 'transparent',
+        fill: 'hsl(75, 62%, 81%)',
         stroke: 'transparent',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
+        fill: 'hsl(26, 25%, 32%)',
         stroke: 'hsl(0, 0%, 100%)',
       },
     },
     landcover: {
       section: {
-        fill: 'transparent',
-        stroke: 'transparent',
+        fill: 'hsl(75, 62%, 81%)',
+        stroke: 'hsl(35, 12%, 89%)',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+        fill: 'transparent',
+        stroke: 'transparent',
       },
     },
     mountain: {
       section: {
-        fill: 'transparent',
+        fill: 'hsl(56, 59%, 22%)',
         stroke: 'transparent',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+        fill: 'transparent',
+        stroke: 'transparent',
       },
     },
   },
@@ -235,17 +222,17 @@ const data: PropertyType = {
         stroke: 'transparent',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+        fill: 'transparent',
+        stroke: 'transparent',
       },
     },
     airport: {
       section: {
-        fill: 'transparent',
-        stroke: 'transparent',
+        fill: 'hsl(234, 20%, 30%)',
+        stroke: 'hsl(230, 23%, 82%)',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
+        fill: 'hsl(0, 69%, 50%)',
         stroke: 'hsl(0, 0%, 100%)',
       },
     },
@@ -255,28 +242,28 @@ const data: PropertyType = {
         stroke: 'transparent',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
+        fill: 'hsl(13, 68%, 63%)',
         stroke: 'hsl(0, 0%, 100%)',
       },
     },
     rail: {
       section: {
-        fill: 'transparent',
+        fill: 'hsl(234, 20%, 30%)',
         stroke: 'transparent',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+        fill: 'transparent',
+        stroke: 'transparent',
       },
     },
     subway: {
       section: {
-        fill: 'transparent',
+        fill: 'hsl(192, 70%, 43%)',
         stroke: 'transparent',
       },
       labelText: {
-        fill: 'hsl(0, 0%, 0%)',
-        stroke: 'hsl(0, 0%, 100%)',
+        fill: 'transparent',
+        stroke: 'transparent',
       },
     },
   },
@@ -302,4 +289,4 @@ const data: PropertyType = {
   },
 };
 
-export default data;
+export default layersColor;

From 9d2742448d873dddf3ecf3878d14b8f4b76a6918 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 11:27:43 +0900
Subject: [PATCH 106/138] =?UTF-8?q?[fix]=20=ED=83=80=EC=9E=85=20=EC=9D=B4?=
 =?UTF-8?q?=EC=8A=88=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 타입 선언해서 문제 해결
---
 src/store/map/initializeMap.ts             |  11 ++-
 src/utils/rendering-data/initLayerColor.ts | 106 +++++++++++++++++++++
 src/utils/rendering-data/layerColor3.ts    |  98 -------------------
 3 files changed, 112 insertions(+), 103 deletions(-)
 create mode 100644 src/utils/rendering-data/initLayerColor.ts
 delete mode 100644 src/utils/rendering-data/layerColor3.ts

diff --git a/src/store/map/initializeMap.ts b/src/store/map/initializeMap.ts
index b5ad4b5..025c492 100644
--- a/src/store/map/initializeMap.ts
+++ b/src/store/map/initializeMap.ts
@@ -10,7 +10,7 @@ import landscape from './layers/landscape';
 import water from './layers/water';
 import mapboxPOI from './layers/mapbox-poi';
 
-import initColor from '../../utils/rendering-data/layerColor3';
+import initLayersColor from '../../utils/rendering-data/initLayerColor';
 
 const LNG = 126.978;
 const LAT = 37.5656;
@@ -68,9 +68,10 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
 
   map.on('load', () => {
     translate(map);
-    map.removeLayer('poi-label');
-    map.removeLayer('road-label');
-    map.removeLayer('road-polygon');
+    const removalLayers: string[] = ['poi-label', 'road-label', 'road-polygon'];
+    removalLayers.forEach((element) => {
+      map.removeLayer(element);
+    });
 
     map.addSource(Sources.polygon, {
       type: 'vector',
@@ -95,7 +96,7 @@ function initializeMap({ mapRef }: InitializeMapProps): mapboxgl.Map {
     ] as mapboxgl.Layer[];
     layers.forEach((layer: mapboxgl.Layer) => map.addLayer(layer));
 
-    Object.entries(initColor).forEach(([key, value]) => {
+    Object.entries(initLayersColor).forEach(([key, value]) => {
       map.setPaintProperty(key, `${value.type}-color`, value.color);
     });
   });
diff --git a/src/utils/rendering-data/initLayerColor.ts b/src/utils/rendering-data/initLayerColor.ts
new file mode 100644
index 0000000..36bb800
--- /dev/null
+++ b/src/utils/rendering-data/initLayerColor.ts
@@ -0,0 +1,106 @@
+interface InitLayerColor {
+  [name: string]: {
+    color: string;
+    type: string;
+  };
+}
+
+const initLayerColor: InitLayerColor = {
+  'poi-attraction': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-arts-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-landmark-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-business': { color: 'hsl(22, 55%, 55%)', type: 'text' },
+  'poi-food-label': { color: 'hsl(22, 55%, 55%)', type: 'text' },
+  'poi-store-label': { color: 'hsl(22, 55%, 55%)', type: 'text' },
+  'poi-government': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-public-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-general-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-medical': { color: 'hsl(340, 39%, 42%)', type: 'text' },
+  'poi-medical-label': { color: 'hsl(340, 39%, 42%)', type: 'text' },
+  'poi-park': { color: 'hsl(100, 45%, 37%)', type: 'text' },
+  'poi-park-label': { color: 'hsl(100, 45%, 37%)', type: 'text' },
+  'poi-worship': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-religion-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-school': { color: 'hsl(51, 40%, 40%)', type: 'text' },
+  'poi-education-label': { color: 'hsl(51, 40%, 40%)', type: 'text' },
+  'poi-sport-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-etc': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-industrial-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-historic-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'poi-building-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'admin-0-boundary': { color: 'hsl(230, 8%, 51%)', type: 'line' },
+  'admin-0-boundary-bg': { color: 'hsl(230, 8%, 51%)', type: 'line' },
+  'admin-0-boundary-disputed': { color: 'hsl(230, 8%, 51%)', type: 'line' },
+  'country-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  'admin-1-boundary-bg': { color: 'hsl(230, 14%, 77%)', type: 'line' },
+  'admin-1-boundary': { color: 'hsl(230, 14%, 77%)', type: 'line' },
+  'state-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  'settlement-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  'settlement-subdivision-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
+  water: { color: 'hsl(205, 87%, 76%)', type: 'fill' },
+  'water-polygon': { color: 'hsl(205, 87%, 76%)', type: 'fill' },
+  'water-line-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'water-point-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'waterway-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  //
+  'mapbox-airport-aeroway-polygon': {
+    color: 'hsl(234, 20%, 30%)',
+    type: 'fill',
+  },
+  // 'mapbox-airport-polygon': { color: 'hsl(234, 20%, 30%)', type: 'fill' },
+  // 'mapbox-airport-aeroway-line': { color: 'hsl(230, 23%, 82%)', type: 'line' },
+  // 'mapbox-airport-label': { color: 'hsl(0, 69%, 50%)', type: 'text' },
+  // 'transit-bus-label': { color: 'hsl(13, 68%, 63%)', type: 'text' },
+  // 'mapbox-rail-road-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
+  // 'transit-rail-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
+  // 'transit-subway-line': { color: 'hsl(192, 70%, 43%)', type: 'line' },
+  // 'road-arterial': { color: 'hsl(0, 0%, 100%)', type: 'fill' },
+  // 'road-arterial-polygon': { color: 'hsl(0, 0%, 100%)', type: 'fill' },
+  // 'road-primary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  // 'road-secondary-teritary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  // 'road-motorway-trunk': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  // 'road-minor': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  // 'road-minor-low': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  // 'road-primary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  // 'road-secondary-teritary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  // 'road-motorway-trunk-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  // 'road-minor-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  // 'road-number-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
+  // 'road-exit-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
+  // 'road-arterial-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
+  // 'road-local-polygon': { color: 'hsl(35, 14%, 93%)', type: 'fill' },
+  // ferry: { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  // 'ferry-auto': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  // 'road-local': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  // 'road-street': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  // 'road-street-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  // 'road-local-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
+  // 'road-pedestrian-polygon-fill': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
+  // 'road-pedestrian-polygon-pattern': {
+  //   color: 'hsl(35, 10%, 83%)',
+  //   type: 'fill',
+  // },
+  // 'road-sidewalk-polygon': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
+  // 'road-footway': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  // 'road-pedestrian': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  // 'road-steps': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  // 'road-path': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  // 'road-pedestrian-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  // 'road-sidewalk-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
+  // 'landscape-human-made': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  // 'pitch-outline': { color: 'hsl(75, 57%, 84%)', type: 'fill' },
+  // 'landscape-building': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  // building: { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  // 'building-outline': { color: 'hsl(35, 6%, 79%)', type: 'line' },
+  // 'building-number-label': { color: 'hsl(35, 2%, 69%)', type: 'text' },
+  // 'landscape-natural': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  // 'natural-point-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  // 'landscape-landcover': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  // landcover: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  // landuse: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  // 'land-structure-polygon': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  // 'land-structure-line': { color: 'hsl(35, 12%, 89%)', type: 'line' },
+  // hillshade: { color: 'hsl(56, 59%, 22%)', type: 'fill' },
+};
+
+export default initLayerColor;
diff --git a/src/utils/rendering-data/layerColor3.ts b/src/utils/rendering-data/layerColor3.ts
deleted file mode 100644
index 89aba20..0000000
--- a/src/utils/rendering-data/layerColor3.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-export default {
-  'poi-attraction': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-arts-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-landmark-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-business': { color: 'hsl(22, 55%, 55%)', type: 'text' },
-  'poi-food-label': { color: 'hsl(22, 55%, 55%)', type: 'text' },
-  'poi-store-label': { color: 'hsl(22, 55%, 55%)', type: 'text' },
-  'poi-government': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-public-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-general-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-medical': { color: 'hsl(340, 39%, 42%)', type: 'text' },
-  'poi-medical-label': { color: 'hsl(340, 39%, 42%)', type: 'text' },
-  'poi-park': { color: 'hsl(100, 45%, 37%)', type: 'text' },
-  'poi-park-label': { color: 'hsl(100, 45%, 37%)', type: 'text' },
-  'poi-worship': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-religion-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-school': { color: 'hsl(51, 40%, 40%)', type: 'text' },
-  'poi-education-label': { color: 'hsl(51, 40%, 40%)', type: 'text' },
-  'poi-sport-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-etc': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-industrial-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-historic-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'poi-building-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'admin-0-boundary': { color: 'hsl(230, 8%, 51%)', type: 'line' },
-  'admin-0-boundary-bg': { color: 'hsl(230, 8%, 51%)', type: 'line' },
-  'admin-0-boundary-disputed': { color: 'hsl(230, 8%, 51%)', type: 'line' },
-  'country-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
-  'admin-1-boundary-bg': { color: 'hsl(230, 14%, 77%)', type: 'line' },
-  'admin-1-boundary': { color: 'hsl(230, 14%, 77%)', type: 'line' },
-  'state-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
-  'settlement-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
-  'settlement-subdivision-label': { color: 'hsl(0, 0%, 0%)', type: 'text' },
-  water: { color: 'hsl(205, 87%, 76%)', type: 'fill' },
-  'water-polygon': { color: 'hsl(205, 87%, 76%)', type: 'fill' },
-  'water-line-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
-  'water-point-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
-  'waterway-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
-  'mapbox-airport-aeroway-polygon': {
-    color: 'hsl(234, 20%, 30%)',
-    type: 'fill',
-  },
-  'mapbox-airport-polygon': { color: 'hsl(234, 20%, 30%)', type: 'fill' },
-  'mapbox-airport-aeroway-line': { color: 'hsl(230, 23%, 82%)', type: 'line' },
-  'mapbox-airport-label': { color: 'hsl(0, 69%, 50%)', type: 'text' },
-  'transit-bus-label': { color: 'hsl(13, 68%, 63%)', type: 'text' },
-  'mapbox-rail-road-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
-  'transit-rail-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
-  'transit-subway-line': { color: 'hsl(192, 70%, 43%)', type: 'line' },
-  'road-arterial': 'hsl(0, 0%, 100%)',
-  'road-arterial-polygon': { color: 'hsl(0, 0%, 100%)', type: 'fill' },
-  'road-primary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
-  'road-secondary-teritary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
-  'road-motorway-trunk': { color: 'hsl(0, 0%, 100%)', type: 'line' },
-  'road-minor': { color: 'hsl(0, 0%, 100%)', type: 'line' },
-  'road-minor-low': { color: 'hsl(0, 0%, 100%)', type: 'line' },
-  'road-primary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  'road-secondary-teritary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  'road-motorway-trunk-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  'road-minor-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  'road-number-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
-  'road-exit-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
-  'road-arterial-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
-  //
-  'road-local-polygon': { color: 'hsl(35, 14%, 93%)', type: 'fill' },
-  ferry: 'hsl(230, 48%, 44%)',
-  'ferry-auto': { color: 'hsl(35, 14%, 93%)', type: 'line' },
-  'road-local': { color: 'hsl(35, 14%, 93%)', type: 'line' },
-  'road-street': { color: 'hsl(35, 14%, 93%)', type: 'line' },
-  'road-street-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  'road-local-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
-  //
-  'road-pedestrian-polygon-fill': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
-  'road-pedestrian-polygon-pattern': {
-    color: 'hsl(35, 10%, 83%)',
-    type: 'fill',
-  },
-  'road-sidewalk-polygon': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
-  'road-footway': { color: 'hsl(35, 10%, 83%)', type: 'line' },
-  'road-pedestrian': { color: 'hsl(35, 10%, 83%)', type: 'line' },
-  'road-steps': { color: 'hsl(35, 10%, 83%)', type: 'line' },
-  'road-path': { color: 'hsl(35, 10%, 83%)', type: 'line' },
-  'road-pedestrian-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  'road-sidewalk-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
-  'landscape-human-made': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
-  'pitch-outline': { color: 'hsl(75, 57%, 84%)', type: 'fill' },
-  'landscape-building': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
-  building: { color: 'hsl(35, 11%, 86%)', type: 'fill' },
-  'building-outline': { color: 'hsl(35, 6%, 79%)', type: 'line' },
-  'building-number-label': { color: 'hsl(35, 2%, 69%)', type: 'text' },
-  'landscape-natural': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
-  'natural-point-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  'landscape-landcover': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
-  landcover: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
-  landuse: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
-  'land-structure-polygon': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
-  'land-structure-line': { color: 'hsl(35, 12%, 89%)', type: 'line' },
-  hillshade: { color: 'hsl(56, 59%, 22%)', type: 'fill' },
-};

From 9c5e3806096438bf7ea8bfd304a9a7292c831694 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 11:29:24 +0900
Subject: [PATCH 107/138] =?UTF-8?q?[fix]=20=EC=98=A4=ED=83=80=20=EB=B0=8F?=
 =?UTF-8?q?=20=EC=9E=98=EB=AA=BB=20=EA=B8=B0=EC=9E=85=EB=90=9C=20=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/map/layers/transit.ts         |  2 +-
 src/utils/map-styling/administrative.ts |  2 +-
 src/utils/map-styling/landscape.ts      | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/store/map/layers/transit.ts b/src/store/map/layers/transit.ts
index 93d66ee..d2e1cfe 100644
--- a/src/store/map/layers/transit.ts
+++ b/src/store/map/layers/transit.ts
@@ -110,7 +110,7 @@ export default [
       'line-color': 'hsl(201, 100%, 14%)',
       'line-width': 2,
     },
-    filter: ['match', ['get', 'type'], 'rail'],
+    filter: ['match', ['get', 'type'], 'rail', true, false],
   },
   {
     id: 'mapbox-rail-road-line',
diff --git a/src/utils/map-styling/administrative.ts b/src/utils/map-styling/administrative.ts
index 164c051..6c53ba4 100644
--- a/src/utils/map-styling/administrative.ts
+++ b/src/utils/map-styling/administrative.ts
@@ -29,7 +29,7 @@ const layers = {
   },
   locality: {
     line: [],
-    symbol: ['settlement-label', 'settlement_subdivision-label'],
+    symbol: ['settlement-label', 'settlement-subdivision-label'],
   },
   all: {
     line: [
diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index 0ebf009..e154cb7 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -57,9 +57,9 @@ const landCoverSectionFill = [
   'landscape-landcover',
   'landcover',
   'landuse',
-  'lang-structure-polygon',
+  'land-structure-polygon',
 ];
-const landCoverSectionStroke = ['lang-structure-line'];
+const landCoverSectionStroke = ['land-structure-line'];
 
 const mountainCoverSectionFill = ['hillshade'];
 
@@ -71,13 +71,13 @@ const layersByType: { [key in LandscapeSubFeature]: DetailType } = {
   },
   building: {
     [SECTION]: makeSubDetail(buildingSectionFill, buildingSectionStroke),
-    [LABELTEXT]: makeSubDetail([], []),
-    [LABELICON]: makeSubDetail(buildingLabel, buildingLabel),
+    [LABELTEXT]: makeSubDetail(buildingLabel, buildingLabel),
+    [LABELICON]: makeSubDetail([], []),
   },
   natural: {
     [SECTION]: makeSubDetail(naturalSectionFill, []),
-    [LABELTEXT]: makeSubDetail([], []),
-    [LABELICON]: makeSubDetail(naturalLabel, naturalLabel),
+    [LABELTEXT]: makeSubDetail(naturalLabel, naturalLabel),
+    [LABELICON]: makeSubDetail([], []),
   },
   landcover: {
     [SECTION]: makeSubDetail(landCoverSectionFill, landCoverSectionStroke),

From 951e3a8a56b923431d3dd89a16090ad80ef1e39b Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 13:02:54 +0900
Subject: [PATCH 108/138] =?UTF-8?q?[fix]=20range=EC=9D=98=20numbe,=20strin?=
 =?UTF-8?q?g=20=EA=B5=AC=EB=B6=84=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/common/useInputRange.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hooks/common/useInputRange.ts b/src/hooks/common/useInputRange.ts
index 1b1bfc8..577f784 100644
--- a/src/hooks/common/useInputRange.ts
+++ b/src/hooks/common/useInputRange.ts
@@ -23,7 +23,10 @@ function useInputRange({
   }, [range]);
 
   const rangeChangeHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setCurRange(e.target.value);
+    const value = Number.isNaN(Number(e.target.value))
+      ? e.target.value
+      : Number(e.target.value);
+    setCurRange(value);
   };
 
   const rangeMouseUpHandler = (key: StyleKeyType) => {

From 73ab8dc9b83384cd5072553979393f1d1f342500 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 13:06:01 +0900
Subject: [PATCH 109/138] =?UTF-8?q?[fix]=20mapbox=20=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=96=B4=20=EC=9C=A0=ED=98=95=20=EC=9D=B4=EB=8F=99=20=EB=B0=8F?=
 =?UTF-8?q?=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/map-styling/administrative.ts | 2 +-
 src/utils/map-styling/landscape.ts      | 2 +-
 src/utils/map-styling/water.ts          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/map-styling/administrative.ts b/src/utils/map-styling/administrative.ts
index 6c53ba4..1f9b040 100644
--- a/src/utils/map-styling/administrative.ts
+++ b/src/utils/map-styling/administrative.ts
@@ -42,7 +42,7 @@ const layers = {
     symbol: [
       'country-label',
       'settlement-label',
-      'settlement_subdivision-label',
+      'settlement-subdivision-label',
       'state-label',
     ],
   },
diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index e154cb7..29c3420 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -48,7 +48,7 @@ const humanMadeSectionStroke = ['pitch-outline'];
 
 const buildingSectionFill = ['landscape-building', 'building'];
 const buildingSectionStroke = ['building-outline'];
-const buildingLabel = ['building-number-label'];
+const buildingLabel = ['building-number-label', 'poi-building-label'];
 
 const naturalSectionFill = ['landscape-natural'];
 const naturalLabel = ['natural-point-label'];
diff --git a/src/utils/map-styling/water.ts b/src/utils/map-styling/water.ts
index a87215d..e32d2ba 100644
--- a/src/utils/map-styling/water.ts
+++ b/src/utils/map-styling/water.ts
@@ -13,7 +13,7 @@ import {
 } from '../applyStyle';
 
 const layers = {
-  polygon: ['water-polygon', 'water'],
+  polygon: ['water-polygon', 'water', 'water-shadow'],
   symbol: ['water-line-label', 'water-point-label', 'waterway-label'],
 };
 

From 2421955f9717d4857e174f328980765ed6c86940 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 13:16:24 +0900
Subject: [PATCH 110/138] =?UTF-8?q?[feat]=20=EB=8F=84=EB=A1=9C=20All=20?=
 =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A0=81=EC=9A=A9=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/map-styling/road-categories/all.ts  | 44 +++++++++++++++++++
 .../map-styling/road-categories/arterial.ts   | 12 ++++-
 .../map-styling/road-categories/local.ts      | 10 ++++-
 .../map-styling/road-categories/sidewalk.ts   | 12 ++++-
 src/utils/map-styling/road.ts                 |  4 +-
 5 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 src/utils/map-styling/road-categories/all.ts

diff --git a/src/utils/map-styling/road-categories/all.ts b/src/utils/map-styling/road-categories/all.ts
new file mode 100644
index 0000000..e5f983b
--- /dev/null
+++ b/src/utils/map-styling/road-categories/all.ts
@@ -0,0 +1,44 @@
+import { arterialLayerNames } from './arterial';
+import { localLayerNames } from './local';
+import { sidewalkLayerNames } from './sidewalk';
+
+export const allRoadLayerNames = {
+  all: [
+    ...arterialLayerNames.all,
+    ...localLayerNames.all,
+    ...sidewalkLayerNames.all,
+  ],
+  polygon: [
+    ...arterialLayerNames.polygon,
+    ...localLayerNames.polygon,
+    ...sidewalkLayerNames.polygon,
+  ],
+  line: [
+    ...arterialLayerNames.line,
+    ...localLayerNames.line,
+    ...sidewalkLayerNames.line,
+  ],
+  stroke: [
+    ...arterialLayerNames.stroke,
+    ...localLayerNames.stroke,
+    ...sidewalkLayerNames.stroke,
+  ],
+  text: {
+    all: [
+      ...arterialLayerNames.text.all,
+      ...localLayerNames.text.all,
+      ...sidewalkLayerNames.text.all,
+    ],
+    hasStroke: [
+      ...arterialLayerNames.text.hasStroke,
+      ...localLayerNames.text.hasStroke,
+      ...sidewalkLayerNames.text.hasStroke,
+    ],
+    noStroke: [
+      ...arterialLayerNames.text.noStroke,
+      ...localLayerNames.text.noStroke,
+      ...sidewalkLayerNames.text.noStroke,
+    ],
+  },
+  icon: [],
+};
diff --git a/src/utils/map-styling/road-categories/arterial.ts b/src/utils/map-styling/road-categories/arterial.ts
index bf9f685..cc19e0e 100644
--- a/src/utils/map-styling/road-categories/arterial.ts
+++ b/src/utils/map-styling/road-categories/arterial.ts
@@ -1,6 +1,17 @@
 export const arterialLayerNames = {
   all: [
+    'road-arterial-polygon',
     'road-arterial',
+    'road-primary',
+    'road-secondary-tertiary',
+    'road-motorway-trunk',
+    'road-minor',
+    'road-minor-low',
+    'road-primary-case',
+    'road-secondary-tertiary-case',
+    'road-motorway-trunk-case',
+    'road-minor-case',
+    'road-minor-low',
     'road-number-shield',
     'road-exit-shield',
     'road-arterial-label',
@@ -19,7 +30,6 @@ export const arterialLayerNames = {
     'road-secondary-tertiary-case',
     'road-motorway-trunk-case',
     'road-minor-case',
-    'road-minor-low',
   ],
   text: {
     all: ['road-number-shield', 'road-exit-shield', 'road-arterial-label'],
diff --git a/src/utils/map-styling/road-categories/local.ts b/src/utils/map-styling/road-categories/local.ts
index 617961f..be70479 100644
--- a/src/utils/map-styling/road-categories/local.ts
+++ b/src/utils/map-styling/road-categories/local.ts
@@ -1,5 +1,13 @@
 export const localLayerNames = {
-  all: ['ferry', 'ferry-auto', 'road-local', 'road-local-label'],
+  all: [
+    'road-local-polygon',
+    'ferry',
+    'ferry-auto',
+    'road-local',
+    'road-street',
+    'road-street-case',
+    'road-local-label',
+  ],
   polygon: ['road-local-polygon'],
   line: ['ferry', 'ferry-auto', 'road-local', 'road-street'],
   stroke: ['road-street-case'],
diff --git a/src/utils/map-styling/road-categories/sidewalk.ts b/src/utils/map-styling/road-categories/sidewalk.ts
index 6137a5a..57f3a6b 100644
--- a/src/utils/map-styling/road-categories/sidewalk.ts
+++ b/src/utils/map-styling/road-categories/sidewalk.ts
@@ -1,5 +1,15 @@
 export const sidewalkLayerNames = {
-  all: ['road-footway', 'road-sidewalk-label'],
+  all: [
+    'road-footway',
+    'road-sidewalk-label',
+    'road-pedestrian-polygon-fill',
+    'road-pedestrian-polygon-pattern',
+    'road-sidewalk-polygon',
+    'road-pedestrian',
+    'road-steps',
+    'road-path',
+    'road-pedestrian-case',
+  ],
   polygon: [
     'road-pedestrian-polygon-fill',
     'road-pedestrian-polygon-pattern',
diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
index 578e815..83d8ea4 100644
--- a/src/utils/map-styling/road.ts
+++ b/src/utils/map-styling/road.ts
@@ -2,6 +2,7 @@ import { stylingProps } from '.';
 import { arterialLayerNames } from './road-categories/arterial';
 import { localLayerNames } from './road-categories/local';
 import { sidewalkLayerNames } from './road-categories/sidewalk';
+import { allRoadLayerNames } from './road-categories/all';
 import stylingCategory from './road-categories/stylingCategory';
 
 function roadStyling({
@@ -12,9 +13,10 @@ function roadStyling({
   key,
   style,
 }: stylingProps): void {
-  type RoadSubFeatureType = 'arterial' | 'local' | 'sidewalk';
+  type RoadSubFeatureType = 'all' | 'arterial' | 'local' | 'sidewalk';
 
   const mappingSubFeatureLayerNames = {
+    all: allRoadLayerNames,
     arterial: arterialLayerNames,
     local: localLayerNames,
     sidewalk: sidewalkLayerNames,

From f415dbc7144561e6e9226f1fc96773788cc9392f Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 13:17:24 +0900
Subject: [PATCH 111/138] =?UTF-8?q?[fix]=20=EA=B8=B0=EB=B3=B8=20=EB=A0=88?=
 =?UTF-8?q?=EC=9D=B4=EC=96=B4=20=EC=86=8D=EC=84=B1=EA=B0=92=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 잘못 기입되거나 값에 수정이 필요한 부분들 적용함
---
 src/store/map/layers/transit.ts            |   6 +-
 src/utils/rendering-data/initLayerColor.ts | 108 ++++++++++-----------
 src/utils/rendering-data/layersColor.ts    |   4 +-
 3 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/store/map/layers/transit.ts b/src/store/map/layers/transit.ts
index d2e1cfe..12b0a5a 100644
--- a/src/store/map/layers/transit.ts
+++ b/src/store/map/layers/transit.ts
@@ -108,7 +108,7 @@ export default [
     },
     paint: {
       'line-color': 'hsl(201, 100%, 14%)',
-      'line-width': 2,
+      'line-width': 1,
     },
     filter: ['match', ['get', 'type'], 'rail', true, false],
   },
@@ -125,7 +125,7 @@ export default [
 
     paint: {
       'line-color': 'hsl(234, 20%, 30%)',
-      'line-width': 6,
+      'line-width': 1,
     },
     filter: [
       'all',
@@ -144,7 +144,7 @@ export default [
       visibility: 'visible',
     },
     paint: {
-      'text-halo-color': 'hsl(151, 24%, 60%)',
+      'text-halo-color': 'hsl(0, 0%, 100%)',
       'text-halo-width': 1,
       'text-color': 'hsl(13, 68%, 63%)',
     },
diff --git a/src/utils/rendering-data/initLayerColor.ts b/src/utils/rendering-data/initLayerColor.ts
index 36bb800..c24f56d 100644
--- a/src/utils/rendering-data/initLayerColor.ts
+++ b/src/utils/rendering-data/initLayerColor.ts
@@ -47,60 +47,60 @@ const initLayerColor: InitLayerColor = {
     color: 'hsl(234, 20%, 30%)',
     type: 'fill',
   },
-  // 'mapbox-airport-polygon': { color: 'hsl(234, 20%, 30%)', type: 'fill' },
-  // 'mapbox-airport-aeroway-line': { color: 'hsl(230, 23%, 82%)', type: 'line' },
-  // 'mapbox-airport-label': { color: 'hsl(0, 69%, 50%)', type: 'text' },
-  // 'transit-bus-label': { color: 'hsl(13, 68%, 63%)', type: 'text' },
-  // 'mapbox-rail-road-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
-  // 'transit-rail-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
-  // 'transit-subway-line': { color: 'hsl(192, 70%, 43%)', type: 'line' },
-  // 'road-arterial': { color: 'hsl(0, 0%, 100%)', type: 'fill' },
-  // 'road-arterial-polygon': { color: 'hsl(0, 0%, 100%)', type: 'fill' },
-  // 'road-primary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
-  // 'road-secondary-teritary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
-  // 'road-motorway-trunk': { color: 'hsl(0, 0%, 100%)', type: 'line' },
-  // 'road-minor': { color: 'hsl(0, 0%, 100%)', type: 'line' },
-  // 'road-minor-low': { color: 'hsl(0, 0%, 100%)', type: 'line' },
-  // 'road-primary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  // 'road-secondary-teritary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  // 'road-motorway-trunk-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  // 'road-minor-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  // 'road-number-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
-  // 'road-exit-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
-  // 'road-arterial-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
-  // 'road-local-polygon': { color: 'hsl(35, 14%, 93%)', type: 'fill' },
-  // ferry: { color: 'hsl(230, 48%, 44%)', type: 'text' },
-  // 'ferry-auto': { color: 'hsl(35, 14%, 93%)', type: 'line' },
-  // 'road-local': { color: 'hsl(35, 14%, 93%)', type: 'line' },
-  // 'road-street': { color: 'hsl(35, 14%, 93%)', type: 'line' },
-  // 'road-street-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  // 'road-local-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
-  // 'road-pedestrian-polygon-fill': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
-  // 'road-pedestrian-polygon-pattern': {
-  //   color: 'hsl(35, 10%, 83%)',
-  //   type: 'fill',
-  // },
-  // 'road-sidewalk-polygon': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
-  // 'road-footway': { color: 'hsl(35, 10%, 83%)', type: 'line' },
-  // 'road-pedestrian': { color: 'hsl(35, 10%, 83%)', type: 'line' },
-  // 'road-steps': { color: 'hsl(35, 10%, 83%)', type: 'line' },
-  // 'road-path': { color: 'hsl(35, 10%, 83%)', type: 'line' },
-  // 'road-pedestrian-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
-  // 'road-sidewalk-label': { color: 'hsl(230, 48%, 44%)', type: 'line' },
-  // 'landscape-human-made': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
-  // 'pitch-outline': { color: 'hsl(75, 57%, 84%)', type: 'fill' },
-  // 'landscape-building': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
-  // building: { color: 'hsl(35, 11%, 86%)', type: 'fill' },
-  // 'building-outline': { color: 'hsl(35, 6%, 79%)', type: 'line' },
-  // 'building-number-label': { color: 'hsl(35, 2%, 69%)', type: 'text' },
-  // 'landscape-natural': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
-  // 'natural-point-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
-  // 'landscape-landcover': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
-  // landcover: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
-  // landuse: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
-  // 'land-structure-polygon': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
-  // 'land-structure-line': { color: 'hsl(35, 12%, 89%)', type: 'line' },
-  // hillshade: { color: 'hsl(56, 59%, 22%)', type: 'fill' },
+  'mapbox-airport-polygon': { color: 'hsl(234, 20%, 30%)', type: 'fill' },
+  'mapbox-airport-aeroway-line': { color: 'hsl(230, 23%, 82%)', type: 'line' },
+  'mapbox-airport-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'transit-bus-label': { color: 'hsl(234, 20%, 30%)', type: 'text' },
+  'mapbox-rail-road-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
+  'transit-rail-line': { color: 'hsl(234, 20%, 30%)', type: 'line' },
+  'transit-subway-line': { color: 'hsl(192, 70%, 43%)', type: 'line' },
+  'road-arterial': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-arterial-polygon': { color: 'hsl(0, 0%, 100%)', type: 'fill' },
+  'road-primary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-secondary-tertiary': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-motorway-trunk': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-minor': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-minor-low': { color: 'hsl(0, 0%, 100%)', type: 'line' },
+  'road-primary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-secondary-tertiary-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-motorway-trunk-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-minor-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-number-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
+  'road-exit-shield': { color: 'hsl(0, 0%, 100%)', type: 'text' },
+  'road-arterial-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'road-local-polygon': { color: 'hsl(35, 14%, 93%)', type: 'fill' },
+  ferry: { color: 'hsl(230, 48%, 44%)', type: 'line' },
+  'ferry-auto': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  'road-local': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  'road-street': { color: 'hsl(35, 14%, 93%)', type: 'line' },
+  'road-street-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-local-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'road-pedestrian-polygon-fill': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
+  'road-pedestrian-polygon-pattern': {
+    color: 'hsl(35, 10%, 83%)',
+    type: 'fill',
+  },
+  'road-sidewalk-polygon': { color: 'hsl(35, 10%, 83%)', type: 'fill' },
+  'road-footway': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-pedestrian': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-steps': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-path': { color: 'hsl(35, 10%, 83%)', type: 'line' },
+  'road-pedestrian-case': { color: 'hsl(230, 24%, 87%)', type: 'line' },
+  'road-sidewalk-label': { color: 'hsl(230, 48%, 44%)', type: 'text' },
+  'landscape-human-made': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  'pitch-outline': { color: 'hsl(75, 57%, 84%)', type: 'line' },
+  'landscape-building': { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  building: { color: 'hsl(35, 11%, 86%)', type: 'fill' },
+  'building-outline': { color: 'hsl(35, 6%, 79%)', type: 'line' },
+  'building-number-label': { color: 'hsl(35, 2%, 69%)', type: 'text' },
+  'landscape-natural': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  'natural-point-label': { color: 'hsl(26, 25%, 32%)', type: 'text' },
+  'landscape-landcover': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  landcover: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  landuse: { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  'land-structure-polygon': { color: 'hsl(75, 62%, 81%)', type: 'fill' },
+  'land-structure-line': { color: 'hsl(35, 12%, 89%)', type: 'line' },
+  hillshade: { color: 'hsl(56, 59%, 22%)', type: 'fill' },
 };
 
 export default initLayerColor;
diff --git a/src/utils/rendering-data/layersColor.ts b/src/utils/rendering-data/layersColor.ts
index 0e23150..7cc42a1 100644
--- a/src/utils/rendering-data/layersColor.ts
+++ b/src/utils/rendering-data/layersColor.ts
@@ -232,7 +232,7 @@ const layersColor: PropertyType = {
         stroke: 'hsl(230, 23%, 82%)',
       },
       labelText: {
-        fill: 'hsl(0, 69%, 50%)',
+        fill: 'hsl(230, 48%, 44%)',
         stroke: 'hsl(0, 0%, 100%)',
       },
     },
@@ -242,7 +242,7 @@ const layersColor: PropertyType = {
         stroke: 'transparent',
       },
       labelText: {
-        fill: 'hsl(13, 68%, 63%)',
+        fill: 'hsl(234, 20%, 30%)',
         stroke: 'hsl(0, 0%, 100%)',
       },
     },

From 9312d2c1fb2f00594701c01e1ddb907379f3d7ac Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 13:19:04 +0900
Subject: [PATCH 112/138] =?UTF-8?q?[fix]=20weight=20=EC=A0=88=EB=8C=80?=
 =?UTF-8?q?=EA=B0=92=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 두께 변화가 커서 조정
- icon의 경우 opacity 범위가 제한되어서 수정함
---
 src/utils/applyStyle.ts      |  2 +-
 src/utils/map-styling/poi.ts | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index 15d41c4..db26af6 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -90,7 +90,7 @@ export function applyWeight({
 }: ApplyProps): void {
   if (!type) return;
 
-  const weightValue = weight === 0 ? 0 : weight * 2 + 1;
+  const weightValue = weight === 0 ? 0 : weight;
   layerNames.forEach((layerName) => {
     map.setPaintProperty(layerName, type, weightValue);
   });
diff --git a/src/utils/map-styling/poi.ts b/src/utils/map-styling/poi.ts
index 9f371b2..1b36d61 100644
--- a/src/utils/map-styling/poi.ts
+++ b/src/utils/map-styling/poi.ts
@@ -26,7 +26,7 @@ type POI_LAYERS_TYPE = {
   [name in PoiSubFeature]: string[];
 };
 
-const VISIBLE = 1;
+const VISIBLE = -0.001;
 const INVISIBLE = 0;
 const POI_LAYERS: POI_LAYERS_TYPE = {
   all: [
@@ -51,7 +51,6 @@ const POI_LAYERS: POI_LAYERS_TYPE = {
     'poi-etc',
     'poi-industrial-label',
     'poi-historic-label',
-    'poi-building-label',
   ],
   landmark: ['poi-attraction', 'poi-arts-label', 'poi-landmark-label'],
   business: ['poi-business', 'poi-food-label', 'poi-store-label'],
@@ -61,12 +60,7 @@ const POI_LAYERS: POI_LAYERS_TYPE = {
   worship: ['poi-worship', 'poi-religion-label'],
   school: ['poi-school', 'poi-education-label'],
   sports: ['poi-sport-label'],
-  etc: [
-    'poi-etc',
-    'poi-industrial-label',
-    'poi-historic-label',
-    'poi-building-label',
-  ],
+  etc: ['poi-etc', 'poi-industrial-label', 'poi-historic-label'],
 };
 
 const mappingDetailToFunc = {

From 0bcf6ed72d2d1a59557554d518db2d71992ce6d9 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 14:00:15 +0900
Subject: [PATCH 113/138] =?UTF-8?q?[refactor]=20=EA=B3=B5=ED=86=B5=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EB=B3=80=EC=88=98=20=EB=84=A4=EC=9D=B4?=
 =?UTF-8?q?=EB=B0=8D=20=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 세부 유형을 의미하는 deatil -> element로 변경
- 공통 타입에 선언된 인터페이스 사용하도록 수정하여 Name 제거
---
 .../Sidebar/SidebarContentMore/DetailType.tsx | 27 +++----
 .../SidebarContentMore/FeatureType.tsx        |  4 +-
 .../Sidebar/SidebarContentMore/Styler.tsx     | 33 +++------
 src/hooks/sidebar/useDetailType.ts            | 30 ++++----
 src/hooks/sidebar/useStyleType.ts             | 52 ++++++-------
 src/utils/map-styling/administrative.ts       | 19 ++---
 src/utils/map-styling/index.ts                |  6 +-
 src/utils/map-styling/landscape.ts            | 74 ++++++++-----------
 src/utils/map-styling/marker.ts               |  6 +-
 src/utils/map-styling/poi.ts                  | 24 +++---
 .../road-categories/stylingCategory.ts        | 48 ++++++------
 src/utils/map-styling/road.ts                 | 15 ++--
 src/utils/map-styling/transit.ts              | 26 +++----
 src/utils/map-styling/water.ts                | 15 ++--
 14 files changed, 169 insertions(+), 210 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index edda5c2..4f147b2 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -9,9 +9,9 @@ import useDetailType, {
 } from '../../../hooks/sidebar/useDetailType';
 import Styler from './Styler';
 import {
-  FeatureNameType,
   ElementNameType,
   SubElementNameType,
+  FeaturePropsType,
 } from '../../../store/common/type';
 
 interface PaddingProp {
@@ -62,15 +62,10 @@ const CheckRight = styled.div`
   color: ${(props) => props.theme.GREEN};
 `;
 
-interface DetailTypeProps {
-  featureName: FeatureNameType;
-  subFeatureName: string;
-}
-
 function DetailType({
-  featureName,
-  subFeatureName,
-}: DetailTypeProps): React.ReactElement {
+  feature,
+  subFeature,
+}: FeaturePropsType): React.ReactElement {
   const {
     sidebarTypeName,
     sidebarSubTypeName,
@@ -87,11 +82,11 @@ function DetailType({
     sidebarSubTypeClickHandler,
     sidebarTypeName,
     sidebarSubTypeName,
-    featureName,
-    subFeatureName,
+    feature,
+    subFeature,
   });
 
-  if (!featureName) {
+  if (!feature) {
     return <></>;
   }
 
@@ -199,10 +194,10 @@ function DetailType({
         </List>
       </DetailWrapper>
       <Styler
-        featureName={featureName}
-        subFeatureName={subFeatureName}
-        detailName={sidebarTypeName as ElementNameType}
-        subDetailName={sidebarSubTypeName as SubElementNameType}
+        feature={feature}
+        subFeature={subFeature}
+        element={sidebarTypeName as ElementNameType}
+        subElement={sidebarSubTypeName as SubElementNameType}
       />
     </>
   );
diff --git a/src/components/Sidebar/SidebarContentMore/FeatureType.tsx b/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
index da87cae..9818601 100644
--- a/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
@@ -53,8 +53,8 @@ function FeatureType(): React.ReactElement {
         ))}
       </FeatureTypeWrapper>
       <DetailType
-        featureName={sidebarTypeName as FeatureNameType}
-        subFeatureName={sidebarSubTypeName}
+        feature={sidebarTypeName as FeatureNameType}
+        subFeature={sidebarSubTypeName}
       />
     </>
   );
diff --git a/src/components/Sidebar/SidebarContentMore/Styler.tsx b/src/components/Sidebar/SidebarContentMore/Styler.tsx
index e6b1391..34d2ed0 100644
--- a/src/components/Sidebar/SidebarContentMore/Styler.tsx
+++ b/src/components/Sidebar/SidebarContentMore/Styler.tsx
@@ -1,10 +1,6 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
-import {
-  FeatureNameType,
-  ElementNameType,
-  SubElementNameType,
-} from '../../../store/common/type';
+import { ElementPropsType } from '../../../store/common/type';
 import useStyleType, {
   UseStyleHookType,
 } from '../../../hooks/sidebar/useStyleType';
@@ -39,30 +35,23 @@ const Hr = styled.hr`
   color: ${(props) => props.theme.GREY};
 `;
 
-interface StylerProps {
-  featureName: FeatureNameType;
-  subFeatureName: string;
-  detailName: ElementNameType;
-  subDetailName?: SubElementNameType;
-}
-
 function Styler({
-  featureName,
-  subFeatureName,
-  detailName,
-  subDetailName,
-}: StylerProps): React.ReactElement {
+  feature,
+  subFeature,
+  element,
+  subElement,
+}: ElementPropsType): React.ReactElement {
   const {
     styleElement: { visibility, color, weight, saturation, lightness },
     onStyleChange,
   }: UseStyleHookType = useStyleType({
-    featureName,
-    subFeatureName,
-    detailName,
-    subDetailName,
+    feature,
+    subFeature,
+    element,
+    subElement,
   });
 
-  if (!detailName) {
+  if (!element) {
     return <></>;
   }
 
diff --git a/src/hooks/sidebar/useDetailType.ts b/src/hooks/sidebar/useDetailType.ts
index 802dfbd..4fdfb51 100644
--- a/src/hooks/sidebar/useDetailType.ts
+++ b/src/hooks/sidebar/useDetailType.ts
@@ -8,8 +8,8 @@ import {
 } from '../../store/common/type';
 
 interface UseDetailTypeProps {
-  featureName: FeatureNameType;
-  subFeatureName: string;
+  feature: FeatureNameType;
+  subFeature: string;
   sidebarTypeName: string;
   sidebarSubTypeName: string;
   sidebarTypeClickHandler: (name: string) => void;
@@ -34,37 +34,35 @@ const dummyDetail = {
 };
 
 function useDetailType({
-  featureName,
-  subFeatureName,
+  feature,
+  subFeature,
   sidebarTypeName,
   sidebarSubTypeName,
   sidebarTypeClickHandler,
   sidebarSubTypeClickHandler,
 }: UseDetailTypeProps): UseDetailHookType {
   const detail = useSelector<RootState>((state) => {
-    if (!featureName) {
+    if (!feature) {
       return dummyDetail;
     }
 
-    return state[featureName][subFeatureName];
+    return state[feature][subFeature];
   }) as FeatureType;
 
   const styleClickHandler = (
-    elementName: ElementNameType,
-    subElementName?: SubElementNameType
+    element: ElementNameType,
+    subElement?: SubElementNameType
   ) => {
-    sidebarTypeClickHandler(elementName);
-    if (subElementName) sidebarSubTypeClickHandler(subElementName);
+    sidebarTypeClickHandler(element);
+    if (subElement) sidebarSubTypeClickHandler(subElement);
   };
 
   const checkIsSelected = (
-    elementName: ElementNameType,
-    subElementName?: SubElementNameType
+    element: ElementNameType,
+    subElement?: SubElementNameType
   ) => {
-    if (!subElementName) return sidebarTypeName === elementName;
-    return (
-      sidebarTypeName === elementName && sidebarSubTypeName === subElementName
-    );
+    if (!subElement) return sidebarTypeName === element;
+    return sidebarTypeName === element && sidebarSubTypeName === subElement;
   };
 
   return {
diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index 21c6237..2c79394 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -8,54 +8,48 @@ import {
   StyleKeyType,
   ElementNameType,
   SubElementNameType,
+  ElementPropsType,
 } from '../../store/common/type';
 import { setStyle } from '../../store/style/action';
 import { getDefaultStyle } from '../../store/style/properties';
 import * as mapStyling from '../../utils/map-styling';
 
-interface UseStyleTypeProps {
-  featureName: FeatureNameType;
-  subFeatureName: string;
-  detailName: ElementNameType;
-  subDetailName?: SubElementNameType;
-}
-
 export interface UseStyleHookType {
   styleElement: StyleType;
   onStyleChange: (key: StyleKeyType, value: string | number) => void;
 }
 
 function useStyleType({
-  featureName,
-  subFeatureName,
-  detailName,
-  subDetailName,
-}: UseStyleTypeProps): UseStyleHookType {
+  feature,
+  subFeature,
+  element,
+  subElement,
+}: ElementPropsType): UseStyleHookType {
   const dispatch = useDispatch();
 
   const map = useSelector<RootState>((state) => state.map.map) as mapboxgl.Map;
   const styleElement = useSelector<RootState>((state) => {
-    if (!detailName) {
+    if (!element) {
       return getDefaultStyle({
-        feature: featureName,
-        subFeature: subFeatureName,
-        element: detailName,
-        subElement: subDetailName,
+        feature,
+        subFeature,
+        element,
+        subElement,
       });
     }
-    const feature = state[featureName][subFeatureName];
-    if (detailName === ElementNameType.labelIcon) return feature[detailName];
-    return feature[detailName][subDetailName as SubElementNameType];
+    const newFeature = state[feature][subFeature];
+    if (element === ElementNameType.labelIcon) return newFeature[element];
+    return newFeature[element][subElement as SubElementNameType];
   }) as StyleType;
 
   const onStyleChange = useCallback(
     (key: StyleKeyType, value: string | number) => {
-      mapStyling[featureName]({
+      mapStyling[feature]({
         map,
-        subFeatureName,
+        subFeature,
         key,
-        detailName,
-        subDetailName: subDetailName as SubElementNameType,
+        element,
+        subElement: subElement as SubElementNameType,
         style: {
           ...styleElement,
           [key]: value,
@@ -64,10 +58,10 @@ function useStyleType({
 
       dispatch(
         setStyle({
-          feature: featureName,
-          subFeature: subFeatureName,
-          element: detailName,
-          subElement: subDetailName,
+          feature,
+          subFeature,
+          element,
+          subElement,
           style: {
             ...styleElement,
             [key]: value,
@@ -75,7 +69,7 @@ function useStyleType({
         })
       );
     },
-    [featureName, subFeatureName, detailName, subDetailName, styleElement]
+    [feature, subFeature, element, subElement, styleElement]
   );
 
   return {
diff --git a/src/utils/map-styling/administrative.ts b/src/utils/map-styling/administrative.ts
index 1f9b040..8f42d90 100644
--- a/src/utils/map-styling/administrative.ts
+++ b/src/utils/map-styling/administrative.ts
@@ -50,18 +50,18 @@ const layers = {
 
 function administrativeStyling({
   map,
-  subFeatureName,
-  detailName,
-  subDetailName,
+  subFeature,
+  element,
+  subElement,
   key,
   style,
 }: stylingProps): void {
-  const mappingLayers = layers[subFeatureName as subFeatureNameType];
+  const mappingLayers = layers[subFeature as subFeatureNameType];
 
-  if (detailName === ElementNameType.labelIcon) return;
-  if (detailName === ElementNameType.labelText) {
+  if (element === ElementNameType.labelIcon) return;
+  if (element === ElementNameType.labelText) {
     // labelText - fill
-    if (subDetailName === SubElementNameType.fill) {
+    if (subElement === SubElementNameType.fill) {
       if (key === StyleKeyType.weight) return;
       if (key === StyleKeyType.visibility) {
         const styleValue = style[key] === 'none' ? 'none' : 'visible';
@@ -106,10 +106,7 @@ function administrativeStyling({
   }
 
   // section - fill
-  if (
-    subFeatureName === 'locality' ||
-    subDetailName === SubElementNameType.fill
-  )
+  if (subFeature === 'locality' || subElement === SubElementNameType.fill)
     return;
 
   // section - stroke
diff --git a/src/utils/map-styling/index.ts b/src/utils/map-styling/index.ts
index 1b259cf..9eb2660 100644
--- a/src/utils/map-styling/index.ts
+++ b/src/utils/map-styling/index.ts
@@ -8,9 +8,9 @@ import {
 
 export interface stylingProps {
   map: mapboxgl.Map;
-  subFeatureName: string;
-  detailName: ElementNameType;
-  subDetailName: SubElementNameType;
+  subFeature: string;
+  element: ElementNameType;
+  subElement: SubElementNameType;
   key: StyleKeyType;
   style: StyleType;
 }
diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index 29c3420..f618334 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -7,11 +7,7 @@ import {
   ColorType,
   StyleTypes,
 } from '../applyStyle';
-import {
-  StyleKeyType,
-  ElementNameType,
-  StyleType,
-} from '../../store/common/type';
+import { StyleKeyType, ElementNameType } from '../../store/common/type';
 
 const SECTION = 'section';
 const LABELTEXT = 'labelText';
@@ -36,7 +32,7 @@ interface DetailType {
   labelIcon: SubDetailType;
 }
 
-function makeSubDetail(
+function makeSubElement(
   fillLayers: string[],
   strokeLayers: string[]
 ): SubDetailType {
@@ -65,32 +61,32 @@ const mountainCoverSectionFill = ['hillshade'];
 
 const layersByType: { [key in LandscapeSubFeature]: DetailType } = {
   'human-made': {
-    [SECTION]: makeSubDetail(humanMadeSectionFill, humanMadeSectionStroke),
-    [LABELTEXT]: makeSubDetail([], []),
-    [LABELICON]: makeSubDetail([], []),
+    [SECTION]: makeSubElement(humanMadeSectionFill, humanMadeSectionStroke),
+    [LABELTEXT]: makeSubElement([], []),
+    [LABELICON]: makeSubElement([], []),
   },
   building: {
-    [SECTION]: makeSubDetail(buildingSectionFill, buildingSectionStroke),
-    [LABELTEXT]: makeSubDetail(buildingLabel, buildingLabel),
-    [LABELICON]: makeSubDetail([], []),
+    [SECTION]: makeSubElement(buildingSectionFill, buildingSectionStroke),
+    [LABELTEXT]: makeSubElement(buildingLabel, buildingLabel),
+    [LABELICON]: makeSubElement([], []),
   },
   natural: {
-    [SECTION]: makeSubDetail(naturalSectionFill, []),
-    [LABELTEXT]: makeSubDetail(naturalLabel, naturalLabel),
-    [LABELICON]: makeSubDetail([], []),
+    [SECTION]: makeSubElement(naturalSectionFill, []),
+    [LABELTEXT]: makeSubElement(naturalLabel, naturalLabel),
+    [LABELICON]: makeSubElement([], []),
   },
   landcover: {
-    [SECTION]: makeSubDetail(landCoverSectionFill, landCoverSectionStroke),
-    [LABELTEXT]: makeSubDetail([], []),
-    [LABELICON]: makeSubDetail([], []),
+    [SECTION]: makeSubElement(landCoverSectionFill, landCoverSectionStroke),
+    [LABELTEXT]: makeSubElement([], []),
+    [LABELICON]: makeSubElement([], []),
   },
   mountain: {
-    [SECTION]: makeSubDetail(mountainCoverSectionFill, []),
-    [LABELTEXT]: makeSubDetail([], []),
-    [LABELICON]: makeSubDetail([], []),
+    [SECTION]: makeSubElement(mountainCoverSectionFill, []),
+    [LABELTEXT]: makeSubElement([], []),
+    [LABELICON]: makeSubElement([], []),
   },
   all: {
-    [SECTION]: makeSubDetail(
+    [SECTION]: makeSubElement(
       [
         ...humanMadeSectionFill,
         ...buildingSectionFill,
@@ -104,8 +100,8 @@ const layersByType: { [key in LandscapeSubFeature]: DetailType } = {
         ...landCoverSectionStroke,
       ]
     ),
-    [LABELTEXT]: makeSubDetail([], []),
-    [LABELICON]: makeSubDetail([], [...buildingLabel, ...naturalLabel]),
+    [LABELTEXT]: makeSubElement([], [...buildingLabel, ...naturalLabel]),
+    [LABELICON]: makeSubElement([], []),
   },
 };
 
@@ -251,9 +247,9 @@ const mappingDetailToFunc = {
 
 function landscapeStyling({
   map,
-  subFeatureName,
-  detailName,
-  subDetailName,
+  subFeature,
+  element,
+  subElement,
   key,
   style,
 }: stylingProps): void {
@@ -261,16 +257,16 @@ function landscapeStyling({
   let func = null;
 
   if (
-    detailName === ElementNameType.section ||
-    detailName === ElementNameType.labelText
+    element === ElementNameType.section ||
+    element === ElementNameType.labelText
   ) {
-    const { typeName, funcName } = mappingDetailToFunc[detailName][
-      subDetailName
-    ][key as StyleKeyType];
+    const { typeName, funcName } = mappingDetailToFunc[element][subElement][
+      key as StyleKeyType
+    ];
     type = typeName;
     func = funcName;
   } else {
-    const { typeName, funcName } = mappingDetailToFunc[detailName][
+    const { typeName, funcName } = mappingDetailToFunc[element][
       key as StyleKeyType
     ];
     type = typeName;
@@ -287,9 +283,7 @@ function landscapeStyling({
     func({
       map,
       layerNames:
-        layersByType[subFeatureName as LandscapeSubFeature][detailName][
-          subDetailName
-        ],
+        layersByType[subFeature as LandscapeSubFeature][element][subElement],
       type,
       weight: style.visibility === 'none' ? INVISIBLE : VISIBLE,
     });
@@ -299,9 +293,7 @@ function landscapeStyling({
     func({
       map,
       layerNames:
-        layersByType[subFeatureName as LandscapeSubFeature][detailName][
-          subDetailName
-        ],
+        layersByType[subFeature as LandscapeSubFeature][element][subElement],
       visibility: style.visibility,
     });
   }
@@ -309,9 +301,7 @@ function landscapeStyling({
   func({
     map,
     layerNames:
-      layersByType[subFeatureName as LandscapeSubFeature][detailName][
-        subDetailName
-      ],
+      layersByType[subFeature as LandscapeSubFeature][element][subElement],
     type: type as StyleTypes,
     color: style.color,
     [key]: style[key as StyleKeyType],
diff --git a/src/utils/map-styling/marker.ts b/src/utils/map-styling/marker.ts
index 051a573..80da01c 100644
--- a/src/utils/map-styling/marker.ts
+++ b/src/utils/map-styling/marker.ts
@@ -2,9 +2,9 @@ import { stylingProps } from './index';
 
 function markerStyling({
   map,
-  subFeatureName,
-  detailName,
-  subDetailName,
+  subFeature,
+  element,
+  subElement,
   style,
 }: stylingProps): void {
   console.log(1);
diff --git a/src/utils/map-styling/poi.ts b/src/utils/map-styling/poi.ts
index 1b36d61..e4f92ad 100644
--- a/src/utils/map-styling/poi.ts
+++ b/src/utils/map-styling/poi.ts
@@ -120,24 +120,24 @@ const mappingDetailToFunc = {
 
 function poiStyling({
   map,
-  subFeatureName,
-  detailName,
-  subDetailName,
+  subFeature,
+  element,
+  subElement,
   style,
   key,
 }: stylingProps): void {
   let type = null;
   let func = null;
 
-  if (detailName === ElementNameType.section) return;
-  if (detailName === ElementNameType.labelText && key !== 'isChanged') {
-    const { typeName, funcName } = mappingDetailToFunc[detailName][
-      subDetailName
-    ][key];
+  if (element === ElementNameType.section) return;
+  if (element === ElementNameType.labelText && key !== 'isChanged') {
+    const { typeName, funcName } = mappingDetailToFunc[element][subElement][
+      key
+    ];
     type = typeName;
     func = funcName;
-  } else if (detailName === ElementNameType.labelIcon && key === 'visibility') {
-    const { typeName, funcName } = mappingDetailToFunc[detailName][key];
+  } else if (element === ElementNameType.labelIcon && key === 'visibility') {
+    const { typeName, funcName } = mappingDetailToFunc[element][key];
     type = typeName;
     func = funcName;
   }
@@ -149,7 +149,7 @@ function poiStyling({
   ) {
     func({
       map,
-      layerNames: POI_LAYERS[subFeatureName as PoiSubFeature],
+      layerNames: POI_LAYERS[subFeature as PoiSubFeature],
       type,
       weight: style.visibility === 'none' ? INVISIBLE : VISIBLE,
     });
@@ -158,7 +158,7 @@ function poiStyling({
 
   func({
     map,
-    layerNames: POI_LAYERS[subFeatureName as PoiSubFeature],
+    layerNames: POI_LAYERS[subFeature as PoiSubFeature],
     type: type as StyleTypes,
     color: style.color,
     [key]: style[key as StyleKeyType],
diff --git a/src/utils/map-styling/road-categories/stylingCategory.ts b/src/utils/map-styling/road-categories/stylingCategory.ts
index 5e6b4f0..6e8ace0 100644
--- a/src/utils/map-styling/road-categories/stylingCategory.ts
+++ b/src/utils/map-styling/road-categories/stylingCategory.ts
@@ -28,9 +28,9 @@ export interface layerProps {
 
 export interface catergoryStylingProps {
   map: mapboxgl.Map;
-  subFeatureName: string;
-  detailName: ElementNameType;
-  subDetailName: SubElementNameType;
+  subFeature: string;
+  element: ElementNameType;
+  subElement: SubElementNameType;
   key: StyleKeyType;
   style: StyleType;
   layerNames: layerProps;
@@ -39,17 +39,17 @@ export interface catergoryStylingProps {
 function stylingCategory({
   layerNames,
   map,
-  subFeatureName,
-  detailName,
-  subDetailName,
+  subFeature,
+  element,
+  subElement,
   key,
   style,
 }: catergoryStylingProps): void {
   const { visibility, color, weight } = style;
-
+  console.log(map);
   if (key === 'visibility') {
-    if (detailName === ElementNameType.section) {
-      if (subDetailName === SubElementNameType.fill) {
+    if (element === ElementNameType.section) {
+      if (subElement === SubElementNameType.fill) {
         applyVisibility({
           map,
           layerNames: layerNames.line,
@@ -60,20 +60,20 @@ function stylingCategory({
           layerNames: layerNames.polygon,
           visibility,
         });
-      } else if (subDetailName === SubElementNameType.stroke)
+      } else if (subElement === SubElementNameType.stroke)
         applyVisibility({
           map,
           layerNames: layerNames.stroke,
           visibility,
         });
-    } else if (detailName === ElementNameType.labelText) {
-      if (subDetailName === SubElementNameType.fill)
+    } else if (element === ElementNameType.labelText) {
+      if (subElement === SubElementNameType.fill)
         applyVisibility({
           map,
           layerNames: layerNames.text.noStroke,
           visibility,
         });
-      else if (subDetailName === SubElementNameType.stroke)
+      else if (subElement === SubElementNameType.stroke)
         applyVisibility({
           map,
           layerNames: layerNames.text.hasStroke,
@@ -81,8 +81,8 @@ function stylingCategory({
         });
     }
   } else if (key === 'color' || key === 'saturation' || key === 'lightness') {
-    if (detailName === ElementNameType.section) {
-      if (subDetailName === SubElementNameType.fill) {
+    if (element === ElementNameType.section) {
+      if (subElement === SubElementNameType.fill) {
         applyColor({
           map,
           layerNames: layerNames.line,
@@ -97,7 +97,7 @@ function stylingCategory({
           type: ColorType.fill,
           [key]: style[key as StyleKeyType],
         });
-      } else if (subDetailName === SubElementNameType.stroke) {
+      } else if (subElement === SubElementNameType.stroke) {
         applyColor({
           map,
           layerNames: layerNames.stroke,
@@ -106,8 +106,8 @@ function stylingCategory({
           [key]: style[key as StyleKeyType],
         });
       }
-    } else if (detailName === ElementNameType.labelText) {
-      if (subDetailName === SubElementNameType.fill) {
+    } else if (element === ElementNameType.labelText) {
+      if (subElement === SubElementNameType.fill) {
         applyColor({
           map,
           layerNames: layerNames.text.all,
@@ -115,7 +115,7 @@ function stylingCategory({
           type: ColorType.text,
           [key]: style[key as StyleKeyType],
         });
-      } else if (subDetailName === SubElementNameType.stroke) {
+      } else if (subElement === SubElementNameType.stroke) {
         applyColor({
           map,
           layerNames: layerNames.text.hasStroke,
@@ -126,15 +126,15 @@ function stylingCategory({
       }
     }
   } else if (key === 'weight') {
-    if (detailName === ElementNameType.section) {
-      if (subDetailName === SubElementNameType.fill) {
+    if (element === ElementNameType.section) {
+      if (subElement === SubElementNameType.fill) {
         applyWeight({
           map,
           layerNames: layerNames.line,
           type: WeightType.line,
           weight,
         });
-      } else if (subDetailName === SubElementNameType.stroke) {
+      } else if (subElement === SubElementNameType.stroke) {
         applyWeight({
           map,
           layerNames: layerNames.stroke,
@@ -143,8 +143,8 @@ function stylingCategory({
         });
       }
     }
-    if (detailName === ElementNameType.labelText) {
-      if (subDetailName === SubElementNameType.stroke)
+    if (element === ElementNameType.labelText) {
+      if (subElement === SubElementNameType.stroke)
         applyWeight({
           map,
           layerNames: layerNames.text.hasStroke,
diff --git a/src/utils/map-styling/road.ts b/src/utils/map-styling/road.ts
index 83d8ea4..67243d9 100644
--- a/src/utils/map-styling/road.ts
+++ b/src/utils/map-styling/road.ts
@@ -7,9 +7,9 @@ import stylingCategory from './road-categories/stylingCategory';
 
 function roadStyling({
   map,
-  subFeatureName,
-  detailName,
-  subDetailName,
+  subFeature,
+  element,
+  subElement,
   key,
   style,
 }: stylingProps): void {
@@ -23,12 +23,11 @@ function roadStyling({
   };
 
   stylingCategory({
-    layerNames:
-      mappingSubFeatureLayerNames[subFeatureName as RoadSubFeatureType],
+    layerNames: mappingSubFeatureLayerNames[subFeature as RoadSubFeatureType],
     map,
-    subFeatureName,
-    detailName,
-    subDetailName,
+    subFeature,
+    element,
+    subElement,
     key,
     style,
   });
diff --git a/src/utils/map-styling/transit.ts b/src/utils/map-styling/transit.ts
index c0e9cd9..1295fcf 100644
--- a/src/utils/map-styling/transit.ts
+++ b/src/utils/map-styling/transit.ts
@@ -30,30 +30,30 @@ const LabelLayers = ['mapbox-airport-label', 'transit-bus-label'];
 
 function transitStyling({
   map,
-  subFeatureName,
+  subFeature,
   key,
-  detailName,
-  subDetailName,
+  element,
+  subElement,
   style,
 }: stylingProps): void {
   // TODO: labelIcon 관련 구현
-  if (detailName === ElementNameType.labelIcon) return;
+  if (element === ElementNameType.labelIcon) return;
 
   let layerNames: string[] =
-    subDetailName === SubElementNameType.fill
+    subElement === SubElementNameType.fill
       ? key === StyleKeyType.weight
         ? []
-        : detailName === ElementNameType.labelText
+        : element === ElementNameType.labelText
         ? [...LabelLayers]
         : [...PolygonLayers]
-      : detailName === ElementNameType.labelText
+      : element === ElementNameType.labelText
       ? [...LabelLayers]
       : [...LineLayers];
 
   layerNames =
-    subFeatureName === 'all'
+    subFeature === 'all'
       ? layerNames
-      : layerNames.filter((layer) => layer.includes(subFeatureName));
+      : layerNames.filter((layer) => layer.includes(subFeature));
 
   if (layerNames.length === 0) return;
 
@@ -78,11 +78,11 @@ function transitStyling({
       const ligKey = StyleKeyType.lightness;
 
       styleType =
-        detailName === ElementNameType.labelText
-          ? subDetailName === SubElementNameType.fill
+        element === ElementNameType.labelText
+          ? subElement === SubElementNameType.fill
             ? ColorType.text
             : ColorType.textHalo
-          : subDetailName === SubElementNameType.fill
+          : subElement === SubElementNameType.fill
           ? ColorType.fill
           : ColorType.line;
 
@@ -103,7 +103,7 @@ function transitStyling({
 
     case StyleKeyType.weight:
       styleType =
-        detailName === ElementNameType.labelText
+        element === ElementNameType.labelText
           ? WeightType.textHalo
           : WeightType.line;
       applyWeight({
diff --git a/src/utils/map-styling/water.ts b/src/utils/map-styling/water.ts
index e32d2ba..df3c3d3 100644
--- a/src/utils/map-styling/water.ts
+++ b/src/utils/map-styling/water.ts
@@ -19,16 +19,16 @@ const layers = {
 
 function waterStyling({
   map,
-  detailName,
-  subDetailName,
+  element,
+  subElement,
   key,
   style,
 }: stylingProps): void {
-  if (detailName === ElementNameType.labelIcon) return;
+  if (element === ElementNameType.labelIcon) return;
 
-  if (detailName === ElementNameType.labelText) {
+  if (element === ElementNameType.labelText) {
     // labelText - fill
-    if (subDetailName === SubElementNameType.fill) {
+    if (subElement === SubElementNameType.fill) {
       if (key === StyleKeyType.weight) return;
       if (key === StyleKeyType.visibility) {
         const styleValue = style[key] === 'none' ? 'none' : 'visible';
@@ -73,10 +73,7 @@ function waterStyling({
   }
 
   // section - stroke
-  if (
-    subDetailName === SubElementNameType.stroke ||
-    key === StyleKeyType.weight
-  )
+  if (subElement === SubElementNameType.stroke || key === StyleKeyType.weight)
     return;
 
   // section - fill

From 748ea545c4696fd67fe081974a841e937a936399 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 14:09:59 +0900
Subject: [PATCH 114/138] =?UTF-8?q?[chore]=20=EB=A1=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C,=20POI=20=EC=95=84=EC=9D=B4=EC=BD=98=20Weigh?=
 =?UTF-8?q?t=20=EC=84=A4=EC=A0=95=EA=B0=92=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/map-styling/poi.ts                             | 2 +-
 src/utils/map-styling/road-categories/stylingCategory.ts | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/utils/map-styling/poi.ts b/src/utils/map-styling/poi.ts
index e4f92ad..4aa1ed8 100644
--- a/src/utils/map-styling/poi.ts
+++ b/src/utils/map-styling/poi.ts
@@ -26,7 +26,7 @@ type POI_LAYERS_TYPE = {
   [name in PoiSubFeature]: string[];
 };
 
-const VISIBLE = -0.001;
+const VISIBLE = 1;
 const INVISIBLE = 0;
 const POI_LAYERS: POI_LAYERS_TYPE = {
   all: [
diff --git a/src/utils/map-styling/road-categories/stylingCategory.ts b/src/utils/map-styling/road-categories/stylingCategory.ts
index 6e8ace0..e60ed56 100644
--- a/src/utils/map-styling/road-categories/stylingCategory.ts
+++ b/src/utils/map-styling/road-categories/stylingCategory.ts
@@ -46,7 +46,6 @@ function stylingCategory({
   style,
 }: catergoryStylingProps): void {
   const { visibility, color, weight } = style;
-  console.log(map);
   if (key === 'visibility') {
     if (element === ElementNameType.section) {
       if (subElement === SubElementNameType.fill) {

From b49c30fe826f4b5dfadacf15435973fadd32541b Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 14:18:49 +0900
Subject: [PATCH 115/138] =?UTF-8?q?[fix]=20=ED=8F=89=EC=A7=80=20background?=
 =?UTF-8?q?=EB=A1=9C=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- background의 경우 맵박스 함수가 달라서 구분하도록 처리
---
 src/utils/applyStyle.ts            |  1 +
 src/utils/map-styling/landscape.ts | 39 +++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/utils/applyStyle.ts b/src/utils/applyStyle.ts
index db26af6..75c35d0 100644
--- a/src/utils/applyStyle.ts
+++ b/src/utils/applyStyle.ts
@@ -8,6 +8,7 @@ export enum ColorType {
   fill = 'fill-color',
   line = 'line-color',
   text = 'text-color',
+  background = 'background-color',
   textHalo = 'text-halo-color',
   icon = 'icon-opacity',
 }
diff --git a/src/utils/map-styling/landscape.ts b/src/utils/map-styling/landscape.ts
index f618334..8a97622 100644
--- a/src/utils/map-styling/landscape.ts
+++ b/src/utils/map-styling/landscape.ts
@@ -21,21 +21,21 @@ type LandscapeSubFeature =
   | 'landcover'
   | 'mountain';
 
-interface SubDetailType {
+interface SubElementsType {
   fill: string[];
   stroke: string[];
 }
 
-interface DetailType {
-  section: SubDetailType;
-  labelText: SubDetailType;
-  labelIcon: SubDetailType;
+interface ElementsType {
+  section: SubElementsType;
+  labelText: SubElementsType;
+  labelIcon: SubElementsType;
 }
 
 function makeSubElement(
   fillLayers: string[],
   strokeLayers: string[]
-): SubDetailType {
+): SubElementsType {
   return { fill: fillLayers, stroke: strokeLayers };
 }
 
@@ -46,10 +46,11 @@ const buildingSectionFill = ['landscape-building', 'building'];
 const buildingSectionStroke = ['building-outline'];
 const buildingLabel = ['building-number-label', 'poi-building-label'];
 
-const naturalSectionFill = ['landscape-natural'];
+const naturalSectionFill = ['landscape-natural', 'national-park'];
 const naturalLabel = ['natural-point-label'];
 
 const landCoverSectionFill = [
+  'land',
   'landscape-landcover',
   'landcover',
   'landuse',
@@ -59,7 +60,7 @@ const landCoverSectionStroke = ['land-structure-line'];
 
 const mountainCoverSectionFill = ['hillshade'];
 
-const layersByType: { [key in LandscapeSubFeature]: DetailType } = {
+const layersByType: { [key in LandscapeSubFeature]: ElementsType } = {
   'human-made': {
     [SECTION]: makeSubElement(humanMadeSectionFill, humanMadeSectionStroke),
     [LABELTEXT]: makeSubElement([], []),
@@ -276,14 +277,16 @@ function landscapeStyling({
   if (!type) {
     return;
   }
+
+  let layerNames =
+    layersByType[subFeature as LandscapeSubFeature][element][subElement];
   if (
     key === 'visibility' &&
     (type === ColorType.icon || type === WeightType.textHalo)
   ) {
     func({
       map,
-      layerNames:
-        layersByType[subFeature as LandscapeSubFeature][element][subElement],
+      layerNames,
       type,
       weight: style.visibility === 'none' ? INVISIBLE : VISIBLE,
     });
@@ -292,16 +295,24 @@ function landscapeStyling({
   if (key === 'visibility') {
     func({
       map,
-      layerNames:
-        layersByType[subFeature as LandscapeSubFeature][element][subElement],
+      layerNames,
       visibility: style.visibility,
     });
   }
 
+  if (layerNames.includes('land')) {
+    func({
+      map,
+      layerNames: ['land'],
+      type: ColorType.background,
+      color: style.color,
+    });
+    layerNames = layerNames.filter((item) => item !== 'land');
+  }
+
   func({
     map,
-    layerNames:
-      layersByType[subFeature as LandscapeSubFeature][element][subElement],
+    layerNames,
     type: type as StyleTypes,
     color: style.color,
     [key]: style[key as StyleKeyType],

From 05594828040868fee3b22b27c8a2fac5a3c11630 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 14:19:12 +0900
Subject: [PATCH 116/138] =?UTF-8?q?[refactor]=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=B3=80=EC=88=98=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/sidebar/useStyleType.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index 2c79394..6f610e5 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -3,7 +3,6 @@ import { useSelector, useDispatch } from 'react-redux';
 import { useCallback } from 'react';
 import { RootState } from '../../store';
 import {
-  FeatureNameType,
   StyleType,
   StyleKeyType,
   ElementNameType,

From 6f8db7138f7cdc240eaa41067e0feb6e78397f52 Mon Sep 17 00:00:00 2001
From: gitgitwi <johnwi@knou.ac.kr>
Date: Thu, 3 Dec 2020 16:24:21 +0900
Subject: [PATCH 117/138] =?UTF-8?q?[FEAT]=20Sidebar=20=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=20=EC=A0=80=EC=9E=A5=20=EC=9C=84=ED=95=9C=20action/reducer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Feature/Element 선택 내용에 대한 상태 저장
---
 src/store/sidebar/action.ts  | 46 ++++++++++++++++++++++++++
 src/store/sidebar/reducer.ts | 63 ++++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 src/store/sidebar/action.ts
 create mode 100644 src/store/sidebar/reducer.ts

diff --git a/src/store/sidebar/action.ts b/src/store/sidebar/action.ts
new file mode 100644
index 0000000..58c00d3
--- /dev/null
+++ b/src/store/sidebar/action.ts
@@ -0,0 +1,46 @@
+import {
+  FeatureNameType,
+  ElementNameType,
+  SubElementNameType,
+} from '../common/type';
+
+export const SET_FEATURE = 'SET_FEATURE' as const;
+export const SET_SUBFEATURE = 'SET_SUBFEATURE' as const;
+export const SET_ELEMENT = 'SET_ELEMENT' as const;
+export const SET_SUBELEMENT = 'SET_SUBELEMENT' as const;
+
+export interface SidebarActionType {
+  type:
+    | typeof SET_FEATURE
+    | typeof SET_SUBFEATURE
+    | typeof SET_ELEMENT
+    | typeof SET_SUBELEMENT;
+  payload: {
+    feature?: FeatureNameType;
+    subFeature?: string;
+    element?: ElementNameType;
+    subElement?: SubElementNameType;
+  };
+}
+
+export const setFeature = (feature: FeatureNameType): SidebarActionType => ({
+  type: SET_FEATURE,
+  payload: { feature },
+});
+
+export const setSubFeature = (subFeature: string): SidebarActionType => ({
+  type: SET_SUBFEATURE,
+  payload: { subFeature },
+});
+
+export const setElement = (element: ElementNameType): SidebarActionType => ({
+  type: SET_ELEMENT,
+  payload: { element },
+});
+
+export const setSubElement = (
+  subElement: SubElementNameType
+): SidebarActionType => ({
+  type: SET_SUBELEMENT,
+  payload: { subElement },
+});
diff --git a/src/store/sidebar/reducer.ts b/src/store/sidebar/reducer.ts
new file mode 100644
index 0000000..90193d2
--- /dev/null
+++ b/src/store/sidebar/reducer.ts
@@ -0,0 +1,63 @@
+import {
+  FeatureNameType,
+  ElementNameType,
+  SubElementNameType,
+  SidebarActionType,
+} from '../common/type';
+import {
+  SET_FEATURE,
+  SET_SUBFEATURE,
+  SET_ELEMENT,
+  SET_SUBELEMENT,
+} from './action';
+
+interface SidebarStateType {
+  feature?: FeatureNameType | '';
+  subFeature?: string;
+  element?: ElementNameType | '';
+  subElement?: SubElementNameType | '';
+}
+
+const initialState: SidebarStateType = {
+  feature: '',
+  subFeature: '',
+  element: '',
+  subElement: '',
+};
+
+function sidebarReducer(
+  state: SidebarStateType = initialState,
+  action: SidebarActionType
+): SidebarStateType {
+  switch (action.type) {
+    case SET_FEATURE: {
+      return {
+        ...state,
+        feature: action.payload.feature,
+      };
+    }
+    case SET_SUBFEATURE: {
+      return {
+        ...state,
+        subFeature: action.payload.subFeature,
+      };
+    }
+    case SET_ELEMENT: {
+      return {
+        ...state,
+        element: action.payload.element,
+      };
+    }
+    case SET_SUBELEMENT: {
+      return {
+        ...state,
+
+        subElement: action.payload.subElement,
+      };
+    }
+    default:
+      return state;
+  }
+}
+
+export default sidebarReducer;

From 5cb852cbb8864deb1096b2586958618953088c4d Mon Sep 17 00:00:00 2001
From: gitgitwi <johnwi@knou.ac.kr>
Date: Thu, 3 Dec 2020 16:25:21 +0900
Subject: [PATCH 118/138] =?UTF-8?q?[FEAT]=20Sidebar=20action=20type=20?=
 =?UTF-8?q?=EC=A7=80=EC=A0=95=20=EB=B0=8F=20store=20=EC=A0=80=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/common/type.ts | 11 +++++++++++
 src/store/index.ts       |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index 1b7dc90..3ff2e9a 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -1,4 +1,10 @@
 import { init, setStyle } from '../style/action';
+import {
+  setFeature,
+  setSubFeature,
+  setElement,
+  setSubElement,
+} from '../sidebar/action';
 
 export type hello = 'landmark';
 
@@ -70,6 +76,11 @@ export interface ElementPropsType extends FeaturePropsType {
 }
 
 export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
+export type SidebarActionType =
+  | ReturnType<typeof setFeature>
+  | ReturnType<typeof setSubFeature>
+  | ReturnType<typeof setElement>
+  | ReturnType<typeof setSubElement>;
 
 export interface ActionPayload extends ElementPropsType {
   style: StyleType;
diff --git a/src/store/index.ts b/src/store/index.ts
index 439bf20..b18bbb9 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -10,6 +10,7 @@ import {
   waterReducer as water,
   markerReducer as marker,
 } from './style/reducer';
+import sidebar from './sidebar/reducer';
 
 const rootReducer = combineReducers({
   map,
@@ -20,6 +21,7 @@ const rootReducer = combineReducers({
   transit,
   water,
   marker,
+  sidebar,
 });
 
 const store = createStore(rootReducer);

From 4f60cdeb7645d7ae0fbe6427fe42071fa858dbcb Mon Sep 17 00:00:00 2001
From: gitgitwi <johnwi@knou.ac.kr>
Date: Thu, 3 Dec 2020 16:28:07 +0900
Subject: [PATCH 119/138] =?UTF-8?q?[FEAT]=20sidebar=20hooks=EC=97=90=20act?=
 =?UTF-8?q?ion=20=EB=B0=8F=20dispatcher=20=EB=93=B1=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 각각의 Type/SubType에 맞는 action 등록
---
 src/hooks/sidebar/useSidebarType.ts | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/hooks/sidebar/useSidebarType.ts b/src/hooks/sidebar/useSidebarType.ts
index 835c1a8..12fa538 100644
--- a/src/hooks/sidebar/useSidebarType.ts
+++ b/src/hooks/sidebar/useSidebarType.ts
@@ -1,4 +1,16 @@
 import { useState } from 'react';
+import { useDispatch } from 'react-redux';
+import {
+  setFeature,
+  setSubFeature,
+  setElement,
+  setSubElement,
+} from '../../store/sidebar/action';
+import {
+  FeatureNameType,
+  ElementNameType,
+  SubElementNameType,
+} from '../../store/common/type';
 
 export interface SidebarHookType {
   sidebarTypeClickHandler: (name: string) => void;
@@ -10,15 +22,33 @@ export interface SidebarHookType {
 function useSidebarType(): SidebarHookType {
   const [sidebarTypeName, setSidebarTypeName] = useState<string>('');
   const [sidebarSubTypeName, setSidebarSubTypeName] = useState<string>('');
+  const dispatch = useDispatch();
 
   const sidebarTypeClickHandler = (name: string) => {
     if (name !== sidebarTypeName) {
+      if (
+        name === ElementNameType.section ||
+        name === ElementNameType.labelText ||
+        name === ElementNameType.labelIcon
+      ) {
+        dispatch(setElement(name as ElementNameType));
+      } else {
+        dispatch(setFeature(name as FeatureNameType));
+      }
       setSidebarTypeName(name);
     }
   };
 
   const sidebarSubTypeClickHandler = (name: string) => {
     if (name !== sidebarSubTypeName) {
+      if (
+        name === SubElementNameType.fill ||
+        name === SubElementNameType.stroke
+      ) {
+        dispatch(setSubElement(name));
+      } else {
+        dispatch(setSubFeature(name));
+      }
       setSidebarSubTypeName(name);
     }
   };

From c9db4ad4c582eb1b9eaa797a6a6aa3cf58e01d7f Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 18:52:30 +0900
Subject: [PATCH 120/138] =?UTF-8?q?[feat]=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?=
 =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=95=A1=EC=85=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기존 스토어 상태와 동일한 형태로 전달받도록 하였고, 대신 변경되는 값만 전달되도록 하였음
---
 src/store/common/type.ts      | 32 ++++++++++++++++++++++++++++++--
 src/store/style/action.ts     | 15 ++++++++++++++-
 src/store/style/getReducer.ts |  2 +-
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index 1b7dc90..5b5ebe0 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -1,4 +1,4 @@
-import { init, setStyle } from '../style/action';
+import { init, setStyle, setWholeStyle } from '../style/action';
 
 export type hello = 'landmark';
 
@@ -69,12 +69,40 @@ export interface ElementPropsType extends FeaturePropsType {
   subElement?: SubElementNameType;
 }
 
-export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
+export type ActionType =
+  | ReturnType<typeof init>
+  | ReturnType<typeof setStyle>
+  | ReturnType<typeof setWholeStyle>;
 
 export interface ActionPayload extends ElementPropsType {
   style: StyleType;
 }
 
+export interface StyleActionPayload {
+  isChanged?: boolean;
+  visibility?: string;
+  color?: string;
+  weight?: number;
+  saturation?: number;
+  lightness?: number;
+}
+export interface SubElementActionPayload {
+  [SubElementNameType.fill]?: StyleActionPayload;
+  [SubElementNameType.stroke]?: StyleActionPayload;
+}
+
+export interface ElemetnActionPayload {
+  [ElementNameType.section]?: SubElementActionPayload;
+  [ElementNameType.labelText]?: SubElementActionPayload;
+  [ElementNameType.labelIcon]?: StyleActionPayload;
+}
+
+export type WholeStyleActionPayload = {
+  [featureName in FeatureNameType]?: {
+    [subFeatureName: string]: ElemetnActionPayload;
+  };
+};
+
 export interface StylePropsType {
   [SubElementNameType.fill]: string;
   [SubElementNameType.stroke]: string;
diff --git a/src/store/style/action.ts b/src/store/style/action.ts
index 441ec31..23ae85f 100644
--- a/src/store/style/action.ts
+++ b/src/store/style/action.ts
@@ -1,13 +1,19 @@
-import { ActionPayload } from '../common/type';
+import { ActionPayload, WholeStyleActionPayload } from '../common/type';
 
 export const INIT = 'INIT' as const;
 export const SET = 'SET' as const;
+export const SET_WHOLE = 'SET_WHOLE' as const;
 
 export interface SetType {
   type: typeof SET;
   payload: ActionPayload;
 }
 
+export interface SetWholeType {
+  type: typeof SET_WHOLE;
+  payload: WholeStyleActionPayload;
+}
+
 export const init = (): { type: typeof INIT } => ({
   type: INIT,
 });
@@ -22,3 +28,10 @@ export const setStyle = ({
   type: SET,
   payload: { feature, subFeature, element, subElement, style },
 });
+
+export const setWholeStyle = (
+  wholeStyle: WholeStyleActionPayload
+): SetWholeType => ({
+  type: SET_WHOLE,
+  payload: wholeStyle,
+});
diff --git a/src/store/style/getReducer.ts b/src/store/style/getReducer.ts
index b835704..1315887 100644
--- a/src/store/style/getReducer.ts
+++ b/src/store/style/getReducer.ts
@@ -10,7 +10,7 @@ import {
   SubElementType,
 } from '../common/type';
 import { getDefaultFeature } from './properties';
-import { INIT, SET } from './action';
+import { INIT, SET, SET_WHOLE } from './action';
 import { checkStyleIsChanged, checkFeatureIsChanged } from './compareStyle';
 
 interface ReducerType {

From 7dc5f8484886384a961fb94bbaababa01d3fde07 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 18:53:25 +0900
Subject: [PATCH 121/138] =?UTF-8?q?[feat]=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?=
 =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=88=98=EC=A0=95=20reducer=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 변경된 사항만 업데이트 하기 위해서 combine 함수 만들었음
---
 src/store/style/getReducer.ts       | 19 +++++++++++++
 src/store/style/manageCategories.ts | 41 +++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 src/store/style/manageCategories.ts

diff --git a/src/store/style/getReducer.ts b/src/store/style/getReducer.ts
index 1315887..9ea77d9 100644
--- a/src/store/style/getReducer.ts
+++ b/src/store/style/getReducer.ts
@@ -12,6 +12,7 @@ import {
 import { getDefaultFeature } from './properties';
 import { INIT, SET, SET_WHOLE } from './action';
 import { checkStyleIsChanged, checkFeatureIsChanged } from './compareStyle';
+import { combineCategory } from './manageCategories';
 
 interface ReducerType {
   (state: FeatureState, action: ActionType): FeatureState;
@@ -72,6 +73,24 @@ export default function getReducer(IDX: number): ReducerType {
 
         return newState;
       }
+      case SET_WHOLE: {
+        const inputStyle = action.payload[renderingData[IDX].typeKey];
+        const updateStyle = JSON.parse(JSON.stringify(initialState));
+
+        if (!inputStyle) return updateStyle;
+
+        const categories = Object.keys(updateStyle);
+        categories.forEach((category) => {
+          combineCategory({
+            element: category as ElementNameType,
+            elementStyle: inputStyle[category],
+            initialElementStyle: updateStyle[category],
+          });
+        });
+
+        return updateStyle;
+      }
+
       default:
         return state;
     }
diff --git a/src/store/style/manageCategories.ts b/src/store/style/manageCategories.ts
new file mode 100644
index 0000000..6703daf
--- /dev/null
+++ b/src/store/style/manageCategories.ts
@@ -0,0 +1,41 @@
+import {
+  ElementNameType,
+  SubElementActionPayload,
+  StyleActionPayload,
+  ElemetnActionPayload,
+} from '../common/type';
+
+interface combineCatecoryProps {
+  element: ElementNameType;
+  elementStyle: ElemetnActionPayload;
+  initialElementStyle: ElemetnActionPayload;
+}
+
+export function combineCategory({
+  element,
+  elementStyle,
+  initialElementStyle,
+}: combineCatecoryProps): ElemetnActionPayload {
+  const update = initialElementStyle;
+  if (element === 'labelIcon' && elementStyle[element]) {
+    (update[element] as StyleActionPayload) = {
+      ...update[element],
+      ...elementStyle[element],
+    };
+    return update;
+  }
+
+  const verifiedCategory = elementStyle[element] as SubElementActionPayload;
+  const verifiedUpdate = update[element] as SubElementActionPayload;
+
+  if (verifiedCategory.fill) {
+    verifiedUpdate.fill = { ...verifiedUpdate.fill, ...verifiedCategory.fill };
+  }
+  if (verifiedCategory.stroke) {
+    verifiedUpdate.stroke = {
+      ...verifiedUpdate.stroke,
+      ...verifiedCategory.stroke,
+    };
+  }
+  return update;
+}

From 6fccd90a1aec1071b67a56a4514d11ba0072eebc Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 18:55:08 +0900
Subject: [PATCH 122/138] =?UTF-8?q?[feat]=20=EC=A0=84=EC=B2=B4=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EB=B3=80=EA=B2=BD=20hook=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- input으로 전달된 값을 스토어로 dispatch 하도록 하였음.
- 아직 맵 스타일도 수정하는 부분이 빠져있음
- 전체 레이어 업데이트 시간이 걸릴 것 같아서.. 논의가 필요함
---
 src/hooks/common/useWholeStyle.ts | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/hooks/common/useWholeStyle.ts

diff --git a/src/hooks/common/useWholeStyle.ts b/src/hooks/common/useWholeStyle.ts
new file mode 100644
index 0000000..6f1297c
--- /dev/null
+++ b/src/hooks/common/useWholeStyle.ts
@@ -0,0 +1,26 @@
+import mapboxgl from 'mapbox-gl';
+import { useSelector, useDispatch } from 'react-redux';
+import { RootState } from '../../store';
+import { setWholeStyle } from '../../store/style/action';
+import { WholeStyleActionPayload } from '../../store/common/type';
+import * as mapStyling from '../../utils/map-styling';
+
+interface WholeStyleHook {
+  changeStyle: (inputStyle: WholeStyleActionPayload) => void;
+}
+
+function useWholeStyle(): WholeStyleHook {
+  const dispatch = useDispatch();
+
+  const map = useSelector<RootState>((state) => state.map.map) as mapboxgl.Map;
+
+  const changeStyle = (inputStyle: WholeStyleActionPayload): void => {
+    dispatch(setWholeStyle(inputStyle));
+  };
+
+  return {
+    changeStyle,
+  };
+}
+
+export default useWholeStyle;

From d7b84b316992d614e2e8ccfda4017f14397465c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 21:17:11 +0900
Subject: [PATCH 123/138] =?UTF-8?q?[feat]=20redux=EC=97=90=20sidebar?=
 =?UTF-8?q?=EC=9D=98=20=EC=83=81=ED=83=9C=EB=A5=BC=20=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20state=EB=A5=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- sidebar의 상태를 관리하기 위하여 reducer와 action을 추가하였다
- feature subFeature element SubElement의 네개의 상태를 저장한다
---
 src/store/common/type.ts     | 22 ++++++-------
 src/store/sidebar/action.ts  | 61 ++++++++++++++----------------------
 src/store/sidebar/reducer.ts | 59 +++++++++-------------------------
 3 files changed, 49 insertions(+), 93 deletions(-)

diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index 3ff2e9a..094d7e0 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -1,10 +1,5 @@
 import { init, setStyle } from '../style/action';
-import {
-  setFeature,
-  setSubFeature,
-  setElement,
-  setSubElement,
-} from '../sidebar/action';
+import { setSidebarProperties, initSidebarProperties } from '../sidebar/action';
 
 export type hello = 'landmark';
 
@@ -77,15 +72,20 @@ export interface ElementPropsType extends FeaturePropsType {
 
 export type ActionType = ReturnType<typeof init> | ReturnType<typeof setStyle>;
 export type SidebarActionType =
-  | ReturnType<typeof setFeature>
-  | ReturnType<typeof setSubFeature>
-  | ReturnType<typeof setElement>
-  | ReturnType<typeof setSubElement>;
-
+  | ReturnType<typeof setSidebarProperties>
+  | ReturnType<typeof initSidebarProperties>;
 export interface ActionPayload extends ElementPropsType {
   style: StyleType;
 }
 
+export interface PayloadPropsType {
+  key: 'feature' | 'subFeature' | 'element' | 'subElement';
+  feature: FeatureNameType | null;
+  subFeature: string | null;
+  element: ElementNameType | null;
+  subElement: SubElementNameType | null;
+}
+
 export interface StylePropsType {
   [SubElementNameType.fill]: string;
   [SubElementNameType.stroke]: string;
diff --git a/src/store/sidebar/action.ts b/src/store/sidebar/action.ts
index 58c00d3..cb040f7 100644
--- a/src/store/sidebar/action.ts
+++ b/src/store/sidebar/action.ts
@@ -1,46 +1,31 @@
-import {
-  FeatureNameType,
-  ElementNameType,
-  SubElementNameType,
-} from '../common/type';
+import { PayloadPropsType } from '../common/type';
 
-export const SET_FEATURE = 'SET_FEATURE' as const;
-export const SET_SUBFEATURE = 'SET_SUBFEATURE' as const;
-export const SET_ELEMENT = 'SET_ELEMENT' as const;
-export const SET_SUBELEMENT = 'SET_SUBELEMENT' as const;
+export const SET_SIDEBAR_PROPERTIES = 'SET_SIDEBAR_PROPERTIES' as const;
+export const INIT_SIDEBAR_PROPERTIES = 'INIT_SIDEBAR_PROPERTIES' as const;
 
 export interface SidebarActionType {
-  type:
-    | typeof SET_FEATURE
-    | typeof SET_SUBFEATURE
-    | typeof SET_ELEMENT
-    | typeof SET_SUBELEMENT;
-  payload: {
-    feature?: FeatureNameType;
-    subFeature?: string;
-    element?: ElementNameType;
-    subElement?: SubElementNameType;
-  };
+  type: typeof SET_SIDEBAR_PROPERTIES | typeof INIT_SIDEBAR_PROPERTIES;
+  payload: PayloadPropsType;
 }
 
-export const setFeature = (feature: FeatureNameType): SidebarActionType => ({
-  type: SET_FEATURE,
-  payload: { feature },
+export const setSidebarProperties = ({
+  key,
+  feature,
+  subFeature,
+  element,
+  subElement,
+}: PayloadPropsType): SidebarActionType => ({
+  type: SET_SIDEBAR_PROPERTIES,
+  payload: { key, feature, subFeature, element, subElement },
 });
 
-export const setSubFeature = (subFeature: string): SidebarActionType => ({
-  type: SET_SUBFEATURE,
-  payload: { subFeature },
-});
-
-export const setElement = (element: ElementNameType): SidebarActionType => ({
-  type: SET_ELEMENT,
-  payload: { element },
-});
-
-export const setSubElement = (
-  subElement: SubElementNameType
-): SidebarActionType => ({
-  type: SET_SUBELEMENT,
-  payload: { subElement },
+export const initSidebarProperties = ({
+  key,
+  feature,
+  subFeature,
+  element,
+  subElement,
+}: PayloadPropsType): SidebarActionType => ({
+  type: INIT_SIDEBAR_PROPERTIES,
+  payload: { key, feature, subFeature, element, subElement },
 });
diff --git a/src/store/sidebar/reducer.ts b/src/store/sidebar/reducer.ts
index 90193d2..bc79666 100644
--- a/src/store/sidebar/reducer.ts
+++ b/src/store/sidebar/reducer.ts
@@ -1,58 +1,29 @@
-import {
-  FeatureNameType,
-  ElementNameType,
-  SubElementNameType,
-  SidebarActionType,
-} from '../common/type';
-import {
-  SET_FEATURE,
-  SET_SUBFEATURE,
-  SET_ELEMENT,
-  SET_SUBELEMENT,
-} from './action';
+import { PayloadPropsType, SidebarActionType } from '../common/type';
+import { SET_SIDEBAR_PROPERTIES, INIT_SIDEBAR_PROPERTIES } from './action';
 
-interface SidebarStateType {
-  feature?: FeatureNameType | '';
-  subFeature?: string;
-  element?: ElementNameType | '';
-  subElement?: SubElementNameType | '';
-}
-
-const initialState: SidebarStateType = {
-  feature: '',
-  subFeature: '',
-  element: '',
-  subElement: '',
+const initialState: PayloadPropsType = {
+  key: 'feature',
+  feature: null,
+  subFeature: null,
+  element: null,
+  subElement: null,
 };
 
 function sidebarReducer(
-  state: SidebarStateType = initialState,
+  state: PayloadPropsType = initialState,
   action: SidebarActionType
-): SidebarStateType {
+): PayloadPropsType {
   switch (action.type) {
-    case SET_FEATURE: {
-      return {
-        ...state,
-        feature: action.payload.feature,
-      };
-    }
-    case SET_SUBFEATURE: {
+    case SET_SIDEBAR_PROPERTIES: {
       return {
         ...state,
-        subFeature: action.payload.subFeature,
+        [action.payload.key]: action.payload[action.payload.key],
       };
     }
-    case SET_ELEMENT: {
+    case INIT_SIDEBAR_PROPERTIES: {
       return {
-        ...state,
-        element: action.payload.element,
-      };
-    }
-    case SET_SUBELEMENT: {
-      return {
-        ...state,
-
-        subElement: action.payload.subElement,
+        ...initialState,
+        [action.payload.key]: action.payload[action.payload.key],
       };
     }
     default:

From 382da11f9f6719f98125b06d3f65456014330c21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 21:19:20 +0900
Subject: [PATCH 124/138] =?UTF-8?q?[refactor]=20feature=20Component?=
 =?UTF-8?q?=EC=99=80=20hook=EC=9D=84=20sidebarProperties=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=EB=A5=BC=20=EB=B0=9B=EC=95=84=EC=98=A4=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- useSidebar에서 feature / subFeature를 다루었었지만, 상태로 뺌으로서 store에서 필요한  항목을 가져오는 것으로 변경하였다
- 따라서 props로 feature / subFeature를 전달하는 것이 사라지게 된다
---
 .../SidebarContentMore/FeatureType.tsx        | 21 ++---
 .../SidebarContentMore/FeatureTypeItem.tsx    | 24 +++---
 src/hooks/sidebar/useFeatureTypeItem.ts       | 13 ++-
 src/hooks/sidebar/useSidebarType.ts           | 84 +++++++++++--------
 4 files changed, 84 insertions(+), 58 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/FeatureType.tsx b/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
index 9818601..4bba352 100644
--- a/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
@@ -6,12 +6,12 @@ import DetailType from './DetailType';
 import useSidebarType, {
   SidebarHookType,
 } from '../../../hooks/sidebar/useSidebarType';
-import { FeatureNameType } from '../../../store/common/type';
+// import { FeatureNameType } from '../../../store/common/type';
 
 import FeatureTypeItem from './FeatureTypeItem';
 
 interface WrapperProps {
-  isFeatureName: string;
+  isFeatureName: string | null;
 }
 
 const FeatureTypeWrapper = styled.ul<WrapperProps>`
@@ -29,33 +29,28 @@ const FeatureTypeTitle = styled.h2`
 
 function FeatureType(): React.ReactElement {
   const {
+    feature,
+    // subFeature,
     sidebarTypeClickHandler,
     sidebarSubTypeClickHandler,
-    sidebarTypeName,
-    sidebarSubTypeName,
   }: SidebarHookType = useSidebarType();
 
   return (
     <>
-      <FeatureTypeWrapper isFeatureName={sidebarTypeName}>
+      <FeatureTypeWrapper isFeatureName={feature}>
         <FeatureTypeTitle>기능 유형</FeatureTypeTitle>
-        {data.map(({ typeKey, typeName, features }) => (
+        {data.map(({ typeKey, typeName, subFeatures }) => (
           <FeatureTypeItem
             key={typeKey}
             typeKey={typeKey}
             typeName={typeName}
-            features={features}
-            sidebarTypeName={sidebarTypeName}
-            sidebarSubTypeName={sidebarSubTypeName}
+            subFeatures={subFeatures}
             sidebarTypeClickHandler={sidebarTypeClickHandler}
             sidebarSubTypeClickHandler={sidebarSubTypeClickHandler}
           />
         ))}
       </FeatureTypeWrapper>
-      <DetailType
-        feature={sidebarTypeName as FeatureNameType}
-        subFeature={sidebarSubTypeName}
-      />
+      <DetailType />
     </>
   );
 }
diff --git a/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx b/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx
index cf44206..f80d752 100644
--- a/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx
+++ b/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
 import { FeaturesType } from '../../../utils/rendering-data/featureTypeData';
-import { FeatureNameType } from '../../../store/common/type';
+import { FeatureNameType, FeatureState } from '../../../store/common/type';
 import useFeatureTypeItemHook from '../../../hooks/sidebar/useFeatureTypeItem';
 
 interface ListProps {
@@ -60,9 +60,9 @@ const Pointer = styled.span`
 interface FeatureTypeItemProps {
   typeKey: FeatureNameType;
   typeName: string;
-  features: FeaturesType[];
-  sidebarTypeName: string;
-  sidebarSubTypeName: string;
+  subFeatures: FeaturesType[];
+  // sidebarTypeName: string;
+  // sidebarSubTypeName: string;
   sidebarTypeClickHandler: (name: string) => void;
   sidebarSubTypeClickHandler: (name: string) => void;
 }
@@ -70,18 +70,20 @@ interface FeatureTypeItemProps {
 function FeatureTypeItem({
   typeKey,
   typeName,
-  features,
-  sidebarTypeName,
-  sidebarSubTypeName,
+  subFeatures,
+  // sidebarTypeName,
+  // sidebarSubTypeName,
   sidebarTypeClickHandler,
   sidebarSubTypeClickHandler,
 }: FeatureTypeItemProps): React.ReactElement {
-  const { featureList } = useFeatureTypeItemHook({ featureName: typeKey });
+  const { featureList, feature, subFeature } = useFeatureTypeItemHook({
+    featureName: typeKey,
+  });
 
   return (
     <>
       <FeatureList
-        isChecked={sidebarTypeName === typeKey && sidebarSubTypeName === 'all'}
+        isChecked={feature === typeKey && subFeature === 'all'}
         onClick={() => {
           sidebarTypeClickHandler(typeKey);
           sidebarSubTypeClickHandler('all');
@@ -91,10 +93,10 @@ function FeatureTypeItem({
         {typeName}
         <Pointer>{'>'}</Pointer>
       </FeatureList>
-      {features?.map(({ key, name }) => (
+      {subFeatures.map(({ key, name }) => (
         <SectionList
           key={key}
-          isChecked={sidebarSubTypeName === key}
+          isChecked={subFeature === key}
           onClick={() => {
             sidebarTypeClickHandler(typeKey);
             sidebarSubTypeClickHandler(key);
diff --git a/src/hooks/sidebar/useFeatureTypeItem.ts b/src/hooks/sidebar/useFeatureTypeItem.ts
index 994c51a..eb510d3 100644
--- a/src/hooks/sidebar/useFeatureTypeItem.ts
+++ b/src/hooks/sidebar/useFeatureTypeItem.ts
@@ -1,9 +1,15 @@
 import { useSelector } from 'react-redux';
 import { RootState } from '../../store';
-import { FeatureState, FeatureNameType } from '../../store/common/type';
+import {
+  FeatureState,
+  FeatureNameType,
+  PayloadPropsType,
+} from '../../store/common/type';
 
 interface useFeatureTypeItemType {
   featureList: FeatureState;
+  feature: FeatureNameType | null;
+  subFeature: string | null;
 }
 
 export interface useFeatureTypeItemProps {
@@ -13,12 +19,17 @@ export interface useFeatureTypeItemProps {
 function useFeatureTypeItem({
   featureName,
 }: useFeatureTypeItemProps): useFeatureTypeItemType {
+  const { feature, subFeature } = useSelector<RootState>(
+    (state) => state.sidebar
+  ) as PayloadPropsType;
   const featureList = useSelector<RootState>(
     (state) => state[featureName]
   ) as FeatureState;
 
   return {
     featureList,
+    feature,
+    subFeature,
   };
 }
 
diff --git a/src/hooks/sidebar/useSidebarType.ts b/src/hooks/sidebar/useSidebarType.ts
index 12fa538..26f2b72 100644
--- a/src/hooks/sidebar/useSidebarType.ts
+++ b/src/hooks/sidebar/useSidebarType.ts
@@ -1,63 +1,81 @@
-import { useState } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import {
-  setFeature,
-  setSubFeature,
-  setElement,
-  setSubElement,
+  setSidebarProperties,
+  initSidebarProperties,
 } from '../../store/sidebar/action';
+import { RootState } from '../../store/index';
 import {
   FeatureNameType,
   ElementNameType,
   SubElementNameType,
+  PayloadPropsType,
 } from '../../store/common/type';
 
 export interface SidebarHookType {
   sidebarTypeClickHandler: (name: string) => void;
   sidebarSubTypeClickHandler: (name: string) => void;
-  sidebarTypeName: string;
-  sidebarSubTypeName: string;
+  feature: FeatureNameType | null;
+  subFeature: string | null;
+  element: ElementNameType | null;
+  subElement: SubElementNameType | null;
 }
 
 function useSidebarType(): SidebarHookType {
-  const [sidebarTypeName, setSidebarTypeName] = useState<string>('');
-  const [sidebarSubTypeName, setSidebarSubTypeName] = useState<string>('');
   const dispatch = useDispatch();
+  const sidebarStates = useSelector<RootState>(
+    (state) => state.sidebar
+  ) as PayloadPropsType;
+  const { feature, subFeature, element, subElement } = sidebarStates;
 
   const sidebarTypeClickHandler = (name: string) => {
-    if (name !== sidebarTypeName) {
-      if (
-        name === ElementNameType.section ||
-        name === ElementNameType.labelText ||
-        name === ElementNameType.labelIcon
-      ) {
-        dispatch(setElement(name as ElementNameType));
-      } else {
-        dispatch(setFeature(name as FeatureNameType));
-      }
-      setSidebarTypeName(name);
+    if ([feature, element].includes(name as any)) return;
+    if (Object.keys(ElementNameType).includes(name)) {
+      dispatch(
+        setSidebarProperties({
+          ...sidebarStates,
+          element: name as ElementNameType,
+          key: 'element',
+        })
+      );
+    } else {
+      dispatch(
+        initSidebarProperties({
+          ...sidebarStates,
+          feature: name as FeatureNameType,
+          key: 'feature',
+        })
+      );
     }
   };
 
   const sidebarSubTypeClickHandler = (name: string) => {
-    if (name !== sidebarSubTypeName) {
-      if (
-        name === SubElementNameType.fill ||
-        name === SubElementNameType.stroke
-      ) {
-        dispatch(setSubElement(name));
-      } else {
-        dispatch(setSubFeature(name));
-      }
-      setSidebarSubTypeName(name);
+    if ([subFeature, subElement].includes(name)) return;
+    if (Object.keys(SubElementNameType).includes(name)) {
+      dispatch(
+        setSidebarProperties({
+          ...sidebarStates,
+          subElement: name as SubElementNameType,
+          key: 'subElement',
+        })
+      );
+    } else {
+      dispatch(
+        setSidebarProperties({
+          ...sidebarStates,
+          subFeature: name,
+          key: 'subFeature',
+        })
+      );
     }
   };
 
   return {
     sidebarTypeClickHandler,
     sidebarSubTypeClickHandler,
-    sidebarTypeName,
-    sidebarSubTypeName,
+    feature,
+    subFeature,
+    element,
+    subElement,
   };
 }
 

From 7b040a6ec014d8602c6aa458050c77c310a095c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 21:21:51 +0900
Subject: [PATCH 125/138] =?UTF-8?q?[refactor]=20=EC=82=AC=EC=9D=B4?=
 =?UTF-8?q?=EB=93=9C=EB=B0=94=EC=97=90=20=ED=95=84=EC=9A=94=ED=95=9C=20?=
 =?UTF-8?q?=EB=A0=8C=EB=8D=94=EB=A7=81=20=EB=8D=B0=EC=9D=B4=ED=84=B0?=
 =?UTF-8?q?=EC=9D=98=20key=EA=B0=92=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- feature / subFeature로 명명법을 변경하였어서, 맞추어서 데이터의 key값을 변경
---
 src/utils/rendering-data/featureTypeData.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/utils/rendering-data/featureTypeData.ts b/src/utils/rendering-data/featureTypeData.ts
index 7e6a4f7..b79a290 100644
--- a/src/utils/rendering-data/featureTypeData.ts
+++ b/src/utils/rendering-data/featureTypeData.ts
@@ -7,14 +7,14 @@ export interface FeaturesType {
 export interface DataType {
   typeKey: FeatureNameType;
   typeName: string;
-  features: FeaturesType[];
+  subFeatures: FeaturesType[];
 }
 
 const data: DataType[] = [
   {
     typeKey: FeatureNameType.poi,
     typeName: 'POI',
-    features: [
+    subFeatures: [
       { key: 'landmark', name: '랜드마크' },
       { key: 'business', name: '상업시설' },
       { key: 'government', name: '공공시설' },
@@ -29,7 +29,7 @@ const data: DataType[] = [
   {
     typeKey: FeatureNameType.road,
     typeName: '도로',
-    features: [
+    subFeatures: [
       { key: 'arterial', name: '주요도로' },
       { key: 'local', name: '일반도로' },
       { key: 'sidewalk', name: '인도' },
@@ -38,7 +38,7 @@ const data: DataType[] = [
   {
     typeKey: FeatureNameType.administrative,
     typeName: '행정구역',
-    features: [
+    subFeatures: [
       { key: 'country', name: '국가' },
       { key: 'state', name: '도/주' },
       { key: 'locality', name: '그외' },
@@ -47,7 +47,7 @@ const data: DataType[] = [
   {
     typeKey: FeatureNameType.landscape,
     typeName: '경관',
-    features: [
+    subFeatures: [
       { key: 'human-made', name: '인공물' },
       { key: 'building', name: '건물' },
       { key: 'natural', name: '자연물' },
@@ -58,15 +58,15 @@ const data: DataType[] = [
   {
     typeKey: FeatureNameType.transit,
     typeName: '교통',
-    features: [
+    subFeatures: [
       { key: 'airport', name: '공항' },
       { key: 'bus', name: '버스' },
       { key: 'rail', name: '철도' },
       { key: 'subway', name: '지하철' },
     ],
   },
-  { typeKey: FeatureNameType.water, typeName: '물', features: [] },
-  { typeKey: FeatureNameType.marker, typeName: '마크', features: [] },
+  { typeKey: FeatureNameType.water, typeName: '물', subFeatures: [] },
+  { typeKey: FeatureNameType.marker, typeName: '마크', subFeatures: [] },
 ];
 
 export default data;

From 8febfdcfd78cbc520c5b76e2349657ee07e640f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 21:23:03 +0900
Subject: [PATCH 126/138] =?UTF-8?q?[refactor]=20DetailType=20Component?=
 =?UTF-8?q?=EC=99=80=20hook=EC=9D=84=20sidebarProperties=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=EB=A5=BC=20=EB=B0=9B=EC=95=84=EC=98=A4=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 이전의 커밋과 동일하게 현재 선택된 사이드바의 정보들을 스토어에서 받아온다.
- 따라서 props로 전달하는 양이 줄어든다
---
 .../Sidebar/SidebarContentMore/DetailType.tsx | 30 +++++++----------
 src/hooks/sidebar/useDetailType.ts            | 32 ++++++++-----------
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index 4f147b2..3734c10 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -62,13 +62,12 @@ const CheckRight = styled.div`
   color: ${(props) => props.theme.GREEN};
 `;
 
-function DetailType({
-  feature,
-  subFeature,
-}: FeaturePropsType): React.ReactElement {
+function DetailType(): React.ReactElement {
   const {
-    sidebarTypeName,
-    sidebarSubTypeName,
+    feature,
+    subFeature,
+    element,
+    subElement,
     sidebarTypeClickHandler,
     sidebarSubTypeClickHandler,
   }: SidebarHookType = useSidebarType();
@@ -80,10 +79,6 @@ function DetailType({
   }: UseDetailHookType = useDetailType({
     sidebarTypeClickHandler,
     sidebarSubTypeClickHandler,
-    sidebarTypeName,
-    sidebarSubTypeName,
-    feature,
-    subFeature,
   });
 
   if (!feature) {
@@ -115,8 +110,8 @@ function DetailType({
             {section?.stroke.isChanged ? <Check>✓</Check> : <></>}
             <ListItem
               isSelected={
-                sidebarTypeName === ElementNameType.section &&
-                sidebarSubTypeName === SubElementNameType.stroke
+                element === ElementNameType.section &&
+                subElement === SubElementNameType.stroke
               }
               padding="second"
               clickHandler={() => {
@@ -193,12 +188,11 @@ function DetailType({
           )}
         </List>
       </DetailWrapper>
-      <Styler
-        feature={feature}
-        subFeature={subFeature}
-        element={sidebarTypeName as ElementNameType}
-        subElement={sidebarSubTypeName as SubElementNameType}
-      />
+      {element ? <Styler /> : <></>}
+      {/* // feature={feature}
+      // subFeature={subFeature}
+      // element={element as ElementNameType}
+      // subElement={subElement as SubElementNameType} */}
     </>
   );
 }
diff --git a/src/hooks/sidebar/useDetailType.ts b/src/hooks/sidebar/useDetailType.ts
index 4fdfb51..5cf67aa 100644
--- a/src/hooks/sidebar/useDetailType.ts
+++ b/src/hooks/sidebar/useDetailType.ts
@@ -1,17 +1,13 @@
 import { useSelector } from 'react-redux';
 import { RootState } from '../../store';
 import {
-  FeatureNameType,
   ElementNameType,
   SubElementNameType,
   FeatureType,
+  PayloadPropsType,
 } from '../../store/common/type';
 
 interface UseDetailTypeProps {
-  feature: FeatureNameType;
-  subFeature: string;
-  sidebarTypeName: string;
-  sidebarSubTypeName: string;
   sidebarTypeClickHandler: (name: string) => void;
   sidebarSubTypeClickHandler: (name: string) => void;
 }
@@ -34,15 +30,15 @@ const dummyDetail = {
 };
 
 function useDetailType({
-  feature,
-  subFeature,
-  sidebarTypeName,
-  sidebarSubTypeName,
   sidebarTypeClickHandler,
   sidebarSubTypeClickHandler,
 }: UseDetailTypeProps): UseDetailHookType {
+  const { feature, subFeature, element, subElement } = useSelector<RootState>(
+    (state) => state.sidebar
+  ) as PayloadPropsType;
+
   const detail = useSelector<RootState>((state) => {
-    if (!feature) {
+    if (!feature || !subFeature) {
       return dummyDetail;
     }
 
@@ -50,19 +46,19 @@ function useDetailType({
   }) as FeatureType;
 
   const styleClickHandler = (
-    element: ElementNameType,
-    subElement?: SubElementNameType
+    elementName: ElementNameType,
+    subElementName?: SubElementNameType
   ) => {
-    sidebarTypeClickHandler(element);
-    if (subElement) sidebarSubTypeClickHandler(subElement);
+    sidebarTypeClickHandler(elementName);
+    if (subElementName) sidebarSubTypeClickHandler(subElementName);
   };
 
   const checkIsSelected = (
-    element: ElementNameType,
-    subElement?: SubElementNameType
+    elementName: ElementNameType,
+    subElementName?: SubElementNameType
   ) => {
-    if (!subElement) return sidebarTypeName === element;
-    return sidebarTypeName === element && sidebarSubTypeName === subElement;
+    if (!subElementName) return elementName === element;
+    return elementName === element && subElementName === subElement;
   };
 
   return {

From 6a487590df4db8e93cfd98353ad881ab98a6b49c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 21:24:39 +0900
Subject: [PATCH 127/138] =?UTF-8?q?[refactor]=20Style=20Component=EC=99=80?=
 =?UTF-8?q?=20hook=EC=9D=84=20sidebarProperties=EC=83=81=ED=83=9C=EB=A5=BC?=
 =?UTF-8?q?=20=EB=B0=9B=EC=95=84=EC=98=A4=EB=8F=84=EB=A1=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 이전 커밋과 마찬가지로 현재 선택한 사이드바의 요소들을 스토어에서 가져온다
- 따라서 props로 전달받는 것이 줄어들게 된다.
---
 .../Sidebar/SidebarContentMore/Styler.tsx     | 15 ++--------
 src/hooks/sidebar/useStyleType.ts             | 29 ++++++++++++++-----
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/Styler.tsx b/src/components/Sidebar/SidebarContentMore/Styler.tsx
index 34d2ed0..c096380 100644
--- a/src/components/Sidebar/SidebarContentMore/Styler.tsx
+++ b/src/components/Sidebar/SidebarContentMore/Styler.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
-import { ElementPropsType } from '../../../store/common/type';
+// import { ElementPropsType } from '../../../store/common/type';
 import useStyleType, {
   UseStyleHookType,
 } from '../../../hooks/sidebar/useStyleType';
@@ -35,21 +35,12 @@ const Hr = styled.hr`
   color: ${(props) => props.theme.GREY};
 `;
 
-function Styler({
-  feature,
-  subFeature,
-  element,
-  subElement,
-}: ElementPropsType): React.ReactElement {
+function Styler(): React.ReactElement {
   const {
     styleElement: { visibility, color, weight, saturation, lightness },
     onStyleChange,
-  }: UseStyleHookType = useStyleType({
-    feature,
-    subFeature,
     element,
-    subElement,
-  });
+  }: UseStyleHookType = useStyleType();
 
   if (!element) {
     return <></>;
diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index 6f610e5..f3c4870 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -8,6 +8,8 @@ import {
   ElementNameType,
   SubElementNameType,
   ElementPropsType,
+  PayloadPropsType,
+  FeatureNameType,
 } from '../../store/common/type';
 import { setStyle } from '../../store/style/action';
 import { getDefaultStyle } from '../../store/style/properties';
@@ -16,26 +18,34 @@ import * as mapStyling from '../../utils/map-styling';
 export interface UseStyleHookType {
   styleElement: StyleType;
   onStyleChange: (key: StyleKeyType, value: string | number) => void;
+  element: ElementNameType | null;
 }
 
-function useStyleType({
-  feature,
-  subFeature,
-  element,
-  subElement,
-}: ElementPropsType): UseStyleHookType {
+function useStyleType(): UseStyleHookType {
+  //   {
+  //   feature,
+  //   subFeature,
+  //   element,
+  //   subElement,
+  // }: ElementPropsType
   const dispatch = useDispatch();
 
+  const { feature, subFeature, element, subElement } = useSelector<RootState>(
+    (state) => state.sidebar
+  ) as PayloadPropsType;
   const map = useSelector<RootState>((state) => state.map.map) as mapboxgl.Map;
   const styleElement = useSelector<RootState>((state) => {
-    if (!element) {
+    if (!feature || !subFeature || !element) {
+      // ?!?
       return getDefaultStyle({
         feature,
         subFeature,
         element,
         subElement,
-      });
+      } as ElementPropsType);
     }
+    // if (!feature || !subFeature || !element) return null;
+    console.log(state, feature, subFeature);
     const newFeature = state[feature][subFeature];
     if (element === ElementNameType.labelIcon) return newFeature[element];
     return newFeature[element][subElement as SubElementNameType];
@@ -43,6 +53,8 @@ function useStyleType({
 
   const onStyleChange = useCallback(
     (key: StyleKeyType, value: string | number) => {
+      if (!feature || !subFeature || !element || !subElement) return;
+
       mapStyling[feature]({
         map,
         subFeature,
@@ -74,6 +86,7 @@ function useStyleType({
   return {
     styleElement,
     onStyleChange,
+    element,
   };
 }
 

From 8b039e0bf45c2802ebf7423359b71e94101c4e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 21:26:29 +0900
Subject: [PATCH 128/138] =?UTF-8?q?[fix]=20getReducer=EC=9D=98=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 렌더링 데이터의 key값 변경으로 알맞게 바꾸어줌
---
 src/store/style/getReducer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/style/getReducer.ts b/src/store/style/getReducer.ts
index b835704..b9ecb80 100644
--- a/src/store/style/getReducer.ts
+++ b/src/store/style/getReducer.ts
@@ -20,7 +20,7 @@ interface ReducerType {
 export default function getReducer(IDX: number): ReducerType {
   const subFeatures = [
     'all',
-    ...(renderingData[IDX].features?.map((v) => v.key) as string[]),
+    ...(renderingData[IDX].subFeatures?.map((v) => v.key) as string[]),
   ];
 
   const initialState = subFeatures.reduce((acc: FeatureState, cur: string) => {

From e82d174d2d58482999d2a66a0a8c0da91c7e9f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 21:39:15 +0900
Subject: [PATCH 129/138] =?UTF-8?q?[refactor]=20useStyleType=20=EC=A3=BC?=
 =?UTF-8?q?=EC=84=9D=20=EC=82=AD=EC=A0=9C=ED=9B=84=20=EB=B6=88=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EB=A1=9C=EC=A7=81=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 주석을 삭제
- getDefaultStyle은 더이상 필요없다. 사이드바의 상태관리를 스토어에서 해주고, 그것을 필요한 컴포넌트들이 받아쓰기 때문이다
---
 src/hooks/sidebar/useStyleType.ts | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/hooks/sidebar/useStyleType.ts b/src/hooks/sidebar/useStyleType.ts
index f3c4870..756eafb 100644
--- a/src/hooks/sidebar/useStyleType.ts
+++ b/src/hooks/sidebar/useStyleType.ts
@@ -7,12 +7,9 @@ import {
   StyleKeyType,
   ElementNameType,
   SubElementNameType,
-  ElementPropsType,
   PayloadPropsType,
-  FeatureNameType,
 } from '../../store/common/type';
 import { setStyle } from '../../store/style/action';
-import { getDefaultStyle } from '../../store/style/properties';
 import * as mapStyling from '../../utils/map-styling';
 
 export interface UseStyleHookType {
@@ -22,12 +19,6 @@ export interface UseStyleHookType {
 }
 
 function useStyleType(): UseStyleHookType {
-  //   {
-  //   feature,
-  //   subFeature,
-  //   element,
-  //   subElement,
-  // }: ElementPropsType
   const dispatch = useDispatch();
 
   const { feature, subFeature, element, subElement } = useSelector<RootState>(
@@ -36,16 +27,9 @@ function useStyleType(): UseStyleHookType {
   const map = useSelector<RootState>((state) => state.map.map) as mapboxgl.Map;
   const styleElement = useSelector<RootState>((state) => {
     if (!feature || !subFeature || !element) {
-      // ?!?
-      return getDefaultStyle({
-        feature,
-        subFeature,
-        element,
-        subElement,
-      } as ElementPropsType);
+      return null;
     }
-    // if (!feature || !subFeature || !element) return null;
-    console.log(state, feature, subFeature);
+
     const newFeature = state[feature][subFeature];
     if (element === ElementNameType.labelIcon) return newFeature[element];
     return newFeature[element][subElement as SubElementNameType];

From 2010bc1904f3aa5f55b2c9d2751b5d72286f935a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 21:40:55 +0900
Subject: [PATCH 130/138] =?UTF-8?q?[refactor]=20=EC=9D=BC=EB=B6=80=20hook?=
 =?UTF-8?q?=EB=93=A4=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0=ED=9B=84=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=85=20=EB=AA=85=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 주석을 제거
- sidebarTypeClickHandler를 사용하는 함수의 input type을 string대신 좀 더 명시적으로 지정해주었다
---
 .../Sidebar/SidebarContentMore/FeatureTypeItem.tsx        | 8 ++------
 src/hooks/sidebar/useDetailType.ts                        | 3 ++-
 src/hooks/sidebar/useSidebarType.ts                       | 6 +++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx b/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx
index f80d752..95f193b 100644
--- a/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx
+++ b/src/components/Sidebar/SidebarContentMore/FeatureTypeItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
 import { FeaturesType } from '../../../utils/rendering-data/featureTypeData';
-import { FeatureNameType, FeatureState } from '../../../store/common/type';
+import { FeatureNameType, ElementNameType } from '../../../store/common/type';
 import useFeatureTypeItemHook from '../../../hooks/sidebar/useFeatureTypeItem';
 
 interface ListProps {
@@ -61,9 +61,7 @@ interface FeatureTypeItemProps {
   typeKey: FeatureNameType;
   typeName: string;
   subFeatures: FeaturesType[];
-  // sidebarTypeName: string;
-  // sidebarSubTypeName: string;
-  sidebarTypeClickHandler: (name: string) => void;
+  sidebarTypeClickHandler: (name: FeatureNameType | ElementNameType) => void;
   sidebarSubTypeClickHandler: (name: string) => void;
 }
 
@@ -71,8 +69,6 @@ function FeatureTypeItem({
   typeKey,
   typeName,
   subFeatures,
-  // sidebarTypeName,
-  // sidebarSubTypeName,
   sidebarTypeClickHandler,
   sidebarSubTypeClickHandler,
 }: FeatureTypeItemProps): React.ReactElement {
diff --git a/src/hooks/sidebar/useDetailType.ts b/src/hooks/sidebar/useDetailType.ts
index 5cf67aa..76cb81d 100644
--- a/src/hooks/sidebar/useDetailType.ts
+++ b/src/hooks/sidebar/useDetailType.ts
@@ -1,6 +1,7 @@
 import { useSelector } from 'react-redux';
 import { RootState } from '../../store';
 import {
+  FeatureNameType,
   ElementNameType,
   SubElementNameType,
   FeatureType,
@@ -8,7 +9,7 @@ import {
 } from '../../store/common/type';
 
 interface UseDetailTypeProps {
-  sidebarTypeClickHandler: (name: string) => void;
+  sidebarTypeClickHandler: (name: FeatureNameType | ElementNameType) => void;
   sidebarSubTypeClickHandler: (name: string) => void;
 }
 
diff --git a/src/hooks/sidebar/useSidebarType.ts b/src/hooks/sidebar/useSidebarType.ts
index 26f2b72..971f5d0 100644
--- a/src/hooks/sidebar/useSidebarType.ts
+++ b/src/hooks/sidebar/useSidebarType.ts
@@ -12,7 +12,7 @@ import {
 } from '../../store/common/type';
 
 export interface SidebarHookType {
-  sidebarTypeClickHandler: (name: string) => void;
+  sidebarTypeClickHandler: (name: FeatureNameType | ElementNameType) => void;
   sidebarSubTypeClickHandler: (name: string) => void;
   feature: FeatureNameType | null;
   subFeature: string | null;
@@ -27,8 +27,8 @@ function useSidebarType(): SidebarHookType {
   ) as PayloadPropsType;
   const { feature, subFeature, element, subElement } = sidebarStates;
 
-  const sidebarTypeClickHandler = (name: string) => {
-    if ([feature, element].includes(name as any)) return;
+  const sidebarTypeClickHandler = (name: FeatureNameType | ElementNameType) => {
+    if ([feature, element].includes(name)) return;
     if (Object.keys(ElementNameType).includes(name)) {
       dispatch(
         setSidebarProperties({

From 75878bcd19f2345c5b6124715f53ae94cfde790d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 21:41:50 +0900
Subject: [PATCH 131/138] =?UTF-8?q?[refactor]=20=EB=B6=88=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 불필요한 주석들을 제거
---
 src/components/Sidebar/SidebarContentMore/DetailType.tsx  | 2 --
 src/components/Sidebar/SidebarContentMore/FeatureType.tsx | 2 --
 src/components/Sidebar/SidebarContentMore/Styler.tsx      | 1 -
 3 files changed, 5 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index 3734c10..b859bcf 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -11,7 +11,6 @@ import Styler from './Styler';
 import {
   ElementNameType,
   SubElementNameType,
-  FeaturePropsType,
 } from '../../../store/common/type';
 
 interface PaddingProp {
@@ -65,7 +64,6 @@ const CheckRight = styled.div`
 function DetailType(): React.ReactElement {
   const {
     feature,
-    subFeature,
     element,
     subElement,
     sidebarTypeClickHandler,
diff --git a/src/components/Sidebar/SidebarContentMore/FeatureType.tsx b/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
index 4bba352..7cc1b16 100644
--- a/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/FeatureType.tsx
@@ -6,7 +6,6 @@ import DetailType from './DetailType';
 import useSidebarType, {
   SidebarHookType,
 } from '../../../hooks/sidebar/useSidebarType';
-// import { FeatureNameType } from '../../../store/common/type';
 
 import FeatureTypeItem from './FeatureTypeItem';
 
@@ -30,7 +29,6 @@ const FeatureTypeTitle = styled.h2`
 function FeatureType(): React.ReactElement {
   const {
     feature,
-    // subFeature,
     sidebarTypeClickHandler,
     sidebarSubTypeClickHandler,
   }: SidebarHookType = useSidebarType();
diff --git a/src/components/Sidebar/SidebarContentMore/Styler.tsx b/src/components/Sidebar/SidebarContentMore/Styler.tsx
index c096380..92fb730 100644
--- a/src/components/Sidebar/SidebarContentMore/Styler.tsx
+++ b/src/components/Sidebar/SidebarContentMore/Styler.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import styled from '../../../utils/styles/styled';
-// import { ElementPropsType } from '../../../store/common/type';
 import useStyleType, {
   UseStyleHookType,
 } from '../../../hooks/sidebar/useStyleType';

From fbd15cf687bb35869680148204dd1b761e08d499 Mon Sep 17 00:00:00 2001
From: tejava <goddrinktejava@gmail.com>
Date: Thu, 3 Dec 2020 22:25:24 +0900
Subject: [PATCH 132/138] =?UTF-8?q?[feat]=20DetailType.tsx=20=EB=A6=AC?=
 =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

이전 상태는 isChanged 등 이벤트 발생 조건이 각각 함수 literal로 지정되어있었습니다.
이를 줄이고자 각각의 단계에 따라서 변화하는 공통의 DetailTypeSubList을 만들었습니다.
항목이 2단계 1단계 등 다양하게 나뉘어져있어 일반화하는 대신 객체 형태로 전달하는 걸 고려해봤습니다.
각각은 내부에 하위 항목을 값으로 가지고 있고,
이 내부 값이 빈 경우 최하위 항목으로 설정되도록 작동합니다.
---
 .../Sidebar/SidebarContentMore/DetailType.tsx | 168 ++++++------------
 .../SidebarContentMore/DetailTypeSubList.tsx  | 114 ++++++++++++
 2 files changed, 172 insertions(+), 110 deletions(-)
 create mode 100644 src/components/Sidebar/SidebarContentMore/DetailTypeSubList.tsx

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index 4f147b2..0dbd5b7 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -3,7 +3,7 @@ import styled from '../../../utils/styles/styled';
 import useSidebarType, {
   SidebarHookType,
 } from '../../../hooks/sidebar/useSidebarType';
-import ListItem, { paddingStepType, paddingStep } from './DetailTypeItem';
+import ListItem from './DetailTypeItem';
 import useDetailType, {
   UseDetailHookType,
 } from '../../../hooks/sidebar/useDetailType';
@@ -14,9 +14,7 @@ import {
   FeaturePropsType,
 } from '../../../store/common/type';
 
-interface PaddingProp {
-  padding: paddingStepType;
-}
+import DetailTypeSubList from './DetailTypeSubList';
 
 const DetailWrapper = styled.div`
   width: 230px;
@@ -39,14 +37,6 @@ const List = styled.ul`
   margin-bottom: 30px;
 `;
 
-const Text = styled.h3<PaddingProp>`
-  margin: 10px 0;
-  padding-left: ${(props) => paddingStep[props.padding]};
-  font-size: 1.7rem;
-  font-weight: 600;
-  color: ${(props) => props.theme.GREY};
-`;
-
 const Check = styled.div`
   position: absolute;
   font-size: 1.2rem;
@@ -54,14 +44,6 @@ const Check = styled.div`
   color: ${(props) => props.theme.GREEN};
 `;
 
-const CheckRight = styled.div`
-  position: absolute;
-  left: 10px;
-  font-size: 1.2rem;
-  font-weight: 600;
-  color: ${(props) => props.theme.GREEN};
-`;
-
 function DetailType({
   feature,
   subFeature,
@@ -95,103 +77,69 @@ function DetailType({
       <DetailWrapper>
         <Title>세부 유형</Title>
         {section ? (
+          <DetailTypeSubList
+            title="구역"
+            checkIsSelected={checkIsSelected}
+            styleClickHandler={styleClickHandler}
+            childrenProps={[
+              {
+                isChanged: section?.fill.isChanged,
+                elementName: ElementNameType.section,
+                subElementName: SubElementNameType.fill,
+                title: '채우기',
+                childrenProps: [],
+              },
+              {
+                isChanged: section?.stroke.isChanged,
+                elementName: ElementNameType.section,
+                subElementName: SubElementNameType.stroke,
+                title: '윤곽선',
+                childrenProps: [],
+              },
+            ]}
+          />
+        ) : null}
+        {labelText ? (
+          <DetailTypeSubList
+            title="라벨"
+            checkIsSelected={checkIsSelected}
+            styleClickHandler={styleClickHandler}
+            childrenProps={[
+              {
+                title: '텍스트',
+                childrenProps: [
+                  {
+                    isChanged: labelText?.fill.isChanged,
+                    title: '채우기',
+                    elementName: ElementNameType.labelText,
+                    subElementName: SubElementNameType.fill,
+                    childrenProps: [],
+                  },
+                  {
+                    isChanged: labelText?.stroke.isChanged,
+                    title: '윤곽선',
+                    elementName: ElementNameType.labelText,
+                    subElementName: SubElementNameType.stroke,
+                    childrenProps: [],
+                  },
+                ],
+              },
+            ]}
+          />
+        ) : null}
+        {labelIcon ? (
           <List>
-            <Text padding="first">구역</Text>
-            {section?.fill.isChanged ? <Check>✓</Check> : <></>}
-            <ListItem
-              isSelected={checkIsSelected(
-                ElementNameType.section,
-                SubElementNameType.fill
-              )}
-              padding="second"
-              clickHandler={() => {
-                styleClickHandler(
-                  ElementNameType.section,
-                  SubElementNameType.fill
-                );
-              }}
-              name="채우기"
-            />
-            {section?.stroke.isChanged ? <Check>✓</Check> : <></>}
+            {labelIcon.isChanged ? <Check>✓</Check> : <></>}
             <ListItem
-              isSelected={
-                sidebarTypeName === ElementNameType.section &&
-                sidebarSubTypeName === SubElementNameType.stroke
-              }
+              isSelected={checkIsSelected(ElementNameType.labelIcon)}
               padding="second"
               clickHandler={() => {
-                styleClickHandler(
-                  ElementNameType.section,
-                  SubElementNameType.stroke
-                );
+                styleClickHandler(ElementNameType.labelIcon);
               }}
-              name="윤곽선"
+              name="아이콘"
             />
           </List>
-        ) : (
-          <></>
-        )}
-        <List>
-          {labelText ? (
-            <>
-              <Text padding="first">라벨</Text>
-              <List>
-                <Text padding="second">텍스트</Text>
-                {labelText?.fill.isChanged ? <CheckRight>✓</CheckRight> : <></>}
-                <ListItem
-                  isSelected={checkIsSelected(
-                    ElementNameType.labelText,
-                    SubElementNameType.fill
-                  )}
-                  padding="third"
-                  clickHandler={() => {
-                    styleClickHandler(
-                      ElementNameType.labelText,
-                      SubElementNameType.fill
-                    );
-                  }}
-                  name="채우기"
-                />
-                {labelText?.stroke.isChanged ? (
-                  <CheckRight>✓</CheckRight>
-                ) : (
-                  <></>
-                )}
-                <ListItem
-                  isSelected={checkIsSelected(
-                    ElementNameType.labelText,
-                    SubElementNameType.stroke
-                  )}
-                  padding="third"
-                  clickHandler={() => {
-                    styleClickHandler(
-                      ElementNameType.labelText,
-                      SubElementNameType.stroke
-                    );
-                  }}
-                  name="윤곽선"
-                />
-              </List>
-            </>
-          ) : (
-            <></>
-          )}
-          {labelIcon ? (
-            <>
-              {labelIcon.isChanged ? <Check>✓</Check> : <></>}
-              <ListItem
-                isSelected={checkIsSelected(ElementNameType.labelIcon)}
-                padding="second"
-                clickHandler={() => {
-                  styleClickHandler(ElementNameType.labelIcon);
-                }}
-                name="아이콘"
-              />
-            </>
-          ) : (
-            <></>
-          )}
-        </List>
+        ) : null}
       </DetailWrapper>
       <Styler
         feature={feature}
diff --git a/src/components/Sidebar/SidebarContentMore/DetailTypeSubList.tsx b/src/components/Sidebar/SidebarContentMore/DetailTypeSubList.tsx
new file mode 100644
index 0000000..f70a6bd
--- /dev/null
+++ b/src/components/Sidebar/SidebarContentMore/DetailTypeSubList.tsx
@@ -0,0 +1,114 @@
+import React from 'react';
+import styled from '../../../utils/styles/styled';
+import ListItem, { paddingStepType, paddingStep } from './DetailTypeItem';
+import {
+  ElementNameType,
+  SubElementNameType,
+} from '../../../store/common/type';
+
+interface PaddingProp {
+  padding: paddingStepType;
+}
+
+export const List = styled.ul`
+  position: relative;
+  margin-bottom: 30px;
+`;
+
+export const Text = styled.h3<PaddingProp>`
+  margin: 10px 0;
+  padding-left: ${(props) => paddingStep[props.padding]};
+  font-size: 1.7rem;
+  font-weight: 600;
+  color: ${(props) => props.theme.GREY};
+`;
+
+export const Check = styled.div`
+  position: absolute;
+  font-size: 1.2rem;
+  font-weight: 600;
+  color: ${(props) => props.theme.GREEN};
+`;
+
+interface ChildrenType {
+  isChanged?: boolean;
+  title: string;
+  elementName?: string;
+  subElementName?: string;
+  childrenProps: ChildrenType[];
+}
+
+interface PropsType {
+  title: string;
+  checkIsSelected: (
+    elementName: ElementNameType,
+    subElementName?: SubElementNameType | undefined
+  ) => boolean;
+  styleClickHandler: (
+    elementName: ElementNameType,
+    subElementName?: SubElementNameType | undefined
+  ) => void;
+  childrenProps: ChildrenType[];
+}
+
+function DetailTypeSubList({
+  title,
+  checkIsSelected,
+  styleClickHandler,
+  childrenProps,
+}: PropsType): React.ReactElement {
+  const childComponent = childrenProps.map((child: ChildrenType) => {
+    return child.childrenProps.length !== 0 ? (
+      <div>
+        <Text padding="second">{child.title}</Text>
+        {child.childrenProps.map((innerChild) => {
+          return (
+            <div>
+              {innerChild.isChanged ? <Check>✓</Check> : null}
+              <ListItem
+                isSelected={checkIsSelected(
+                  innerChild.elementName as ElementNameType,
+                  innerChild.subElementName as SubElementNameType
+                )}
+                padding="third"
+                clickHandler={() => {
+                  styleClickHandler(
+                    innerChild.elementName as ElementNameType,
+                    innerChild.subElementName as SubElementNameType
+                  );
+                }}
+                name={innerChild.title}
+              />
+            </div>
+          );
+        })}
+      </div>
+    ) : (
+      <div>
+        {child.isChanged ? <Check>✓</Check> : null}
+        <ListItem
+          isSelected={checkIsSelected(
+            child.elementName as ElementNameType,
+            child.subElementName as SubElementNameType
+          )}
+          padding="second"
+          clickHandler={() => {
+            styleClickHandler(
+              child.elementName as ElementNameType,
+              child.subElementName as SubElementNameType
+            );
+          }}
+          name={child.title}
+        />
+      </div>
+    );
+  });
+  return (
+    <List>
+      <Text padding="first">{title}</Text>
+      {childComponent}
+    </List>
+  );
+}
+
+export default DetailTypeSubList;

From d63b7de82985c116ab53a6d0d3b9351427f7302d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 22:36:21 +0900
Subject: [PATCH 133/138] =?UTF-8?q?[feat]=20react-router=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=20=ED=9B=84=20=EB=A1=9C=EA=B3=A0=20=ED=99=94=EB=A9=B4=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- react-router추가
- 라우팅으로 로고 화면을 보여주도록 함
---
 package-lock.json   | 115 ++++++++++++++++++++++++++++++++++++++++++++
 package.json        |   2 +
 src/App.tsx         |   9 +++-
 src/index.tsx       |  15 +++---
 src/pages/Entry.tsx |   5 +-
 5 files changed, 138 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e34ecd1..79101d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2491,6 +2491,12 @@
         "@types/node": "*"
       }
     },
+    "@types/history": {
+      "version": "4.7.8",
+      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.8.tgz",
+      "integrity": "sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==",
+      "dev": true
+    },
     "@types/hoist-non-react-statics": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
@@ -2619,6 +2625,27 @@
         "redux": "^4.0.0"
       }
     },
+    "@types/react-router": {
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.8.tgz",
+      "integrity": "sha512-HzOyJb+wFmyEhyfp4D4NYrumi+LQgQL/68HvJO+q6XtuHSDvw6Aqov7sCAhjbNq3bUPgPqbdvjXC5HeB2oEAPg==",
+      "dev": true,
+      "requires": {
+        "@types/history": "*",
+        "@types/react": "*"
+      }
+    },
+    "@types/react-router-dom": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.1.6.tgz",
+      "integrity": "sha512-gjrxYqxz37zWEdMVvQtWPFMFj1dRDb4TGOcgyOfSXTrEXdF92L00WE3C471O3TV/RF1oskcStkXsOU0Ete4s/g==",
+      "dev": true,
+      "requires": {
+        "@types/history": "*",
+        "@types/react": "*",
+        "@types/react-router": "*"
+      }
+    },
     "@types/redux": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/@types/redux/-/redux-3.6.0.tgz",
@@ -7469,6 +7496,19 @@
       "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
     },
+    "history": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
+      "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "loose-envify": "^1.2.0",
+        "resolve-pathname": "^3.0.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0",
+        "value-equal": "^1.0.1"
+      }
+    },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -10452,6 +10492,15 @@
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="
     },
+    "mini-create-react-context": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz",
+      "integrity": "sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==",
+      "requires": {
+        "@babel/runtime": "^7.12.1",
+        "tiny-warning": "^1.0.3"
+      }
+    },
     "mini-css-extract-plugin": {
       "version": "0.11.3",
       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.3.tgz",
@@ -12938,6 +12987,52 @@
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
       "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="
     },
+    "react-router": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
+      "integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "history": "^4.9.0",
+        "hoist-non-react-statics": "^3.1.0",
+        "loose-envify": "^1.3.1",
+        "mini-create-react-context": "^0.4.0",
+        "path-to-regexp": "^1.7.0",
+        "prop-types": "^15.6.2",
+        "react-is": "^16.6.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "path-to-regexp": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+          "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+          "requires": {
+            "isarray": "0.0.1"
+          }
+        }
+      }
+    },
+    "react-router-dom": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
+      "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "history": "^4.9.0",
+        "loose-envify": "^1.3.1",
+        "prop-types": "^15.6.2",
+        "react-router": "5.2.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      }
+    },
     "react-scripts": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.0.tgz",
@@ -13550,6 +13645,11 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
     },
+    "resolve-pathname": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
+      "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
+    },
     "resolve-protobuf-schema": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
@@ -15312,6 +15412,16 @@
       "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
     },
+    "tiny-invariant": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz",
+      "integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw=="
+    },
+    "tiny-warning": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+    },
     "tinyqueue": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
@@ -15780,6 +15890,11 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
+    "value-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
+      "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
+    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
diff --git a/package.json b/package.json
index 7f40996..121fc91 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-redux": "^7.2.2",
+    "react-router-dom": "^5.2.0",
     "react-scripts": "4.0.0",
     "redux": "^4.0.5",
     "redux-devtools-extension": "^2.13.8",
@@ -52,6 +53,7 @@
   "devDependencies": {
     "@types/mapbox-gl": "^1.12.7",
     "@types/react-redux": "^7.1.11",
+    "@types/react-router-dom": "^5.1.6",
     "@types/redux": "^3.6.0",
     "@typescript-eslint/eslint-plugin": "^4.8.0",
     "@typescript-eslint/parser": "^4.8.0",
diff --git a/src/App.tsx b/src/App.tsx
index 7aeff5d..0d03ff9 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,9 +1,16 @@
 import React from 'react';
+import { Route, Switch } from 'react-router-dom';
 import Main from './pages/Main';
+import Entry from './pages/Entry';
 
 /** 추후에 라우팅해야되면 수정할 예정 */
 function App(): React.ReactElement {
-  return <Main />;
+  return (
+    <Switch>
+      <Route path="/" exact component={Entry} />
+      <Route path="/map" component={Main} />
+    </Switch>
+  );
 }
 
 export default App;
diff --git a/src/index.tsx b/src/index.tsx
index 1293c73..b5c7f69 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import { BrowserRouter } from 'react-router-dom';
 import { ThemeProvider } from 'emotion-theming';
 import App from './App';
 
@@ -11,12 +12,14 @@ import store from './store';
 
 ReactDOM.render(
   <React.StrictMode>
-    <Provider store={store}>
-      <ThemeProvider theme={theme}>
-        <GlobalStyle />
-        <App />
-      </ThemeProvider>
-    </Provider>
+    <BrowserRouter>
+      <Provider store={store}>
+        <ThemeProvider theme={theme}>
+          <GlobalStyle />
+          <App />
+        </ThemeProvider>
+      </Provider>
+    </BrowserRouter>
   </React.StrictMode>,
   document.getElementById('root')
 );
diff --git a/src/pages/Entry.tsx b/src/pages/Entry.tsx
index 412aea8..b13b996 100644
--- a/src/pages/Entry.tsx
+++ b/src/pages/Entry.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { Link } from 'react-router-dom';
 import Canvas from '../components/Canvas';
 import styled from '../utils/styles/styled';
 
@@ -44,7 +45,9 @@ function Entry(): React.ReactElement {
     <BackGround>
       <Container>
         <Canvas />
-        <StartButton>시작하기</StartButton>
+        <StartButton>
+          <Link to="/map">시작하기</Link>
+        </StartButton>
       </Container>
     </BackGround>
   );

From c86affd645bd82e6cc54a9d1ee1ba71d1222edfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Thu, 3 Dec 2020 22:36:54 +0900
Subject: [PATCH 134/138] =?UTF-8?q?[fix]=20=EB=A0=8C=EB=8D=94=EB=A7=81=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=A7=80=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기능유형 feature > feature이동 시 세부유형이 렌더링이 되지않았음
- 기존 조건 검사가 막고있었어서 제거하는 것으로 해결
- enum으로 묶어서 key를 관리할 수 있도록 하고 넘길 떄 enum을 사용해서 넘김
---
 src/hooks/sidebar/useSidebarType.ts | 10 +++++-----
 src/store/common/type.ts            |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/hooks/sidebar/useSidebarType.ts b/src/hooks/sidebar/useSidebarType.ts
index 971f5d0..d38c2f9 100644
--- a/src/hooks/sidebar/useSidebarType.ts
+++ b/src/hooks/sidebar/useSidebarType.ts
@@ -9,6 +9,7 @@ import {
   ElementNameType,
   SubElementNameType,
   PayloadPropsType,
+  SidebarProperties,
 } from '../../store/common/type';
 
 export interface SidebarHookType {
@@ -34,7 +35,7 @@ function useSidebarType(): SidebarHookType {
         setSidebarProperties({
           ...sidebarStates,
           element: name as ElementNameType,
-          key: 'element',
+          key: SidebarProperties.element,
         })
       );
     } else {
@@ -42,20 +43,19 @@ function useSidebarType(): SidebarHookType {
         initSidebarProperties({
           ...sidebarStates,
           feature: name as FeatureNameType,
-          key: 'feature',
+          key: SidebarProperties.feature,
         })
       );
     }
   };
 
   const sidebarSubTypeClickHandler = (name: string) => {
-    if ([subFeature, subElement].includes(name)) return;
     if (Object.keys(SubElementNameType).includes(name)) {
       dispatch(
         setSidebarProperties({
           ...sidebarStates,
           subElement: name as SubElementNameType,
-          key: 'subElement',
+          key: SidebarProperties.subElement,
         })
       );
     } else {
@@ -63,7 +63,7 @@ function useSidebarType(): SidebarHookType {
         setSidebarProperties({
           ...sidebarStates,
           subFeature: name,
-          key: 'subFeature',
+          key: SidebarProperties.subFeature,
         })
       );
     }
diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index 094d7e0..065dda1 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -33,6 +33,13 @@ export enum FeatureNameType {
   marker = 'marker',
 }
 
+export enum SidebarProperties {
+  feature = 'feature',
+  subFeature = 'subFeature',
+  element = 'element',
+  subElement = 'subElement',
+}
+
 export interface objType {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [name: string]: any;

From e9755b892a1fefc33089e47f4361fb9575b9245e Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Thu, 3 Dec 2020 23:04:40 +0900
Subject: [PATCH 135/138] =?UTF-8?q?[chore]=20=EC=98=A4=ED=83=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/common/type.ts            | 4 ++--
 src/store/style/manageCategories.ts | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index 5b5ebe0..59e9d83 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -91,7 +91,7 @@ export interface SubElementActionPayload {
   [SubElementNameType.stroke]?: StyleActionPayload;
 }
 
-export interface ElemetnActionPayload {
+export interface ElementActionPayload {
   [ElementNameType.section]?: SubElementActionPayload;
   [ElementNameType.labelText]?: SubElementActionPayload;
   [ElementNameType.labelIcon]?: StyleActionPayload;
@@ -99,7 +99,7 @@ export interface ElemetnActionPayload {
 
 export type WholeStyleActionPayload = {
   [featureName in FeatureNameType]?: {
-    [subFeatureName: string]: ElemetnActionPayload;
+    [subFeatureName: string]: ElementActionPayload;
   };
 };
 
diff --git a/src/store/style/manageCategories.ts b/src/store/style/manageCategories.ts
index 6703daf..9b06f6c 100644
--- a/src/store/style/manageCategories.ts
+++ b/src/store/style/manageCategories.ts
@@ -2,20 +2,20 @@ import {
   ElementNameType,
   SubElementActionPayload,
   StyleActionPayload,
-  ElemetnActionPayload,
+  ElementActionPayload,
 } from '../common/type';
 
 interface combineCatecoryProps {
   element: ElementNameType;
-  elementStyle: ElemetnActionPayload;
-  initialElementStyle: ElemetnActionPayload;
+  elementStyle: ElementActionPayload;
+  initialElementStyle: ElementActionPayload;
 }
 
 export function combineCategory({
   element,
   elementStyle,
   initialElementStyle,
-}: combineCatecoryProps): ElemetnActionPayload {
+}: combineCatecoryProps): ElementActionPayload {
   const update = initialElementStyle;
   if (element === 'labelIcon' && elementStyle[element]) {
     (update[element] as StyleActionPayload) = {

From fa85583b7290fee1b07313c5713c5af59629d98e Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Fri, 4 Dec 2020 01:34:56 +0900
Subject: [PATCH 136/138] =?UTF-8?q?[fix]=20=EA=B8=B0=EC=A1=B4=20=ED=95=A8?=
 =?UTF-8?q?=EC=88=98=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 상태 객체의 subFeature와 element가 혼동되어서 함수를 잘못 구현했음

- 기존 combine 함수를 2개로 분리해서 element(section, labelText, labelIcon) 별로 처리하고 subElement가 있는 경우를 분리된 함수에서 처리하도록 하였음
---
 src/store/style/getReducer.ts       | 14 +++----
 src/store/style/manageCategories.ts | 64 ++++++++++++++++++-----------
 2 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/src/store/style/getReducer.ts b/src/store/style/getReducer.ts
index 9ea77d9..64a0e60 100644
--- a/src/store/style/getReducer.ts
+++ b/src/store/style/getReducer.ts
@@ -12,7 +12,7 @@ import {
 import { getDefaultFeature } from './properties';
 import { INIT, SET, SET_WHOLE } from './action';
 import { checkStyleIsChanged, checkFeatureIsChanged } from './compareStyle';
-import { combineCategory } from './manageCategories';
+import { combineElement } from './manageCategories';
 
 interface ReducerType {
   (state: FeatureState, action: ActionType): FeatureState;
@@ -79,15 +79,13 @@ export default function getReducer(IDX: number): ReducerType {
 
         if (!inputStyle) return updateStyle;
 
-        const categories = Object.keys(updateStyle);
-        categories.forEach((category) => {
-          combineCategory({
-            element: category as ElementNameType,
-            elementStyle: inputStyle[category],
-            initialElementStyle: updateStyle[category],
+        const subFeatures = Object.keys(inputStyle);
+        subFeatures.forEach((subFeature) => {
+          updateStyle[subFeature] = combineElement({
+            elementStyle: inputStyle[subFeature],
+            initialElementStyle: updateStyle[subFeature],
           });
         });
-
         return updateStyle;
       }
 
diff --git a/src/store/style/manageCategories.ts b/src/store/style/manageCategories.ts
index 9b06f6c..b2d5709 100644
--- a/src/store/style/manageCategories.ts
+++ b/src/store/style/manageCategories.ts
@@ -1,41 +1,59 @@
 import {
-  ElementNameType,
   SubElementActionPayload,
-  StyleActionPayload,
   ElementActionPayload,
+  FeatureType,
+  SubElementType,
 } from '../common/type';
 
-interface combineCatecoryProps {
-  element: ElementNameType;
+interface combineElementProps {
   elementStyle: ElementActionPayload;
-  initialElementStyle: ElementActionPayload;
+  initialElementStyle: FeatureType;
 }
 
-export function combineCategory({
-  element,
+export const combineElement = ({
   elementStyle,
   initialElementStyle,
-}: combineCatecoryProps): ElementActionPayload {
+}: combineElementProps): FeatureType => {
   const update = initialElementStyle;
-  if (element === 'labelIcon' && elementStyle[element]) {
-    (update[element] as StyleActionPayload) = {
-      ...update[element],
-      ...elementStyle[element],
+  if (elementStyle.labelIcon && update.labelIcon) {
+    update.labelIcon = {
+      ...update.labelIcon,
+      ...elementStyle.labelIcon,
     };
-    return update;
   }
 
-  const verifiedCategory = elementStyle[element] as SubElementActionPayload;
-  const verifiedUpdate = update[element] as SubElementActionPayload;
-
-  if (verifiedCategory.fill) {
-    verifiedUpdate.fill = { ...verifiedUpdate.fill, ...verifiedCategory.fill };
+  if (elementStyle.labelText && update.labelText) {
+    update.labelText = combineSubElement({
+      subElementStyle: elementStyle.labelText,
+      initialSubElementStyle: update.labelText,
+    });
   }
-  if (verifiedCategory.stroke) {
-    verifiedUpdate.stroke = {
-      ...verifiedUpdate.stroke,
-      ...verifiedCategory.stroke,
-    };
+
+  if (elementStyle.section && update.section) {
+    update.section = combineSubElement({
+      subElementStyle: elementStyle.section,
+      initialSubElementStyle: update.section,
+    });
   }
+
   return update;
+};
+
+interface combineSubElementProps {
+  subElementStyle: SubElementActionPayload;
+  initialSubElementStyle: SubElementType;
 }
+
+const combineSubElement = ({
+  subElementStyle,
+  initialSubElementStyle,
+}: combineSubElementProps): SubElementType => {
+  const update = initialSubElementStyle;
+  if (subElementStyle.fill) {
+    update.fill = { ...update.fill, ...subElementStyle.fill };
+  }
+  if (subElementStyle.stroke) {
+    update.stroke = { ...update.stroke, ...subElementStyle.stroke };
+  }
+  return update as SubElementType;
+};

From f2155e25a17e477d381c9ed9d680d08df8d46935 Mon Sep 17 00:00:00 2001
From: eunsol0410 <eunsollee04@gmail.com>
Date: Fri, 4 Dec 2020 01:36:45 +0900
Subject: [PATCH 137/138] =?UTF-8?q?[feat]=20import=20=EB=AA=A8=EB=8B=AC?=
 =?UTF-8?q?=EC=B0=BD=EC=97=90=20useWholeStyle=20Hook=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- textarea 값이 json 파싱 문제가 있다고 생각했는데, 그게 아니라 json 형식 자체의 문제였음
- 따라서 전달된 json의 형식이 알맞게 왔는지 validation하는 함수가 필요해보임
---
 src/components/Sidebar/SidebarModal/ImportModal.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/Sidebar/SidebarModal/ImportModal.tsx b/src/components/Sidebar/SidebarModal/ImportModal.tsx
index 47403da..5ffd2a2 100644
--- a/src/components/Sidebar/SidebarModal/ImportModal.tsx
+++ b/src/components/Sidebar/SidebarModal/ImportModal.tsx
@@ -8,6 +8,8 @@ import useInputText, {
   InputTextHookType,
 } from '../../../hooks/common/useInputText';
 import CloseIcon from '../../Icon/CloseIcon';
+import useWholeStyle from '../../../hooks/common/useWholeStyle';
+import { WholeStyleActionPayload } from '../../../store/common/type';
 
 const Overlay = styled.div`
   position: fixed;
@@ -116,6 +118,7 @@ function ImportModal({
     }
   );
   const { inputText, onInputChange }: InputTextHookType = useInputText();
+  const { changeStyle } = useWholeStyle();
 
   return (
     <>
@@ -133,6 +136,14 @@ function ImportModal({
           onChange={onInputChange}
         />
         <ModalOKButton onClick={onClickOK}>지도 가져오기</ModalOKButton>
+        <button
+          type="button"
+          onClick={() => {
+            changeStyle(JSON.parse(inputText) as WholeStyleActionPayload);
+          }}
+        >
+          테스트
+        </button>
       </ModalWrapper>
     </>
   );

From 39be470227b5877cdc993f7d85190160ea6c9f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9D=80=EC=8B=9D?= <qkrdmstlr3@naver.com>
Date: Fri, 4 Dec 2020 10:38:11 +0900
Subject: [PATCH 138/138] =?UTF-8?q?[fix]=20github=EC=97=90=EC=84=9C=20pr?=
 =?UTF-8?q?=20merge=20=EC=9D=B4=ED=9B=84=20=EB=B0=9C=EC=83=9D=ED=95=9C=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- github에서 pr merge하고 받아온 뒤 확인해보니 문제가 있어서 해결하였다
-
---
 src/components/Sidebar/SidebarContentMore/DetailType.tsx | 6 +-----
 src/store/common/type.ts                                 | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/Sidebar/SidebarContentMore/DetailType.tsx b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
index ed78125..a602989 100644
--- a/src/components/Sidebar/SidebarContentMore/DetailType.tsx
+++ b/src/components/Sidebar/SidebarContentMore/DetailType.tsx
@@ -43,14 +43,10 @@ const Check = styled.div`
   color: ${(props) => props.theme.GREEN};
 `;
 
-function DetailType({
-  feature,
-  subFeature,
-}: FeaturePropsType): React.ReactElement {
+function DetailType(): React.ReactElement {
   const {
     feature,
     element,
-    subElement,
     sidebarTypeClickHandler,
     sidebarSubTypeClickHandler,
   }: SidebarHookType = useSidebarType();
diff --git a/src/store/common/type.ts b/src/store/common/type.ts
index edaef75..f1593b5 100644
--- a/src/store/common/type.ts
+++ b/src/store/common/type.ts
@@ -77,7 +77,6 @@ export interface ElementPropsType extends FeaturePropsType {
   subElement?: SubElementNameType;
 }
 
-
 export type SidebarActionType =
   | ReturnType<typeof setSidebarProperties>
   | ReturnType<typeof initSidebarProperties>;
@@ -87,12 +86,10 @@ export type ActionType =
   | ReturnType<typeof setStyle>
   | ReturnType<typeof setWholeStyle>;
 
-
 export interface ActionPayload extends ElementPropsType {
   style: StyleType;
 }
 
-
 export interface PayloadPropsType {
   key: 'feature' | 'subFeature' | 'element' | 'subElement';
   feature: FeatureNameType | null;