Источники
+ {/*Источники
*/}-
{sources.map(({ link, name, data }) => {
return (
diff --git a/components/Card/index.ts b/components/Card/index.ts
deleted file mode 100644
index 984b6544..00000000
--- a/components/Card/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { DesktopCard } from './DesktopCard/DesktopCard';
-export { MobileCard } from './MobileCard';
diff --git a/components/Card/Card.tsx b/components/Card/index.tsx
similarity index 99%
rename from components/Card/Card.tsx
rename to components/Card/index.tsx
index cdbdbe84..d93f158c 100644
--- a/components/Card/Card.tsx
+++ b/components/Card/index.tsx
@@ -25,7 +25,6 @@ export function Card({ contentConfig, popupId, popupType }: Props) {
}
setLoading(true);
-
const requestFunction = contentConfig[popupType].oneItemRequest;
const data = await requestFunction(popupId);
diff --git a/components/Filters/FilterGrid.tsx b/components/Filters/FilterGrid.tsx
new file mode 100644
index 00000000..2396f632
--- /dev/null
+++ b/components/Filters/FilterGrid.tsx
@@ -0,0 +1,53 @@
+import React, { ComponentProps, useCallback, useEffect, useState } from 'react';
+import { Checkbox, ListGrid, ListGridItem } from 'ekb';
+
+export type IFilterGridItem = Partial
+ {placemark?.attributes?.WearAndTear} %
+
),
});
}
if (placemark?.attributes?.Series) {
result.push({
- name: 'Серия дома',
- text: placemark?.attributes?.Series,
+ title: 'Серия дома',
+ value: placemark?.attributes?.Series,
});
}
if (placemark?.attributes?.Floors) {
result.push({
- name: 'Количество этажей',
- text: placemark?.attributes?.Floors,
+ title: 'Количество этажей',
+ value: placemark?.attributes?.Floors,
});
}
@@ -137,6 +134,36 @@ export function HousesCardContent() {
isEmergency,
]);
+ const constructionDateInfo = useMemo(() => {
+ const date = String(placemark?.attributes.Year);
+ const result = [
+ {
+ type: 'value',
+ title: 'Когда построили',
+ value: date,
+ },
+ ];
+
+ const constructionYearMatch = date.match(/\d{4}/);
+
+ if (constructionYearMatch) {
+ const constructionYear = Number(constructionYearMatch[0]);
+ const age = new Date().getFullYear() - Number(constructionYear);
+
+ result.push({
+ type: 'value',
+ title: 'Возраст здания',
+ value: `${String(age)} ${getYearNameByValue(age)}`,
+ });
+ }
+
+ if (result.length && aboutHouse.length) {
+ return [{ type: 'divider' }].concat(result as any);
+ }
+
+ return [];
+ }, [aboutHouse.length, placemark?.attributes.Year]);
+
const defaultSources = [
SOURCES_BY_TYPE[SourceType.osm],
SOURCES_BY_TYPE[SourceType.howoldthishouse],
@@ -144,12 +171,18 @@ export function HousesCardContent() {
SOURCES_BY_TYPE[SourceType.domaekb],
];
- if (loading) {
- return (
-
-
- );
+ const facade = facades[placemark?.attributes?.osmId];
+ const facadesSection = [];
+ if (facade) {
+ defaultSources.push(SOURCES_BY_TYPE[SourceType.ekaterinburgdesign]);
+ if (aboutHouse.length || constructionDateInfo.length) {
+ facadesSection.push({ type: 'divider' });
+ }
+ facadesSection.push({
+ type: 'section',
+ title: 'Дизайн-код фасада',
+ value:
-
- {isEmergency && (
-
- )}
- {placemark?.attributes.Year && (
-
-
- )}
-
- {facades[placemark?.attributes?.osmId] && (
-
-
- )}
-
-
-
-
-
+
- {placemark?.attributes.Condition}
-
- )}
-
-
Участники
-
- <>
- {vehicles.map((vehicle, i) => {
- const driverIndex = vehicle.participants.findIndex(
- (participant) => participant.role === 'Водитель',
- );
+ ;
-export type ObjectsState = Record;
-
-export function areaReducer(state: AreaState, action: AreaAction) {
- switch (action.type) {
- case 'toggle':
- return { ...state, [action.areaType]: !state[action.areaType] };
- default:
- return state;
- }
-}
-
-export const areaInitalState = Object.values(OknAreaType).reduce((acc, type) => {
- acc[type] = false;
-
- return acc;
-}, {} as AreaState);
-
-export function objectsReducer(state: ObjectsState, action: ObjectsAction) {
- switch (action.type) {
- case 'toggle':
- return { ...state, [action.objectsType]: !state[action.objectsType] };
- default:
- return state;
- }
-}
-
-export const objectsInitalState = Object.values(OknObjectSignificanceType).reduce((acc, type) => {
- acc[type] = true;
-
- return acc;
-}, {} as ObjectsState);
diff --git a/features/OKN/Filter/OknFilter.tsx b/features/OKN/Filter/OknFilter.tsx
index b538e073..1c9a7835 100644
--- a/features/OKN/Filter/OknFilter.tsx
+++ b/features/OKN/Filter/OknFilter.tsx
@@ -1,129 +1,34 @@
-import React, { useCallback, useEffect, useReducer, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { Checkbox, ListGrid, ListGridItem } from 'ekb';
-import { setFilter } from 'state/features/dataLayers';
-import { okn } from 'features/OKN/okn';
-import { FilterLoader } from 'components/Filters/FilterLoader';
-import { Section } from 'components/Card/components/Section/Section';
+import React from 'react';
+import { Divider } from 'ekb';
+import { OKN_ITEMS, ZONES_ITEMS } from 'features/OKN/okn';
import { FilterType } from 'types/Filters.types';
-import { activeFilterParamsSelector, activeFilterSelector } from 'state/features/selectors';
-import { AREA_CONFIG, OBJECTS_CONFIG } from '../Okn.constants';
-import { OknObjectSignificanceType, OknAreaType } from '../oknConstants';
-import {
- areaInitalState,
- areaReducer,
- objectsInitalState,
- objectsReducer,
-} from './OknFilter.state';
-
-type ObjectsCountEntries = [OknObjectSignificanceType, number][];
+import { LayerFilter } from 'features/Filters/LayerFilter';
+import { AREA_CONFIG, OBJECTS_CONFIG_COLORS, ZONES_COLORS } from '../Okn.constants';
+
+const objects = OKN_ITEMS.map((item) => ({
+ type: item.type,
+ subTitle: item.count,
+ color: OBJECTS_CONFIG_COLORS[item.type],
+}));
+
+const zones = ZONES_ITEMS.map((item) => ({
+ type: item.type,
+ subTitle: item.count,
+ color: ZONES_COLORS[item.type],
+ description: AREA_CONFIG[item.type].description,
+}));
export function OknFilter() {
- const dispatch = useDispatch();
- const activeFilter = useSelector(activeFilterSelector);
- const activeFilterParams = useSelector(activeFilterParamsSelector);
- const [areaState, dispatchArea] = useReducer(areaReducer, areaInitalState);
- const [objectsState, dispatchObjects] = useReducer(objectsReducer, objectsInitalState);
- const [objectsCount, setObjectsCount] = useState(null);
- const [areaCount, setAreaCount] = useState<[OknAreaType, number][]>(null);
-
- useEffect(() => {
- okn.getObjectsCount().then((objectsCountResult: ObjectsCountEntries) => {
- const sortedObjectsCount = objectsCountResult.sort(
- ([, countA], [, countB]) => countB - countA,
- );
-
- setObjectsCount(sortedObjectsCount);
- });
- }, []);
-
- useEffect(() => {
- okn.getZonesCount().then((areaCountResult: [OknAreaType, number][]) => {
- const sortedObjectsCount = areaCountResult.sort(
- ([, countA], [, countB]) => countB - countA,
- );
-
- setAreaCount(sortedObjectsCount);
- });
- }, []);
-
- const onAreaChange = useCallback(
- (oknArea: OknAreaType) => dispatchArea({ type: 'toggle', areaType: oknArea }),
- [],
- );
-
- const onObjectsChange = useCallback(
- (oknObjectType: OknObjectSignificanceType) =>
- dispatchObjects({ type: 'toggle', objectsType: oknObjectType }),
- [],
- );
-
- useEffect(() => {
- dispatch(
- setFilter({
- activeFilter: FilterType.OKN,
- activeFilterParams: {
- ...Object.entries(areaState).reduce(
- (all, [id, value]) => ({ ...all, [id]: { value, type: 'area' } }),
- {},
- ),
- ...Object.entries(objectsState).reduce(
- (all, [id, value]) => ({ ...all, [id]: { value, type: 'objects' } }),
- {},
- ),
- },
- }),
- );
- }, [dispatch, areaState, objectsState]);
-
- if (activeFilter !== FilterType.OKN && !activeFilterParams.filter) {
- return null;
- }
-
- if (!(objectsCount && areaCount)) {
- return
- {objectsCount?.map(([type, count]) => (
- onObjectsChange(type)}
- />
- }
- >
- {type}
-
- ))}
-
-
-
-
- {areaCount?.map(([type, count]) => (
- onAreaChange(type)}
- />
- }
- >
- {type}
-
- ))}
-
-
+
+ 
+
+ }
+ actions={({ initial: 10, hover: 12, active: 13 }),
// @ts-ignore
@@ -86,11 +79,11 @@ export function OknSource() {
};
const getZoneStyle = (type: string): FillLayer => ({
- id: LAYERS[type].layerId,
+ id: ZONES_LAYERS[type].layerId,
type: 'fill',
- source: LAYERS[type].sourceId,
+ source: ZONES_LAYERS[type].sourceId,
paint: {
- 'fill-color': AREA_CONFIG[LAYERS[type].zone].color,
+ 'fill-color': ZONES_COLORS[ZONES_LAYERS[type].zone],
'fill-opacity': getLayerStyle({
initial: 0.5,
hover: 0.8,
@@ -100,11 +93,11 @@ export function OknSource() {
});
const getZoneOutlineStyle = (type: string): LineLayer => ({
- id: `${LAYERS[type].layerId}-outline`,
+ id: `${ZONES_LAYERS[type].layerId}-outline`,
type: 'line',
- source: LAYERS[type].sourceId,
+ source: ZONES_LAYERS[type].sourceId,
paint: {
- 'line-color': AREA_CONFIG[LAYERS[type].zone].color,
+ 'line-color': ZONES_COLORS[ZONES_LAYERS[type].zone],
'line-width': 3,
'line-dasharray': [2, 2],
},
@@ -112,13 +105,13 @@ export function OknSource() {
return (
<>
- {Object.keys(LAYERS).map(
+ {Object.keys(ZONES_LAYERS).map(
(layerKey, i) =>
- activeFilterParams[LAYERS[layerKey].zone]?.value && (
+ activeFilterParams.okn?.zones?.includes(ZONES_LAYERS[layerKey].zone) && (
@@ -127,14 +120,16 @@ export function OknSource() {
),
)}
-
-
+ {activeFilterParams.okn?.objects?.length && (
+
+
+ )}
);
}
diff --git a/shared/UI/Icons/OKN.tsx b/features/OKN/SvgOknIcon.tsx
similarity index 99%
rename from shared/UI/Icons/OKN.tsx
rename to features/OKN/SvgOknIcon.tsx
index a5ad5eac..3616c023 100644
--- a/shared/UI/Icons/OKN.tsx
+++ b/features/OKN/SvgOknIcon.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-export function OKN() {
+export function SvgOknIcon() {
return (
+ <>
+ {vehicles.map((vehicle, i) => {
+ const driverIndex = vehicle.participants.findIndex(
+ (participant) => participant.role === 'Водитель',
+ );
- let driver: DTPParticipant;
- let driverHealthStatus: HealthStatusType;
+ let driver: DTPParticipant;
+ let driverHealthStatus: HealthStatusType;
- if (driverIndex !== -1) {
- driver = vehicle.participants[driverIndex];
- driverHealthStatus = healthStatusToType(driver.health_status);
- }
+ if (driverIndex !== -1) {
+ driver = vehicle.participants[driverIndex];
+ driverHealthStatus = healthStatusToType(driver.health_status);
+ }
- const restParticipants = vehicle.participants.filter(
- (participant) => participant.role !== 'Водитель',
- );
+ const restParticipants = vehicle.participants.filter(
+ (participant) => participant.role !== 'Водитель',
+ );
- const car = getVehicleName(vehicle);
+ const car = getVehicleName(vehicle);
- return (
-
);
}
diff --git a/features/OKN/CardContent/index.ts b/features/OKN/CardContent/index.ts
deleted file mode 100644
index 4342f0a8..00000000
--- a/features/OKN/CardContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { OKNCardContent } from './CardContent';
diff --git a/features/OKN/Filter/OknFilter.state.ts b/features/OKN/Filter/OknFilter.state.ts
deleted file mode 100644
index 4efdad3f..00000000
--- a/features/OKN/Filter/OknFilter.state.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { OknAreaType, OknObjectSignificanceType } from '../oknConstants';
-
-export interface AreaAction {
- type: 'toggle';
- areaType: OknAreaType;
-}
-export interface ObjectsAction {
- type: 'toggle';
- objectsType: OknObjectSignificanceType;
-}
-
-export type AreaState = Record
-
- {/*
- (null);
-
- useEffect(() => {
- lines.getFilters().then((linesFilters: LinesCountEntries) => {
- const sortedLinesCount = linesFilters.sort(([, countA], [, countB]) => countB - countA);
-
- setLinesCount(sortedLinesCount);
- });
- }, []);
-
- useEffect(() => {
- dispatch(
- setFilter({
- activeFilter: FilterType.Line,
- activeFilterParams: linesState,
- }),
- );
- }, [dispatch, linesState]);
-
- const onLinesChange = useCallback(
- (lineType: LineType) => dispatchLines({ type: 'toggle', lineType }),
- [],
- );
-
- if (!linesCount) return
- {linesCount.map(([type, count]) => (
- onLinesChange(type as LineType)}
- />
- }
- >
- {type}
-
- ))}
-
- );
-}
diff --git a/features/Lines/Filter/LinesFilter.types.ts b/features/Lines/Filter/LinesFilter.types.ts
deleted file mode 100644
index 54877233..00000000
--- a/features/Lines/Filter/LinesFilter.types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { LineType } from '../lineType';
-
-export interface LinesAction {
- type: 'toggle';
- lineType: LineType;
-}
-
-export type LinesState = Record;
diff --git a/features/Lines/Lines.constants.ts b/features/Lines/Lines.constants.ts
deleted file mode 100644
index 82e96aa2..00000000
--- a/features/Lines/Lines.constants.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { LineType } from './lineType';
-
-export const LINES_CONFIG = {
- [LineType.RedLine]: {
- color: '#e31e24',
- description: 'Маршрут по\u00A0историческому центру города',
- },
- [LineType.BlueLine]: {
- color: '#189eda',
- description: 'Маршрут по\u00A0местам, связанным с\u00A0царской семьей',
- },
- [LineType.PurpleLine]: {
- color: '#9747ff',
- description: 'Арт-объекты фестиваля уличного искусства «Стенограффия»',
- },
-};
diff --git a/features/Lines/LinesCardContent.tsx b/features/Lines/LinesCardContent.tsx
new file mode 100644
index 00000000..5c28e2d6
--- /dev/null
+++ b/features/Lines/LinesCardContent.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { Card, Link, LinkSize } from 'ekb';
+import { CardActions } from 'components/Card/components/CardActions';
+
+export interface LineObject {
+ properties: {
+ id: number;
+ title?: string;
+ description: null | string;
+ };
+ geometry: {
+ id: string;
+ coordinates: [lat: number, lng: number];
+ type?: string;
+ };
+}
+
+type TLinesCardContentProps = {
+ placemark?: LineObject;
+};
+
+export function LinesCardContent({ placemark }: TLinesCardContentProps) {
+ if (!placemark) return null;
+
+ return (
+ ({ initial: 8, hover: 10, active: 12 }),
- // @ts-ignore
- 'circle-color': ['case'].concat(...colors).concat(['rgba(0, 0, 0, 0)']),
- 'circle-stroke-width': 1,
- // @ts-ignore
- 'circle-stroke-color': ['case'].concat(...strokeColors).concat(['rgba(0, 0, 0, 0)']),
- },
- };
-
- const linesLayerStyle: LineLayer = {
- id: 'lines',
- type: 'line',
- source: 'ekb-lines-source',
- paint: {
- // @ts-ignore
- 'line-color': ['case'].concat(...colors).concat(['rgba(0, 0, 0, 0)']),
- 'line-width': 3,
- },
- };
-
- return (
- <>
-
-
-
-
-
- );
-}
diff --git a/features/Lines/lineType.ts b/features/Lines/lineType.ts
deleted file mode 100644
index eb5d96ad..00000000
--- a/features/Lines/lineType.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export enum LineType {
- RedLine = 'Красная линия',
- BlueLine = 'Синяя линия',
- PurpleLine = 'Фиолетовая линия',
-}
-
-export interface LineObject {
- properties: {
- id: number;
- title?: string;
- description: null | string;
- };
- geometry: {
- id: string;
- coordinates: [lat: number, lng: number];
- type?: string;
- };
-}
diff --git a/features/Lines/lines.ts b/features/Lines/lines.ts
index 4e97720c..7e0890d3 100644
--- a/features/Lines/lines.ts
+++ b/features/Lines/lines.ts
@@ -1,16 +1,10 @@
-import groupBy from 'lodash/groupBy';
import data from 'public/ekb-color-points.json';
-const linesByType = Object.entries(groupBy(data.features, (item) => item.properties.type))
- .map(([type, items]) => [type, items.length])
- .sort((a, b) => (b[1] as number) - (a[1] as number));
-
export const lines = {
+ async getAll(): Promise
- ;
export const MIN_DTP_YEAR = 2015;
-export const CURRENT_YEAR = new Date().getFullYear();
+export const MAX_DTP_YEAR = 2023;
export const DTP_PARTICIPANT_CONFIG: ParticipantConfig = {
[DtpParticipantType.Children]: {
@@ -31,19 +30,13 @@ export const DTP_PARTICIPANT_CONFIG: ParticipantConfig = {
},
};
-export const SEVERITY_CONFIG = {
- [DtpSeverityType.Light]: {
- color: '#36ccaa',
- },
- [DtpSeverityType.Heavy]: {
- color: '#fdcf4e',
- },
- [DtpSeverityType.WithDead]: {
- color: '#ff0000',
- },
+export const SEVERITY_CONFIG_COLOR = {
+ [DtpSeverityType.Light]: '#36ccaa',
+ [DtpSeverityType.Heavy]: '#fdcf4e',
+ [DtpSeverityType.WithDead]: '#ff0000',
};
-export const DTP_YEARS_RANGE = range(MIN_DTP_YEAR, CURRENT_YEAR);
+export const DTP_YEARS_RANGE = range(MIN_DTP_YEAR, MAX_DTP_YEAR);
export const YEARS_FILTERS_DATA: HistogramDataWithoutValues = DTP_YEARS_RANGE.map((year) => ({
from: year,
to: year + 1,
diff --git a/features/DTP/CardContent/CardContent.tsx b/features/DTP/DtpCardContent.tsx
similarity index 54%
rename from features/DTP/CardContent/CardContent.tsx
rename to features/DTP/DtpCardContent.tsx
index 1352db08..beba3fb8 100644
--- a/features/DTP/CardContent/CardContent.tsx
+++ b/features/DTP/DtpCardContent.tsx
@@ -1,15 +1,11 @@
import React, { useMemo } from 'react';
-
-import { Section } from 'components/Card/components/Section/Section';
-import { Header } from 'components/Card/components/Header/Header';
-import { Info } from 'components/Card/components/Info/Info';
+import { Card } from 'ekb';
+import { CardActions } from 'components/Card/components/CardActions';
import { Sources } from 'components/Card/components/Sources/Sources';
-import { InfoProps } from 'components/Card/components/Info/Info.types';
import { SourceType } from 'types/Sources.types';
import { SOURCES_BY_TYPE } from 'constants/sources';
-import { DTPObject } from '../dtp';
-import styles from './CardContent.module.css';
-import { Participants } from './components/Participants/Participants';
+import { DTPObject } from './dtp';
+import { Participants } from './CardContent/components/Participants/Participants';
export type DTPCardContentProps = {
placemark: DTPObject;
@@ -46,12 +42,13 @@ export function DTPCardContent({ placemark }: DTPCardContentProps) {
}, [placemark?.properties.datetime]);
const environment = useMemo(() => {
- const result: InfoProps['infos'] = [];
+ const result = [];
if (placemark?.properties.light) {
result.push({
- name: 'Время суток',
- text: placemark.properties.light,
+ type: 'value',
+ title: 'Время суток',
+ value: placemark.properties.light,
});
}
@@ -63,8 +60,9 @@ export function DTPCardContent({ placemark }: DTPCardContentProps) {
].join(', ');
result.push({
- name: 'Погода',
- text: joinedConditions,
+ type: 'value',
+ title: 'Погода',
+ value: joinedConditions,
});
}
@@ -76,8 +74,9 @@ export function DTPCardContent({ placemark }: DTPCardContentProps) {
].join(', ');
result.push({
- name: 'Дорожные условия',
- text: joinedConditions,
+ type: 'value',
+ title: 'Дорожные условия',
+ value: joinedConditions,
});
}
@@ -88,33 +87,40 @@ export function DTPCardContent({ placemark }: DTPCardContentProps) {
placemark?.properties.light,
]);
- return placemark?.properties ? (
-
-
);
}
diff --git a/features/DTP/Filter/DTPFilter.module.css b/features/DTP/Filter/DTPFilter.module.css
index 9beb6982..cc26de49 100644
--- a/features/DTP/Filter/DTPFilter.module.css
+++ b/features/DTP/Filter/DTPFilter.module.css
@@ -2,21 +2,3 @@
font-size: 18px;
margin: 11px 0 8px;
}
-
-.DTPFilter__checkboxContent {
- width: 100%;
-
- &:not(:last-of-type) {
- margin-bottom: 8px;
- }
-}
-
-.DTPFilter__objectsCount {
- margin-left: 8px;
- color: #9baac3;
-}
-
-.DTPFilter__icon {
- margin-right: 2px;
- vertical-align: text-bottom;
-}
diff --git a/features/DTP/Filter/DTPFilter.state.ts b/features/DTP/Filter/DTPFilter.state.ts
deleted file mode 100644
index 280736ae..00000000
--- a/features/DTP/Filter/DTPFilter.state.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { DtpParticipantType, DtpSeverityType } from '../types';
-import {
- DTPParticipantsAction,
- DTPParticipantsState,
- DTPSeverityAction,
- DTPSeverityState,
-} from './DTPFilter.types';
-
-export function dtpSeverityReducer(state: DTPSeverityState, action: DTPSeverityAction) {
- switch (action.type) {
- case 'toggle':
- return { ...state, [action.severityType]: !state[action.severityType] };
- default:
- return state;
- }
-}
-
-export const dtpSeverityInitalState = Object.values(DtpSeverityType).reduce((acc, type) => {
- acc[type] = true;
-
- return acc;
-}, {} as DTPSeverityState);
-
-export function dtpParticipantReducer(state: DTPParticipantsState, action: DTPParticipantsAction) {
- switch (action.type) {
- case 'toggle':
- return { ...state, [action.participantType]: !state[action.participantType] };
- default:
- return state;
- }
-}
-
-export const dtpParticipantInitalState = Object.values(DtpParticipantType).reduce((acc, type) => {
- acc[type] = true;
-
- return acc;
-}, {} as DTPParticipantsState);
diff --git a/features/DTP/Filter/DTPFilter.tsx b/features/DTP/Filter/DTPFilter.tsx
index 93b38138..101e00f7 100644
--- a/features/DTP/Filter/DTPFilter.tsx
+++ b/features/DTP/Filter/DTPFilter.tsx
@@ -1,83 +1,32 @@
-import React, { useCallback, useEffect, useMemo, useReducer, useState } from 'react';
+import React, { useCallback } from 'react';
import { useDispatch } from 'react-redux';
-import { Checkbox, ListGrid, ListGridItem, MinMax } from 'ekb';
-import { setFilter } from 'state/features/dataLayers';
-import { dtp, DTPFiltersParams } from 'features/DTP/dtp';
-import { FilterLoader } from 'components/Filters/FilterLoader';
+import { MinMax } from 'ekb';
+import { updateFilterParams } from 'state/features/dataLayers';
+import { dtp, DTP_PARTICIPANTS_ITEMS } from 'features/DTP/dtp';
+import { LayerFilter } from 'features/Filters/LayerFilter';
+import { MapFilter } from 'features/Filters/MapFilter';
import { FilterType } from 'types/Filters.types';
import { RangeBaseFilter } from 'components/RangeBaseFilter';
-import { DtpParticipantType, DtpSeverityType } from '../types';
-import {
- MIN_DTP_YEAR,
- CURRENT_YEAR,
- DTP_PARTICIPANT_CONFIG,
- SEVERITY_CONFIG,
- YEARS_FILTERS_DATA,
-} from '../DTP.constants';
-import {
- dtpParticipantInitalState,
- dtpParticipantReducer,
- dtpSeverityInitalState,
- dtpSeverityReducer,
-} from './DTPFilter.state';
+import { MIN_DTP_YEAR, MAX_DTP_YEAR, YEARS_FILTERS_DATA } from '../DTP.constants';
import styles from './DTPFilter.module.css';
-type ParticipantCountEntries = [DtpParticipantType, number][];
-type SeverityCountEntries = [DtpSeverityType, number][];
-
-const DEFAULT_MIN_YEAR = CURRENT_YEAR - 1;
-
export function DTPFilter() {
const dispatch = useDispatch();
- const [severityState, dispatchSeverity] = useReducer(
- dtpSeverityReducer,
- dtpSeverityInitalState,
- );
- const [participantState, dispatchParticipant] = useReducer(
- dtpParticipantReducer,
- dtpParticipantInitalState,
- );
- const [yearsLoaded, setYearsLoaded] = useState(false);
- const [participantCount, setParticipantCount] = useState(null);
- const [severityCount, setSeverityCount] = useState(null);
- const [yearsState, setYearsState] = useState({
- min: DEFAULT_MIN_YEAR,
- max: CURRENT_YEAR,
- });
-
- useEffect(() => {
- dtp.getParticipantFilters().then((participantFilters: ParticipantCountEntries) => {
- const sortedParticipantCount = participantFilters.sort(
- ([, countA], [, countB]) => countB - countA,
- );
-
- setParticipantCount(sortedParticipantCount);
- });
- }, []);
- useEffect(() => {
- dtp.getSeverityFilters().then((severityFilters: SeverityCountEntries) => {
- const sortedSeverityCount = severityFilters.sort(
- ([, countA], [, countB]) => countB - countA,
+ const onYearsChange = useCallback(
+ (range: MinMax) => {
+ dispatch(
+ updateFilterParams({
+ activeFilter: FilterType.DTP,
+ activeFilterParams: {
+ dtp: { range },
+ },
+ }),
);
-
- setSeverityCount(sortedSeverityCount);
- });
- }, []);
-
- const onSeverityChange = useCallback(
- (severityType: DtpSeverityType) => dispatchSeverity({ type: 'toggle', severityType }),
- [],
+ },
+ [dispatch],
);
- const onParticipantChange = useCallback(
- (participantType: DtpParticipantType) =>
- dispatchParticipant({ type: 'toggle', participantType }),
- [],
- );
-
- const onYearsChange = useCallback((range: MinMax) => setYearsState(range), []);
-
const getHistogramData = useCallback(async () => {
const dtpFilters = await dtp.getYearsFilters();
@@ -86,126 +35,30 @@ export function DTPFilter() {
value: dtpFilters[idx],
}));
- setYearsLoaded(true);
-
return histogramData;
}, []);
- useEffect(() => {
- const filters: DTPFiltersParams = {
- years: {
- from: yearsState.min,
- to: yearsState.max,
- },
- };
-
- const severities = Object.entries(severityState).reduce((acc, [type, value]) => {
- if (value) {
- acc.push(type);
- }
-
- return acc;
- }, []) as DtpSeverityType[];
- const participants = Object.entries(participantState).reduce((acc, [type, value]) => {
- if (value) {
- acc.push(type);
- }
-
- return acc;
- }, []) as DtpParticipantType[];
-
- filters.severity = severities;
- filters.participants = participants;
-
- dispatch(
- setFilter({
- activeFilter: FilterType.DTP,
- activeFilterParams: filters,
- }),
- );
- }, [dispatch, severityState, participantState, yearsState.min, yearsState.max]);
-
- const shouldShowLoader = useMemo(
- () => !yearsLoaded || !participantCount || !severityCount,
- [yearsLoaded, participantCount, severityCount],
- );
-
- const shouldShowCheckboxes = useMemo(
- () => participantCount && severityCount,
- [participantCount, severityCount],
- );
-
return (
<>
- {participantCount?.map(([type, count]) => (
- {
- onParticipantChange(type as DtpParticipantType);
- }}
- />
- }
- >
- {DTP_PARTICIPANT_CONFIG[type]?.label || type}
-
- ))}
-
-
- {severityCount?.map(([type, count]) => (
- {
- onSeverityChange(type as DtpSeverityType);
- }}
- />
- }
- >
- {DTP_PARTICIPANT_CONFIG[type]?.label || type}
-
- ))}
-
- {/* {severityCount?.map(([type, count], i) => (
-
-
- ))} */}
-
- )}
- {shouldShowLoader && ;
-export type DTPParticipantsState = Record;
diff --git a/features/DTP/dtp.ts b/features/DTP/dtp.ts
index 4d3d75f9..c4ec7c73 100644
--- a/features/DTP/dtp.ts
+++ b/features/DTP/dtp.ts
@@ -1,59 +1,44 @@
-import groupBy from 'lodash/groupBy';
-import { Range } from 'ekb';
import { DTP_YEARS_RANGE } from 'features/DTP/DTP.constants';
import { fetchAPI } from 'shared/helpers/fetchApi';
import dtpData from 'public/ekb-dtp.json';
-import { DtpParticipantType, DtpSeverityType } from './types';
+import { DtpSeverityType } from './types';
-export const dtp = {
- async getObject(id: string): Promise {
- return fetchAPI(`/api/dtp?id=${id}`);
- },
- async getSeverityFilters() {
- const dtpBySeverity = Object.entries(
- groupBy(dtpData.features, (item) => item.properties.severity),
- )
- .map(([type, items]) => [type, items.length])
- .sort((a, b) => (b[1] as number) - (a[1] as number));
+const categories = Array.from(
+ new Set(dtpData.features.map((item) => item.properties.participant_categories).flat(2)),
+);
- return Promise.resolve(dtpBySeverity);
- },
- async getParticipantFilters() {
- const categories = Array.from(
- new Set(dtpData.features.map((item) => item.properties.participant_categories).flat(2)),
- );
+const dtpByParticipants = categories
+ .map((category) => [
+ category,
+ dtpData.features.filter((item) =>
+ item.properties.participant_categories.includes(category),
+ ),
+ ])
+ .map(([type, items]) => [type, items.length])
+ .sort((a, b) => (b[1] as number) - (a[1] as number));
- const dtpByParticipants = categories
- .map((category) => [
- category,
- dtpData.features.filter((item) =>
- item.properties.participant_categories.includes(category),
- ),
- ])
- .map(([type, items]) => [type, items.length])
- .sort((a, b) => (b[1] as number) - (a[1] as number));
+export const DTP_PARTICIPANTS_ITEMS = dtpByParticipants.map(([type, count]) => ({
+ type: String(type),
+ subTitle: String(count),
+}));
- return Promise.resolve(dtpByParticipants);
+export const dtp = {
+ async getObject(id: string): Promise {
+ return fetchAPI(`/api/dtp?id=${id}`);
},
- async getYearsFilters() {
+ getYearsFilters() {
const years = DTP_YEARS_RANGE;
const dtpByYear = years.map(
(year) => dtpData.features.filter((item) => item.properties.year === year).length,
);
- return Promise.resolve(dtpByYear);
+ return dtpByYear;
},
};
-export interface DTPFiltersParams {
- severity?: DtpSeverityType[];
- participants?: DtpParticipantType[];
- years: Range;
-}
-
export type DTPObject = {
properties: DTPObjectProperties;
geometry: {
diff --git a/features/DesignCode/CardContent/CardContent.tsx b/features/DesignCode/CardContent/CardContent.tsx
deleted file mode 100644
index 7770caff..00000000
--- a/features/DesignCode/CardContent/CardContent.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Tag } from 'ekb';
-import { Header } from 'components/Card/components/Header/Header';
-import { Section } from 'components/Card/components/Section/Section';
-import { DESIGN_MAP_HOST } from 'features/DesignCode/designCode';
-import styles from 'styles/CardContent.module.css';
-import { Sources } from 'components/Card/components/Sources/Sources';
-import { SOURCES_BY_TYPE } from 'constants/sources';
-import { SourceType } from 'types/Sources.types';
-import { DesignCodeObject } from '../designCodeObject';
-import { DESIGN_CODE_ITEMS_COLORS } from '../DesignCode.constants';
-
-export function DesignCodeCardContent({ placemark }: { placemark?: DesignCodeObject }) {
- return placemark ? (
- {placemark.type}
+ ),
+ },
+ { type: 'divider' },
+ {
+ type: 'section',
+ value: (
+ <>
+ {placemark.images.map((image) => {
+ const imageData = image.m || image.s;
+ const imageSrc = `${DESIGN_MAP_HOST}${imageData.src}`;
+
+ return (
+
+ 
+
+ );
+ })}
+
+ ),
+ },
+ { type: 'divider' },
+ {
+ type: 'section',
+ title: 'Источники',
+ value: ({
- initial: DESIGN_CODE_MARKER_CLICKABLE_SIZE,
- hover: DESIGN_CODE_MARKER_CLICKABLE_SIZE * 1.2,
- active: DESIGN_CODE_MARKER_CLICKABLE_SIZE * 1.3,
- }),
- 'circle-opacity': 1,
- },
- };
-
- return (
-
-
- 
-
- ))}
-
- );
-}
diff --git a/features/DesignCode/Filter/DesignCodeFilter.state.ts b/features/DesignCode/Filter/DesignCodeFilter.state.ts
deleted file mode 100644
index 55063377..00000000
--- a/features/DesignCode/Filter/DesignCodeFilter.state.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { DesignCodeItemType } from '../designCodeObject';
-import { DesignCodeFilterState, DesignCodeFilterAction } from './DesignCodeFilter.types';
-
-export function designCodeReducer(state: DesignCodeFilterState, action: DesignCodeFilterAction) {
- switch (action.type) {
- case 'toggle':
- return { ...state, [action.designCodeItemType]: !state[action.designCodeItemType] };
- default:
- return state;
- }
-}
-
-export const designCondeInitalState = Object.values(DesignCodeItemType).reduce((acc, type) => {
- acc[type] = true;
-
- return acc;
-}, {} as DesignCodeFilterState);
diff --git a/features/DesignCode/Filter/DesignCodeFilter.tsx b/features/DesignCode/Filter/DesignCodeFilter.tsx
deleted file mode 100644
index cd1edc44..00000000
--- a/features/DesignCode/Filter/DesignCodeFilter.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { useCallback, useEffect, useReducer } from 'react';
-import { useDispatch } from 'react-redux';
-import { Checkbox, ListGrid, ListGridItem } from 'ekb';
-import groupBy from 'lodash/groupBy';
-import { FilterType } from 'types/Filters.types';
-import { setFilter } from 'state/features/dataLayers';
-import designCode from 'public/ekb-design-code.json';
-import { DESIGN_CODE_ITEMS_COLORS } from '../DesignCode.constants';
-import { DesignCodeItemType } from '../designCodeObject';
-import { designCodeReducer, designCondeInitalState } from './DesignCodeFilter.state';
-
-const DESIGN_CODE_ITEMS = groupBy(designCode.features, (item) => item.properties.type);
-
-export function DesignCodeFilter() {
- const dispatch = useDispatch();
- const [designCodeFilterState, dispatchDesignCodeAction] = useReducer(
- designCodeReducer,
- designCondeInitalState,
- );
-
- const onChange = useCallback(
- (designCodeItemType: DesignCodeItemType) =>
- dispatchDesignCodeAction({ type: 'toggle', designCodeItemType }),
- [],
- );
-
- useEffect(() => {
- dispatch(
- setFilter({
- activeFilter: FilterType.DesignCode,
- activeFilterParams: designCodeFilterState,
- }),
- );
- }, [designCodeFilterState, dispatch]);
-
- return (
-
- {Object.entries(DESIGN_CODE_ITEMS).map(([type, items]) => (
- onChange(type as DesignCodeItemType)}
- />
- }
- >
- {type}
-
- ))}
-
- );
-}
diff --git a/features/DesignCode/Filter/DesignCodeFilter.types.ts b/features/DesignCode/Filter/DesignCodeFilter.types.ts
deleted file mode 100644
index 2c0d0807..00000000
--- a/features/DesignCode/Filter/DesignCodeFilter.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { DesignCodeItemType } from '../designCodeObject';
-
-export type DesignCodeFilterState = Record;
-export interface DesignCodeFilterAction {
- type: 'toggle';
- designCodeItemType: DesignCodeItemType;
-}
diff --git a/features/DesignCode/designCode.ts b/features/DesignCode/designCode.ts
index ab00bd47..afcc3b75 100644
--- a/features/DesignCode/designCode.ts
+++ b/features/DesignCode/designCode.ts
@@ -1,23 +1,20 @@
-import groupBy from 'lodash/groupBy';
-import dtp from 'public/ekb-design-code.json';
-import { DesignCodeItemType, DesignCodeObject } from './designCodeObject';
+import { FeatureCollection } from 'geojson';
+import dc from 'public/ekb-design-code.json';
+import { groupByProperty } from 'features/Map/helpers/groupByProperty';
+import { DesignCodeObject } from './designCodeObject';
export const DESIGN_MAP_HOST = 'https://map.ekaterinburg.design';
-const designByType = Object.entries(groupBy(dtp.features, (item) => item.properties.type))
- .map(([type, items]) => [type, items.length])
- .sort((a, b) => (b[1] as number) - (a[1] as number));
+export const DESIGN_CODE_ITEMS = groupByProperty(dc as FeatureCollection);
export const designCode = {
getObject(id: string): Promise {
try {
- const result = dtp.features.find((item) => item.properties.id === id);
+ const result = dc.features.find((item) => item.properties.id === id);
// @ts-ignore
return Promise.resolve({
...result.properties,
- street: result.properties.street,
- type: result.properties.type as DesignCodeItemType,
coords: [result.geometry.coordinates[0], result.geometry.coordinates[1]],
});
} catch (error) {
@@ -25,7 +22,4 @@ export const designCode = {
return Promise.resolve(null);
}
},
- async getObjectsCount() {
- return designByType;
- },
};
diff --git a/features/Facade/CardContent/Facade.module.css b/features/Facade/CardContent/Facade.module.css
deleted file mode 100644
index c8b0c5b1..00000000
--- a/features/Facade/CardContent/Facade.module.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.facade {
- display: flex;
- gap: 8px;
- flex-direction: column;
-}
-
-.facade_title {
- font-size: 16px;
- line-height: 1.3;
- font-weight: 400;
- margin: 0;
-}
diff --git a/features/Facade/CardContent/Facade.tsx b/features/Facade/CardContent/Facade.tsx
deleted file mode 100644
index 4c29234e..00000000
--- a/features/Facade/CardContent/Facade.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { DownloadButton } from 'shared/UI/DownloadButton/DownloadButton';
-import styles from './Facade.module.css';
-
-type Props = {
- facade: {
- name: string;
- link: string;
- };
-};
-
-export default function Facade({ facade }: Props) {
- return (
-
- Данные берутся из публичных источников
- и содержат неточности.{' '}
-
- Оставьте фидбек
-
- — помогите улучшить карту.
-
- )}
-
- )}
+ <>
+ {isActive && component ? component : null}
+ {isActive ?
+ Данные берутся из публичных источников и содержат
+ неточности.{' '}
+
+ Оставьте фидбек
+
+ — помогите улучшить карту.
+
+ )}
+
);
},
diff --git a/features/Filters/LayerFilter.tsx b/features/Filters/LayerFilter.tsx
new file mode 100644
index 00000000..bca45920
--- /dev/null
+++ b/features/Filters/LayerFilter.tsx
@@ -0,0 +1,38 @@
+import React, { useCallback } from 'react';
+import { useDispatch } from 'react-redux';
+import { FilterGrid, IFilterGridItem } from 'components/Filters/FilterGrid';
+import { updateFilterParams } from 'state/features/dataLayers';
+
+interface Props {
+ filterType: string;
+ items?: IFilterGridItem[];
+ selectedByDefault?: string[];
+ filterItemKey?: string;
+}
+
+export function LayerFilter({
+ filterType,
+ items,
+ selectedByDefault = items.map((item) => item.type),
+ filterItemKey,
+}: Props) {
+ const dispatch = useDispatch();
+
+ const onChange = useCallback(
+ (selected) => {
+ dispatch(
+ updateFilterParams({
+ activeFilter: filterType,
+ activeFilterParams: {
+ [filterType]: {
+ [filterItemKey]: selected,
+ },
+ },
+ }),
+ );
+ },
+ [dispatch, filterItemKey, filterType],
+ );
+
+ return (null);
+ const filter = state.filters[filterItemKey];
+
+ useEffect(() => {
+ if (filter?.type) {
+ fetchAPI(filter.path).then(setData);
+ }
+ }, [filter?.path, filter?.type]);
+
+ if (!filter?.type) {
+ return null;
+ }
+
+ if (!data) {
+ return
diff --git a/features/HouseWearTear/HouseWearTearFilter.tsx b/features/HouseWearTear/HouseWearTearFilter.tsx
index 6895eca2..8e6ed881 100644
--- a/features/HouseWearTear/HouseWearTearFilter.tsx
+++ b/features/HouseWearTear/HouseWearTearFilter.tsx
@@ -1,7 +1,7 @@
import React, { useCallback } from 'react';
import { useDispatch } from 'react-redux';
import { MinMax } from 'ekb';
-import { HouseBaseFilter } from 'features/Buildings/Filter/HouseBaseFilter';
+import { HouseBaseFilter } from 'features/Buildings/HouseBaseFilter';
import { houseBase } from 'features/Buildings/houseBase';
import { HouseSourceType, WEAR_TEAR_FILTERS_DATA } from 'features/Buildings/Houses.constants';
import { setFilterParams } from 'state/features/dataLayers';
diff --git a/features/Lines/CardContent/CardContent.tsx b/features/Lines/CardContent/CardContent.tsx
deleted file mode 100644
index 96e4e548..00000000
--- a/features/Lines/CardContent/CardContent.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import { Link, LinkSize } from 'ekb';
-import { Header } from 'components/Card/components/Header/Header';
-import { Section } from 'components/Card/components/Section/Section';
-import styles from 'styles/CardContent.module.css';
-import { LineObject } from '../lineType';
-
-type TLinesCardContentProps = {
- placemark?: LineObject;
-};
-
-export function LinesCardContent({ placemark }: TLinesCardContentProps) {
- if (!placemark) return null;
-
- return (
-
-
);
}
diff --git a/features/DTP/DTP.constants.ts b/features/DTP/DTP.constants.ts
index fa2bfa8e..42824815 100644
--- a/features/DTP/DTP.constants.ts
+++ b/features/DTP/DTP.constants.ts
@@ -1,12 +1,11 @@
import { range } from 'lodash';
-import { HistogramDataWithoutValues } from 'ekb';
-import { IconType } from 'shared/UI/Icons/Icons.types';
+import { HistogramDataWithoutValues, IconType } from 'ekb';
import { DtpParticipantType, DtpSeverityType } from './types';
export type ParticipantConfig = Record
- {car}
-
-
- {vehicle.color}
-
+ return (
+
+
+ );
+ })}
+ {participants.map((participant, i) => (
+
+
-
- ))}
+ {driver && (
+
- );
- })}
- {participants.map((participant, i) => (
-
+
+ {driverHealthStatus}
+
)}
- {restParticipants.map((participant, i) => (
-
+
- {driverHealthStatus}
-
- )}
{driver && (
- {car}
+
+ {vehicle.color}
- {driver && (
-
-
+
+
+ )}
-
- ))}
-
-
+
+ ))}
+
+ ))}
+
-
-
- {placemark?.properties.participants_count && (
-
-
- )}
-
-
-
- ) : null;
+ if (!placemark?.properties) {
+ return null;
+ }
+
+ return (
+ {date}
} - {placemark?.properties.address && ( - - {placemark?.properties.address} - - )} -Участники ДТП
-Вред здоровью
+Участники ДТП
-
- {type}
- {count}
-
- Вред здоровью
+ +
-
- {placemark.type}
-
-
- {placemark.images.map((image) => {
- const imageData = image.m || image.s;
- const imageSrc = `${DESIGN_MAP_HOST}${imageData.src}`;
-
- return (
-
-
-
- );
- })}
-
-
-
-
- ) : null;
-}
diff --git a/features/DesignCode/DesignCode.constants.ts b/features/DesignCode/DesignCode.constants.ts
index 9dc9a1a4..7dccbaa0 100644
--- a/features/DesignCode/DesignCode.constants.ts
+++ b/features/DesignCode/DesignCode.constants.ts
@@ -1,17 +1,15 @@
-import { DesignCodeItemType } from './designCodeObject';
-
export const DESIGN_CODE_ITEMS_COLORS = {
- [DesignCodeItemType.AddressPlate]: '#ff640a',
- [DesignCodeItemType.ChoPlate]: '#e63223',
- [DesignCodeItemType.CommemorativePlaque]: '#f758b6',
- [DesignCodeItemType.HistoricAddressPlate]: '#aa9b46',
- [DesignCodeItemType.LogosAndIdentic]: '#00b400',
- [DesignCodeItemType.NavigationStela]: '#ffd400',
- [DesignCodeItemType.OKN]: '#00b4ff',
- [DesignCodeItemType.StopFreeze]: '#55647d',
- [DesignCodeItemType.StreetFurniture]: '#5820e4',
- [DesignCodeItemType.TrafficLight]: '#965a14',
- [DesignCodeItemType.Transport]: '#006d4e',
- [DesignCodeItemType.WallPlate]: '#a00041',
- [DesignCodeItemType.ColumnsWithArrows]: '#86e621',
+ 'Обычные адресные таблички': '#ff640a',
+ 'Таблички ЧО': '#e63223',
+ 'Памятные таблички': '#f758b6',
+ 'Исторические адресные таблички': '#aa9b46',
+ 'Логотипы и айдентика': '#00b400',
+ 'Навигационные стелы': '#ffd400',
+ 'Таблички ОКН': '#00b4ff',
+ 'Фризы остановок': '#55647d',
+ 'Уличная мебель': '#5820e4',
+ Светофор: '#965a14',
+ Транспорт: '#006d4e',
+ 'Настенные таблички': '#a00041',
+ 'Столбы со стрелками': '#86e621',
};
diff --git a/features/DesignCode/DesignCodeCard.tsx b/features/DesignCode/DesignCodeCard.tsx
new file mode 100644
index 00000000..00635069
--- /dev/null
+++ b/features/DesignCode/DesignCodeCard.tsx
@@ -0,0 +1,67 @@
+import { Card, Tag } from 'ekb';
+import { DESIGN_MAP_HOST } from 'features/DesignCode/designCode';
+import { CardActions } from 'components/Card/components/CardActions';
+import { Sources } from 'components/Card/components/Sources/Sources';
+import { SOURCES_BY_TYPE } from 'constants/sources';
+import { SourceType } from 'types/Sources.types';
+import styles from 'styles/CardContent.module.css';
+import { DesignCodeObject } from './designCodeObject';
+import { DESIGN_CODE_ITEMS_COLORS } from './DesignCode.constants';
+
+export function DesignCodeCardContent({ placemark }: { placemark?: DesignCodeObject }) {
+ if (!placemark) {
+ return null;
+ }
+
+ return (
+
-
- );
-}
diff --git a/shared/UI/DownloadButton/DownloadButton.module.css b/features/Facade/DownloadButton/DownloadButton.module.css
similarity index 100%
rename from shared/UI/DownloadButton/DownloadButton.module.css
rename to features/Facade/DownloadButton/DownloadButton.module.css
diff --git a/shared/UI/DownloadButton/DownloadButton.tsx b/features/Facade/DownloadButton/DownloadButton.tsx
similarity index 84%
rename from shared/UI/DownloadButton/DownloadButton.tsx
rename to features/Facade/DownloadButton/DownloadButton.tsx
index a2f18080..59fffc81 100644
--- a/shared/UI/DownloadButton/DownloadButton.tsx
+++ b/features/Facade/DownloadButton/DownloadButton.tsx
@@ -1,5 +1,5 @@
import classNames from 'classnames';
-import DownloadIcon from 'shared/UI/Icons/DownloadIcon';
+import { Icon, IconType } from 'ekb';
import styles from './DownloadButton.module.css';
type Props = {
@@ -22,7 +22,7 @@ export function DownloadButton({ type, name, link }: Props) {
rel="noreferrer"
>
Дизайн-код фасада
-
-
diff --git a/features/Facade/Filter/FacadeFilter.tsx b/features/Facade/FacadeFilter.tsx
similarity index 100%
rename from features/Facade/Filter/FacadeFilter.tsx
rename to features/Facade/FacadeFilter.tsx
diff --git a/features/FeedbackButton/FeedbackButton.tsx b/features/FeedbackButton/FeedbackButton.tsx
index 750d4eb8..3e826149 100644
--- a/features/FeedbackButton/FeedbackButton.tsx
+++ b/features/FeedbackButton/FeedbackButton.tsx
@@ -1,6 +1,4 @@
-import { Button, ButtonSize, ButtonType } from 'ekb';
-import { Icon } from 'shared/UI/Icons';
-import { IconType } from 'shared/UI/Icons/Icons.types';
+import { Button, ButtonSize, ButtonType, Icon, IconType } from 'ekb';
const getEditObjectLink = (address: string) =>
`https://tally.so#tally-open=w2BoVe&tally-width=650&tally-overlay=1&tally-emoji-animation=none&address=${address}`;
@@ -18,7 +16,7 @@ export function FeedbackButton({ address }: Props) {
type={ButtonType.DEFAULT}
size={ButtonSize.MEDIUM}
href={href}
- prefix={{name}
{isEmergency ? (
-
-
-
- Подробнее об объекте
-
-
- )}
-
- );
-}
diff --git a/features/Lines/Filter/LinesFilter.state.ts b/features/Lines/Filter/LinesFilter.state.ts
deleted file mode 100644
index 0508d6ad..00000000
--- a/features/Lines/Filter/LinesFilter.state.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { LineType } from '../lineType';
-import { LinesState, LinesAction } from './LinesFilter.types';
-
-export function linesReducer(state: LinesState, action: LinesAction) {
- switch (action.type) {
- case 'toggle':
- return { ...state, [action.lineType]: !state[action.lineType] };
- default:
- return state;
- }
-}
-
-export const linesInitalState = Object.values(LineType).reduce((acc, type) => {
- acc[type] = true;
-
- return acc;
-}, {} as LinesState);
diff --git a/features/Lines/Filter/LinesFilter.tsx b/features/Lines/Filter/LinesFilter.tsx
deleted file mode 100644
index 47a780e6..00000000
--- a/features/Lines/Filter/LinesFilter.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { useCallback, useEffect, useReducer, useState } from 'react';
-import { useDispatch } from 'react-redux';
-import { Checkbox, ListGrid, ListGridItem } from 'ekb';
-import { setFilter } from 'state/features/dataLayers';
-import { FilterType } from 'types/Filters.types';
-import { lines } from 'features/Lines/lines';
-import { FilterLoader } from 'components/Filters/FilterLoader';
-import { LineType } from '../lineType';
-import { LINES_CONFIG } from '../Lines.constants';
-import { linesInitalState, linesReducer } from './LinesFilter.state';
-
-type LinesCountEntries = [LineType, number][];
-
-export function LinesFilter() {
- const dispatch = useDispatch();
- const [linesState, dispatchLines] = useReducer(linesReducer, linesInitalState);
- const [linesCount, setLinesCount] = useState
-
*/}
-
- 19,6 МБ
-
+
+ }
+ actions={