Changeset 486:bc4d2b8e3009

Timestamp:

01/23/10 10:13:48 (8 weeks ago)

Author:

rgrp <http://rufuspollock.org>

Branch:

default

Message:

[model,misc][s]: change model.types.GeometryPlain? so that on load from db None is converted to default 'empty' Point feature (already convert empty feature back to None on saving to db).

• Main reason for doing this was it seemed lack of Feature structure on Factlets with no location was what was breaking showing "Select location on map" thread edit view (due to element fill issues i think ...)
  • Also location editor itself is broken when no long/lat. Have fix for this (not yet committed) but need to check when online.
• microfacts/getdata/dbpedia.py, microfacts/lib/base.py, microfacts/model/core.py:
  • We already had this empty point Feature as default_location attribute on Factlet which we can now deprecate in favour of GeometryPlain?.default_feature

Location:

microfacts

Files:

• getdata/dbpedia.py (modified) (1 diff)
• lib/base.py (modified) (1 diff)
• model/core.py (modified) (1 diff)
• model/types.py (modified) (1 diff)
• templates/factlet/edit_core.html (modified) (1 diff)

microfacts/getdata/dbpedia.py

@@ -178 +178 @@
                 'place': [], # holding item for locations
                 # NB: model code takes care of ignoring empty (default) location 
-                'location': model.Factlet.default_location,
+                'location': model.GeometryPlain.default_feature,
                 'image_urls': [],
                 'license':  u'CC-BY-SA'

microfacts/lib/base.py

@@ -26 +26 @@
     def __getattr__(self, name):
         attrs = dict(id=0, title='', image='', description='',
-                     start='', end='', location=model.Factlet.default_location,
+                     start='', end='',
+                     location=model.GeometryPlain.default_feature,
                      source='', license='', state='', revision='',
                      blank_factlet=True)

microfacts/model/core.py

@@ -146 +146 @@
     text_search_fields = [ 'title', 'description' ]
 
-    default_location = geojson.Feature(
-        properties=dict(title=u''),
-        geometry=geojson.Point(coordinates=[None,None])
-        )
-
 import swiss.date
 def add_flexidate(domain_object, name):

microfacts/model/types.py

@@ -32 +32 @@
             # return "SRID=%s;%s" % (self.srid, value.wkb.encode('hex'))
 
+    default_feature = geojson.Feature(
+        properties=dict(title=u''),
+        geometry=geojson.Point(coordinates=[None,None])
+        )
+
     def convert_result_value(self, value, engine):
         if value is None:
-            return None
+            return self.default_feature
         else:
             # Temporary hack for old-style as we switch to geojson

microfacts/templates/factlet/edit_core.html

@@ -32 +32 @@
       </dl>
 
-      <div class="location" py:with="ourlocation = c.factlet.location if
-        c.factlet.location else c.factlet.default_location">
+      <div class="location" py:with="ourlocation = c.factlet.location">
         ${gmaps()}
         ${h.hidden('location[type]', value=ourlocation['type'], class_='type')}