cleanup: MapComponent.js

redux/slices/database/gisLinesSlice.js

@@ -3,7 +3,7 @@ import { createSlice } from "@reduxjs/toolkit";
 import { fetchGisLinesThunk } from "../../thunks/database/fetchGisLinesThunk";
 
 const gisLinesSlice = createSlice({
-  name: "gisLines",
+  name: "gisLinesFromDatabase",
   initialState: {
     data: [],
     status: "idle",

redux/slices/webService/gisLinesStatusSlice.js

@@ -9,7 +9,7 @@ const initialState = {
 };
 
 export const gisLinesStatusSlice = createSlice({
-  name: "gisLinesStatus",
+  name: "gisLinesStatusFromWebservice",
   initialState,
   reducers: {},
   extraReducers: (builder) => {
@@ -30,4 +30,4 @@ export const gisLinesStatusSlice = createSlice({
 
 export default gisLinesStatusSlice.reducer;
 
-export const selectGisLinesStatus = (state) => state.gisLinesStatus;
+export const selectGisLinesStatusFromWebservice = (state) => state.gisLinesStatusFromWebservice;

redux/slices/webService/userRightsSlice.js

@@ -9,7 +9,7 @@ const initialState = {
 };
 
 export const userRightsSlice = createSlice({
-  name: "userRights",
+  name: "gisUserRightsFromWebservice",
   initialState,
   reducers: {},
   extraReducers: (builder) => {
@@ -30,5 +30,5 @@ export const userRightsSlice = createSlice({
 
 export default userRightsSlice.reducer;
 
-export const selectUserRights = (state) => state.userRights.rights;
-export const selectUserRightsStatus = (state) => state.userRights.status;
+export const selectGisUserRightsFromWebservice = (state) => state.gisUserRightsFromWebservice.rights;
+export const selectGisUserRightsStatus = (state) => state.gisUserRightsFromWebservice.status;

redux/store.js

@@ -17,27 +17,30 @@ import zoomTriggerReducer from "./slices/zoomTriggerSlice";
 import urlParameterReducer from "./slices/urlParameterSlice";
 //-----database------------
 import priorityConfigReducer from "./slices/database/priorityConfigSlice";
-import gisLinesReducer from "./slices/database/gisLinesSlice";
 import poiTypesReducer from "./slices/database/poiTypesSlice";
 import locationDevicesFromDBReducer from "./slices/database/locationDevicesFromDBSlice";
+import gisLinesFromDatabaseReducer from "./slices/database/gisLinesSlice";
 //----webservice------------
 import gisStationsStaticDistrictReducer from "./slices/webservice/gisStationsStaticDistrictSlice";
 import gisStationsStatusDistrictReducer from "./slices/webservice/gisStationsStatusDistrictSlice";
 import gisStationsMeasurementsReducer from "./slices/webservice/gisStationsMeasurementsSlice";
 import gisSystemStaticReducer from "./slices/webservice/gisSystemStaticSlice";
-import gisLinesStatusReducer from "./slices/webservice/gisLinesStatusSlice";
 import userRightsReducer from "./slices/webservice/userRightsSlice";
+import gisLinesStatusFromWebserviceReducer from "./slices/webservice/gisLinesStatusSlice";
 
 export const store = configureStore({
   reducer: {
-    lineVisibility: lineVisibilityReducer,
-    currentPoi: currentPoiReducer,
-    polylineLayerVisible: polylineLayerVisibleReducer,
-    locationDevicesFromDB: locationDevicesFromDBReducer,
     gisStationsStaticDistrict: gisStationsStaticDistrictReducer,
     gisStationsStatusDistrict: gisStationsStatusDistrictReducer,
     gisStationsMeasurements: gisStationsMeasurementsReducer,
     gisSystemStatic: gisSystemStaticReducer,
+    gisUserRightsFromWebservice: userRightsReducer,
+    gisLinesStatusFromWebservice: gisLinesStatusFromWebserviceReducer,
+    gisLinesFromDatabase: gisLinesFromDatabaseReducer,
+    lineVisibility: lineVisibilityReducer,
+    currentPoi: currentPoiReducer,
+    polylineLayerVisible: polylineLayerVisibleReducer,
+    locationDevicesFromDB: locationDevicesFromDBReducer,
     poiTypes: poiTypesReducer,
     addPoiOnPolyline: addPoiOnPolylineReducer,
     polylineContextMenu: polylineContextMenuReducer,
@@ -52,8 +55,5 @@ export const store = configureStore({
     zoomTrigger: zoomTriggerReducer,
     urlParameter: urlParameterReducer,
     priorityConfig: priorityConfigReducer,
-    gisLines: gisLinesReducer,
-    gisLinesStatus: gisLinesStatusReducer,
-    userRights: userRightsReducer,
   },
 });