From: Tom Hughes <tom@compton.nu>
Date: Sun, 14 Oct 2018 21:00:48 +0000 (+0100)
Subject: Revert "Add Maps extension to the main wiki"
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/6b99ca5ff58b5526a5f58ce1a8523a3d381c0681?hp=5da3b1f59799cbc1283e79598a39c2715ba70fc4

Revert "Add Maps extension to the main wiki"

This reverts commit 5da3b1f59799cbc1283e79598a39c2715ba70fc4.
---

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 350c5a1ba..e574a884f 100644
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -84,15 +84,6 @@ mediawiki_extension "OsmWikibase" do
   reference "master"
 end
 
-mediawiki_extension "Maps" do
-  site "wiki.openstreetmap.org"
-  repository "git://github.com/JeroenDeDauw/Maps.git"
-  tag "6.0.3"
-  template "mw-ext-Maps.inc.php.erb"
-  template_cookbook "wiki"
-  variables :thunderforest_key => passwords["thunderforest"]
-end
-
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
diff --git a/cookbooks/wiki/templates/default/mw-ext-Maps.inc.php.erb b/cookbooks/wiki/templates/default/mw-ext-Maps.inc.php.erb
deleted file mode 100644
index d00697f22..000000000
--- a/cookbooks/wiki/templates/default/mw-ext-Maps.inc.php.erb
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-# DO NOT EDIT - This file is being maintained by Chef
-wfLoadExtension( 'Maps' );
-
-require_once __DIR__ . '/../extensions/Maps/Maps_Settings.php';
-
-// Limit available services to just leaflet
-$GLOBALS['egMapsAvailableServices'] = ['leaflet'];
-
-// Disable the Semantic MediaWiki integration
-$GLOBALS['egMapsDisableSmwIntegration'] = true;
-
-// Put pages with maps in a special category
-$GLOBALS['egMapsEnableCategory'] = true;
-
-// Limit available base layers for leaflet
-$GLOBALS['egMapsLeafletAvailableLayers']['OpenMapSurfer.Roads'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['OpenMapSurfer.Grayscale'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Hydda.Full'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Hydda.Base'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['MapBox'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Stamen.Toner'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Stamen.TonerBackground'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Stamen.TonerHybrid'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Stamen.TonerLines'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Stamen.TonerLabels'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Stamen.TonerLite'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Stamen.Watercolor'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Stamen.Terrain'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Stamen.TerrainBackground'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Stamen.TopOSMRelief'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Stamen.TopOSMFeatures'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Esri.WorldStreetMap'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Esri.DeLorme'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Esri.WorldTopoMap'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Esri.WorldImagery'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Esri.WorldTerrain'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Esri.WorldShadedRelief'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Esri.WorldPhysical'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Esri.OceanBasemap'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Esri.NatGeoWorldMap'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['Esri.WorldGrayCanvas'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['MapQuestOpen'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['HERE'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['FreeMapSK'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['MtbMap'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['CartoDB.Positron'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['CartoDB.PositronNoLabels'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['CartoDB.PositronOnlyLabels'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['CartoDB.DarkMatter'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['CartoDB.DarkMatterNoLabels'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['CartoDB.DarkMatterOnlyLabels'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['HikeBike.HikeBike'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['HikeBike.HillShading'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['BasemapAT.basemap'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['BasemapAT.grau'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['BasemapAT.overlay'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['BasemapAT.highdpi'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['BasemapAT.orthofoto'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['NASAGIBS.ModisTerraTrueColorCR'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['NASAGIBS.ModisTerraBands367CR'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['NASAGIBS.ViirsEarthAtNight2012'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['NLS'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['GeoportailFrance'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['GeoportailFrance.parcels'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['GeoportailFrance.ignMaps'] = false;
-$GLOBALS['egMapsLeafletAvailableLayers']['GeoportailFrance.orthos'] = false;
-
-// Limit available overlay layers for leaflet
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenMapSurfer.AdminBounds'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenWeatherMap.Clouds'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenWeatherMap.CloudsClassic'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenWeatherMap.Precipitation'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenWeatherMap.PrecipitationClassic'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenWeatherMap.Rain'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenWeatherMap.RainClassic'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenWeatherMap.Pressure'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenWeatherMap.PressureContour'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenWeatherMap.Wind'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenWeatherMap.Temperature'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['OpenWeatherMap.Snow'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['Hydda.RoadsAndLabels'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['NASAGIBS.ModisTerraLSTDay'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['NASAGIBS.ModisTerraSnowCover'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['NASAGIBS.ModisTerraAOD'] = false;
-$GLOBALS['egMapsLeafletAvailableOverlayLayers']['NASAGIBS.ModisTerraChlorophyll'] = false;
-
-// Set API key for Thunderforest layers
-$GLOBALS['egMapsLeafletLayersApiKeys']['Thunderforest'] = '<%= @thunderforest_key %>';