diff --git a/js/LayersConfig.js b/js/LayersConfig.js
index 4305c75..8d913d2 100644
--- a/js/LayersConfig.js
+++ b/js/LayersConfig.js
@@ -76,6 +76,8 @@ BR.LayersConfig = L.Class.extend({
 
         BR.layerIndex['OpenStreetMap.CH'].geometry =
             BR.confLayers.switzerlandPadded;
+
+        BR.layerIndex['1017'].geometry = BR.confLayers.osmapaPl;
     },
 
     isDefaultLayer: function(id, overlay) {
diff --git a/layers/config/geometry.js b/layers/config/geometry.js
index 98fceda..15768be 100644
--- a/layers/config/geometry.js
+++ b/layers/config/geometry.js
@@ -1443,3 +1443,33 @@ BR.confLayers.switzerlandPadded = {
         ]
     ]
 };
+
+// osmapa.pl (1017): manually derived from z9-z11, no worldwide tiles >z13, 
+// but unclear because of general issues at z14+z15 as of 06/2019
+BR.confLayers.osmapaPl = {
+    "type": "Polygon",
+    "coordinates": [
+        [
+            [
+                25,
+                47
+            ],
+            [
+                25,
+                56
+            ],
+            [
+                13.5,
+                56
+            ],
+            [
+                13.5,
+                47
+            ],
+            [
+                25,
+                47
+            ]
+        ]
+    ]
+};
diff --git a/layers/config/overrides.js b/layers/config/overrides.js
index bca4ca6..3a04cb6 100644
--- a/layers/config/overrides.js
+++ b/layers/config/overrides.js
@@ -73,11 +73,6 @@ BR.confLayers.getPropertyOverrides = function() {
             'nameShort': 'OSM French',
             'mapUrl': 'http://tile.openstreetmap.fr/?layers=B00000000FFFFFF&zoom={zoom}&lat={lat}&lon={lon}'
         },
-        // Osmapa.pl - Mapa OpenStreetMap Polska
-        '1017': {
-            'language_code': 'pl',
-            'mapUrl': 'http://osmapa.pl/#lat={lat}&lon={lon}&z={zoom}&m=os'
-        },
         // kosmosnimki.ru
         '1023': {
             'language_code': 'ru',
@@ -155,6 +150,13 @@ BR.confLayers.getPropertyOverrides = function() {
         'mtbmap-no': {
             'mapUrl': 'https://mtbmap.no/#{zoom}/{lat}/{lon}'
         },
+        // Osmapa.pl - Mapa OpenStreetMap Polska
+        '1017': {
+            "country_code": "PL",
+            'language_code': 'pl',
+            'mapUrl': 'http://osmapa.pl/#lat={lat}&lon={lon}&z={zoom}&m=os',
+            'worldTiles': true // -z13
+        },
         'Freemap.sk-Car': {
             'mapUrl': 'https://www.freemap.sk/?map={zoom}/{lat}/{lon}&layers=A'
         },
diff --git a/layers/config/tree.js b/layers/config/tree.js
index dc97bd5..71edcc4 100644
--- a/layers/config/tree.js
+++ b/layers/config/tree.js
@@ -17,7 +17,6 @@ BR.confLayers.tree = {
         'worldwide-monolingual': [
             'osm-mapnik-german_style',
             'osmfr',
-            '1017',  // Osmapa.pl - Mapa OpenStreetMap Polska
             '1023', // kosmosnimki.ru
             '1021' // sputnik.ru
         ],
@@ -48,6 +47,7 @@ BR.confLayers.tree = {
                 ]
             },
             'mtbmap-no',
+            '1017',  // Osmapa.pl - Mapa OpenStreetMap Polska
             {
                 'SK': [
                     'Freemap.sk-Car',