From 61404dd77626f7d2bf756c8e2de2abd269303193 Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Tue, 31 May 2011 10:42:22 +0200
Subject: [PATCH] formatted area output in place panel

---
 source/Ox.UI/js/Map/Ox.ListMap.js   | 22 ++++++++++++++--------
 source/Ox.UI/js/Map/Ox.MapMarker.js |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js
index 0b8e03f0..68603eb2 100644
--- a/source/Ox.UI/js/Map/Ox.ListMap.js
+++ b/source/Ox.UI/js/Map/Ox.ListMap.js
@@ -444,7 +444,7 @@ Ox.ListMap = function(options, self) {
                 self.$map.value(self.selectedPlace, 'type', data.selected[0]);
             }
         })
-    ], ['South', 'West', 'North', 'East', 'Latitude', 'Longitude'].map(function(v) {
+    ], ['Latitude', 'Longitude', 'South', 'West', 'North', 'East'].map(function(v) {
         var id = (
                 v == 'Latitude' ? 'lat' : v == 'Longitude' ? 'lng' : v
             ).toLowerCase(),
@@ -462,14 +462,8 @@ Ox.ListMap = function(options, self) {
         });
     }), [
         self.$areaInput = Ox.Input({
-            disabled: true,
             id: 'area',
-            label: 'Area',
-            labelWidth: 80,
-            textAlign: 'right',
-            type: 'float',
-            width: 240
-        })    
+        }).hide()
     ]);
     
     self.$placeForm = Ox.Form({
@@ -479,6 +473,17 @@ Ox.ListMap = function(options, self) {
         .css({margin: '8px'})
         .hide();
 
+    self.$areaKmInput = Ox.Input({
+            disabled: true,
+            id: 'areaKm',
+            label: 'Area',
+            labelWidth: 80,
+            textAlign: 'right',
+            width: 240
+        })
+        .css({margin: '4px 0 4px 0'})
+        .appendTo(self.$placeForm);
+
     self.$placeStatusbar = Ox.Bar({
             size: 24
         });
@@ -699,6 +704,7 @@ Ox.ListMap = function(options, self) {
             self.$placeTitleName.options({title: place.geoname || ''});
             self.$placeTitle.show();
             self.$placeForm.values(place).show();
+            self.$areaKmInput.options({value: Ox.formatArea(place.area)});
             self.$placeButton.options({title: isResult ? 'Add Place' : 'Remove Place'});
             self.$revertButton.options({disabled: true}).show();
         } else {
diff --git a/source/Ox.UI/js/Map/Ox.MapMarker.js b/source/Ox.UI/js/Map/Ox.MapMarker.js
index 761df4e4..b8b4b0a4 100644
--- a/source/Ox.UI/js/Map/Ox.MapMarker.js
+++ b/source/Ox.UI/js/Map/Ox.MapMarker.js
@@ -21,7 +21,7 @@ Ox.MapMarker = function(options) {
 
     var that = this,
         typeColor = {
-            country: [0, 255, 255],
+            country: [0, 128, 255],
             region: [255, 0, 255],
             city: [255, 0, 0],
             borough: [255, 128, 0],