backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-22 20:11:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add only used hatchings on export

Browse source
This commit is contained in:
Azgaar 2022-02-06 22:38:58 +03:00 • committed by Peter
parent cf17d51910
commit 3e353e98cc
2 changed files with 124 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/export.js
View file

@ -180,9 +180,6 @@ async function getMapURL(type, options = {}) {
filters[i].remove(); filters[i].remove();
} }
const hatching = svgDefs.getElementById("defs-hatching");
if (hatching) cloneDefs.appendChild(hatching.cloneNode(true));
// remove unused patterns // remove unused patterns
const patterns = cloneEl.querySelectorAll("pattern"); const patterns = cloneEl.querySelectorAll("pattern");
for (let i = 0; i < patterns.length; i++) { for (let i = 0; i < patterns.length; i++) {
@ -261,17 +258,17 @@ async function getMapURL(type, options = {}) {
if (pattern) cloneDefs.appendChild(pattern.cloneNode(true)); if (pattern) cloneDefs.appendChild(pattern.cloneNode(true));
} }
if (!cloneEl.getElementById("defs-hatching").children.length) cloneEl.getElementById("defs-hatching")?.remove(); // remove unused hatching group
if (!cloneEl.getElementById("fogging-cont")) cloneEl.getElementById("fog")?.remove(); // remove unused fog if (!cloneEl.getElementById("fogging-cont")) cloneEl.getElementById("fog")?.remove(); // remove unused fog
if (!cloneEl.getElementById("regions")) cloneEl.getElementById("statePaths")?.remove(); // removed unused statePaths if (!cloneEl.getElementById("regions")) cloneEl.getElementById("statePaths")?.remove(); // removed unused statePaths
if (!cloneEl.getElementById("labels")) cloneEl.getElementById("textPaths")?.remove(); // removed unused textPaths if (!cloneEl.getElementById("labels")) cloneEl.getElementById("textPaths")?.remove(); // removed unused textPaths
// add armies style // add armies style
if (cloneEl.getElementById("armies")) if (cloneEl.getElementById("armies")) {
cloneEl.insertAdjacentHTML( cloneEl.insertAdjacentHTML(
"afterbegin", "afterbegin",
"<style>#armies text {stroke: none; fill: #fff; text-shadow: 0 0 4px #000; dominant-baseline: central; text-anchor: middle; font-family: Helvetica; fill-opacity: 1;}#armies text.regimentIcon {font-size: .8em;}</style>" "<style>#armies text {stroke: none; fill: #fff; text-shadow: 0 0 4px #000; dominant-baseline: central; text-anchor: middle; font-family: Helvetica; fill-opacity: 1;}#armies text.regimentIcon {font-size: .8em;}</style>"
); );
}
// add xlink: for href to support svg 1.1 // add xlink: for href to support svg 1.1
if (type === "svg") { if (type === "svg") {
@ -282,6 +279,16 @@ async function getMapURL(type, options = {}) {
}); });
} }
// add hatchings
const hatchingUsers = cloneEl.querySelectorAll(`[fill^='url(#hatch']`);
const hatchingFills = unique(Array.from(hatchingUsers).map(el => el.getAttribute("fill")));
const hatchingIds = hatchingFills.map(fill => fill.slice(5, -1));
for (const hatchingId of hatchingIds) {
const hatching = svgDefs.getElementById(hatchingId);
if (hatching) cloneDefs.appendChild(hatching.cloneNode(true));
}
// load fonts
const usedFonts = getUsedFonts(cloneEl); const usedFonts = getUsedFonts(cloneEl);
const fontsToLoad = usedFonts.filter(font => font.src); const fontsToLoad = usedFonts.filter(font => font.src);
if (fontsToLoad.length) { if (fontsToLoad.length) {

166
modules/load.js
View file

@ -425,16 +425,16 @@ function parseLoadedData(data) {
void (function resolveVersionConflicts() { void (function resolveVersionConflicts() {
const version = parseFloat(data[0].split('|')[0]); const version = parseFloat(data[0].split('|')[0]);
if (version < 0.9) { if (version < 0.9) {
// 0.9 has additional relief icons to be included into older maps // v0.9 has additional relief icons to be included into older maps
document.getElementById('defs-relief').innerHTML = reliefIcons; document.getElementById("defs-relief").innerHTML = reliefIcons;
} }
if (version < 1) { if (version < 1) {
// 1.0 adds a new religions layer // v1.0 adds a new religions layer
relig = viewbox.insert('g', '#terrain').attr('id', 'relig'); relig = viewbox.insert("g", "#terrain").attr("id", "relig");
Religions.generate(); Religions.generate();
// 1.0 adds a legend box // v1.0 adds a legend box
legend = svg.append("g").attr("id", "legend"); legend = svg.append("g").attr("id", "legend");
legend legend
.attr("font-family", "Almendra SC") .attr("font-family", "Almendra SC")
@ -447,7 +447,7 @@ function parseLoadedData(data) {
.attr("stroke-dasharray", "0 4 10 4") .attr("stroke-dasharray", "0 4 10 4")
.attr("stroke-linecap", "round"); .attr("stroke-linecap", "round");
// 1.0 separated drawBorders fron drawStates() // v1.0 separated drawBorders fron drawStates()
stateBorders = borders.append("g").attr("id", "stateBorders"); stateBorders = borders.append("g").attr("id", "stateBorders");
provinceBorders = borders.append("g").attr("id", "provinceBorders"); provinceBorders = borders.append("g").attr("id", "provinceBorders");
borders borders
@ -460,8 +460,8 @@ function parseLoadedData(data) {
stateBorders.attr("opacity", 0.8).attr("stroke", "#56566d").attr("stroke-width", 1).attr("stroke-dasharray", "2").attr("stroke-linecap", "butt"); stateBorders.attr("opacity", 0.8).attr("stroke", "#56566d").attr("stroke-width", 1).attr("stroke-dasharray", "2").attr("stroke-linecap", "butt");
provinceBorders.attr("opacity", 0.8).attr("stroke", "#56566d").attr("stroke-width", 0.5).attr("stroke-dasharray", "1").attr("stroke-linecap", "butt"); provinceBorders.attr("opacity", 0.8).attr("stroke", "#56566d").attr("stroke-width", 0.5).attr("stroke-dasharray", "1").attr("stroke-linecap", "butt");
// 1.0 adds state relations, provinces, forms and full names // v1.0 adds state relations, provinces, forms and full names
provs = viewbox.insert('g', '#borders').attr('id', 'provs').attr('opacity', 0.6); provs = viewbox.insert("g", "#borders").attr("id", "provs").attr("opacity", 0.6);
BurgsAndStates.collectStatistics(); BurgsAndStates.collectStatistics();
BurgsAndStates.generateCampaigns(); BurgsAndStates.generateCampaigns();
BurgsAndStates.generateDiplomacy(); BurgsAndStates.generateDiplomacy();
@ -472,42 +472,42 @@ function parseLoadedData(data) {
if (!layerIsOn('toggleBorders')) $('#borders').fadeOut(); if (!layerIsOn('toggleBorders')) $('#borders').fadeOut();
if (!layerIsOn('toggleStates')) regions.attr('display', 'none').selectAll('path').remove(); if (!layerIsOn('toggleStates')) regions.attr('display', 'none').selectAll('path').remove();
// 1.0 adds zones layer // v1.0 adds zones layer
zones = viewbox.insert('g', '#borders').attr('id', 'zones').attr('display', 'none'); zones = viewbox.insert("g", "#borders").attr("id", "zones").attr("display", "none");
zones.attr('opacity', 0.6).attr('stroke', null).attr('stroke-width', 0).attr('stroke-dasharray', null).attr('stroke-linecap', 'butt'); zones.attr("opacity", 0.6).attr("stroke", null).attr("stroke-width", 0).attr("stroke-dasharray", null).attr("stroke-linecap", "butt");
addZones(); addZones();
if (!markers.selectAll("*").size()) { if (!markers.selectAll("*").size()) {
Markers.generate(); Markers.generate();
turnButtonOn("toggleMarkers"); turnButtonOn("toggleMarkers");
} }
// 1.0 add fogging layer (state focus) // v1.0 add fogging layer (state focus)
fogging = viewbox.insert('g', '#ruler').attr('id', 'fogging-cont').attr('mask', 'url(#fog)').append('g').attr('id', 'fogging').style('display', 'none'); fogging = viewbox.insert("g", "#ruler").attr("id", "fogging-cont").attr("mask", "url(#fog)").append("g").attr("id", "fogging").style("display", "none");
fogging.append('rect').attr('x', 0).attr('y', 0).attr('width', '100%').attr('height', '100%'); fogging.append("rect").attr("x", 0).attr("y", 0).attr("width", "100%").attr("height", "100%");
defs.append('mask').attr('id', 'fog').append('rect').attr('x', 0).attr('y', 0).attr('width', '100%').attr('height', '100%').attr('fill', 'white'); defs.append("mask").attr("id", "fog").append("rect").attr("x", 0).attr("y", 0).attr("width", "100%").attr("height", "100%").attr("fill", "white");
// 1.0 changes states opacity bask to regions level // v1.0 changes states opacity bask to regions level
if (statesBody.attr('opacity')) { if (statesBody.attr("opacity")) {
regions.attr('opacity', statesBody.attr('opacity')); regions.attr("opacity", statesBody.attr("opacity"));
statesBody.attr('opacity', null); statesBody.attr("opacity", null);
} }
// 1.0 changed labels to multi-lined // v1.0 changed labels to multi-lined
labels.selectAll('textPath').each(function () { labels.selectAll("textPath").each(function () {
const text = this.textContent; const text = this.textContent;
const shift = this.getComputedTextLength() / -1.5; const shift = this.getComputedTextLength() / -1.5;
this.innerHTML = `<tspan x="${shift}">${text}</tspan>`; this.innerHTML = `<tspan x="${shift}">${text}</tspan>`;
}); });
// 1.0 added new biome - Wetland // v1.0 added new biome - Wetland
biomesData.name.push('Wetland'); biomesData.name.push("Wetland");
biomesData.color.push('#0b9131'); biomesData.color.push("#0b9131");
biomesData.habitability.push(12); biomesData.habitability.push(12);
} }
if (version < 1.1) { if (version < 1.1) {
// v1.0 initial code had a bug with religion layer id // v1.0 initial code had a bug with religion layer id
if (!relig.size()) relig = viewbox.insert('g', '#terrain').attr('id', 'relig'); if (!relig.size()) relig = viewbox.insert("g", "#terrain").attr("id", "relig");
// v1.0 initially has Sympathy status then relaced with Friendly // v1.0 initially has Sympathy status then relaced with Friendly
for (const s of pack.states) { for (const s of pack.states) {
@ -539,13 +539,13 @@ function parseLoadedData(data) {
} }
// v1.1 added new lake and coast groups // v1.1 added new lake and coast groups
if (!document.getElementById('sinkhole')) { if (!document.getElementById("sinkhole")) {
lakes.append('g').attr('id', 'sinkhole'); lakes.append("g").attr("id", "sinkhole");
lakes.append('g').attr('id', 'frozen'); lakes.append("g").attr("id", "frozen");
lakes.append('g').attr('id', 'lava'); lakes.append("g").attr("id", "lava");
lakes.select('#sinkhole').attr('opacity', 1).attr('fill', '#5bc9fd').attr('stroke', '#53a3b0').attr('stroke-width', 0.7).attr('filter', null); lakes.select("#sinkhole").attr("opacity", 1).attr("fill", "#5bc9fd").attr("stroke", "#53a3b0").attr("stroke-width", 0.7).attr("filter", null);
lakes.select('#frozen').attr('opacity', 0.95).attr('fill', '#cdd4e7').attr('stroke', '#cfe0eb').attr('stroke-width', 0).attr('filter', null); lakes.select("#frozen").attr("opacity", 0.95).attr("fill", "#cdd4e7").attr("stroke", "#cfe0eb").attr("stroke-width", 0).attr("filter", null);
lakes.select('#lava').attr('opacity', 0.7).attr('fill', '#90270d').attr('stroke', '#f93e0c').attr('stroke-width', 2).attr('filter', 'url(#crumpled)'); lakes.select("#lava").attr("opacity", 0.7).attr("fill", "#90270d").attr("stroke", "#f93e0c").attr("stroke-width", 2).attr("filter", "url(#crumpled)");
coastline.append('g').attr('id', 'sea_island'); coastline.append('g').attr('id', 'sea_island');
coastline.append('g').attr('id', 'lake_island'); coastline.append('g').attr('id', 'lake_island');
@ -554,19 +554,19 @@ function parseLoadedData(data) {
} }
// v1.1 features stores more data // v1.1 features stores more data
defs.select('#land').selectAll('path').remove(); defs.select("#land").selectAll("path").remove();
defs.select('#water').selectAll('path').remove(); defs.select("#water").selectAll("path").remove();
coastline.selectAll('path').remove(); coastline.selectAll("path").remove();
lakes.selectAll('path').remove(); lakes.selectAll("path").remove();
drawCoastline(); drawCoastline();
} }
if (version < 1.11) { if (version < 1.11) {
// v1.11 added new attributes // v1.11 added new attributes
terrs.attr('scheme', 'bright').attr('terracing', 0).attr('skip', 5).attr('relax', 0).attr('curve', 0); terrs.attr("scheme", "bright").attr("terracing", 0).attr("skip", 5).attr("relax", 0).attr("curve", 0);
svg.select('#oceanic > *').attr('id', 'oceanicPattern'); svg.select("#oceanic > *").attr("id", "oceanicPattern");
oceanLayers.attr('layers', '-6,-3,-1'); oceanLayers.attr("layers", "-6,-3,-1");
gridOverlay.attr('type', 'pointyHex').attr('size', 10); gridOverlay.attr("type", "pointyHex").attr("size", 10);
// v1.11 added cultures heirarchy tree // v1.11 added cultures heirarchy tree
if (pack.cultures[1] && !pack.cultures[1].code) { if (pack.cultures[1] && !pack.cultures[1].code) {
@ -582,17 +582,17 @@ function parseLoadedData(data) {
unfog(); unfog();
// v1.2 added new terrain attributes // v1.2 added new terrain attributes
if (!terrain.attr('set')) terrain.attr('set', 'simple'); if (!terrain.attr("set")) terrain.attr("set", "simple");
if (!terrain.attr('size')) terrain.attr('size', 1); if (!terrain.attr("size")) terrain.attr("size", 1);
if (!terrain.attr('density')) terrain.attr('density', 0.4); if (!terrain.attr("density")) terrain.attr("density", 0.4);
} }
if (version < 1.21) { if (version < 1.21) {
// v1.11 replaced "display" attribute by "display" style // v1.11 replaced "display" attribute by "display" style
viewbox.selectAll('g').each(function () { viewbox.selectAll("g").each(function () {
if (this.hasAttribute('display')) { if (this.hasAttribute("display")) {
this.removeAttribute('display'); this.removeAttribute("display");
this.style.display = 'none'; this.style.display = "none";
} }
}); });
@ -629,22 +629,22 @@ function parseLoadedData(data) {
BurgsAndStates.generateCampaigns(); BurgsAndStates.generateCampaigns();
// v1.3 added militry layer // v1.3 added militry layer
armies = viewbox.insert('g', '#icons').attr('id', 'armies'); armies = viewbox.insert("g", "#icons").attr("id", "armies");
armies.attr('opacity', 1).attr('fill-opacity', 1).attr('font-size', 6).attr('box-size', 3).attr('stroke', '#000').attr('stroke-width', 0.3); armies.attr("opacity", 1).attr("fill-opacity", 1).attr("font-size", 6).attr("box-size", 3).attr("stroke", "#000").attr("stroke-width", 0.3);
turnButtonOn('toggleMilitary'); turnButtonOn("toggleMilitary");
Military.generate(); Military.generate();
} }
if (version < 1.4) { if (version < 1.4) {
// v1.35 added dry lakes // v1.35 added dry lakes
if (!lakes.select('#dry').size()) { if (!lakes.select("#dry").size()) {
lakes.append('g').attr('id', 'dry'); lakes.append("g").attr("id", "dry");
lakes.select('#dry').attr('opacity', 1).attr('fill', '#c9bfa7').attr('stroke', '#8e816f').attr('stroke-width', 0.7).attr('filter', null); lakes.select("#dry").attr("opacity", 1).attr("fill", "#c9bfa7").attr("stroke", "#8e816f").attr("stroke-width", 0.7).attr("filter", null);
} }
// v1.4 added ice layer // v1.4 added ice layer
ice = viewbox.insert('g', '#coastline').attr('id', 'ice').style('display', 'none'); ice = viewbox.insert("g", "#coastline").attr("id", "ice").style("display", "none");
ice.attr('opacity', null).attr('fill', '#e8f0f6').attr('stroke', '#e8f0f6').attr('stroke-width', 1).attr('filter', 'url(#dropShadow05)'); ice.attr("opacity", null).attr("fill", "#e8f0f6").attr("stroke", "#e8f0f6").attr("stroke-width", 1).attr("filter", "url(#dropShadow05)");
drawIce(); drawIce();
// v1.4 added icon and power attributes for units // v1.4 added icon and power attributes for units
@ -664,8 +664,8 @@ function parseLoadedData(data) {
else return '⚔️'; else return '⚔️';
} }
// 1.4 added state reference for regiments // v1.4 added state reference for regiments
pack.states.filter((s) => s.military).forEach((s) => s.military.forEach((r) => (r.state = s.i))); pack.states.filter(s => s.military).forEach(s => s.military.forEach(r => (r.state = s.i)));
} }
if (version < 1.5) { if (version < 1.5) {
@ -676,33 +676,33 @@ function parseLoadedData(data) {
localStorage.removeItem('styleMonochrome'); localStorage.removeItem('styleMonochrome');
// v1.5 cultures has shield attribute // v1.5 cultures has shield attribute
pack.cultures.forEach((culture) => { pack.cultures.forEach(culture => {
if (culture.removed) return; if (culture.removed) return;
culture.shield = Cultures.getRandomShield(); culture.shield = Cultures.getRandomShield();
}); });
// v1.5 added burg type value // v1.5 added burg type value
pack.burgs.forEach((burg) => { pack.burgs.forEach(burg => {
if (!burg.i || burg.removed) return; if (!burg.i || burg.removed) return;
burg.type = BurgsAndStates.getType(burg.cell, burg.port); burg.type = BurgsAndStates.getType(burg.cell, burg.port);
}); });
// v1.5 added emblems // v1.5 added emblems
defs.append('g').attr('id', 'defs-emblems'); defs.append("g").attr("id", "defs-emblems");
emblems = viewbox.insert('g', '#population').attr('id', 'emblems').style('display', 'none'); emblems = viewbox.insert("g", "#population").attr("id", "emblems").style("display", "none");
emblems.append('g').attr('id', 'burgEmblems'); emblems.append("g").attr("id", "burgEmblems");
emblems.append('g').attr('id', 'provinceEmblems'); emblems.append("g").attr("id", "provinceEmblems");
emblems.append('g').attr('id', 'stateEmblems'); emblems.append("g").attr("id", "stateEmblems");
regenerateEmblems(); regenerateEmblems();
toggleEmblems(); toggleEmblems();
// v1.5 changed releif icons data // v1.5 changed releif icons data
terrain.selectAll('use').each(function () { terrain.selectAll("use").each(function () {
const type = this.getAttribute('data-type') || this.getAttribute('xlink:href'); const type = this.getAttribute("data-type") || this.getAttribute("xlink:href");
this.removeAttribute('xlink:href'); this.removeAttribute("xlink:href");
this.removeAttribute('data-type'); this.removeAttribute("data-type");
this.removeAttribute('data-size'); this.removeAttribute("data-size");
this.setAttribute('href', type); this.setAttribute("href", type);
}); });
} }
@ -740,7 +740,7 @@ function parseLoadedData(data) {
if (version < 1.61) { if (version < 1.61) {
// v1.61 changed rulers data // v1.61 changed rulers data
ruler.style('display', null); ruler.style("display", null);
rulers = new Rulers(); rulers = new Rulers();
ruler.selectAll('.ruler > .white').each(function () { ruler.selectAll('.ruler > .white').each(function () {
@ -794,15 +794,15 @@ function parseLoadedData(data) {
if (version < 1.62) { if (version < 1.62) {
// v1.62 changed grid data // v1.62 changed grid data
gridOverlay.attr('size', null); gridOverlay.attr("size", null);
} }
if (version < 1.63) { if (version < 1.63) {
// v.1.63 changed ocean pattern opacity element // v1.63 changed ocean pattern opacity element
const oceanPattern = document.getElementById('oceanPattern'); const oceanPattern = document.getElementById("oceanPattern");
if (oceanPattern) oceanPattern.removeAttribute('opacity'); if (oceanPattern) oceanPattern.removeAttribute("opacity");
const oceanicPattern = document.getElementById('oceanicPattern'); const oceanicPattern = document.getElementById("oceanicPattern");
if (!oceanicPattern.getAttribute('opacity')) oceanicPattern.setAttribute('opacity', 0.2); if (!oceanicPattern.getAttribute("opacity")) oceanicPattern.setAttribute("opacity", 0.2);
// v 1.63 moved label text-shadow from css to editable inline style // v 1.63 moved label text-shadow from css to editable inline style
burgLabels.select('#cities').style('text-shadow', 'white 0 0 4px'); burgLabels.select('#cities').style('text-shadow', 'white 0 0 4px');
@ -819,12 +819,12 @@ function parseLoadedData(data) {
} }
if (version < 1.64) { if (version < 1.64) {
// v.1.64 change states style // v1.64 change states style
const opacity = regions.attr('opacity'); const opacity = regions.attr("opacity");
const filter = regions.attr('filter'); const filter = regions.attr("filter");
statesBody.attr('opacity', opacity).attr('filter', filter); statesBody.attr("opacity", opacity).attr("filter", filter);
statesHalo.attr('opacity', opacity).attr('filter', 'blur(5px)'); statesHalo.attr("opacity", opacity).attr("filter", "blur(5px)");
regions.attr('opacity', null).attr('filter', null); regions.attr("opacity", null).attr("filter", null);
} }
if (version < 1.65) { if (version < 1.65) {