search

mapfish / mapfish-print

A component of MapFish for printing templated cartographic maps. This module is the Java serverside module.
http://mapfish.github.io/mapfish-print-doc/
BSD 2-Clause "Simplified" License
184 stars 417 forks source link

default don't work in !scalebar attribute #290

Closed sbrunner closed 9 years ago

sbrunner commented 9 years ago 
13:55:13.279 [http-8080-1] INFO  o.m.p.s.ServletMapPrinterFactory - Configuration file modified. Reloading...
13:55:13.279 [http-8080-1] INFO  o.m.p.s.ServletMapPrinterFactory - Loading configuration file: file:/srv/tomcat/tomcat1/webapps/print-sbrunner/print-apps/geoportailv3/config.yaml
13:55:13.818 [http-8080-1] ERROR o.m.p.s.ServletMapPrinterFactory - Error occurred while reading configuration file
org.yaml.snakeyaml.constructor.ConstructorException: Cannot create property=templates for JavaBean=org.mapfish.print.config.Configuration@5cd7b797; Cannot create property=attributes for JavaBean=org.mapfish.print.config.Template@789a1b6;
 Cannot create property=default for JavaBean=org.mapfish.print.attribute.ScalebarAttribute@5ae36728; No suitable constructor with 1 arguments found for interface java.util.Map;  in 'reader', line 34, column 9:
            - geodetic: true
            ^;  in 'reader', line 16, column 7:
          name: !string {}
          ^;  in 'reader', line 10, column 3:
      A4 portrait: !template
      ^
        at org.yaml.snakeyaml.constructor.Constructor$ConstructMapping.constructJavaBean2ndStep(Constructor.java:299) ~[snakeyaml-1.13.jar:na]
        at org.mapfish.print.config.MapfishPrintConstructor$MapfishPrintConstruct.constructJavaBean2ndStep(MapfishPrintConstructor.java:84) ~[MapfishPrintConstructor$MapfishPrintConstruct.class:na]
        at org.yaml.snakeyaml.constructor.Constructor$ConstructMapping.construct(Constructor.java:189) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.Constructor$ConstructYamlObject.construct(Constructor.java:332) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.constructObject(BaseConstructor.java:182) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.constructDocument(BaseConstructor.java:141) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.getSingleData(BaseConstructor.java:127) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.Yaml.loadFromReader(Yaml.java:481) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.Yaml.load(Yaml.java:424) ~[snakeyaml-1.13.jar:na]
        at org.mapfish.print.config.ConfigurationFactory.getConfig(ConfigurationFactory.java:86) ~[ConfigurationFactory.class:na]
        at org.mapfish.print.MapPrinter.setConfiguration(MapPrinter.java:80) ~[MapPrinter.class:na]
        at org.mapfish.print.servlet.ServletMapPrinterFactory.create(ServletMapPrinterFactory.java:128) ~[ServletMapPrinterFactory.class:na]
        at org.mapfish.print.servlet.MapPrinterServlet.createAndSubmitPrintJob(MapPrinterServlet.java:952) [MapPrinterServlet.class:na]
        at org.mapfish.print.servlet.MapPrinterServlet.createReport(MapPrinterServlet.java:351) [MapPrinterServlet.class:na]
        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.7.0_79]
        at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) ~[na:1.7.0_79]
        at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.7.0_79]
        at java.lang.reflect.Method.invoke(Method.java:606) ~[na:1.7.0_79]
        at org.springframework.web.bind.annotation.support.HandlerMethodInvoker.invokeHandlerMethod(HandlerMethodInvoker.java:176) [spring-web-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter.invokeHandlerMethod(AnnotationMethodHandlerAdapter.java:440) [spring-webmvc-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter.handle(AnnotationMethodHandlerAdapter.java:428) [spring-webmvc-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:925) [spring-webmvc-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:856) [spring-webmvc-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:953) [spring-webmvc-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:855) [spring-webmvc-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) [servlet-api-2.5.jar:na]
        at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:829) [spring-webmvc-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) [servlet-api-2.5.jar:na]
        at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) [catalina-6.0.35.jar:6.0.35]
        at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) [catalina-6.0.35.jar:6.0.35]
        at com.codahale.metrics.servlet.AbstractInstrumentedFilter.doFilter(AbstractInstrumentedFilter.java:97) [metrics-servlet-3.0.2.jar:3.0.2]
        at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) [catalina-6.0.35.jar:6.0.35]
        at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) [catalina-6.0.35.jar:6.0.35]
        at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:330) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]

        at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:118) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:84) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:113) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:103) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:113) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:154) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:45) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.authentication.www.BasicAuthenticationFilter.doFilter(BasicAuthenticationFilter.java:150) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:87) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.access.channel.ChannelProcessingFilter.doFilter(ChannelProcessingFilter.java:144) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:192) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:160) [spring-security-web-3.2.5.RELEASE.jar:3.2.5.RELEASE]
        at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:343) [spring-web-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:260) [spring-web-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) [catalina-6.0.35.jar:6.0.35]
        at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) [catalina-6.0.35.jar:6.0.35]
        at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:88) [spring-web-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) [spring-web-3.2.8.RELEASE.jar:3.2.8.RELEASE]
        at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) [catalina-6.0.35.jar:6.0.35]
        at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) [catalina-6.0.35.jar:6.0.35]
        at org.mapfish.print.servlet.RequestSizeFilter.doFilter(RequestSizeFilter.java:59) [RequestSizeFilter.class:na]
        at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) [catalina-6.0.35.jar:6.0.35]
        at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) [catalina-6.0.35.jar:6.0.35]
        at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233) [catalina-6.0.35.jar:6.0.35]
        at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191) [catalina-6.0.35.jar:6.0.35]
        at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127) [catalina-6.0.35.jar:6.0.35]
        at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102) [catalina-6.0.35.jar:6.0.35]
        at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109) [catalina-6.0.35.jar:6.0.35]
        at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:293) [catalina-6.0.35.jar:6.0.35]
        at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:859) [tomcat-coyote-6.0.35.jar:6.0.35]
        at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:602) [tomcat-coyote-6.0.35.jar:6.0.35]
        at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:489) [tomcat-coyote-6.0.35.jar:6.0.35]
        at java.lang.Thread.run(Thread.java:745) [na:1.7.0_79]
Caused by: org.yaml.snakeyaml.constructor.ConstructorException: Cannot create property=attributes for JavaBean=org.mapfish.print.config.Template@789a1b6; Cannot create property=default for JavaBean=org.mapfish.print.attribute.ScalebarAttribute@5ae36728; No suitable constructor with 1 arguments found for interface java.util.Map;  in 'reader', line 34, column 9:
            - geodetic: true
            ^;  in 'reader', line 16, column 7:
          name: !string {}
          ^
        at org.yaml.snakeyaml.constructor.Constructor$ConstructMapping.constructJavaBean2ndStep(Constructor.java:299) ~[snakeyaml-1.13.jar:na]
        at org.mapfish.print.config.MapfishPrintConstructor$MapfishPrintConstruct.constructJavaBean2ndStep(MapfishPrintConstructor.java:84) ~[MapfishPrintConstructor$MapfishPrintConstruct.class:na]
        at org.yaml.snakeyaml.constructor.Constructor$ConstructMapping.construct(Constructor.java:189) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.Constructor$ConstructYamlObject.construct(Constructor.java:332) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.constructObject(BaseConstructor.java:182) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.constructMapping2ndStep(BaseConstructor.java:373) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.SafeConstructor.constructMapping2ndStep(SafeConstructor.java:145) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.constructMapping(BaseConstructor.java:354) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.Constructor$ConstructMapping.construct(Constructor.java:170) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.constructObject(BaseConstructor.java:182) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.Constructor$ConstructMapping.constructJavaBean2ndStep(Constructor.java:296) ~[snakeyaml-1.13.jar:na]
        ... 75 common frames omitted
Caused by: org.yaml.snakeyaml.constructor.ConstructorException: Cannot create property=default for JavaBean=org.mapfish.print.attribute.ScalebarAttribute@5ae36728; No suitable constructor with 1 arguments found for interface java.util.Map;  in 'reader', line 34, column 9:
            - geodetic: true
            ^
        at org.yaml.snakeyaml.constructor.Constructor$ConstructMapping.constructJavaBean2ndStep(Constructor.java:299) ~[snakeyaml-1.13.jar:na]
        at org.mapfish.print.config.MapfishPrintConstructor$MapfishPrintConstruct.constructJavaBean2ndStep(MapfishPrintConstructor.java:84) ~[MapfishPrintConstructor$MapfishPrintConstruct.class:na]
        at org.yaml.snakeyaml.constructor.Constructor$ConstructMapping.construct(Constructor.java:189) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.Constructor$ConstructYamlObject.construct(Constructor.java:332) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.constructObject(BaseConstructor.java:182) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.constructMapping2ndStep(BaseConstructor.java:373) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.SafeConstructor.constructMapping2ndStep(SafeConstructor.java:145) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.constructMapping(BaseConstructor.java:354) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.Constructor$ConstructMapping.construct(Constructor.java:170) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.constructObject(BaseConstructor.java:182) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.Constructor$ConstructMapping.constructJavaBean2ndStep(Constructor.java:296) ~[snakeyaml-1.13.jar:na]
        ... 85 common frames omitted
Caused by: org.yaml.snakeyaml.error.YAMLException: No suitable constructor with 1 arguments found for interface java.util.Map
        at org.yaml.snakeyaml.constructor.Constructor$ConstructSequence.construct(Constructor.java:576) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.BaseConstructor.constructObject(BaseConstructor.java:182) ~[snakeyaml-1.13.jar:na]
        at org.yaml.snakeyaml.constructor.Constructor$ConstructMapping.constructJavaBean2ndStep(Constructor.java:296) ~[snakeyaml-1.13.jar:na]
        ... 95 common frames omitted
tsauerwein commented 9 years ago

Can you please give your configuration?

sbrunner commented 9 years ago 
pdfConfig: !pdfConfig
  compressed: false
  author: "Jeff Konnen"
  subject: "map.geoportail.lu Print"
  creator: "Mapfish Print"

throwErrorOnExtraParameters: true

templates:
  A4 portrait: !template
    pdfConfig: !pdfConfig
      title: "A4 Portrait by geoportail.lu"
      keywords: ["map"]
    reportTemplate: a4_portrait.jrxml
    attributes:
      name: !string {}
      scale: !string {}
      url: !string {}
      qrimage: !string {}
      map: !map
        maxDpi: 400
        dpiSuggestions: [72, 91, 128, 254, 300, 400]
        width: 470
        height: 650
      lang: !string {}
      legend: !datasource
        attributes:
            name: !string {}
        default: []
      scalebar: !scalebar
        width: 150
        height: 30
    processors:
    - !reportBuilder # compile all reports in current directory
      directory: '.'
    - !createMap
      inputMapper: {map: map}
      outputMapper: {mapSubReport: mapSubReport}
    - !createScalebar {}
{
    "layout": "A4 portrait",
    "attributes": {
        "scale": 10000,
        "legend": null,
        "name": "",
        "map": {
            "center": [665061, 6361034],
            "scale": 15399.348720507025,
            "rotation": 0,
            "layers": [{
                "style": "default",
                "matrices": [{
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [1, 1],
                    "tileSize": [256, 256],
                    "identifier": "00",
                    "scaleDenominator": 5.590822640285715E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [2, 2],
                    "tileSize": [256, 256],
                    "identifier": "01",
                    "scaleDenominator": 2.7954113201428574E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [4, 4],
                    "tileSize": [256, 256],
                    "identifier": "02",
                    "scaleDenominator": 1.3977056600714287E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [8, 8],
                    "tileSize": [256, 256],
                    "identifier": "03",
                    "scaleDenominator": 6.988528300357144E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [16, 16],
                    "tileSize": [256, 256],
                    "identifier": "04",
                    "scaleDenominator": 3.494264150178572E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [32, 32],
                    "tileSize": [256, 256],
                    "identifier": "05",
                    "scaleDenominator": 1.747132075089286E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [64, 64],
                    "tileSize": [256, 256],
                    "identifier": "06",
                    "scaleDenominator": 8735660.375464285
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [128, 128],
                    "tileSize": [256, 256],
                    "identifier": "07",
                    "scaleDenominator": 4367830.187714286
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [256, 256],
                    "tileSize": [256, 256],
                    "identifier": "08",
                    "scaleDenominator": 2183915.093860714
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [512, 512],
                    "tileSize": [256, 256],
                    "identifier": "09",
                    "scaleDenominator": 1091957.546932143
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [1024, 1024],
                    "tileSize": [256, 256],
                    "identifier": "10",
                    "scaleDenominator": 545978.7734642858
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [2048, 2048],
                    "tileSize": [256, 256],
                    "identifier": "11",
                    "scaleDenominator": 272989.38673285715
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [4096, 4096],
                    "tileSize": [256, 256],
                    "identifier": "12",
                    "scaleDenominator": 136494.69336642858
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [8192, 8192],
                    "tileSize": [256, 256],
                    "identifier": "13",
                    "scaleDenominator": 68247.34668321429
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [16384, 16384],
                    "tileSize": [256, 256],
                    "identifier": "14",
                    "scaleDenominator": 34123.673341607144
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [32768, 32768],
                    "tileSize": [256, 256],
                    "identifier": "15",
                    "scaleDenominator": 17061.836670785713
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [65536, 65536],
                    "tileSize": [256, 256],
                    "identifier": "16",
                    "scaleDenominator": 8530.918335392857
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [131072, 131072],
                    "tileSize": [256, 256],
                    "identifier": "17",
                    "scaleDenominator": 4265.459167714285
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [262144, 262144],
                    "tileSize": [256, 256],
                    "identifier": "18",
                    "scaleDenominator": 2132.7295838500004
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [524288, 524288],
                    "tileSize": [256, 256],
                    "identifier": "19",
                    "scaleDenominator": 1066.3647919250002
                }],
                "imageFormat": "image/png",
                "matrixSet": "GLOBAL_WEBMERCATOR",
                "layer": "parcels",
                "dimensionParams": {},
                "baseURL": "http://wmts.geoportail.lu/mapproxy_4_v3/wmts/parcels/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png",
                "dimensions": [],
                "type": "WMTS",
                "version": "1.0.0",
                "requestEncoding": "REST"
            }, {
                "style": "default",
                "matrices": [{
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [1, 1],
                    "tileSize": [256, 256],
                    "identifier": "00",
                    "scaleDenominator": 5.590822640285715E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [2, 2],
                    "tileSize": [256, 256],
                    "identifier": "01",
                    "scaleDenominator": 2.7954113201428574E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [4, 4],
                    "tileSize": [256, 256],
                    "identifier": "02",
                    "scaleDenominator": 1.3977056600714287E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [8, 8],
                    "tileSize": [256, 256],
                    "identifier": "03",
                    "scaleDenominator": 6.988528300357144E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [16, 16],
                    "tileSize": [256, 256],
                    "identifier": "04",
                    "scaleDenominator": 3.494264150178572E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [32, 32],
                    "tileSize": [256, 256],
                    "identifier": "05",
                    "scaleDenominator": 1.747132075089286E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [64, 64],
                    "tileSize": [256, 256],
                    "identifier": "06",
                    "scaleDenominator": 8735660.375464285
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [128, 128],
                    "tileSize": [256, 256],
                    "identifier": "07",
                    "scaleDenominator": 4367830.187714286
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [256, 256],
                    "tileSize": [256, 256],
                    "identifier": "08",
                    "scaleDenominator": 2183915.093860714
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [512, 512],
                    "tileSize": [256, 256],
                    "identifier": "09",
                    "scaleDenominator": 1091957.546932143
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [1024, 1024],
                    "tileSize": [256, 256],
                    "identifier": "10",
                    "scaleDenominator": 545978.7734642858
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [2048, 2048],
                    "tileSize": [256, 256],
                    "identifier": "11",
                    "scaleDenominator": 272989.38673285715
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [4096, 4096],
                    "tileSize": [256, 256],
                    "identifier": "12",
                    "scaleDenominator": 136494.69336642858
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [8192, 8192],
                    "tileSize": [256, 256],
                    "identifier": "13",
                    "scaleDenominator": 68247.34668321429
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [16384, 16384],
                    "tileSize": [256, 256],
                    "identifier": "14",
                    "scaleDenominator": 34123.673341607144
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [32768, 32768],
                    "tileSize": [256, 256],
                    "identifier": "15",
                    "scaleDenominator": 17061.836670785713
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [65536, 65536],
                    "tileSize": [256, 256],
                    "identifier": "16",
                    "scaleDenominator": 8530.918335392857
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [131072, 131072],
                    "tileSize": [256, 256],
                    "identifier": "17",
                    "scaleDenominator": 4265.459167714285
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [262144, 262144],
                    "tileSize": [256, 256],
                    "identifier": "18",
                    "scaleDenominator": 2132.7295838500004
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [524288, 524288],
                    "tileSize": [256, 256],
                    "identifier": "19",
                    "scaleDenominator": 1066.3647919250002
                }],
                "imageFormat": "image/png",
                "matrixSet": "GLOBAL_WEBMERCATOR",
                "layer": "addresses",
                "dimensionParams": {},
                "baseURL": "http://wmts.geoportail.lu/mapproxy_4_v3/wmts/addresses/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png",
                "dimensions": [],
                "type": "WMTS",
                "version": "1.0.0",
                "requestEncoding": "REST"
            }, {
                "style": "default",
                "matrices": [{
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [1, 1],
                    "tileSize": [256, 256],
                    "identifier": "00",
                    "scaleDenominator": 5.590822640285715E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [2, 2],
                    "tileSize": [256, 256],
                    "identifier": "01",
                    "scaleDenominator": 2.7954113201428574E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [4, 4],
                    "tileSize": [256, 256],
                    "identifier": "02",
                    "scaleDenominator": 1.3977056600714287E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [8, 8],
                    "tileSize": [256, 256],
                    "identifier": "03",
                    "scaleDenominator": 6.988528300357144E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [16, 16],
                    "tileSize": [256, 256],
                    "identifier": "04",
                    "scaleDenominator": 3.494264150178572E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [32, 32],
                    "tileSize": [256, 256],
                    "identifier": "05",
                    "scaleDenominator": 1.747132075089286E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [64, 64],
                    "tileSize": [256, 256],
                    "identifier": "06",
                    "scaleDenominator": 8735660.375464285
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [128, 128],
                    "tileSize": [256, 256],
                    "identifier": "07",
                    "scaleDenominator": 4367830.187714286
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [256, 256],
                    "tileSize": [256, 256],
                    "identifier": "08",
                    "scaleDenominator": 2183915.093860714
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [512, 512],
                    "tileSize": [256, 256],
                    "identifier": "09",
                    "scaleDenominator": 1091957.546932143
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [1024, 1024],
                    "tileSize": [256, 256],
                    "identifier": "10",
                    "scaleDenominator": 545978.7734642858
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [2048, 2048],
                    "tileSize": [256, 256],
                    "identifier": "11",
                    "scaleDenominator": 272989.38673285715
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [4096, 4096],
                    "tileSize": [256, 256],
                    "identifier": "12",
                    "scaleDenominator": 136494.69336642858
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [8192, 8192],
                    "tileSize": [256, 256],
                    "identifier": "13",
                    "scaleDenominator": 68247.34668321429
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [16384, 16384],
                    "tileSize": [256, 256],
                    "identifier": "14",
                    "scaleDenominator": 34123.673341607144
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [32768, 32768],
                    "tileSize": [256, 256],
                    "identifier": "15",
                    "scaleDenominator": 17061.836670785713
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [65536, 65536],
                    "tileSize": [256, 256],
                    "identifier": "16",
                    "scaleDenominator": 8530.918335392857
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [131072, 131072],
                    "tileSize": [256, 256],
                    "identifier": "17",
                    "scaleDenominator": 4265.459167714285
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [262144, 262144],
                    "tileSize": [256, 256],
                    "identifier": "18",
                    "scaleDenominator": 2132.7295838500004
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [524288, 524288],
                    "tileSize": [256, 256],
                    "identifier": "19",
                    "scaleDenominator": 1066.3647919250002
                }],
                "imageFormat": "image/png",
                "matrixSet": "GLOBAL_WEBMERCATOR",
                "layer": "roads",
                "dimensionParams": {},
                "baseURL": "http://wmts.geoportail.lu/mapproxy_4_v3/wmts/roads/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png",
                "dimensions": [],
                "type": "WMTS",
                "version": "1.0.0",
                "requestEncoding": "REST"
            }, {
                "style": "default",
                "matrices": [{
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [1, 1],
                    "tileSize": [256, 256],
                    "identifier": "00",
                    "scaleDenominator": 5.590822640285715E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [2, 2],
                    "tileSize": [256, 256],
                    "identifier": "01",
                    "scaleDenominator": 2.7954113201428574E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [4, 4],
                    "tileSize": [256, 256],
                    "identifier": "02",
                    "scaleDenominator": 1.3977056600714287E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [8, 8],
                    "tileSize": [256, 256],
                    "identifier": "03",
                    "scaleDenominator": 6.988528300357144E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [16, 16],
                    "tileSize": [256, 256],
                    "identifier": "04",
                    "scaleDenominator": 3.494264150178572E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [32, 32],
                    "tileSize": [256, 256],
                    "identifier": "05",
                    "scaleDenominator": 1.747132075089286E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [64, 64],
                    "tileSize": [256, 256],
                    "identifier": "06",
                    "scaleDenominator": 8735660.375464285
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [128, 128],
                    "tileSize": [256, 256],
                    "identifier": "07",
                    "scaleDenominator": 4367830.187714286
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [256, 256],
                    "tileSize": [256, 256],
                    "identifier": "08",
                    "scaleDenominator": 2183915.093860714
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [512, 512],
                    "tileSize": [256, 256],
                    "identifier": "09",
                    "scaleDenominator": 1091957.546932143
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [1024, 1024],
                    "tileSize": [256, 256],
                    "identifier": "10",
                    "scaleDenominator": 545978.7734642858
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [2048, 2048],
                    "tileSize": [256, 256],
                    "identifier": "11",
                    "scaleDenominator": 272989.38673285715
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [4096, 4096],
                    "tileSize": [256, 256],
                    "identifier": "12",
                    "scaleDenominator": 136494.69336642858
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [8192, 8192],
                    "tileSize": [256, 256],
                    "identifier": "13",
                    "scaleDenominator": 68247.34668321429
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [16384, 16384],
                    "tileSize": [256, 256],
                    "identifier": "14",
                    "scaleDenominator": 34123.673341607144
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [32768, 32768],
                    "tileSize": [256, 256],
                    "identifier": "15",
                    "scaleDenominator": 17061.836670785713
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [65536, 65536],
                    "tileSize": [256, 256],
                    "identifier": "16",
                    "scaleDenominator": 8530.918335392857
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [131072, 131072],
                    "tileSize": [256, 256],
                    "identifier": "17",
                    "scaleDenominator": 4265.459167714285
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [262144, 262144],
                    "tileSize": [256, 256],
                    "identifier": "18",
                    "scaleDenominator": 2132.7295838500004
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [524288, 524288],
                    "tileSize": [256, 256],
                    "identifier": "19",
                    "scaleDenominator": 1066.3647919250002
                }],
                "imageFormat": "image/png",
                "matrixSet": "GLOBAL_WEBMERCATOR",
                "layer": "wg_landnutzung",
                "dimensionParams": {},
                "baseURL": "http://wmts.geoportail.lu/mapproxy_4_v3/wmts/wg_landnutzung/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png",
                "dimensions": [],
                "type": "WMTS",
                "version": "1.0.0",
                "requestEncoding": "REST"
            }, {
                "style": "default",
                "matrices": [{
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [1, 1],
                    "tileSize": [256, 256],
                    "identifier": "00",
                    "scaleDenominator": 5.590822640285715E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [2, 2],
                    "tileSize": [256, 256],
                    "identifier": "01",
                    "scaleDenominator": 2.7954113201428574E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [4, 4],
                    "tileSize": [256, 256],
                    "identifier": "02",
                    "scaleDenominator": 1.3977056600714287E8
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [8, 8],
                    "tileSize": [256, 256],
                    "identifier": "03",
                    "scaleDenominator": 6.988528300357144E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [16, 16],
                    "tileSize": [256, 256],
                    "identifier": "04",
                    "scaleDenominator": 3.494264150178572E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [32, 32],
                    "tileSize": [256, 256],
                    "identifier": "05",
                    "scaleDenominator": 1.747132075089286E7
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [64, 64],
                    "tileSize": [256, 256],
                    "identifier": "06",
                    "scaleDenominator": 8735660.375464285
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [128, 128],
                    "tileSize": [256, 256],
                    "identifier": "07",
                    "scaleDenominator": 4367830.187714286
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [256, 256],
                    "tileSize": [256, 256],
                    "identifier": "08",
                    "scaleDenominator": 2183915.093860714
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [512, 512],
                    "tileSize": [256, 256],
                    "identifier": "09",
                    "scaleDenominator": 1091957.546932143
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [1024, 1024],
                    "tileSize": [256, 256],
                    "identifier": "10",
                    "scaleDenominator": 545978.7734642858
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [2048, 2048],
                    "tileSize": [256, 256],
                    "identifier": "11",
                    "scaleDenominator": 272989.38673285715
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [4096, 4096],
                    "tileSize": [256, 256],
                    "identifier": "12",
                    "scaleDenominator": 136494.69336642858
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [8192, 8192],
                    "tileSize": [256, 256],
                    "identifier": "13",
                    "scaleDenominator": 68247.34668321429
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [16384, 16384],
                    "tileSize": [256, 256],
                    "identifier": "14",
                    "scaleDenominator": 34123.673341607144
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [32768, 32768],
                    "tileSize": [256, 256],
                    "identifier": "15",
                    "scaleDenominator": 17061.836670785713
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [65536, 65536],
                    "tileSize": [256, 256],
                    "identifier": "16",
                    "scaleDenominator": 8530.918335392857
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [131072, 131072],
                    "tileSize": [256, 256],
                    "identifier": "17",
                    "scaleDenominator": 4265.459167714285
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [262144, 262144],
                    "tileSize": [256, 256],
                    "identifier": "18",
                    "scaleDenominator": 2132.7295838500004
                }, {
                    "topLeftCorner": [-2.00375083428E7, 2.00375083428E7],
                    "matrixSize": [524288, 524288],
                    "tileSize": [256, 256],
                    "identifier": "19",
                    "scaleDenominator": 1066.3647919250002
                }],
                "imageFormat": "image/png",
                "matrixSet": "GLOBAL_WEBMERCATOR",
                "layer": "geologie_nouvelle_edition",
                "dimensionParams": {},
                "baseURL": "http://wmts.geoportail.lu/mapproxy_4_v3/wmts/geologie_nouvelle_edition/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png",
                "dimensions": [],
                "type": "WMTS",
                "version": "1.0.0",
                "requestEncoding": "REST"
            }],
            "projection": "EPSG:3857",
            "dpi": 96
        },
        "lang": "fr",
        "url": "http://luxembourg-geomapfish.dev.sig.cloud.camptocamp.net/sbrunner/s/I8e4",
        "qrimage": "http://luxembourg-geomapfish.dev.sig.cloud.camptocamp.net/sbrunner/wsgi/qr?url=http://luxembourg-geomapfish.dev.sig.cloud.camptocamp.net/sbrunner/s/I8e4"
    }
}
tsauerwein commented 9 years ago

And you are saying the configuration with a default value (like the following) does not work?

  scalebar: !scalebar
    width: 150
    height: 30
    default:
      geodetic: true
sbrunner commented 9 years ago

no :-(

sbrunner commented 9 years ago

Effectively it's what I tested, I remove it do go ahead :-)

tsauerwein commented 9 years ago

I added a test for this: https://github.com/mapfish/mapfish-print/commit/3dd0642154478e8791bc0a3402c6430830a2d92b#diff-e0fc65bb14e52d68198bd3f552f7e82d

Closing because it seems to work.