diff --git a/data/imagery.json b/data/imagery.json
index 7cd171a18..35fd41a33 100644
--- a/data/imagery.json
+++ b/data/imagery.json
@@ -3620,7 +3620,7 @@
       "id": "bavaria-80cm",
       "name": "Bavaria (80 cm)",
       "type": "wms",
-      "template": "https://geoservices.bayern.de/wms/v1/ogc_dop80_oa.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=by_dop80c&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
+      "template": "https://geoservices.bayern.de/wms/v2/ogc_dop80_oa.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=by_dop80c&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
       "projection": "EPSG:4326",
       "zoomExtent": [7, 18],
       "polygon": [
@@ -23577,7 +23577,7 @@
       "id": "GURS-buildings",
       "name": "GURS: Building outlines",
       "type": "tms",
-      "template": "http://wms.openstreetmap.de/tms/GURS-building-outlines/{zoom}/{x}/{y}.png",
+      "template": "https://wms.openstreetmap.de/tms/GURS-building-outlines/{zoom}/{x}/{y}.png",
       "zoomExtent": [8, 19],
       "polygon": [
         [
@@ -23611,9 +23611,8 @@
           [13.81063, 45.42531],
           [13.7856, 45.45577],
           [13.67553, 45.43241],
-          [13.58846, 45.46171],
-          [13.45377, 45.59765],
-          [13.62822, 45.64153],
+          [13.38, 45.5666],
+          [13.63822, 45.64153],
           [13.72158, 45.60472],
           [13.83759, 45.59226],
           [13.89962, 45.63295],
@@ -23762,7 +23761,7 @@
         ]
       ],
       "terms_url": "http://egp.gu.gov.si/",
-      "terms_text": "CC-BY ©2018 Geodetska uprava Republike Slovenije (gu.gov.si).",
+      "terms_text": "CC-BY ©2019 Geodetska uprava Republike Slovenije (gu.gov.si).",
       "icon": "https://osmlab.github.io/editor-layer-index/sources/europe/si/GURSRoadlines.png",
       "overlay": true
     },
@@ -23770,7 +23769,7 @@
       "id": "GURS-roads",
       "name": "GURS: Road lines",
       "type": "tms",
-      "template": "http://wms.openstreetmap.de/tms/GURS-road-lines/{zoom}/{x}/{y}.png",
+      "template": "https://wms.openstreetmap.de/tms/GURS-road-lines/{zoom}/{x}/{y}.png",
       "zoomExtent": [8, 19],
       "polygon": [
         [
@@ -23804,9 +23803,8 @@
           [13.81063, 45.42531],
           [13.7856, 45.45577],
           [13.67553, 45.43241],
-          [13.58846, 45.46171],
-          [13.45377, 45.59765],
-          [13.62822, 45.64153],
+          [13.38, 45.5666],
+          [13.63822, 45.64153],
           [13.72158, 45.60472],
           [13.83759, 45.59226],
           [13.89962, 45.63295],
@@ -23955,7 +23953,7 @@
         ]
       ],
       "terms_url": "http://egp.gu.gov.si/",
-      "terms_text": "CC-BY ©2018 Geodetska uprava Republike Slovenije (gu.gov.si).",
+      "terms_text": "CC-BY ©2019 Geodetska uprava Republike Slovenije (gu.gov.si).",
       "icon": "https://osmlab.github.io/editor-layer-index/sources/europe/si/GURSRoadlines.png",
       "overlay": true
     },
@@ -32072,6 +32070,65 @@
       ],
       "terms_text": "ITACyL"
     },
+    {
+      "id": "gsi.go.jp_airphoto",
+      "name": "Japan GSI airphoto Imagery",
+      "type": "tms",
+      "template": "http://cyberjapandata.gsi.go.jp/xyz/airphoto/{zoom}/{x}/{y}.png",
+      "zoomExtent": [14, 18],
+      "polygon": [
+        [
+          [140.88867, 45.67548],
+          [140.71289, 45.41388],
+          [141.04248, 43.80282],
+          [139.96582, 43.35714],
+          [138.99902, 42.01665],
+          [139.04297, 41.26129],
+          [137.5708, 38.58253],
+          [132.69287, 36.86204],
+          [130.84717, 34.93999],
+          [129.74854, 34.994],
+          [129.02344, 34.56086],
+          [128.36426, 33.21112],
+          [127.90283, 31.87756],
+          [128.4082, 29.89781],
+          [125.8374, 26.78485],
+          [123.33252, 25.0657],
+          [122.58545, 24.42715],
+          [123.53027, 23.44309],
+          [125.88135, 24.10665],
+          [129.96826, 26.31311],
+          [132.1875, 30.20211],
+          [134.42871, 32.43561],
+          [136.82373, 33.28462],
+          [137.85645, 34.21634],
+          [138.64746, 33.24788],
+          [138.58154, 32.00808],
+          [139.6582, 28.67131],
+          [141.65771, 29.66896],
+          [142.0752, 32.06396],
+          [141.21826, 33.37641],
+          [141.56982, 35.44277],
+          [141.43799, 36.52729],
+          [142.82227, 39.16414],
+          [143.04199, 40.89691],
+          [145.92041, 42.40723],
+          [146.18408, 43.03678],
+          [145.74463, 43.54855],
+          [145.32715, 43.67582],
+          [145.30518, 43.91372],
+          [145.61279, 44.2452],
+          [145.41504, 44.62175],
+          [144.38232, 44.52784],
+          [142.31689, 45.53714],
+          [141.3501, 45.70618],
+          [140.88867, 45.67548]
+        ]
+      ],
+      "terms_url": "http://www.gsi.go.jp/kikakuchousei/kikakuchousei40182.html",
+      "terms_text": "GSI Japan",
+      "description": "Japan GSI airphoto Imagery. Not fully orthorectified, but a bit newer and/or differently covered than GSI ortho Imagery."
+    },
     {
       "id": "finds.jp_KBN_2500",
       "name": "Japan GSI KIBAN 2500",
@@ -35052,7 +35109,97 @@
           [7.70438, 47.55794]
         ]
       ],
-      "terms_text": "AGIS OF2016",
+      "terms_text": "AGIS OF2016"
+    },
+    {
+      "id": "Aargau-AGIS-2017",
+      "name": "Kanton Aargau 25cm (AGIS 2017)",
+      "type": "tms",
+      "template": "https://mapproxy.osm.ch/tiles/AGIS2017/EPSG900913/{zoom}/{x}/{y}.png?origin=nw",
+      "endDate": "2017-01-01T00:00:00.000Z",
+      "startDate": "2017-01-01T00:00:00.000Z",
+      "zoomExtent": [8, 19],
+      "polygon": [
+        [
+          [7.70438, 47.55794],
+          [7.77076, 47.55772],
+          [7.77103, 47.58025],
+          [7.80408, 47.58017],
+          [7.80433, 47.60248],
+          [7.93713, 47.60217],
+          [7.93703, 47.57962],
+          [8.00374, 47.57917],
+          [8.00338, 47.55687],
+          [8.0364, 47.55665],
+          [8.03681, 47.57928],
+          [8.10313, 47.57881],
+          [8.10387, 47.60112],
+          [8.17011, 47.60086],
+          [8.17036, 47.6235],
+          [8.30311, 47.62235],
+          [8.30305, 47.59988],
+          [8.3362, 47.59927],
+          [8.33585, 47.5771],
+          [8.36913, 47.57694],
+          [8.36943, 47.59931],
+          [8.43564, 47.59877],
+          [8.43454, 47.53133],
+          [8.40144, 47.53162],
+          [8.40096, 47.50926],
+          [8.3678, 47.50959],
+          [8.3675, 47.48698],
+          [8.40042, 47.48666],
+          [8.39939, 47.41929],
+          [8.46558, 47.4187],
+          [8.46515, 47.39647],
+          [8.43206, 47.39654],
+          [8.43125, 47.3516],
+          [8.46434, 47.35128],
+          [8.46327, 47.28387],
+          [8.42997, 47.28421],
+          [8.42714, 47.12676],
+          [8.3293, 47.12753],
+          [8.32937, 47.13007],
+          [8.32833, 47.13007],
+          [8.3285, 47.14529],
+          [8.3294, 47.19502],
+          [8.2964, 47.19526],
+          [8.29714, 47.24022],
+          [8.2641, 47.24046],
+          [8.26446, 47.26297],
+          [8.23141, 47.26316],
+          [8.23075, 47.21822],
+          [8.09886, 47.21912],
+          [8.09874, 47.24135],
+          [8.066, 47.24176],
+          [8.06552, 47.2192],
+          [7.99993, 47.21952],
+          [8.00003, 47.26433],
+          [7.96735, 47.26462],
+          [7.96675, 47.21961],
+          [7.80153, 47.22029],
+          [7.80244, 47.28791],
+          [7.83518, 47.28772],
+          [7.83543, 47.31017],
+          [7.86837, 47.31017],
+          [7.86885, 47.35542],
+          [8.00097, 47.3543],
+          [8.00156, 47.39928],
+          [7.9353, 47.39976],
+          [7.93607, 47.46716],
+          [7.90278, 47.46729],
+          [7.90303, 47.48981],
+          [7.86987, 47.48998],
+          [7.86993, 47.5125],
+          [7.83689, 47.51258],
+          [7.83665, 47.4901],
+          [7.77027, 47.49026],
+          [7.77045, 47.51274],
+          [7.70452, 47.51307],
+          [7.70438, 47.55794]
+        ]
+      ],
+      "terms_text": "AGIS OF2017",
       "best": true
     },
     {
@@ -41456,8 +41603,8 @@
       "id": "MassGIS-L3-Parcels",
       "name": "MassGIS L3 Parcels",
       "type": "tms",
-      "template": "https://ags-proxy.openstreetmap.us/tiles/{zoom}/{x}/{y}?url=http%3A%2F%2Fgisprpxy.itd.state.ma.us%2Farcgisserver%2Frest%2Fservices%2FAGOL%2FL3Parcels_feature_service%2FMapServer%2F&transparent=true&layers=show%3A0",
-      "zoomExtent": [15, 22],
+      "template": "https://tiles.arcgis.com/tiles/hGdibHYSPO59RG1h/arcgis/rest/services/MassGIS_Level3_Parcels/MapServer/tile/{zoom}/{y}/{x}",
+      "zoomExtent": [15, 20],
       "polygon": [
         [
           [-72.13569, 42.03025],
@@ -42462,7 +42609,7 @@
       "id": "miljodirektoratet-vern",
       "name": "Miljødirektoratet Protected Areas overlay",
       "type": "wms",
-      "template": "https://arcgisproxy.miljodirektoratet.no/arcgis/services/vern/MapServer/WmsServer?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=naturvern_klasser_omrade,naturvern_punkt&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
+      "template": "https://kart.miljodirektoratet.no/arcgis/services/vern/MapServer/WmsServer?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=naturvern_klasser_omrade&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
       "projection": "EPSG:3857",
       "zoomExtent": [0, 22],
       "polygon": [
@@ -42527,7 +42674,7 @@
       "id": "miljodirektoratet-friluftsomrader",
       "name": "Miljødirektoratet Public Recreation Areas overlay",
       "type": "wms",
-      "template": "https://arcgisproxy.miljodirektoratet.no/arcgis/services/friluftsliv_statlig_sikra/MapServer/WmsServer?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=friluftsliv_statlig_sikra&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
+      "template": "https://kart.miljodirektoratet.no/arcgis/services/friluftsliv_statlig_sikra/MapServer/WmsServer?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=friluftsliv_statlig_sikra&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
       "projection": "EPSG:4326",
       "zoomExtent": [0, 22],
       "polygon": [
@@ -47726,6 +47873,328 @@
         ]
       ]
     },
+    {
+      "id": "OSIP_1ft",
+      "name": "OSIP 1ft Imagery Most Current Available",
+      "type": "wms",
+      "template": "https://geo.oit.ohio.gov/arcgis/services/OSIP/osip_best_avail_1ft/ImageServer/WMSServer?FORMAT=image/jpeg&TRANSPARENT=TRUE&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=0&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
+      "projection": "EPSG:4326",
+      "endDate": "2014-01-01T00:00:00.000Z",
+      "startDate": "2011-01-01T00:00:00.000Z",
+      "zoomExtent": [1, 20],
+      "polygon": [
+        [
+          [-83.1356, 41.75081],
+          [-83.08101, 41.7511],
+          [-83.0796, 41.62936],
+          [-82.95011, 41.54404],
+          [-82.89032, 41.54404],
+          [-82.89032, 41.69462],
+          [-82.8494, 41.7463],
+          [-82.76758, 41.73925],
+          [-82.75184, 41.63584],
+          [-82.64799, 41.62408],
+          [-82.68575, 41.50634],
+          [-82.49063, 41.40492],
+          [-82.0217, 41.53462],
+          [-81.72901, 41.52048],
+          [-81.39541, 41.7369],
+          [-81.10587, 41.84484],
+          [-80.50161, 41.99939],
+          [-80.51105, 40.62127],
+          [-80.6275, 40.59021],
+          [-80.58344, 40.49933],
+          [-80.58973, 40.2812],
+          [-80.85095, 39.625],
+          [-81.19399, 39.37974],
+          [-81.38912, 39.31159],
+          [-81.45521, 39.38704],
+          [-81.515, 39.35054],
+          [-81.54333, 39.26288],
+          [-81.72586, 39.19461],
+          [-81.73216, 38.9258],
+          [-81.9021, 38.85477],
+          [-81.95875, 38.89397],
+          [-81.9084, 38.93315],
+          [-82.02799, 38.99922],
+          [-82.11611, 38.92336],
+          [-82.12555, 38.8278],
+          [-82.19794, 38.78856],
+          [-82.16647, 38.72475],
+          [-82.16017, 38.58712],
+          [-82.26718, 38.57236],
+          [-82.29865, 38.43198],
+          [-82.57875, 38.39745],
+          [-82.73925, 38.53545],
+          [-82.8494, 38.56006],
+          [-82.91235, 38.73212],
+          [-83.00676, 38.71002],
+          [-83.14524, 38.59942],
+          [-83.30575, 38.58466],
+          [-83.39387, 38.64368],
+          [-83.46625, 38.64614],
+          [-83.54178, 38.69283],
+          [-83.65193, 38.61172],
+          [-83.74635, 38.63385],
+          [-83.9635, 38.76403],
+          [-84.08624, 38.75421],
+          [-84.22157, 38.7812],
+          [-84.34117, 38.99922],
+          [-84.49223, 39.07255],
+          [-84.64015, 39.05545],
+          [-84.74086, 39.11164],
+          [-84.84471, 39.08477],
+          [-84.82898, 41.70637],
+          [-83.44737, 41.76038],
+          [-83.13438, 41.64959],
+          [-83.1356, 41.75081]
+        ]
+      ],
+      "terms_url": "https://ogrip.oit.ohio.gov/ProjectsInitiatives/StatewideImagery.aspx",
+      "terms_text": "Ohio Statewide Imagery Program",
+      "description": "Most recent available 1-foot orthoimagery from the Ohio Statewide Imagery Program."
+    },
+    {
+      "id": "OSIP_6in",
+      "name": "OSIP 6in Imagery Most Current Available",
+      "type": "wms",
+      "template": "https://geo.oit.ohio.gov/arcgis/rest/services/OSIP/OSIP_6in_best_avail/ImageServer/exportImage?f=image&bbox={bbox}&imageSR=3857&bboxSR=4326&SR={proj}&size={width}%2C{height}",
+      "projection": "EPSG:4326",
+      "endDate": "2013-01-01T00:00:00.000Z",
+      "startDate": "2011-01-01T00:00:00.000Z",
+      "zoomExtent": [1, 22],
+      "polygon": [
+        [
+          [-84.8172, 39.566],
+          [-84.47765, 39.56679],
+          [-84.00558, 39.56441],
+          [-84.01108, 39.25379],
+          [-83.99391, 39.25273],
+          [-84.05605, 38.77041],
+          [-83.95821, 38.78567],
+          [-83.86791, 38.75274],
+          [-83.83461, 38.7123],
+          [-83.79101, 38.69623],
+          [-83.76904, 38.65093],
+          [-83.66398, 38.62331],
+          [-83.63926, 38.63725],
+          [-83.62141, 38.67801],
+          [-83.52219, 38.70025],
+          [-83.46451, 38.6705],
+          [-83.37112, 38.65602],
+          [-83.32615, 38.63189],
+          [-83.31928, 38.60265],
+          [-83.29319, 38.59353],
+          [-83.26435, 38.61499],
+          [-83.241, 38.62545],
+          [-83.20599, 38.61311],
+          [-83.14796, 38.61848],
+          [-83.12222, 38.64342],
+          [-83.10505, 38.67184],
+          [-83.05527, 38.6906],
+          [-83.02299, 38.7257],
+          [-82.97733, 38.72195],
+          [-82.89459, 38.75382],
+          [-82.87365, 38.73721],
+          [-82.88189, 38.68765],
+          [-82.84927, 38.59111],
+          [-82.78748, 38.55595],
+          [-82.72533, 38.55595],
+          [-82.69238, 38.53608],
+          [-82.65495, 38.48988],
+          [-82.60998, 38.46757],
+          [-82.59899, 38.41836],
+          [-82.55333, 38.39926],
+          [-82.40364, 38.43584],
+          [-82.37514, 38.43154],
+          [-82.32468, 38.4431],
+          [-82.30614, 38.48343],
+          [-82.29927, 38.5205],
+          [-82.28416, 38.58414],
+          [-82.35901, 38.58682],
+          [-82.35249, 38.67747],
+          [-82.47059, 38.68417],
+          [-82.46475, 38.7415],
+          [-82.48466, 38.74391],
+          [-82.48158, 38.77336],
+          [-82.58045, 38.78192],
+          [-82.57393, 38.84532],
+          [-82.75795, 38.85709],
+          [-82.75074, 38.94606],
+          [-82.80739, 38.9506],
+          [-83.02265, 38.95994],
+          [-83.2053, 38.96208],
+          [-83.21011, 38.99037],
+          [-83.24032, 39.01785],
+          [-83.26778, 39.02052],
+          [-83.31242, 39.05438],
+          [-83.38486, 39.05785],
+          [-83.61111, 39.02052],
+          [-83.70586, 39.02398],
+          [-83.8686, 39.02345],
+          [-83.86414, 39.24449],
+          [-83.83598, 39.24316],
+          [-83.83804, 39.22082],
+          [-83.80646, 39.22161],
+          [-83.78277, 39.26044],
+          [-83.59051, 39.37757],
+          [-83.37044, 39.37545],
+          [-83.26435, 39.51675],
+          [-83.25096, 39.69609],
+          [-83.65093, 39.71907],
+          [-83.64578, 39.77688],
+          [-83.73642, 39.78269],
+          [-83.73951, 39.79034],
+          [-83.82568, 39.79983],
+          [-83.825, 39.82409],
+          [-83.93898, 39.83095],
+          [-83.93761, 39.84492],
+          [-84.05125, 39.85283],
+          [-84.00867, 40.31147],
+          [-84.00181, 40.31121],
+          [-83.9994, 40.47986],
+          [-83.98979, 40.48038],
+          [-83.99151, 40.53285],
+          [-83.88439, 40.53442],
+          [-83.8813, 40.52972],
+          [-83.52184, 40.50753],
+          [-83.54176, 40.33686],
+          [-83.63857, 40.33739],
+          [-83.63617, 40.30179],
+          [-83.56647, 40.30179],
+          [-83.54656, 40.27612],
+          [-83.55343, 40.22817],
+          [-83.49609, 40.22371],
+          [-83.50674, 40.10985],
+          [-83.16788, 40.10565],
+          [-83.17028, 40.24521],
+          [-83.2465, 40.24678],
+          [-83.2465, 40.5091],
+          [-83.41267, 40.5078],
+          [-83.41782, 40.68741],
+          [-83.43773, 40.68923],
+          [-83.43842, 40.70433],
+          [-83.49335, 40.70355],
+          [-83.493, 40.81901],
+          [-83.51395, 40.82005],
+          [-83.51257, 40.90339],
+          [-83.47584, 40.90313],
+          [-83.47515, 40.94697],
+          [-83.45592, 40.94749],
+          [-83.45592, 40.99001],
+          [-83.41747, 40.99052],
+          [-83.41782, 41.16754],
+          [-83.87787, 41.17064],
+          [-83.88062, 41.41132],
+          [-83.85143, 41.41235],
+          [-83.74432, 41.4646],
+          [-83.70827, 41.49341],
+          [-83.7038, 41.52143],
+          [-83.67805, 41.54405],
+          [-83.6063, 41.56922],
+          [-83.57094, 41.61236],
+          [-83.41782, 41.61673],
+          [-83.42297, 41.25329],
+          [-83.23139, 41.25045],
+          [-82.84241, 41.25303],
+          [-82.83245, 40.99493],
+          [-82.42973, 40.99078],
+          [-82.4342, 41.06279],
+          [-82.33463, 41.06408],
+          [-82.33944, 41.28632],
+          [-82.83897, 41.29225],
+          [-82.84515, 41.43217],
+          [-82.9509, 41.4332],
+          [-82.95158, 41.48286],
+          [-82.87262, 41.48826],
+          [-82.84447, 41.49469],
+          [-82.83417, 41.45945],
+          [-82.79984, 41.4682],
+          [-82.81494, 41.49649],
+          [-82.7528, 41.50086],
+          [-82.7401, 41.48441],
+          [-82.70199, 41.49521],
+          [-82.70817, 41.55098],
+          [-82.78164, 41.54816],
+          [-82.83142, 41.59465],
+          [-82.86507, 41.57847],
+          [-82.85854, 41.5551],
+          [-82.88807, 41.52631],
+          [-82.93098, 41.51835],
+          [-82.98626, 41.53505],
+          [-83.04016, 41.5682],
+          [-83.06694, 41.60235],
+          [-83.10574, 41.6175],
+          [-83.14247, 41.61955],
+          [-83.20564, 41.63828],
+          [-83.33954, 41.70957],
+          [-83.35327, 41.69189],
+          [-83.4264, 41.69548],
+          [-83.41679, 41.70291],
+          [-83.41816, 41.7375],
+          [-83.88405, 41.72341],
+          [-83.87993, 41.62032],
+          [-83.88783, 41.62006],
+          [-83.88577, 41.48955],
+          [-84.34547, 41.48852],
+          [-84.34513, 41.42548],
+          [-84.23183, 41.42522],
+          [-84.23355, 41.16366],
+          [-83.97366, 41.16444],
+          [-83.97434, 41.17995],
+          [-83.90259, 41.17865],
+          [-83.90327, 41.16418],
+          [-83.88371, 41.16444],
+          [-83.88336, 40.92337],
+          [-83.99975, 40.92233],
+          [-83.99769, 40.90754],
+          [-84.11167, 40.90651],
+          [-84.11167, 40.8629],
+          [-84.34444, 40.86186],
+          [-84.33758, 40.90521],
+          [-84.39491, 40.90547],
+          [-84.39663, 40.98871],
+          [-84.33861, 40.98897],
+          [-84.33964, 41.21043],
+          [-84.45362, 41.21146],
+          [-84.45499, 41.25458],
+          [-84.80621, 41.2551],
+          [-84.80724, 40.72488],
+          [-84.45877, 40.7254],
+          [-84.46083, 40.35649],
+          [-84.43851, 40.35073],
+          [-84.43474, 40.17494],
+          [-84.44504, 40.15841],
+          [-84.43336, 40.15841],
+          [-84.42959, 39.92185],
+          [-84.81651, 39.91974],
+          [-84.8172, 39.57685],
+          [-84.82647, 39.56997],
+          [-84.8172, 39.566]
+        ],
+        [
+          [-82.83211, 41.73033],
+          [-82.80945, 41.72828],
+          [-82.77374, 41.7006],
+          [-82.78198, 41.66368],
+          [-82.84309, 41.61544],
+          [-82.86713, 41.68266],
+          [-82.83211, 41.73033]
+        ],
+        [
+          [-81.09077, 40.89742],
+          [-81.09146, 40.9913],
+          [-81.00494, 40.99026],
+          [-81.007, 41.1373],
+          [-80.51537, 41.13574],
+          [-80.51468, 40.89794],
+          [-81.09077, 40.89742]
+        ]
+      ],
+      "terms_url": "https://ogrip.oit.ohio.gov/ProjectsInitiatives/StatewideImagery.aspx",
+      "terms_text": "Ohio Statewide Imagery Program",
+      "description": "Most recent available 6-inch orthoimagery from the Ohio Statewide Imagery Program."
+    },
     {
       "id": "osmie_barony",
       "name": "OSMIE Baronies",
@@ -50631,7 +51100,7 @@
       "id": "RABA-KGZ-3000",
       "name": "RABA-KGZ: Slovenia built-up areas",
       "type": "tms",
-      "template": "http://wms.openstreetmap.de/tms/RABA3000/{zoom}/{x}/{y}.png",
+      "template": "https://wms.openstreetmap.de/tms/RABA3000/{zoom}/{x}/{y}.png",
       "zoomExtent": [8, 19],
       "polygon": [
         [
@@ -50665,9 +51134,8 @@
           [13.81063, 45.42531],
           [13.7856, 45.45577],
           [13.67553, 45.43241],
-          [13.58846, 45.46171],
-          [13.45377, 45.59765],
-          [13.62822, 45.64153],
+          [13.38, 45.5666],
+          [13.63822, 45.64153],
           [13.72158, 45.60472],
           [13.83759, 45.59226],
           [13.89962, 45.63295],
@@ -50816,14 +51284,14 @@
         ]
       ],
       "terms_url": "https://wiki.openstreetmap.org/wiki/Slovenia_Landcover_Import_-_RABA-KGZ",
-      "terms_text": "Copyright ©2015 Ministrstvo za kmetijstvo, gozdarstvo in prehrano (mkgp.gov.si). Some rights reserved.",
+      "terms_text": "Copyright ©2019 Ministrstvo za kmetijstvo, gozdarstvo in prehrano (mkgp.gov.si). Some rights reserved.",
       "icon": "https://osmlab.github.io/editor-layer-index/sources/europe/si/RABA-KGZSloveniafarmlanduse.png"
     },
     {
       "id": "RABA-KGZ",
       "name": "RABA-KGZ: Slovenia farmland use",
       "type": "tms",
-      "template": "http://wms.openstreetmap.de/tms/RABA/{zoom}/{x}/{y}.png",
+      "template": "https://wms.openstreetmap.de/tms/RABA/{zoom}/{x}/{y}.png",
       "zoomExtent": [8, 19],
       "polygon": [
         [
@@ -50857,9 +51325,8 @@
           [13.81063, 45.42531],
           [13.7856, 45.45577],
           [13.67553, 45.43241],
-          [13.58846, 45.46171],
-          [13.45377, 45.59765],
-          [13.62822, 45.64153],
+          [13.38, 45.5666],
+          [13.63822, 45.64153],
           [13.72158, 45.60472],
           [13.83759, 45.59226],
           [13.89962, 45.63295],
@@ -51008,7 +51475,7 @@
         ]
       ],
       "terms_url": "https://wiki.openstreetmap.org/wiki/Slovenia_Landcover_Import_-_RABA-KGZ",
-      "terms_text": "Copyright ©2015 Ministrstvo za kmetijstvo, gozdarstvo in prehrano (mkgp.gov.si). Some rights reserved.",
+      "terms_text": "Copyright ©2019 Ministrstvo za kmetijstvo, gozdarstvo in prehrano (mkgp.gov.si). Some rights reserved.",
       "icon": "https://osmlab.github.io/editor-layer-index/sources/europe/si/RABA-KGZSloveniafarmlanduse.png"
     },
     {
@@ -65365,49 +65832,6 @@
       "best": true,
       "description": "Public domain street and address data from the San Juan County, WA. Updated at least quarterly."
     },
-    {
-      "id": "Vercors-Orthophotos-1999",
-      "name": "Vercors (Réserve naturelle des Hauts-Plateaux du Vercors) - Orthophoto - 1999 - 1 m",
-      "type": "tms",
-      "template": "http://wms.openstreetmap.fr/tms/1.0.0/PNRVercors-RHP-1999/{zoom}/{x}/{y}",
-      "endDate": "1999-01-01T00:00:00.000Z",
-      "startDate": "1999-01-01T00:00:00.000Z",
-      "zoomExtent": [0, 19],
-      "polygon": [
-        [
-          [5.43565, 44.99918],
-          [5.43193, 44.9229],
-          [5.43624, 44.92284],
-          [5.43472, 44.89001],
-          [5.43303, 44.88995],
-          [5.43065, 44.85026],
-          [5.43387, 44.85014],
-          [5.43285, 44.82638],
-          [5.43548, 44.82626],
-          [5.43497, 44.8139],
-          [5.44106, 44.81372],
-          [5.43717, 44.74098],
-          [5.4546, 44.74044],
-          [5.45282, 44.70425],
-          [5.5211, 44.70245],
-          [5.5233, 44.73858],
-          [5.58904, 44.73684],
-          [5.59298, 44.81263],
-          [5.5879, 44.81299],
-          [5.58977, 44.84947],
-          [5.58823, 44.84938],
-          [5.58972, 44.87351],
-          [5.53863, 44.87503],
-          [5.53947, 44.88686],
-          [5.52834, 44.88733],
-          [5.53002, 44.92012],
-          [5.53319, 44.92012],
-          [5.53761, 44.99624],
-          [5.43565, 44.99918]
-        ]
-      ],
-      "terms_text": "Parc Naturel du Vercors"
-    },
     {
       "id": "vicosa_al",
       "name": "Viçosa AL",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e87cad6db..2391188dc 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -8122,6 +8122,13 @@
                 "description": "Japan GSI ortho Imagery. Usually better than bing, but a bit older.",
                 "name": "Japan GSI ortho Imagery"
             },
+            "gsi.go.jp_airphoto": {
+                "attribution": {
+                    "text": "GSI Japan"
+                },
+                "description": "Japan GSI airphoto Imagery. Not fully orthorectified, but a bit newer and/or differently covered than GSI ortho Imagery.",
+                "name": "Japan GSI airphoto Imagery"
+            },
             "gsi.go.jp_std_map": {
                 "attribution": {
                     "text": "GSI Japan"