Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Geography: KML media objects not shown on map. (#577)

Browse Source 
Geography doesn't conform to the relative paths
If a place has no coordinates, KML files are not displayed.

Fixes #10487
This commit is contained in:
Serge Noiraud 2018-03-10 03:25:25 +01:00 committed by Sam Manzi
parent ae11eceef7
commit 2a297623f2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps/plugins/lib/maps/geography.py
View File

@ -54,6 +54,7 @@ from gramps.gen.const import HOME_DIR
from gramps.gen.config import config from gramps.gen.config import config
from gramps.gui.editors import EditPlace, EditEvent, EditFamily, EditPerson from gramps.gui.editors import EditPlace, EditEvent, EditFamily, EditPerson
from gramps.gui.selectors.selectplace import SelectPlace from gramps.gui.selectors.selectplace import SelectPlace
from gramps.gen.utils.file import media_path_full
import gi import gi
gi.require_version('OsmGpsMap', '1.0') gi.require_version('OsmGpsMap', '1.0')
@ -866,6 +867,7 @@ class GeoGraphyView(OsmGps, NavigationView):
path = media_obj.get_path() path = media_obj.get_path()
name, extension = os.path.splitext(path) name, extension = os.path.splitext(path)
if extension == ".kml": if extension == ".kml":
path = media_path_full(self.dbstate.db, path)
if os.path.isfile(path): if os.path.isfile(path):
self.kml_layer.add_kml(path) self.kml_layer.add_kml(path)

2
gramps/plugins/view/geoplaces.py
View File

@ -252,6 +252,7 @@ class GeoPlaces(GeoGraphyView):
longitude = place.get_longitude() longitude = place.get_longitude()
latitude = place.get_latitude() latitude = place.get_latitude()
latitude, longitude = conv_lat_lon(latitude, longitude, "D.D8") latitude, longitude = conv_lat_lon(latitude, longitude, "D.D8")
self.load_kml_files(place)
# place.get_longitude and place.get_latitude return # place.get_longitude and place.get_latitude return
# one string. We have coordinates when the two values # one string. We have coordinates when the two values
# contains non null string. # contains non null string.
@ -266,7 +267,6 @@ class GeoPlaces(GeoGraphyView):
None, # family.gramps_id None, # family.gramps_id
color=self.plc_color[int(place.get_type())+1] color=self.plc_color[int(place.get_type())+1]
) )
self.load_kml_files(place)
def _createmap(self, place_x): def _createmap(self, place_x):
""" """