example_route_server/example_request.xml server/.gitignore server/.project server/.pydevproject server/insert.sh server/truncate.py @@ -4,4 +4,6 @@ */*.pyc commit.msg server/database.py* -server/tile.csv +server/data/tile.csv +server/USE_APP_ENGINE +server/USE_POSTGRES .gitignore @@ -5,10 +5,7 @@ <body> Hi there. Pick a route to see its altitude profile. You can also view the route in Google Maps. <ul> - <li>Route 1 : Downtown Melbourne Swanston Street. See <a href="http://maps.google.com/maps/ms?hl=en&ie=UTF8&oe=UTF8&msa=0&msid=100510881926257285904.00044ebd0efd56c9e5c33" class="external text" title="http://maps.google.com/maps/ms?hl=en&ie=UTF8&oe=UTF8&msa=0&msid=100510881926257285904.00044ebd0efd56c9e5c33" rel="nofollow">Google map</a>. Just a walk down the street, two coordinates. 1.3 kilometers. Lots of high rise buildings in the neighborhood. Show profile (<a href="index.html?type=xml&route=1">xml</a>, <a href="index.html?type=gchart&route=1">Google Chart</a>) - <li>Route 2 : Melbourne: along the M3. See <a href="http://maps.google.com/maps/ms?ie=UTF8&hl=en&msa=0&msid=100510881926257285904.00044ebd7c782bf7d26b1&ll=-37.792965,145.066051&spn=0.06457,0.160675&t=p&z=13" class="external text" title="http://maps.google.com/maps/ms?ie=UTF8&hl=en&msa=0&msid=100510881926257285904.00044ebd7c782bf7d26b1&ll=-37.792965,145.066051&spn=0.06457,0.160675&t=p&z=13" rel="nofollow">Google map</a>. Show profile (<a href="index.html?type=xml&route=2">xml</a>, <a href="index.html?type=gchart&route=2">Google Chart</a>) - <li>Route 3 : Don Road. See <a href="http://maps.google.com/maps?f=d&hl=en&geocode=6136499379036602369,-37.757051,145.588828&saddr=Old+Don+Rd+%40-37.757051,+145.588828&daddr=-37.702294,145.570564&mra=mi&mrsp=1,0&sz=13&sll=-37.71085,145.600777&sspn=0.064642,0.160675&ie=UTF8&ll=-37.728638,145.596657&spn=0.064627,0.160675&t=p&z=13" class="external text" title="http://maps.google.com/maps?f=d&hl=en&geocode=6136499379036602369,-37.757051,145.588828&saddr=Old+Don+Rd+%40-37.757051,+145.588828&daddr=-37.702294,145.570564&mra=mi&mrsp=1,0&sz=13&sll=-37.71085,145.600777&sspn=0.064642,0.160675&ie=UTF8&ll=-37.728638,145.596657&spn=0.064627,0.160675&t=p&z=13" rel="nofollow">Google map</a> Show profile (<a href="index.html?type=xml&route=3">xml</a>, <a href="index.html?type=gchart&route=3">Google Chart</a>) - <li>Route 4 : Long straight road. See <a href="http://maps.google.com/maps?f=d&hl=en&geocode=1130370581986007382,-30.088850,145.937740%3B10496179191282796778,-31.559080,147.188810&saddr=Mitchell+Hwy+%40-30.088850,+145.937740&daddr=-31.548112,147.200317+to:Mitchell+Hwy+%40-31.559080,+147.188810&mra=dpe&mrcr=0&mrsp=1&sz=8&via=1&sll=-30.859795,147.024536&sspn=2.244471,5.141602&ie=UTF8&t=p&z=8" class="external text" title="http://maps.google.com/maps?f=d&hl=en&geocode=1130370581986007382,-30.088850,145.937740%3B10496179191282796778,-31.559080,147.188810&saddr=Mitchell+Hwy+%40-30.088850,+145.937740&daddr=-31.548112,147.200317+to:Mitchell+Hwy+%40-31.559080,+147.188810&mra=dpe&mrcr=0&mrsp=1&sz=8&via=1&sll=-30.859795,147.024536&sspn=2.244471,5.141602&ie=UTF8&t=p&z=8" rel="nofollow">Google map</a> Show profile (<a href="index.html?type=xml&route=4">xml</a>, <a href="index.html?type=gchart&route=4">Google Chart</a>) + <li>Route 1 : Downtown Heidelberg. Car route on <a href="http://maps.google.com/maps?f=d&hl=en&geocode=17786583812122914276,49.414740,8.693260&saddr=49.40779,8.681002&daddr=Bergstra%C3%9Fe+%4049.414740,+8.693260&mra=mi&mrsp=0,1&sz=15&sll=49.411029,8.689027&sspn=0.014128,0.037594&ie=UTF8&ll=49.410052,8.692503&spn=0.014129,0.037594&z=15">Google maps</a>. <a href="index.html?type=ors&route=1">Walking route on OpenRouteService</a> (xml). Altitude profile (<a href="index.html?type=xml&route=1">xml</a>, <a href="index.html?type=gchart&route=1">Google Chart</a>) </ul> More information <a href="http://wiki.openstreetmap.org/index.php/Route_altitude_profiles_SRTM">here</a>. </body> example_route_server/www/index.html @@ -17,13 +17,13 @@ from google.appengine.ext import webapp ##### Database ##### class Altitude(db.Model): - pos = db.IntegerProperty() + #pos = db.IntegerProperty() alt = db.IntegerProperty() ##### Pages ###### class MainPage(webapp.RequestHandler): def get(self): - alts = Altitude.gql("ORDER BY pos DESC LIMIT 10") + alts = Altitude.gql("LIMIT 10") self.response.out.write(""" <html> <body>""") @@ -31,6 +31,8 @@ class MainPage(webapp.RequestHandler): for alt in alts: self.response.out.write("" + str(alt.alt) + "") + alt = Altitude.get_by_key_name("P-19490696459") + self.response.out.write("And fetch directly by keyname:" + str(alt.alt) + "") self.response.out.write(""" </body> </html>""") server/altitude.py @@ -5,7 +5,31 @@ api_version: 1 handlers: - url: / - script: altitude.py + script: src/altitude.py - url: /load - script: myloader.py + script: src/myloader.py + login: admin + +- url: /truncate + script: src/truncate.py + login: admin + +skip_files: | + ^(.*/)?( + (app\.yaml)| + (app\.yml)| + (index\.yaml)| + (index\.yml)| + (.*\.csv)| + (data/.*)| + (test/.*)| + (src/import-google-apps-engine\.sh) + (src/import-google-apps-engine\.py) + (#.*#)| + (.*~)| + (.*\.py[co])| + (.*/RCS/.*)| + (\..*)| + )$ + server/app.yaml @@ -8,21 +8,21 @@ from math import sqrt # Main functions def loadTile(filename): - srtm = gdal.Open('data/Australia/' + filename + '.hgt') + srtm = gdal.Open('data/Eurasia/' + filename + '.hgt') return gdal_array.DatasetReadAsArray(srtm) def posFromLatLon(lat,lon): return (lat * 360 + lon) * 1200 * 1200 -def writeTileCsvFile(tile, lat0, lon0): +def writeTileCsvFile(tile, lat0, lon0, top_row = 1, bottom_row = 1200, left_col = 0, right_col = 1199 ): # Calculate begin position begin = posFromLatLon(lat0,lon0) # First we write the data into a temporary file. - f = open('tile.csv', 'w') + f = open('data/tile.csv', 'w') # We drop the top row and right column. - for row in range(1, len(tile)): - for col in range(0, len(tile) - 1): + for row in range(top_row, bottom_row + 1 ): + for col in range(left_col, right_col + 1): f.write(str(\ begin + (row-1) * 1200 + col\ ) + ", " + str(tile[row][col] ) + "\n") @@ -49,7 +49,47 @@ def getLatLonFromFileName(name): return [lat,lon] if __name__ == '__main__': - name = sys.argv[1] + # We will only upload 1 tile to the Google App Engine. This will take quite + # a bit of time. For the offline data store, we will only "upload" the city + # of Heidelberg; the offline data store is very slow. + + # For this we need tile N49E008. + name = "N49E008" tile = loadTile(name) [lat,lon] = getLatLonFromFileName(name) - writeTileCsvFile(tile, lat, lon) + + if not ("online" in sys.argv or "offline" in sys.argv): + print "Online or offline?" + exit() + + if sys.argv[1] == "offline": + # If we are offline, we'll only look the center of Heidelberg. + # 49.39 --- 49.42 + # 8.67 --- 8.71 + # That corresponds to: + row_top = int((1.0 - 0.42) * 1200.) + row_bottom = int((1.0 - 0.39) * 1200.) + col_left = int(0.67 * 1200.) + col_right = int(0.71 * 1200.) + # So that 1813 records + writeTileCsvFile(tile, lat, lon, row_top, row_bottom, col_left, col_right) + print "Now run this command to insert the data into your local datastore:" + print "/path/to/app-engine-sdk/bulkload_client.py --filename ../data/tile.csv --kind Altitude --url http://localhost:8080/load --batch_size 100 --cookie 'dev_appserver_login=test@example.com:True'" + + else: + # Because the bulk upload script does not support resume, we will upload + # the data row by row. sys.argv[2] represents the line number to insert. + # You should create a script to perform the upload. Start at 1, end at 1200. + row = int(sys.argv[2]) + print "About to make cvs for row " + str(row) + " of 1200..." + row_top = row + row_bottom = row + col_left = 0 + col_right = 1199 + writeTileCsvFile(tile, lat, lon, row_top, row_bottom, col_left, col_right) + + # To insert, you need to do something like this: + # /path/to/app-engine-sdk/bulkload_client.py --filename ../data/tile.csv --kind Altitude --url http://something.appspot.com/load --batch_size 100" + + # You also need to add a --cookie argument: just surf to http://something.appspot.com/load + # to see how. server/import-google-apps-engine.py @@ -1,5 +1,6 @@ from google.appengine.ext import bulkload from google.appengine.api import datastore_types +from google.appengine.api import datastore from google.appengine.ext import search class AltitudeLoader(bulkload.Loader): @@ -9,5 +10,12 @@ class AltitudeLoader(bulkload.Loader): ('alt', int) ]) + def HandleEntity(self, entity): + name="P" + str(entity['pos']) + del entity['pos'] + newent = datastore.Entity('Altitude',name=name) + newent.update(entity) + return newent + if __name__ == '__main__': bulkload.main(AltitudeLoader()) server/myloader.py server/data/.gitignore server/data/Australia/.gitignore server/import-google-apps-engine.sh server/test/test_server.py e5e5e72b9f088a8bdb39774dc9e65715e4300997 Sjors sjors@sprovoost.nl http://github.com/Sjors/openstreetmap-route-altitude-profile/commit/277f2e06179d57175c29d1f6274684892742e684 277f2e06179d57175c29d1f6274684892742e684

2008-07-04T00:57:35-07:00

Work in progress: script can import a tile into the Datastore or downtown Heidelberg into offline store. 331196247409a7ef80d51688d2dad5224274f9e0 Sjors sjors@sprovoost.nl