From 56bcce42ec6653709065b0346a4eece61244c25f Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Mon, 18 Jun 2018 22:58:16 +0300
Subject: [PATCH] v. 0.57.03b

---
 index.html | 10 ++++++----
 script.js  | 30 +++++++++++++++++-------------
 2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/index.html b/index.html
index 01c34939..25cd3920 100644
--- a/index.html
+++ b/index.html
@@ -32,8 +32,8 @@
   <script src="libs/quantize.min.js" defer></script>
   <script src="libs/d3-hexbin.v0.2.min.js" defer></script>
   <script src="libs/jquery.ui.touch-punch.min.js" defer></script>
-  <link rel="stylesheet" type="text/css" href="index.css?version=0.57.02b"/>
-  <link rel="stylesheet" type="text/css" href="icons.css?version=0.57.02b"/>
+  <link rel="stylesheet" type="text/css" href="index.css?version=0.57.03b"/>
+  <link rel="stylesheet" type="text/css" href="icons.css?version=0.57.03b"/>
   <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/>
 </head>
 <body>
@@ -575,9 +575,11 @@
   <div id="routeEditor" class="dialog" style="display: none">
     <button id="routeGroups" onmouseover="tip('Change path group')" class="icon-map-signs" onclick="$('#routeEditor').children().not(this).toggle()"></button>
     <div id="routeGroupsSelection" style="display: none">
-      <select id="routeGroup" onmouseover="tip('Select a group for this route')"></select>
+      <select id="routeGroup" onmouseover="tip('Select a group for this route')">
+        <option value="roads" selected>roads</option>
+      </select>
     </div>
-    <button id="routeLength"></button>
+    <button id="routeLength">0</button>
     <button id="routeSplit" onmouseover="tip('Click on a control point to split the route')" class="icon-unlink" onclick="$(this).toggleClass('pressed')"></button>
     <button id="routeNew" onmouseover="tip('Create new route clicking on map')" class="icon-map-pin"></button>
     <button id="routeRemove" onmouseover="tip('Remove route')" class="icon-trash"></button>
diff --git a/script.js b/script.js
index 8dec6e00..5b3fee27 100644
--- a/script.js
+++ b/script.js
@@ -2200,18 +2200,20 @@ function fantasyMap() {
     function newRouteAddPoint() {
       const point = d3.mouse(this);
       const x = rn(point[0], 2), y = rn(point[1], 2);
-      let group = elSelected ? d3.select(elSelected.node().parentNode) : null;
       let routeType = routeGroup.value;
       if (!elSelected) {
         const index = getIndex(point);
         const height = cells[index].height;
-        routeType = height < 0.2 ? "searoutes" : "roads";
-        group = routes.select("#"+routeType);
+        if (height < 0.2) routeType = "searoutes";
+        if (routeType === "searoutes" && height >= 0.2) routeType = "roads";
       }
+      const group = routes.select("#"+routeType);
       addRoutePoint({x, y});
       if (!elSelected || elSelected.attr("data-route") !== "new") {
         const id = routeType + "" + group.selectAll("*").size();
-        elSelected = group.append("path").attr("data-route", "new").attr("id", id).on("click", completeNewRoute);
+        elSelected = group.append("path").attr("data-route", "new").attr("id", id).on("click", editRoute);
+        routeUpdateGroups();
+        routeType.value = routeType;
         $("#routeEditor").dialog({
           title: "Edit Route",
           minHeight: 30, width: "auto", resizable: false,
@@ -2230,9 +2232,10 @@ function fantasyMap() {
     function completeNewRoute() {
       $("#routeNew, #addRoute").removeClass('pressed');
       restoreDefaultEvents();
+      if (!elSelected) return;
       if (elSelected.attr("data-route") === "new") {
         routeRedraw();
-        elSelected.attr("data-route", "").on("click", editRoute);
+        elSelected.attr("data-route", "");
         const node = elSelected.node();
         const l = node.getTotalLength();
         let pathCells = [];
@@ -2252,6 +2255,7 @@ function fantasyMap() {
     }
 
     function routeUpdateGroups() {
+      const group = d3.select(elSelected.node().parentNode);
       const type = group.attr("data-type");
       routeGroup.innerHTML = "";
       routes.selectAll("g").each(function(d) {
@@ -2264,6 +2268,7 @@ function fantasyMap() {
     }
 
     function routeSplitInPoint(clicked) {
+      const group = d3.select(this.parentNode);
       $("#routeSplit").removeClass('pressed');
       let points1 = [], points2 = [];
       let points = points1;
@@ -2284,10 +2289,7 @@ function fantasyMap() {
     }
 
     $("#routeGroup").change(function() {
-      const newGroup = this.value;
-      if (routeType === newGroup) {return;}
-      $(elSelected.node()).detach().appendTo($("#"+newGroup));
-      routeType = newGroup;
+      $(elSelected.node()).detach().appendTo($("#"+this.value));
     });
 
     $("#routeNew").click(function() {
@@ -5064,16 +5066,18 @@ function fantasyMap() {
       $("#labels #capitals, #labels #towns").detach().appendTo($("#burgLabels"));
       $("#icons #capitals, #icons #towns").detach().appendTo($("#burgIcons"));
       labels.select("#burgLabels").selectAll("text").each(function() {
-        const id = +this.getAttribute("id").replace("manorLabel", "");
+        let id = this.getAttribute("id");
+        if (!id) return;
         this.removeAttribute("id");
-        this.setAttribute("data-id", id);
+        this.setAttribute("data-id", +id.replace("manorLabel", ""));
       });
       icons.select("#burgIcons").select("#capitals").attr("font-size", 1).attr("fill-opacity", .7).attr("stroke-opacity", 1);
       icons.select("#burgIcons").select("#towns").attr("font-size", .5).attr("fill-opacity", .7).attr("stroke-opacity", 1);
       icons.select("#burgIcons").selectAll("circle").each(function() {
-        const id = +this.getAttribute("id").replace("manorIcon", "");
+        let id = this.getAttribute("id");
+        if (!id) return;
         this.removeAttribute("id");
-        this.setAttribute("data-id", id);
+        this.setAttribute("data-id", +id.replace("manorIcon", ""));
       });
       icons.select("#capital-anchors").raise().attr("font-size", 2).attr("size", null);
       icons.select("#town-anchorss").raise().attr("font-size", 1).attr("size", null);
