Filtered: Add support for map providers; re-enable filtered by default

DefaultSettings.php

@@ -43,6 +43,7 @@
 	'd3chart',
 	'latest',
 	'earliest',
+	'filtered',
 	'slideshow',
 	'timeseries',
 	'sparkline',
@@ -63,9 +64,6 @@
 	// @see Help:Incoming_format
 	// 'incoming',
 
-	// @see Help:Filtered_format
-	// 'filtered',
-
 	// Still in alpha:
 	// 'jitgraph', // Several issues need to be fixed before this can be enabled, most notably it does not work properly with the RL.
 

RELEASE-NOTES.md

@@ -6,8 +6,7 @@ This is not a release yet.
 
 * Raised minimum required version of PHP to 5.6
 * Raised minimum required version of MediaWiki to 1.27
-* Filtered: New parameters `map view height`, `map view zoom`, `map view min zoom`, `map view max zoom`
-* Filtered: Improved testing
+* Improved filtered format: More options, better test coverage, re-enabled by default
 * Provided translation updates (by translatewiki.net community)
 * (#248) Fixed localized formatting of math results
 

formats/filtered/gulpfile.js

@@ -55,9 +55,11 @@ gulp.task( 'buildLeafletJS', function () {
 
 	return gulp.src( [
 		'node_modules/leaflet/dist/leaflet-src.js',
-		'node_modules/leaflet.markercluster/dist/leaflet.markercluster-src.js'
+		'node_modules/leaflet.markercluster/dist/leaflet.markercluster-src.js',
+		'node_modules/leaflet-providers/leaflet-providers.js'
 	] )
 	.pipe( concat( 'ext.srf.filtered.leaflet.js' ) )
+	.pipe( uglify() )
 	.pipe( gulp.dest( 'resources/js' ) );
 
 } );

formats/filtered/package.json

@@ -16,6 +16,7 @@
     "@types/jqueryui": "^1.11.32",
     "@types/leaflet": "^1.0.60",
     "@types/leaflet-markercluster": "^1.0.3",
+    "@types/leaflet-providers": "^1.1.0",
     "@types/qunit": "^1.16.31",
     "browserify": "^14.1.0",
     "gulp": "^3.9.1",
@@ -25,6 +26,7 @@
     "gulp-typescript": "^3.1.6",
     "gulp-uglify": "^2.1.2",
     "leaflet": "^1.0.3",
+    "leaflet-providers": "^1.1.17",
     "leaflet.markercluster": "^1.0.4",
     "tsify": "^3.0.1",
     "typescript": "^2.2.1",

formats/filtered/resources/css/ext.srf.filtered.leaflet.css

@@ -60,6 +60,12 @@
 	-ms-touch-action: none;
 	touch-action: none;
 }
+.leaflet-container {
+	-webkit-tap-highlight-color: transparent;
+}
+.leaflet-container a {
+	-webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
+}
 .leaflet-tile {
 	filter: inherit;
 	visibility: hidden;
@@ -303,7 +309,14 @@
 	height: 30px;
 	line-height: 30px;
 	}
-
+.leaflet-touch .leaflet-bar a:first-child {
+	border-top-left-radius: 2px;
+	border-top-right-radius: 2px;
+	}
+.leaflet-touch .leaflet-bar a:last-child {
+	border-bottom-left-radius: 2px;
+	border-bottom-right-radius: 2px;
+	}
 
 /* zoom control */
 
@@ -312,16 +325,10 @@
 	font: bold 18px 'Lucida Console', Monaco, monospace;
 	text-indent: 1px;
 	}
-.leaflet-control-zoom-out {
-	font-size: 20px;
-	}
 
-.leaflet-touch .leaflet-control-zoom-in {
+.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out  {
 	font-size: 22px;
 	}
-.leaflet-touch .leaflet-control-zoom-out {
-	font-size: 24px;
-	}
 
 
 /* layers control */