From cfd59da40fe172359f493cc0399b4a133c4b290c Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Fri, 8 Jun 2012 23:56:16 +0000 Subject: [PATCH] GEPS008: Moved PlaceUtils module svn: r19805 --- po/POTFILES.in | 4 +++- src/Makefile.am | 3 +-- src/gen/filters/rules/place/_inlatlonneighborhood.py | 8 ++++---- src/gen/utils/Makefile.am | 3 ++- src/gen/utils/__init__.py | 5 +++-- src/{PlaceUtils.py => gen/utils/place.py} | 0 src/gui/editors/editplace.py | 2 +- src/gui/views/treemodels/placemodel.py | 2 +- src/plugins/export/ExportGedcom.py | 2 +- src/plugins/gramplet/EditExifMetadata.py | 2 +- src/plugins/gramplet/PlaceDetails.py | 2 +- src/plugins/lib/libmapservice.py | 2 +- src/plugins/lib/libmetadata.py | 2 +- src/plugins/view/geoclose.py | 2 +- src/plugins/view/geoevents.py | 2 +- src/plugins/view/geofamclose.py | 2 +- src/plugins/view/geofamily.py | 2 +- src/plugins/view/geomoves.py | 2 +- src/plugins/view/geoperson.py | 2 +- src/plugins/view/geoplaces.py | 2 +- src/plugins/webreport/NarrativeWeb.py | 2 +- 21 files changed, 28 insertions(+), 25 deletions(-) rename src/{PlaceUtils.py => gen/utils/place.py} (100%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 51c9169b8..326966b00 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,7 +5,6 @@ src/const.py src/gramps.py src/LdsUtils.py -src/PlaceUtils.py src/TransUtils.py src/Utils.py @@ -324,6 +323,9 @@ src/gen/proxy/private.py src/gen/simple/_simpleaccess.py src/gen/simple/_simpletable.py +# gen.utils +src/gen/utils/place.py + # gui - GUI code src/gui/aboutdialog.py src/gui/clipboard.py diff --git a/src/Makefile.am b/src/Makefile.am index 71e5fefd7..61addbca1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,8 +21,7 @@ gdir_PYTHON = \ LdsUtils.py \ MacTransUtils.py\ TransUtils.py\ - Utils.py\ - PlaceUtils.py + Utils.py # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo diff --git a/src/gen/filters/rules/place/_inlatlonneighborhood.py b/src/gen/filters/rules/place/_inlatlonneighborhood.py index 9768f2f4f..e102c6717 100644 --- a/src/gen/filters/rules/place/_inlatlonneighborhood.py +++ b/src/gen/filters/rules/place/_inlatlonneighborhood.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gen.filters.rules import Rule -import PlaceUtils +from gen.utils import conv_lat_lon #------------------------------------------------------------------------- # @@ -82,7 +82,7 @@ class InLatLonNeighborhood(Rule): self.list[1] = '0.0' #we allow a band instead of a triangle - self.lat, self.lon = PlaceUtils.conv_lat_lon(self.list[0],self.list[1],"D.D8") + self.lat, self.lon = conv_lat_lon(self.list[0],self.list[1],"D.D8") if self.lat is not None and self.lon is not None : self.lat = float(self.lat) self.lon = float(self.lon) @@ -138,8 +138,8 @@ class InLatLonNeighborhood(Rule): if not ( place.get_latitude().strip and place.get_longitude().strip() ): return False - latpl, lonpl = PlaceUtils.conv_lat_lon(place.get_latitude(), - place.get_longitude(),"D.D8") + latpl, lonpl = conv_lat_lon(place.get_latitude(), + place.get_longitude(), "D.D8") if latpl and lonpl : latpl = float(latpl) lonpl = float(lonpl) diff --git a/src/gen/utils/Makefile.am b/src/gen/utils/Makefile.am index 4bce71682..127b6a82f 100644 --- a/src/gen/utils/Makefile.am +++ b/src/gen/utils/Makefile.am @@ -11,7 +11,8 @@ pkgpython_PYTHON = \ callback.py \ callman.py \ configmanager.py \ - fallback.py + fallback.py \ + place.py pkgpyexecdir = @pkgpyexecdir@/gen/utils diff --git a/src/gen/utils/__init__.py b/src/gen/utils/__init__.py index 4e859e08a..89e62ad01 100644 --- a/src/gen/utils/__init__.py +++ b/src/gen/utils/__init__.py @@ -25,6 +25,7 @@ Generic utilities useful for users of the gen package """ -from fallback import * -from configmanager import ConfigManager from callback import Callback +from configmanager import ConfigManager +from fallback import * +from place import conv_lat_lon diff --git a/src/PlaceUtils.py b/src/gen/utils/place.py similarity index 100% rename from src/PlaceUtils.py rename to src/gen/utils/place.py diff --git a/src/gui/editors/editplace.py b/src/gui/editors/editplace.py index 787e85a1d..91d8e87ba 100644 --- a/src/gui/editors/editplace.py +++ b/src/gui/editors/editplace.py @@ -51,7 +51,7 @@ from displaytabs import (GrampsTab, LocationEmbedList, CitationEmbedList, GalleryTab, NoteTab, WebEmbedList, PlaceBackRefList) from gui.widgets import MonitoredEntry, PrivacyButton from gen.errors import ValidationError -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gui.dialog import ErrorDialog from gui.glade import Glade diff --git a/src/gui/views/treemodels/placemodel.py b/src/gui/views/treemodels/placemodel.py index ae628177f..cb2daa163 100644 --- a/src/gui/views/treemodels/placemodel.py +++ b/src/gui/views/treemodels/placemodel.py @@ -47,7 +47,7 @@ import gtk # #------------------------------------------------------------------------- import Utils -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gui.views.treemodels.flatbasemodel import FlatBaseModel from gui.views.treemodels.treebasemodel import TreeBaseModel diff --git a/src/plugins/export/ExportGedcom.py b/src/plugins/export/ExportGedcom.py index 8eea4c3c1..521943b54 100644 --- a/src/plugins/export/ExportGedcom.py +++ b/src/plugins/export/ExportGedcom.py @@ -48,7 +48,7 @@ from gen.errors import DatabaseError from gui.plug.export import WriterOptionBox from gen.updatecallback import UpdateCallback from Utils import media_path_full -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon #------------------------------------------------------------------------- # diff --git a/src/plugins/gramplet/EditExifMetadata.py b/src/plugins/gramplet/EditExifMetadata.py index 8f3fe30bd..cc388b0d5 100644 --- a/src/plugins/gramplet/EditExifMetadata.py +++ b/src/plugins/gramplet/EditExifMetadata.py @@ -65,7 +65,7 @@ from gen.lib import Date import gen.mime import Utils -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gen.db import DbTxn diff --git a/src/plugins/gramplet/PlaceDetails.py b/src/plugins/gramplet/PlaceDetails.py index 5a4a7087e..b1c3312cc 100644 --- a/src/plugins/gramplet/PlaceDetails.py +++ b/src/plugins/gramplet/PlaceDetails.py @@ -22,7 +22,7 @@ from gen.plug import Gramplet from gui.widgets import Photo from gen.ggettext import gettext as _ -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon import Utils import gtk import pango diff --git a/src/plugins/lib/libmapservice.py b/src/plugins/lib/libmapservice.py index bb7f8804e..7fd6f211b 100644 --- a/src/plugins/lib/libmapservice.py +++ b/src/plugins/lib/libmapservice.py @@ -35,7 +35,7 @@ Base class for map services. Example: open place in openstreetmap.org # GRAMPS modules # #------------------------------------------------------------------------- -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gui.display import display_url class MapService(): diff --git a/src/plugins/lib/libmetadata.py b/src/plugins/lib/libmetadata.py index 61851f5c9..c2cda4dd1 100644 --- a/src/plugins/lib/libmetadata.py +++ b/src/plugins/lib/libmetadata.py @@ -24,7 +24,7 @@ from gui.listmodel import ListModel from gen.ggettext import gettext as _ -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from fractions import Fraction import gen.lib import gen.datehandler diff --git a/src/plugins/view/geoclose.py b/src/plugins/view/geoclose.py index b0274d748..853800ad2 100644 --- a/src/plugins/view/geoclose.py +++ b/src/plugins/view/geoclose.py @@ -52,7 +52,7 @@ import gen.lib import config import gen.datehandler from gen.display.name import displayer as _nd -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gui.views.navigationview import NavigationView from gui.views.bookmarks import PersonBookmarks from maps import constants diff --git a/src/plugins/view/geoevents.py b/src/plugins/view/geoevents.py index c1331899d..fbb78cd9b 100644 --- a/src/plugins/view/geoevents.py +++ b/src/plugins/view/geoevents.py @@ -59,7 +59,7 @@ import Utils import config import gen.datehandler from gen.display.name import displayer as _nd -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gui.views.pageview import PageView from gui.editors import EditPlace from gui.selectors.selectplace import SelectPlace diff --git a/src/plugins/view/geofamclose.py b/src/plugins/view/geofamclose.py index 2181e5e07..21bb45a51 100644 --- a/src/plugins/view/geofamclose.py +++ b/src/plugins/view/geofamclose.py @@ -52,7 +52,7 @@ import gen.lib import config import gen.datehandler from gen.display.name import displayer as _nd -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gui.views.navigationview import NavigationView from gui.views.bookmarks import FamilyBookmarks from maps import constants diff --git a/src/plugins/view/geofamily.py b/src/plugins/view/geofamily.py index 6bb98f658..047de002e 100644 --- a/src/plugins/view/geofamily.py +++ b/src/plugins/view/geofamily.py @@ -59,7 +59,7 @@ import Utils import config import gen.datehandler from gen.display.name import displayer as _nd -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gui.views.pageview import PageView from gui.editors import EditPlace from gui.selectors.selectplace import SelectPlace diff --git a/src/plugins/view/geomoves.py b/src/plugins/view/geomoves.py index a8ef99e22..ee3be88b1 100644 --- a/src/plugins/view/geomoves.py +++ b/src/plugins/view/geomoves.py @@ -55,7 +55,7 @@ import gen.lib import config import gen.datehandler from gen.display.name import displayer as _nd -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gui.views.navigationview import NavigationView from gui.views.bookmarks import PersonBookmarks from maps import constants diff --git a/src/plugins/view/geoperson.py b/src/plugins/view/geoperson.py index 2a5e70c60..f2988f94b 100644 --- a/src/plugins/view/geoperson.py +++ b/src/plugins/view/geoperson.py @@ -60,7 +60,7 @@ import Utils import config import gen.datehandler from gen.display.name import displayer as _nd -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gui.views.pageview import PageView from gui.editors import EditPlace from gui.selectors.selectplace import SelectPlace diff --git a/src/plugins/view/geoplaces.py b/src/plugins/view/geoplaces.py index dce0cc661..46e2e47c2 100644 --- a/src/plugins/view/geoplaces.py +++ b/src/plugins/view/geoplaces.py @@ -59,7 +59,7 @@ import gen.lib import Utils import config from gen.display.name import displayer as _nd -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gui.views.pageview import PageView from gui.editors import EditPlace from gui.selectors.selectplace import SelectPlace diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index f9d2fe01b..2ce88eeca 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -105,7 +105,7 @@ from libhtml import Html from libhtmlbackend import HtmlBackend, process_spaces from libgedcom import make_gedcom_date -from PlaceUtils import conv_lat_lon +from gen.utils import conv_lat_lon from gui.pluginmanager import GuiPluginManager from gen.relationship import get_relationship_calculator