diff --git a/src/server/services/wmts/qgswmtsutils.cpp b/src/server/services/wmts/qgswmtsutils.cpp index e11ef3415787..def94ee173c1 100644 --- a/src/server/services/wmts/qgswmtsutils.cpp +++ b/src/server/services/wmts/qgswmtsutils.cpp @@ -140,6 +140,7 @@ namespace QgsWmts double top = ( extent.yMinimum() + ( extent.yMaximum() - extent.yMinimum() ) / 2.0 ) + ( row / 2.0 ) * ( tileSize * res ); tmi.extent = QgsRectangle( left, bottom, right, top ); + tmi.resolution = res; tmi.scaleDenominator = scaleDenominator; calculatedTileMatrixInfoMap[crsStr] = tmi; @@ -155,8 +156,7 @@ namespace QgsWmts QgsUnitTypes::DistanceUnit unit = tmi.unit; // constant - double UNIT_TO_M = QgsUnitTypes::fromUnitToUnitFactor( tmi.unit, QgsUnitTypes::DistanceMeters ); - double resolution = POINTS_TO_M * scaleDenominator / UNIT_TO_M; + double resolution = tmi.resolution; int column = std::ceil( ( extent.xMaximum() - extent.xMinimum() ) / ( tileSize * resolution ) ); int row = std::ceil( ( extent.yMaximum() - extent.yMinimum() ) / ( tileSize * resolution ) ); @@ -263,7 +263,7 @@ namespace QgsWmts { tmi = fixedTileMatrixInfoMap[crsStr]; // Calculate resolution based on scale denominator - resolution = POINTS_TO_M * tmi.scaleDenominator / QgsUnitTypes::fromUnitToUnitFactor( tmi.unit, QgsUnitTypes::DistanceMeters ); + resolution = tmi.resolution; // Get fixed corner QgsRectangle extent = tmi.extent; fixedTop = extent.yMaximum(); @@ -811,17 +811,23 @@ namespace QgsWmts // Tile matrix information // to build tile matrix set like Google Mercator or TMS + // some references for resolution + // https://github.com/mapserver/mapcache/blob/master/lib/configuration.c#L94 tileMatrixInfo tmi3857; tmi3857.ref = QStringLiteral( "EPSG:3857" ); tmi3857.extent = QgsRectangle( -20037508.3427892480, -20037508.3427892480, 20037508.3427892480, 20037508.3427892480 ); + tmi3857.resolution = 156543.0339280410; tmi3857.scaleDenominator = 559082264.0287179; tmi3857.unit = QgsUnitTypes::DistanceMeters; m[tmi3857.ref] = tmi3857; - + // To build tile matrix set like mapcache for WGS84 + // some references for resolution + // https://github.com/mapserver/mapcache/blob/master/lib/configuration.c#L73 tileMatrixInfo tmi4326; tmi4326.ref = QStringLiteral( "EPSG:4326" ); tmi4326.extent = QgsRectangle( -180, -90, 180, 90 ); + tmi4326.resolution = 0.703125000000000; tmi4326.scaleDenominator = 279541132.0143588675418869; tmi4326.unit = QgsUnitTypes::DistanceDegrees; tmi4326.hasAxisInverted = true; diff --git a/src/server/services/wmts/qgswmtsutils.h b/src/server/services/wmts/qgswmtsutils.h index 31e902962748..a802033c68e7 100644 --- a/src/server/services/wmts/qgswmtsutils.h +++ b/src/server/services/wmts/qgswmtsutils.h @@ -45,6 +45,8 @@ namespace QgsWmts bool hasAxisInverted = false; + double resolution = 0.0; + double scaleDenominator = 0.0; int lastLevel = -1; diff --git a/tests/testdata/control_images/qgis_server/WMTS_GetTile_CountryGroup_3857_0/WMTS_GetTile_CountryGroup_3857_0.png b/tests/testdata/control_images/qgis_server/WMTS_GetTile_CountryGroup_3857_0/WMTS_GetTile_CountryGroup_3857_0.png index 276c41e0400a..f6249f45bf52 100644 Binary files a/tests/testdata/control_images/qgis_server/WMTS_GetTile_CountryGroup_3857_0/WMTS_GetTile_CountryGroup_3857_0.png and b/tests/testdata/control_images/qgis_server/WMTS_GetTile_CountryGroup_3857_0/WMTS_GetTile_CountryGroup_3857_0.png differ diff --git a/tests/testdata/control_images/qgis_server/WMTS_GetTile_CountryGroup_4326_0/WMTS_GetTile_CountryGroup_4326_0.png b/tests/testdata/control_images/qgis_server/WMTS_GetTile_CountryGroup_4326_0/WMTS_GetTile_CountryGroup_4326_0.png index 8c6486b88f6e..0dea7a82153a 100644 Binary files a/tests/testdata/control_images/qgis_server/WMTS_GetTile_CountryGroup_4326_0/WMTS_GetTile_CountryGroup_4326_0.png and b/tests/testdata/control_images/qgis_server/WMTS_GetTile_CountryGroup_4326_0/WMTS_GetTile_CountryGroup_4326_0.png differ diff --git a/tests/testdata/control_images/qgis_server/WMTS_GetTile_Hello_3857_0/WMTS_GetTile_Hello_3857_0.png b/tests/testdata/control_images/qgis_server/WMTS_GetTile_Hello_3857_0/WMTS_GetTile_Hello_3857_0.png index b9a737f05372..8c94d66fc564 100644 Binary files a/tests/testdata/control_images/qgis_server/WMTS_GetTile_Hello_3857_0/WMTS_GetTile_Hello_3857_0.png and b/tests/testdata/control_images/qgis_server/WMTS_GetTile_Hello_3857_0/WMTS_GetTile_Hello_3857_0.png differ diff --git a/tests/testdata/control_images/qgis_server/WMTS_GetTile_Hello_4326_0/WMTS_GetTile_Hello_4326_0.png b/tests/testdata/control_images/qgis_server/WMTS_GetTile_Hello_4326_0/WMTS_GetTile_Hello_4326_0.png index 2b54a1bf8bce..f87cc69d23d8 100644 Binary files a/tests/testdata/control_images/qgis_server/WMTS_GetTile_Hello_4326_0/WMTS_GetTile_Hello_4326_0.png and b/tests/testdata/control_images/qgis_server/WMTS_GetTile_Hello_4326_0/WMTS_GetTile_Hello_4326_0.png differ diff --git a/tests/testdata/control_images/qgis_server/WMTS_GetTile_Project_3857_0/WMTS_GetTile_Project_3857_0.png b/tests/testdata/control_images/qgis_server/WMTS_GetTile_Project_3857_0/WMTS_GetTile_Project_3857_0.png index 3064097f45a0..c9dc8e7f0225 100644 Binary files a/tests/testdata/control_images/qgis_server/WMTS_GetTile_Project_3857_0/WMTS_GetTile_Project_3857_0.png and b/tests/testdata/control_images/qgis_server/WMTS_GetTile_Project_3857_0/WMTS_GetTile_Project_3857_0.png differ diff --git a/tests/testdata/control_images/qgis_server/WMTS_GetTile_Project_4326_0/WMTS_GetTile_Project_4326_0.png b/tests/testdata/control_images/qgis_server/WMTS_GetTile_Project_4326_0/WMTS_GetTile_Project_4326_0.png index 843453c5c133..cfae9f0177ae 100644 Binary files a/tests/testdata/control_images/qgis_server/WMTS_GetTile_Project_4326_0/WMTS_GetTile_Project_4326_0.png and b/tests/testdata/control_images/qgis_server/WMTS_GetTile_Project_4326_0/WMTS_GetTile_Project_4326_0.png differ diff --git a/tests/testdata/qgis_server/wmts_getcapabilities.txt b/tests/testdata/qgis_server/wmts_getcapabilities.txt index 31a01a3210b2..6884c7b69e4c 100644 --- a/tests/testdata/qgis_server/wmts_getcapabilities.txt +++ b/tests/testdata/qgis_server/wmts_getcapabilities.txt @@ -1,4 +1,4 @@ -Content-Length: 45681 +Content-Length: 45698 Content-Type: text/xml; charset=utf-8 @@ -20,21 +20,21 @@ Content-Type: text/xml; charset=utf-8 - + - + - + @@ -105,107 +105,107 @@ Content-Type: text/xml; charset=utf-8 6 0 - 62 + 63 1 49 7 1 - 125 + 127 2 - 98 + 99 8 3 - 251 + 254 5 - 196 + 198 9 7 - 502 + 509 11 - 392 + 397 10 14 - 1005 + 1018 22 - 784 + 794 11 29 - 2011 + 2036 45 - 1569 + 1588 12 - 58 - 4022 - 90 - 3139 + 59 + 4072 + 91 + 3177 13 - 117 - 8045 - 180 - 6278 + 119 + 8144 + 182 + 6355 14 - 235 - 16090 - 360 - 12556 + 238 + 16289 + 365 + 12711 15 - 470 - 32181 - 721 - 25112 + 476 + 32579 + 730 + 25423 16 - 941 - 64362 - 1443 - 50225 + 952 + 65159 + 1461 + 50846 17 - 1882 - 128725 - 2887 - 100450 + 1905 + 130318 + 2923 + 101693 18 - 3764 - 257451 - 5774 - 200900 + 3810 + 260637 + 5846 + 203386 19 - 7528 - 514903 - 11549 - 401801 + 7621 + 521274 + 11692 + 406772 20 - 15057 - 1029806 - 23099 - 803602 + 15243 + 1042549 + 23384 + 813545 @@ -250,107 +250,107 @@ Content-Type: text/xml; charset=utf-8 5 0 - 62 - 0 + 63 + 1 28 6 1 - 125 - 1 + 127 + 2 56 7 3 - 251 - 3 - 112 + 254 + 4 + 113 8 7 - 502 - 7 - 224 + 509 + 8 + 227 9 14 - 1005 - 15 - 449 + 1018 + 16 + 454 10 29 - 2011 - 31 - 898 + 2036 + 32 + 909 11 - 58 - 4022 - 63 - 1797 + 59 + 4072 + 64 + 1819 12 - 117 - 8045 - 127 - 3595 + 119 + 8144 + 129 + 3639 13 - 235 - 16090 - 255 - 7190 + 238 + 16289 + 259 + 7279 14 - 470 - 32181 - 511 - 14381 + 476 + 32579 + 518 + 14559 15 - 941 - 64362 - 1023 - 28763 + 952 + 65159 + 1036 + 29119 16 - 1882 - 128725 - 2047 - 57527 + 1905 + 130318 + 2072 + 58238 17 - 3764 - 257451 - 4094 - 115054 + 3810 + 260637 + 4144 + 116477 18 - 7528 - 514903 - 8188 - 230108 + 7621 + 521274 + 8289 + 232955 19 - 15057 - 1029806 - 16376 - 460216 + 15243 + 1042549 + 16579 + 465910 @@ -398,133 +398,133 @@ Content-Type: text/xml; charset=utf-8 0 3 0 - 2 + 3 3 0 7 0 - 5 + 6 4 0 15 0 - 11 + 12 5 0 31 1 - 23 + 24 6 0 63 2 - 47 + 48 7 1 - 126 + 127 5 - 95 + 96 8 2 - 252 + 255 10 - 191 + 193 9 5 - 504 + 511 20 - 383 + 387 10 10 - 1009 - 40 - 766 + 1022 + 41 + 775 11 21 - 2019 - 81 - 1532 + 2044 + 82 + 1551 12 42 - 4039 - 163 - 3065 + 4089 + 165 + 3103 13 - 84 - 8078 - 327 - 6131 + 85 + 8178 + 331 + 6207 14 - 168 - 16157 - 654 - 12262 + 170 + 16357 + 662 + 12414 15 - 337 - 32314 - 1309 - 24524 + 341 + 32714 + 1325 + 24828 16 - 674 - 64629 - 2619 - 49049 + 682 + 65429 + 2651 + 49656 17 - 1349 - 129258 - 5239 - 98098 + 1365 + 130858 + 5303 + 99312 18 - 2698 - 258517 - 10478 - 196197 + 2731 + 261716 + 10607 + 198624 19 - 5396 - 517035 - 20956 - 392394 + 5463 + 523432 + 21215 + 397249 20 - 10793 - 1034070 - 41912 - 784789 + 10927 + 1046865 + 42430 + 794499 @@ -557,119 +557,119 @@ Content-Type: text/xml; charset=utf-8 0 15 0 - 6 + 7 4 0 31 0 - 13 + 14 5 0 63 1 - 27 + 28 6 1 - 126 + 127 2 - 55 + 56 7 2 - 252 + 255 4 - 110 + 112 8 5 - 504 - 8 - 221 + 511 + 9 + 224 9 10 - 1009 - 17 - 442 + 1022 + 18 + 448 10 21 - 2019 - 35 - 885 + 2044 + 36 + 896 11 42 - 4039 - 71 - 1771 + 4089 + 72 + 1793 12 - 84 - 8078 - 143 - 3542 + 85 + 8178 + 145 + 3586 13 - 168 - 16157 - 286 - 7084 + 170 + 16357 + 290 + 7172 14 - 337 - 32314 - 573 - 14169 + 341 + 32714 + 580 + 14344 15 - 674 - 64629 - 1147 - 28338 + 682 + 65429 + 1161 + 28688 16 - 1349 - 129258 - 2294 - 56676 + 1365 + 130858 + 2322 + 57377 17 - 2698 - 258517 - 4588 - 113353 + 2731 + 261716 + 4644 + 114755 18 - 5396 - 517035 - 9176 - 226706 + 5463 + 523432 + 9289 + 229511 19 - 10793 - 1034070 - 18352 - 453412 + 10927 + 1046865 + 18579 + 459022 @@ -709,140 +709,140 @@ Content-Type: text/xml; charset=utf-8 0 1 0 - 0 + 1 2 0 3 0 - 1 + 2 3 1 6 1 - 3 + 4 4 2 12 3 - 7 + 8 5 4 - 24 + 25 7 - 15 + 16 6 8 - 49 + 50 14 - 31 + 32 7 16 - 99 - 28 - 63 + 100 + 29 + 64 8 33 - 198 - 57 - 127 + 200 + 58 + 128 9 - 66 - 396 - 115 - 254 + 67 + 400 + 116 + 257 10 - 133 - 792 - 230 - 508 + 135 + 801 + 233 + 514 11 - 267 - 1584 - 460 - 1017 + 270 + 1603 + 466 + 1029 12 - 534 - 3168 - 921 - 2034 + 540 + 3207 + 932 + 2059 13 - 1068 - 6336 - 1842 - 4068 + 1081 + 6414 + 1864 + 4118 14 - 2136 - 12672 - 3684 - 8137 + 2163 + 12829 + 3729 + 8237 15 - 4273 - 25344 - 7368 - 16274 + 4326 + 25658 + 7459 + 16475 16 - 8547 - 50689 - 14736 - 32548 + 8652 + 51316 + 14919 + 32951 17 - 17094 - 101378 - 29473 - 65097 + 17305 + 102632 + 29838 + 65902 18 - 34188 - 202756 - 58947 - 130194 + 34611 + 205265 + 59677 + 131805 19 - 68377 - 405512 - 117895 - 260388 + 69223 + 410530 + 119354 + 263610 20 - 136755 - 811025 - 235791 - 520776 + 138447 + 821060 + 238708 + 527220 @@ -861,133 +861,133 @@ Content-Type: text/xml; charset=utf-8 0 3 0 - 0 + 1 2 1 6 0 - 1 + 2 3 2 12 0 - 3 + 4 4 4 - 24 + 25 1 - 7 + 8 5 8 - 49 + 50 3 - 15 + 16 6 16 - 99 + 100 7 - 31 + 32 7 33 - 198 + 200 14 - 63 + 64 8 - 66 - 396 - 28 - 127 + 67 + 400 + 29 + 129 9 - 133 - 792 - 57 - 255 + 135 + 801 + 58 + 258 10 - 267 - 1584 - 115 - 511 + 270 + 1603 + 116 + 517 11 - 534 - 3168 - 230 - 1022 + 540 + 3207 + 233 + 1035 12 - 1068 - 6336 - 460 - 2045 + 1081 + 6414 + 466 + 2070 13 - 2136 - 12672 - 920 - 4091 + 2163 + 12829 + 932 + 4141 14 - 4273 - 25344 - 1841 - 8182 + 4326 + 25658 + 1864 + 8283 15 - 8547 - 50689 - 3682 - 16364 + 8652 + 51316 + 3728 + 16567 16 - 17094 - 101378 - 7365 - 32729 + 17305 + 102632 + 7456 + 33134 17 - 34188 - 202756 - 14730 - 65459 + 34611 + 205265 + 14912 + 66269 18 - 68377 - 405512 - 29460 - 130918 + 69223 + 410530 + 29825 + 132538 19 - 136755 - 811025 - 58921 - 261836 + 138447 + 821060 + 59650 + 265076 diff --git a/tests/testdata/qgis_server/wmts_getcapabilities_config.txt b/tests/testdata/qgis_server/wmts_getcapabilities_config.txt index 5df041c2c759..1531c1b781a4 100644 --- a/tests/testdata/qgis_server/wmts_getcapabilities_config.txt +++ b/tests/testdata/qgis_server/wmts_getcapabilities_config.txt @@ -1,4 +1,4 @@ -Content-Length: 45435 +Content-Length: 45440 Content-Type: text/xml; charset=utf-8 @@ -105,107 +105,107 @@ Content-Type: text/xml; charset=utf-8 6 0 - 62 + 63 1 49 7 1 - 125 + 127 2 - 98 + 99 8 3 - 251 + 254 5 - 196 + 198 9 7 - 502 + 509 11 - 392 + 397 10 14 - 1005 + 1018 22 - 784 + 794 11 29 - 2011 + 2036 45 - 1569 + 1588 12 - 58 - 4022 - 90 - 3139 + 59 + 4072 + 91 + 3177 13 - 117 - 8045 - 180 - 6278 + 119 + 8144 + 182 + 6355 14 - 235 - 16090 - 360 - 12556 + 238 + 16289 + 365 + 12711 15 - 470 - 32181 - 721 - 25112 + 476 + 32579 + 730 + 25423 16 - 941 - 64362 - 1443 - 50225 + 952 + 65159 + 1461 + 50846 17 - 1882 - 128725 - 2887 - 100450 + 1905 + 130318 + 2923 + 101693 18 - 3764 - 257451 - 5774 - 200900 + 3810 + 260637 + 5846 + 203386 19 - 7528 - 514903 - 11549 - 401801 + 7621 + 521274 + 11692 + 406772 20 - 15057 - 1029806 - 23099 - 803602 + 15243 + 1042549 + 23384 + 813545 @@ -250,107 +250,107 @@ Content-Type: text/xml; charset=utf-8 5 0 - 62 - 0 + 63 + 1 28 6 1 - 125 - 1 + 127 + 2 56 7 3 - 251 - 3 - 112 + 254 + 4 + 113 8 7 - 502 - 7 - 224 + 509 + 8 + 227 9 14 - 1005 - 15 - 449 + 1018 + 16 + 454 10 29 - 2011 - 31 - 898 + 2036 + 32 + 909 11 - 58 - 4022 - 63 - 1797 + 59 + 4072 + 64 + 1819 12 - 117 - 8045 - 127 - 3595 + 119 + 8144 + 129 + 3639 13 - 235 - 16090 - 255 - 7190 + 238 + 16289 + 259 + 7279 14 - 470 - 32181 - 511 - 14381 + 476 + 32579 + 518 + 14559 15 - 941 - 64362 - 1023 - 28763 + 952 + 65159 + 1036 + 29119 16 - 1882 - 128725 - 2047 - 57527 + 1905 + 130318 + 2072 + 58238 17 - 3764 - 257451 - 4094 - 115054 + 3810 + 260637 + 4144 + 116477 18 - 7528 - 514903 - 8188 - 230108 + 7621 + 521274 + 8289 + 232955 19 - 15057 - 1029806 - 16376 - 460216 + 15243 + 1042549 + 16579 + 465910 @@ -398,133 +398,133 @@ Content-Type: text/xml; charset=utf-8 0 3 0 - 2 + 3 3 0 7 0 - 5 + 6 4 0 15 0 - 11 + 12 5 0 31 1 - 23 + 24 6 0 63 2 - 47 + 48 7 1 - 126 + 127 5 - 95 + 96 8 2 - 252 + 255 10 - 191 + 193 9 5 - 504 + 511 20 - 383 + 387 10 10 - 1009 - 40 - 766 + 1022 + 41 + 775 11 21 - 2019 - 81 - 1532 + 2044 + 82 + 1551 12 42 - 4039 - 163 - 3065 + 4089 + 165 + 3103 13 - 84 - 8078 - 327 - 6131 + 85 + 8178 + 331 + 6207 14 - 168 - 16157 - 654 - 12262 + 170 + 16357 + 662 + 12414 15 - 337 - 32314 - 1309 - 24524 + 341 + 32714 + 1325 + 24828 16 - 674 - 64629 - 2619 - 49049 + 682 + 65429 + 2651 + 49656 17 - 1349 - 129258 - 5239 - 98098 + 1365 + 130858 + 5303 + 99312 18 - 2698 - 258517 - 10478 - 196197 + 2731 + 261716 + 10607 + 198624 19 - 5396 - 517035 - 20956 - 392394 + 5463 + 523432 + 21215 + 397249 20 - 10793 - 1034070 - 41912 - 784789 + 10927 + 1046865 + 42430 + 794499 @@ -557,119 +557,119 @@ Content-Type: text/xml; charset=utf-8 0 15 0 - 6 + 7 4 0 31 0 - 13 + 14 5 0 63 1 - 27 + 28 6 1 - 126 + 127 2 - 55 + 56 7 2 - 252 + 255 4 - 110 + 112 8 5 - 504 - 8 - 221 + 511 + 9 + 224 9 10 - 1009 - 17 - 442 + 1022 + 18 + 448 10 21 - 2019 - 35 - 885 + 2044 + 36 + 896 11 42 - 4039 - 71 - 1771 + 4089 + 72 + 1793 12 - 84 - 8078 - 143 - 3542 + 85 + 8178 + 145 + 3586 13 - 168 - 16157 - 286 - 7084 + 170 + 16357 + 290 + 7172 14 - 337 - 32314 - 573 - 14169 + 341 + 32714 + 580 + 14344 15 - 674 - 64629 - 1147 - 28338 + 682 + 65429 + 1161 + 28688 16 - 1349 - 129258 - 2294 - 56676 + 1365 + 130858 + 2322 + 57377 17 - 2698 - 258517 - 4588 - 113353 + 2731 + 261716 + 4644 + 114755 18 - 5396 - 517035 - 9176 - 226706 + 5463 + 523432 + 9289 + 229511 19 - 10793 - 1034070 - 18352 - 453412 + 10927 + 1046865 + 18579 + 459022 @@ -709,140 +709,140 @@ Content-Type: text/xml; charset=utf-8 0 1 0 - 0 + 1 2 0 3 0 - 1 + 2 3 1 6 1 - 3 + 4 4 2 12 3 - 7 + 8 5 4 - 24 + 25 7 - 15 + 16 6 8 - 49 + 50 14 - 31 + 32 7 16 - 99 - 28 - 63 + 100 + 29 + 64 8 33 - 198 - 57 - 127 + 200 + 58 + 128 9 - 66 - 396 - 115 - 254 + 67 + 400 + 116 + 257 10 - 133 - 792 - 230 - 508 + 135 + 801 + 233 + 514 11 - 267 - 1584 - 460 - 1017 + 270 + 1603 + 466 + 1029 12 - 534 - 3168 - 921 - 2034 + 540 + 3207 + 932 + 2059 13 - 1068 - 6336 - 1842 - 4068 + 1081 + 6414 + 1864 + 4118 14 - 2136 - 12672 - 3684 - 8137 + 2163 + 12829 + 3729 + 8237 15 - 4273 - 25344 - 7368 - 16274 + 4326 + 25658 + 7459 + 16475 16 - 8547 - 50689 - 14736 - 32548 + 8652 + 51316 + 14919 + 32951 17 - 17094 - 101378 - 29473 - 65097 + 17305 + 102632 + 29838 + 65902 18 - 34188 - 202756 - 58947 - 130194 + 34611 + 205265 + 59677 + 131805 19 - 68377 - 405512 - 117895 - 260388 + 69223 + 410530 + 119354 + 263610 20 - 136755 - 811025 - 235791 - 520776 + 138447 + 821060 + 238708 + 527220 @@ -861,133 +861,133 @@ Content-Type: text/xml; charset=utf-8 0 3 0 - 0 + 1 2 1 6 0 - 1 + 2 3 2 12 0 - 3 + 4 4 4 - 24 + 25 1 - 7 + 8 5 8 - 49 + 50 3 - 15 + 16 6 16 - 99 + 100 7 - 31 + 32 7 33 - 198 + 200 14 - 63 + 64 8 - 66 - 396 - 28 - 127 + 67 + 400 + 29 + 129 9 - 133 - 792 - 57 - 255 + 135 + 801 + 58 + 258 10 - 267 - 1584 - 115 - 511 + 270 + 1603 + 116 + 517 11 - 534 - 3168 - 230 - 1022 + 540 + 3207 + 233 + 1035 12 - 1068 - 6336 - 460 - 2045 + 1081 + 6414 + 466 + 2070 13 - 2136 - 12672 - 920 - 4091 + 2163 + 12829 + 932 + 4141 14 - 4273 - 25344 - 1841 - 8182 + 4326 + 25658 + 1864 + 8283 15 - 8547 - 50689 - 3682 - 16364 + 8652 + 51316 + 3728 + 16567 16 - 17094 - 101378 - 7365 - 32729 + 17305 + 102632 + 7456 + 33134 17 - 34188 - 202756 - 14730 - 65459 + 34611 + 205265 + 14912 + 66269 18 - 68377 - 405512 - 29460 - 130918 + 69223 + 410530 + 29825 + 132538 19 - 136755 - 811025 - 58921 - 261836 + 138447 + 821060 + 59650 + 265076 diff --git a/tests/testdata/qgis_server/wmts_getcapabilities_config_3857.txt b/tests/testdata/qgis_server/wmts_getcapabilities_config_3857.txt index cebd57dc8eea..3f7e38bd7450 100644 --- a/tests/testdata/qgis_server/wmts_getcapabilities_config_3857.txt +++ b/tests/testdata/qgis_server/wmts_getcapabilities_config_3857.txt @@ -1,4 +1,4 @@ -Content-Length: 45435 +Content-Length: 25385 Content-Type: text/xml; charset=utf-8 @@ -105,107 +105,107 @@ Content-Type: text/xml; charset=utf-8 6 0 - 62 + 63 1 49 7 1 - 125 + 127 2 - 98 + 99 8 3 - 251 + 254 5 - 196 + 198 9 7 - 502 + 509 11 - 392 + 397 10 14 - 1005 + 1018 22 - 784 + 794 11 29 - 2011 + 2036 45 - 1569 + 1588 12 - 58 - 4022 - 90 - 3139 + 59 + 4072 + 91 + 3177 13 - 117 - 8045 - 180 - 6278 + 119 + 8144 + 182 + 6355 14 - 235 - 16090 - 360 - 12556 + 238 + 16289 + 365 + 12711 15 - 470 - 32181 - 721 - 25112 + 476 + 32579 + 730 + 25423 16 - 941 - 64362 - 1443 - 50225 + 952 + 65159 + 1461 + 50846 17 - 1882 - 128725 - 2887 - 100450 + 1905 + 130318 + 2923 + 101693 18 - 3764 - 257451 - 5774 - 200900 + 3810 + 260637 + 5846 + 203386 19 - 7528 - 514903 - 11549 - 401801 + 7621 + 521274 + 11692 + 406772 20 - 15057 - 1029806 - 23099 - 803602 + 15243 + 1042549 + 23384 + 813545 @@ -253,133 +253,133 @@ Content-Type: text/xml; charset=utf-8 0 3 0 - 2 + 3 3 0 7 0 - 5 + 6 4 0 15 0 - 11 + 12 5 0 31 1 - 23 + 24 6 0 63 2 - 47 + 48 7 1 - 126 + 127 5 - 95 + 96 8 2 - 252 + 255 10 - 191 + 193 9 5 - 504 + 511 20 - 383 + 387 10 10 - 1009 - 40 - 766 + 1022 + 41 + 775 11 21 - 2019 - 81 - 1532 + 2044 + 82 + 1551 12 42 - 4039 - 163 - 3065 + 4089 + 165 + 3103 13 - 84 - 8078 - 327 - 6131 + 85 + 8178 + 331 + 6207 14 - 168 - 16157 - 654 - 12262 + 170 + 16357 + 662 + 12414 15 - 337 - 32314 - 1309 - 24524 + 341 + 32714 + 1325 + 24828 16 - 674 - 64629 - 2619 - 49049 + 682 + 65429 + 2651 + 49656 17 - 1349 - 129258 - 5239 - 98098 + 1365 + 130858 + 5303 + 99312 18 - 2698 - 258517 - 10478 - 196197 + 2731 + 261716 + 10607 + 198624 19 - 5396 - 517035 - 20956 - 392394 + 5463 + 523432 + 21215 + 397249 20 - 10793 - 1034070 - 41912 - 784789 + 10927 + 1046865 + 42430 + 794499 @@ -419,140 +419,140 @@ Content-Type: text/xml; charset=utf-8 0 1 0 - 0 + 1 2 0 3 0 - 1 + 2 3 1 6 1 - 3 + 4 4 2 12 3 - 7 + 8 5 4 - 24 + 25 7 - 15 + 16 6 8 - 49 + 50 14 - 31 + 32 7 16 - 99 - 28 - 63 + 100 + 29 + 64 8 33 - 198 - 57 - 127 + 200 + 58 + 128 9 - 66 - 396 - 115 - 254 + 67 + 400 + 116 + 257 10 - 133 - 792 - 230 - 508 + 135 + 801 + 233 + 514 11 - 267 - 1584 - 460 - 1017 + 270 + 1603 + 466 + 1029 12 - 534 - 3168 - 921 - 2034 + 540 + 3207 + 932 + 2059 13 - 1068 - 6336 - 1842 - 4068 + 1081 + 6414 + 1864 + 4118 14 - 2136 - 12672 - 3684 - 8137 + 2163 + 12829 + 3729 + 8237 15 - 4273 - 25344 - 7368 - 16274 + 4326 + 25658 + 7459 + 16475 16 - 8547 - 50689 - 14736 - 32548 + 8652 + 51316 + 14919 + 32951 17 - 17094 - 101378 - 29473 - 65097 + 17305 + 102632 + 29838 + 65902 18 - 34188 - 202756 - 58947 - 130194 + 34611 + 205265 + 59677 + 131805 19 - 68377 - 405512 - 117895 - 260388 + 69223 + 410530 + 119354 + 263610 20 - 136755 - 811025 - 235791 - 520776 + 138447 + 821060 + 238708 + 527220