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

javascript config

Browse source
This commit is contained in:
Ilya Zverev 2015-03-27 13:10:25 +03:00
parent 85563072fb
commit 5bb570d7be
6 changed files with 41 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
www/borders.js
View file

@ -29,15 +29,15 @@ function init() {
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';
document.getElementById('filefm').action = getServer('import');
$('#r_green').val(size_good);
$('#r_red').val(size_bad);
checkHasOSM();
filterSelect();
filterSelect(true);
}
function checkHasOSM() {
$.ajax(server + '/tables', {
$.ajax(getServer('tables'), {
success: function(res) {
if( res.osm )
$('#osm_actions').css('display', 'block');
@ -53,7 +53,7 @@ function checkHasOSM() {
function updateBorders() {
var b = map.getBounds(),
simplified = map.getZoom() < 7 ? 2 : (map.getZoom() < 11 ? 1 : 0);
$.ajax(server + '/bbox', {
$.ajax(getServer('bbox'), {
data: {
'simplify' : simplified,
'xmin': b.getWest(),
@ -68,7 +68,7 @@ function updateBorders() {
if( oldBordersLayer != null && OLD_BORDERS_NAME ) {
oldBordersLayer.clearLayers();
$.ajax(server + '/bbox', {
$.ajax(getServer('bbox'), {
data: {
'table': OLD_BORDERS_NAME,
'simplify': simplified,
@ -107,7 +107,7 @@ function processResult(data) {
var b = map.getBounds();
if( tooSmallLayer != null ) {
tooSmallLayer.clearLayers();
$.ajax(server + '/small', {
$.ajax(getServer('small'), {
data: {
'xmin': b.getWest(),
'xmax': b.getEast(),
@ -198,7 +198,7 @@ function selectLayer(e) {
$('#rename').css('display', 'none');
}
function filterSelect() {
function filterSelect(noRefresh) {
value = $('#f_type').val();
$('#f_size').css('display', value == 'size' ? 'block' : 'none');
$('#f_chars').css('display', value == 'chars' ? 'block' : 'none');
@ -211,7 +211,8 @@ function filterSelect() {
map.removeLayer(tooSmallLayer);
tooSmallLayer = null;
}
updateBorders();
if( !noRefresh )
updateBorders();
}
function getColor(props) {
@ -282,7 +283,7 @@ function bOldBorders() {
function bJOSM() {
var b = map.getBounds();
var url = server + '/josm?' + $.param({
var url = getServer('josm') + '?' + $.param({
'xmin': b.getWest(),
'xmax': b.getEast(),
'ymin': b.getSouth(),
@ -300,7 +301,7 @@ function bJOSM() {
function bJosmOld() {
var b = map.getBounds();
var url = server + '/josm?' + $.param({
var url = getServer('josm') + '?' + $.param({
'table': OLD_BORDERS_NAME,
'xmin': b.getWest(),
'xmax': b.getEast(),
@ -345,7 +346,7 @@ function bRename() {
if( !selectedId || !(selectedId in borders) )
return;
$('#rename').css('display', 'none');
$.ajax(server + '/rename', {
$.ajax(getServer('rename'), {
data: { 'name': selectedId, 'newname': $('#b_rename').val() },
success: updateBorders
});
@ -354,7 +355,7 @@ function bRename() {
function bDisable() {
if( !selectedId || !(selectedId in borders) )
return;
$.ajax(server + (borders[selectedId].disabled ? '/enable' : '/disable'), {
$.ajax(getServer(borders[selectedId].disabled ? 'enable' : 'disable'), {
data: { 'name': selectedId },
success: updateBorders
});
@ -365,7 +366,7 @@ function bDelete() {
return;
if( !window.confirm('Точно удалить регион ' + selectedId + '?') )
return;
$.ajax(server + '/delete', {
$.ajax(getServer('delete'), {
data: { 'name': selectedId },
success: updateBorders
});
@ -374,7 +375,7 @@ function bDelete() {
function sendComment( text ) {
if( !selectedId || !(selectedId in borders) )
return;
$.ajax(server + '/comment', {
$.ajax(getServer('comment'), {
data: { 'name': selectedId, 'comment': text },
type: 'POST',
success: updateBorders
@ -429,7 +430,7 @@ function bSplitDo() {
wkt += ',';
wkt += L.Util.formatNum(lls[i].lng, 6) + ' ' + L.Util.formatNum(lls[i].lat, 6);
}
$.ajax(server + '/split', {
$.ajax(getServer('split'), {
data: { 'name': splitSelected, 'line': 'LINESTRING(' + wkt + ')' },
datatype: 'json',
success: function(data) { if( data.status != 'ok' ) alert(data.status); else updateBorders(); }
@ -469,7 +470,7 @@ function bJoinSelect(layer) {
function bJoinDo() {
if( joinSelected != null && joinAnother != null ) {
$.ajax(server + '/join', {
$.ajax(getServer('join'), {
data: { 'name': joinSelected, 'name2': joinAnother },
success: updateBorders
});
@ -496,7 +497,7 @@ function bPoint() {
function bPointList() {
var ll = pMarker.getLatLng();
$.ajax(server + '/point', {
$.ajax(getServer('point'), {
data: { 'lat': ll.lat, 'lon': ll.lng },
dataType: 'json',
success: updatePointList
@ -521,7 +522,7 @@ function updatePointList(data) {
function pPointSelect(id, name1) {
var name = $('#p_name').val();
name = name.replace('*', name1);
$.ajax(server + '/from_osm', {
$.ajax(getServer('from_osm'), {
data: { 'name': name, 'id': id },
success: updateBorders
});
@ -558,7 +559,7 @@ function bDividePreview() {
}
$('#d_do').css('display', 'none');
$('#d_none').css('display', 'none');
$.ajax(server + '/divpreview', {
$.ajax(getServer('divpreview'), {
data: {
'like': $('#d_like').val(),
'query': $('#d_where').val()
@ -583,7 +584,7 @@ function bDivideDrawPreview(geojson) {
}
function bDivideDo() {
$.ajax(server + '/divide', {
$.ajax(getServer('divide'), {
data: {
'name': divSelected,
'prefix': $('#d_prefix').val(),
@ -608,7 +609,7 @@ function bDivideCancel() {
function bLargest() {
if( !selectedId || !(selectedId in borders) )
return;
$.ajax(server + '/chop1', {
$.ajax(getServer('chop1'), {
data: { 'name': selectedId },
success: updateBorders
});
@ -617,7 +618,7 @@ function bLargest() {
function bHull() {
if( !selectedId || !(selectedId in borders) )
return;
$.ajax(server + '/hull', {
$.ajax(getServer('hull'), {
data: { 'name': selectedId },
success: updateBorders
});
@ -630,7 +631,7 @@ function bBackup() {
$('#backup_save').attr('disabled', false);
$('#backup_list').text('');
$('#backup').css('display', 'block');
$.ajax(server + '/backlist', {
$.ajax(getServer('backlist'), {
success: updateBackupList
});
}
@ -664,7 +665,7 @@ function updateBackupList(data) {
}
function bBackupSave() {
$.ajax(server + '/backup', {
$.ajax(getServer('backup'), {
success: bBackupCancel
});
$('#backup_save').attr('disabled', true);
@ -672,7 +673,7 @@ function bBackupSave() {
}
function bBackupRestore(timestamp) {
$.ajax(server + '/restore', {
$.ajax(getServer('restore'), {
data: { 'timestamp': timestamp },
success: function() { bBackupCancel(); updateBorders(); }
});
@ -681,7 +682,7 @@ function bBackupRestore(timestamp) {
}
function bBackupDelete(timestamp) {
$.ajax(server + '/backdelete', {
$.ajax(getServer('backdelete'), {
data: { 'timestamp': timestamp }
});
bBackupCancel();

4
www/config.js Normal file
View file

@ -0,0 +1,4 @@
function getServer(endpoint) {
var server = '/borders-api';
return endpoint ? server + '/' + endpoint : server;
}

8
www/import.html
View file

@ -3,12 +3,18 @@
<head>
<meta charset="utf-8">
<title>Заливка поправленных границ</title>
<script src="config.js"></script>
</head>
<body>
<body onload="init();">
<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>
<script>
function init() {
document.getElementById('filefm').action = getServer('import');
}
</script>
</body>
</html>

2
www/index.html
View file

@ -8,8 +8,8 @@
<script src="lib/Leaflet.Editable.js"></script>
<script src="lib/leaflet-hash.js"></script>
<script src="lib/jquery-1.11.2.min.js"></script>
<script src="config.js"></script>
<script src="borders.js"></script>
<script>server = 'http://127.0.0.1:5000';</script>
<style>
html, body, #map, #panel { margin: 0; height: 100%; }
#panel { width: 250px; float: right; padding: 1em; font-family: sans-serif; }

2
www/stat.html
View file

@ -4,8 +4,8 @@
<meta charset="utf-8">
<title>Статистика границ для MAPS.ME</title>
<script src="lib/jquery-1.11.2.min.js"></script>
<script src="config.js"></script>
<script src="stat.js"></script>
<script>server = 'http://127.0.0.1:5000';</script>
<style>
body > div { display: none; margin-bottom: 1em; }
#sizes > div { margin-top: 1em; }

2
www/stat.js
View file

@ -11,7 +11,7 @@ function statOpen(id) {
}
function statQuery(id, callback) {
$.ajax(server + '/stat', {
$.ajax(getServer('stat'), {
data: { 'group': id },
success: function(data) {
callback(data);