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/standard/common.js | 75 --------------------------- 1 file changed, 75 deletions(-) delete mode 100644 diplomacy/web/src/gui/maps/standard/common.js (limited to 'diplomacy/web/src/gui/maps/standard/common.js') diff --git a/diplomacy/web/src/gui/maps/standard/common.js b/diplomacy/web/src/gui/maps/standard/common.js deleted file mode 100644 index cb768c2..0000000 --- a/diplomacy/web/src/gui/maps/standard/common.js +++ /dev/null @@ -1,75 +0,0 @@ -// ============================================================================== -// 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 {SvgStandardExtra} from "./SvgStandardExtra"; - -const TAG_ORDERDRAWING = 'jdipNS:ORDERDRAWING'; -const TAG_POWERCOLORS = 'jdipNS:POWERCOLORS'; -const TAG_POWERCOLOR = 'jdipNS:POWERCOLOR'; -const TAG_SYMBOLSIZE = 'jdipNS:SYMBOLSIZE'; -const TAG_PROVINCE_DATA = 'jdipNS:PROVINCE_DATA'; -const TAG_PROVINCE = 'jdipNS:PROVINCE'; -const TAG_UNIT = 'jdipNS:UNIT'; -const TAG_DISLODGED_UNIT = 'jdipNS:DISLODGED_UNIT'; -const TAG_SUPPLY_CENTER = 'jdipNS:SUPPLY_CENTER'; - -export const ARMY = 'Army'; -export const FLEET = 'Fleet'; - -function getCoordinates() { - const coordinates = {}; - for (let provinceDefiniton of SvgStandardExtra[TAG_PROVINCE_DATA][TAG_PROVINCE]) { - const name = provinceDefiniton.name.toUpperCase().replace('-', '/'); - coordinates[name] = {}; - if (provinceDefiniton.hasOwnProperty(TAG_UNIT)) { - coordinates[name].unit = [provinceDefiniton[TAG_UNIT]['x'], provinceDefiniton[TAG_UNIT]['y']]; - } - if (provinceDefiniton.hasOwnProperty(TAG_DISLODGED_UNIT)) { - coordinates[name].disl = [provinceDefiniton[TAG_DISLODGED_UNIT]['x'], provinceDefiniton[TAG_DISLODGED_UNIT]['y']]; - } - if (provinceDefiniton.hasOwnProperty(TAG_SUPPLY_CENTER)) { - coordinates[name].sc = [provinceDefiniton[TAG_SUPPLY_CENTER]['x'], provinceDefiniton[TAG_SUPPLY_CENTER]['y']]; - } - } - return coordinates; -} - -function getSymbolSizes() { - const sizes = {}; - for (let definition of SvgStandardExtra[TAG_ORDERDRAWING][TAG_SYMBOLSIZE]) { - sizes[definition.name] = { - width: parseInt(definition.width), - height: parseInt(definition.height) - }; - } - return sizes; -} - -function getColors() { - const colors = {}; - for (let definition of SvgStandardExtra[TAG_ORDERDRAWING][TAG_POWERCOLORS][TAG_POWERCOLOR]) { - colors[definition.power.toUpperCase()] = definition.color; - } - return colors; -} - -export const Coordinates = getCoordinates(); -export const SymbolSizes = getSymbolSizes(); -export const Colors = getColors(); - -export function offset(floatString, offset) { - return "" + (parseFloat(floatString) + offset); -} -- cgit v1.2.3