Merge pull request mapfish#515 from mapfish/png_svg

Fix PNG in SVG layer
ger-benjamin · Apr 3, 2017 · 43e80f6 · 43e80f6
2 parents f8d132d + ee04c29
commit 43e80f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -178,6 +178,7 @@ dependencies {
     compile ('org.apache.xmlgraphics:batik-transcoder:1.7'){
         exclude module: 'fop'
     }
+    compile ('org.apache.xmlgraphics:batik-codec:1.7')
     providedCompile('com.google.code.findbugs:jsr305:2.0.1')
 
     providedCompile('javax.servlet:servlet-api:2.5')

diff --git a/core/src/main/java/org/mapfish/print/processor/http/MapUriProcessor.java b/core/src/main/java/org/mapfish/print/processor/http/MapUriProcessor.java
@@ -6,6 +6,8 @@
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.http.AbstractMfClientHttpRequestFactoryWrapper;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 
@@ -32,6 +34,7 @@
  * [[examples=http_processors,osm_custom_params]]
  */
 public final class MapUriProcessor extends AbstractClientHttpRequestFactoryProcessor {
+    private static final Logger LOGGER = LoggerFactory.getLogger(MapUriProcessor.class);
     private final Map<Pattern, String> uriMapping = Maps.newHashMap();
 
     /**
@@ -61,12 +64,15 @@ protected ClientHttpRequest createRequest(final URI uri,
                 for (Map.Entry<Pattern, String> entry : MapUriProcessor.this.uriMapping.entrySet()) {
                     Matcher matcher = entry.getKey().matcher(uriString);
                     if (matcher.matches()) {
+                        LOGGER.debug("URI {} matched {}", uriString, entry.getKey());
                         final String finalUri = matcher.replaceAll(entry.getValue());
                         try {
                             return requestFactory.createRequest(new URI(finalUri), httpMethod);
                         } catch (URISyntaxException e) {
                             throw ExceptionUtils.getRuntimeException(e);
                         }
+                    } else {
+                        LOGGER.debug("URI {} did not match {}", uriString, entry.getKey());
                     }
                 }
                 return requestFactory.createRequest(uri, httpMethod);