From 9e31fc992fb1616801c65184aa33aca2c30ba188 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Fri, 27 Mar 2015 14:38:01 +0300 Subject: [PATCH] better readonly handling, poly download --- server/borders_api.py | 43 ++++++++++++++++++++++++++++++++++--------- www/borders.js | 32 ++++++++++++++++++++++++++++++-- www/index.html | 30 ++++++++++++++++++------------ 3 files changed, 82 insertions(+), 23 deletions(-) diff --git a/server/borders_api.py b/server/borders_api.py index d817b15..11c4ec3 100755 --- a/server/borders_api.py +++ b/server/borders_api.py @@ -1,8 +1,9 @@ #!/usr/bin/python -from flask import Flask, g, request, json, jsonify, abort, Response +from flask import Flask, g, request, json, jsonify, abort, Response, send_file from flask.ext.cors import CORS from flask.ext.compress import Compress import psycopg2 +import io, re, zipfile, unicodedata import config try: @@ -225,8 +226,6 @@ def enable_border(): @app.route('/comment', methods=['POST']) def update_comment(): - if config.READONLY: - abort(405) name = request.form['name'] comment = request.form['comment'] cur = g.conn.cursor() @@ -682,15 +681,41 @@ def export_poly(): cur = g.conn.cursor() if xmin and xmax and ymin and ymax: - cur.execute("""SELECT name, ST_AsGeoJSON(geom, 7) as geometry FROM {table} WHERE not disabled + cur.execute("""SELECT name, ST_AsGeoJSON(geom, 7) as geometry FROM {table} WHERE disabled = false and ST_Intersects(ST_SetSRID(ST_MakeBox2D(ST_Point(%s, %s), ST_Point(%s, %s)), 4326), geom); """.format(table=table), (xmin, ymin, xmax, ymax)) else: - cur.execute("""SELECT name, ST_AsGeoJSON(geom, 7) as geometry FROM {table} WHERE not disabled;""".format(table=table)) - result = [] - for rec in cur: - pass - pass + cur.execute("""SELECT name, ST_AsGeoJSON(geom, 7) as geometry FROM {table} WHERE disabled = false;""".format(table=table)) + + memory_file = io.BytesIO(); + with zipfile.ZipFile(memory_file, 'w', zipfile.ZIP_DEFLATED) as zf: + for res in cur: + geometry = json.loads(res[1]) + polygons = [geometry['coordinates']] if geometry['type'] == 'Polygon' else geometry['coordinates'] + # sanitize name, src: http://stackoverflow.com/a/295466/1297601 + name = res[0].decode('utf-8') + name = unicodedata.normalize('NFKD', name) + name = name.encode('ascii', 'ignore') + name = re.sub('[^\w _-]', '', name).strip() + name = name + '.poly' + + poly = io.BytesIO() + poly.write(res[0] + '\n') + pcounter = 1 + for polygon in polygons: + outer = True + for ring in polygon: + poly.write('{}\n'.format(pcounter if outer else -pcounter)) + pcounter = pcounter + 1 + for coord in ring: + poly.write('\t{:E}\t{:E}\n'.format(coord[0], coord[1])) + poly.write('END\n') + outer = False + poly.write('END\n') + zf.writestr(name, poly.getvalue()) + poly.close() + memory_file.seek(0) + return send_file(memory_file, attachment_filename='borders.zip', as_attachment=True) @app.route('/stat') def statistics(): diff --git a/www/borders.js b/www/borders.js index cf873e7..74e829a 100644 --- a/www/borders.js +++ b/www/borders.js @@ -25,11 +25,16 @@ function init() { }); if( IMPORT_ENABLED ) { + $('#import_link').css('display', 'none'); $('#filefm').css('display', 'block'); - var iframe = ''; + $('#filefm').attr('action', getServer('import')); + var iframe = ''; $('#filefm').after(iframe); } - document.getElementById('filefm').action = getServer('import'); + $('#poly_all').attr('href', getPolyDownloadLink()); + $('#poly_bbox').on('mousedown', function() { + $(this).attr('href', getPolyDownloadLink(true)); + }); $('#r_green').val(size_good); $('#r_red').val(size_bad); checkHasOSM(); @@ -46,6 +51,17 @@ function checkHasOSM() { $('#old_action').css('display', 'block'); $('#josm_old').css('display', 'inline'); } + if( res.readonly ) { + $('#action_buttons').css('display', 'none'); + $('#import_link').css('display', 'none'); + } + if( !res.readonly && IMPORT_ENABLED ) { + $('#import_link').css('display', 'none'); + $('#filefm').css('display', 'block'); + $('#filefm').attr('action', getServer('import')); + var iframe = ''; + $('#filefm').after(iframe); + } } }); } @@ -654,6 +670,7 @@ function updateBackupList(data) { $(a).text(b['text'] + ' (' + b['count'] + ')'); if( i > 0 ) { var d = document.createElement('a'); + d.className = 'back_del'; d.href = '#'; d.onclick = (function(id, name) { return function() { bBackupDelete(id); return false } })(b['timestamp']); $(d).text('[x]'); @@ -687,3 +704,14 @@ function bBackupDelete(timestamp) { }); bBackupCancel(); } + +function getPolyDownloadLink(bbox) { + var b = map.getBounds(); + var data = { + 'xmin': b.getWest(), + 'xmax': b.getEast(), + 'ymin': b.getSouth(), + 'ymax': b.getNorth() + }; + return getServer('poly') + (bbox ? '?' + $.param(data) : ''); +} diff --git a/www/index.html b/www/index.html index 9a029ba..b04840f 100644 --- a/www/index.html +++ b/www/index.html @@ -18,13 +18,14 @@ #actions { visibility: hidden; } #osm_actions { display: none; margin-top: 1em; } #info { margin-top: 2em; } - #b_delete, #b_clear { font-size: 8pt; } + #b_delete, #b_clear, .back_del { font-size: 8pt; } #rename, #split, #join, #point, #divide, #backup { display: none; } .actions input[type='text'] { width: 150px; } #header { border-bottom: 1px solid gray; margin-bottom: 1em; padding-bottom: 1em; } - #f_topo, #f_chars, #f_comments { font-size: 10pt; } + #f_topo, #f_chars, #f_comments, #links { font-size: 10pt; } #backup_saving, #backup_restoring { margin-bottom: 1em; } #filefm, #old_action, #josm_old { display: none; } + .h_iframe { display: none; width: 230px; height: 80px; } @@ -64,20 +65,25 @@
-
+
- - Удалить
-
-
-
-
-
-
-
+
+ + Удалить
+
+
+
+
+
+
+
+