Added the feature to display on maps all subordinate locations and pe…

…rsons of the selected hierarchy of locations (fix #601)
Serg-Norseman · Oct 25, 2024 · fd63ba1 · fd63ba1
1 parent b2c201f
commit fd63ba1
Show file tree

Hide file tree

Showing 37 changed files with 329 additions and 85 deletions.
diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/English.lng b/locales/English.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/czech.lng b/locales/czech.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/french.lng b/locales/french.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/german.lng b/locales/german.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Added the feature to display on maps all subordinate locations and persons of the selected hierarchy of locations.
             <li>Added mode for displaying parents' ages in tree diagrams.
             <li>Added an option to simplify the form of woman single surnames in extended mode (output without brackets if there are no other surnames).
             <li>Added protection against problems with folders in Windows if the file name has a space before the extension.

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Добавлена возможность выводить на карты все подчиненные места и персоны выбранной иерархии мест.
             <li>Добавлен режим отображения возрастов родителей в диаграммах деревьев.
             <li>Добавлена опция упрощения формы единственных фамилий женщин в расширенном режиме (вывод без скобок, если других фамилий нет).
             <li>Добавлена защита от проблем с папками в Windows, если в имени файла перед расширением есть пробел.

diff --git a/locales/italian.lng b/locales/italian.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/polish.lng b/locales/polish.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/locales/russian.lng b/locales/russian.lng
@@ -1009,3 +1009,5 @@
 996=Архив не указан
 997=Возраст родителей
 998=Простая форма единственных фамилий
+999=Карта мест
+1000=Карта персон
diff --git a/locales/ukrainian.lng b/locales/ukrainian.lng
@@ -1009,3 +1009,5 @@
 996=Repository is not specified
 997=Age of parents
 998=Simple form of single surnames
+999=Map of places
+1000=Map of persons
diff --git a/projects/GKCore/GKCore/Controllers/BaseController.cs b/projects/GKCore/GKCore/Controllers/BaseController.cs
@@ -19,6 +19,8 @@
  */
 
 using System;
+using System.Collections.Generic;
+using System.Text;
 using System.Threading.Tasks;
 using BSLib;
 using GDModel;
@@ -28,6 +30,7 @@
 using GKCore.Design.Views;
 using GKCore.Interfaces;
 using GKCore.Lists;
+using GKCore.Maps;
 using GKCore.Names;
 using GKCore.Operations;
 using GKCore.Options;
@@ -1444,5 +1447,58 @@ public static void ShowMedia(IBaseWindow baseWin, GDMMultimediaRecord mediaRec,
                 }
             }
         }
+
+        public static void ShowMap(IBaseWindow baseWin, List<GeoPoint> fixedPoints = null)
+        {
+            var mapsWin = AppHost.Container.Resolve<IMapsViewerWin>(baseWin);
+            if (fixedPoints != null) {
+                mapsWin.ShowFixedPoints(fixedPoints);
+            }
+            AppHost.Instance.ShowWindow(mapsWin);
+        }
+
+        public static void ShowMap_Sub(IBaseWindow baseWin, GDMLocationRecord locRec)
+        {
+            var tree = baseWin.Context.Tree;
+            var subLinks = new HashSet<GDMLocationRecord>();
+            GKUtils.GetLocationRecursiveSubordinateLinks(tree, locRec, subLinks, true);
+
+            var geoPoints = new List<GeoPoint>();
+            foreach (var location in subLinks) {
+                string locName = GKUtils.GetRecordName(tree, location, false);
+                var mapPt = location.Map;
+                geoPoints.Add(new GeoPoint(mapPt.Lati, mapPt.Long, locName));
+            }
+
+            ShowMap(baseWin, geoPoints);
+        }
+
+        public static void ShowMap_Indi(IBaseWindow baseWin, GDMLocationRecord locRec)
+        {
+            var tree = baseWin.Context.Tree;
+            var subLinks = new HashSet<GDMLocationRecord>();
+            GKUtils.GetLocationRecursiveSubordinateLinks(tree, locRec, subLinks, true);
+
+            var locName = new StringBuilder();
+
+            var geoPoints = new List<GeoPoint>();
+            foreach (var location in subLinks) {
+                var individualRecords = new HashSet<GDMIndividualRecord>();
+                GKUtils.GetLocationIndividuals(tree, location, individualRecords);
+
+                locName.AppendLine(GKUtils.GetRecordName(tree, location, false));
+                var mapPt = location.Map;
+
+                foreach (var iRec in individualRecords) {
+                    string iName = GKUtils.GetRecordName(tree, iRec, false);
+                    locName.AppendLine(iName);
+                }
+
+                geoPoints.Add(new GeoPoint(mapPt.Lati, mapPt.Long, locName.ToString()));
+                locName.Clear();
+            }
+
+            ShowMap(baseWin, geoPoints);
+        }
     }
 }
diff --git a/projects/GKCore/GKCore/Controllers/BaseWinController.cs b/projects/GKCore/GKCore/Controllers/BaseWinController.cs
@@ -385,6 +385,14 @@ public void SelectSummaryLink(IHyperView sender, string linkName)
                     ApplyFilter(GDMRecordType.rtIndividual, listMan);
                     fView.ShowRecordsTab(GDMRecordType.rtIndividual);
                 }
+            } else if (linkName.StartsWith(GKData.INFO_HREF_LOC_SUB)) {
+                string xref = linkName.Remove(0, GKData.INFO_HREF_LOC_SUB.Length);
+                var locRec = fContext.Tree.FindXRef<GDMLocationRecord>(xref);
+                if (locRec != null) BaseController.ShowMap_Sub(fView, locRec);
+            } else if (linkName.StartsWith(GKData.INFO_HREF_LOC_INDI)) {
+                string xref = linkName.Remove(0, GKData.INFO_HREF_LOC_INDI.Length);
+                var locRec = fContext.Tree.FindXRef<GDMLocationRecord>(xref);
+                if (locRec != null) BaseController.ShowMap_Indi(fView, locRec);
             } else if (linkName.StartsWith(GKData.INFO_HREF_EXPAND_ASSO)) {
                 GKUtils.ExpandExtInfo(fContext, sender, linkName);
             } else {
@@ -1277,8 +1285,7 @@ public void SendMail()
 
         public void ShowMap()
         {
-            var mapsWin = AppHost.Container.Resolve<IMapsViewerWin>(fView);
-            AppHost.Instance.ShowWindow(mapsWin);
+            BaseController.ShowMap(fView);
         }
 
         public async void ShowOrganizer()

diff --git a/projects/GKCore/GKCore/Controllers/MapsViewerWinController.cs b/projects/GKCore/GKCore/Controllers/MapsViewerWinController.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -23,11 +23,11 @@
 using BSLib;
 using GDModel;
 using GDModel.Providers.GEDCOM;
+using GKCore.Design;
 using GKCore.Design.Controls;
+using GKCore.Design.Views;
 using GKCore.Interfaces;
 using GKCore.Maps;
-using GKCore.Design;
-using GKCore.Design.Views;
 
 namespace GKCore.Controllers
 {
@@ -54,6 +54,22 @@ public MapsViewerWinController(IMapsViewerWin view, List<GDMRecord> selectedPers
             fSelectedPersons = selectedPersons;
         }
 
+        public void ShowFixedPoints(IEnumerable<GeoPoint> points)
+        {
+            var mapBrowser = fView.MapBrowser;
+            mapBrowser.ShowLines = false;
+            mapBrowser.BeginUpdate();
+            try {
+                mapBrowser.ClearPoints();
+                foreach (var pt in points) {
+                    mapBrowser.AddPoint(pt);
+                }
+            } finally {
+                mapBrowser.EndUpdate();
+            }
+            mapBrowser.ZoomToBounds();
+        }
+
         public override void UpdateView()
         {
         }

diff --git a/projects/GKCore/GKCore/Controllers/PartialViewController.cs b/projects/GKCore/GKCore/Controllers/PartialViewController.cs
@@ -195,6 +195,14 @@ public void SelectSummaryLink(IHyperView sender, string linkName)
                     iFilter.SourceRef = rec.XRef;
                     ApplyFilter(GDMRecordType.rtIndividual, listMan);
                 }
+            } else if (linkName.StartsWith(GKData.INFO_HREF_LOC_SUB)) {
+                string xref = linkName.Remove(0, GKData.INFO_HREF_LOC_SUB.Length);
+                var locRec = fBase.Context.Tree.FindXRef<GDMLocationRecord>(xref);
+                if (locRec != null) BaseController.ShowMap_Sub(fBase, locRec);
+            } else if (linkName.StartsWith(GKData.INFO_HREF_LOC_INDI)) {
+                string xref = linkName.Remove(0, GKData.INFO_HREF_LOC_INDI.Length);
+                var locRec = fBase.Context.Tree.FindXRef<GDMLocationRecord>(xref);
+                if (locRec != null) BaseController.ShowMap_Indi(fBase, locRec);
             } else if (linkName.StartsWith(GKData.INFO_HREF_EXPAND_ASSO)) {
                 GKUtils.ExpandExtInfo(fBase.Context, sender, linkName);
             } else {

diff --git a/projects/GKCore/GKCore/Design/Controls/IMapBrowser.cs b/projects/GKCore/GKCore/Design/Controls/IMapBrowser.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -19,7 +19,6 @@
  */
 
 using System.Collections.Generic;
-using GKCore.Design.Controls;
 using GKCore.Maps;
 
 namespace GKCore.Design.Controls
@@ -34,6 +33,7 @@ public interface IMapBrowser : IBaseControl
         IList<GeoPoint> MapPoints { get; }
 
         int AddPoint(double latitude, double longitude, string hint);
+        int AddPoint(GeoPoint pt);
         void ClearPoints();
         void DeletePoint(int index);
         void BeginUpdate();

diff --git a/projects/GKCore/GKCore/Design/Views/IMapsViewerWin.cs b/projects/GKCore/GKCore/Design/Views/IMapsViewerWin.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -18,8 +18,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+using System.Collections.Generic;
 using GKCore.Design.Controls;
 using GKCore.Interfaces;
+using GKCore.Maps;
 
 namespace GKCore.Design.Views
 {
@@ -37,5 +39,7 @@ public interface IMapsViewerWin : IWindow
         IRadioButton SelectedRadio { get; }
 
         ITVNode FindTreeNode(string place);
+
+        void ShowFixedPoints(IEnumerable<GeoPoint> points);
     }
 }
diff --git a/projects/GKCore/GKCore/GKData.cs b/projects/GKCore/GKCore/GKData.cs
@@ -81,6 +81,8 @@ public static class GKData
         public const string INFO_HREF_VIEW = "view_";
         public const string INFO_HREF_FILTER_INDI = "filter_indi_by_";
         public const string INFO_HREF_EXPAND_ASSO = "expand_asso_";
+        public const string INFO_HREF_LOC_SUB = "map_loc_sub_";
+        public const string INFO_HREF_LOC_INDI = "map_loc_indi_";
 
 #if OS_LINUX || OS_FREEBSD
         public const string DEF_FONT = "Noto Sans";