Backgroundlayerselector opacityslider #3553

llienher · 2018-02-21T12:24:19Z

Add a way to get a static background layer linked to an opacity slider, via a parameter to include in the interface. I.E:

  /**
   * @type {string}
   * @export
   */
  this.bgOpacityOptions = 'Test aus Olten';

The string is the layer label (column name from admin interface when defining the layers).

The component is defined as follow in the html:

<gmf-backgroundlayerselector
    gmf-backgroundlayerselector-map="::mainCtrl.map"
    gmf-backgroundlayer-opacity-options="::mainCtrl.bgOpacityOptions"
    class="dropdown-menu">
</gmf-backgroundlayerselector>

gmf-backgroundlayer-opacity-options is facultative and if ignored, the application will just set as it was without the feature.

First commit is remove correctly the dimension used in the past but not done completly.
The app now use a group containing the active layer and the one used as overlay for the opacity slider. This group is called "background" and is always index 0 with group "data" at index 1.
Tests are updated to this new structures.

sbrunner · 2018-02-22T09:50:26Z

What's this strange pull request for?

llienher · 2018-02-22T09:55:49Z

@sbrunner EPFL and Schwytz want back the opacity slider for a background layer as it was available in CGXP. Ngeo implementation is extending the current background selector.

ger-benjamin · 2018-02-22T13:23:38Z

contribs/gmf/src/directives/backgroundlayerselector.js

@@ -166,9 +175,34 @@ gmf.BackgroundlayerselectorController.prototype.$onInit = function() {
 gmf.BackgroundlayerselectorController.prototype.handleThemesChange_ = function() {
  this.gmfThemes_.getBgLayers().then((layers) => {
    this.bgLayers = layers;
+
+    if (this.opacityOptions !== undefined && !this.isThemeLoadedOnce_) {
+      this.isThemeLoadedOnce_ = true;


Please add a comment to explain that

ger-benjamin

Thanks !

sbrunner · 2018-02-22T14:33:26Z

We shouldn't do that in 2.2...

- New background group - General PR cleanup - Adapt getter for the backgroundlayermanager

gberaudo · 2018-02-26T15:34:26Z

contribs/gmf/src/directives/backgroundlayerselector.js


  /**
-   * @type {?ol.Map}
+   * @type {?string}


Should be {!string|undefined} instead.

gberaudo · 2018-02-26T16:14:22Z

src/services/backgroundlayermgr.js

+  layer.setOpacity(0);
+  layer.setVisible(true);
+  const bgGroup = this.ngeoLayerHelper_.getGroupFromMap(map, gmf.BACKGROUNDLAYERGROUP_NAME);
+  bgGroup.getLayers().insertAt(1, layer);


You should remove all the extra layers (> 1) using a for (i=1; i< bgGroup.getLayers().length) and bgGroup.getLayers().removeAt(i).

Then the method will be callable several times.

gberaudo · 2018-02-26T16:22:40Z

contribs/gmf/src/directives/backgroundlayerselector.js

@@ -166,9 +175,37 @@ gmf.BackgroundlayerselectorController.prototype.$onInit = function() {
 gmf.BackgroundlayerselectorController.prototype.handleThemesChange_ = function() {
  this.gmfThemes_.getBgLayers().then((layers) => {
    this.bgLayers = layers;
+
+    if (this.opacityOptions !== undefined && !this.isThemeLoadedOnce_) {


This method is called several times, it should be normal.
I would avoid messing with the ordering inside getBgLayers so I suggest to duplicate the array before changing it (use slice without arguments).
Then remove the isThemeLoadedOnce condition.

gberaudo · 2018-02-26T16:30:00Z

@ybolognini, we are going to migrate EPFL to 2.3 starting this week.
If we merge in 2.2 it will need some work and delay to port it to 2.3.

Can we instead merge it in 2.3?

jwkaltz · 2018-02-27T07:18:25Z

@gberaudo it is promised to Schwyz for an upcoming 2.2 version, too.

gberaudo · 2018-03-01T09:09:42Z

@llienher, there is a test failing:

e 64.0.3282 (Linux 0.0.0) ngeo.BackgroundLayerMgr #set unsets the background layer FAILED
	TypeError: Cannot read property 'setZIndex' of null
	    at ngeo.BackgroundLayerMgr.set (src/services/backgroundlayermgr.js:9:2479)
	    at UserContext.it (test/spec/services/backgroundlayermgr.spec.js:61:30)

llienher added 3 commits February 20, 2018 14:25

Remove unused dimensions in backgroundlayerselector for app and examples

d136514

Add config for bgOpacityLayer in desktop_alt, basic UI

bf7a0cf

Add bgOpacityLayer to map

de3a620

llienher force-pushed the backgroundlayerselector-opacityslider branch 3 times, most recently from 60a5bc2 to 94d69f5 Compare February 22, 2018 08:23

Fix compiler errors

3ac6b09

llienher force-pushed the backgroundlayerselector-opacityslider branch from 94d69f5 to 3ac6b09 Compare February 22, 2018 08:32

Use of getter/setter for the opacity slider ng-model

76ba203

ger-benjamin reviewed Feb 22, 2018

View reviewed changes

ger-benjamin approved these changes Feb 22, 2018

View reviewed changes

llienher added 2 commits February 22, 2018 15:42

Add a background group containing all background layers

a668df5

- New background group - General PR cleanup - Adapt getter for the backgroundlayermanager

Update tests

4fe22dd

llienher force-pushed the backgroundlayerselector-opacityslider branch from c687e1b to 4fe22dd Compare February 22, 2018 14:42

llienher added 2 commits February 26, 2018 14:08

Fix background group order issue

53f42e3

Getter for opacity background layer and tests

74c1862

llienher force-pushed the backgroundlayerselector-opacityslider branch from 6f17671 to 74c1862 Compare February 26, 2018 13:25

llienher changed the title ~~[wip] Backgroundlayerselector opacityslider~~ Backgroundlayerselector opacityslider Feb 26, 2018

llienher requested review from gberaudo and fredj February 26, 2018 15:12

gberaudo reviewed Feb 26, 2018

View reviewed changes

llienher added 2 commits February 27, 2018 09:46

Add zIndex for background layers, better overlay background set

b738e64

Use fa-check icon

5a022ab

Fix set background method if layer is null for zindex property

c2cb3b5

fredj approved these changes Mar 1, 2018

View reviewed changes

llienher merged commit c95d1e4 into 2.2 Mar 1, 2018

llienher deleted the backgroundlayerselector-opacityslider branch March 1, 2018 13:27

sbrunner added this to the 2.2 milestone Apr 12, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Backgroundlayerselector opacityslider #3553

Backgroundlayerselector opacityslider #3553

llienher commented Feb 21, 2018 •

edited

sbrunner commented Feb 22, 2018

llienher commented Feb 22, 2018

ger-benjamin Feb 22, 2018

ger-benjamin left a comment

sbrunner commented Feb 22, 2018

gberaudo Feb 26, 2018

gberaudo Feb 26, 2018

gberaudo Feb 26, 2018

gberaudo commented Feb 26, 2018

jwkaltz commented Feb 27, 2018

gberaudo commented Mar 1, 2018

Backgroundlayerselector opacityslider #3553

Backgroundlayerselector opacityslider #3553

Conversation

llienher commented Feb 21, 2018 • edited

sbrunner commented Feb 22, 2018

llienher commented Feb 22, 2018

ger-benjamin Feb 22, 2018

Choose a reason for hiding this comment

ger-benjamin left a comment

Choose a reason for hiding this comment

sbrunner commented Feb 22, 2018

gberaudo Feb 26, 2018

Choose a reason for hiding this comment

gberaudo Feb 26, 2018

Choose a reason for hiding this comment

gberaudo Feb 26, 2018

Choose a reason for hiding this comment

gberaudo commented Feb 26, 2018

jwkaltz commented Feb 27, 2018

gberaudo commented Mar 1, 2018

llienher commented Feb 21, 2018 •

edited