MaxSem has uploaded a new change for review. https://gerrit.wikimedia.org/r/292742
Change subject: Disable Wikivoyage mode by default ...................................................................... Disable Wikivoyage mode by default Bug: T129106 Change-Id: I9478b0ad3877137dd4161df807f57ef3cafc8ef4 --- M extension.json M tests/parserTests.txt 2 files changed, 52 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/42/292742/1 diff --git a/extension.json b/extension.json index c47251d..53bcf92 100644 --- a/extension.json +++ b/extension.json @@ -228,8 +228,6 @@ "ParserTestFiles": [ "tests/parserTests.txt" ], - - "@comment-config": "TODO: KartographerWikivoyageMode should be false by default", "config": { "KartographerWikivoyageMode": true, "KartographerDfltStyle": "osm-intl", diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 613e744..8ca4f0b 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -270,3 +270,55 @@ <p><a class="mw-kartographer mw-kartographer-link" mw-data="interface" data-style="osm-intl" data-zoom="13" data-lat="10" data-lon="20" data-overlays="["_a724df91b09b20c8c7ea0dc28127eaed1727511b"]">A</a> </p> !! end + +!! test +Wikivoyage mode enabled +!! config +wgKartographerWikivoyageMode=true +!! input +<maplink zoom=0 latitude=0 longitude=0 group=ponies/> +<mapframe zoom=0 latitude=0 longitude=0 width=300 height=300 group=ponies> +{ +"type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [-122.3988, 37.8013] + }, + "properties": { + "marker-symbol": "-letter", + "marker-color": "#abcdef" + } +} +</mapframe> +!! result +<p><a class="mw-kartographer mw-kartographer-link" mw-data="interface" data-style="osm-intl" data-zoom="0" data-lat="0" data-lon="0" data-overlays="["ponies"]">0°0′0″N 0°0′0″E</a> +</p> +<div class="mw-kartographer mw-kartographer-interactive floatright" mw-data="interface" style="width:300px; height:300px;" data-style="osm-intl" data-zoom="0" data-lat="0" data-lon="0" data-overlays="["ponies"]"></div> + +!! end + +!! test +Wikivoyage mode disabled +!! config +wgKartographerWikivoyageMode=false +!! input +<maplink zoom=0 latitude=0 longitude=0 group=ponies/> +<mapframe zoom=0 latitude=0 longitude=0 width=300 height=300 group=ponies> +{ +"type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [-122.3988, 37.8013] + }, + "properties": { + "marker-symbol": "-letter", + "marker-color": "#abcdef" + } +} +</mapframe> +!! result +<p><a class="mw-kartographer mw-kartographer-link" mw-data="interface" data-style="osm-intl" data-zoom="0" data-lat="0" data-lon="0">0°0′0″N 0°0′0″E</a> +</p> +<div class="mw-kartographer mw-kartographer-interactive floatright" mw-data="interface" style="width:300px; height:300px;" data-style="osm-intl" data-zoom="0" data-lat="0" data-lon="0" data-overlays="["_a724df91b09b20c8c7ea0dc28127eaed1727511b"]"></div> + +!! end \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/292742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9478b0ad3877137dd4161df807f57ef3cafc8ef4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: master Gerrit-Owner: MaxSem <maxsem.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits