Add GeoJson caching

Maps_Settings.php

@@ -165,6 +165,10 @@
 
 // Other general configuration
 
+	// Integer. Determines the TTL of cached GeoJson.
+	// Default value: 0 (no caching).
+	$GLOBALS['egMapsGeoJsonCacheTtl'] = 0;
+
 	// Boolean. Sets if pages with maps should be put in special category
 	$GLOBALS['egMapsEnableCategory'] = false;
 

src/DataAccess/CachingGeocoder.php

@@ -1,5 +1,7 @@
 <?php
 
+declare( strict_types = 1 );
+
 namespace Maps\DataAccess;
 
 use BagOStuff;

src/DataAccess/JsonFileParser.php

@@ -1,5 +1,7 @@
 <?php
 
+declare( strict_types = 1 );
+
 namespace Maps\DataAccess;
 
 use FileFetcher\FileFetcher;
@@ -23,7 +25,7 @@ class JsonFileParser implements ValueParser {
 
 	public function __construct( $fileFetcher = null, PageContentFetcher $pageContentFetcher = null ) {
 		$this->fileFetcher = $fileFetcher instanceof FileFetcher
-			? $fileFetcher : MapsFactory::newDefault()->getFileFetcher();
+			? $fileFetcher : MapsFactory::newDefault()->getGeoJsonFileFetcher();
 
 		$this->pageContentFetcher = $pageContentFetcher instanceof PageContentFetcher
 			? $pageContentFetcher : MapsFactory::newDefault()->getPageContentFetcher();

src/DataAccess/MapsFileFetcher.php

@@ -1,5 +1,7 @@
 <?php
 
+declare( strict_types = 1 );
+
 namespace Maps\DataAccess;
 
 use FileFetcher\FileFetcher;

src/DataAccess/PageContentFetcher.php

@@ -1,5 +1,7 @@
 <?php
 
+declare( strict_types = 1 );
+
 namespace Maps\DataAccess;
 
 use MediaWiki\Storage\RevisionLookup;

src/MapsFactory.php

@@ -4,6 +4,7 @@
 
 namespace Maps;
 
+use FileFetcher\CachingFileFetcher;
 use FileFetcher\FileFetcher;
 use Jeroen\SimpleGeocoder\Geocoder;
 use Jeroen\SimpleGeocoder\Geocoders\Decorators\CoordinateFriendlyGeocoder;
@@ -18,6 +19,8 @@
 use Maps\Presentation\CoordinateFormatter;
 use Maps\Presentation\WikitextParsers\LocationParser;
 use MediaWiki\MediaWikiServices;
+use SimpleCache\Cache\Cache;
+use SimpleCache\Cache\MediaWikiCache;
 
 /**
  * @licence GNU GPL v2+
@@ -109,6 +112,20 @@ private function newFileFetcher(): FileFetcher {
 		return new MapsFileFetcher();
 	}
 
+	public function getGeoJsonFileFetcher(): FileFetcher {
+		return new CachingFileFetcher(
+			$this->getFileFetcher(),
+			$this->getMediaWikiSimpleCache( $this->settings['egMapsGeoJsonCacheTtl'] )
+		);
+	}
+
+	private function getMediaWikiSimpleCache( int $ttlInSeconds ): Cache {
+		return new MediaWikiCache(
+			$this->getMediaWikiCache(),
+			$ttlInSeconds
+		);
+	}
+
 	private function getMediaWikiCache(): \BagOStuff {
 		return wfGetCache( CACHE_ANYTHING );
 	}