| Index: trunk/extensions/SemanticMaps/includes/SM_GeoCoordsValue.php |
| — | — | @@ -102,7 +102,10 @@ |
| 103 | 103 | $this->m_dataitem = new SMWDIGeoCoord( $parsedCoords ); |
| 104 | 104 | } else { |
| 105 | 105 | $this->addError( wfMsgExt( 'maps_unrecognized_coords', array( 'parsemag' ), $coordinates, 1 ) ); |
| 106 | | - $this->m_dataitem = new SMWDIGeoCoord( array(0, 0) ); // make sure this is always set |
| | 106 | + |
| | 107 | + // Make sure this is always set |
| | 108 | + // TODO: Why is this needed?! |
| | 109 | + $this->m_dataitem = new SMWDIGeoCoord( array( 'lat' => 0, 'lon' => 0 ) ); |
| 107 | 110 | } |
| 108 | 111 | } |
| 109 | 112 | |
| Index: trunk/extensions/SemanticMaps/includes/queryprinters/SM_MapPrinter.php |
| — | — | @@ -143,7 +143,7 @@ |
| 144 | 144 | if ( $this->fatalErrorMsg === false ) { |
| 145 | 145 | global $wgParser; |
| 146 | 146 | |
| 147 | | - $params = $this->m_params; |
| | 147 | + $params = $this->params; |
| 148 | 148 | |
| 149 | 149 | $queryHandler = new SMQueryHandler( $res, $outputmode ); |
| 150 | 150 | $queryHandler->setShowSubject( $params['showtitle'] ); |
| — | — | @@ -176,8 +176,10 @@ |
| 177 | 177 | SMWOutputs::requireResource( $resourceModule ); |
| 178 | 178 | } |
| 179 | 179 | |
| | 180 | + $result = $this->getMapHTML( $params, $wgParser, $mapName ) . $this->getJSON( $params, $wgParser, $mapName ); |
| | 181 | + |
| 180 | 182 | return array( |
| 181 | | - $this->getMapHTML( $params, $wgParser, $mapName ) . $this->getJSON( $params, $wgParser, $mapName ), |
| | 183 | + $result, |
| 182 | 184 | 'noparse' => true, |
| 183 | 185 | 'isHTML' => true |
| 184 | 186 | ); |