Skip to content

Commit

Permalink
Bump mapfish print 2.3.0 -> 2.3.1 (geoserver#7794)
Browse files Browse the repository at this point in the history
* bump mapfish print 2.3.0 -> 2.3.1

* Support custom pdf layer name

mapfish/mapfish-print-v2#22

* text block do not support maxWidth and maxHeight

With the removal of jyaml library, now the mapping of the fields is being validated.

Just fixing the sample yaml.

https://docs.geoserver.org/latest/en/user/extensions/printing/configuration.html
  • Loading branch information
tiago-s-vieira-alb authored Jul 30, 2024
1 parent c7d34d4 commit c98076b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
16 changes: 14 additions & 2 deletions doc/en/user/source/extensions/printing/protocol.rst
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,8 @@ Render vector layers. The geometries and the styling comes directly from the spe
* geoJson (Required) the geoJson to render
* styleProperty (Defaults to '_style') Name of the property within the features to use as style name. The given property may contain a style object directly.
* styles (Optional) dictionary of styles. One style is defined as in OpenLayers.Feature.Vector.style.
* name (Defaults to ``vector``) the layer name.
* name (Defaults to ``vector``) the layer name. (deprecated: use pdfLayerName instead)
* pdfLayerName (Defaults to ``vector``) PDF layer name.

WMS
---
Expand All @@ -271,6 +272,7 @@ Support for the WMS protocol with possibilities to go through a WMS-C service (T
* format (Required)
* version (Defaults to ``1.1.1``)
* useNativeAngle (Defaults to false) it true transform the map angle to customParams.angle for GeoServer, and customParams.map_angle for MapServer.
* pdfLayerName (Defaults to stringify layers field comma separated) PDF layer name.

WMTS
----
Expand Down Expand Up @@ -305,6 +307,7 @@ Standard mode:
}, ...]
* format (Optional, Required id requestEncoding is ``KVP``)
* pdfLayerName (Defaults to layer field) PDF layer name.

Simple mode:

Expand Down Expand Up @@ -338,6 +341,7 @@ Support the TMS tile layout.
* layer (Required)
* resolutions (Required) Array of resolutions
* tileOrigin (Optional) Object, tile origin. Defaults to ``0,0``
* pdfLayerName (Defaults to layer field) PDF layer name.

Resources:

Expand All @@ -360,6 +364,7 @@ Support the tile layout z/x/y.<extension>.
* tileOrigin (Optional) Array, tile origin e.g. ``[420000, 350000]``
* tileOriginCorner ``tl`` or ``bl`` (Defaults to ``bl``)
* path_format (Optional) url fragment used to construct the tile location. Can support variable replacement of ``${x}``, ``${y}``, ``${z}`` and ``${extension}``. Defaults to zz/x/y.extension format. You can use multiple "letters" to indicate a replaceable pattern (aka, ``${zzzz}`` will ensure the z variable is 0 padded to have a length of AT LEAST 4 characters).
* pdfLayerName (Defaults to "t") PDF layer name.

Osm
---
Expand All @@ -374,6 +379,7 @@ Support the OSM tile layout.
* tileSize (Required) Array, tile size e.g. ``[256, 256]``
* resolutions (Required) Array of resolutions
* extension (Required) file extension
* pdfLayerName (Defaults to "t") PDF layer name.

TileCache
---------
Expand All @@ -389,6 +395,7 @@ Support for the protocol using directly the content of a TileCache directory.
* tileSize (Required) Array, tile size e.g. ``[256, 256]``
* resolutions (Required) Array of resolutions
* extension (Required) file extension
* pdfLayerName (Defaults to layer field) PDF layer name.

Image
-----
Expand All @@ -398,6 +405,7 @@ Type: image
* name (Required)
* baseURL (Required) Service URL
* extent (Required)
* pdfLayerName (Defaults to name field) PDF layer name.

MapServer
---------
Expand All @@ -410,6 +418,7 @@ Support mapserver WMS server.
* customParams (Optional) Map, additional URL arguments
* layers (Required)
* format (Required)
* pdfLayerName (Defaults to stringify layers field comma separated) PDF layer name.

KaMap
-----
Expand All @@ -426,6 +435,7 @@ Support for the protocol using the KaMap tiling method
* tileSize (Required) Array, tile size e.g. ``[256, 256]``
* resolutions (Required) Array of resolutions
* extension (Required) file extension
* pdfLayerName (Defaults to map field) PDF layer name.

KaMapCache
----------
Expand All @@ -445,6 +455,7 @@ Support for the protocol talking directly to a web-accessible ka-Map cache gener
* tileSize (Required) Array, tile size e.g. ``[256, 256]``
* resolutions (Required) Array of resolutions
* extension (Required) file extension
* pdfLayerName (Defaults to map field) PDF layer name.

Google
------
Expand All @@ -465,6 +476,7 @@ The google map reader has several custom parameters that can be added to the req
* maptype (Required) - type of map to display: http://code.google.com/apis/maps/documentation/staticmaps/#MapTypes
* sensor (Optional) - specifies whether the application requesting the static map is using a sensor to determine the user's location
* language (Optional) - language of labels.
* pdfLayerName (Defaults to "t") PDF layer name.
* markers (Optional) - add markers to the map: http://code.google.com/apis/maps/documentation/staticmaps/#Markers

.. code-block:: javascript
Expand All @@ -486,4 +498,4 @@ either expressed or implied.
Document under `Creative Common License Attribution-Share Alike 2.5 Generic
<http://creativecommons.org/licenses/by-sa/2.5/>`_.

Authors: MapFish developers.
Authors: MapFish developers.
2 changes: 0 additions & 2 deletions src/extension/printing/src/test/resources/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ layouts:
backgroundColor: #A0A0A0
cell: !text
align: center
maxWidth: 15
maxHeight: 15
text: TEXT
- !text
font: Helvetica
Expand Down
2 changes: 1 addition & 1 deletion src/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<interactive.image>false</interactive.image>
<windows.leniency>true</windows.leniency>
<gf.version>3.7-SNAPSHOT</gf.version>
<mf.version>2.3.0</mf.version>
<mf.version>2.3.1</mf.version>
<jasypt.version>1.9.2</jasypt.version>
<hibernate-version>3.6.9.Final</hibernate-version>
<hibernate-generic-dao-version>1.1.0</hibernate-generic-dao-version>
Expand Down

0 comments on commit c98076b

Please sign in to comment.