From 08518a771cafca8fa6c67be858a6504078658bc1 Mon Sep 17 00:00:00 2001
From: Alexey Zakharenkov
 <35913079+alexey-zakharenkov@users.noreply.github.com>
Date: Fri, 24 Jul 2020 14:59:31 +0300
Subject: [PATCH] Do not show 'Divide' button in 'divide preview' mode in case
 of only one subregion/cluster

---
 web/app/static/borders.js    | 50 +++++++++++++++++++-----------------
 web/app/templates/index.html |  9 ++-----
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/web/app/static/borders.js b/web/app/static/borders.js
index c386cb6..f48fef7 100644
--- a/web/app/static/borders.js
+++ b/web/app/static/borders.js
@@ -376,7 +376,7 @@ function getColor(props) {
 			color = FILL_TOO_BIG;
 	}
     else if (fType == 'country') {
-        color = getCountryColor(props) 
+        color = getCountryColor(props);
     }
 	return color;
 }
@@ -439,7 +439,7 @@ function bOldBorders() {
 
 function importInJOSM(method, data) {
 	var url = getServer(method) + '?' + $.param(data);
-    var params = [ 
+    var params = [
             ['new_layer', 'true'],
             ['format', '.osm'],
             ['layer_name', 'borders_' + Date.now()],
@@ -448,7 +448,7 @@ function importInJOSM(method, data) {
     var params_str = params.map(x => (x[0] + '=' + x[1])).join('&');
 	$.ajax({
 		url: 'http://127.0.0.1:8111/import?' + encodeURI(params_str),
-        // Don't use ajax 'data' param since the order of 
+        // Don't use ajax 'data' param since the order of
         // params in url matters: url=<url> must be the last
         // otherwise all the rest params would be a part of that url.
 		complete: function(t) {
@@ -575,7 +575,7 @@ function finishChooseParent() {
 function bTogglePotentialParents() {
     var potentialParentsDiv = $('#potential_parents');
     if (potentialParentsDiv.is(':visible')) {
-        finishChooseParent(); 
+        finishChooseParent();
     }
     else {
         if (!selectedId || !(selectedId in borders))
@@ -642,7 +642,7 @@ function processPotentialParents(answer) {
     if (parents.length == 0) {
         potentialParentsDiv.html('Ничего не найдено.');
         return;
-    } 
+    }
     potentialParentsDiv.html('');
     var selectedParentId = borders[selectedIdForParentAssigning].parent_id;
     for (var i = 0; i < parents.length; ++i) {
@@ -805,14 +805,13 @@ function bJoinToParent() {
     var props = borders[selectedId];
     if (!props['parent_id']) {
         alert('Это регион верхнего уровня');
-        return; 
+        return;
     }
 	joinSelected = selectedId;
 	$('#j_to_parent_sel').text(props['name'] + ' (' + selectedId + ')');
 	$('#j_sel_parent').text(props['parent_name'] + ' (' + props['parent_id'] + ')');
 	$('#actions').hide();
 	$('#join_to_parent').show();
-    
 }
 
 function bJoinToParentPreview() {
@@ -910,7 +909,7 @@ function bPointCancel() {
 	map.removeLayer(pMarker);
 }
 
-var subregionsLayer = null, 
+var subregionsLayer = null,
     clustersLayer = null,
     divSelectedId = null;
 
@@ -918,14 +917,13 @@ function bDivide() {
 	if( !selectedId || !(selectedId in borders) )
 		return;
 	divSelectedId = selectedId;
-	$('#actions').css('display', 'none');
-	$('#d_do').css('display', 'none');
-	$('#d_none').css('display', 'none');
-	$('#divide').css('display', 'block');
+	$('#actions').hide();
+	$('#d_count').hide();
+	$('#b_divide').hide();
+	$('#divide').show();
 	// pre-fill 'like' and 'where' fields
-	$('#region_to_divide').text(borders[selectedId].name + ' (' + 
+	$('#region_to_divide').text(borders[selectedId].name + ' (' +
                      selectedId + ')');
-	$('#d_prefix').val(borders[selectedId].name);
     var next_admin_level = borders[selectedId].admin_level ?
                            borders[selectedId].admin_level + 1 : null;
 	$('#next_level').val(next_admin_level);
@@ -952,8 +950,8 @@ function bDividePreview() {
         return;
     }
     clearDivideLayers();
-	$('#d_do').hide();
-	$('#d_none').hide();
+	$('#d_count').hide();
+	$('#b_divide').hide();
     var apply_to_similar= $('#apply_to_similar').prop('checked');
     var params = {
         'id': divSelectedId,
@@ -975,7 +973,7 @@ function bDivideDrawPreview(response) {
     var subregions = response.subregions;
     var clusters = response.clusters;
 	if( !('features' in subregions) || !subregions.features.length ) {
-		$('#d_none').show();
+		$('#d_count').text('Нет областей').show();
 		return;
 	}
 	subregionsLayer = L.geoJson(subregions, {
@@ -985,7 +983,7 @@ function bDivideDrawPreview(response) {
 	});
 	map.addLayer(subregionsLayer);
     subregionsLayer.bringToFront();
-	if (clusters) { 
+	if (clusters) {
         clustersLayer = L.geoJson(clusters, {
             style: function(f) {
                 return { color: 'black', weight: 2, fill: false };
@@ -995,10 +993,16 @@ function bDivideDrawPreview(response) {
         clustersLayer.bringToFront();
     }
     var subregions_count_text = '' + subregions.features.length + ' подрегионов';
-    if (clusters)
-        subregions_count_text += ', ' + clusters.features.length + ' кластеров'; 
-	$('#d_count').text(subregions_count_text);
-	$('#d_do').show();
+    var show_divide_button = (subregions.features.length > 1);
+    if (clusters) {
+        subregions_count_text += ', ' + clusters.features.length + ' кластеров';
+        show_divide_button = (clusters.features.length > 1);
+    }
+	$('#d_count').text(subregions_count_text).show();
+    if (show_divide_button)
+        $('#b_divide').show();
+    else
+        $('#b_divide').hide();
 }
 
 function bDivideDo() {
@@ -1269,7 +1273,7 @@ function startOver() {
 	    bJoinToParentCancel();
     	bPointCancel();
     	bDivideCancel();
-        bBackupCancel(); 
+        bBackupCancel();
 	    bFixCrossCancel();
 	    selectLayer(null);
         $('#wait_start_over').show();
diff --git a/web/app/templates/index.html b/web/app/templates/index.html
index 37be9b2..a75465a 100644
--- a/web/app/templates/index.html
+++ b/web/app/templates/index.html
@@ -210,13 +210,8 @@
                     </label>
                 </div>
                	<button onclick="bDividePreview()">Посмотреть субобласти</button><br>
-				<div id="d_none">Нет областей</div>
-				<div id="d_do">
-					<span id="d_count"></span><br>
-					<!-- Префикс <input type="text" id="d_prefix"><br-->
-
-					<button onclick="bDivideDo()">Заменить область</button>
-				</div>
+				<div id="d_count"></div>
+				<button id="b_divide" onclick="bDivideDo()">Заменить область</button>
 				<br>
 				<button onclick="bDivideCancel()">Вернуться</button>
 			</div>