diff --git a/public/data/data.js b/public/data/data.js deleted file mode 100644 index 66c43b916..000000000 --- a/public/data/data.js +++ /dev/null @@ -1,581 +0,0 @@ -const content = { - info: { - "p1": "Erinvale Country Estate and Golf Club celebrates its 25th anniversary with an exclusive sculpture exhibition by the internationally renowned sculptor Anton Smit. Over 30 life-size sculptures are exhibited around the Erinvale Clubhouse and across the prestigious Golf Course. Enjoy a perfect symbiosis of breath taking landscapes and exquisite art pieces. Both, Anton Smit and Erinvale are South African success stories with international recognition and clientele. Erinvale is home to a truly diverse community of property owners, golf members, visitors and guests coming from all parts of the world to enjoy this exquisite spot at the heart of the Helderberg. The Anton Smit Sculpture Exhibition at Erinvale starts on 25th January until May 2020. External visitors and guests are welcome to visit the Sculpture Exhibition at Erinvale on appointment (only). Please contact Erinvale Country Estate and Golf Club

Tel. 021 8471144

Sculpture enquiries and sales:
antonsmit@erinvale.com", - "p2": "Find all sculpture positions at Erinvale on this interactive map: Zoom in and out of the map to click on golden dots for outside and blue dots for inside positions. A click on a position displays the picture and relevant information about the sculptures that can be viewed at Ernvale." - }, - sculptures: [ - { - id: 0, - properties: { - name: 'FAITH MASK LARGE (wallmounted)', - position: 'outside', - size: 'H1400 / W820 / D370', - material: 'GRP MULTICOLOUR', - edition: "x/24", - poetry: 'Faith Mask

Fragmented beings
Face to Face
We see ourselves in glass

- dimly', - pos: [18.883701333390945,-34.0657207030428] - } - }, - { - id: 1, - properties: { - name: 'COLOSSAL YOUTH ORIGINAL', - position: 'outside', - size: 'H2500 / W1200 / D800', - material: 'GRP', - edition: "x/24", - poetry: "Colossal Youth

My flesh covers the tough clay,
my bones to rocks are metamorphosed,
that’s the cold northern star
burning
in my eyes, those legs, those thighs,
my monstrous
trunk, my erect head,
here it ends.

- Anton Smit", - pos: [18.882689599496643,-34.061917558094926] - } - }, - { - id: 2, - properties: { - name: 'REFLECT SERIES OF 3', - position: 'outside', - size: 'H1700 / W350 / D350 x3', - material: 'GRP MULTICOLOUR', - edition: 'x/24', - poetry: "Reflect Series

Coversation is a game of circles
In conversation we pluck up the termini
which bound the comon silence on every side

- Ralph W.E. Emmersan", - pos: [18.8832526407391,-34.065883440685155] - } - }, - { - id: 3, - properties: { - name: 'AGAPÉ EFFERVESCENT LARGE', - position: 'outside', - size: 'H2395 / W1250 / D840', - material: 'GRP MULTICOLOUR', - edition: "UNIQUE", - poetry: "Agapé

They think they know me all so well,
But behind this mask I secretly dwell.
I hide my thoughts, my feelings too,
I hide so well from all of you.

- Zoe Howarth", - pos: [18.88320496910751,-34.065987893669266] - } - }, - { - id: 4, - properties: { - name: 'AGAPÉ EFFERVESCENT LARGE', - position: 'outside', - size: 'H2395 / W1250 / D840', - material: 'GRP MULTICOLOUR', - edition: "UNIQUE", - poetry: "Agapé

They think they know me all so well,
But behind this mask I secretly dwell.
I hide my thoughts, my feelings too,
I hide so well from all of you.

- Zoe Howarth", - pos: [18.883239921658515,-34.06601333848289] - } - }, - { - id: 5, - properties: { - name: 'AGAPÉ EFFERVESCENT LARGE', - position: 'outside', - size: 'H2395 / W1250 / D840', - material: 'GRP MULTICOLOUR', - edition: "UNIQUE", - poetry: "Agapé

They think they know me all so well,
But behind this mask I secretly dwell.
I hide my thoughts, my feelings too,
I hide so well from all of you.

- Zoe Howarth", - pos: [18.883272064692164,-34.066038169072414] - } - }, - { - id: 6, - properties: { - name: 'BUT I FLY', - position: 'outside', - size: 'H1730 / W350 / D260', - material: 'Bronze', - edition: "x/12", - poetry: "BUT I FLY

Tarnished metals, fragmented beings, fallen buildings
I gallop through garnisons empty of soldiers
a flash of that persistant brightness
expands and engulfs the universe.

- Anton Smit", - pos: [18.883915135450593,-34.065827657620275] - } - }, - { - id: 7, - properties: { - name: 'FAITH MASK LARGE', - position: 'outside', - size: 'H1400 / W820 / D370', - material: 'GRP MULTICOLOUR', - edition: 'x/24', - poetry: "Faith Mask

Fragmented beings
Face to Face
We see ourselves in glass

- dimly", - pos: [18.88364414348075,-34.065705550598956] - } - }, - { - id: 8, - properties: { - name: 'DIE VERLANGE LARGE', - position: 'outside', - size: 'H1750 / W600 / D1700', - material: 'GRP', - edition: 'x/24', - poetry: "DIE VERLANGE

My cries shatter the meaning of the moment
and break the circle of extended peace
hovering over infinity
and waiting for pain to move
break the trance of living symphony
the callous theorem of small pain

- Anton Smit", - pos: [18.88366249127057,-34.06625752200005] - } - }, - { - id: 9, - properties: { - name: 'CROUCHING MAN x2', - position: 'outside', - size: 'H1210 / W590 / D590 x2', - material: 'GRP', - edition: 'x/24', - poetry: "CROUCHING MAN

My inspiration is derived from the
interconnectedness of our being -
the flawed cohesiveness of man.
The power of love and hope
the ever present awareness of our inadequacy.
We twist and turn in vain effort to break free,
only to be woven into the fabric
of man's epic journey.

- Anton Smit", - pos: [18.88414568199744,-34.06593615320918] - } - }, - { - id: 11, - properties: { - name: 'MORTAL COIL', - position: 'outside', - size: 'H1500 / W600 / D800', - material: 'SYLINDER BASE', - edition: 'x/24', - poetry: `MORTAL COIL

We turn and twist in a vain
to break free,
only to be more deeply woven
into the fabric
of man's epic journey.

- Anton Smit`, - pos: [18.881203600990375,-34.05754096738043] - } - }, - { - id: 12, - properties: { - name: 'VOËLVRY LARGE', - position: 'outside', - size: 'H1515 / W430 / D1040', - material: 'GRP', - edition: 'x/24', - poetry: '', - pos: [18.87980283086472,-34.06860260263451] - } - }, - { - id: 13, - properties: { - name: 'SPEED HEAD', - position: 'outside', - size: 'H1375 / W775 / D240', - material: 'GRP', - edition: 'x/24', - poetry: "Speed Head

Too much, too fast.Breathless at a stoplight.
I HAVE NO TIME
everything/everything/today/tomorrow
Always with the rushing, barely feeling, barely knowing where I am.

– Hannah Christin", - pos: [18.881274694117565,-34.07092813081486] - } - }, - { - id: 15, - properties: { - name: "ASTRONOMER'S HEAD LARGE", - position: 'outside', - size: 'H1260 / W700 / D330', - material: 'GRP', - edition: 'x/24', - poetry: `ASTRONOMER'S HEAD

Wandering re-establishes the original harmony
which once exisited between man and the universe

- Anatole France

Inscribing the face with knowledge.`, - pos: [18.886690707165826,-34.070201634075886] - } - }, - { - id: 16, - properties: { - name: 'THE AGE OF GRACE', - position: 'outside', - size: 'H2230 / W450 / D810', - material: 'GRP', - edition: 'x/24', - poetry: `The Age of Grace

The age of grace
is the last period
of mankind on earth
before the Second Coming.

- Anton Smit`, - pos: [18.883669053806898,-34.07279867954403] - } - }, - { - id: 17, - properties: { - name: 'TOIVA YA TOIVA - REDEMPTION', - position: 'outside', - size: 'LIFE SIZE', - material: 'GRP', - edition: 'UNIQUE', - poetry: `TOIVA YA TOIVA

Tis all a checker board of nights and days,
where destiny with men for pieces plays,
Hither and thither, mates and slays.

- Edward Fitzgerald`, - pos: [18.883844638591654,-34.07296682240876] - } - }, - { - id: 18, - properties: { - name: 'COLOSSAL YOUTH LARGE', - position: 'outside', - size: 'H3020 / W1150 / d750', - material: 'GRP', - edition: 'x/24', - poetry: `COLOSSAL YOUTH

My flesh covers the tough clay,
my bones to rocks are metamorphosed,
that’s the cold northern star burning
in my eyes, those legs, those thighs,
my monstrous trunk, my erect head,
here it ends.

- Anton Smit`, - pos: [18.887299831463906,-34.07376340746013] - } - }, -{ - id: 29, - properties: { - name: 'TOIVA YA TOIVA - that shifting moment', - position: 'outside', - size: 'LIFE SIZE', - material: 'GRP', - edition: 'UNIQUE', - poetry: `TOIVA YA TOIVA

Tis all a checker board of nights and days,
where destiny with men for pieces plays,
Hither and thither, mates and slays.

- Edward Fitzgerald`, - pos: [18.883736083951476,-34.066356876882445] - } - }, - { - id: 30, - properties: { - name: 'FAITH MASK LARGE', - position: 'outside', - size: 'H1400 / W820 / D370', - material: 'GRP TURQUOISE', - edition: 'x/24', - poetry: `FAITH MASK

Fragmented beings
Face to Face
We see ourselves in glass

- dimly`, - pos: [18.883750185454346,-34.066614022821454] - } - }, - { - id: 31, - properties: { - name: 'THE MAN WHO HAS PEACE', - position: 'outside', - size: 'H2030 / W450 / D810', - material: 'GRP', - edition: 'UNIQUE', - poetry: `THE MAN WHO HAS PEACE

Find a better variant of peace
Another meaning, another sience
In night fall's clemency of quiet.

- Anton Smit`, - pos: [18.881361341577986,-34.07084090867248] - } - }, - { - id: 38, - properties: { - name: 'GRACE CUT TORSO', - position: 'outside', - size: 'H1200 / W600 / D600', - material: 'BR', - edition: 'UNIQUE', - poetry: ``, - pos: [18.883395196015726,-34.06612352437555] - } - }, - { - id: 32, - properties: { - name: 'FAITH', - position: 'outside', - size: 'LIFE SIZE', - material: 'Bronze', - edition: "x/12", - poetry: `FAITH

I lift my eyes to You
To You whose throne is in heaven
In complete submission to God

- Anton Smit`, - pos: [18.882705344687565,-34.061276931208525] - } - }, - - // statues inside clubhouse: - { - id: 19, - properties: { - name: 'FACET II ORIGINAL', - position: 'inside', - size: 'H850 / W525 / D275', - material: 'Bronze', - edition: 'x/12', - poetry: "Facets II - Original

Rising from the ashes
like a phoenix
together we stand
divided we fall.

- Anton Smit", - pos: [18.883342155938294,-34.065806003202674] - } - }, - { - id: 20, - properties: { - name: 'TORNADO', - position: 'inside', - size: 'H1200 / W415 / D180', - material: 'Bronze', - edition: 'x/12', - poetry: `TORNADO

There, Dark recedes
Its mantle fallen
Curtains part
And Heaven spills into our hand

- Kevin J Taylor`, - pos: [18.883421117163834,-34.06575594804635] - } - }, - { - id: 21, - properties: { - name: 'AFRICAN QUEEN', - position: 'inside', - size: 'H510 / W200 / D240', - material: 'Bronze', - edition: 'x/12', - poetry: `AFRICAN QUEEN

Out of the carbon vault of night,
the beautiful one has come,
suffused unseen with shades of light,
Save for a ban of aural light
on shoulders draped in gold

DK Pritchett - Nefertiti`, - pos: [18.88350793863117,-34.06570379446638] - } - }, - { - id: 22, - properties: { - name: 'CROUCHING GIRL WITH WING', - position: 'inside', - size: 'H644 / W220 / D110', - material: 'GRP', - edition: 'UNIQUE', - poetry: `CROUCHING GIRL WITH WING

Infinity,she whispers as she closes her eyes.
Descending into thin air,
where our arms outstretch to catch her.

- Lisa Zara, GIRL`, - pos: [18.88360253586245,-34.06586770269832] - } - }, - { - id: 23, - properties: { - name: 'DIE VERLANGE ORIGINAL', - position: 'inside', - size: 'H700 / W600 / D300', - material: 'Bronze', - edition: 'x/12', - poetry: `DIE VERLANGE

My cries shatter the meaning of the moment
and break the circle of extended peace
hovering over infinity
and waiting for pain to move
break the trance of living symphony
the callous theorem of small pain

- Anton Smit`, - pos: [18.883485752516435,-34.06595035990588] - } - }, - { - id: 24, - properties: { - name: 'MILLENIUM LARGE', - position: 'outside', - size: 'H600 / W225 / D180', - material: 'Bronze', - edition: 'x/12', - poetry: '', - pos: [18.88387234632694,-34.066028265108535] - } - }, - { - id: 65, - properties: { - name: 'PLEIADES LARGE', - position: 'inside', - size: 'H2405 / W1190 / D255', - material: 'GRP', - edition: 'x/24', - poetry: `PLEIADES

A conspicious constellation of stars,
a clutter of seven damsels`, - pos: [18.883536616090282,-34.06573712341227] - } - }, - { - id: 28, - properties: { - name: 'FAITH II', - position: 'inside', - size: 'H1000 / W900 / D300', - material: 'Bronze', - edition: 'x/24', - poetry: `FAITH

I lift my eyes to You
To You whose throne is in heaven
In complete submission to God

- Anton Smit`, - pos: [18.883333310547073,-34.06593295122568] - } - }, - { - id: 40, - properties: { - name: 'OBLIVION OF THE WAVES - ORIGINAL', - position: 'inside', - size: 'H800 / W250 / D580', - material: 'STEEL PLATED', - edition: 'UNIQUE', - poetry: '', - pos: [18.883412729262545,-34.06587773637073] - } - }, - { - id: 41, - properties: { - name: 'TRANSLUCENT CATHEDRAL', - position: 'inside', - size: 'H800 / W250 / D350', - material: 'Bronze', - edition: '10/12', - poetry: '', - pos: [18.883487125666534,-34.065888457543124] - } - }, - { - id: 42, - properties: { - name: 'CRYSTAL OF THE SEA', - position: 'inside', - size: 'H800 / W250 / D350', - material: 'Bronze', - edition: '10/12', - poetry: '', - pos: [18.883569461808406,-34.06589847944723] - } - }, - { - id: 65, - properties: { - name: 'PLEIADES LARGE', - position: 'inside', - size: 'H2405 / W1190 / D255', - material: 'GRP', - edition: 'x/24', - poetry: '', - pos: [18.883569461808406,-34.06589847944723] - } - }, - { - id: 50, - properties: { - name: 'FAITH MASK - SMALL - MOUNTED', - position: 'inside', - size: 'H410 / W150 / D105', - material: 'GRP', - edition: 'UNIQUE', - poetry: '', - pos: [18.883376791033243,-34.06584379855272] - } - }, - { - id: 51, - properties: { - name: 'FAITH MASK - SMALL - MOUNTED', - position: 'inside', - size: 'H410 / W150 / D105', - material: 'GRP', - edition: 'UNIQUE', - poetry: '', - pos: [18.88345044300945,-34.065913996145255] - } - }, - { - id: 52, - properties: { - name: 'FAITH MASK - SMALL - MOUNTED', - position: 'inside', - size: 'H410 / W150 / D105', - material: 'GRP', - edition: 'UNIQUE', - poetry: '', - pos: [18.883378363750353,-34.06578164059617] - } - }, - { - id: 53, - properties: { - name: 'FAITH MASK - SMALL - MOUNTED', - position: 'inside', - size: 'H410 / W150 / D105', - material: 'GRP', - edition: 'UNIQUE', - poetry: '', - pos: [18.883416486483952,-34.06581600780311] - } - }, - { - id: 54, - properties: { - name: 'FAITH MASK - SMALL - MOUNTED', - position: 'inside', - size: 'H410 / W150 / D105', - material: 'GRP', - edition: 'UNIQUE', - poetry: '', - pos: [18.883450124189608,-34.065856876894586] - } - }, - { - id: 57, - properties: { - name: 'AGAPE MASK SMALL COPPER PLATED', - position: 'inside', - size: 'H610 / W250 / D170', - material: 'Copper Plated', - edition: 'UNIQUE', - poetry: '', - pos: [18.883529733428304,-34.06592654007423] - } - }, - - { - id: 58, - properties: { - name: 'KUNGWINI HEAD - SMALL', - position: 'inside', - size: 'H450 / W450 / D200', - material: 'Bronze', - edition: '2/12', - poetry: '', - pos: [18.883453201246425,-34.06579274695543] - } - }, - { - id: 59, - properties: { - name: 'TBD', - position: 'inside', - size: 'H610 / W250 / D170', - material: 'GRP', - edition: '1/12', - poetry: '', - pos: [18.883490526021205,-34.065824982332565] - } - }, - - { - id: 60, - properties: { - name: 'MILLENIUM ORIGINAL - SMALL', - position: 'inside', - size: 'H250 / W160 / D135', - material: 'Marbe Dust', - edition: 'UNIQUE', - poetry: '', - pos: [18.8835268425064,-34.065863179516974] - } - }, - { - id: 61, - properties: { - name: 'BLACK HEAD WITH GLASSES - SMALL', - position: 'inside', - size: 'H250 / W250 / D160', - material: 'GRP', - edition: '12/24', - poetry: '', - pos: [18.88346423346968,-34.065732515970495] - } - }, - { - id: 62, - properties: { - name: 'AGAPE EFFERVES-CENT - SMALL SERIES MASK 1 - WALL MOUNTED', - position: 'inside', - size: 'H450 / W250 / D155', - material: 'GRP', - edition: '4/12', - poetry: '', - pos: [18.883499260143026,-34.06576536896053] - } - }, - { - id: 63, - properties: { - name: 'MIJNLIEF', - position: 'inside', - size: 'H400 / W300 / D150', - material: 'Bronze', - edition: 'AP', - poetry: '', - pos: [18.883530345656936,-34.065796687847815] - } - }, - { - id: 64, - properties: { - name: 'REFLECT SINGLE MEDIUM', - position: 'inside', - size: '', - material: 'GRP', - edition: 'AP', - poetry: '', - pos: [18.883563951618157,-34.06582870269844] - } - }, - - - -] -} - -export default content; \ No newline at end of file diff --git a/src/assets/content.js b/src/assets/content.js index 52c95f946..68ba522af 100644 --- a/src/assets/content.js +++ b/src/assets/content.js @@ -10,6 +10,10 @@ const content = { title: 'Über das Projekt', description: 'Die Folgen des Klimawandels, insbesondere die trockenen und heißen Sommer, belasten das Berliner Ökosystem. Unsere Straßenbäume vertrocknen und tragen langfristige Schäden davon: in den letzten Jahren mussten immer mehr Bäume gefällt werden und ihre Lebensdauer sinkt. Inzwischen wird regelmäßig sogar die Bevölkerung zur Unterstützung aufgerufen, allerdings weitgehend unkoordiniert. Dies möchten wir mit diesem Projekt ändern und die koordinierte Bürger*innenbeteiligung und bei der Bewässerung städtischen Grüns ermöglichen.' }, + { + title: 'Plattform und Daten', + description: "Gieß den Kiez ist eine interaktive Karte, auf der sich NutzerInnen über den Wasserbedarf der Berliner Bäume informieren können. Die Karte zeigt alle Straßen- und Anlagenbäume (Stand: 14.06.2019) des Geoportals von Berlin. Es wird abgebildet wie viel Niederschlag in den letzten 30 Tagen bei jedem Baum gefallen ist und ob diese in der Zeit bereits gegossen wurden. Nutzer*innen können einzelne Bäume abonnieren und markieren, wenn diese gegossen wurden. Die Baumdaten stammen vom Berliner Geoportal FIS Broker. Die Niederschlagsdaten werden täglich vom Deutschen Wetterdienst bereitgestellt. Die Wasserpumpen werden von OpenStreetMap bereitgestellt." + }, { title: 'Die richtige Bewässerung', description: 'Je nach Alter, Standort und Baumart benötigen Bäume unterschiedlich viel Wasser. Jungbäume (0-15 Jahre), benötigen mehr Wasser als mittelalte Bäume (15-40 Jahre), und Altbäume (ab 40 Jahre) sind komplette Selbstversorger. Da frisch gepflanzte Bäume bis zum Alter von drei Jahren von der Berliner Verwaltung mit Wasser versorgt werden, benötigen besonders die Bäume zwischen vier und 15 Jahren unsere Aufmerksamkeit, beziehungsweise unser Wasser. Dies haben wir mit den Kennzeichungen des geringen, mittleren oder hohen Wasserbedarfs hervorgehoben.

Angelehnt an das Berliner Handbuch Gute Pflege empfehlen wir euch, lieber seltener zu wässern, dafür mit einer größeren Menge an Wasser. Das Handbuch empfiehlt für frisch gepflanzte Bäume bis zu 200l pro Gießung. So sorgt ihr dafür, dass die Bodenfeuchte auch in der Tiefe erhöht wird. Im Endeffekt schaden aber auch kleinere Mengen gerade im Hochsommer nicht. Wichtig ist es, den ausgetrockneten Boden vor dem Gießen aufzulockern, sodass das Wasser in den Boden eindringen kann und nicht wegläuft oder sich falsch anstaut.' diff --git a/src/components/Card/CardAccordion/TreesAdopted.js b/src/components/Card/CardAccordion/TreesAdopted.js index 926a8822f..8c70ba993 100644 --- a/src/components/Card/CardAccordion/TreesAdopted.js +++ b/src/components/Card/CardAccordion/TreesAdopted.js @@ -1,5 +1,8 @@ import React from 'react'; import styled from 'styled-components'; +import Actions from "../../../state/Actions"; +import { connect } from "unistore/react"; +import Store from "../../../state/Store"; import TreeType from './TreeType' import CardWaterDrops from '../CardWaterDrops' @@ -12,6 +15,11 @@ const StyledTreeType = styled(TreeType)` const Wrapper = styled.div` display: flex; flex-direction: column; + cursor: pointer; + + &:hover { + opacity: .5; + } `; const WrapperOuter = styled.div` @@ -26,9 +34,15 @@ const Title = styled.span` font-size: ${p => p.theme.fontSizeL}; `; - const TreesAdopted = p => { - const { data } = p; + const { data, setViewport } = p; + + const handleClick = (info) => { + console.log('handleClick', info); + Store.setState({selectedTree: info}) + const coordinates = [parseFloat(info.lat), parseFloat(info.lng)] + setViewport(coordinates); + } if (data.length === 0) { return ( @@ -41,7 +55,7 @@ const TreesAdopted = p => { {data.map(info => { return ( - + handleClick(info)}> {info.artdtsch} {info.strname == 'undefined' ? '' : info.strname} @@ -53,4 +67,6 @@ const TreesAdopted = p => { } -export default TreesAdopted; \ No newline at end of file +export default connect(state => { + +},Actions)(TreesAdopted) \ No newline at end of file diff --git a/src/components/Cookie/index.js b/src/components/Cookie/index.js index 9383bd0b6..f902388d3 100644 --- a/src/components/Cookie/index.js +++ b/src/components/Cookie/index.js @@ -66,7 +66,7 @@ const Cookie = p => { - Diese Webseite verwendet Cookies, um bestimmte Funktionen zu ermöglichen und das Angebot zu verbessern. Indem Sie hier fortfahren stimmen Sie der Nutzung von Cookies zu. Weitere Informationen. + Diese Webseite verwendet Cookies, um bestimmte Funktionen zu ermöglichen und das Angebot zu verbessern. Indem du hier fortfährst stimmst du der Nutzung von Cookies zu. Weitere Informationen. setCookie()}> Einverstanden diff --git a/src/components/map/index.js b/src/components/map/index.js index acb8ddd0f..6cc476871 100644 --- a/src/components/map/index.js +++ b/src/components/map/index.js @@ -35,7 +35,6 @@ class DeckGLMap extends React.Component { this.test = false; this.state = { - highlightedObject: 0, hoveredObject: null, data: null, included: null, @@ -54,6 +53,7 @@ class DeckGLMap extends React.Component { rainGeojson, treesVisible, pumpsVisible, + highlightedObject, rainVisible, pumps, csvdata @@ -159,16 +159,14 @@ class DeckGLMap extends React.Component { this._onClick(info.x, info.y, info.object); if (info.object != undefined) { - this.setState({ - highlightedObject: info.object.properties["id"], - }); + Store.setState({highlightedObject: info.object.properties["id"]}) setDetailRouteWithListPath(info.object.properties.id); } }, updateTriggers: { getFillColor: [ this.props.wateredTrees, - this.state.highlightedObject, + this.props.highlightedObject, this.props.ageRange, this.props.dataView ], @@ -379,6 +377,7 @@ export default connect( isLoading: state.isLoading, wateredTrees: wateredTreesSelector(state), state: state, + highlightedObject: state.highlightedObject, ageRange: state.ageRange, communityData: state.communityData, user: state.user, diff --git a/src/state/Store.js b/src/state/Store.js index 4bfdb60f9..05c6841b5 100644 --- a/src/state/Store.js +++ b/src/state/Store.js @@ -13,6 +13,7 @@ const Store = createStore({ overlayIsVisible: true, legendExpanded: false, pumpsVisible: false, + highlightedObject: false, user: null, rainVisible: false, legendExpanded: false,