Import additional waypoints from GPX.

librestash/lib/adaptors/gpx.py

@@ -43,7 +43,7 @@ class GpxImporter(object):
             session.add(waypoint)
 
             # Is this a geocache?
-            if gpx_waypoint.getElementsByTagName('groundspeak:cache'):
+            if waypoint.type.startswith('Geocache|') and gpx_waypoint.getElementsByTagName('groundspeak:cache'):
                 cache_node = gpx_waypoint.getElementsByTagName('groundspeak:cache')[0]
 
                 # Find or create listing
@@ -107,6 +107,26 @@ class GpxImporter(object):
 
                         # Save log
                         session.add(log)
+            elif waypoint.type.startswith('Waypoint|'):
+                # This is a sub-waypoint
+                # Guess platform prefix
+                if gpx_waypoint.getElementsByTagName('url')[0].firstChild.data.startswith('http://www.geocaching.com'):
+                    platform_prefix = 'GC'
+                    parent_code = platform_prefix + waypoint.code[2:]
+
+                # Find or create parent listing
+                parent_waypoint = session.query(Waypoint).filter_by(code=parent_code).scalar()
+                if not parent_waypoint:
+                    logger.info('Creating new master waypoint and listing for %s' % parent_code)
+                    parent_waypoint = Waypoint(code=parent_code)
+                    parent_listing = Listing(master_waypoint=parent_waypoint, waypoints=[parent_waypoint])
+
+                # Add waypoint
+                logger.info('Linking %s to %s' % (waypoint.code, parent_code))
+                parent_listing.waypoints.append(waypoint)
+
+                # Save listing
+                session.add(parent_listing)
 
         session.commit()