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

disablable import

Browse source
This commit is contained in:
Ilya Zverev 2015-03-27 11:02:21 +03:00
parent 703146fd87
commit f225a07dfe
3 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
www/borders.js
View file

@ -4,9 +4,10 @@ var FILL_TOO_SMALL = '#0f0';
var FILL_TOO_BIG = '#800';
var FILL_ZERO = 'black';
var OLD_BORDERS_NAME; // filled in checkHasOSM()
var IMPORT_ENABLED = false;
var map, borders = {}, bordersLayer, selectedId, editing = false;
var size_good = 5, size_bad = 100;
var size_good = 5, size_bad = 50;
var tooSmallLayer = null;
var oldBordersLayer = null;
@ -23,6 +24,11 @@ function init() {
$('#b_josm').css('visibility', map.getZoom() >= 7 ? 'visible' : 'hidden');
});
if( IMPORT_ENABLED ) {
$('#filefm').css('display', 'block');
var iframe = '<iframe name="import_frame" style="display: none;" width="230" height="80" src="about:blank"></iframe>';
$('#filefm').after(iframe);
}
document.getElementById('filefm').action = server + '/import';
$('#r_green').val(size_good);
$('#r_red').val(size_bad);
@ -537,6 +543,7 @@ function bDivide() {
divSelected = selectedId;
$('#actions').css('display', 'none');
$('#d_do').css('display', 'none');
$('#d_none').css('display', 'none');
$('#divide').css('display', 'block');
// pre-fill 'like' and 'where' fields
$('#d_like').val(borders[selectedId].name);
@ -550,6 +557,7 @@ function bDividePreview() {
divPreview = null;
}
$('#d_do').css('display', 'none');
$('#d_none').css('display', 'none');
$.ajax(server + '/divpreview', {
data: {
'like': $('#d_like').val(),
@ -560,15 +568,17 @@ function bDividePreview() {
}
function bDivideDrawPreview(geojson) {
if( !('features' in geojson) || !geojson.features.length )
if( !('features' in geojson) || !geojson.features.length ) {
$('#d_none').css('display', 'block');
return;
}
divPreview = L.geoJson(geojson, {
style: function(f) {
return { color: 'blue', weight: 1, fill: false };
}
});
map.addLayer(divPreview);
$('#d_count').text(geojson.features.length + ' областей');
$('#d_count').text(geojson.features.length);
$('#d_do').css('display', 'block');
}

14
www/import.html Normal file
View file

@ -0,0 +1,14 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title>Заливка поправленных границ</title>
</head>
<body>
<form action="http://127.0.0.1:5000/import" enctype="multipart/form-data" method="post" id="filefm" target="import_frame">
Импорт <input type="file" accept=".osm,.xml" name="file">
<input type="submit">
</form>
<iframe name="import_frame" width="500" height="200" src="about:blank"></iframe>
</body>
</html>

6
www/index.html
View file

@ -24,7 +24,7 @@
#header { border-bottom: 1px solid gray; margin-bottom: 1em; padding-bottom: 1em; }
#f_topo, #f_chars, #f_comments { font-size: 10pt; }
#backup_saving, #backup_restoring { margin-bottom: 1em; }
#old_action, #josm_old { display: none; }
#filefm, #old_action, #josm_old { display: none; }
</style>
</head>
<body onload="init();">
@ -60,7 +60,6 @@
<form action="" enctype="multipart/form-data" method="post" id="filefm" target="import_frame">
Импорт <input type="file" accept=".osm,.xml" name="file" id="b_import" onchange="bImport();" style="max-width: 100px;">
</form>
<iframe name="import_frame" style="display: none;" width="230" height="80" src="about:blank"></iframe>
<button onclick="bBackup()">Архив границ</button><br>
<div id="old_action">
<input type="checkbox" id="old" onchange="bOldBorders()"><label for="old"> старые границы</label>
@ -133,8 +132,9 @@
Like для названия выбранной области <input type="text" id="d_like"><br>
Where для субобластей <input type="text" id="d_where"><br>
<button onclick="bDividePreview()">Посмотреть субобласти</button><br>
<div id="d_none">Нет областей</div>
<div id="d_do">
<span id="d_count"></span><br>
<span id="d_count"></span> областей<br>
Префикс <input type="text" id="d_prefix"><br>
<button onclick="bDivideDo()">Заменить область</button>
</div>