diff --git a/data/imagery.json b/data/imagery.json
index a78762abb..aae099bc8 100644
--- a/data/imagery.json
+++ b/data/imagery.json
@@ -2747,6 +2747,629 @@
         "terms_url": "http://wiki.openstreetmap.org/wiki/Fugro",
         "terms_text": "Fugro Aerial Mapping"
     },
+    {
+        "name": "Geodatastyrelsen (Denmark)",
+        "type": "tms",
+        "template": "http://mapproxy.gpweb.dk/tiles/1.0.0/kortforsyningen_ortoforaar/EPSG3857/{zoom}/{x}/{y}.jpeg",
+        "scaleExtent": [
+            0,
+            21
+        ],
+        "polygon": [
+            [
+                [
+                    8.3743941,
+                    54.9551655
+                ],
+                [
+                    8.3683809,
+                    55.4042149
+                ],
+                [
+                    8.2103997,
+                    55.4039795
+                ],
+                [
+                    8.2087314,
+                    55.4937345
+                ],
+                [
+                    8.0502655,
+                    55.4924731
+                ],
+                [
+                    8.0185123,
+                    56.7501399
+                ],
+                [
+                    8.1819161,
+                    56.7509948
+                ],
+                [
+                    8.1763274,
+                    57.0208898
+                ],
+                [
+                    8.3413329,
+                    57.0219872
+                ],
+                [
+                    8.3392467,
+                    57.1119574
+                ],
+                [
+                    8.5054433,
+                    57.1123212
+                ],
+                [
+                    8.5033923,
+                    57.2020499
+                ],
+                [
+                    9.3316304,
+                    57.2027636
+                ],
+                [
+                    9.3319079,
+                    57.2924835
+                ],
+                [
+                    9.4978864,
+                    57.2919578
+                ],
+                [
+                    9.4988593,
+                    57.3820608
+                ],
+                [
+                    9.6649749,
+                    57.3811615
+                ],
+                [
+                    9.6687295,
+                    57.5605591
+                ],
+                [
+                    9.8351961,
+                    57.5596265
+                ],
+                [
+                    9.8374896,
+                    57.6493322
+                ],
+                [
+                    10.1725726,
+                    57.6462818
+                ],
+                [
+                    10.1754245,
+                    57.7367768
+                ],
+                [
+                    10.5118282,
+                    57.7330269
+                ],
+                [
+                    10.5152095,
+                    57.8228945
+                ],
+                [
+                    10.6834853,
+                    57.8207722
+                ],
+                [
+                    10.6751613,
+                    57.6412021
+                ],
+                [
+                    10.5077045,
+                    57.6433097
+                ],
+                [
+                    10.5039992,
+                    57.5535088
+                ],
+                [
+                    10.671038,
+                    57.5514113
+                ],
+                [
+                    10.6507805,
+                    57.1024538
+                ],
+                [
+                    10.4857673,
+                    57.1045138
+                ],
+                [
+                    10.4786236,
+                    56.9249051
+                ],
+                [
+                    10.3143981,
+                    56.9267573
+                ],
+                [
+                    10.3112341,
+                    56.8369269
+                ],
+                [
+                    10.4750295,
+                    56.83509
+                ],
+                [
+                    10.4649016,
+                    56.5656681
+                ],
+                [
+                    10.9524239,
+                    56.5589761
+                ],
+                [
+                    10.9479249,
+                    56.4692243
+                ],
+                [
+                    11.1099335,
+                    56.4664675
+                ],
+                [
+                    11.1052639,
+                    56.376833
+                ],
+                [
+                    10.9429901,
+                    56.3795284
+                ],
+                [
+                    10.9341235,
+                    56.1994768
+                ],
+                [
+                    10.7719685,
+                    56.2020244
+                ],
+                [
+                    10.7694751,
+                    56.1120103
+                ],
+                [
+                    10.6079695,
+                    56.1150259
+                ],
+                [
+                    10.4466742,
+                    56.116717
+                ],
+                [
+                    10.2865948,
+                    56.118675
+                ],
+                [
+                    10.2831527,
+                    56.0281851
+                ],
+                [
+                    10.4439274,
+                    56.0270388
+                ],
+                [
+                    10.4417713,
+                    55.7579243
+                ],
+                [
+                    10.4334961,
+                    55.6693533
+                ],
+                [
+                    10.743814,
+                    55.6646861
+                ],
+                [
+                    10.743814,
+                    55.5712253
+                ],
+                [
+                    10.8969041,
+                    55.5712253
+                ],
+                [
+                    10.9051793,
+                    55.3953852
+                ],
+                [
+                    11.0613726,
+                    55.3812841
+                ],
+                [
+                    11.0593038,
+                    55.1124061
+                ],
+                [
+                    11.0458567,
+                    55.0318621
+                ],
+                [
+                    11.2030844,
+                    55.0247474
+                ],
+                [
+                    11.2030844,
+                    55.117139
+                ],
+                [
+                    11.0593038,
+                    55.1124061
+                ],
+                [
+                    11.0613726,
+                    55.3812841
+                ],
+                [
+                    11.0789572,
+                    55.5712253
+                ],
+                [
+                    10.8969041,
+                    55.5712253
+                ],
+                [
+                    10.9258671,
+                    55.6670198
+                ],
+                [
+                    10.743814,
+                    55.6646861
+                ],
+                [
+                    10.7562267,
+                    55.7579243
+                ],
+                [
+                    10.4417713,
+                    55.7579243
+                ],
+                [
+                    10.4439274,
+                    56.0270388
+                ],
+                [
+                    10.4466742,
+                    56.116717
+                ],
+                [
+                    10.6079695,
+                    56.1150259
+                ],
+                [
+                    10.6052053,
+                    56.0247462
+                ],
+                [
+                    10.9258671,
+                    56.0201215
+                ],
+                [
+                    10.9197132,
+                    55.9309388
+                ],
+                [
+                    11.0802782,
+                    55.92792
+                ],
+                [
+                    11.0858066,
+                    56.0178284
+                ],
+                [
+                    11.7265047,
+                    56.005058
+                ],
+                [
+                    11.7319981,
+                    56.0952142
+                ],
+                [
+                    12.0540333,
+                    56.0871256
+                ],
+                [
+                    12.0608477,
+                    56.1762576
+                ],
+                [
+                    12.7023469,
+                    56.1594405
+                ],
+                [
+                    12.6611131,
+                    55.7114318
+                ],
+                [
+                    12.9792318,
+                    55.7014026
+                ],
+                [
+                    12.9612912,
+                    55.5217294
+                ],
+                [
+                    12.3268659,
+                    55.5412096
+                ],
+                [
+                    12.3206071,
+                    55.4513655
+                ],
+                [
+                    12.4778226,
+                    55.447067
+                ],
+                [
+                    12.4702432,
+                    55.3570479
+                ],
+                [
+                    12.6269738,
+                    55.3523837
+                ],
+                [
+                    12.6200898,
+                    55.2632576
+                ],
+                [
+                    12.4627339,
+                    55.26722
+                ],
+                [
+                    12.4552949,
+                    55.1778223
+                ],
+                [
+                    12.2987046,
+                    55.1822303
+                ],
+                [
+                    12.2897344,
+                    55.0923641
+                ],
+                [
+                    12.6048608,
+                    55.0832904
+                ],
+                [
+                    12.5872011,
+                    54.9036285
+                ],
+                [
+                    12.2766618,
+                    54.9119031
+                ],
+                [
+                    12.2610181,
+                    54.7331602
+                ],
+                [
+                    12.1070691,
+                    54.7378161
+                ],
+                [
+                    12.0858621,
+                    54.4681655
+                ],
+                [
+                    11.7794953,
+                    54.4753579
+                ],
+                [
+                    11.7837381,
+                    54.5654783
+                ],
+                [
+                    11.1658525,
+                    54.5782155
+                ],
+                [
+                    11.1706443,
+                    54.6686508
+                ],
+                [
+                    10.8617173,
+                    54.6733956
+                ],
+                [
+                    10.8651245,
+                    54.7634667
+                ],
+                [
+                    10.7713646,
+                    54.7643888
+                ],
+                [
+                    10.7707276,
+                    54.7372807
+                ],
+                [
+                    10.7551428,
+                    54.7375776
+                ],
+                [
+                    10.7544039,
+                    54.7195666
+                ],
+                [
+                    10.7389074,
+                    54.7197588
+                ],
+                [
+                    10.7384368,
+                    54.7108482
+                ],
+                [
+                    10.7074486,
+                    54.7113045
+                ],
+                [
+                    10.7041094,
+                    54.6756741
+                ],
+                [
+                    10.5510973,
+                    54.6781698
+                ],
+                [
+                    10.5547184,
+                    54.7670245
+                ],
+                [
+                    10.2423994,
+                    54.7705935
+                ],
+                [
+                    10.2459845,
+                    54.8604673
+                ],
+                [
+                    10.0902268,
+                    54.8622134
+                ],
+                [
+                    10.0873731,
+                    54.7723851
+                ],
+                [
+                    9.1555798,
+                    54.7769557
+                ],
+                [
+                    9.1562752,
+                    54.8675369
+                ],
+                [
+                    8.5321973,
+                    54.8663765
+                ],
+                [
+                    8.531432,
+                    54.95516
+                ]
+            ],
+            [
+                [
+                    11.4577738,
+                    56.819554
+                ],
+                [
+                    11.7849181,
+                    56.8127385
+                ],
+                [
+                    11.7716715,
+                    56.6332796
+                ],
+                [
+                    11.4459621,
+                    56.6401087
+                ]
+            ],
+            [
+                [
+                    11.3274736,
+                    57.3612962
+                ],
+                [
+                    11.3161808,
+                    57.1818004
+                ],
+                [
+                    11.1508692,
+                    57.1847276
+                ],
+                [
+                    11.1456628,
+                    57.094962
+                ],
+                [
+                    10.8157703,
+                    57.1001693
+                ],
+                [
+                    10.8290599,
+                    57.3695272
+                ]
+            ],
+            [
+                [
+                    11.5843266,
+                    56.2777928
+                ],
+                [
+                    11.5782882,
+                    56.1880397
+                ],
+                [
+                    11.7392309,
+                    56.1845765
+                ],
+                [
+                    11.7456428,
+                    56.2743186
+                ]
+            ],
+            [
+                [
+                    14.6825922,
+                    55.3639405
+                ],
+                [
+                    14.8395247,
+                    55.3565231
+                ],
+                [
+                    14.8263755,
+                    55.2671261
+                ],
+                [
+                    15.1393406,
+                    55.2517359
+                ],
+                [
+                    15.1532015,
+                    55.3410836
+                ],
+                [
+                    15.309925,
+                    55.3330556
+                ],
+                [
+                    15.295719,
+                    55.2437356
+                ],
+                [
+                    15.1393406,
+                    55.2517359
+                ],
+                [
+                    15.1255631,
+                    55.1623802
+                ],
+                [
+                    15.2815819,
+                    55.1544167
+                ],
+                [
+                    15.2535578,
+                    54.9757646
+                ],
+                [
+                    14.6317464,
+                    55.0062496
+                ]
+            ]
+        ],
+        "terms_url": "http://download.kortforsyningen.dk/content/vilkaar-og-betingelser",
+        "terms_text": "Geodatastyrelsen og Danske Kommuner"
+    },
     {
         "name": "Geoimage.at MaxRes",
         "type": "tms",
@@ -18643,10 +19266,11 @@
         "template": "http://tile.openstreetmap.org/{zoom}/{x}/{y}.png",
         "scaleExtent": [
             0,
-            18
+            19
         ],
         "terms_url": "http://openstreetmap.org/",
         "terms_text": "© OpenStreetMap contributors, CC-BY-SA",
+        "id": "MAPNIK",
         "default": true
     },
     {