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

Forbid joining a region with itself

Browse source
This commit is contained in:
Alexey Zakharenkov 2020-02-28 17:32:59 +03:00
parent e75ef1a880
commit c80b6c07f5
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/borders_api.py
View file

@ -228,6 +228,8 @@ def join_borders():
abort(405)
name = request.args.get('name').encode('utf-8')
name2 = request.args.get('name2').encode('utf-8')
if name == name2:
return jsonify(status='cannot join region with itself')
cur = g.conn.cursor()
cur.execute('update {table} set geom = ST_Union(geom, b2.g), count_k = -1 from (select geom as g from {table} where name = %s) as b2 where name = %s;'.format(table=config.TABLE), (name2, name))
cur.execute('delete from {} where name = %s;'.format(config.TABLE), (name2,))

2
www/borders.js
View file

@ -570,7 +570,7 @@ function bJoin() {
// called from selectLayer() when joinSelected is not null
function bJoinSelect(layer) {
if( 'id' in layer && layer.id in borders ) {
if( 'id' in layer && layer.id in borders && layer.id != joinSelected ) {
joinAnother = layer.id;
$('#j_name2').text(joinAnother);
$('#j_do').css('display', 'block');