feat: routes - add route on burg creation

modules/ui/burgs-overview.js

@@ -279,7 +279,8 @@ function overviewBurgs(settings = {stateId: null, cultureId: null}) {
 
   function addBurgOnClick() {
     const point = d3.mouse(this);
-    const cell = findCell(point[0], point[1]);
+    const cell = findCell(...point);
+
     if (pack.cells.h[cell] < 20)
       return tip("You cannot place state into the water. Please click on a land cell", false, "error");
     if (pack.cells.burg[cell])

modules/ui/editors.js

@@ -132,27 +132,43 @@ function applySorting(headers) {
 }
 
 function addBurg(point) {
-  const cells = pack.cells;
-  const x = rn(point[0], 2),
-    y = rn(point[1], 2);
-  const cell = findCell(x, point[1]);
-  const i = pack.burgs.length;
-  const culture = cells.culture[cell];
-  const name = Names.getCulture(culture);
-  const state = cells.state[cell];
-  const feature = cells.f[cell];
+  const {cells, states} = pack;
+  const x = rn(point[0], 2);
+  const y = rn(point[1], 2);
 
-  const temple = pack.states[state].form === "Theocracy";
-  const population = Math.max(cells.s[cell] / 3 + i / 1000 + (cell % 100) / 1000, 0.1);
-  const type = BurgsAndStates.getType(cell, false);
+  const cellId = findCell(x, y);
+  const i = pack.burgs.length;
+  const culture = cells.culture[cellId];
+  const name = Names.getCulture(culture);
+  const state = cells.state[cellId];
+  const feature = cells.f[cellId];
+
+  const population = Math.max(cells.s[cellId] / 3 + i / 1000 + (cellId % 100) / 1000, 0.1);
+  const type = BurgsAndStates.getType(cellId, false);
 
   // generate emblem
-  const coa = COA.generate(pack.states[state].coa, 0.25, null, type);
+  const coa = COA.generate(states[state].coa, 0.25, null, type);
   coa.shield = COA.getShield(culture, state);
   COArenderer.add("burg", i, coa, x, y);
 
-  pack.burgs.push({name, cell, x, y, state, i, culture, feature, capital: 0, port: 0, temple, population, coa, type});
-  cells.burg[cell] = i;
+  const burg = {
+    name,
+    cell: cellId,
+    x,
+    y,
+    state,
+    i,
+    culture,
+    feature,
+    capital: 0,
+    port: 0,
+    temple: 0,
+    population,
+    coa,
+    type
+  };
+  pack.burgs.push(burg);
+  cells.burg[cellId] = i;
 
   const townSize = burgIcons.select("#towns").attr("size") || 0.5;
   burgIcons
@@ -173,7 +189,17 @@ function addBurg(point) {
     .attr("dy", `${townSize * -1.5}px`)
     .text(name);
 
-  BurgsAndStates.defineBurgFeatures(pack.burgs[i]);
+  BurgsAndStates.defineBurgFeatures(burg);
+
+  const newRoute = Routes.connect(cellId);
+  if (newRoute && layerIsOn("toggleRoutes")) {
+    routes
+      .select("#" + newRoute.group)
+      .append("path")
+      .attr("d", Routes.getPath(newRoute))
+      .attr("id", "route" + newRoute.i);
+  }
+
   return i;
 }
 

modules/ui/layers.js

@@ -1631,26 +1631,14 @@ function toggleRoutes(event) {
   }
 }
 
-const ROUTE_CURVES = {
-  roads: d3.curveCatmullRom.alpha(0.1),
-  trails: d3.curveCatmullRom.alpha(0.1),
-  searoutes: d3.curveCatmullRom.alpha(0.5),
-  default: d3.curveCatmullRom.alpha(0.1)
-};
-
 function drawRoutes() {
   TIME && console.time("drawRoutes");
   const routePaths = {};
-  const lineGen = d3.line();
 
   for (const route of pack.routes) {
     const {i, group} = route;
-    lineGen.curve(ROUTE_CURVES[group] || ROUTE_CURVES.default);
-    const points = route.points.map(p => [p[0], p[1]]);
-    const path = round(lineGen(points), 1);
-
     if (!routePaths[group]) routePaths[group] = [];
-    routePaths[group].push(`<path id="route${i}" d="${path}"/>`);
+    routePaths[group].push(`<path id="route${i}" d="${Routes.getPath(route)}"/>`);
   }
 
   routes.selectAll("path").remove();

modules/ui/routes-creator.js

@@ -84,15 +84,12 @@ function createRoute(defaultGroup) {
       .attr("r", 0.6);
 
     const group = byId("routeCreatorGroupSelect").value;
-    const lineGen = d3.line();
-    lineGen.curve(ROUTE_CURVES[group] || ROUTE_CURVES.default);
-    const path = round(lineGen(points), 1);
 
     routes.select("#routeTemp").remove();
     routes
       .select("#" + group)
       .append("path")
-      .attr("d", path)
+      .attr("d", Routes.getPath({group, points}))
       .attr("id", "routeTemp");
   }
 

modules/ui/routes-editor.js

@@ -134,13 +134,7 @@ function editRoute(id) {
   }
 
   function redrawRoute(route) {
-    const lineGen = d3.line();
-    lineGen.curve(ROUTE_CURVES[route.group] || ROUTE_CURVES.default);
-
-    const points = route.points.map(p => [p[0], p[1]]);
-    const path = round(lineGen(points), 1);
-    elSelected.attr("d", path);
-
+    elSelected.attr("d", Routes.getPath(route));
     updateRouteLength(route);
     if (byId("elevationProfile").offsetParent) showRouteElevationProfile();
   }