[MediaWiki-commits] [Gerrit] Disable Wikivoyage mode by default - change (mediawiki...Kartographer)

2016-06-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

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, 53 insertions(+), 3 deletions(-)

Approvals:
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index c47251d..9431ee6 100644
--- a/extension.json
+++ b/extension.json
@@ -228,10 +228,8 @@
"ParserTestFiles": [
"tests/parserTests.txt"
],
-
-   "@comment-config": "TODO: KartographerWikivoyageMode should be false by 
default",
"config": {
-   "KartographerWikivoyageMode": true,
+   "KartographerWikivoyageMode": false,
"KartographerDfltStyle": "osm-intl",
"KartographerStyles": ["osm-intl", "osm"],
"KartographerSrcsetScales": [1.3, 1.5, 2, 2.6, 3],
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 784e766..6e15c7b 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -253,3 +253,55 @@
 A
 
 !! end
+
+!! test
+Wikivoyage mode enabled
+!! config
+wgKartographerWikivoyageMode=true
+!! input
+
+
+{
+"type": "Feature",
+   "geometry": {
+   "type": "Point",
+   "coordinates": [-122.3988, 37.8013]
+   },
+   "properties": {
+   "marker-symbol": "-letter",
+   "marker-color": "#abcdef"
+   }
+}
+
+!! result
+0°0′0″N 0°0′0″E
+
+
+
+!! end
+
+!! test
+Wikivoyage mode disabled
+!! config
+wgKartographerWikivoyageMode=false
+!! input
+
+
+{
+"type": "Feature",
+   "geometry": {
+   "type": "Point",
+   "coordinates": [-122.3988, 37.8013]
+   },
+   "properties": {
+   "marker-symbol": "-letter",
+   "marker-color": "#abcdef"
+   }
+}
+
+!! result
+0°0′0″N 0°0′0″E
+
+
+
+!! 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: merged
Gerrit-Change-Id: I9478b0ad3877137dd4161df807f57ef3cafc8ef4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Disable Wikivoyage mode by default - change (mediawiki...Kartographer)

2016-06-03 Thread MaxSem (Code Review) 
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 @@
 A
 
 !! end
+
+!! test
+Wikivoyage mode enabled
+!! config
+wgKartographerWikivoyageMode=true
+!! input
+
+
+{
+"type": "Feature",
+   "geometry": {
+   "type": "Point",
+   "coordinates": [-122.3988, 37.8013]
+   },
+   "properties": {
+   "marker-symbol": "-letter",
+   "marker-color": "#abcdef"
+   }
+}
+
+!! result
+0°0′0″N 0°0′0″E
+
+
+
+!! end
+
+!! test
+Wikivoyage mode disabled
+!! config
+wgKartographerWikivoyageMode=false
+!! input
+
+
+{
+"type": "Feature",
+   "geometry": {
+   "type": "Point",
+   "coordinates": [-122.3988, 37.8013]
+   },
+   "properties": {
+   "marker-symbol": "-letter",
+   "marker-color": "#abcdef"
+   }
+}
+
+!! result
+0°0′0″N 
0°0′0″E
+
+
+
+!! 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 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits