organicmaps/borders
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fix some things

Browse source
This commit is contained in:
Ilya Zverev 2015-12-09 19:49:38 +03:00
parent 7e36075887
commit dd65120f15
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
scripts/import_points.py Normal file → Executable file
View file

4
scripts/poly2postgis.py
View file

@ -31,7 +31,7 @@ def read_multipolygon(f):
polygons = []
cur_poly = []
while True:
title = f.readline()
title = f.readline().strip()
if not title:
return None
if title == 'END':
@ -60,7 +60,7 @@ def convert_poly(input_file, cur):
wkt = read_multipolygon(f)
print ' ', name
try:
cur.execute('insert into borders (name, geom) values (%s, ST_GeomFromText(%s))', (name, wkt))
cur.execute('insert into borders (name, geom, modified) values (%s, ST_GeomFromText(%s), now())', (name, wkt))
except psycopg2.Error as e:
print wkt
raise e

5
scripts/process_planet.sh
View file

@ -37,10 +37,13 @@ echo Cleaning up tiles table and index
psql $DATABASE -c "DELETE FROM $TABLE; DROP INDEX IF EXISTS ${TABLE}_idx;"
echo Loading tiles into the database
pv $PLANET-tiles.csv | python tiles2pg.py -d $DATABASE -t $TABLE
pv $PLANET-tiles.csv | python "$(dirname "$0")/tiles2pg.py" -d $DATABASE -t $TABLE
rm $PLANET-tiles.csv
echo Indexing tiles
psql $DATABASE -c "CREATE INDEX ${TABLE}_idx ON $TABLE USING GIST (tile);"
echo Dumping the table
pg_dump -t $TABLE $DATABASE | gzip > $PLANET-tiles.sql.gz
echo Done!

11
server/borders_api.py
View file

@ -103,10 +103,13 @@ def query_routing_points():
ymin = request.args.get('ymin')
ymax = request.args.get('ymax')
cur = g.conn.cursor()
cur.execute('''SELECT ST_X(geom), ST_Y(geom), type
FROM points
WHERE geom && ST_MakeBox2D(ST_Point(%s, %s), ST_Point(%s, %s)
);''', (xmin, ymin, xmax, ymax))
try:
cur.execute('''SELECT ST_X(geom), ST_Y(geom), type
FROM points
WHERE geom && ST_MakeBox2D(ST_Point(%s, %s), ST_Point(%s, %s)
);''', (xmin, ymin, xmax, ymax))
except psycopg2.Error, e:
return jsonify(features=[])
result = []
for rec in cur:
result.append({ 'lon': rec[0], 'lat': rec[1], 'type': rec[2] })