better readonly handling, poly download
This commit is contained in:
Ilya Zverev
parent
5bb570d7be
commit
9e31fc992f
3 changed files with 82 additions and 23 deletions
|
|
@ -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():
|
||||
|
|
|
|||
|
|
@ -25,11 +25,16 @@ function init() {
|
|||
});
|
||||
|
||||
if( IMPORT_ENABLED ) {
|
||||
$('#import_link').css('display', 'none');
|
||||
$('#filefm').css('display', 'block');
|
||||
var iframe = '<iframe name="import_frame" style="display: none;" width="230" height="80" src="about:blank"></iframe>';
|
||||
$('#filefm').attr('action', getServer('import'));
|
||||
var iframe = '<iframe name="import_frame" class="h_iframe" src="about:blank"></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 = '<iframe name="import_frame" class="h_iframe" src="about:blank"></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) : '');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
</style>
|
||||
</head>
|
||||
<body onload="init();">
|
||||
|
|
@ -64,20 +65,25 @@
|
|||
<div id="old_action">
|
||||
<input type="checkbox" id="old" onchange="bOldBorders()"><label for="old"> старые границы</label>
|
||||
</div>
|
||||
<div>
|
||||
<div id="links">
|
||||
<a href="stat.html">Статистика</a>
|
||||
<a href="import.html" id="import_link">Импорт</a><br>
|
||||
<a href="#" id="poly_bbox">Скачать в poly видимое</a>,
|
||||
<a href="#" id="poly_all">всё</a>
|
||||
</div>
|
||||
</div>
|
||||
<div id="actions" class="actions">
|
||||
<button onclick="bDisable()" id="b_disable">Убрать</button>
|
||||
<a href="#" onclick="bDelete(); return false;" id="b_delete">Удалить</a><br>
|
||||
<button onclick="bSplit()">Разрезать</button><br>
|
||||
<button onclick="bJoin()">Склеить</button><br>
|
||||
<button onclick="bLargest()">Выделить острова</button><br>
|
||||
<button onclick="bHull()">Единый контур</button><br>
|
||||
<div id="osm_actions">
|
||||
<button onclick="bDivide()">Заменить регионами</button><br>
|
||||
<button onclick="bPoint()">Регион из точки</button><br>
|
||||
<div id="action_buttons">
|
||||
<button onclick="bDisable()" id="b_disable">Убрать</button>
|
||||
<a href="#" onclick="bDelete(); return false;" id="b_delete">Удалить</a><br>
|
||||
<button onclick="bSplit()">Разрезать</button><br>
|
||||
<button onclick="bJoin()">Склеить</button><br>
|
||||
<button onclick="bLargest()">Выделить острова</button><br>
|
||||
<button onclick="bHull()">Единый контур</button><br>
|
||||
<div id="osm_actions">
|
||||
<button onclick="bDivide()">Заменить регионами</button><br>
|
||||
<button onclick="bPoint()">Регион из точки</button><br>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="info">
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue