Updated Place Format editor and displayer etc.

Author: prculley

gramps/gen/db/generic.py

@@ -49,6 +49,7 @@
                KEY_TO_NAME_MAP, DBMODE_R, DBMODE_W)
 from .utils import write_lock_file, clear_lock_file
 from .exceptions import DbVersionError, DbUpgradeRequiredError
+from ..display.place import displayer as _pd
 from ..errors import HandleError
 from ..utils.callback import Callback
 from ..updatecallback import UpdateCallback
@@ -633,6 +634,7 @@ def load(self, directory, callback=None, mode=DBMODE_W,
         self.placeabbr_types = self._get_metadata('placeabbr_types', set())
         self.placehier_types = self._get_metadata('placehier_types', set())
         PlaceType.set_db_data(self._get_metadata('place_types_data', None))
+        _pd.load_formats(self._get_metadata('place_formats', []))
 
         # surname list
         self.surname_list = self.get_surname_list()
@@ -2319,6 +2321,9 @@ def save_place_types(self, close=False):
         """
         self._set_metadata('place_types_data', PlaceType.get_db_data(close))
 
+    def save_place_formats(self, formats):
+        self._set_metadata('place_formats', formats)
+
     def get_default_handle(self):
         return self._get_metadata("default-person-handle", None)
 

gramps/gen/display/place.py

@@ -178,12 +178,16 @@ def get_handle_referents(self):
     def set_type_for_place(self, place):
         """
         Set the hierarchy type for the PlaceRef based on the type of the
-        enclosing place.  If place type is unknown (new place), set to ADMIN.
+        enclosing place.  If place type is a likely ADMIN candidate,
+        set to ADMIN.
         If ref.type is already set, skip.
         """
         if self.type == PlaceHierType.UNKNOWN:
             p_type = place.get_type()
-            if p_type.value == PlaceType.UNKNOWN:
+            g_mask = (PlaceType.G_PLACE | PlaceType.G_UNPOP |
+                      PlaceType.G_REGION | PlaceType.G_COUNTRY |
+                      PlaceType.G_BUILDING)
+            if p_type.value > PlaceType.UNKNOWN or p_type & g_mask:
                 self.type.set(PlaceHierType.ADMIN)
 
     def set_type(self, p_type):

gramps/gen/lib/placeref.py

@@ -33,14 +33,15 @@
 #-------------------------------------------------------------------------
 def get_location_list(db, place, date=None, lang='', hier=PlaceHierType.ADMIN):
     """
-    Return a list of place names and types for display.
+    Return a list of place names, types, and handles for display.
     the list is in order of smallest (most enclosed) to largest place.
     The list will match the date, lang and hierarchy type.
     """
     if date is None:
         date = __get_latest_date(place)
     visited = [place.handle]
-    lines = [(__get_name(place, date, lang), __get_type(place, date))]
+    name, abbrs = __get_name(place, date, lang)
+    lines = [(name, __get_type(place, date), place.handle, abbrs)]
     while True:
         handle = None
         for placeref in place.get_placeref_list():
@@ -55,19 +56,26 @@ def get_location_list(db, place, date=None, lang='', hier=PlaceHierType.ADMIN):
         if place is None:
             break
         visited.append(handle)
-        lines.append((__get_name(place, date, lang), __get_type(place, date)))
+        name, abbrs = __get_name(place, date, lang)
+        lines.append((name, __get_type(place, date), place.handle, abbrs))
     return lines
 
+
 def __get_name(place, date, lang):
+    """ Gets the name for a given date and language.  Returns the str name and
+    a list of abbreviations (PlaceAbbrevType)
+    """
     endonym = None
     for place_name in place.get_names():
         name_date = place_name.get_date_object()
         if name_date.is_empty() or date.match_exact(name_date):
             if place_name.get_language() == lang:
-                return place_name.get_value()
+                return place_name.get_value(), place_name.get_abbrevs()
             if endonym is None:
                 endonym = place_name.get_value()
-    return endonym if endonym is not None else '?'
+                abbs = place_name.get_abbrevs()
+    return (endonym, abbs) if endonym is not None else ('?', [])
+
 
 def __get_type(place, date):
     for place_type in place.get_types():
@@ -76,6 +84,7 @@ def __get_type(place, date):
             return place_type
     return PlaceType(PlaceType.UNKNOWN)
 
+
 def __get_latest_date(place):
     latest_date = None
     for place_name in place.get_names():
@@ -103,9 +112,9 @@ def get_main_location(db, place, date=None):
     result as a dictionary of place types and names.
     """
     return dict([(int(place_type), name)
-                    for name, place_type
-                    in get_location_list(db, place, date)
-                    if not place_type.is_custom()])
+                 for name, place_type, dummy_hndl, dummy_abbrs
+                 in get_location_list(db, place, date)
+                 if not place_type.is_custom()])
 
 #-------------------------------------------------------------------------
 #

gramps/gen/utils/location.py

@@ -117,7 +117,7 @@ def make_unknown(class_arg, explanation, class_func, commit_func, transaction,
             obj.set_type(EventType.UNKNOWN)
     elif isinstance(obj, Place):
         obj.set_title(_('Unknown'))
-        obj.name.set_value(_('Unknown'))
+        obj.set_name.PlaceName(value=_('Unknown'))
     elif isinstance(obj, Source):
         obj.set_title(_('Unknown'))
     elif isinstance(obj, Citation):

gramps/gen/utils/unknown.py

@@ -1845,7 +1845,7 @@ def _cursor_changed(self, _obj):
         name = model.get_value(node, 0)
         self.ptype_entry.set_text(name)
         rem_btn = self.top.get_object("remove")
-        if typ in self.ptype_in_use or typ > 0:
+        if typ in self.ptype_in_use or typ >= 0:
             rem_btn.set_sensitive(False)
         else:
             rem_btn.set_sensitive(True)
@@ -1982,6 +1982,9 @@ def group_entry_focus_out(self, entry, _event):
 
     def remove_group(self, _obj, group):
         """ Remove a group (right click over groups checkbox)"""
+        # don't remove standard Groups!
+        if group <= PlaceType.G_OTHER:
+            return
         # find and remove references to this group in types
         for typ, tup in PlaceType.DATAMAP.items():
             new_tup = (tup[0], tup[1] & ~group, tup[2])

gramps/gui/configure.py

@@ -37,7 +37,7 @@
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.sgettext
-from gramps.gen.lib import NoteType, Place
+from gramps.gen.lib import NoteType, Place, PlaceName
 from gramps.gen.db import DbTxn
 from .editprimary import EditPrimary
 from .displaytabs import (PlaceRefEmbedList, PlaceNameEmbedList,
@@ -75,6 +75,8 @@
 class EditPlace(EditPrimary):
     """ Edit the place """
     def __init__(self, dbstate, uistate, track, place, callback=None):
+        if not place.get_names():
+            place.add_name(PlaceName())
         EditPrimary.__init__(self, dbstate, uistate, track, place,
                              dbstate.db.get_place_from_handle,
                              dbstate.db.get_place_from_gramps_id, callback)