Display lines crossing borders
This commit is contained in:
Ilya Zverev
parent
034768d3b3
commit
6786a3fbaf
4 changed files with 251 additions and 11 deletions
|
|
@ -23,9 +23,9 @@ def hello_world():
|
|||
|
||||
@app.route('/www/<path:path>')
|
||||
def send_js(path):
|
||||
if config.DEBUG:
|
||||
return send_from_directory('../www/', path)
|
||||
abort(404)
|
||||
if config.DEBUG:
|
||||
return send_from_directory('../www/', path)
|
||||
abort(404)
|
||||
|
||||
@app.before_request
|
||||
def before_request():
|
||||
|
|
@ -103,7 +103,7 @@ def query_routing_points():
|
|||
ymin = request.args.get('ymin')
|
||||
ymax = request.args.get('ymax')
|
||||
cur = g.conn.cursor()
|
||||
try:
|
||||
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)
|
||||
|
|
@ -115,11 +115,34 @@ def query_routing_points():
|
|||
result.append({ 'lon': rec[0], 'lat': rec[1], 'type': rec[2] })
|
||||
return jsonify(features=result)
|
||||
|
||||
@app.route('/crossing')
|
||||
def query_crossing():
|
||||
xmin = request.args.get('xmin')
|
||||
xmax = request.args.get('xmax')
|
||||
ymin = request.args.get('ymin')
|
||||
ymax = request.args.get('ymax')
|
||||
region = request.args.get('region')
|
||||
cur = g.conn.cursor()
|
||||
sql = """SELECT id, ST_AsGeoJSON(line, 7) as geometry, region, processed FROM {table}
|
||||
WHERE line && ST_MakeBox2D(ST_Point(%s, %s), ST_Point(%s, %s)) and processed = 0 {reg};
|
||||
""".format(table=config.CROSSING_TABLE, reg='and region = %s' if region else '')
|
||||
params = [xmin, ymin, xmax, ymax]
|
||||
if region:
|
||||
params.append(region)
|
||||
cur.execute(sql, tuple(params))
|
||||
result = []
|
||||
for rec in cur:
|
||||
props = { 'id': rec[0], 'region': rec[2], 'processed': rec[3] }
|
||||
feature = { 'type': 'Feature', 'geometry': json.loads(rec[1]), 'properties': props }
|
||||
result.append(feature)
|
||||
return jsonify(type='FeatureCollection', features=result)
|
||||
|
||||
@app.route('/tables')
|
||||
def check_osm_table():
|
||||
osm = False
|
||||
backup = False
|
||||
old = []
|
||||
crossing = False
|
||||
try:
|
||||
cur = g.conn.cursor()
|
||||
cur.execute('select osm_id, ST_Area(way), admin_level, name from {} limit 2;'.format(config.OSM_TABLE))
|
||||
|
|
@ -139,7 +162,14 @@ def check_osm_table():
|
|||
old.append(t)
|
||||
except psycopg2.Error, e:
|
||||
pass
|
||||
return jsonify(osm=osm, tables=old, readonly=config.READONLY, backup=backup)
|
||||
try:
|
||||
cur = g.conn.cursor()
|
||||
cur.execute('select id, ST_Length(line), region, processed from {} limit 2;'.format(config.CROSSING_TABLE))
|
||||
if cur.rowcount == 2:
|
||||
crossing = True
|
||||
except psycopg2.Error, e:
|
||||
pass
|
||||
return jsonify(osm=osm, tables=old, readonly=config.READONLY, backup=backup, crossing=crossing)
|
||||
|
||||
@app.route('/split')
|
||||
def split():
|
||||
|
|
@ -336,6 +366,56 @@ def draw_hull():
|
|||
g.conn.commit()
|
||||
return jsonify(status='ok')
|
||||
|
||||
@app.route('/fixcrossing')
|
||||
def fix_crossing():
|
||||
if config.READONLY:
|
||||
abort(405)
|
||||
preview = request.args.get('preview') == '1'
|
||||
region = request.args.get('region')
|
||||
if region is None:
|
||||
return jsonify(status='Please specify a region')
|
||||
ids = request.args.get('ids')
|
||||
if ids is None or len(ids) == 0:
|
||||
return jsonify(status='Please specify a list of line ids')
|
||||
ids = tuple(ids.split(','))
|
||||
cur = g.conn.cursor()
|
||||
if preview:
|
||||
cur.execute("""
|
||||
WITH lines as (SELECT ST_Buffer(ST_Collect(line), 0.002, 1) as g FROM {cross} WHERE id IN %s)
|
||||
SELECT ST_AsGeoJSON(ST_Collect(ST_MakePolygon(er.ring))) FROM
|
||||
(
|
||||
SELECT ST_ExteriorRing((ST_Dump(ST_Union(ST_Buffer(geom, 0.0), lines.g))).geom) as ring FROM {table}, lines WHERE name = %s
|
||||
) as er
|
||||
""".format(table=config.TABLE, cross=config.CROSSING_TABLE), (ids, region))
|
||||
res = cur.fetchone()
|
||||
if not res:
|
||||
return jsonify(status='Failed to extend geometry')
|
||||
f = { "type": "Feature", "properties": {}, "geometry": json.loads(res[0]) }
|
||||
#return jsonify(type="FeatureCollection", features=[f])
|
||||
return jsonify(type="Feature", properties={}, geometry=json.loads(res[0]))
|
||||
else:
|
||||
cur.execute("""
|
||||
WITH lines as (SELECT ST_Buffer(ST_Collect(line), 0.002, 1) as g FROM {cross} WHERE id IN %s)
|
||||
UPDATE {table} SET geom = res.g FROM
|
||||
(
|
||||
SELECT ST_Collect(ST_MakePolygon(er.ring)) as g FROM
|
||||
(
|
||||
SELECT ST_ExteriorRing((ST_Dump(ST_Union(ST_Buffer(geom, 0.0), lines.g))).geom) as ring FROM {table}, lines WHERE name = %s
|
||||
) as er
|
||||
) as res
|
||||
WHERE name = %s
|
||||
""".format(table=config.TABLE, cross=config.CROSSING_TABLE), (ids, region, region))
|
||||
cur.execute("""
|
||||
UPDATE {table} b SET geom = ST_Difference(b.geom, o.geom)
|
||||
FROM {table} o
|
||||
WHERE ST_Overlaps(b.geom, o.geom)
|
||||
AND o.name = %s
|
||||
""".format(table=config.TABLE), (region,))
|
||||
cur.execute("UPDATE {cross} SET processed = 1 WHERE id IN %s".format(cross=config.CROSSING_TABLE), (ids,))
|
||||
g.conn.commit()
|
||||
return jsonify(status='ok')
|
||||
|
||||
|
||||
@app.route('/backup')
|
||||
def backup_do():
|
||||
if config.READONLY:
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ OSM_TABLE = 'osm_borders'
|
|||
OTHER_TABLES = { 'old': 'old_borders' }
|
||||
# backup table
|
||||
BACKUP = 'borders_backup'
|
||||
# table with crossing lines
|
||||
CROSSING_TABLE = 'crossing'
|
||||
# area of an island for it to be considered small
|
||||
SMALL_KM2 = 10
|
||||
# force multipolygons in JOSM output
|
||||
|
|
|
|||
155
www/borders.js
155
www/borders.js
|
|
@ -11,6 +11,7 @@ var size_good = 5, size_bad = 50;
|
|||
var tooSmallLayer = null;
|
||||
var oldBordersLayer = null;
|
||||
var routingGroup = null;
|
||||
var crossingLayer = null;
|
||||
|
||||
function init() {
|
||||
map = L.map('map', { editable: true }).setView([30, 0], 3);
|
||||
|
|
@ -20,7 +21,10 @@ function init() {
|
|||
{ attribution: '© GIScience Heidelberg' }).addTo(map);
|
||||
bordersLayer = L.layerGroup();
|
||||
map.addLayer(bordersLayer);
|
||||
routingGroup = new L.FeatureGroup();
|
||||
routingGroup = L.layerGroup();
|
||||
map.addLayer(routingGroup);
|
||||
crossingLayer = L.layerGroup();
|
||||
map.addLayer(crossingLayer);
|
||||
|
||||
map.on('moveend', function() {
|
||||
if( map.getZoom() >= 5 )
|
||||
|
|
@ -55,6 +59,8 @@ function checkHasOSM() {
|
|||
$('#old_action').css('display', 'block');
|
||||
$('#josm_old').css('display', 'inline');
|
||||
}
|
||||
if( res.crossing )
|
||||
$('#cross_actions').css('display', 'block');
|
||||
if( !res.backup ) {
|
||||
$('#backups').css('display', 'none');
|
||||
}
|
||||
|
|
@ -102,6 +108,21 @@ function updateBorders() {
|
|||
dataType: 'json'
|
||||
});
|
||||
|
||||
if (map.getZoom() >= 7) {
|
||||
$.ajax(getServer('crossing'), {
|
||||
data: {
|
||||
'xmin': b.getWest(),
|
||||
'xmax': b.getEast(),
|
||||
'ymin': b.getSouth(),
|
||||
'ymax': b.getNorth()
|
||||
},
|
||||
success: processCrossing,
|
||||
dataType: 'json'
|
||||
});
|
||||
} else {
|
||||
crossingLayer.clearLayers();
|
||||
}
|
||||
|
||||
if( oldBordersLayer != null && OLD_BORDERS_NAME ) {
|
||||
oldBordersLayer.clearLayers();
|
||||
$.ajax(getServer('bbox'), {
|
||||
|
|
@ -120,16 +141,14 @@ function updateBorders() {
|
|||
}
|
||||
|
||||
routingTypes = {1: "Border and feature are intersecting several times.",
|
||||
2: "Unknown outgoing feature."};
|
||||
2: "Unknown outgoing feature."};
|
||||
|
||||
function processRouting(data) {
|
||||
map.removeLayer(routingGroup);
|
||||
routingGroup.clearLayers();
|
||||
for( var f = 0; f < data.features.length; f++ ) {
|
||||
marker = L.marker([data.features[f]["lat"], data.features[f]["lon"]]).addTo(routingGroup);
|
||||
marker = L.marker([data.features[f]["lat"], data.features[f]["lon"]]);
|
||||
marker.bindPopup(routingTypes[data.features[f]["type"]], {showOnMouseOver: true});
|
||||
}
|
||||
map.addLayer(routingGroup);
|
||||
}
|
||||
|
||||
function processResult(data) {
|
||||
|
|
@ -757,3 +776,129 @@ function getPolyDownloadLink(bbox) {
|
|||
};
|
||||
return getServer('poly') + (bbox ? '?' + $.param(data) : '');
|
||||
}
|
||||
|
||||
var crossSelected = null, fcPreview = null;
|
||||
var crossingSelected = {};
|
||||
|
||||
function crossingUpdateColor(layer) {
|
||||
layer.setStyle({ color: crossingSelected[layer.crossId] ? 'red' : 'blue' });
|
||||
}
|
||||
|
||||
function crossingClicked(e) {
|
||||
if( !crossSelected )
|
||||
return;
|
||||
var layer = e.target;
|
||||
if( 'crossId' in layer ) {
|
||||
var id = layer.crossId;
|
||||
if( crossingSelected[id] )
|
||||
delete crossingSelected[id];
|
||||
else
|
||||
crossingSelected[id] = true;
|
||||
crossingUpdateColor(layer);
|
||||
}
|
||||
}
|
||||
|
||||
function setBordersSelectable(selectable) {
|
||||
crossingLayer.eachLayer(function(l) {
|
||||
//l.setOptions({ clickable: selectable });
|
||||
l.bringToFront();
|
||||
});
|
||||
}
|
||||
|
||||
function processCrossing(data) {
|
||||
crossingLayer.clearLayers();
|
||||
for( var f = 0; f < data.features.length; f++ ) {
|
||||
var layer = L.GeoJSON.geometryToLayer(data.features[f].geometry),
|
||||
props = data.features[f].properties;
|
||||
layer.crossId = '' + props.id;
|
||||
layer.crossRegion = props.region;
|
||||
crossingUpdateColor(layer);
|
||||
layer.on('click', crossingClicked);
|
||||
crossingLayer.addLayer(layer);
|
||||
}
|
||||
}
|
||||
|
||||
function selectCrossingByRegion(region) {
|
||||
if( region ) {
|
||||
crossingLayer.eachLayer(function(l) {
|
||||
if( l.crossId && l.crossRegion == region ) {
|
||||
crossingSelected[l.crossId] = true;
|
||||
crossingUpdateColor(l);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
crossingLayer.eachLayer(function(l) {
|
||||
if( l.crossId ) {
|
||||
delete crossingSelected[l.crossId];
|
||||
crossingUpdateColor(l);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function bFixCross() {
|
||||
if( !selectedId || !(selectedId in borders) )
|
||||
return;
|
||||
setBordersSelectable(false);
|
||||
crossSelected = selectedId;
|
||||
fcPreview = null;
|
||||
$('#actions').css('display', 'none');
|
||||
$('#fc_sel').text(crossSelected);
|
||||
$('#fc_do').css('display', 'none');
|
||||
$('#fixcross').css('display', 'block');
|
||||
selectCrossingByRegion(crossSelected);
|
||||
// TODO; enable selection
|
||||
}
|
||||
|
||||
function bFixCrossPreview() {
|
||||
if( fcPreview != null ) {
|
||||
map.removeLayer(fcPreview);
|
||||
fcPreview = null;
|
||||
}
|
||||
$('#fc_do').css('display', 'none');
|
||||
$.ajax(getServer('fixcrossing'), {
|
||||
data: {
|
||||
'preview': 1,
|
||||
'region': crossSelected,
|
||||
'ids': Object.keys(crossingSelected).join(',')
|
||||
},
|
||||
success: bFixCrossDrawPreview
|
||||
});
|
||||
}
|
||||
|
||||
function bFixCrossDrawPreview(geojson) {
|
||||
if( !('geometry' in geojson) ) {
|
||||
return;
|
||||
}
|
||||
fcPreview = L.geoJson(geojson, {
|
||||
style: function(f) {
|
||||
return { color: 'red', weight: 1, fill: false };
|
||||
}
|
||||
});
|
||||
map.addLayer(fcPreview);
|
||||
$('#fc_do').css('display', 'block');
|
||||
}
|
||||
|
||||
function bFixCrossDo() {
|
||||
$.ajax(getServer('fixcrossing'), {
|
||||
data: {
|
||||
'region': crossSelected,
|
||||
'ids': Object.keys(crossingSelected).join(',')
|
||||
},
|
||||
success: updateBorders
|
||||
});
|
||||
bFixCrossCancel();
|
||||
}
|
||||
|
||||
function bFixCrossCancel() {
|
||||
if( fcPreview != null ) {
|
||||
map.removeLayer(fcPreview);
|
||||
fcPreview = null;
|
||||
}
|
||||
crossSelected = null;
|
||||
selectCrossingByRegion(false);
|
||||
crossingSelected = {};
|
||||
updateBorders();
|
||||
$('#actions').css('display', 'block');
|
||||
$('#fixcross').css('display', 'none');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#header { border-bottom: 1px solid gray; margin-bottom: 1em; padding-bottom: 1em; }
|
||||
#f_topo, #f_chars, #f_comments, #links { font-size: 10pt; }
|
||||
#backup_saving, #backup_restoring { margin-bottom: 1em; }
|
||||
#filefm, #old_action, #josm_old { display: none; }
|
||||
#filefm, #old_action, #josm_old, #cross_actions { display: none; }
|
||||
.h_iframe { display: none; width: 230px; height: 80px; }
|
||||
</style>
|
||||
</head>
|
||||
|
|
@ -86,6 +86,9 @@
|
|||
<button onclick="bDivide()">Заменить регионами</button><br>
|
||||
<button onclick="bPoint()">Регион из точки</button><br>
|
||||
</div>
|
||||
<div id="cross_actions">
|
||||
<button onclick="bFixCross()">Исправить меж-mwm</button><br>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="info">
|
||||
|
|
@ -158,6 +161,16 @@
|
|||
<div id="backup_list"></div>
|
||||
<button onclick="bBackupCancel()">Вернуться</button>
|
||||
</div>
|
||||
<div id="fixcross" class="action">
|
||||
Границы региона <span id="fc_sel"></span> будут поправлены, чтобы включать в себя подсвеченные красным линии.
|
||||
Кликайте на линии, чтобы изменять их статус.<br>
|
||||
<br>
|
||||
<button onclick="bFixCrossPreview()">Посмотреть, что получится</button><br>
|
||||
<div id="fc_do">
|
||||
<button onclick="bFixCrossDo()">Включить линии в контур</button>
|
||||
</div>
|
||||
<button onclick="bFixCrossCancel()">Вернуться</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="map"></div>
|
||||
</body>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue