Merge pull request #32 from Skippern/none-object

relation without shape -> None

fetch_kml.py

@@ -25,13 +25,19 @@
 gpx_store.init_cache()
 
 
-tags = gpx_data.load_tags(args.obj_id, args.obj_level)
+try:
+    tags = gpx_data.load_tags(args.obj_id, args.obj_level)
+except:
+    tags = dict({ 'name': 'unknown', })
 
 name = str(args.obj_id)
 if 'name:en' in tags:
     name = tags['name:en']
 else:
-    name = tags['name']
+    try:
+        name = tags['name']
+    except:
+        pass
 
 geos = gpx_data.load_geo_shape(args.obj_id, args.obj_level, name)
 gpx_store.store_kml(geos, args.obj_id, args.obj_level, name)

gpx/gpx_data.py

@@ -36,6 +36,10 @@ def geojson_to_geometry(data, name):
 
     ###########################
 
+    if len(my_ways) == 0:
+        __LOG.critical("Relation have no shape: %s" % name )
+        return None
+
     rings = []
     lines = []
 

gpx/gpx_store.py

@@ -148,6 +148,9 @@ def store_wkb(obj, obj_id, admin_level):
     :param int admin_level: The subdir (usually the administrative level)
     :return: None
     """
+    if obj == None:
+        return None
+
     filename = '%s/geos/%s/%s.wkb' % (cache_dir, admin_level, obj_id)
 
     __LOG.info(u'store_wkb: storing a %s with size: %s ', obj.geom_type, obj.area)

gpx/gpx_utils.py

@@ -109,6 +109,8 @@ def test_object(track, obj):
     :param obj: The polygon object to test against.
     :return bool: If the object
     """
+    if obj == None:
+        return False
     if track.within(obj):
         return True
     if track.intersects(obj):