Added comment for region processing.

[philipp/winterrodeln/wrfeed.git] / wrfeed / controllers / berichte.py

diff --git a/wrfeed/controllers/berichte.py b/wrfeed/controllers/berichte.py
index 7018a9dfd9bc37b837e11d9924b21ef5d19f8198..878a83cf87df41d5a3faa642e98414d05658f5e5 100644 (file)
--- a/wrfeed/controllers/berichte.py
+++ b/wrfeed/controllers/berichte.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7

 # -*- coding: UTF-8 -*-
 """Creates an Atom-Feed for single or multiple winterrodeln sled reports.
 
 # -*- coding: UTF-8 -*-
 """Creates an Atom-Feed for single or multiple winterrodeln sled reports.
 


@@ -6,6 +6,7 @@ Format:
     http://www.winterrodeln.org/feed/berichte/alle
     http://www.winterrodeln.org/feed/berichte/bahn/kemater_alm
     http://www.winterrodeln.org/feed/berichte/bahnen/5+280+251
     http://www.winterrodeln.org/feed/berichte/alle
     http://www.winterrodeln.org/feed/berichte/bahn/kemater_alm
     http://www.winterrodeln.org/feed/berichte/bahnen/5+280+251

+    http://www.winterrodeln.org/feed/berichte/region/osttirol

 See:
     http://www.atompub.org/
     http://effbot.org/zone/element.htm
 See:
     http://www.atompub.org/
     http://effbot.org/zone/element.htm


@@ -16,6 +17,7 @@ import datetime
 from xml.etree.ElementTree import Element, SubElement, tostring
 
 from sqlalchemy.engine import create_engine
 from xml.etree.ElementTree import Element, SubElement, tostring
 
 from sqlalchemy.engine import create_engine

+from osgeo import ogr

 
 import logging
 
 
 import logging
 


@@ -28,9 +30,10 @@ from wrfeed.lib.base import BaseController, render
 log = logging.getLogger(__name__)
 
 
 log = logging.getLogger(__name__)
 
 

-def create_feed(page_title=None, page_ids=None):
+def create_feed(page_title=None, page_ids=None, region_name=None):

     """If a page_title is given, only the reports for the given sledrun are shown.
     If a list of page_ids is given, only the reports for the selected pages are shown.
     """If a page_title is given, only the reports for the given sledrun are shown.
     If a list of page_ids is given, only the reports for the selected pages are shown.

+    If a region name (lower case) is given, the reports just for this region are shown.

     Otherwise, all reports are shown."""
 
     engine = create_engine(config['sqlalchemy.url'])
     Otherwise, all reports are shown."""
 
     engine = create_engine(config['sqlalchemy.url'])


@@ -56,6 +59,23 @@ def create_feed(page_title=None, page_ids=None):
         where += " or ".join(['wrreport.page_id=%s' for page_id in page_ids])
         where += ')'
         params += map(str, page_ids)
         where += " or ".join(['wrreport.page_id=%s' for page_id in page_ids])
         where += ')'
         params += map(str, page_ids)

+    elif not region_name is None:
+        # a name of a region is given
+        # (1) find out whether the region exists
+        subselect = 'select aswkb(border) as border_wkb from wrregion where name=lcase(%s)'
+        subresult = conn.execute(subselect, region_name)
+        if subresult.rowcount == 0:
+            # no region with such a name
+            raise webob.exc.HTTPNotFound()
+        assert subresult.rowcount == 1
+        row = subresult.fetchone()
+        # (2) now we have the border
+        border_wkb = row['border_wkb'] # border as WKB
+        where += ' and contains(geomfromwkb(%s), point(position_longitude, position_latitude))'
+        params += [border_wkb]
+        # the following variables are needed for the additional filtering below
+        border = ogr.CreateGeometryFromWkb(border_wkb)
+        point = ogr.Geometry(ogr.wkbPoint)

     else:
         # user wants to have all reports
         pass
     else:
         # user wants to have all reports
         pass


@@ -70,6 +90,8 @@ def create_feed(page_title=None, page_ids=None):
         feed_id.text = url(qualified=True, controller='berichte', action='bahn', id=page_title)
     elif not page_ids is None:
         feed_id.text = url(qualified=True, controller='berichte', action='bahnen', id="+".join(map(str, page_ids)))
         feed_id.text = url(qualified=True, controller='berichte', action='bahn', id=page_title)
     elif not page_ids is None:
         feed_id.text = url(qualified=True, controller='berichte', action='bahnen', id="+".join(map(str, page_ids)))

+    elif not region_name is None:
+        feed_id.text = url(qualified=True, controller='berichte', action='region', id=region_name)

     else:
         feed_id.text = url(qualified=True, controller='berichte', action='alle')
     feed_updated = SubElement(feed, "updated")
     else:
         feed_id.text = url(qualified=True, controller='berichte', action='alle')
     feed_updated = SubElement(feed, "updated")


@@ -78,6 +100,15 @@ def create_feed(page_title=None, page_ids=None):
     last_updated = None
     for row in result:
         page_id, page_title, report_id, date_report, date_entry, condition, description, author_name, author_userid, author_username, lon, lat = row
     last_updated = None
     for row in result:
         page_id, page_title, report_id, date_report, date_entry, condition, description, author_name, author_userid, author_username, lon, lat = row

+
+        if not region_name is None:
+            # mysql 5.5 doesn't have specification conform geospacial functions.
+            # http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html
+            # therefore we have to do further filtering here.
+            point.SetPoint(0, lon, lat)
+            if not point.Within(border):
+                continue
+

         page_title_url = page_title.replace(u' ', u'_')
         entry = SubElement(feed, "entry")
         entry_title = SubElement(entry, "title")
         page_title_url = page_title.replace(u' ', u'_')
         entry = SubElement(feed, "entry")
         entry_title = SubElement(entry, "title")


@@ -162,3 +193,11 @@ class BerichteController(BaseController):
             abort(400) # bad request
         response.content_type = 'application/atom+xml'
         return create_feed(page_ids=page_ids)
             abort(400) # bad request
         response.content_type = 'application/atom+xml'
         return create_feed(page_ids=page_ids)

+
+    def region(self, id):
+        """Handles URLs like
+        http://www.winterrodeln.org/feed/berichte/region/osttirol
+        """
+        response.content_type = 'application/atom+xml'
+        return create_feed(region_name=id)
+