1 files changed, 9 insertions, 22 deletions
diff --git a/resources/views/modules/pedigree-map/chart.phtml b/resources/views/modules/pedigree-map/chart.phtml
index b3556a80bc..e9ac08d83f 100644
--- a/resources/views/modules/pedigree-map/chart.phtml
+++ b/resources/views/modules/pedigree-map/chart.phtml
@@ -5,7 +5,7 @@ use Fisharebest\Webtrees\View;
 
 /**
  * @var array<mixed> $data
- * @var array<mixed> $provider
+ * @var object       $leaflet_config
  */
 ?>
 
@@ -36,12 +36,12 @@ use Fisharebest\Webtrees\View;
 'use strict';
 
 window.WT_OSM = (function () {
+  const config = <?= json_encode($leaflet_config) ?>;
   const minZoom = 2;
 
   let map      = null;
   let zoom     = null;
   let sidebar  = $('.osm-sidebar');
-  let provider = <?= json_encode($provider) ?>;
 
 // Map components
   let markers = L.markerClusterGroup({
@@ -64,7 +64,7 @@ window.WT_OSM = (function () {
 
         return false;
       };
-      let reset         = <?= json_encode(I18N::translate('Reload map')) ?>;
+      let reset         = config.i18n.reset;
       let anchor        = L.DomUtil.create('a', 'leaflet-control-reset', container);
       anchor.setAttribute('aria-label', reset);
       anchor.href  = '#';
@@ -77,25 +77,12 @@ window.WT_OSM = (function () {
     },
   });
 
-// Zoom control with localised text
-  let newZoomControl = new L.control.zoom({
-    zoomInTitle: <?= json_encode(I18N::translate('Zoom in')) ?>,
-    zoomOutTitle: <?= json_encode(I18N::translate('Zoom out')) ?>,
-  });
-
-  /**
-   *
+   /**
    * @private
    */
-  let _drawMap = function () {
-    map = L.map('osm-map', {
-      center:      [0, 0],
-      minZoom:     minZoom,   // maxZoom set by leaflet-providers.js
-      zoomControl: false,     // remove default
-    })
-    .addControl(new resetControl())
-    .addControl(newZoomControl)
-    .addLayer(L.tileLayer(provider.url, provider.options));
+   let _drawMap = function() {
+    map = webtrees.buildLeafletJsMap('osm-map', config)
+      .addControl(new resetControl());
   };
 
   /**
@@ -195,8 +182,8 @@ window.WT_OSM = (function () {
     });
   });
 
-  _drawMap();
-  _buildMapData();
+    _drawMap();
+    _buildMapData();
 
   return 'Leaflet map interface for webtrees-2';
 })();