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

Show admin_level of parent region in the web interface

Browse source
This commit is contained in:
Alexey Zakharenkov 2020-10-15 23:57:38 +03:00
parent 3dc6ceada6
commit ce461536a4
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
web/app/borders_api.py
View file

@ -79,7 +79,7 @@ def fetch_borders(**kwargs):
query = f"""
SELECT name, geometry, nodes, modified, disabled, count_k, cmnt,
(CASE WHEN area = 'NaN' THEN 0 ELSE area END) AS area,
id, admin_level, parent_id, parent_name,
id, admin_level, parent_id, parent_name, parent_admin_level,
mwm_size_est
FROM (
SELECT name,
@ -98,6 +98,9 @@ def fetch_borders(**kwargs):
( SELECT name FROM {table}
WHERE id = t.parent_id
) AS parent_name,
( SELECT admin_level FROM {osm_table}
WHERE osm_id = (SELECT parent_id FROM {table} WHERE id = t.id)
) AS parent_admin_level,
mwm_size_est
FROM {table} t
WHERE ({where_clause}) {leaves_filter}
@ -118,10 +121,11 @@ def fetch_borders(**kwargs):
'id': region_id,
'admin_level': rec[9],
'parent_id': rec[10],
'parent_name': rec[11] or '',
'parent_name': rec[11],
'parent_admin_level': rec[12],
'country_id': country_id,
'country_name': country_name,
'mwm_size_est': rec[12]
'mwm_size_est': rec[13]
}
feature = {'type': 'Feature',
'geometry': json.loads(rec[1]),

23
web/app/static/borders.js
View file

@ -258,7 +258,7 @@ function selectLayer(e) {
e.target.setStyle({ fillOpacity: 0.01 });
$('#b_name').text(props['name']);
$('#b_al').text(props['admin_level'] ? '('+props['admin_level']+')' : '');
$('#b_parent_name').text(props['parent_name']);
$('#b_parent_name').text(getParentBorderRepresentation(props));
$('#b_size').text(Math.round(props['count_k'] * BYTES_FOR_NODE / 1024 / 1024) + ' MB');
$('#pa_size').text(Math.round(props['mwm_size_est']/1024) + ' MB');
//$('#b_nodes').text(borders[selectedId].layer.getLatLngs()[0].length);
@ -632,7 +632,9 @@ function processPotentialParents(answer) {
var parent_id = parent.properties.id;
potentialParents[parent_id] = parent;
var div = $('<div/>').appendTo(potentialParentsDiv);
var name = parent.properties.name || '' + parent_id;
var al = parent.properties.admin_level;
var al_str = al ? ' (' + al + ')' : '';
var name = (parent.properties.name || '' + parent_id) + al_str;
$('<span>' + name + '</span>').appendTo(div);
$('<span> </span>').appendTo(div);
$('<a href="#">показать</a>')
@ -781,6 +783,21 @@ function bJoinCancel() {
var parentLayer = null;
function getParentBorderRepresentation(props, long) {
var parent_repr = '';
if (props['parent_id']) {
parent_repr = props['parent_name'] || '' + props['parent_id'];
if (long && props['parent_name'])
parent_repr += ' [' + props['parent_id'] + ']';
if (props['parent_admin_level'])
parent_repr += ' (' + props['parent_admin_level'] + ')';
}
return parent_repr;
}
function bJoinToParent() {
if( !selectedId || !(selectedId in borders) )
return;
@ -791,7 +808,7 @@ function bJoinToParent() {
}
joinSelected = selectedId;
$('#j_to_parent_sel').text(props['name'] + ' (' + selectedId + ')');
$('#j_sel_parent').text(props['parent_name'] + ' (' + props['parent_id'] + ')');
$('#j_sel_parent').text(getParentBorderRepresentation(props, true));
$('#actions').hide();
$('#join_to_parent').show();
}