From dd65120f1548fff0a140773e04199608493213cc Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Wed, 9 Dec 2015 19:49:38 +0300
Subject: [PATCH] Fix some things

---
 scripts/import_points.py  |  0
 scripts/poly2postgis.py   |  4 ++--
 scripts/process_planet.sh |  5 ++++-
 server/borders_api.py     | 11 +++++++----
 4 files changed, 13 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 scripts/import_points.py

diff --git a/scripts/import_points.py b/scripts/import_points.py
old mode 100644
new mode 100755
diff --git a/scripts/poly2postgis.py b/scripts/poly2postgis.py
index 68afac2..d0ba817 100755
--- a/scripts/poly2postgis.py
+++ b/scripts/poly2postgis.py
@@ -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
diff --git a/scripts/process_planet.sh b/scripts/process_planet.sh
index 603a991..639d40e 100755
--- a/scripts/process_planet.sh
+++ b/scripts/process_planet.sh
@@ -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!
diff --git a/server/borders_api.py b/server/borders_api.py
index 8ce3fc9..dda7417 100755
--- a/server/borders_api.py
+++ b/server/borders_api.py
@@ -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] })