Fixed __repr__ functions

ogn/model/country.py

@@ -25,15 +25,15 @@ class Country(Base):
     geom = Column('geom', Geometry('MULTIPOLYGON', srid=4326))
 
     def __repr__(self):
-        return "<Country %s: %s,%s,%s,%s,%s,%s,%s,%s,%s,% s>" % (
+        return "<Country %s: %s,%s,%s,%s,%s,%s,%s,%s,%s,%s>" % (
+            self.fips,
+            self.iso2,
+            self.iso3,
+            self.un,
             self.name,
-            self.code,
-            self.country_code,
-            self.style,
-            self.description,
-            self.location_wkt.latitude if self.location_wkt else None,
-            self.location_wkt.longitude if self.location_wkt else None,
-            self.altitude,
-            self.runway_direction,
-            self.runway_length,
-            self.frequency)
+            self.area,
+            self.pop2005,
+            self.region,
+            self.subregion,
+            self.lon,
+            self.lat)

ogn/model/flights2d.py

@@ -18,9 +18,10 @@ class Flight2D(Base):
     device = relationship('Device', foreign_keys=[device_id], backref='flights2d')
 
     def __repr__(self):
-        return "<Flight %s: %s,%s,%s,%s,%s,%s,%s,%s,%s,% s>" % (
+        return "<Flight %s: %s,%s>" % (
             self.date,
-            self.path_wkt)
+            self.path_wkt,
+            self.path_simple_wkt)
 
 
 Index('ix_flights2d_date_device_id', Flight2D.date, Flight2D.device_id)

ogn/model/relation_stats.py

@@ -22,9 +22,9 @@ class RelationStats(Base):
     receiver = relationship('Receiver', foreign_keys=[receiver_id], backref='relation_stats')
 
     def __repr__(self):
-        return "<RelationStats: %s,%s,%s,%s>" % (
+        return "<RelationStats: %s,%s,%s>" % (
             self.date,
-            self.normalized_signal_quality,
+            self.quality,
             self.beacon_count)