89 show multiple regions layers #97

srezacova · 2021-12-29T21:12:17Z

Description

Show multiple region layers. Create layerOptions in mapLayers config.

How has this been tested?

TEST singleLayer: true with 2 timeseries layers behavior:

upload this these files in to initial-data-load/data/Sample/attributes/daily_cases_test folder
Daily_Covid19_cases1.csv
Daily_Covid19_cases2.csv
Daily_Covid19_cases3.csv
add these lines to initial-data-load/data/Sample/attributes/index.js

    referenceId: 'DailyCovid19Cases',
    date: new Date(now - 1 * oneDay).toISOString(),
    csvFileName: 'daily_cases_test/Daily_Covid19_cases1.csv',
  },
  {
    referenceId: 'DailyCovid19Cases',
    date: new Date(now - 2 * oneDay).toISOString(),
    csvFileName: 'daily_cases_test/Daily_Covid19_cases2.csv',
  },
  {
    referenceId: 'DailyCovid19Cases',
    date: new Date(now - 3 * oneDay).toISOString(),
    csvFileName: 'daily_cases_test/Daily_Covid19_cases3.csv',
  },

add test layer to MapLayers.yml

  geoReferenceId: "slovakiaRegions"
  layerType: "regions"
  category: "Baseline data"
  title: "Daily Covid-19"
  attribute: "Daily Covid19 Cases"
  attributeDescription:
    descriptionText: "COVID-19 New Cases: {{Daily Covid19 Cases}}"
    featureText: "{{featureId}} kraj"
  featureId: "name"
  style:
    fillColor:
      type: "colormap"
      value: "green"
    min: 0
    max: 100
    strokeColor:
      type: "color"
      value: "rgba(255,255,255,0.2)"
  legend:
    - type: "colormap"
      color: "green"
      min: 0
      max: 100
  metadata:
    description: "Sample data created just for this purpose. Do not represent the reality in any time."
    updateFrequency: "never"
    unit: "n/a"
    dataRetrievalDescription: "Data was randomly created."
  layerOptions: 
    singleDisplay: false   
    timeseries: true

Leave singleDisplay false for both timeseries layers to check functionality with more sliders shown on the map. Change singleDisplay to true in other layers for checking singleDisplay functionality. Add maxResolution: 1000 to any of the layers to check if it works.

Run ./start.sh, ./runinitialload.sh with COUNTRY=Sample. Check layers on the map.
Now you have 2 timeseries layers for testing purposes, one in Baseline data and one in Covid-19. You can add one more for testing purposes.

check points in Show multiple region layers - 3SP #89
check new functionality in publicMap.js and if comments are understandable
check layer without values, that it is transparent gray
run tests in api
check release notes
check documentation and schema changes
slider behavior is the same for all the layer types, singleDisplay behavior is added just for regions layers, other layer types will act like before, so they will appear together with regions layers, singleDisplay flag in them won't have any effect
this task doesn't solve layer ordering, when 2 region layers overlay each other, the color doesn't corespond to legend, because the colors are mixed together, we should use z-index later to fix this.
check group layer

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

I have read the CONTRIBUTING document.
I have checked to ensure that there aren't other open Pull Requests for the same update/change.
My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have added tests to cover my changes.
All new and existing tests passed.

frontend/src/ol/staticLayers/layerTypes/regions.js

srezacova · 2021-12-30T09:26:52Z

Hi,
mark 'timeseries' on top level as deprecated in release notes

So I will add this in CHANGELOG.md?

[1.3.1] - 2021-12-29

Deprecated

'timeseries' key on top level is now deprecated, it is moved to 'layerOptions' key

or something like that?

bariela · 2021-12-30T09:36:22Z

Hi, mark 'timeseries' on top level as deprecated in release notes

So I will add this in CHANGELOG.md?

[1.3.1] - 2021-12-29

Deprecated

'timeseries' key on top level is now deprecated, it is moved to 'layerOptions' key

or something like that?

in the unreleased part for now, as we don't make new release just for this feature and with more specification, so the reader can understand what and where exactly should be changed

srezacova · 2022-01-03T09:00:00Z

Hi, mark 'timeseries' on top level as deprecated in release notes
So I will add this in CHANGELOG.md?

[1.3.1] - 2021-12-29

Deprecated

'timeseries' key on top level is now deprecated, it is moved to 'layerOptions' key

or something like that?

in the unreleased part for now, as we don't make new release just for this feature and with more specification, so the reader can understand what and where exactly should be changed

I fixed this in release notes.

srezacova · 2022-01-03T09:48:41Z

frontend/src/screens/Map/TimeSeriesSlider.js

@@ -124,6 +124,10 @@ const TimeSeriesSlider = ({ availableDates, modifiedLayer }) => {

  const [currentValue, setCurrentValue] = useState(undefined);

+  useEffect(() => {


When you have more layers in map visible with slider and deselect one of these layers, slider stay on the date you selected before on this layer. So I added this useEffect to always show LAST value. You can comment out this and check the behavior or if we should do it another way. In PublicMap.js we have code on LN142-144, if I comment this out, slider behave the same. What was the purpose of it? I suppose this should fetch the LAST values for the layer, but we have LAST values also without it, when you show the slider for the first time when we use it on LN214. (Thats because of LN132-134 in TimeSeriesSlider.js.) And when we use it on LN171 in PublicMap.js, this doesn't set slider to LAST, because currentValue already exist. So my question is should I remove PublicMap.js LN142-144? And leave this code in TimeSeriesSlider? Thanks for checking

Hi, so this is ok?

…openkfw/Oscar into 89-show-multiple-regions-layers

bariela · 2022-01-03T15:39:20Z

frontend/src/screens/Map/PublicMap.js

          setTimeSeriesSlider(false);
          setModifiedLayer(null);
        }
      } else {
        // layer is not selected, selecting
-        // deselect the rest of regions layers, if regions layer selected
+        // deselect the rest of regions layers, if regions layer with singleDisplay true is selected


I believe this comment should be to if on L182

Sure, I moved it.

bariela · 2022-01-03T15:40:59Z

frontend/src/screens/Map/PublicMap.js

+              }
+            });
+          } else {
+            // deselect regions layer, which have singleDisplay true, if regions layer with singleDisplay false is selected


'regions layer, which has'
it's only one ;)

yeah you are right :) fixed

bariela · 2022-01-05T08:12:47Z

frontend/src/ol/staticLayers/layerTypes/group.js

@@ -7,8 +7,17 @@ const groupLayer = (layerData, handleIsLoading) => {
    title: layerData.title,
    type: layerData.layerType,
    legend: layerData.legend,
-    layers: layerData.layers.map((layer) => staticLayerGenerator({ ...layer, visible: true }, handleIsLoading)),
-    timeseries: layerData.timeseries,


should be still compatible with this data structure

I fixed this and tested it. Please check it. I removed 'timeseries' key from documentation (moved it to layerOptions). Should I also leave the documentation as it was before + add layerOptions description?

bariela · 2022-01-07T09:46:47Z

initial-data-load/src/mapLayers/mapLayersUpload.js

@@ -6,6 +6,11 @@ const logger = require('../config/winston');
 const { getOneLayerGeoData, saveMapLayers } = require('./db');

 const addMapLayer = async (data) => {
+  if (data.timeseries !== undefined) {
+    logger.info(
+      `DeprecationWarning: 'timeseries' key on the top level is deprecated. Move 'timeseries' key in 'layerOptions' key in ${data.referenceId} layer in mapLayers config.`,


srezacova added 2 commits December 29, 2021 22:06

#89-show multiple region layers

d41bb52

#89-fix-lint

18d2825

srezacova commented Dec 30, 2021

View reviewed changes

frontend/src/ol/staticLayers/layerTypes/regions.js Show resolved Hide resolved

srezacova requested a review from bariela December 30, 2021 09:27

#89-fix show multiple region layers

c240240

srezacova closed this Jan 3, 2022

srezacova reopened this Jan 3, 2022

srezacova commented Jan 3, 2022

View reviewed changes

#89-fix docs links

b5716f2

srezacova changed the title ~~Draft 89 show multiple regions layers~~ 89 show multiple regions layers Jan 3, 2022

srezacova and others added 6 commits January 4, 2022 10:22

#89-fix maxResolution

a788ad5

#89-revert fix maxResolution

5a4cfc2

#89-compatibility with old data structure

e5c122c

Merge branch '89-show-multiple-regions-layers' of https://github.com/…

7c3e012

…openkfw/Oscar into 89-show-multiple-regions-layers

#89-fix frontend error

5fe067c

#89-fix NaN in url

f39cec6

bariela suggested changes Jan 5, 2022

View reviewed changes

srezacova added 2 commits January 6, 2022 22:11

#89-fix timeseries key

d79c64a

#89-fix lint

164e3e6

srezacova requested a review from bariela January 6, 2022 21:27

bariela approved these changes Jan 7, 2022

View reviewed changes

bariela merged commit dca4075 into main Jan 7, 2022

bariela deleted the 89-show-multiple-regions-layers branch January 7, 2022 13:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

89 show multiple regions layers #97

89 show multiple regions layers #97

srezacova commented Dec 29, 2021 •

edited

Loading

srezacova commented Dec 30, 2021

bariela commented Dec 30, 2021

[1.3.1] - 2021-12-29

Deprecated

srezacova commented Jan 3, 2022

[1.3.1] - 2021-12-29

Deprecated

srezacova Jan 3, 2022

srezacova Jan 6, 2022

bariela Jan 3, 2022

srezacova Jan 6, 2022

bariela Jan 3, 2022

srezacova Jan 6, 2022

bariela Jan 5, 2022

srezacova Jan 6, 2022

bariela Jan 7, 2022

		@@ -124,6 +124,10 @@ const TimeSeriesSlider = ({ availableDates, modifiedLayer }) => {

		const [currentValue, setCurrentValue] = useState(undefined);

		useEffect(() => {

89 show multiple regions layers #97

89 show multiple regions layers #97

Conversation

srezacova commented Dec 29, 2021 • edited Loading

Description

How has this been tested?

Screenshots (if appropriate):

Types of changes

Checklist:

srezacova commented Dec 30, 2021

[1.3.1] - 2021-12-29

Deprecated

bariela commented Dec 30, 2021

[1.3.1] - 2021-12-29

Deprecated

srezacova commented Jan 3, 2022

[1.3.1] - 2021-12-29

Deprecated

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

srezacova commented Dec 29, 2021 •

edited

Loading