# HG changeset patch # User Jeff Hammel # Date 1498427753 25200 # Node ID 21095c9006e530fda8772b62cb222941c3de9a38 # Parent 27925261c137753cb505662fe85fbbe424938e15 city page is now functional + linky diff -r 27925261c137 -r 21095c9006e5 globalneighbors/grid.py --- a/globalneighbors/grid.py Sun Jun 25 14:29:18 2017 -0700 +++ b/globalneighbors/grid.py Sun Jun 25 14:55:53 2017 -0700 @@ -70,3 +70,5 @@ def __init__(self, locations): raise NotImplementedError('TODO') + +def main( diff -r 27925261c137 -r 21095c9006e5 globalneighbors/templates/city.html --- a/globalneighbors/templates/city.html Sun Jun 25 14:29:18 2017 -0700 +++ b/globalneighbors/templates/city.html Sun Jun 25 14:55:53 2017 -0700 @@ -1,19 +1,28 @@ - {{ name }} + {{ city.name }} Home -

{{ name }}

+

{{ city.name }}

-

{{latitude}},{{longitude}}

+ +

+ {{city.latitude}},{{city.longitude}} + +

Population:
-
{{ population }}
+
{{ city.population }}
+ +
Country:
+
{{ city['country code'] }}
diff -r 27925261c137 -r 21095c9006e5 globalneighbors/web.py --- a/globalneighbors/web.py Sun Jun 25 14:29:18 2017 -0700 +++ b/globalneighbors/web.py Sun Jun 25 14:55:53 2017 -0700 @@ -58,12 +58,19 @@ for i in cities: if i[name].startswith(startswith): retval.append({"name": i[name], + "country code": i["country code"], + "population": i['population'], "geonameid": i['geonameid']}) else: retval = [{"name": i[name], - "geonameid": i['geonameid']} + "country code": i["country code"], + "population": i['population'], + "geonameid": i['geonameid']} for i in cities] - return sorted(retval, key=lambda x: x['name'])[:limit] + return sorted(retval, + key=lambda x: (x['name'], + -x['population']) + )[:limit] class Handler(object): @@ -152,8 +159,9 @@ city = self.cities.get(geoid) if not city: return + variables = dict(city=city) return Response(content_type=self.content_type, - body=self.citypage.render(**city)) + body=self.citypage.render(variables)) except ValueError: pass