Skip to content

Commit 35b3e9d

Browse files
author
Azgaar
committed
v1.1
1 parent 729d91c commit 35b3e9d

18 files changed

+614
-164
lines changed

index.css

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ button, select, a {
8080
fill-rule: evenodd;
8181
}
8282

83+
#lakes,
84+
#coastline {
85+
cursor: pointer;
86+
}
87+
8388
#temperature {
8489
fill-rule: evenodd;
8590
font-family: sans-serif;
@@ -242,7 +247,10 @@ i.icon-lock {
242247
text-anchor: middle;
243248
}
244249

245-
#routeLength, #riverLength {
250+
#routeLength,
251+
#riverLength,
252+
#lakeArea,
253+
#coastlineArea {
246254
background-color: #eeeeee;
247255
border: 1px solid #a5a5a5;
248256
line-height: 1.3em;
@@ -875,7 +883,7 @@ body button.noicon {
875883
#controlPoints {
876884
fill: #ff0000;
877885
stroke: #841f1f;
878-
stroke-width: .3;
886+
stroke-width: .25;
879887
cursor: move;
880888
opacity: .8;
881889
}
@@ -888,6 +896,25 @@ body button.noicon {
888896
cursor: pointer;
889897
}
890898

899+
#vertices > circle {
900+
fill: #ff0000;
901+
stroke: #841f1f;
902+
stroke-width: .1;
903+
cursor: move;
904+
opacity: .8;
905+
}
906+
907+
#vertices > polygon {
908+
fill: none;
909+
stroke: #808080;
910+
stroke-width: .1;
911+
}
912+
913+
#controlPoints > circle:hover,
914+
#vertices> circle:hover {
915+
stroke: #2c0808;
916+
}
917+
891918
.drag-trigger {
892919
border-left: 12px solid transparent;
893920
border-right: 12px solid #916e7f;

index.html

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<g id="hatching">
131131
<pattern id="hatch0" patternUnits="userSpaceOnUse" width="4" height="4">
132132
<line x1="0" y1="0" x2="0" y2="4" style="stroke:black; stroke-width:2"/>
133-
</pattern>;
133+
</pattern>
134134

135135
<pattern id="hatch1" patternTransform="rotate(45 0 0)" patternUnits="userSpaceOnUse" width="4" height="4">
136136
<line x1="0" y1="0" x2="0" y2="4" style="stroke:black; stroke-width:2"/>
@@ -2086,6 +2086,35 @@
20862086
<button id="routeRemove" data-tip="Remove route. Shortcut: Delete" class="icon-trash"></button>
20872087
</div>
20882088

2089+
<div id="lakeEditor" class="dialog" style="display: none">
2090+
<button id="lakeGroupsShow" data-tip="Show the group selection" class="icon-tags"></button>
2091+
<div id="lakeGroupsSelection" style="display: none">
2092+
<button id="lakeGroupsHide" data-tip="Hide the group section" class="icon-tags"></button>
2093+
<select id="lakeGroup" data-tip="Select a group for this lake" style="width:9em"></select>
2094+
<input id="lakeGroupName" placeholder="new group name" data-tip="Provide a name for the new group" style="display:none; width:9em"/>
2095+
<span id="lakeGroupAdd" data-tip="Create new group for this lake" class="icon-plus pointer"></span>
2096+
<span id="lakeGroupRemove" data-tip="Remove the group" class="icon-trash-empty pointer"></span>
2097+
</div>
2098+
2099+
<button id="lakeEditStyle" data-tip="Edit lake group style in Style Editor" class="icon-brush"></button>
2100+
<button id="lakeArea" data-tip="Lake area in selected units">0</button>
2101+
<button id="lakeLegend" data-tip="Edit free text notes (legend) for the lake" class="icon-edit"></button>
2102+
</div>
2103+
2104+
<div id="coastlineEditor" class="dialog" style="display: none">
2105+
<button id="coastlineGroupsShow" data-tip="Show the group selection" class="icon-tags"></button>
2106+
<div id="coastlineGroupsSelection" style="display: none">
2107+
<button id="coastlineGroupsHide" data-tip="Hide the group section" class="icon-tags"></button>
2108+
<select id="coastlineGroup" data-tip="Select a group for this coastline" style="width:9em"></select>
2109+
<input id="coastlineGroupName" placeholder="new group name" data-tip="Provide a name for the new group" style="display:none; width:9em"/>
2110+
<span id="coastlineGroupAdd" data-tip="Create new group for this coastline" class="icon-plus pointer"></span>
2111+
<span id="coastlineGroupRemove" data-tip="Remove the group" class="icon-trash-empty pointer"></span>
2112+
</div>
2113+
2114+
<button id="coastlineEditStyle" data-tip="Edit coastline group style in Style Editor" class="icon-brush"></button>
2115+
<button id="coastlineArea" data-tip="Lake area in selected units">0</button>
2116+
</div>
2117+
20892118
<div id="reliefEditor" class="dialog" style="display: none">
20902119

20912120
<div id="reliefTools" data-tip="Select mode of operation">
@@ -2446,8 +2475,7 @@
24462475
<button id="convertImageLoad" data-tip="Load image to convert" class="icon-upload"></button>
24472476
<button id="convertAutoLum" data-tip="Auto-assign colors based on liminosity (good to monochrome images)" class="icon-adjust"></button>
24482477
<button id="convertAutoHue" data-tip="Auto-assign colors based on hue (good to colored images)" class="icon-brush"></button>
2449-
<button id="convertColorsMinus" data-tip="Reduce the number of colors. Minimal number is 3" class="icon-minus-squared"></button>
2450-
<button id="convertColorsPlus" data-tip="Increase the number of colors. Maximum number is 256" class="icon-plus-squared"></button>
2478+
<button id="convertColorsButton" data-tip="Set number of colors" class="icon-signal"></button>
24512479
<input id="convertColors" value="18" style="display: none"/>
24522480
<button id="convertComplete" data-tip="Complete the assignment. All unassigned colors will be considered as ocean" class="icon-check"></button>
24532481
</div>
@@ -3027,7 +3055,6 @@
30273055
<script src="libs/polylabel.min.js"></script>
30283056
<script src="libs/jquery-ui.min.js"></script>
30293057
<script src="libs/seedrandom.min.js"></script>
3030-
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/simplex-noise/2.3.0/simplex-noise.js"></script> -->
30313058
<script src="modules/ui/layers.js"></script>
30323059

30333060
<script defer src="modules/ui/general.js"></script>
@@ -3047,6 +3074,7 @@
30473074
<script defer src="modules/ui/namesbase-editor.js"></script>
30483075
<script defer src="modules/ui/routes-editor.js"></script>
30493076
<script defer src="modules/ui/lakes-editor.js"></script>
3077+
<script defer src="modules/ui/coastline-editor.js"></script>
30503078
<script defer src="modules/ui/labels-editor.js"></script>
30513079
<script defer src="modules/ui/rivers-editor.js"></script>
30523080
<script defer src="modules/ui/relief-editor.js"></script>

libs/jquery-ui.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,8 @@ body .ui-dialog {
362362
border: 0;
363363
padding: .5em 1em;
364364
background: none;
365-
overflow: auto;
365+
overflow-y: auto;
366+
overflow-x: hidden;
366367
}
367368
.ui-dialog .ui-dialog-buttonpane {
368369
text-align: left;

0 commit comments

Comments
 (0)