From 1dce1b2b35972f53195cbf0480b9b65c42f430b9 Mon Sep 17 00:00:00 2001
From: AdenKoperczak <awkoperczak@gmail.com>
Date: Thu, 28 Nov 2024 11:07:37 -0500
Subject: [PATCH] Added new icons for location markers. All icons are white, so
 they can be color modulated to the correct color.

---
 .../icons/font-awesome-6/briefcase-solid.svg  |  1 +
 .../font-awesome-6/building-columns-solid.svg |  1 +
 .../icons/font-awesome-6/caravan-solid.svg    |  1 +
 .../font-awesome-6/house-solid-white.svg      |  1 +
 .../location-crosshairs-solid.svg             |  1 +
 .../res/icons/font-awesome-6/location-pin.svg |  4 +++
 .../icons/font-awesome-6/star-solid-white.svg |  1 +
 .../res/icons/font-awesome-6/tent-solid.svg   |  1 +
 .../res/textures/images/location-marker.svg   |  2 +-
 scwx-qt/scwx-qt.qrc                           |  8 ++++++
 .../source/scwx/qt/types/texture_types.cpp    | 27 +++++++++++++++++++
 .../source/scwx/qt/types/texture_types.hpp    |  9 +++++++
 12 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 scwx-qt/res/icons/font-awesome-6/briefcase-solid.svg
 create mode 100644 scwx-qt/res/icons/font-awesome-6/building-columns-solid.svg
 create mode 100644 scwx-qt/res/icons/font-awesome-6/caravan-solid.svg
 create mode 100644 scwx-qt/res/icons/font-awesome-6/house-solid-white.svg
 create mode 100644 scwx-qt/res/icons/font-awesome-6/location-crosshairs-solid.svg
 create mode 100644 scwx-qt/res/icons/font-awesome-6/location-pin.svg
 create mode 100644 scwx-qt/res/icons/font-awesome-6/star-solid-white.svg
 create mode 100644 scwx-qt/res/icons/font-awesome-6/tent-solid.svg

diff --git a/scwx-qt/res/icons/font-awesome-6/briefcase-solid.svg b/scwx-qt/res/icons/font-awesome-6/briefcase-solid.svg
new file mode 100644
index 00000000..b16bc330
--- /dev/null
+++ b/scwx-qt/res/icons/font-awesome-6/briefcase-solid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 512 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path fill="#ffffff" d="M184 48l144 0c4.4 0 8 3.6 8 8l0 40L176 96l0-40c0-4.4 3.6-8 8-8zm-56 8l0 40L64 96C28.7 96 0 124.7 0 160l0 96 192 0 128 0 192 0 0-96c0-35.3-28.7-64-64-64l-64 0 0-40c0-30.9-25.1-56-56-56L184 0c-30.9 0-56 25.1-56 56zM512 288l-192 0 0 32c0 17.7-14.3 32-32 32l-64 0c-17.7 0-32-14.3-32-32l0-32L0 288 0 416c0 35.3 28.7 64 64 64l384 0c35.3 0 64-28.7 64-64l0-128z"/></svg>
diff --git a/scwx-qt/res/icons/font-awesome-6/building-columns-solid.svg b/scwx-qt/res/icons/font-awesome-6/building-columns-solid.svg
new file mode 100644
index 00000000..cf0df19a
--- /dev/null
+++ b/scwx-qt/res/icons/font-awesome-6/building-columns-solid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 512 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path fill="#ffffff" d="M243.4 2.6l-224 96c-14 6-21.8 21-18.7 35.8S16.8 160 32 160l0 8c0 13.3 10.7 24 24 24l400 0c13.3 0 24-10.7 24-24l0-8c15.2 0 28.3-10.7 31.3-25.6s-4.8-29.9-18.7-35.8l-224-96c-8-3.4-17.2-3.4-25.2 0zM128 224l-64 0 0 196.3c-.6 .3-1.2 .7-1.8 1.1l-48 32c-11.7 7.8-17 22.4-12.9 35.9S17.9 512 32 512l448 0c14.1 0 26.5-9.2 30.6-22.7s-1.1-28.1-12.9-35.9l-48-32c-.6-.4-1.2-.7-1.8-1.1L448 224l-64 0 0 192-40 0 0-192-64 0 0 192-48 0 0-192-64 0 0 192-40 0 0-192zM256 64a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/></svg>
diff --git a/scwx-qt/res/icons/font-awesome-6/caravan-solid.svg b/scwx-qt/res/icons/font-awesome-6/caravan-solid.svg
new file mode 100644
index 00000000..c341214f
--- /dev/null
+++ b/scwx-qt/res/icons/font-awesome-6/caravan-solid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="16" viewBox="0 0 640 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path fill="#ffffff" d="M0 112C0 67.8 35.8 32 80 32l336 0c88.4 0 160 71.6 160 160l0 160 32 0c17.7 0 32 14.3 32 32s-14.3 32-32 32l-32 0-288 0c0 53-43 96-96 96s-96-43-96-96l-16 0c-44.2 0-80-35.8-80-80L0 112zM320 352l128 0 0-96-32 0c-8.8 0-16-7.2-16-16s7.2-16 16-16l32 0 0-64c0-17.7-14.3-32-32-32l-64 0c-17.7 0-32 14.3-32 32l0 192zM96 128c-17.7 0-32 14.3-32 32l0 64c0 17.7 14.3 32 32 32l128 0c17.7 0 32-14.3 32-32l0-64c0-17.7-14.3-32-32-32L96 128zm96 336a48 48 0 1 0 0-96 48 48 0 1 0 0 96z"/></svg>
diff --git a/scwx-qt/res/icons/font-awesome-6/house-solid-white.svg b/scwx-qt/res/icons/font-awesome-6/house-solid-white.svg
new file mode 100644
index 00000000..59f65e1e
--- /dev/null
+++ b/scwx-qt/res/icons/font-awesome-6/house-solid-white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="18" viewBox="0 0 576 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path opacity="1" fill="#ffffff" d="M575.8 255.5c0 18-15 32.1-32 32.1h-32l.7 160.2c0 2.7-.2 5.4-.5 8.1V472c0 22.1-17.9 40-40 40H456c-1.1 0-2.2 0-3.3-.1c-1.4 .1-2.8 .1-4.2 .1H416 392c-22.1 0-40-17.9-40-40V448 384c0-17.7-14.3-32-32-32H256c-17.7 0-32 14.3-32 32v64 24c0 22.1-17.9 40-40 40H160 128.1c-1.5 0-3-.1-4.5-.2c-1.2 .1-2.4 .2-3.6 .2H104c-22.1 0-40-17.9-40-40V360c0-.9 0-1.9 .1-2.8V287.6H32c-18 0-32-14-32-32.1c0-9 3-17 10-24L266.4 8c7-7 15-8 22-8s15 2 21 7L564.8 231.5c8 7 12 15 11 24z"/></svg>
diff --git a/scwx-qt/res/icons/font-awesome-6/location-crosshairs-solid.svg b/scwx-qt/res/icons/font-awesome-6/location-crosshairs-solid.svg
new file mode 100644
index 00000000..5bb1ea5c
--- /dev/null
+++ b/scwx-qt/res/icons/font-awesome-6/location-crosshairs-solid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 512 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path fill="#ffffff" d="M256 0c17.7 0 32 14.3 32 32l0 34.7C368.4 80.1 431.9 143.6 445.3 224l34.7 0c17.7 0 32 14.3 32 32s-14.3 32-32 32l-34.7 0C431.9 368.4 368.4 431.9 288 445.3l0 34.7c0 17.7-14.3 32-32 32s-32-14.3-32-32l0-34.7C143.6 431.9 80.1 368.4 66.7 288L32 288c-17.7 0-32-14.3-32-32s14.3-32 32-32l34.7 0C80.1 143.6 143.6 80.1 224 66.7L224 32c0-17.7 14.3-32 32-32zM128 256a128 128 0 1 0 256 0 128 128 0 1 0 -256 0zm128-80a80 80 0 1 1 0 160 80 80 0 1 1 0-160z"/></svg>
diff --git a/scwx-qt/res/icons/font-awesome-6/location-pin.svg b/scwx-qt/res/icons/font-awesome-6/location-pin.svg
new file mode 100644
index 00000000..4b6182cd
--- /dev/null
+++ b/scwx-qt/res/icons/font-awesome-6/location-pin.svg
@@ -0,0 +1,4 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 384 512">
+    <!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.-->
+    <path fill="#ffffff" d="M215.7 499.2C267 435 384 279.4 384 192C384 86 298 0 192 0S0 86 0 192c0 87.4 117 243 168.3 307.2c12.3 15.3 35.1 15.3 47.4 0zM192 128a64 64 0 1 1 0 128 64 64 0 1 1 0-128z"/>
+</svg>
diff --git a/scwx-qt/res/icons/font-awesome-6/star-solid-white.svg b/scwx-qt/res/icons/font-awesome-6/star-solid-white.svg
new file mode 100644
index 00000000..41bcd103
--- /dev/null
+++ b/scwx-qt/res/icons/font-awesome-6/star-solid-white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="18" viewBox="0 0 576 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path opacity="1" fill="#ffffff" d="M316.9 18C311.6 7 300.4 0 288.1 0s-23.4 7-28.8 18L195 150.3 51.4 171.5c-12 1.8-22 10.2-25.7 21.7s-.7 24.2 7.9 32.7L137.8 329 113.2 474.7c-2 12 3 24.2 12.9 31.3s23 8 33.8 2.3l128.3-68.5 128.3 68.5c10.8 5.7 23.9 4.9 33.8-2.3s14.9-19.3 12.9-31.3L438.5 329 542.7 225.9c8.6-8.5 11.7-21.2 7.9-32.7s-13.7-19.9-25.7-21.7L381.2 150.3 316.9 18z"/></svg>
diff --git a/scwx-qt/res/icons/font-awesome-6/tent-solid.svg b/scwx-qt/res/icons/font-awesome-6/tent-solid.svg
new file mode 100644
index 00000000..9f159d60
--- /dev/null
+++ b/scwx-qt/res/icons/font-awesome-6/tent-solid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="16" viewBox="0 0 576 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path fill="#ffffff" d="M269.4 6C280.5-2 295.5-2 306.6 6l224 160c7.4 5.3 12.2 13.5 13.2 22.5l32 288c1 9-1.9 18.1-8 24.9s-14.7 10.7-23.8 10.7l-80 0-28.2 0c-12.1 0-23.2-6.8-28.6-17.7L306.7 293.5c-1.7-3.4-5.1-5.5-8.8-5.5c-5.5 0-9.9 4.4-9.9 9.9L288 480c0 17.7-14.3 32-32 32l-16 0L32 512c-9.1 0-17.8-3.9-23.8-10.7s-9-15.8-8-24.9l32-288c1-9 5.8-17.2 13.2-22.5L269.4 6z"/></svg>
diff --git a/scwx-qt/res/textures/images/location-marker.svg b/scwx-qt/res/textures/images/location-marker.svg
index 8ebb064f..3eef9d9e 100644
--- a/scwx-qt/res/textures/images/location-marker.svg
+++ b/scwx-qt/res/textures/images/location-marker.svg
@@ -6,6 +6,6 @@
     <path d="M 40,118 L 85,40 L 130,118 L 40,118 L 85,40 Z"
         stroke="black" stroke-width="40" fill="none"/>
     <path d="M 40,118 L 85,40 L 130,118 L 40,118 L 85,40 Z"
-        stroke="red"   stroke-width="20" fill="none"/>
+        stroke="#ffffff" stroke-width="20" fill="none"/>
 
  </svg>
diff --git a/scwx-qt/scwx-qt.qrc b/scwx-qt/scwx-qt.qrc
index cca0f62c..ee3fcc8e 100644
--- a/scwx-qt/scwx-qt.qrc
+++ b/scwx-qt/scwx-qt.qrc
@@ -32,6 +32,9 @@
         <file>res/icons/font-awesome-6/angles-up-solid.svg</file>
         <file>res/icons/font-awesome-6/backward-step-solid.svg</file>
         <file>res/icons/font-awesome-6/book-solid.svg</file>
+        <file>res/icons/font-awesome-6/briefcase-solid.svg</file>
+        <file>res/icons/font-awesome-6/building-solid.svg</file>
+        <file>res/icons/font-awesome-6/caravan-solid.svg</file>
         <file>res/icons/font-awesome-6/copy-regular.svg</file>
         <file>res/icons/font-awesome-6/discord.svg</file>
         <file>res/icons/font-awesome-6/earth-americas-solid.svg</file>
@@ -40,8 +43,11 @@
         <file>res/icons/font-awesome-6/gears-solid.svg</file>
         <file>res/icons/font-awesome-6/github.svg</file>
         <file>res/icons/font-awesome-6/house-solid.svg</file>
+        <file>res/icons/font-awesome-6/house-solid-white.svg</file>
         <file>res/icons/font-awesome-6/keyboard-regular.svg</file>
         <file>res/icons/font-awesome-6/layer-group-solid.svg</file>
+        <file>res/icons/font-awesome-6/location-crosshairs-solid.svg</file>
+        <file>res/icons/font-awesome-6/location-pin.svg</file>
         <file>res/icons/font-awesome-6/palette-solid.svg</file>
         <file>res/icons/font-awesome-6/pause-solid.svg</file>
         <file>res/icons/font-awesome-6/play-solid.svg</file>
@@ -53,7 +59,9 @@
         <file>res/icons/font-awesome-6/square-minus-regular.svg</file>
         <file>res/icons/font-awesome-6/square-plus-regular.svg</file>
         <file>res/icons/font-awesome-6/star-solid.svg</file>
+        <file>res/icons/font-awesome-6/star-solid-white.svg</file>
         <file>res/icons/font-awesome-6/stop-solid.svg</file>
+        <file>res/icons/font-awesome-6/tent-solid.svg</file>
         <file>res/icons/font-awesome-6/volume-high-solid.svg</file>
         <file>res/palettes/wct/CC.pal</file>
         <file>res/palettes/wct/Default16.pal</file>
diff --git a/scwx-qt/source/scwx/qt/types/texture_types.cpp b/scwx-qt/source/scwx/qt/types/texture_types.cpp
index 7f0c7a24..336a26d8 100644
--- a/scwx-qt/source/scwx/qt/types/texture_types.cpp
+++ b/scwx-qt/source/scwx/qt/types/texture_types.cpp
@@ -25,8 +25,35 @@ static const std::unordered_map<ImageTexture, TextureInfo> imageTextureInfo_ {
    {ImageTexture::Cursor17,
     {"images/cursor-17", ":/res/textures/images/cursor-17.png"}},
    {ImageTexture::Dot3, {"images/dot-3", ":/res/textures/images/dot-3.png"}},
+   {ImageTexture::LocationBriefcase,
+    {"images/location-briefcase",
+     ":/res/icons/font-awesome-6/briefcase-solid.svg"}},
+   {ImageTexture::LocationBuildingColumns,
+    {"images/location-building-columns",
+     ":/res/icons/font-awesome-6/building-columns-solid.svg"}},
+   {ImageTexture::LocationBuilding,
+    {"images/location-building",
+     ":/res/icons/font-awesome-6/building-solid.svg"}},
+   {ImageTexture::LocationCaravan,
+    {"images/location-caravan",
+     ":/res/icons/font-awesome-6/caravan-solid.svg"}},
+   {ImageTexture::LocationCrosshair,
+    {"images/location-crosshair",
+     ":/res/icons/font-awesome-6/location-crosshairs-solid.svg"}},
+   {ImageTexture::LocationHouse,
+    {"images/location-house",
+     ":/res/icons/font-awesome-6/house-solid-white.svg"}},
    {ImageTexture::LocationMarker,
     {"images/location-marker", ":/res/textures/images/location-marker.svg"}},
+   {ImageTexture::LocationPin,
+    {"images/location-pin",
+     ":/res/icons/font-awesome-6/location-pin.svg"}},
+   {ImageTexture::LocationStar,
+    {"images/location-star",
+     ":/res/icons/font-awesome-6/star-solid-white.svg"}},
+   {ImageTexture::LocationTent,
+    {"images/location-tent",
+     ":/res/icons/font-awesome-6/tent-solid.svg"}},
    {ImageTexture::MapboxLogo,
     {"images/mapbox-logo", ":/res/textures/images/mapbox-logo.svg"}},
    {ImageTexture::MapTilerLogo,
diff --git a/scwx-qt/source/scwx/qt/types/texture_types.hpp b/scwx-qt/source/scwx/qt/types/texture_types.hpp
index 307a7638..d5eabc4a 100644
--- a/scwx-qt/source/scwx/qt/types/texture_types.hpp
+++ b/scwx-qt/source/scwx/qt/types/texture_types.hpp
@@ -18,7 +18,16 @@ enum class ImageTexture
    Crosshairs24,
    Cursor17,
    Dot3,
+   LocationBriefcase,
+   LocationBuildingColumns,
+   LocationBuilding,
+   LocationCaravan,
+   LocationCrosshair,
+   LocationHouse,
    LocationMarker,
+   LocationPin,
+   LocationStar,
+   LocationTent,
    MapboxLogo,
    MapTilerLogo
 };