From a7d58870f19a699d4d9efc09675df51ec0390dd7 Mon Sep 17 00:00:00 2001 From: shyambhongle Date: Sun, 5 May 2024 16:04:07 +0530 Subject: [PATCH] Filters added on SymbolLayer --- .eslintrc.js | 3 ++- assets/images/icons/MultTreePin.png | Bin 0 -> 4584 bytes assets/images/icons/RemovalPin.png | Bin 0 -> 4554 bytes assets/images/icons/SingleTreePin.png | Bin 0 -> 4425 bytes src/components/home/ProjectModal.tsx | 3 +-- src/components/map/DisplayMap.tsx | 12 +++++++++-- src/components/map/PolygonShapeSource.tsx | 22 +++++++++++++++++++- src/utils/helpers/interventionFormHelper.ts | 3 +++ 8 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 assets/images/icons/MultTreePin.png create mode 100644 assets/images/icons/RemovalPin.png create mode 100644 assets/images/icons/SingleTreePin.png diff --git a/.eslintrc.js b/.eslintrc.js index 059422f02..5c7276568 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -17,7 +17,8 @@ module.exports = { rules: { 'react/no-unescaped-entities': 0, 'react-native/no-inline-styles': 0, - "@typescript-eslint/no-explicit-any": ["off"] + "@typescript-eslint/no-explicit-any": ["off"], + "@typescript-eslint/no-var-requires": "off" }, ignorePatterns: [ '**/__mocks__/*.ts', diff --git a/assets/images/icons/MultTreePin.png b/assets/images/icons/MultTreePin.png new file mode 100644 index 0000000000000000000000000000000000000000..994527bdb1ff06f3241717ed9d8be60c76c11ed4 GIT binary patch literal 4584 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 literal 0 HcmV?d00001 diff --git a/assets/images/icons/SingleTreePin.png b/assets/images/icons/SingleTreePin.png new file mode 100644 index 0000000000000000000000000000000000000000..7c0a3483295ba93eb6e2f6cb0bfa7ca1e612fa7e GIT binary patch literal 4425 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 { id: '', }), ) - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - //@ts-expect-error + const allProjects = realm.objects(RealmSchema.Projects) setProjectSites(allProjects[data.index].sites) } diff --git a/src/components/map/DisplayMap.tsx b/src/components/map/DisplayMap.tsx index 571620345..afe0c99bb 100644 --- a/src/components/map/DisplayMap.tsx +++ b/src/components/map/DisplayMap.tsx @@ -16,6 +16,11 @@ import bbox from '@turf/bbox' import SiteMapSource from './SiteMapSource' import PolygonShapeSource from './PolygonShapeSource' + +const MultiTreePin = require('assets/images/icons/MultTreePin.png'); +const SingleTreePin = require('assets/images/icons/SingleTreePin.png'); +const RemovalPin = require('assets/images/icons/RemovalPin.png'); + // eslint-disable-next-line @typescript-eslint/no-var-requires const MapStyle = require('assets/mapStyle/mapStyleOutput.json') @@ -48,6 +53,7 @@ const DisplayMap = () => { el.location.type, JSON.parse(el.location.coordinates), el.intervention_id, + el.intervention_key ) return result.geoJSON }) @@ -61,7 +67,7 @@ const DisplayMap = () => { requestLocationPermission() }, []) - + useEffect(() => { @@ -114,7 +120,6 @@ const DisplayMap = () => { const handleMarkerPress = (i: number) => { dispatch(updateActiveIndex(i)) } - return ( { styleURL={JSON.stringify(MapStyle)}> + + + diff --git a/src/components/map/PolygonShapeSource.tsx b/src/components/map/PolygonShapeSource.tsx index 8f08b2ed9..c83585676 100644 --- a/src/components/map/PolygonShapeSource.tsx +++ b/src/components/map/PolygonShapeSource.tsx @@ -3,6 +3,7 @@ import React from 'react' import MapLibreGL, { LineLayerStyle } from '@maplibre/maplibre-react-native' import { Colors } from 'src/utils/constants' + const polyline: StyleProp = { lineWidth: 2, lineOpacity: 0.5, @@ -10,6 +11,7 @@ const polyline: StyleProp = { lineColor: Colors.PRIMARY } const fillStyle = { fillOpacity: 0.3, fillColor: Colors.PRIMARY } +const circleStyle = { circleColor: Colors.PRIMARY_DARK, circleOpacity: 0.8 }; interface Props { geoJSON: any @@ -31,11 +33,29 @@ const PolygonShapeSource = (props: Props) => { + filter={['all', ['>=', ['zoom'], 14], ['==', ['geometry-type'], 'Polygon']]} + /> =', ['zoom'], 14], ['==', ['geometry-type'], 'Polygon']]} + /> + + ) } diff --git a/src/utils/helpers/interventionFormHelper.ts b/src/utils/helpers/interventionFormHelper.ts index de0d792a4..4d6886c96 100644 --- a/src/utils/helpers/interventionFormHelper.ts +++ b/src/utils/helpers/interventionFormHelper.ts @@ -66,6 +66,7 @@ export const makeInterventionGeoJson = ( type: string, coordinates: Array, id: string, + key?: string ) => { const coord: Array = coordinates switch (type) { @@ -75,6 +76,7 @@ export const makeInterventionGeoJson = ( type: 'Feature', properties: { id, + key: key || '', }, geometry: { type: 'Point', @@ -90,6 +92,7 @@ export const makeInterventionGeoJson = ( type: 'Feature', properties: { id, + key: key || '', }, geometry: { type: 'Polygon',