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

Fixes for review comments

Browse source 
Reverted icons.css to master
Removed index.html/icon-route class and modified size for SVG icon on button
Refactored RouteOpisometer.trackCell so that duplicate code is pulled outside of if blocks
This commit is contained in:
Richard Robertson 2021-03-12 12:14:16 -06:00
parent 426ee32ee5
commit f0f7ebb71f
3 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
icons.css
View file

@ -204,7 +204,6 @@
.icon-chess-pawn:before {content:'\f443';} /* '' */ .icon-chess-pawn:before {content:'\f443';} /* '' */
.icon-chess-queen:before {content:'\f445';} /* '' */ .icon-chess-queen:before {content:'\f445';} /* '' */
.icon-chess-rook:before {content:'\f447';} /* '' */ .icon-chess-rook:before {content:'\f447';} /* '' */
/*.icon-route:before {content:'\f4d7';} /* '' */
.icon-sign:before {content:'\f4d9';} /* '' */ .icon-sign:before {content:'\f4d9';} /* '' */
.icon-user-friends:before {content:'\f500';} /* '' */ .icon-user-friends:before {content:'\f500';} /* '' */
.icon-user-shield:before {content:'\f505';} /* '' */ .icon-user-shield:before {content:'\f505';} /* '' */

6
index.html
View file

@ -1938,7 +1938,7 @@
<div data-tip="Burg mean annual temperature and real-world city for comparison"> <div data-tip="Burg mean annual temperature and real-world city for comparison">
<div class="label">Temperature:</div> <div class="label">Temperature:</div>
<span id="burgTemperature"></span>, like in <span id="burgTemperature"></span>, like in
<span id="burgTemperatureLikeIn"></span> <span id="burgTemperatureLikeIn"></span>
</div> </div>
@ -3099,8 +3099,8 @@
<div id="unitsBottom"> <div id="unitsBottom">
<button id="addLinearRuler" data-tip="Click to place a linear measurer (ruler)" class="icon-ruler"></button> <button id="addLinearRuler" data-tip="Click to place a linear measurer (ruler)" class="icon-ruler"></button>
<button id="addOpisometer" data-tip="Drag to measure a curve length (opisometer)" class="icon-drafting-compass"></button> <button id="addOpisometer" data-tip="Drag to measure a curve length (opisometer)" class="icon-drafting-compass"></button>
<button id="addRouteOpisometer" data-tip="Drag to measure a curve length that sticks to routes (route opisometer)" class="icon-route"> <button id="addRouteOpisometer" data-tip="Drag to measure a curve length that sticks to routes (route opisometer)">
<svg width="1em" height="1em"> <svg width="0.88em" height="0.88em">
<use xlink:href="#icon-route" /> <use xlink:href="#icon-route" />
</svg> </svg>
</button> </button>

14
modules/ui/measurers.js
View file

@ -333,13 +333,9 @@ class RouteOpisometer extends Measurer {
} else if (cellStops.length > 1 && foundIndex != -1) { } else if (cellStops.length > 1 && foundIndex != -1) {
cellStops.splice(foundIndex + 1); cellStops.splice(foundIndex + 1);
this.points.splice(foundIndex + 1); this.points.splice(foundIndex + 1);
this.updateCurve(); } else {
this.updateLabel();
} else {
cellStops.push(cell); cellStops.push(cell);
this.points.push(this.getCellRouteCoord(cell)); this.points.push(this.getCellRouteCoord(cell));
this.updateCurve();
this.updateLabel();
} }
} else { } else {
if (cellStops[0] === cell) { if (cellStops[0] === cell) {
@ -347,15 +343,13 @@ class RouteOpisometer extends Measurer {
} else if (cellStops.length > 1 && foundIndex != -1) { } else if (cellStops.length > 1 && foundIndex != -1) {
cellStops.splice(0, foundIndex); cellStops.splice(0, foundIndex);
this.points.splice(0, foundIndex); this.points.splice(0, foundIndex);
this.updateCurve(); } else {
this.updateLabel();
} else {
cellStops.unshift(cell); cellStops.unshift(cell);
this.points.unshift(this.getCellRouteCoord(cell)); this.points.unshift(this.getCellRouteCoord(cell));
this.updateCurve();
this.updateLabel();
} }
} }
this.updateCurve();
this.updateLabel();
} }
getCellRouteCoord(c) { getCellRouteCoord(c) {