update cities example; fix zero population entries; don't include city data twice

examples/cities/css/example.css

@@ -22,11 +22,11 @@
 }
 
 .OxTextList .OxItem .OxCell > div.region {
-    width: 12px;
+    width: 14px;
-    height: 12px;
+    height: 14px;
-    border-width: 1px;
     border-radius: 2px;
     margin-left: -3px;
+    box-shadow: 0 0 2px rgb(128, 128, 128) inset;
 }
 .OxTextList .OxItem .OxCell > img.flag {
     width: 14px;

examples/cities/js/example.js

@@ -172,20 +172,19 @@ Ox.load({UI: {showScreen: true}, Geo: {}}, function() {
                         {
                             /*
                             We use the format function to display the region as
-                            a colored icon with a tooltip. The OxTypeIcon class
+                            a colored icon with a tooltip. The region class is
-                            makes the icon themed (its border color will depend
+                            added to apply our own custom CSS, and
-                            on the current theme), the region class is added to
+                            Ox.getGeoColor returns a color for the region. Note
-                            apply our own custom CSS, and Ox.getGeoColor returns
+                            that the actual value is 'Continent, Region,
-                            a color for the region. Note that the actual value
+                            Country', which results in a nicer sort order than
-                            is 'Continent, Region, Country', which results in a
+                            just 'Region'.
-                            nicer sort order than just 'Region'.
                             */
                             format: function(value) {
                                 var region = value.split(', ')[1];
                                 return Ox.Element({
                                         tooltip: region
                                     })
-                                    .addClass('OxTypeIcon region')
+                                    .addClass('region')
                                     .css({
                                         background: 'rgb('
                                             + Ox.getGeoColor(region).join(', ')
@@ -237,7 +236,10 @@ Ox.load({UI: {showScreen: true}, Geo: {}}, function() {
                         {
                             format: function(value) {
                                 return value
-                                    ? $('<img>')
+                                    ? Ox.Element({
+                                            element: '<img>',
+                                            tooltip: 'Capital'
+                                        })
                                         .addClass('capital')
                                         .attr({
                                             src: Ox.UI.getImageURL('symbolStar')

examples/cities/py/txt2json.py

@@ -1,74 +0,0 @@
-import json
-import math
-import re
-from ox.geo import get_country
-
-def read_table(source, target, keys, filter_=lambda x: True, map_=lambda x: x, sort_=lambda x: x):
-    def parse_value(str, t):
-        if type(t) == float:
-            str = float(str) if str else t
-        elif type(t) == int:
-            str = int(str) if str else t
-        return str
-    data = []
-    f = open(source)
-    for r, row in enumerate(f):
-        if row and row[0] != '#':
-            item = {}
-            cols = row[:-1].split('\t')
-            for c, col in enumerate(cols):
-                key = keys[c]
-                if type(key['type']) == list:
-                    if col:
-                        col = col.split(',')
-                        value = map(lambda x: parse_value(x, key['type'][0]), col)
-                    else:
-                        value = []
-                else:
-                    value = parse_value(col, key['type'])
-                item[key['name']] = value
-            if filter_(item):
-                data.append(map_(item))
-    data = sorted(data, key=sort_)
-    f = open(target, 'w')
-    f.write(json.dumps(data, indent=4, sort_keys=True))
-    f.close()
-    print len(data), 'cities'
-
-# http://download.geonames.org/export/dump/
-# http://www.geonames.org/export/codes.html
-source = '../txt/cities1000.txt'
-target = '../json/cities.json'
-keys = [
-    {'name': 'geonameid', 'type': 0},
-    {'name': 'name', 'type': ''},
-    {'name': 'asciiname', 'type': ''},
-    {'name': 'alternatenames', 'type': ['']},
-    {'name': 'latitude', 'type': 0.0},
-    {'name': 'longitude', 'type': 0.0},
-    {'name': 'feature_class', 'type': ''},
-    {'name': 'feature_code', 'type': ''},
-    {'name': 'country_code', 'type': ''},
-    {'name': 'cc2', 'type': ['']},
-    {'name': 'admin1_code', 'type': ''},
-    {'name': 'admin2_code', 'type': ''},
-    {'name': 'admin3_code', 'type': ''},
-    {'name': 'admin4_code', 'type': ''},
-    {'name': 'population', 'type': 0},
-    {'name': 'elevation', 'type': 0},
-    {'name': 'gtopo30', 'type': 0},
-    {'name': 'timezone', 'type': ''},
-    {'name': 'modification_date', 'type': ''}
-]
-filter_ = lambda x: re.search('^PPL(C|A)$', x['feature_code']) or x['population'] >= 49589
-def map_(x):
-    data = {}
-    for key in [
-        'country_code', 'elevation', 'feature_code'
-        'latitude', 'longitude', 'name', 'population'
-    ]:
-        data[key] = x[key]
-    return data
-sort_ = lambda x: -x['population']
-
-read_table(source, target, keys, filter_, map_, sort_)