Added an option to disable the search for places without coordinates …

…in geocoders (general maps)
Serg-Norseman · Oct 31, 2024 · b55fc70 · b55fc70
1 parent 1d1d34a
commit b55fc70
Show file tree

Hide file tree

Showing 32 changed files with 284 additions and 171 deletions.
diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/English.lng b/locales/English.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/czech.lng b/locales/czech.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/french.lng b/locales/french.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/german.lng b/locales/german.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
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 an option to disable the search for places without coordinates in geocoders (general maps).
             <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).

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>Добавлена опция упрощения формы единственных фамилий женщин в расширенном режиме (вывод без скобок, если других фамилий нет).

diff --git a/locales/italian.lng b/locales/italian.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/polish.lng b/locales/polish.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/locales/russian.lng b/locales/russian.lng
@@ -1011,3 +1011,5 @@
 998=Простая форма единственных фамилий
 999=Карта мест
 1000=Карта персон
+1001=Поиск в геокодерах мест без координат (карты)
+1002=Места и Карты
diff --git a/locales/ukrainian.lng b/locales/ukrainian.lng
@@ -1011,3 +1011,5 @@
 998=Simple form of single surnames
 999=Map of places
 1000=Map of persons
+1001=Search in geocoders for places without coordinates (maps)
+1002=Locations and Maps
diff --git a/projects/GKCore/GKCore/Controllers/MapsViewerWinController.cs b/projects/GKCore/GKCore/Controllers/MapsViewerWinController.cs
@@ -28,6 +28,7 @@
 using GKCore.Design.Views;
 using GKCore.Interfaces;
 using GKCore.Maps;
+using GKCore.Options;
 
 namespace GKCore.Controllers
 {
@@ -39,6 +40,7 @@ public sealed class MapsViewerWinController : FormController<IMapsViewerWin>
         private readonly List<GeoPoint> fMapPoints;
         private readonly List<GDMRecord> fSelectedPersons;
         private readonly Dictionary<string, MapPlace> fPlaces;
+        private readonly bool fSearchPlacesWithoutCoords;
 
         private ITVNode fBaseRoot;
 
@@ -52,6 +54,7 @@ public MapsViewerWinController(IMapsViewerWin view, List<GDMRecord> selectedPers
             fMapPoints = new List<GeoPoint>();
             fPlaces = new Dictionary<string, MapPlace>();
             fSelectedPersons = selectedPersons;
+            fSearchPlacesWithoutCoords = GlobalOptions.Instance.SearchPlacesWithoutCoords;
         }
 
         public void ShowFixedPoints(IEnumerable<GeoPoint> points)
@@ -87,26 +90,21 @@ private void LoadPlacesInt(StringList personValues, IProgressController progress
             GDMTree tree = fBase.Context.Tree;
             progress.Begin(LangMan.LS(LSID.LoadingLocations), tree.RecordsCount);
             try {
-                int num = tree.RecordsCount;
-                for (int i = 0; i < num; i++) {
-                    GDMRecord rec = tree[i];
-                    bool res = rec is GDMIndividualRecord && IsSelected(rec);
+                for (int i = 0, num = tree.RecordsCount; i < num; i++) {
+                    GDMIndividualRecord iRec = tree[i] as GDMIndividualRecord;
 
-                    if (res) {
-                        GDMIndividualRecord ind = rec as GDMIndividualRecord;
+                    if (iRec != null && IsSelected(iRec) && iRec.HasEvents) {
                         int pCnt = 0;
 
-                        int num2 = ind.Events.Count;
-                        for (int j = 0; j < num2; j++) {
-                            GDMCustomEvent ev = ind.Events[j];
+                        for (int j = 0, num2 = iRec.Events.Count; j < num2; j++) {
+                            GDMCustomEvent ev = iRec.Events[j];
                             if (ev.HasPlace && !string.IsNullOrEmpty(ev.Place.StringValue)) {
-                                AddPlace(ev.Place, ind, ev);
-                                pCnt++;
+                                pCnt += AddPlace(iRec, ev);
                             }
                         }
 
                         if (pCnt > 0) {
-                            personValues.AddObject(GKUtils.GetNameString(ind, true, false) + " [" + pCnt.ToString() + "]", ind);
+                            personValues.AddObject(GKUtils.GetNameString(iRec, true, false) + " [" + pCnt.ToString() + "]", iRec);
                         }
                     }
 
@@ -163,33 +161,42 @@ public void LoadPlaces()
                 fView.PersonsCombo.EndUpdate();
                 PlacesCache.Instance.Save();
             } catch (Exception ex) {
-                Logger.WriteError("MapsViewerWin.PlacesLoad()", ex);
+                Logger.WriteError("MapsViewerWinController.LoadPlaces()", ex);
             }
         }
 
-        private void AddPlace(GDMPlace place, GDMRecord owner, GDMCustomEvent placeEvent)
+        private int AddPlace(GDMRecord owner, GDMCustomEvent placeEvent)
         {
+            int result = 0;
             try {
+                GDMPlace place = placeEvent.Place;
                 var locRec = fBase.Context.Tree.GetPtrValue<GDMLocationRecord>(place.Location);
                 string placeName = (locRec != null) ? locRec.LocationName : place.StringValue;
 
-                MapPlace mapPlace;
+                MapPlace mapPlace = null;
                 if (!fPlaces.TryGetValue(placeName, out mapPlace)) {
-                    mapPlace = new MapPlace();
-                    mapPlace.Name = placeName;
-                    fPlaces.Add(placeName, mapPlace);
+                    bool hasCoords = locRec != null && !locRec.Map.IsEmpty();
 
-                    if (locRec == null) {
-                        PlacesCache.Instance.GetPlacePoints(placeName, mapPlace.Points);
-                    } else {
+                    if (hasCoords || fSearchPlacesWithoutCoords) {
+                        mapPlace = new MapPlace(placeName);
+                        fPlaces.Add(placeName, mapPlace);
+                    }
+
+                    if (hasCoords) {
                         mapPlace.Points.Add(new GeoPoint(locRec.Map.Lati, locRec.Map.Long, placeName));
+                    } else if (fSearchPlacesWithoutCoords) {
+                        PlacesCache.Instance.GetPlacePoints(placeName, mapPlace.Points);
                     }
                 }
 
-                mapPlace.PlaceRefs.Add(new PlaceRef(owner, placeEvent));
+                if (mapPlace != null) {
+                    mapPlace.PlaceRefs.Add(new PlaceRef(owner, placeEvent));
+                    result = 1;
+                }
             } catch (Exception ex) {
-                Logger.WriteError("MapsViewerWin.AddPlace()", ex);
+                Logger.WriteError("MapsViewerWinController.AddPlace()", ex);
             }
+            return result;
         }
 
         public void SetCenter()
@@ -261,7 +268,7 @@ public async void SaveSnapshot()
                     fView.MapBrowser.SaveSnapshot(fileName);
                 }
             } catch (Exception ex) {
-                Logger.WriteError("SaveSnapshot()", ex);
+                Logger.WriteError("MapsViewerWinController.SaveSnapshot()", ex);
                 AppHost.StdDialogs.ShowError("Image failed to save: " + ex.Message);
             }
         }

diff --git a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
@@ -58,6 +58,13 @@ public OptionsDlgController(IOptionsDlg view) : base(view)
             fView.EventTypesList.ListModel = new EventDefsListModel(fView, null, null);
         }
 
+        public void ChangeTab()
+        {
+            AcceptLanguage();
+            SetLocale();
+            UpdateView();
+        }
+
         private void FillGeoSearchCountries()
         {
             var combo = GetControl<IComboBox>("cmbGeoSearchCountry");
@@ -482,6 +489,7 @@ public void UpdateSpecials()
 
             GetControl<ICheckBox>("chkReversePlacesOrder").Checked = fOptions.ReversePlaceEntitiesOrder;
             GetControl<ICheckBox>("chkShowNumberOfSubstructures").Checked = fOptions.ShowNumberOfSubstructures;
+            GetControl<ICheckBox>("chkSearchPlacesWithoutCoords").Checked = fOptions.SearchPlacesWithoutCoords;
         }
 
         public void AcceptSpecials()
@@ -505,6 +513,7 @@ public void AcceptSpecials()
 
             fOptions.ReversePlaceEntitiesOrder = GetControl<ICheckBox>("chkReversePlacesOrder").Checked;
             fOptions.ShowNumberOfSubstructures = GetControl<ICheckBox>("chkShowNumberOfSubstructures").Checked;
+            fOptions.SearchPlacesWithoutCoords = GetControl<ICheckBox>("chkSearchPlacesWithoutCoords").Checked;
         }
 
         private void UpdateEventTypes()
@@ -1007,6 +1016,8 @@ public override void SetLocale()
 
             GetControl<ITabPage>("pageNavigation").Text = LangMan.LS(LSID.Navigation);
 
+            GetControl<ITabPage>("pageGeo").Text = LangMan.LS(LSID.LocationsAndMaps);
+
             // Pedigree
             GetControl<ITabPage>("pagePedigree").Text = LangMan.LS(LSID.Pedigrees);
 
@@ -1047,6 +1058,7 @@ public override void SetLocale()
             GetControl<ICheckBox>("chkELAbbreviatedNames").Text = LangMan.LS(LSID.EL_AbbreviatedNames);
             GetControl<ICheckBox>("chkReversePlacesOrder").Text = LangMan.LS(LSID.ReversePlacesOrder);
             GetControl<ICheckBox>("chkShowNumberOfSubstructures").Text = LangMan.LS(LSID.ShowNumberOfSubstructures);
+            GetControl<ICheckBox>("chkSearchPlacesWithoutCoords").Text = LangMan.LS(LSID.SearchPlacesWithoutCoords);
 
             // event types
             GetControl<ITabPage>("pageEventTypes").Text = LangMan.LS(LSID.EventTypes);

diff --git a/projects/GKCore/GKCore/LangMan.cs b/projects/GKCore/GKCore/LangMan.cs
@@ -1075,8 +1075,10 @@ public enum LSID
         /* 998 */ SimpleSingleSurnames,
         /* 999 */ MapOfPlaces,
         /* 1000 */ MapOfPersons,
+        /* 1001 */ SearchPlacesWithoutCoords,
+        /* 1002 */ LocationsAndMaps,
 
-        /* 000 */ Last = MapOfPersons
+        /* 000 */ Last = LocationsAndMaps
     }
 
 
@@ -2105,6 +2107,8 @@ public static class LangMan
             /* 998 */ "Simple form of single surnames",
             /* 999 */ "Map of places",
             /* 1000 */ "Map of persons",
+            /* 1001 */ "Search in geocoders for places without coordinates (maps)",
+            /* 1002 */ "Locations and Maps",
         };
 
         private static readonly LangManager fLangMan = new LangManager();

diff --git a/projects/GKCore/GKCore/Maps/PlacesLoader.cs b/projects/GKCore/GKCore/Maps/PlacesLoader.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -52,8 +52,9 @@ public class MapPlace
         public readonly List<GeoPoint> Points;
         public readonly List<PlaceRef> PlaceRefs;
 
-        public MapPlace()
+        public MapPlace(string name)
         {
+            Name = name;
             Points = new List<GeoPoint>();
             PlaceRefs = new List<PlaceRef>();
         }

diff --git a/projects/GKCore/GKCore/Options/GlobalOptions.cs b/projects/GKCore/GKCore/Options/GlobalOptions.cs
@@ -254,6 +254,11 @@ public StringList ResidenceFilters
 
         public bool SearchAndFilterByAllNames { get; set; }
 
+        /// <summary>
+        /// Maps.
+        /// </summary>
+        public bool SearchPlacesWithoutCoords { get; set; }
+
         public bool ShortKinshipForm { get; set; }
 
         public bool ShowDatesCalendar { get; set; }
@@ -423,6 +428,9 @@ public void ResetDefaults_Specials()
             EL_AbbreviatedNames = true;
 
             ShowNumberOfSubstructures = false;
+
+            // maps?
+            SearchPlacesWithoutCoords = false;
         }
 
         public void Assign(IOptions source)
@@ -844,6 +852,7 @@ public void LoadFromFile(IniFile ini)
             ShowIndiNamesakes = ini.ReadBool("Common", "ShowIndiNamesakes", false);
             ShowNumberOfSubstructures = ini.ReadBool("Common", "ShowNumberOfSubstructures", false);
             MatchPatternMethod = (MatchPatternMethod)ini.ReadInteger("Common", "MatchPatternMethod", 0);
+            SearchPlacesWithoutCoords = ini.ReadBool("Common", "SearchPlacesWithoutCoords", false);
 
             Theme = ini.ReadString("Common", "Theme", "");
 
@@ -997,6 +1006,7 @@ public void SaveToFile(IniFile ini)
             ini.WriteBool("Common", "ShowIndiNamesakes", ShowIndiNamesakes);
             ini.WriteBool("Common", "ShowNumberOfSubstructures", ShowNumberOfSubstructures);
             ini.WriteInteger("Common", "MatchPatternMethod", (int)MatchPatternMethod);
+            ini.WriteBool("Common", "SearchPlacesWithoutCoords", SearchPlacesWithoutCoords);
 
             ini.WriteString("Common", "Theme", Theme);
 

diff --git a/projects/GKTests/GKCore/PlacesLoaderTests.cs b/projects/GKTests/GKCore/PlacesLoaderTests.cs
@@ -46,7 +46,7 @@ public void Test_PlaceRef()
         [Test]
         public void Test_MapPlace()
         {
-            var mapPlace = new MapPlace();
+            var mapPlace = new MapPlace(string.Empty);
             Assert.IsNotNull(mapPlace);
             Assert.IsNotNull(mapPlace.Points);
             Assert.IsNotNull(mapPlace.PlaceRefs);