Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[GEOS-11232] Add Zoom scaled layer templates to MapML #356

Closed
wants to merge 14 commits into from
Closed

[GEOS-11232] Add Zoom scaled layer templates to MapML #356

wants to merge 14 commits into from

Conversation

turingtestfail
Copy link

@turingtestfail turingtestfail commented Jan 25, 2024 •
edited
Loading

Checklist

For core and extension modules:

  • New unit tests have been added covering the changes.
  • Documentation has been updated (if change is visible to end users).
  • The REST API docs have been updated (when changing configuration objects or the REST controllers).
  • There is an issue in the GeoServer Jira (except for changes that do not affect administrators or end users in any way).
  • Commit message(s) must be in the form [GEOS-XYZWV] Title of the Jira ticket.
  • Bug fixes and small new features are presented as a single commit.
  • Each commit has a single objective (if there are multiple commits, each has a separate JIRA ticket describing its goal).

@prushforth
Copy link
Collaborator

prushforth commented Jan 26, 2024 •
edited
Loading

Hi Joe, could you help me out to evaluate this PR:

I tried to create an SLD that would limit the scales at which the states layer will render in CBMTILE:

<?xml version="1.0" encoding="ISO-8859-1"?>
<StyledLayerDescriptor version="1.0.0" 
 xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd" 
 xmlns="http://www.opengis.net/sld" 
 xmlns:ogc="http://www.opengis.net/ogc" 
 xmlns:xlink="http://www.w3.org/1999/xlink" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <!-- Limits the scale from 1:2 to whatever, but a bug in GS made this kind of style not generate any kml -->
  <NamedLayer>
    <Name>states_test</Name>
    <UserStyle>
      <Title>Test of Zoom Scales for MapML</Title>
      <Abstract>A sample style that draws a polygon</Abstract>
      <FeatureTypeStyle>
        <Rule>
          <MinScaleDenominator>40000</MinScaleDenominator><!-- max zoom should be 15 -->
          <MaxScaleDenominator>80000000</MaxScaleDenominator><!-- min zoom should be 2 -->
          <PolygonSymbolizer>
            <Fill>
              <CssParameter name="fill">#AAAAAA</CssParameter>
            </Fill>
            <Stroke>
              <CssParameter name="stroke">#000000</CssParameter>
              <CssParameter name="stroke-width">1</CssParameter>
            </Stroke>
          </PolygonSymbolizer>
        </Rule>
      </FeatureTypeStyle>
    </UserStyle>
  </NamedLayer>
</StyledLayerDescriptor>

I based my scale calculations on the m/px resolutions of CBMTILE:

          <MinScaleDenominator>40000</MinScaleDenominator><!-- max zoom should be 15 -->
          <MaxScaleDenominator>80000000</MaxScaleDenominator><!-- min zoom should be 2 -->

In the capabilities I think it has applied the sld rule:

<Layer queryable="1" opaque="0">
<Name>topp:states</Name>
<Title>USA Population</Title>
<Abstract>This is some census data on the states.</Abstract>
<KeywordList>
<Keyword>census</Keyword>
<Keyword>united</Keyword>
<Keyword>boundaries</Keyword>
<Keyword>state</Keyword>
<Keyword>states</Keyword>
</KeywordList>
<CRS>EPSG:3978</CRS>
<CRS>CRS:84</CRS>
<EX_GeographicBoundingBox>
<westBoundLongitude>-124.731422</westBoundLongitude>
<eastBoundLongitude>-66.969849</eastBoundLongitude>
<southBoundLatitude>24.955967</southBoundLatitude>
<northBoundLatitude>49.371735</northBoundLatitude>
</EX_GeographicBoundingBox>
<BoundingBox CRS="CRS:84" minx="-124.731422" miny="24.955967" maxx="-66.969849" maxy="49.371735"/>
<BoundingBox CRS="EPSG:3978" minx="-3385113.991161208" miny="-2857719.8337224196" maxx="3204541.0636327886" maxy="536137.7045786483"/>
<Style>
<Name>states_test</Name>
<Title>Test of Zoom Scales for MapML</Title>
<Abstract>A sample style that draws a polygon</Abstract>
<LegendURL width="20" height="20">
<Format>image/png</Format>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost:8080/geoserver/ows?service=WMS&version=1.3.0&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=topp%3Astates"/>
</LegendURL>
</Style>
<MinScaleDenominator>40000.0</MinScaleDenominator>
<MaxScaleDenominator>8.0E7</MaxScaleDenominator>
</Layer>

However when I do a getmap, I get <map-input name="z" type="zoom" value="25" min="25" max="25"></map-input>.

When I change the MapML extension to"Use Tiles", the <map-input type="zoom" value="..."></map-input> value attribute value becomes critical information to the client to know what zoom level / tile matrix the other (location) inputs' min and max values refer to. (I notice that it didn't change from value=25, above). Clearly the location of the (location inputs) min and max axis limits expressed as tiles depends on the zoom value used, so that's why the <map-input type="zoom" value="..."></map-input> is critical in that situation. I believe that if the user has selected "Use Tiles", then the <map-input type="zoom" min="..." max="..."></map-input> min and max values should come from: the min/max tile cache values, if tile caching is enabled, or from the sld min / max scale denominators per the WMS decision making.

@turingtestfail
Copy link
Author

turingtestfail commented Jan 27, 2024 via email

aaime
aaime reviewed Jan 30, 2024
View reviewed changes
Copy link
Member

@aaime aaime left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, just one comment as I've found one bit confusing.

src/extension/mapml/src/main/java/org/geoserver/mapml/tcrs/TiledCRS.java
public Integer getMinZoomForDenominator(double denominator) {
// handles the case where denominator is larger than the largest scale or is infinity
if (denominator == Double.POSITIVE_INFINITY
|| denominator >= convertGroundResolutionToScale(scales[0])) return 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The call is confusing, convert a ground resolution to scale, and you pass a scale...

Checking the WGS84 initialization inside TiledCRSConstants, I can see where the issue is... it defines scale as the inverse of the pixel size in ground units, but an actual scale is using the expression you have in convertGroundResolutionToScale method.

Checking actual use, it seems the "scales" are not used (not even by the GWC integration, where there is a separate resolutions array), other than checking the length of the array.

@prushforth can we clarify the code? We can either stop calling them scales, and calling them resolutions instead (and avoid the "1/res" math, just use the resolution directly instead)?

Copy link
Collaborator

@prushforth prushforth Jan 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@prushforth can we clarify the code? We can either stop calling them scales, and calling them resolutions instead (and avoid the "1/res" math, just use the resolution directly instead)?

yes, it would be better to use resolutions directly, but it may involve breakage / refactoring

Checking actual use, it seems the "scales" are not used

good, hopefully that makes it straightforward tbd.

The actual numbers are duplicated, which is not good, in the MapMLGridSets.java class, where they are used in resolutions.

Sorry for the confusion.

Edit: I recall that there is a bit of code that calculates the zoom to be used for the preview map based on the fit of the bounds into a pre-defined viewport of 1024 x 768. I believe it must use the scales/resolutions to determine the correct zoom value.

@prushforth
Copy link
Collaborator

prushforth commented Jan 30, 2024 •
edited
Loading

@turingtestfail I think the system may not be generating the bounds correctly. The <map-input type="zoom"> looked good for the example SLD above though, so that's progress, hopefully the bounds issue can be fixed too. I'll keep looking, I only had a brief look at the changes as yet.

It's just a guess, but I think the bounds are messed up by the <map-input name="z" type="zoom" value="15" min="2" max="15"></map-input> because the client is calculating the bounds of the <map-extent> (and the layer) from the <map-input name="y" type="location" axis="row" units="tilematrix" min="2289790" max="2490214"></map-input> min and max values based on the <map-input type="zoom" value="15" min="2" max="15"></map-input> because the min and max axis values must be at a particular zoom value to be understood as coordinates.

Peter Smythe and others added 2 commits January 31, 2024 10:55
Fix spelling mistakes only
466141c
@afabiani
[GEOS-11225] AuthKey synchronize the user/group automatically (geoser…
9ba522f 
…ver#7316)

* [GEOS-11225] AuthKey synchronize the user/group automatically

* - Purge web-service cache on synchronize

 - Code refactoring for readability and stability

* - missing mapper setting

* - trying to fix qa checks

* Fix QA checks

* - Updating the plugin user documentation

* - docs typo
@aaime
Copy link
Member

aaime commented Feb 1, 2024

@turingtestfail regarding bounds, you might want to have a look at what I'm doing with bounds reprojection in the TCRS PR (each projection gets a bbox in its own CRS, before it was using the same bbox as the request, untransformed)

@turingtestfail
Copy link
Author

@turingtestfail regarding bounds, you might want to have a look at what I'm doing with bounds reprojection in the TCRS PR (each projection gets a bbox in its own CRS, before it was using the same bbox as the request, untransformed)

Thanks @aaime , In incorporated your bounds reprojection into this PR

@aaime
Copy link
Member

aaime commented Feb 1, 2024

@prushforth how are we looking on this one? Can it be turned into an official PR?

@prushforth
Copy link
Collaborator

I was having problems working across PRs because my data directory got used to the CRS PR while this PR doesn't have that stuff in it yet. Progress on so many fronts is foreign to me :-P.

Anyway, I believe there's still an issue when a layer has "Use Tiles" checked, the generated <map-extent> is conveying the wrong <map-input type="zoom" value="..."> value: it's setting the value equal to its own <map-input type="zoom" max="..."> max value, but it doesn't matter what that value is (can even be outside the min/max range - in the old system I used the maximum zoom level available in the TCRS to calculate the bounds in tiles, since the tiles are small the bounds are more accurate when expressed this way), as long as it is at the same zoom level that is used to calculate the <map-input type="location" axis="row" (or column) min="..." max="..."> min and max values.

When I load the preview for the states layer with zoom scaling set up, but "Use Tiles" is not checked:

<map-extent units="CBMTILE" checked="checked" hidden="hidden">
      <map-input name="z" type="zoom" value="15" min="2" max="15"></map-input><!-- value is not used in this case -->
      <map-input name="xmin" type="location" rel="map" position="top-left" axis="easting" units="pcrs" min="-3385113.991161208" max="3204541.0636327886"></map-input><!-- min / max are pcrs coords. Good! -->
      <map-input name="ymin" type="location" rel="map" position="bottom-left" axis="northing" units="pcrs" min="-2857719.8337224196" max="536137.7045786483"></map-input>
      <map-input name="xmax" type="location" rel="map" position="top-right" axis="easting" units="pcrs" min="-3385113.991161208" max="3204541.0636327886"></map-input>
      <map-input name="ymax" type="location" rel="map" position="top-left" axis="northing" units="pcrs" min="-2857719.8337224196" max="536137.7045786483"></map-input>
      <map-input name="w" type="width" min="1" max="10000"></map-input>
      <map-input name="h" type="height" min="1" max="10000"></map-input>
      <map-link tref="http://localhost:8080/geoserver/wms?request=GetMap&amp;crs=urn:x-ogc:def:crs:EPSG:3978&amp;service=WMS&amp;bbox={xmin},{ymin},{xmax},{ymax}&amp;layers=states&amp;format=image/png&amp;width={w}&amp;styles=&amp;language=en&amp;version=1.3.0&amp;transparent=true&amp;height={h}" rel="image"></map-link>
      <map-input name="i" type="location" axis="i" units="map"></map-input>
      <map-input name="j" type="location" axis="j" units="map"></map-input>
      <map-link tref="http://localhost:8080/geoserver/wms?request=GetFeatureInfo&amp;query_layers=states&amp;crs=urn:x-ogc:def:crs:EPSG:3978&amp;bbox={xmin},{ymin},{xmax},{ymax}&amp;language=en&amp;version=1.3.0&amp;transparent=true&amp;service=WMS&amp;layers=states&amp;width={w}&amp;x={i}&amp;feature_count=50&amp;y={j}&amp;styles=&amp;info_format=text/mapml&amp;height={h}" rel="query"></map-link>
</map-extent>

When I select "Use Tiles" for the layer (and set up tile caching so it goes through WMTS):

<map-extent units="CBMTILE" checked="checked" hidden="hidden">
      <map-input name="z" type="zoom" value="15" min="2" max="15"></map-input><!-- value is used to tell what the --> 
                                                                            <!-- min/max values in the location -->                                                                                                                                                                                                                                                                                    
                                                                     <!-- inputs below mean/ where they are -->
      <map-input name="x" type="location" axis="column" units="tilematrix" min="1846690" max="2235842"></map-input>
      <map-input name="y" type="location" axis="row" units="tilematrix" min="2289790" max="2490214"></map-input>
      <map-link tref="http://localhost:8080/geoserver/gwc/service/wmts?request=GetTile&amp;tilematrixset=CBMTILE&amp;tilematrix={z}&amp;TileRow={y}&amp;service=WMTS&amp;format=image/png&amp;style=&amp;TileCol={x}&amp;version=1.0.0&amp;layer=topp:states" rel="tile"></map-link>
      <map-input name="i" type="location" axis="i" units="tile"></map-input>
      <map-input name="j" type="location" axis="j" units="tile"></map-input>
      <map-link tref="http://localhost:8080/geoserver/gwc/service/wmts?request=GetFeatureInfo&amp;format=image/png&amp;i={i}&amp;j={j}&amp;TileCol={x}&amp;version=1.0.0&amp;layer=topp:states&amp;tilematrixset=CBMTILE&amp;tilematrix={z}&amp;TileRow={y}&amp;service=WMTS&amp;infoformat=text/mapml&amp;feature_count=50&amp;style=" rel="query"></map-link>
</map-extent>

On main, if I set up the states layer to use tiles and the tile cache, it comes out like this (note that the min/max tilematrix coordinates are the same as in the previous example, except the <map-input type="zoom" value="25"> describes the actual zoom level that they are from:

<map-extent units="CBMTILE" checked="checked" hidden="hidden">
      <map-input name="z" type="zoom" value="25" min="0" max="25"></map-input>
      <map-input name="x" type="location" axis="column" units="tilematrix" min="1846690" max="2235842"></map-input>
      <map-input name="y" type="location" axis="row" units="tilematrix" min="2289790" max="2490214"></map-input>
      <map-link tref="http://localhost:8080/geoserver/gwc/service/wmts?request=GetTile&amp;tilematrixset=CBMTILE&amp;tilematrix={z}&amp;TileRow={y}&amp;service=WMTS&amp;format=image/png&amp;style=&amp;TileCol={x}&amp;version=1.0.0&amp;layer=topp:states" rel="tile"></map-link>
      <map-input name="i" type="location" axis="i" units="tile"></map-input>
      <map-input name="j" type="location" axis="j" units="tile"></map-input>
      <map-link tref="http://localhost:8080/geoserver/gwc/service/wmts?request=GetFeatureInfo&amp;format=image/png&amp;i={i}&amp;j={j}&amp;TileCol={x}&amp;version=1.0.0&amp;layer=topp:states&amp;tilematrixset=CBMTILE&amp;tilematrix={z}&amp;TileRow={y}&amp;service=WMTS&amp;infoformat=text/mapml&amp;feature_count=50&amp;style=" rel="query"></map-link>
</map-extent>

So I think we're pretty close.

@turingtestfail
Copy link
Author

I was having problems working across PRs because my data directory got used to the CRS PR while this PR doesn't have that stuff in it yet. Progress on so many fronts is foreign to me :-P.

Anyway, I believe there's still an issue when a layer has "Use Tiles" checked, the generated <map-extent> is conveying the wrong <map-input type="zoom" value="..."> value: it's setting the value equal to its own <map-input type="zoom" max="..."> max value, but it doesn't matter what that value is (can even be outside the min/max range - in the old system I used the maximum zoom level available in the TCRS to calculate the bounds in tiles, since the tiles are small the bounds are more accurate when expressed this way), as long as it is at the same zoom level that is used to calculate the <map-input type="location" axis="row" (or column) min="..." max="..."> min and max values.

When I load the preview for the states layer with zoom scaling set up, but "Use Tiles" is not checked:

<map-extent units="CBMTILE" checked="checked" hidden="hidden">
      <map-input name="z" type="zoom" value="15" min="2" max="15"></map-input><!-- value is not used in this case -->
      <map-input name="xmin" type="location" rel="map" position="top-left" axis="easting" units="pcrs" min="-3385113.991161208" max="3204541.0636327886"></map-input><!-- min / max are pcrs coords. Good! -->
      <map-input name="ymin" type="location" rel="map" position="bottom-left" axis="northing" units="pcrs" min="-2857719.8337224196" max="536137.7045786483"></map-input>
      <map-input name="xmax" type="location" rel="map" position="top-right" axis="easting" units="pcrs" min="-3385113.991161208" max="3204541.0636327886"></map-input>
      <map-input name="ymax" type="location" rel="map" position="top-left" axis="northing" units="pcrs" min="-2857719.8337224196" max="536137.7045786483"></map-input>
      <map-input name="w" type="width" min="1" max="10000"></map-input>
      <map-input name="h" type="height" min="1" max="10000"></map-input>
      <map-link tref="http://localhost:8080/geoserver/wms?request=GetMap&amp;crs=urn:x-ogc:def:crs:EPSG:3978&amp;service=WMS&amp;bbox={xmin},{ymin},{xmax},{ymax}&amp;layers=states&amp;format=image/png&amp;width={w}&amp;styles=&amp;language=en&amp;version=1.3.0&amp;transparent=true&amp;height={h}" rel="image"></map-link>
      <map-input name="i" type="location" axis="i" units="map"></map-input>
      <map-input name="j" type="location" axis="j" units="map"></map-input>
      <map-link tref="http://localhost:8080/geoserver/wms?request=GetFeatureInfo&amp;query_layers=states&amp;crs=urn:x-ogc:def:crs:EPSG:3978&amp;bbox={xmin},{ymin},{xmax},{ymax}&amp;language=en&amp;version=1.3.0&amp;transparent=true&amp;service=WMS&amp;layers=states&amp;width={w}&amp;x={i}&amp;feature_count=50&amp;y={j}&amp;styles=&amp;info_format=text/mapml&amp;height={h}" rel="query"></map-link>
</map-extent>

When I select "Use Tiles" for the layer (and set up tile caching so it goes through WMTS):

<map-extent units="CBMTILE" checked="checked" hidden="hidden">
      <map-input name="z" type="zoom" value="15" min="2" max="15"></map-input><!-- value is used to tell what the --> 
                                                                            <!-- min/max values in the location -->                                                                                                                                                                                                                                                                                    
                                                                     <!-- inputs below mean/ where they are -->
      <map-input name="x" type="location" axis="column" units="tilematrix" min="1846690" max="2235842"></map-input>
      <map-input name="y" type="location" axis="row" units="tilematrix" min="2289790" max="2490214"></map-input>
      <map-link tref="http://localhost:8080/geoserver/gwc/service/wmts?request=GetTile&amp;tilematrixset=CBMTILE&amp;tilematrix={z}&amp;TileRow={y}&amp;service=WMTS&amp;format=image/png&amp;style=&amp;TileCol={x}&amp;version=1.0.0&amp;layer=topp:states" rel="tile"></map-link>
      <map-input name="i" type="location" axis="i" units="tile"></map-input>
      <map-input name="j" type="location" axis="j" units="tile"></map-input>
      <map-link tref="http://localhost:8080/geoserver/gwc/service/wmts?request=GetFeatureInfo&amp;format=image/png&amp;i={i}&amp;j={j}&amp;TileCol={x}&amp;version=1.0.0&amp;layer=topp:states&amp;tilematrixset=CBMTILE&amp;tilematrix={z}&amp;TileRow={y}&amp;service=WMTS&amp;infoformat=text/mapml&amp;feature_count=50&amp;style=" rel="query"></map-link>
</map-extent>

On main, if I set up the states layer to use tiles and the tile cache, it comes out like this (note that the min/max tilematrix coordinates are the same as in the previous example, except the <map-input type="zoom" value="25"> describes the actual zoom level that they are from:

<map-extent units="CBMTILE" checked="checked" hidden="hidden">
      <map-input name="z" type="zoom" value="25" min="0" max="25"></map-input>
      <map-input name="x" type="location" axis="column" units="tilematrix" min="1846690" max="2235842"></map-input>
      <map-input name="y" type="location" axis="row" units="tilematrix" min="2289790" max="2490214"></map-input>
      <map-link tref="http://localhost:8080/geoserver/gwc/service/wmts?request=GetTile&amp;tilematrixset=CBMTILE&amp;tilematrix={z}&amp;TileRow={y}&amp;service=WMTS&amp;format=image/png&amp;style=&amp;TileCol={x}&amp;version=1.0.0&amp;layer=topp:states" rel="tile"></map-link>
      <map-input name="i" type="location" axis="i" units="tile"></map-input>
      <map-input name="j" type="location" axis="j" units="tile"></map-input>
      <map-link tref="http://localhost:8080/geoserver/gwc/service/wmts?request=GetFeatureInfo&amp;format=image/png&amp;i={i}&amp;j={j}&amp;TileCol={x}&amp;version=1.0.0&amp;layer=topp:states&amp;tilematrixset=CBMTILE&amp;tilematrix={z}&amp;TileRow={y}&amp;service=WMTS&amp;infoformat=text/mapml&amp;feature_count=50&amp;style=" rel="query"></map-link>
</map-extent>

So I think we're pretty close.

@prushforth Looking at the code that sets the axis column and row maxes, it appears that they are always set using the max zoom level specified in the array that comes back from WMTS - for example:

    long[][] minMax = gss.getWMTSCoverages();
    ......
    input.setName("x");
    input.setType(InputType.LOCATION);
    input.setUnits(UnitType.TILEMATRIX);
    input.setAxis(AxisType.COLUMN);
    long[][] minMax = gss.getWMTSCoverages();
    input.setMin(Long.toString(minMax[minMax.length - 1][0]));
    input.setMax(Long.toString(minMax[minMax.length - 1][2]));

I believe that is the reason that the "z" "value" is set to the max zoom level. Is that the correct approach to take?

@prushforth
Copy link
Collaborator

Looking at the code that sets the axis column and row maxes, it appears that they are always set using the max zoom level specified in the array that comes back from WMTS - for example:

long[][] minMax = gss.getWMTSCoverages();
......
input.setName("x");
input.setType(InputType.LOCATION);
input.setUnits(UnitType.TILEMATRIX);
input.setAxis(AxisType.COLUMN);
long[][] minMax = gss.getWMTSCoverages();
input.setMin(Long.toString(minMax[minMax.length - 1][0]));
input.setMax(Long.toString(minMax[minMax.length - 1][2]));
I believe that is the reason that the "z" "value" is set to the max zoom level. Is that the correct approach to take?

Whatever the z value used to set the input.setMax is should be set in the <map-input type="zoom" value="${minMax.length - 1}"> that is probably set a little bit earlier. As I mentioned, it doesn't need to be within the zoom range established by the min/maxScaleDenominator calculation, it just needs to be the correct array index that can be used to deduce the bounds from those tile row/col min/max values.

@prushforth
Copy link
Collaborator

I updated the code with what might be workable, tbd. I will look at a test tomorrow. Revert if you've got something cooking that's better.

@turingtestfail
Copy link
Author

I updated the code with what might be workable, tbd. I will look at a test tomorrow. Revert if you've got something cooking that's better.

I was looking at using the style based maximum to compute the x and y, but looking again at your notes, if these extents are based on the tileset maximums then what you have pushed makes the most sense.

@prushforth
Copy link
Collaborator

Yes the higher the zoom level the better the bounds I think. Updating the already-added extentZoomInput seems a little risky, but it seems to work. That's an advantage of jaxb at least.

etj and others added 10 commits February 2, 2024 18:29
@etj
[GEOS-11290] With Oauth enabled, anon users get random auth requests
19e3a4d
@dependabot @mprins
Bump com.jayway.jsonpath:json-path from 2.7.0 to 2.9.0 in /src (geose…
18422fe 
…rver#7358)

* Bump com.jayway.jsonpath:json-path from 2.7.0 to 2.9.0 in /src

Bumps [com.jayway.jsonpath:json-path](https://github.com/jayway/JsonPath) from 2.7.0 to 2.9.0.
- [Release notes](https://github.com/jayway/JsonPath/releases)
- [Changelog](https://github.com/json-path/JsonPath/blob/master/changelog.md)
- [Commits](json-path/JsonPath@json-path-2.7.0...json-path-2.9.0)

---
updated-dependencies:
- dependency-name: com.jayway.jsonpath:json-path
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

* Add scoped override for json-smart to override the runtime scope of the json-path provided version

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mark <[email protected]>
@afabiani
Merge pull request geoserver#7373 from etj/11290_oauth2
64eeef6 
[GEOS-11290] With Oauth enabled, anon users get random auth requests
@NielsCharlier @aaime
[GEOS-11205] Layer page: style image fails if it is in isolated works…
f3c8975 
…pace
@iaunzu
[GEOS-11263] hideEmptyRules not working in JSON LegendGraphic (geoser…
1ee75ec 
…ver#7353)

* [GEOS-11263] Fix hideEmptyRules in JSON Legends

* Compute hideEmptyRules with BBOX only and skip rasterSymbolizers

* Better test
@NielsCharlier @aaime
GEOS-11278 metadata: only selected tab is submitted
1a956cd
@sikeoka @aaime
[GEOS-11288] Improve input validation in ClasspathPublisher
afd8f31
@dependabot @aaime
Bump org.springframework:spring-expression
63f2d81 
Bumps [org.springframework:spring-expression](https://github.com/spring-projects/spring-framework) from 3.2.5.RELEASE to 5.2.23.RELEASE.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](spring-projects/spring-framework@v3.2.5.RELEASE...v5.2.23.RELEASE)

---
updated-dependencies:
- dependency-name: org.springframework:spring-expression
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@etj @aaime
[GEOS-11291] GeoFence: Cleanup stale log4j references
baa0761
@aaime
Updating documentation for vector mosaic
10a279e
@aaime
Copy link
Member

aaime commented Feb 5, 2024

@prushforth time to turn this one into an official PR?
There is still quite a bit of work to do with Milestone 2 tasks.

@jusabatier
Use threads to read altitude in wps-longitudinal-profile community mo…
026413c 
…dule (geoserver#7363)

* Use threads to read altitude in wps-longitudinal-profile community module

* Adding GeoServer copyright header to AltitudeReaderThread

* Adding GeoServer copyright header to ProfileVertice

* Replace Vector with ArrayList

* Move thread pool to class level

* Replace Stack with ArrayList

* Retrieve adjustment geoms only once at start

* Process altitude adjustment by adjustable chunks of vertices

* QA fixes
@prushforth
Copy link
Collaborator

Yes please.

@turingtestfail
[GEOS-11232] Add Zoom scaled layer templates to MapML
d864c79 
switched to binary search

working test for zoom input

unit tests and fix for single extent detection

GetMap tests

wms output format documentation

added some edge tests

unused var

ground resolution to scale

updated tests and fixed infinite check

Reproject bounds

- For gwc-backed GetMap request update extentZoomInput.value with
the gss.getZoomStop() to match the zoom value used by the location
inputs' min/max row and column axes.  Non-GWC backed GetMap zoom
input will not carry a value attribute, and it's not necessary

- tbd:  a test to cover it
@aaime aaime closed this Feb 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aaime aaime aaime left review comments

@prushforth prushforth Awaiting requested review from prushforth

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@turingtestfail @prushforth @aaime @afabiani @etj @NielsCharlier @iaunzu @sikeoka @jusabatier