Skip to content

Commit 7632e75

Browse files
committed
Fix missing parameters for exception debugging
1 parent dd1b116 commit 7632e75

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

hikingmap/trackfinder.py

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ def calculate_pages(self, tracks):
7575
track_order = [ t[0].to_string() for t in trackpermutation ]
7676
print("Error while calculating permutation %d, track order = %s" % \
7777
(permindex, " // ".join(track_order)))
78-
# TODO
7978
self.__debug_exception()
8079
raise
8180

@@ -138,22 +137,30 @@ def __add_next_point(self, prev_coord, coord):
138137
return coord
139138

140139

141-
def __debug_exception(self, rendercommand, renderoptions, output_format, gpxfiles, verbose):
140+
def __debug_exception(self):
142141
# output already calculated areas
143142
for area in self.renderedareas:
144143
print(area.to_string())
145144

146145
# render overview map for visualization
147146
self.pages = self.renderedareas
148-
self.add_overview_page()
149-
self.pages[0].render(rendercommand, renderoptions, \
150-
'debug_overview.' + output_format, \
151-
self.tempoverviewfile, gpxfiles, verbose)
147+
self.__add_overview_page('debug_overview.gpx')
148+
print("A debug overview map can be generated by running:")
149+
print(("[rendercommand] --pagewidth %.2f --pageheight %.2f -b debug_overview " + \
150+
"-t debug_overview.gpx -v [renderoptions] [gpxfiles] " + \
151+
"bbox -o %.15f -a %.15f -O %.15f -A %.15f") % \
152+
(self.pagewidth, self.pageheight, \
153+
self.pages[0].minlon, self.pages[0].minlat, \
154+
self.pages[0].maxlon, self.pages[0].maxlat))
152155

153156

154157
# Add an overview page on index 0 and write a temporary gpx file with the page layout
155158
# which will be deleted automatically in the destructor
156159
def add_overview_page(self):
160+
self.__add_overview_page()
161+
162+
163+
def __add_overview_page(self, filename=None):
157164
xsischemaloc_qname = \
158165
etree.QName('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation')
159166
xsischemaloc_value = \
@@ -189,8 +196,13 @@ def add_overview_page(self):
189196

190197
gpxtree = etree.ElementTree(gpxnode)
191198

192-
(fd, self.tempoverviewfile) = tempfile.mkstemp(prefix = "hikingmap_temp_overview", \
193-
suffix = ".gpx")
199+
fd = None
200+
if filename is None:
201+
(fd, self.tempoverviewfile) = tempfile.mkstemp(prefix = "hikingmap_temp_overview", \
202+
suffix = ".gpx")
203+
else:
204+
fd = os.open(filename, os.O_RDWR | os.O_CREAT | os.O_TRUNC)
205+
194206
f = os.fdopen(fd, 'wb')
195207
gpxtree.write(f, encoding='utf-8', xml_declaration=True)
196208
f.close()

test/test.t

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,28 +73,28 @@ nooverview:
7373
| Test rendering:
7474
| bbox (0.201255 36.242158 - 0.312732 36.371175)
7575
| pagesize 20.0cm x 28.7cm
76-
| filename /home/roel/hiking/hikingmap/test/detail.1.pdf
76+
| filename /home/roel/hiking/hikingmap/test/detail.0.pdf
7777
| tempwaypointfile = .*hikingmap_temp_waypoints.*.gpx (re)
7878
| gpxfiles = /home/roel/hiking/hikingmap/test/test3.gpx
7979
detail map 2 (landscape): 0.109946,36.355882 - 0.270172,36.445788
8080
| Test rendering:
8181
| bbox (0.109946 36.355882 - 0.270172 36.445788)
8282
| pagesize 28.7cm x 20.0cm
83-
| filename /home/roel/hiking/hikingmap/test/detail.2.pdf
83+
| filename /home/roel/hiking/hikingmap/test/detail.1.pdf
8484
| tempwaypointfile = .*hikingmap_temp_waypoints.*.gpx (re)
8585
| gpxfiles = /home/roel/hiking/hikingmap/test/test3.gpx
8686
detail map 3 (landscape): -0.023655,36.426579 - 0.136694,36.516486
8787
| Test rendering:
8888
| bbox (-0.023655 36.426579 - 0.136694 36.516486)
8989
| pagesize 28.7cm x 20.0cm
90-
| filename /home/roel/hiking/hikingmap/test/detail.3.pdf
90+
| filename /home/roel/hiking/hikingmap/test/detail.2.pdf
9191
| tempwaypointfile = .*hikingmap_temp_waypoints.*.gpx (re)
9292
| gpxfiles = /home/roel/hiking/hikingmap/test/test3.gpx
9393
detail map 4 (portrait): -0.031275,36.489921 - 0.080589,36.618937
9494
| Test rendering:
9595
| bbox (-0.031275 36.489921 - 0.080589 36.618937)
9696
| pagesize 20.0cm x 28.7cm
97-
| filename /home/roel/hiking/hikingmap/test/detail.4.pdf
97+
| filename /home/roel/hiking/hikingmap/test/detail.3.pdf
9898
| tempwaypointfile = .*hikingmap_temp_waypoints.*.gpx (re)
9999
| gpxfiles = /home/roel/hiking/hikingmap/test/test3.gpx
100100
Removing temp file .*hikingmap_temp_waypoints.*.gpx (re)

0 commit comments

Comments
 (0)