From 1c2981e2034c41172e84c58abfb4c63e89cfce9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Charette?= <stephanecharette@gmail.com>
Date: Tue, 6 May 2008 06:51:22 +0000
Subject: [PATCH] bug report #2131, display latitude before longitude

svn: r10681
---
 src/DataViews/PlaceView.py       |  2 +-
 src/DisplayModels/_PlaceModel.py |  4 ++--
 src/plugins/NarrativeWeb.py      | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/DataViews/PlaceView.py b/src/DataViews/PlaceView.py
index e72615b06..3ceea3bc1 100644
--- a/src/DataViews/PlaceView.py
+++ b/src/DataViews/PlaceView.py
@@ -71,8 +71,8 @@ class PlaceView(PageView.ListView):
         _('County'),
         _('State'),
         _('Country'),
-        _('Longitude'),
         _('Latitude'),
+        _('Longitude'),
         _('Last Changed'),
         _('Street'),
         ]
diff --git a/src/DisplayModels/_PlaceModel.py b/src/DisplayModels/_PlaceModel.py
index 3c03790d6..1e11ee1ec 100644
--- a/src/DisplayModels/_PlaceModel.py
+++ b/src/DisplayModels/_PlaceModel.py
@@ -67,8 +67,8 @@ class PlaceModel(BaseModel):
             self.column_county,
             self.column_state,
             self.column_country,
-            self.column_longitude,
             self.column_latitude,
+            self.column_longitude,
             self.column_change,
             self.column_street,
             self.column_handle,
@@ -83,8 +83,8 @@ class PlaceModel(BaseModel):
             self.column_county,
             self.column_state,
             self.column_country,
-            self.column_longitude,
             self.column_latitude,
+            self.column_longitude,
             self.column_change,
             self.column_street,
             self.column_handle,
diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py
index 2a43bff8d..172d93e2c 100644
--- a/src/plugins/NarrativeWeb.py
+++ b/src/plugins/NarrativeWeb.py
@@ -1057,18 +1057,18 @@ class PlacePage(BasePage):
                     of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % val[1])
                     of.write('\t\t\t</tr>\n')
 
-        if place.long:
-            of.write('\t\t\t<tr>\n')
-            of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Longitude'))
-            of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % place.long)
-            of.write('\t\t\t</tr>\n')
-
         if place.lat:
             of.write('\t\t\t<tr>\n')
             of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Latitude'))
             of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % place.lat)
             of.write('\t\t\t</tr>\n')
 
+        if place.long:
+            of.write('\t\t\t<tr>\n')
+            of.write('\t\t\t\t<td class="ColumnAttribute">%s</td>\n' % _('Longitude'))
+            of.write('\t\t\t\t<td class="ColumnValue">%s</td>\n' % place.long)
+            of.write('\t\t\t</tr>\n')
+
         of.write('\t\t</table>\n')
         of.write('\t</div>\n')