Simplify code

fisharebest · Feb 16, 2022 · 9a1386f · 9a1386f
1 parent cbf14da
commit 9a1386f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/app/Module/PedigreeMapModule.php b/app/Module/PedigreeMapModule.php
@@ -242,6 +242,7 @@ private function getMapData(ServerRequestInterface $request): array
         ];
 
         $sosa_points = [];
+        $lines       = [];
 
         foreach ($facts as $sosa => $fact) {
             $location = new PlaceLocation($fact->place()->gedcomName());
@@ -257,16 +258,12 @@ private function getMapData(ServerRequestInterface $request): array
             }
 
             if ($latitude !== null && $longitude !== null) {
-                $polyline           = null;
                 $sosa_points[$sosa] = [$latitude, $longitude];
                 $sosa_child         = intdiv($sosa, 2);
                 $color              = 'var(--wt-pedigree-map-gen-' . $sosa_child % self::GENERATION_COLORS . ')';
 
                 if (array_key_exists($sosa_child, $sosa_points)) {
-                    // Would like to use a GeometryCollection to hold LineStrings
-                    // rather than generate polylines but the MarkerCluster library
-                    // doesn't seem to like them
-                    $polyline = [
+                    $lines[] = [
                         'points'  => [
                             $sosa_points[$sosa_child],
                             [$latitude, $longitude],
@@ -284,7 +281,6 @@ private function getMapData(ServerRequestInterface $request): array
                         'coordinates' => [$longitude, $latitude],
                     ],
                     'properties' => [
-                        'polyline'  => $polyline,
                         'iconcolor' => $color,
                         'tooltip'   => $fact->place()->gedcomName(),
                         'summary'   => view('modules/pedigree-map/events', [
@@ -297,7 +293,10 @@ private function getMapData(ServerRequestInterface $request): array
             }
         }
 
-        return $geojson;
+        return [
+            'geoJSON'   => $geojson,
+            'polylines' => $lines,
+        ];
     }
 
     /**

diff --git a/resources/views/modules/pedigree-map/chart.phtml b/resources/views/modules/pedigree-map/chart.phtml
@@ -20,7 +20,8 @@ use Fisharebest\Webtrees\View;
 
   (function () {
     const config = <?= json_encode($leaflet_config, JSON_THROW_ON_ERROR) ?>;
-    const geoJson_data = <?= json_encode($data, JSON_THROW_ON_ERROR) ?>;
+    const geoJson_data = <?= json_encode($data['geoJSON'], JSON_THROW_ON_ERROR) ?>;
+    const polylines = <?= json_encode($data['polylines'], JSON_THROW_ON_ERROR) ?>;
     const sidebar = document.querySelector('.wt-pedigree-map-sidebar');
 
     const scrollOptions = {
@@ -42,18 +43,17 @@ use Fisharebest\Webtrees\View;
       tree: null
     }
 
-    geoJson_data.features.forEach((feature) => {
-      if (feature.properties.polyline) {
-        features.layer.addLayer(L.polyline(feature.properties.polyline.points, feature.properties.polyline.options));
-        if (!features.tree) {
-          features.tree = {
-            label: '<?= I18N::translate("Show/Hide parent to child lines") ?>',
-            layer: features.layer
-          }
-        }
-      }
+    polylines.forEach((line) => {
+      features.layer.addLayer(L.polyline(line.points, line.options));
     });
 
+    if (polylines.length) {
+      features.tree = {
+        label: '<?= I18N::translate("Show/Hide parent to child lines") ?>',
+        layer: features.layer
+      }
+    }
+
     /**
      * Passed to resetControl to
      * perform necessary reset actions on map