Bounding box: calculation of MinMax values and add clamping options #1993

ftoromanoff · 2023-01-27T16:25:48Z

Description

I changed the way the NodataValue is taken into account for the computation of the MinMax for the bounding box and also added an option to add clamping min and max value when creating a new layer.

Motivation and Context

There was a probleme with the segmentation of tile in relation with abnormal values in particular on see area.
issue #1945
It should also solve the problem seen on the issue #1981

Screenshots (if appropriate)

examples/view_3d_map.html

jailln

Thanks for this PR! Except from my comments, don't forget to rename your commit with the angular convention :)

examples/layers/JSONLayers/IGN_MNT_HIGHRES.json

examples/view_3d_map.html

src/Layer/ElevationLayer.js

jailln · 2023-02-10T12:50:51Z

examples/view_3d_mns_map.html

            itowns.Fetcher.json('./layers/JSONLayers/IGN_MNS_HIGHRES.json').then(addElevationLayerFromConfig);
+            // itowns.Fetcher.json('./layers/JSONLayers/IGN_MNT.json').then(addElevationLayerFromConfig);


Shouldn't be commented out ?

There is a probleme with the dataset linked with this configuration file or with the configuration file (IGN_MNT.json), that appear with the new changes. As it is only used in this example and the extra Elevation layer doesn't really seems to be important. I prefered to removed it and it can be eluded when the issue #2000 will be studied.

Ok, could you describe this problem in #2000 please so we don't forget about it ?

gchoqueux · 2023-02-13T10:59:34Z

examples/3dtiles_ion.html

-            itowns.Fetcher.json('./layers/JSONLayers/WORLD_DTM.json').then(addElevationLayerFromConfig);
            itowns.Fetcher.json('./layers/JSONLayers/IGN_MNT_HIGHRES.json').then(addElevationLayerFromConfig);
+            itowns.Fetcher.json('./layers/JSONLayers/WORLD_DTM.json').then(addElevationLayerFromConfig);


it's issue #2000 ?

gchoqueux · 2023-02-13T11:04:04Z

src/Layer/ElevationLayer.js

+     * @param {number} [config.clampValues.min]   The minimum value to clamp the elevation
+     * @param {number} [config.clampValues.max]   The maximum value to clamp the elevation


you rename to make the parameters more understandable?
you keep zmin and zmax name for the layer properties?

gchoqueux · 2023-02-13T11:07:27Z

src/Parser/XbilParser.js

+ * @param      {number}          [options.zmin]   The minimum elevation value after which it will be clamped
+ * @param      {number}          [options.zmax]   The maximum elevation value after which it will be clamped


could you homogenize with clampValues name?

gchoqueux · 2023-02-13T11:21:04Z

src/Renderer/Shader/Chunk/elevation_pars_vertex.glsl

+        if (d < layer.zmin) d = layer.zmin;
+        if (d > layer.zmax) d = layer.zmax;
+        if (d == layer.noDataValue) d = 0.;


there's a clamp method in glsl

it seems to me that d is an interpolated value, the filter nodatavalue will not work here

I changed it with the clamp method.

I still want the nodata value to be interpreted as an elevation of zero in the texture. Can we check that together ?

…the elevation dataset

mgermerie marked this pull request as draft January 27, 2023 16:28

ftoromanoff changed the title ~~WIP Bathy~~ WIP Bounding box and calculation of MinMax values Feb 1, 2023

ftoromanoff force-pushed the bathy branch 8 times, most recently from 68f82fc to 67debc5 Compare February 8, 2023 14:44

ftoromanoff changed the title ~~WIP Bounding box and calculation of MinMax values~~ WIP Bounding box: calculation of MinMax values and add clamping options Feb 8, 2023

ftoromanoff marked this pull request as ready for review February 9, 2023 13:08

ftoromanoff changed the title ~~WIP Bounding box: calculation of MinMax values and add clamping options~~ Bounding box: calculation of MinMax values and add clamping options Feb 9, 2023

mgermerie requested review from mgermerie and jailln February 9, 2023 13:08

mgermerie reviewed Feb 9, 2023

View reviewed changes

examples/view_3d_map.html Show resolved Hide resolved

mgermerie requested a review from gchoqueux February 9, 2023 13:18

jailln requested changes Feb 9, 2023

View reviewed changes

examples/layers/JSONLayers/IGN_MNT_HIGHRES.json Show resolved Hide resolved

examples/view_3d_map.html Show resolved Hide resolved

src/Layer/ElevationLayer.js Outdated Show resolved Hide resolved

src/Layer/ElevationLayer.js Show resolved Hide resolved

ftoromanoff force-pushed the bathy branch 3 times, most recently from c8b6678 to 67fcdfe Compare February 10, 2023 11:13

jailln reviewed Feb 10, 2023

View reviewed changes

ftoromanoff mentioned this pull request Feb 10, 2023

Adding two elevation Layers and properties linked #2000

Open

jailln approved these changes Feb 10, 2023

View reviewed changes

gchoqueux reviewed Feb 13, 2023

View reviewed changes

mgermerie linked an issue Mar 24, 2023 that may be closed by this pull request

Wrong bounding box computing for negative elevation data #1945

Closed

ftoromanoff force-pushed the bathy branch from 4a134bb to c20376d Compare March 27, 2023 15:51

feat(elevationLayers): Add config.clampValues for clamping values of …

39a15af

…the elevation dataset

ftoromanoff force-pushed the bathy branch 2 times, most recently from a3dc15d to a4989ff Compare March 30, 2023 12:54

ftoromanoff added 2 commits March 30, 2023 14:54

feat(XbilParser): gestion nodata in elevation layer (elevation set to 0)

43a06b5

fix(example): change config file linked with the clampValues config

406ad32

ftoromanoff force-pushed the bathy branch from a4989ff to 4353d5e Compare March 30, 2023 12:55

fix(example): invert order of the ElevationLayer addition when using 2

deeee31

ftoromanoff force-pushed the bathy branch from 4353d5e to deeee31 Compare April 14, 2023 08:18

mgermerie approved these changes Apr 14, 2023

View reviewed changes

mgermerie merged commit c6800c9 into iTowns:master Apr 14, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bounding box: calculation of MinMax values and add clamping options #1993

Bounding box: calculation of MinMax values and add clamping options #1993

ftoromanoff commented Jan 27, 2023 •

edited

Loading

jailln left a comment

jailln Feb 10, 2023

ftoromanoff Feb 10, 2023

jailln Feb 10, 2023

gchoqueux Feb 13, 2023

gchoqueux Feb 13, 2023

gchoqueux Feb 13, 2023

gchoqueux Feb 13, 2023

ftoromanoff Mar 14, 2023

ftoromanoff Mar 14, 2023

		itowns.Fetcher.json('./layers/JSONLayers/IGN_MNS_HIGHRES.json').then(addElevationLayerFromConfig);
		// itowns.Fetcher.json('./layers/JSONLayers/IGN_MNT.json').then(addElevationLayerFromConfig);

		* @param {number} [config.clampValues.min] The minimum value to clamp the elevation
		* @param {number} [config.clampValues.max] The maximum value to clamp the elevation

		* @param {number} [options.zmin] The minimum elevation value after which it will be clamped
		* @param {number} [options.zmax] The maximum elevation value after which it will be clamped

Bounding box: calculation of MinMax values and add clamping options #1993

Bounding box: calculation of MinMax values and add clamping options #1993

Conversation

ftoromanoff commented Jan 27, 2023 • edited Loading

Description

Motivation and Context

Screenshots (if appropriate)

jailln left a 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ftoromanoff commented Jan 27, 2023 •

edited

Loading