server/altitudeprofile.proto @@ -30,6 +30,13 @@ _ROUTE_POINTTYPE = descriptor.Descriptor( message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), + descriptor.FieldDescriptor( + name='alt', full_name='altitudeprofile.Route.PointType.alt', index=2, + number=3, type=2, cpp_type=6, label=1, + default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), ], extensions=[ ], example_route_server/altitudeprofile_pb2.py @@ -41,9 +41,10 @@ <td><a href="server.py/demo?route=1&input=xml&output=gchart_url&server=pg">Google Chart URL</a></td> </tr> <tr> - <td>Protocol Buffers</td><td>Coming soon</td> - <td></td> - <td></td> + <td>Protocol Buffers</td> + <td><a href="server.py/demo?route=1&input=protobuf&output=xml&server=pg">xml</a></td> + <td><a href="server.py/demo?route=1&input=protobuf&output=gchart_url&server=pg">Google Chart URL</a></td> + <td><a href="server.py/demo?route=1&input=protobuf&output=protobuf&server=pg">Protocol buffers</a></td> </tr> <tr> <td>HTTP/GET</td> example_route_server/index.html @@ -79,6 +79,28 @@ def demo(req, route, input, output, server): req.write('<head></head>') req.write('<body>') req.write('' + s + '') + + elif output_type == "protobuf": + s = f.read() + f.close() + + req.content_type = 'text/html' + req.write('<html>') + req.write('<head></head>') + req.write('<body>') + req.write('Extracting protocol buffer:') + req.write('' + s + '') + + req.write('<ul>') + + route_res = altitudeprofile_pb2.Route() + route_res.ParseFromString(s) + + for point in route_res.point: + req.write('<li>lat=' + str(point.lat) + ' lon=' + str(point.lon) + ' alt=' + str(point.alt) + '</li>') + + req.write('</ul>') + #return apache.OK @@ -97,7 +119,7 @@ def fetchResult(url_server_root, input_type, route, output_type): # Get route altitude profile: - return urllib.urlopen(url_server_root + "profile/xml/protobuf/", route_pb_string) + return urllib.urlopen(url_server_root + "profile/" + output_type + "/protobuf/", "protobuf=" + route_pb_string) elif input_type == "xml": # Let's make an xlsRouteGeometry object... example_route_server/server.py @@ -1,5 +1,8 @@ # from numpy import ones from math import floor, ceil +import sys + + # Geopy: http://exogen.case.edu/projects/geopy/ from geopy import distance, util @@ -9,6 +12,8 @@ from pygooglechart import XYLineChart, Axis from xml.dom import minidom +import altitudeprofile_pb2 + ##### Pages ###### def page_main_get(): return 'Welcome! Go to <a href="http://sprovoost.nl/category/gsoc/">my blog</a> to learn more.' @@ -17,12 +22,12 @@ def page_profile(db, utils, data, output_format, input_format): # Extract the route: route = [] if input_format == "protobuf": - # Doesn't work in app egine yet and completely untested + # Doesn't work in app egine yet, only with Apache route_pb = altitudeprofile_pb2.Route() route_pb.ParseFromString(data) for point in route_pb.point: - route += {'lat' : point.lat, 'lon' : point.lon} + route.append({'lat' : point.lat, 'lon' : point.lon}) elif input_format == "xml": dom = minidom.parseString(data) @@ -68,6 +73,21 @@ def page_profile(db, utils, data, output_format, input_format): return ['text/xml', xml] + elif output_format == "protobuf": + profile = altitude_profile(db, route) + + profile_pb = altitudeprofile_pb2.Route() + + for p in profile: + point = profile_pb.point.add() + point.lat = p['lat'] + point.lon = p['lon'] + point.alt = p['alt'] + + profile_pb_string = route_pb.SerializeToString() + + return ['text/html', profile_pb_string] + def altitude_profile_gchart(db, route): # First calculate the altitude profile profile = altitude_profile(db, route) server/altitude.py @@ -1,12 +1,12 @@ #!/usr/bin/python2.4 # Generated by the protocol buffer compiler. DO NOT EDIT! -from protobuf import descriptor -from protobuf import message -from protobuf import reflection -from protobuf import service -from protobuf import service_reflection -from protobuf import descriptor_pb2 +from google.protobuf import descriptor +from google.protobuf import message +from google.protobuf import reflection +from google.protobuf import service +from google.protobuf import service_reflection +from google.protobuf import descriptor_pb2 @@ -30,6 +30,13 @@ _ROUTE_POINTTYPE = descriptor.Descriptor( message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), + descriptor.FieldDescriptor( + name='alt', full_name='altitudeprofile.Route.PointType.alt', index=2, + number=3, type=2, cpp_type=6, label=1, + default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), ], extensions=[ ], server/altitudeprofile_pb2.py @@ -4,6 +4,7 @@ import os sys.path += [os.path.dirname(__file__)] import web +from os import environ sys.stdout = sys.stderr @@ -47,8 +48,13 @@ class main_page: class profile_page: def POST(self, output_format, input_format): - # This assumes XML input - postdata = '<?xml version=' + web.input()['<?xml version'] + # Determine whether the post request is a protocol buffer or + # an XML document. (I am sure there is a more elegant way) + try: + postdata = web.input()['protobuf'] + except: + postdata = '<?xml version=' + web.input()['<?xml version'] + res = altitude.page_profile(db, utils, postdata, output_format, input_format) header = res[0] body = res[1] server/apache.py example_route_server/altitudeprofile.proto 6800152d806ee329134446629d2250546bf95ac5 sjors sjors@b9d5c4c9-76e1-0310-9c85-f3177eceb1e4 http://github.com/Sjors/openstreetmap-route-altitude-profile/commit/27008c88c5fbc48440909a04434560722031e296 27008c88c5fbc48440909a04434560722031e296

2008-08-01T21:29:54-07:00

Protocol buffers are now supported on the Apache version. git-svn-id: http://svn.openstreetmap.org/sites/other/route-altitude-profile/trunk@9427 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4 e0ae55b776e5a47009cb155923d51e8c34e4e0b6 sjors sjors@b9d5c4c9-76e1-0310-9c85-f3177eceb1e4