diff options
| -rw-r--r-- | chimere/tests.py | 7 | ||||
| -rw-r--r-- | chimere/tests/data_license | 1 | ||||
| -rw-r--r-- | chimere/tests/eqs7day-M5.xml | 42 | ||||
| -rw-r--r-- | chimere/tests/georss_simple.xml (renamed from chimere/tests/georss.xml) | 0 | ||||
| -rw-r--r-- | chimere/utils.py | 17 |
5 files changed, 59 insertions, 8 deletions
diff --git a/chimere/tests.py b/chimere/tests.py index 0bfd830..1622923 100644 --- a/chimere/tests.py +++ b/chimere/tests.py @@ -208,10 +208,13 @@ class GeoRSSImporterTest(TestCase, ImporterTest): def setUp(self): subcategory_1, subcategory_2 = subcategory_setup() importer1 = Importer.objects.create(importer_type='RSS', - source=test_dir_path+'tests/georss.xml') + source=test_dir_path+'tests/georss_simple.xml') importer1.categories.add(subcategory_1) + importer2 = Importer.objects.create(importer_type='RSS', + source=test_dir_path+'tests/eqs7day-M5.xml') + importer2.categories.add(subcategory_2) - self.marker_importers = [(importer1, 1)] + self.marker_importers = [(importer1, 1), (importer2, 32)] class FeedsTest(TestCase): def setUp(self): diff --git a/chimere/tests/data_license b/chimere/tests/data_license new file mode 100644 index 0000000..bee3231 --- /dev/null +++ b/chimere/tests/data_license @@ -0,0 +1 @@ +eqs7day-M5.xml is a georss feed from the website http://www.usgs.gov/ published under the US public domain diff --git a/chimere/tests/eqs7day-M5.xml b/chimere/tests/eqs7day-M5.xml new file mode 100644 index 0000000..47c12b7 --- /dev/null +++ b/chimere/tests/eqs7day-M5.xml @@ -0,0 +1,42 @@ +<?xml version="1.0"?> +<rss version="2.0" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <channel> + <title>USGS M 5+ Earthquakes</title> + <description>Real-time, worldwide earthquake list for the past 7 days</description> + <link>http://earthquake.usgs.gov/earthquakes/</link> + <dc:publisher>U.S. Geological Survey</dc:publisher> + <pubDate>Fri, 23 Nov 2012 23:21:31 GMT</pubDate> + <item><pubDate>Fri, 23 Nov 2012 20:50:48 GMT</pubDate><title>M 5.0, Solomon Islands</title><description>November 23, 2012 20:50:48 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dxgz.php</link><geo:lat>-10.7326</geo:lat><geo:long>162.7787</geo:long><dc:subject>5</dc:subject><dc:subject>pastday</dc:subject><dc:subject>32.00 km</dc:subject><guid isPermaLink="false">usc000dxgz</guid></item> + <item><pubDate>Fri, 23 Nov 2012 20:21:28 GMT</pubDate><title>M 5.3, near the east coast of Honshu, Japan</title><description>November 23, 2012 20:21:28 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dxfu.php</link><geo:lat>38.2123</geo:lat><geo:long>141.8265</geo:long><dc:subject>5</dc:subject><dc:subject>pastday</dc:subject><dc:subject>47.00 km</dc:subject><guid isPermaLink="false">usc000dxfu</guid></item> + <item><pubDate>Fri, 23 Nov 2012 04:52:39 GMT</pubDate><title>M 5.2, Luzon, Philippines</title><description>November 23, 2012 04:52:39 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dx8j.php</link><geo:lat>14.0515</geo:lat><geo:long>120.7557</geo:long><dc:subject>5</dc:subject><dc:subject>pastday</dc:subject><dc:subject>199.70 km</dc:subject><guid isPermaLink="false">usc000dx8j</guid></item> + <item><pubDate>Fri, 23 Nov 2012 00:40:19 GMT</pubDate><title>M 5.0, Molucca Sea</title><description>November 23, 2012 00:40:19 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dx7p.php</link><geo:lat>1.6378</geo:lat><geo:long>125.8643</geo:long><dc:subject>5</dc:subject><dc:subject>pastday</dc:subject><dc:subject>57.50 km</dc:subject><guid isPermaLink="false">usc000dx7p</guid></item> + <item><pubDate>Thu, 22 Nov 2012 22:44:31 GMT</pubDate><title>M 5.0, southeast of the Loyalty Islands</title><description>November 22, 2012 22:44:31 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dx70.php</link><geo:lat>-22.3513</geo:lat><geo:long>174.0493</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>35.30 km</dc:subject><guid isPermaLink="false">usc000dx70</guid></item> + <item><pubDate>Thu, 22 Nov 2012 18:01:15 GMT</pubDate><title>M 5.0, southern Sumatra, Indonesia</title><description>November 22, 2012 18:01:15 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dx58.php</link><geo:lat>-4.5417</geo:lat><geo:long>102.8549</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>77.80 km</dc:subject><guid isPermaLink="false">usc000dx58</guid></item> + <item><pubDate>Thu, 22 Nov 2012 13:07:05 GMT</pubDate><title>M 5.6, Salta, Argentina</title><description>November 22, 2012 13:07:05 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dx1i.php</link><geo:lat>-22.6657</geo:lat><geo:long>-63.4880</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>459.10 km</dc:subject><guid isPermaLink="false">usc000dx1i</guid></item> + <item><pubDate>Thu, 22 Nov 2012 09:09:31 GMT</pubDate><title>M 5.0, Bali region, Indonesia</title><description>November 22, 2012 09:09:31 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dwzh.php</link><geo:lat>-8.9069</geo:lat><geo:long>115.1527</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>73.80 km</dc:subject><guid isPermaLink="false">usc000dwzh</guid></item> + <item><pubDate>Thu, 22 Nov 2012 05:21:49 GMT</pubDate><title>M 5.2, Komandorskiye Ostrova, Russia region</title><description>November 22, 2012 05:21:49 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dwta.php</link><geo:lat>54.0864</geo:lat><geo:long>168.3012</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>30.00 km</dc:subject><guid isPermaLink="false">usc000dwta</guid></item> + <item><pubDate>Wed, 21 Nov 2012 22:52:28 GMT</pubDate><title>M 5.2, offshore Libertador O'Higgins, Chile</title><description>November 21, 2012 22:52:28 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dwl3.php</link><geo:lat>-33.9846</geo:lat><geo:long>-72.0118</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>9.80 km</dc:subject><guid isPermaLink="false">usc000dwl3</guid></item> + <item><pubDate>Wed, 21 Nov 2012 21:36:22 GMT</pubDate><title>M 5.9, offshore Libertador O'Higgins, Chile</title><description>November 21, 2012 21:36:22 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dwip.php</link><geo:lat>-34.0163</geo:lat><geo:long>-72.0172</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>15.70 km</dc:subject><guid isPermaLink="false">usc000dwip</guid></item> + <item><pubDate>Wed, 21 Nov 2012 18:16:36 GMT</pubDate><title>M 5.1, offshore Libertador O'Higgins, Chile</title><description>November 21, 2012 18:16:36 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dwbj.php</link><geo:lat>-33.9622</geo:lat><geo:long>-72.1422</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>9.70 km</dc:subject><guid isPermaLink="false">usc000dwbj</guid></item> + <item><pubDate>Wed, 21 Nov 2012 17:42:37 GMT</pubDate><title>M 5.0, near the east coast of Honshu, Japan</title><description>November 21, 2012 17:42:37 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dwai.php</link><geo:lat>38.4991</geo:lat><geo:long>141.7353</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>37.30 km</dc:subject><guid isPermaLink="false">usc000dwai</guid></item> + <item><pubDate>Wed, 21 Nov 2012 16:46:37 GMT</pubDate><title>M 5.4, south of Sumbawa, Indonesia</title><description>November 21, 2012 16:46:37 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dw8j.php</link><geo:lat>-11.3754</geo:lat><geo:long>117.9300</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>9.90 km</dc:subject><guid isPermaLink="false">usc000dw8j</guid></item> + <item><pubDate>Wed, 21 Nov 2012 01:18:40 GMT</pubDate><title>M 5.0, New Britain region, Papua New Guinea</title><description>November 21, 2012 01:18:40 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dvz8.php</link><geo:lat>-5.9033</geo:lat><geo:long>151.7074</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>8.40 km</dc:subject><guid isPermaLink="false">usc000dvz8</guid></item> + <item><pubDate>Tue, 20 Nov 2012 17:08:59 GMT</pubDate><title>M 5.2, Taiwan region</title><description>November 20, 2012 17:08:59 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dvkl.php</link><geo:lat>22.4104</geo:lat><geo:long>121.4210</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>11.40 km</dc:subject><guid isPermaLink="false">usc000dvkl</guid></item> + <item><pubDate>Tue, 20 Nov 2012 16:23:24 GMT</pubDate><title>M 5.4, offshore Libertador O'Higgins, Chile</title><description>November 20, 2012 16:23:24 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dvj3.php</link><geo:lat>-33.9579</geo:lat><geo:long>-72.3163</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>15.40 km</dc:subject><guid isPermaLink="false">usc000dvj3</guid></item> + <item><pubDate>Tue, 20 Nov 2012 15:27:59 GMT</pubDate><title>M 5.0, Molucca Sea</title><description>November 20, 2012 15:27:59 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dvi3.php</link><geo:lat>0.8083</geo:lat><geo:long>126.0539</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>9.90 km</dc:subject><guid isPermaLink="false">usc000dvi3</guid></item> + <item><pubDate>Mon, 19 Nov 2012 17:54:08 GMT</pubDate><title>M 5.4, Pakistan</title><description>November 19, 2012 17:54:08 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000duzz.php</link><geo:lat>30.4539</geo:lat><geo:long>67.5394</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>14.10 km</dc:subject><guid isPermaLink="false">usc000duzz</guid></item> + <item><pubDate>Mon, 19 Nov 2012 16:45:50 GMT</pubDate><title>M 5.2, offshore Libertador O'Higgins, Chile</title><description>November 19, 2012 16:45:50 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000duxx.php</link><geo:lat>-33.9382</geo:lat><geo:long>-72.1818</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>10.00 km</dc:subject><guid isPermaLink="false">usc000duxx</guid></item> + <item><pubDate>Mon, 19 Nov 2012 10:55:08 GMT</pubDate><title>M 5.2, New Britain region, Papua New Guinea</title><description>November 19, 2012 10:55:08 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000duuj.php</link><geo:lat>-5.8731</geo:lat><geo:long>151.6449</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>10.00 km</dc:subject><guid isPermaLink="false">usc000duuj</guid></item> + <item><pubDate>Mon, 19 Nov 2012 10:15:54 GMT</pubDate><title>M 5.1, New Britain region, Papua New Guinea</title><description>November 19, 2012 10:15:54 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dutx.php</link><geo:lat>-5.9073</geo:lat><geo:long>151.7066</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>12.80 km</dc:subject><guid isPermaLink="false">usc000dutx</guid></item> + <item><pubDate>Mon, 19 Nov 2012 10:09:46 GMT</pubDate><title>M 5.0, south of Java, Indonesia</title><description>November 19, 2012 10:09:46 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000duty.php</link><geo:lat>-9.5383</geo:lat><geo:long>108.2428</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>34.90 km</dc:subject><guid isPermaLink="false">usc000duty</guid></item> + <item><pubDate>Mon, 19 Nov 2012 09:44:34 GMT</pubDate><title>M 5.8, New Britain region, Papua New Guinea</title><description>November 19, 2012 09:44:34 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000duti.php</link><geo:lat>-5.7339</geo:lat><geo:long>151.6063</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>10.10 km</dc:subject><guid isPermaLink="false">usc000duti</guid></item> + <item><pubDate>Mon, 19 Nov 2012 04:09:27 GMT</pubDate><title>M 5.1, east of the South Sandwich Islands</title><description>November 19, 2012 04:09:27 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000durc.php</link><geo:lat>-59.3483</geo:lat><geo:long>-18.3098</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>6.50 km</dc:subject><guid isPermaLink="false">usc000durc</guid></item> + <item><pubDate>Sun, 18 Nov 2012 20:01:26 GMT</pubDate><title>M 5.1, Mindanao, Philippines</title><description>November 18, 2012 20:01:26 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dunk.php</link><geo:lat>6.0242</geo:lat><geo:long>125.8842</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>126.10 km</dc:subject><guid isPermaLink="false">usc000dunk</guid></item> + <item><pubDate>Sat, 17 Nov 2012 18:43:52 GMT</pubDate><title>M 5.3, West Chile Rise</title><description>November 17, 2012 18:43:52 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dubt.php</link><geo:lat>-37.0202</geo:lat><geo:long>-94.9667</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>10.80 km</dc:subject><guid isPermaLink="false">usc000dubt</guid></item> + <item><pubDate>Sat, 17 Nov 2012 18:12:21 GMT</pubDate><title>M 5.4, West Chile Rise</title><description>November 17, 2012 18:12:21 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000dub9.php</link><geo:lat>-37.1596</geo:lat><geo:long>-94.9680</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>10.10 km</dc:subject><guid isPermaLink="false">usc000dub9</guid></item> + <item><pubDate>Sat, 17 Nov 2012 09:06:26 GMT</pubDate><title>M 5.1, southeast of the Loyalty Islands</title><description>November 17, 2012 09:06:26 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000du6f.php</link><geo:lat>-22.2351</geo:lat><geo:long>171.6432</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>115.10 km</dc:subject><guid isPermaLink="false">usc000du6f</guid></item> + <item><pubDate>Sat, 17 Nov 2012 05:29:45 GMT</pubDate><title>M 5.0, Fiji region</title><description>November 17, 2012 05:29:45 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000du4e.php</link><geo:lat>-20.2516</geo:lat><geo:long>-178.4418</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>583.80 km</dc:subject><guid isPermaLink="false">usc000du4e</guid></item> + <item><pubDate>Sat, 17 Nov 2012 05:12:56 GMT</pubDate><title>M 6.1, Tonga region</title><description>November 17, 2012 05:12:56 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000du43.php</link><geo:lat>-18.3108</geo:lat><geo:long>-172.3741</geo:long><dc:subject>6</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>9.80 km</dc:subject><guid isPermaLink="false">usc000du43</guid></item> + <item><pubDate>Sat, 17 Nov 2012 02:51:24 GMT</pubDate><title>M 5.7, Vanuatu</title><description>November 17, 2012 02:51:24 GMT</description><link>http://earthquake.usgs.gov/earthquakes/recenteqsww/Quakes/usc000du3a.php</link><geo:lat>-15.0263</geo:lat><geo:long>167.4260</geo:long><dc:subject>5</dc:subject><dc:subject>pastweek</dc:subject><dc:subject>128.40 km</dc:subject><guid isPermaLink="false">usc000du3a</guid></item> + </channel> +</rss> diff --git a/chimere/tests/georss.xml b/chimere/tests/georss_simple.xml index 8697f16..8697f16 100644 --- a/chimere/tests/georss.xml +++ b/chimere/tests/georss_simple.xml diff --git a/chimere/utils.py b/chimere/utils.py index 1877441..ed41a04 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -569,17 +569,22 @@ class GeoRSSManager(ImportManager): if feed['bozo']: return (0, 0, _(u"RSS feed is not well formed")) for item in feed['items']: - if "georss_point" not in item and 'georss_line' not in item: + if "georss_point" not in item and 'georss_line' not in item \ + and not ("geo_lat" in item and "geo_long" in item): continue cls = None dct = {'origin':self.importer_instance.origin, 'license':self.importer_instance.license} - if 'georss_point' in item: + if 'georss_point' in item or "geo_lat" in item: cls = Marker - try: - y, x = item['georss_point'].split(' ') - except ValueError: - continue + if 'georss_point' in item: + try: + y, x = item['georss_point'].split(' ') + except ValueError: + continue + else: + y = item['geo_lat'] + x = item['geo_long'] dct['point'] = 'SRID=4326;POINT(%s %s)' % (x, y) for k in ['description', 'summary', 'value']: if k in item: |