Merge branch 'develop' of https://github.com/jacquestardie/seattle in…

…to develop * 'develop' of https://github.com/jacquestardie/seattle: Fix neighborhood update over water issue.
recombinators · Feb 27, 2015 · c50191f · c50191f
2 parents dd4fba7 + 48650cb
commit c50191f
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/seattle/seattle/models.py b/seattle/seattle/models.py
@@ -26,11 +26,14 @@ class Neighborhoods_Model(Base):
     @classmethod
     def neighborhood(cls, lat, lon):
         """Output neighborhood that contains lat lon."""
-        return (DBSession.query(cls)
-                .filter(func.ST_Within(func.ST_SetSRID(func
-                        .ST_MakePoint(lon, lat), 4236), func
-                    .ST_SetSRID(cls.geom, 4236))).one().name
-                )
+        try:
+            return (DBSession.query(cls)
+                    .filter(func.ST_Within(func.ST_SetSRID(func
+                            .ST_MakePoint(lon, lat), 4236), func
+                        .ST_SetSRID(cls.geom, 4236))).one().name
+                    )
+        except:
+            return u'----'
 
 
 class Incidents_Model(Base):