From 5c3bd9b3802e2001a7e77baf2911386135a03839 Mon Sep 17 00:00:00 2001 From: notoraptor Date: Wed, 14 Aug 2019 12:22:22 -0400 Subject: [Web] Integrated new maps on the web interface - Fixed bug with incorrect dislodged unit on pure map - [python] Make sure dummy powers are registered only for standard maps. - Hardcoded supply centers into SVG files. - Removed supply centers CSS classes. - Update positions for units and dislodged units on all maps. - Converted SVGs to React. - Removed "sym" classes and hardcode related styles into symbol definitions. - Reordered map list (standard at top, then other ones in alphabetical order) - Displayed + button for all maps and disable it for maps without variants. - Minified generated code when converting SVG files to React. - [web] Added ability to hide/display map abbreviations. --- diplomacy/web/src/gui/maps/common/supportMove.js | 61 ++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 diplomacy/web/src/gui/maps/common/supportMove.js (limited to 'diplomacy/web/src/gui/maps/common/supportMove.js') diff --git a/diplomacy/web/src/gui/maps/common/supportMove.js b/diplomacy/web/src/gui/maps/common/supportMove.js new file mode 100644 index 0000000..e52e37f --- /dev/null +++ b/diplomacy/web/src/gui/maps/common/supportMove.js @@ -0,0 +1,61 @@ +// ============================================================================== +// Copyright (C) 2019 - Philip Paquette, Steven Bocco +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU Affero General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +// details. +// +// You should have received a copy of the GNU Affero General Public License along +// with this program. If not, see . +// ============================================================================== +import React from "react"; +import {ARMY, coloredStrokeWidth, getUnitCenter} from "./common"; +import PropTypes from "prop-types"; + +export class SupportMove extends React.Component { + render() { + const Coordinates = this.props.coordinates; + const SymbolSizes = this.props.symbolSizes; + const Colors = this.props.colors; + const loc = this.props.loc; + const src_loc = this.props.srcLoc; + const dest_loc = this.props.dstLoc; + const [loc_x, loc_y] = getUnitCenter(Coordinates, SymbolSizes, loc, false); + const [src_loc_x, src_loc_y] = getUnitCenter(Coordinates, SymbolSizes, src_loc, false); + let [dest_loc_x, dest_loc_y] = getUnitCenter(Coordinates, SymbolSizes, dest_loc, false); + + // Adjusting destination + const delta_x = dest_loc_x - src_loc_x; + const delta_y = dest_loc_y - src_loc_y; + const vector_length = Math.sqrt(delta_x * delta_x + delta_y * delta_y); + const delta_dec = parseFloat(SymbolSizes[ARMY].width) / 2 + 2 * coloredStrokeWidth(SymbolSizes); + dest_loc_x = '' + Math.round((parseFloat(src_loc_x) + (vector_length - delta_dec) / vector_length * delta_x) * 100.) / 100.; + dest_loc_y = '' + Math.round((parseFloat(src_loc_y) + (vector_length - delta_dec) / vector_length * delta_y) * 100.) / 100.; + return ( + + + + + ); + } +} + +SupportMove.propTypes = { + loc: PropTypes.string.isRequired, + srcLoc: PropTypes.string.isRequired, + dstLoc: PropTypes.string.isRequired, + powerName: PropTypes.string.isRequired, + coordinates: PropTypes.object.isRequired, + symbolSizes: PropTypes.object.isRequired, + colors: PropTypes.object.isRequired +}; -- cgit v1.2.3