Merge pull request #2804 from mapfish/add-mapserver-8-support

Add MapServer 8 support
mapfish · Feb 24, 2023 · dcffab9 · dcffab9
2 parents 47711f0 + 84d86a4
commit dcffab9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/BREAKING-CHANGES.md b/BREAKING-CHANGES.md
@@ -1,5 +1,9 @@
 # Known breaking changes
 
+## Version 3.30
+
+- Add support of MapServer 8.0, remove support of MapServer <= 7.4 (MAP_ANGLE => ANGLE).
+
 ## Version 3.26
 
 - Upgrade to Java 11 and Tomcat 9.0

diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerParam.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerParam.java
@@ -45,8 +45,7 @@ public class WmsLayerParam extends AbstractWMXLayerParams {
     public String version = "1.1.1";
 
     /**
-     * If true transform the map angle to customParams.angle for GeoServer, and customParams.map_angle for
-     * MapServer.
+     * If true transform the map angle to customParams.angle for GeoServer, and MapServer.
      */
     @HasDefaultValue
     public boolean useNativeAngle = true;

diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
@@ -140,8 +140,8 @@ private static void addAngleParam(
             final Multimap<String, String> extraParams, final double angle, final ServerType type) {
         switch (type) {
             case MAPSERVER:
-                if (!contains(extraParams, "MAP_ANGLE")) {
-                    extraParams.put("MAP_ANGLE", Double.toString(Math.toDegrees(angle)));
+                if (!contains(extraParams, "ANGLE")) {
+                    extraParams.put("ANGLE", Double.toString(Math.toDegrees(angle)));
                 }
                 break;
             case QGISSERVER: