Merge pull request #531 from Serg-Norseman/feature/location-levels

Feature/location levels
Serg-Norseman · Feb 11, 2024 · c4192b0 · c4192b0
2 parents abd903b + 1b95349
commit c4192b0
Show file tree

Hide file tree

Showing 85 changed files with 2,597 additions and 423 deletions.
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/English.lng b/locales/English.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/czech.lng b/locales/czech.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/french.lng b/locales/french.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/german.lng b/locales/german.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
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.29.0 &amp; v3.5.0]</b><ul>
+            <li>Added the "Extended locations" option, which includes substitution of full place names depending on the date of events when using the historical ATD hierarchy.
             <li>Added a tool for batch adding photos.
             <li>Added support for multiple names and date periods in location records (GEDCOM 5.5 EL).
             <li>Added a non-standard date attribute to source records (for clarifying and sorting censuses, parish books, confession books and personal documents).

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

diff --git a/locales/help_rus/gkhOptions.html b/locales/help_rus/gkhOptions.html
@@ -517,6 +517,10 @@ <h3>Список персон</h3>
         <dt>Расширенное определение родства</dt>
         <dd>В калькуляторе родственных связей и в деревьях с включенным отображением родства, будут определяться такие связи как единокровные и единоутробные братья и сестры,
 		    усыновления/удочерения, родные и неродные родители, гражданские браки.</dd>
+
+        <dt>Расширенная обработка мест</dt>
+        <dd>Все операции по обработке и подстановке местоположений с участием записей мест будут учитывать возможное наличие исторических сведений о привязке названий мест
+		    к датам, возможное наличие иерархических связей между местами (см. <a href="gkhRec_Place.html">Записи географических мест</a>).</dd>
     </dl>
 
     <hr />

diff --git a/locales/help_rus/gkhRec_Place.html b/locales/help_rus/gkhRec_Place.html
@@ -48,6 +48,47 @@ <h1>Записи географических мест</h1>
         можно просмотреть список всех фактов событий персон или семей, которые ссылаются на данную.
     </p>
 
+    <hr />
+    <p align="center"><img src="images/dlgLocHistory.png"></p>
+    <p>
+		Данный диалог предназначен для ввода и управления историческими сведениями о месте: привязками названий мест и ссылок на верхние уровни
+		иерархии административно-территориального деления к периоду действия. Т.е. если определенный нас.пункт на протяжении истории несколько раз менял своё название -
+		в данном диалоге можно ввести все названия и указать в какие интервалы времени они действовали. Если некая деревня или город в разные периоды входили в разные
+		волости или районы - это можно ввести в нижней секции диалога - "Ссылки на верхние уровни".
+    </p>
+    <p>
+		Возможно использование различных подходов к ведению справочника мест:<ul>
+			<li>не использовать исторические привязки имен и иерархию;
+			<li>использовать только одноуровневую модель: в список имен вводятся длинные полные имена, от самого нижнего уровня - до верхнего (или наоборот), и их периоды;
+			<li>использовать полную многоуровневую модель: в имя вводится только непосредственная часть (название города или волости, или губернии, и т.д.), прочие части
+			распределяются по уровням, каждое конкретное место получает собственную запись, со своими названиями и ссылками на верхние уровни.
+		</ul>
+    </p>
+    <p>
+		Внимание: при включении опции "Настройки \ Особое \ Расширенная обработка мест" и подключении иерархически организованных мест к датам в диалоге редактирования событий - 
+		места начинают автоматически подстраиваться при изменении даты (определяется полное длинное название места в конкретную дату события). Также этот механизм будет работать
+		при использовании инструмента управления местами и на этапе верификации загружаемых файлов.
+    </p>
+
+    <hr />
+    <p align="center"><img src="images/dlgLocName.png"></p>
+    <p>
+		Диалог предназначен для редактирования названия места и его периода действия. Например: "Вятское наместничество", период действия названия с 11/09/1780 по 30/12/1796.
+    </p>
+
+    <hr />
+    <p align="center"><img src="images/dlgLocLink.png"></p>
+    <p>
+		Диалог предназначен для редактирования ссылки на запись места более высокого уровня и периода подчинения. Например, "Вятская провинция/наместничество" входила
+		в "Сибирская губерния" с 29/05/1719 по 28/04/1727 и в "Казанская губерния" с 29/04/1727 по 10/09/1780.
+    </p>
+
+    <hr />
+    <p>
+		Пример полного заполнения истории:
+    </p>
+    <p align="center"><img src="images/dlgLocHistSample.png"></p>
+
     <hr />
     <p>
         Также смотрите: <a href="gkhRec_Event.html">События/факты</a>, <a href="gkhRec_Note.html">Заметки</a>, <a href="gkhRec_Media.html">Мультимедиа-материалы</a>,

diff --git a/locales/help_rus/images/dlgLocHistSample.png b/locales/help_rus/images/dlgLocHistSample.png
diff --git a/locales/help_rus/images/dlgLocHistory.png b/locales/help_rus/images/dlgLocHistory.png
diff --git a/locales/help_rus/images/dlgLocLink.png b/locales/help_rus/images/dlgLocLink.png
diff --git a/locales/help_rus/images/dlgLocName.png b/locales/help_rus/images/dlgLocName.png
diff --git a/locales/italian.lng b/locales/italian.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/polish.lng b/locales/polish.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/locales/russian.lng b/locales/russian.lng
@@ -944,7 +944,9 @@
 936=Анализ переписей
 937=Персона может быть найдена в переписи `{0}`
 938=История
-939=Периоды названий места пересекаются. Это приведет к ошибкам при поиске названия места по дате.
+939=Периоды пересекаются. Это приведет к ошибкам при поиске названия места по дате.
 940=Расширенная обработка мест
 941=Пакетное добавление фотографий
 942=Добавлено {0} фотографий из {1}.
+943=Ссылки на верхний уровень
+944=Удалить ссылку на верхний уровень?
diff --git a/locales/ukrainian.lng b/locales/ukrainian.lng
@@ -944,7 +944,9 @@
 936=Census analysis
 937=The person can be found in the census `{0}`
 938=History
-939=The periods of place names overlap. This will cause errors when searching for a place name by date.
+939=The periods overlap. This will cause errors when searching for a place name by date.
 940=Extended locations
 941=Photos batch adding
 942=Added {0} photos from {1}.
+943=Top level links
+944=Remove top level link?
diff --git a/projects/GKCore/GDModel/GDMCustomDate.cs b/projects/GKCore/GDModel/GDMCustomDate.cs
@@ -157,6 +157,8 @@ public bool Equals(GDMCustomDate other)
             return abs1.Equals(abs2);
         }
 
+        public abstract void GetDateRange(out GDMDate dateStart, out GDMDate dateEnd);
+
         public static GDMDate CreateApproximated(GDMDate date, GDMApproximated approximated)
         {
             GDMDate result = new GDMDate();
@@ -181,36 +183,17 @@ public static GDMDateRange CreateRange(GDMDate dateAfter, GDMDate dateBefore)
             return result;
         }
 
-
-        public static void GetDateRange(GDMCustomDate date, out GDMDate dateStart, out GDMDate dateEnd)
-        {
-            if (date is GDMDateRange) {
-                GDMDateRange dtRange = date as GDMDateRange;
-                dateStart = dtRange.After;
-                dateEnd = dtRange.Before;
-            } else if (date is GDMDatePeriod) {
-                GDMDatePeriod dtPeriod = date as GDMDatePeriod;
-                dateStart = dtPeriod.DateFrom;
-                dateEnd = dtPeriod.DateTo;
-            } else {
-                var dt = date as GDMDate;
-                dateStart = dt;
-                dateEnd = dt;
-            }
-        }
-
         public static GDMDatePeriod GetIntersection(GDMCustomDate range1, GDMCustomDate range2)
         {
             if (range1 == null || range1.IsEmpty() || range2 == null || range2.IsEmpty())
                 return GDMDatePeriod.Empty;
 
             GDMDate r1start, r1end, r2start, r2end;
+            range1.GetDateRange(out r1start, out r1end);
+            range2.GetDateRange(out r2start, out r2end);
 
-            GetDateRange(range1, out r1start, out r1end);
-            GetDateRange(range2, out r2start, out r2end);
-
-            GDMDate greatestStart = r1start.CompareTo(r2start) > 0 ? r1start : r2start;
-            GDMDate smallestEnd = r1end.CompareTo(r2end) < 0 ? r1end : r2end;
+            GDMDate greatestStart = r1start.IsEmpty() ? r2start : (r2start.IsEmpty() ? r1start : (r1start.CompareTo(r2start) > 0) ? r1start : r2start);
+            GDMDate smallestEnd = r1end.IsEmpty() ? r2end : (r2end.IsEmpty() ? r1end : (r1end.CompareTo(r2end) < 0) ? r1end : r2end);
 
             // no intersection
             if (greatestStart.CompareTo(smallestEnd) > 0) {

diff --git a/projects/GKCore/GDModel/GDMDate.cs b/projects/GKCore/GDModel/GDMDate.cs
@@ -36,6 +36,8 @@ namespace GDModel
     /// </summary>
     public class GDMDate : GDMCustomDate
     {
+        public static readonly GDMDate Empty = new GDMDate();
+
         public const int UNKNOWN_YEAR = -1;
 
         private GDMApproximated fApproximated;
@@ -585,5 +587,11 @@ public override string GetDisplayStringExt(DateFormat format, bool sign, bool sh
         }
 
         #endregion
+
+        public override void GetDateRange(out GDMDate dateStart, out GDMDate dateEnd)
+        {
+            dateStart = this;
+            dateEnd = this;
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMDatePeriod.cs b/projects/GKCore/GDModel/GDMDatePeriod.cs
@@ -155,5 +155,11 @@ public override string GetDisplayStringExt(DateFormat format, bool sign, bool sh
 
             return result;
         }
+
+        public override void GetDateRange(out GDMDate dateStart, out GDMDate dateEnd)
+        {
+            dateStart = fDateFrom;
+            dateEnd = fDateTo;
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMDateRange.cs b/projects/GKCore/GDModel/GDMDateRange.cs
@@ -168,5 +168,11 @@ public override string GetDisplayStringExt(DateFormat format, bool sign, bool sh
 
             return result;
         }
+
+        public override void GetDateRange(out GDMDate dateStart, out GDMDate dateEnd)
+        {
+            dateStart = fDateAfter;
+            dateEnd = fDateBefore;
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMDateValue.cs b/projects/GKCore/GDModel/GDMDateValue.cs
@@ -164,5 +164,20 @@ public override string GetDisplayStringExt(DateFormat format, bool sign, bool sh
             string result = (fValue == null) ? string.Empty : fValue.GetDisplayStringExt(format, sign, showCalendar, shorten);
             return result;
         }
+
+        public override string ToString()
+        {
+            return GetDisplayStringExt(DateFormat.dfDD_MM_YYYY, true, true, false);
+        }
+
+        public override void GetDateRange(out GDMDate dateStart, out GDMDate dateEnd)
+        {
+            if (fValue == null) {
+                dateStart = null;
+                dateEnd = null;
+            } else {
+                fValue.GetDateRange(out dateStart, out dateEnd);
+            }
+        }
     }
 }