Index: branches/Maps0.7.x/includes/features/Maps_BaseMap.php |
— | — | @@ -77,10 +77,6 @@ |
78 | 78 | |
79 | 79 | $output = $this->getMapHTML( $params, $parser ); |
80 | 80 | |
81 | | - if ( $egMapsUseRL ) { |
82 | | - $output .= $this->getJSON( $params, $parser ); |
83 | | - } |
84 | | - |
85 | 81 | global $wgTitle; |
86 | 82 | if ( !is_null( $wgTitle ) && $wgTitle->getNamespace() == NS_SPECIAL ) { |
87 | 83 | global $wgOut; |
— | — | @@ -94,41 +90,6 @@ |
95 | 91 | } |
96 | 92 | |
97 | 93 | /** |
98 | | - * Returns the JSON with the maps data. |
99 | | - * |
100 | | - * @since 0.7.3 |
101 | | - * |
102 | | - * @param array $params |
103 | | - * @param Parser $parser |
104 | | - * |
105 | | - * @return string |
106 | | - */ |
107 | | - protected function getJSON( array $params, Parser $parser ) { |
108 | | - $object = $this->getJSONObject( $params, $parser ); |
109 | | - |
110 | | - if ( $object === false ) { |
111 | | - return ''; |
112 | | - } |
113 | | - |
114 | | - // TODO |
115 | | - return Html::inlineScript( "maps=[]; maps['{$this->service->getName()}']=[]; maps['{$this->service->getName()}'].push(" . json_encode( $object ) . ')' ); |
116 | | - } |
117 | | - |
118 | | - /** |
119 | | - * Returns a PHP object to encode to JSON with the map data. |
120 | | - * |
121 | | - * @since 0.7.3 |
122 | | - * |
123 | | - * @param array $params |
124 | | - * @param Parser $parser |
125 | | - * |
126 | | - * @return mixed |
127 | | - */ |
128 | | - protected function getJSONObject( array $params, Parser $parser ) { |
129 | | - return $params; |
130 | | - } |
131 | | - |
132 | | - /** |
133 | 94 | * Translates the coordinates field to the centre field and makes sure it's set to it's default when invalid. |
134 | 95 | */ |
135 | 96 | protected function setCentre( array &$params ) { |