From 3d950d9937088f3406093f99bcfe387bb279d458 Mon Sep 17 00:00:00 2001 From: Platon Yasev Date: Tue, 15 Nov 2022 21:49:51 +0300 Subject: [PATCH] Update export params --- src/Map/Points.jsx | 34 ++++++++++++++++++++++++++++++++- src/config.js | 2 -- src/modules/Sidebar/Sidebar.jsx | 4 ++-- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/Map/Points.jsx b/src/Map/Points.jsx index edd2be6..c3c689e 100644 --- a/src/Map/Points.jsx +++ b/src/Map/Points.jsx @@ -5,6 +5,37 @@ import { useActiveTypes } from "../stores/useActiveTypes"; import { useGridSize } from "../stores/useGridSize"; import { useMemo } from "react"; import { useRateExpression } from "./useRateExpression"; +import { useModel } from "../stores/useModel"; + +const usePointSizeScale = () => { + const rate = useRateExpression(); + const { model } = useModel(); + + if (model === "ml") { + return ["interpolate", ["linear"], rate, 0, 0, 10, 5, 50, 20]; + // return [ + // "interpolate", + // ["linear"], + // rate, + // 0, + // 0, + // 10, + // 3, + // 20, + // 4, + // 30, + // 5, + // 40, + // 6, + // 80, + // 9, + // 100, + // 15, + // ]; + } + + return ["interpolate", ["linear"], rate, 0, 0, 10, 5, 50, 20]; +}; export const Points = ({ rate: rateRange }) => { const { gridSize } = useGridSize(); @@ -12,6 +43,7 @@ export const Points = ({ rate: rateRange }) => { const { activeTypes } = useActiveTypes(); const rate = useRateExpression(); + const sizeScale = usePointSizeScale(); const filter = useMemo(() => { let result = [ @@ -34,7 +66,7 @@ export const Points = ({ rate: rateRange }) => { const paintConfig = { ...pointLayer.paint, - "circle-radius": ["interpolate", ["linear"], rate, 0, 0, 10, 5, 50, 20], + "circle-radius": sizeScale, }; return ( diff --git a/src/config.js b/src/config.js index ed77aa4..15a66c9 100644 --- a/src/config.js +++ b/src/config.js @@ -32,5 +32,3 @@ export const factorsNameMapper = { export const api = axios.create({ baseURL: "https://postamates.spatiality.website", }); - -// test deploy diff --git a/src/modules/Sidebar/Sidebar.jsx b/src/modules/Sidebar/Sidebar.jsx index c31e00f..d1268cd 100644 --- a/src/modules/Sidebar/Sidebar.jsx +++ b/src/modules/Sidebar/Sidebar.jsx @@ -62,8 +62,8 @@ export const Sidebar = () => { koefs: factors, tables: activeTablesMapper[gridSize], filters: { - rate_from: rateRange[0] / 100, - rate_to: rateRange[1] / 100, + rate_from: rateRange[0], + rate_to: rateRange[1], }, };