second underworld map

diff --git a/app/Http/Controllers/SitemapXmlController.php b/app/Http/Controllers/SitemapXmlController.php
index 4393a30c0f88cdc0ecd6ff80587cf9fb529d74dd..4f66486b4b89f1576be894b9bb82bb5ddda4d69a 100644 (file)
--- a/app/Http/Controllers/SitemapXmlController.php
+++ b/app/Http/Controllers/SitemapXmlController.php
@@ -23,7 +23,7 @@ class SitemapXmlController extends Controller
                        $urls[] = $url;
                }
 
-               foreach (['lw', 'dw', 'sp', 'uw'] as $map) {
+               foreach (['lw', 'dw', 'sp', 'uw', 'uw2'] as $map) {
                        $tech = TechniqueMap::where('map', '=', $map)->latest()->first();
                        $url = new SitemapUrl();
                        $url->path = '/map/'.$map;

diff --git a/resources/js/components/map/Buttons.js b/resources/js/components/map/Buttons.js
index fa023927bd230aee191c9d1cebbfb29adafa10a4..b07fba66a69134809195632e6c3b290937ebbef8 100644 (file)
--- a/resources/js/components/map/Buttons.js
+++ b/resources/js/components/map/Buttons.js
@@ -11,7 +11,7 @@ const Buttons = ({ setUWOverlay, uwOverlay }) => {
 
        return <div className="mt-5">
                <div className="button-bar">
-                       {['lw', 'dw', 'sp', 'uw'].map(map =>
+                       {['lw', 'dw', 'sp', 'uw', 'uw2'].map(map =>
                                <Button
                                        active={activeMap === map}
                                        key={map}

diff --git a/resources/js/components/map/OpenSeadragon.js b/resources/js/components/map/OpenSeadragon.js
index 52c0506b13fc8ffa89214431562cde8158c29417..3b670db8751ec4cd4c006afb80c93d7e5457b5a9 100644 (file)
--- a/resources/js/components/map/OpenSeadragon.js
+++ b/resources/js/components/map/OpenSeadragon.js
@@ -97,6 +97,15 @@ export const Provider = React.forwardRef(({ children }, ref) => {
                                        maxLevel: 14,
                                        tilesUrl: '/media/alttp/map/uw_files/',
                                        fileFormat: 'png',
+                               }), new OpenSeadragon.DziTileSource({
+                                       width: 16384,
+                                       height: 3072,
+                                       tileSize: 256,
+                                       tileOverlap: 0,
+                                       minLevel: 8,
+                                       maxLevel: 14,
+                                       tilesUrl: '/media/alttp/map/uw2_files/',
+                                       fileFormat: 'png',
                                }),
                        ],
                });
@@ -121,6 +130,9 @@ export const Provider = React.forwardRef(({ children }, ref) => {
                        case 'uw':
                                viewer.goToPage(3);
                                break;
+                       case 'uw2':
+                               viewer.goToPage(4);
+                               break;
                }
                const controller = new AbortController();
                axios.get(`/api/markers/${activeMap}`, {

diff --git a/resources/js/i18n/de.js b/resources/js/i18n/de.js
index 015fa8ef7bfbd3005d2ad0f7103383959d8ea6ae..77023f077c62e92a8d98cc7afd28966a926a5bc4 100644 (file)
--- a/resources/js/i18n/de.js
+++ b/resources/js/i18n/de.js
@@ -447,6 +447,8 @@ export default {
                        onThisMap: 'Auf dieser Karte',
                        spLong: 'Spezielle Gebiete',
                        spShort: 'SP',
+                       uw2Long: 'Underworld 2',
+                       uw2Short: 'UW2',
                        uwLong: 'Underworld',
                        uwOverlay: 'Gitter zigen',
                        uwShort: 'UW',

diff --git a/resources/js/i18n/en.js b/resources/js/i18n/en.js
index a99ce9cc33e0595cf2e850762f97dbb39976ae45..edd8e0a498d780ac0bbdaf0fce61b6b193957979 100644 (file)
--- a/resources/js/i18n/en.js
+++ b/resources/js/i18n/en.js
@@ -447,6 +447,8 @@ export default {
                        onThisMap: 'On this map',
                        spLong: 'Special Areas',
                        spShort: 'SP',
+                       uw2Long: 'Underworld 2',
+                       uw2Short: 'UW2',
                        uwLong: 'Underworld',
                        uwOverlay: 'Show grid',
                        uwShort: 'UW',