v. 0.59.11b

This commit is contained in:
Azgaar 2018-09-04 23:48:21 +03:00
parent f8ce6a0ea8
commit c0d622356b
2 changed files with 14 additions and 3 deletions

View file

@ -71,6 +71,13 @@
<feMergeNode in="SourceGraphic"/>
</feMerge>
</filter>
<filter id="outline">
<feGaussianBlur in="SourceAlpha" stdDeviation="1"/>
<feMerge>
<feMergeNode/>
<feMergeNode in="SourceGraphic"/>
</feMerge>
</filter>
<filter id="pencil">
<feTurbulence baseFrequency="0.03" numOctaves="6" type="fractalNoise"/>
<feDisplacementMap scale="3" in="SourceGraphic" xChannelSelector="R" yChannelSelector="G"/>
@ -299,8 +306,10 @@
<option value="url(#splotch)">Splotch</option>
<option value="url(#bluredSplotch)">Blured Splotch</option>
<option value="url(#dropShadow)">Shadow</option>
<option value="url(#outline)">Outline</option>
<option value="url(#pencil)">Pencil</option>
<option value="url(#turbulence)">Turbulence</option>
<option value="url(#water)">Water</option>
</select>
</div>
<div id="styleScheme">
@ -315,7 +324,7 @@
<fieldset>
<legend>Label groups:</legend>
<input id="hideLabels" class="checkbox" type="checkbox" checked>
<label for="hideLabels" onmouseover="tip('Allow system to hide labels if their size in too small on that scale)')" class="checkbox-label">Toogle visibility automatically</label>
<label for="hideLabels" onmouseover="tip('Allow system to hide labels if their size in too small on that scale)')" class="checkbox-label">Toggle visibility automatically</label>
<div id="styleLabelGroupItems"></div>
</fieldset>
</div>

View file

@ -8975,7 +8975,7 @@ function fantasyMap() {
styleOceanPattern.checked = true;
styleOceanLayers.checked = true;
labels.attr("opacity", 1);
labels.attr("opacity", 1).attr("stroke", "#3a3a3a").attr("stroke-width", 0);
let size = rn(8 - regionsInput.value / 20);
if (size < 3) size = 3;
burgLabels.select("#capitals").attr("fill", "#3e3e4b").attr("opacity", 1).attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC").attr("font-size", size).attr("data-size", size);
@ -9028,8 +9028,10 @@ function fantasyMap() {
if (sel === "overlay") $("#styleOverlay").css("display", "block");
if (sel === "labels") {
$("#styleFill, #styleFontSize").css("display", "inline-block");
$("#styleFill, #styleStroke, #styleStrokeWidth, #styleFontSize").css("display", "inline-block");
styleFillInput.value = styleFillOutput.value = el.select("g").attr("fill") || "#3e3e4b";
styleStrokeInput.value = styleStrokeOutput.value = el.select("g").attr("stroke") || "#3a3a3a";
styleStrokeWidthInput.value = styleStrokeWidthOutput.value = el.attr("stroke-width") || 0;
$("#styleLabelGroups").css("display", "inline-block");
updateLabelGroups();
}