mirror of
https://github.com/Azgaar/Fantasy-Map-Generator.git
synced 2025-12-17 17:51:24 +01:00
fix: routes id after removing all
This commit is contained in:
parent
106d5edc78
commit
9c97711a99
6 changed files with 15 additions and 10 deletions
|
|
@ -8190,7 +8190,7 @@
|
||||||
<script src="modules/cultures-generator.js?v=1.99.00"></script>
|
<script src="modules/cultures-generator.js?v=1.99.00"></script>
|
||||||
<script src="modules/renderers/state-labels.js?v=1.96.04"></script>
|
<script src="modules/renderers/state-labels.js?v=1.96.04"></script>
|
||||||
<script src="modules/burgs-and-states.js?v=1.99.00"></script>
|
<script src="modules/burgs-and-states.js?v=1.99.00"></script>
|
||||||
<script src="modules/routes-generator.js?v=1.99.00"></script>
|
<script src="modules/routes-generator.js?v=1.99.02"></script>
|
||||||
<script src="modules/religions-generator.js?v=1.99.00"></script>
|
<script src="modules/religions-generator.js?v=1.99.00"></script>
|
||||||
<script src="modules/military-generator.js?v=1.99.00"></script>
|
<script src="modules/military-generator.js?v=1.99.00"></script>
|
||||||
<script src="modules/markers-generator.js?v=1.99.00"></script>
|
<script src="modules/markers-generator.js?v=1.99.00"></script>
|
||||||
|
|
@ -8219,8 +8219,8 @@
|
||||||
<script defer src="modules/ui/namesbase-editor.js?v=1.99.00"></script>
|
<script defer src="modules/ui/namesbase-editor.js?v=1.99.00"></script>
|
||||||
<script defer src="modules/ui/elevation-profile.js?v=1.99.00"></script>
|
<script defer src="modules/ui/elevation-profile.js?v=1.99.00"></script>
|
||||||
<script defer src="modules/ui/temperature-graph.js?v=1.99.00"></script>
|
<script defer src="modules/ui/temperature-graph.js?v=1.99.00"></script>
|
||||||
<script defer src="modules/ui/routes-editor.js?v=1.99.00"></script>
|
<script defer src="modules/ui/routes-editor.js?v=1.99.02"></script>
|
||||||
<script defer src="modules/ui/routes-creator.js?v=1.99.00"></script>
|
<script defer src="modules/ui/routes-creator.js?v=1.99.02"></script>
|
||||||
<script defer src="modules/ui/route-group-editor.js?v=1.99.00"></script>
|
<script defer src="modules/ui/route-group-editor.js?v=1.99.00"></script>
|
||||||
<script defer src="modules/ui/ice-editor.js?v=1.99.00"></script>
|
<script defer src="modules/ui/ice-editor.js?v=1.99.00"></script>
|
||||||
<script defer src="modules/ui/lakes-editor.js?v=1.99.00"></script>
|
<script defer src="modules/ui/lakes-editor.js?v=1.99.00"></script>
|
||||||
|
|
@ -8235,7 +8235,7 @@
|
||||||
<script defer src="modules/ui/diplomacy-editor.js?v=1.99.00"></script>
|
<script defer src="modules/ui/diplomacy-editor.js?v=1.99.00"></script>
|
||||||
<script defer src="modules/ui/zones-editor.js?v=1.99.00"></script>
|
<script defer src="modules/ui/zones-editor.js?v=1.99.00"></script>
|
||||||
<script defer src="modules/ui/burgs-overview.js?v=1.99.00"></script>
|
<script defer src="modules/ui/burgs-overview.js?v=1.99.00"></script>
|
||||||
<script defer src="modules/ui/routes-overview.js?v=1.99.00"></script>
|
<script defer src="modules/ui/routes-overview.js?v=1.99.02"></script>
|
||||||
<script defer src="modules/ui/rivers-overview.js?v=1.99.00"></script>
|
<script defer src="modules/ui/rivers-overview.js?v=1.99.00"></script>
|
||||||
<script defer src="modules/ui/military-overview.js?v=1.99.00"></script>
|
<script defer src="modules/ui/military-overview.js?v=1.99.00"></script>
|
||||||
<script defer src="modules/ui/regiments-overview.js?v=1.99.00"></script>
|
<script defer src="modules/ui/regiments-overview.js?v=1.99.00"></script>
|
||||||
|
|
|
||||||
|
|
@ -434,7 +434,7 @@ window.Routes = (function () {
|
||||||
const points = getPoints("trails", pathCells, pointsArray);
|
const points = getPoints("trails", pathCells, pointsArray);
|
||||||
const feature = cells.f[cellId];
|
const feature = cells.f[cellId];
|
||||||
|
|
||||||
const routeId = Math.max(...routes.map(route => route.i)) + 1;
|
const routeId = getNextId();
|
||||||
const newRoute = {i: routeId, group: "trails", feature, points};
|
const newRoute = {i: routeId, group: "trails", feature, points};
|
||||||
routes.push(newRoute);
|
routes.push(newRoute);
|
||||||
|
|
||||||
|
|
@ -706,6 +706,10 @@ window.Routes = (function () {
|
||||||
return path.getTotalLength();
|
return path.getTotalLength();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getNextId() {
|
||||||
|
return pack.routes.length ? Math.max(...pack.routes.map(r => r.i)) + 1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
function remove(route) {
|
function remove(route) {
|
||||||
const routes = pack.cells.routes;
|
const routes = pack.cells.routes;
|
||||||
|
|
||||||
|
|
@ -738,6 +742,7 @@ window.Routes = (function () {
|
||||||
generateName,
|
generateName,
|
||||||
getPath,
|
getPath,
|
||||||
getLength,
|
getLength,
|
||||||
|
getNextId,
|
||||||
remove
|
remove
|
||||||
};
|
};
|
||||||
})();
|
})();
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ function createRoute(defaultGroup) {
|
||||||
const points = createRoute.points;
|
const points = createRoute.points;
|
||||||
if (points.length < 2) return tip("Add at least 2 points", false, "error");
|
if (points.length < 2) return tip("Add at least 2 points", false, "error");
|
||||||
|
|
||||||
const routeId = Math.max(...pack.routes.map(route => route.i)) + 1;
|
const routeId = Routes.getNextId();
|
||||||
const group = byId("routeCreatorGroupSelect").value;
|
const group = byId("routeCreatorGroupSelect").value;
|
||||||
const feature = pack.cells.f[points[0][2]];
|
const feature = pack.cells.f[points[0][2]];
|
||||||
const route = {points, group, feature, i: routeId};
|
const route = {points, group, feature, i: routeId};
|
||||||
|
|
|
||||||
|
|
@ -194,7 +194,7 @@ function editRoute(id) {
|
||||||
|
|
||||||
// create new route
|
// create new route
|
||||||
const newRoute = {
|
const newRoute = {
|
||||||
i: Math.max(...pack.routes.map(route => route.i)) + 1,
|
i: Routes.getNextId(),
|
||||||
group: route.group,
|
group: route.group,
|
||||||
feature: route.feature,
|
feature: route.feature,
|
||||||
name: route.name,
|
name: route.name,
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ function overviewRoutes() {
|
||||||
|
|
||||||
// update footer
|
// update footer
|
||||||
routesFooterNumber.innerHTML = pack.routes.length;
|
routesFooterNumber.innerHTML = pack.routes.length;
|
||||||
const averageLength = rn(d3.mean(pack.routes.map(r => r.length)));
|
const averageLength = rn(d3.mean(pack.routes.map(r => r.length)) || 0);
|
||||||
routesFooterLength.innerHTML = averageLength * distanceScale + " " + distanceUnitInput.value;
|
routesFooterLength.innerHTML = averageLength * distanceScale + " " + distanceUnitInput.value;
|
||||||
|
|
||||||
// add listeners
|
// add listeners
|
||||||
|
|
@ -175,8 +175,8 @@ function overviewRoutes() {
|
||||||
pack.routes = [];
|
pack.routes = [];
|
||||||
routes.selectAll("path").remove();
|
routes.selectAll("path").remove();
|
||||||
|
|
||||||
|
routesOverviewAddLines();
|
||||||
$(this).dialog("close");
|
$(this).dialog("close");
|
||||||
$("#routesOverview").dialog("close");
|
|
||||||
},
|
},
|
||||||
Cancel: function () {
|
Cancel: function () {
|
||||||
$(this).dialog("close");
|
$(this).dialog("close");
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
// version and caching control
|
// version and caching control
|
||||||
const version = "1.99.01"; // generator version, update each time
|
const version = "1.99.02"; // generator version, update each time
|
||||||
|
|
||||||
{
|
{
|
||||||
document.title += " v" + version;
|
document.title += " v" + version;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue