fix: Kartographer tile server und srcset scales dokumentiert

- MapServer jetzt auf /styles endpoint konfiguriert
- SrcsetScales auf [1] gesetzt um @2x requests zu vermeiden
- bracketDevicePixelRatio in Map.js hart auf 1x gesetzt

Diese Änderungen verhindern 404-Fehler bei @2x tile requests auf tile.openstreetmap.org und setzen auf 1x raster tiles.

README.md

@@ -33,13 +33,13 @@ In LocalSettings.php:
 
 ```php
 wfLoadExtension( 'Kartographer' );
-$wgKartographerMapServer = 'https://tiles.rd13server.de';
+$wgKartographerMapServer = 'https://tiles.rd13server.de/styles';
 $wgKartographerStyles = [
 	'osm-bright',
 	'satellite-hybrid',
 ];
 $wgKartographerDfltStyle = 'osm-bright';
-$wgKartographerSrcsetScales = [ 1, 1.5, 2 ];
+$wgKartographerSrcsetScales = [ 1 ];
 ```
 
 ### Schnelltest im Wiki

example.LocalSettings.php

@@ -11,8 +11,8 @@
 # https://www.mediawiki.org/wiki/Manual:Configuration_settings
 
 # Protect against web entry
-if ( !defined( 'MEDIAWIKI' ) ) {
-	exit;
+if (!defined('MEDIAWIKI')) {
+    exit;
 }
 
 
@@ -46,7 +46,7 @@ $wgForceHTTPS = true;
 error_reporting(0);
 
 # Fix to solve net::ERR_HTTP2_PROTOCOL_ERROR 200 in Browsers other than Firefox in Desktops
-$wgDisableOutputCompression  = true;
+$wgDisableOutputCompression = true;
 
 #$wgInternalServer = '192.168.178.6';
 
@@ -71,7 +71,7 @@ $wgResourceBasePath = $wgScriptPath;
 
 ## The URL paths to the logo.  Make sure you change this from the default,
 ## or else you'll overwrite your logo when you upgrade!
-$wgLogos = [ '1x' => "$wgResourceBasePath/resources/assets/Wiki_Logo.png" ];
+$wgLogos = ['1x' => "$wgResourceBasePath/resources/assets/Wiki_Logo.png"];
 
 ## UPO means: this is also a user preference option
 
@@ -125,7 +125,7 @@ $wgImageMagickConvertCommand = "/usr/bin/convert";
 $wgAllowJavaUploads = true; // Solves problem with Office 2007 and newer files (docx, xlsx, etc.)
 $wgGroupPermissions['user']['upload'] = true; // Allow regular users to upload files
 // Make sure that the file types you want to upload are allowed:
-$wgFileExtensions = [ 'png','gif','jpg','jpeg','svg','doc','xls','pdf','ppt','tiff','bmp','docx','xlsx','pptx' ];
+$wgFileExtensions = ['png', 'gif', 'jpg', 'jpeg', 'svg', 'doc', 'xls', 'pdf', 'ppt', 'tiff', 'bmp', 'docx', 'xlsx', 'pptx'];
 
 # InstantCommons allows wiki to use images from https://commons.wikimedia.org
 $wgUseInstantCommons = true;
@@ -223,52 +223,52 @@ $wgDefaultSkin = "timeless";
 
 # Enabled skins.
 # The following skins were automatically enabled:
-wfLoadSkin( 'MonoBook' );
-wfLoadSkin( 'Timeless' );
-wfLoadSkin( 'Vector' );
+wfLoadSkin('MonoBook');
+wfLoadSkin('Timeless');
+wfLoadSkin('Vector');
 
 
 # Enabled extensions. Most of the extensions are enabled by adding
 # wfLoadExtension( 'ExtensionName' );
 # to LocalSettings.php. Check specific extension documentation for more details.
 # The following extensions were automatically enabled:
-wfLoadExtension( 'CategoryTree' );
-wfLoadExtension( 'Cite' );
-wfLoadExtension( 'CiteThisPage' );
-wfLoadExtension( 'CodeEditor' );
-wfLoadExtension( 'ConfirmEdit' );
-wfLoadExtension( 'Gadgets' );
-wfLoadExtension( 'ImageMap' );
-wfLoadExtension( 'InputBox' );
-wfLoadExtension( 'Interwiki' );
-wfLoadExtension( 'LocalisationUpdate' );
-wfLoadExtension( 'MultimediaViewer' );
-wfLoadExtension( 'Nuke' );
-wfLoadExtension( 'OATHAuth' );
-wfLoadExtension( 'ParserFunctions' );
-wfLoadExtension( 'PdfHandler' );
-wfLoadExtension( 'Poem' );
-wfLoadExtension( 'Renameuser' );
-wfLoadExtension( 'ReplaceText' );
-wfLoadExtension( 'Scribunto' );
-wfLoadExtension( 'SecureLinkFixer' );
-wfLoadExtension( 'SpamBlacklist' );
-wfLoadExtension( 'SyntaxHighlight_GeSHi' );
-wfLoadExtension( 'TemplateData' );
-wfLoadExtension( 'TextExtracts' );
-wfLoadExtension( 'TitleBlacklist' );
-wfLoadExtension( 'VisualEditor' );
+wfLoadExtension('CategoryTree');
+wfLoadExtension('Cite');
+wfLoadExtension('CiteThisPage');
+wfLoadExtension('CodeEditor');
+wfLoadExtension('ConfirmEdit');
+wfLoadExtension('Gadgets');
+wfLoadExtension('ImageMap');
+wfLoadExtension('InputBox');
+wfLoadExtension('Interwiki');
+wfLoadExtension('LocalisationUpdate');
+wfLoadExtension('MultimediaViewer');
+wfLoadExtension('Nuke');
+wfLoadExtension('OATHAuth');
+wfLoadExtension('ParserFunctions');
+wfLoadExtension('PdfHandler');
+wfLoadExtension('Poem');
+wfLoadExtension('Renameuser');
+wfLoadExtension('ReplaceText');
+wfLoadExtension('Scribunto');
+wfLoadExtension('SecureLinkFixer');
+wfLoadExtension('SpamBlacklist');
+wfLoadExtension('SyntaxHighlight_GeSHi');
+wfLoadExtension('TemplateData');
+wfLoadExtension('TextExtracts');
+wfLoadExtension('TitleBlacklist');
+wfLoadExtension('VisualEditor');
 $wgVisualEditorAvailableNamespaces = array(
-    NS_MAIN       => true,
-    NS_COLA_TALK  => true,
-    NS_USER       => true,
-    NS_HELP       => true,
-    NS_PROJECT    => true,
-    NS_CONRAD     => true,
-    NS_LAURA      => true,
-    NS_COLA       => true
-    );
-wfLoadExtension( 'WikiEditor' );
+    NS_MAIN => true,
+    NS_COLA_TALK => true,
+    NS_USER => true,
+    NS_HELP => true,
+    NS_PROJECT => true,
+    NS_CONRAD => true,
+    NS_LAURA => true,
+    NS_COLA => true
+);
+wfLoadExtension('WikiEditor');
 
 
 # End of automatically generated settings.
@@ -279,18 +279,18 @@ wfLoadExtension( 'WikiEditor' );
 # Adding Lockdown for Page restrictions
 #######################################
 
-wfLoadExtension( 'Lockdown' );
+wfLoadExtension('Lockdown');
 # Lockdown for Conrads NS
-$wgNamespacePermissionLockdown[NS_CONRAD]['read'] = [ 'conradgroup' ];
-$wgNamespacePermissionLockdown[NS_CONRAD]['edit'] = [ 'conradgroup' ];
+$wgNamespacePermissionLockdown[NS_CONRAD]['read'] = ['conradgroup'];
+$wgNamespacePermissionLockdown[NS_CONRAD]['edit'] = ['conradgroup'];
 $wgNonincludableNamespaces[] = NS_CONRAD;
 # Lockdown for Lauras NS
-$wgNamespacePermissionLockdown[NS_LAURA]['read'] = [ 'lauragroup' ];
-$wgNamespacePermissionLockdown[NS_LAURA]['edit'] = [ 'lauragroup' ];
+$wgNamespacePermissionLockdown[NS_LAURA]['read'] = ['lauragroup'];
+$wgNamespacePermissionLockdown[NS_LAURA]['edit'] = ['lauragroup'];
 $wgNonincludableNamespaces[] = NS_LAURA;
 # Lockdown for CoLa NS
-$wgNamespacePermissionLockdown[NS_COLA]['read'] = [ 'colagroup' ];
-$wgNamespacePermissionLockdown[NS_COLA]['edit'] = [ 'colagroup' ];
+$wgNamespacePermissionLockdown[NS_COLA]['read'] = ['colagroup'];
+$wgNamespacePermissionLockdown[NS_COLA]['edit'] = ['colagroup'];
 $wgNonincludableNamespaces[] = NS_COLA;
 
 #wfLoadExtension( 'ClipUpload' );
@@ -301,7 +301,7 @@ $wgClipUP_MaxFileSize = "10000";
 
 # MSUpload Extension
 ####################
-wfLoadExtension( 'MsUpload' );
+wfLoadExtension('MsUpload');
 # Options
 $wgMSU_useDragDrop = true; // Should the drag & drop area be shown? (Not set by default)
 $wgMSU_showAutoCat = true; // Files uploaded while editing a category page will be added to that category
@@ -319,7 +319,7 @@ $wgAllowTitlesInSVG = true;
 
 # PdfHandler Extension
 ######################
-wfLoadExtension( 'PdfHandler' );
+wfLoadExtension('PdfHandler');
 # Options
 $wgPdfProcessor = '/usr/bin/gs';
 #$wgPdfPostProcessor = $wgImageMagickConvertCommand; // if defined via ImageMagick
@@ -330,7 +330,7 @@ $wgPdftoText = '/usr/bin/pdftotext';
 
 # Allow External Images from my own servers
 $wgAllowExternalImages = true;
-$wgAllowExternalImagesFrom = [ 'http://127.0.0.1/', 'https://cloud.rd13server.de/' ]; // MediaWiki 1.14+
+$wgAllowExternalImagesFrom = ['http://127.0.0.1/', 'https://cloud.rd13server.de/']; // MediaWiki 1.14+
 
 # Extend preview creation file size and pixel size
 # Maximum amount of virtual memory available to shell processes under Linux, in KiB.
@@ -339,7 +339,7 @@ $wgMaxShellFileSize = 307200;
 
 # Support Video Files and external Video Sources
 ################################################
-wfLoadExtension( 'EmbedVideo' );
+wfLoadExtension('EmbedVideo');
 
 $wgEmbedVideoAddFileExtensions = true;  //	Boolean - Enable or disable adding video/audio file extensions to the list of allowable files to be uploaded.
 $wgEmbedVideoEnableVideoHandler = true; //  Boolean - Enable or disable the video media handlers for displaying embedded video in articles.
@@ -360,7 +360,7 @@ $wgCategoryTreeDefaultMode = 10;
 
 # Math Formula extensions
 ##########################
-wfLoadExtension( 'Math' );
+wfLoadExtension('Math');
 
 # Install instructions
 # run this command from wiki root maintanence e.g. /var/www/html/maintenance
@@ -376,11 +376,11 @@ $wgMathMathMLUrl = 'https://mathoid-beta.wmflabs.org/';
 
 # Json Extension needed for Graph extension
 ###########################################
-wfLoadExtension( 'JsonConfig' );
+wfLoadExtension('JsonConfig');
 
 # Adding Graph extension
 #########################
-wfLoadExtension( 'Graph' );
+wfLoadExtension('Graph');
 # https://www.mediawiki.org/wiki/Extension:Graph
 # My be some files are missing and Modules need to be added unter Additional config setup
 # but i dont know how atm
@@ -388,20 +388,20 @@ wfLoadExtension( 'Graph' );
 # Adding Maps Support
 ######################
 # Uncomment after installing
-    # Istalling with: all in wiki root html
-    # curl https://getcomposer.org/composer-2.phar > composer.phar
-    # mv composer.phar /usr/local/bin/composer
-    # chmod +x /usr/local/bin/composer
-    # COMPOSER=composer.local.json composer require --no-update mediawiki/maps:~8.0
-    # composer update
-    # composer update mediawiki/maps --no-dev -o
-    # inside the wiki shell
-wfLoadExtension( 'Maps' );
+# Istalling with: all in wiki root html
+# curl https://getcomposer.org/composer-2.phar > composer.phar
+# mv composer.phar /usr/local/bin/composer
+# chmod +x /usr/local/bin/composer
+# COMPOSER=composer.local.json composer require --no-update mediawiki/maps:~8.0
+# composer update
+# composer update mediawiki/maps --no-dev -o
+# inside the wiki shell
+wfLoadExtension('Maps');
 $egMapsDefaultService = 'leaflet';
 $egMapsDefaultGeoService = 'nominatim';
 
 # Kartographer as a subcategory
-wfLoadExtension( 'Kartographer' );
+wfLoadExtension('Kartographer');
 
 # Global OpenStreetmap tile Server
 # Open Streetmap Tile server does not serve @2x tiles
@@ -429,23 +429,24 @@ wfLoadExtension( 'Kartographer' );
 # Retina Bildschirme schicken noch ein @2x in der URL mit dies kann der Deutsche Tile Server auch noch nicht.
 
 # Eigener Martin Tile Server (ueber NPM/HTTPS erreichbar)
-# Beispiel: https://tiles.rd13server.de
-$wgKartographerMapServer = 'https://tiles.rd13server.de';
+# tileserver-gl liefert Raster-PNG unter /styles/osm-intl/{z}/{x}/{y}.png
+# Kartographer baut URLs als {MapServer}/{Style}/{z}/{x}/{y}.png
+# -> https://tiles.rd13server.de/styles/osm-intl/{z}/{x}/{y}.png
+$wgKartographerMapServer = 'https://tiles.rd13server.de/styles';
 
 # Verfuegbare Styles aus dem Martin Server
 $wgKartographerStyles = [
-    'osm-bright',
-    'satellite-hybrid',
+    'osm-intl',
 ];
 
 # Standardstil fuer <mapframe> / <maplink>
-$wgKartographerDfltStyle = 'osm-bright';
-$wgKartographerSrcsetScales = [ 1, 1.5, 2 ];
+$wgKartographerDfltStyle = 'osm-intl';
+$wgKartographerSrcsetScales = [1];
 
 
 # Adding Musical notation with score Notation
 #############################################
-wfLoadExtension( 'Score' );
+wfLoadExtension('Score');
 ##########################################
 # Some security risks check for updates
 # User could execute code through it if users are trustworthy there shouldnt be a problem
@@ -458,7 +459,7 @@ $wgShellRestrictionMethod = 'firejail';
 #$wgMaxShellMemory = xxxx;
 
 # Timedmedia Extension needed for Score and Video Support
-wfLoadExtension( 'TimedMediaHandler' );
+wfLoadExtension('TimedMediaHandler');
 #$wgFFmpegLocation = '/usr/bin/ffmpeg'; # already set under embedvideo
 #$wgMaxShellMemory = xxxx; # For performance issuse