| Index: trunk/extensions/SemanticMaps/GeoCoords/SM_AreaValueDescription.php |
| — | — | @@ -36,6 +36,12 @@ |
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
| | 40 | + /** |
| | 41 | + * Sets the mBounds fields to an array returned by SMAreaValueDescription::getBoundingBox. |
| | 42 | + * |
| | 43 | + * @param SMGeoCoordsValue $dataValue |
| | 44 | + * @param string $radius |
| | 45 | + */ |
| 40 | 46 | protected function calculateBounds( SMGeoCoordsValue $dataValue, $radius ) { |
| 41 | 47 | $this->mBounds = self::getBoundingBox( |
| 42 | 48 | $dataValue->getCoordinateSet(), |
| Index: trunk/extensions/SemanticMaps/Features/QueryPrinters/SM_MapPrinter.php |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | |
| 47 | 47 | public $serviceName; |
| 48 | 48 | |
| 49 | | - protected $m_locations = array(); |
| | 49 | + protected $mLocations = array(); |
| 50 | 50 | |
| 51 | 51 | protected $defaultZoom; |
| 52 | 52 | |
| — | — | @@ -53,9 +53,9 @@ |
| 54 | 54 | protected $centreLon; |
| 55 | 55 | |
| 56 | 56 | protected $output = ''; |
| 57 | | - protected $errorList; |
| | 57 | + protected $mErrorList; |
| 58 | 58 | |
| 59 | | - protected $mapFeature; |
| | 59 | + protected $mMapFeature; |
| 60 | 60 | |
| 61 | 61 | protected $featureParameters = array(); |
| 62 | 62 | protected $spesificParameters = array(); |
| — | — | @@ -77,7 +77,7 @@ |
| 78 | 78 | $this->formatResultData( $res, $outputmode ); |
| 79 | 79 | |
| 80 | 80 | // Only create a map when there is at least one result. |
| 81 | | - if ( count( $this->m_locations ) > 0 || $this->forceshow ) { |
| | 81 | + if ( count( $this->mLocations ) > 0 || $this->forceshow ) { |
| 82 | 82 | $this->doMapServiceLoad(); |
| 83 | 83 | |
| 84 | 84 | $this->setMapName(); |
| — | — | @@ -94,7 +94,7 @@ |
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | | - return array( $this->output . $this->errorList, 'noparse' => true, 'isHTML' => true ); |
| | 98 | + return array( $this->output . $this->mErrorList, 'noparse' => true, 'isHTML' => true ); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
| — | — | @@ -126,7 +126,7 @@ |
| 127 | 127 | $this->setMapProperties( $manager->getParameters( false ) ); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | | - $this->errorList = $manager->getErrorList(); |
| | 130 | + $this->mErrorList = $manager->getErrorList(); |
| 131 | 131 | |
| 132 | 132 | return $showMap; |
| 133 | 133 | } |
| — | — | @@ -235,7 +235,7 @@ |
| 236 | 236 | $text = preg_replace( '/\n+/m', '<br />', $wgParser->recursiveTagParse( '{{' . implode( '|', $segments ) . '}}' ) ); |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | | - $this->m_locations[] = array( |
| | 239 | + $this->mLocations[] = array( |
| 240 | 240 | Xml::escapeJsString( $lat ), |
| 241 | 241 | Xml::escapeJsString( $lon ), |
| 242 | 242 | Xml::escapeJsString( $title ), |
| — | — | @@ -291,7 +291,7 @@ |
| 292 | 292 | */ |
| 293 | 293 | private function setZoom() { |
| 294 | 294 | if ( strlen( $this->zoom ) < 1 ) { |
| 295 | | - if ( count( $this->m_locations ) > 1 ) { |
| | 295 | + if ( count( $this->mLocations ) > 1 ) { |
| 296 | 296 | $this->zoom = 'null'; |
| 297 | 297 | } |
| 298 | 298 | else { |
| — | — | @@ -314,15 +314,15 @@ |
| 315 | 315 | $this->centreLat = $centre['lat']; |
| 316 | 316 | $this->centreLon = $centre['lon']; |
| 317 | 317 | } |
| 318 | | - elseif ( count( $this->m_locations ) > 1 ) { |
| | 318 | + elseif ( count( $this->mLocations ) > 1 ) { |
| 319 | 319 | // If centre is not set, and there are multiple points, set the values to null, to be auto determined by the JS of the mapping API. |
| 320 | 320 | $this->centreLat = 'null'; |
| 321 | 321 | $this->centreLon = 'null'; |
| 322 | 322 | } |
| 323 | | - elseif ( count( $this->m_locations ) == 1 ) { |
| | 323 | + elseif ( count( $this->mLocations ) == 1 ) { |
| 324 | 324 | // If centre is not set and there is exactelly one marker, use it's coordinates. |
| 325 | | - $this->centreLat = Xml::escapeJsString( $this->m_locations[0][0] ); |
| 326 | | - $this->centreLon = Xml::escapeJsString( $this->m_locations[0][1] ); |
| | 325 | + $this->centreLat = Xml::escapeJsString( $this->mLocations[0][0] ); |
| | 326 | + $this->centreLon = Xml::escapeJsString( $this->mLocations[0][1] ); |
| 327 | 327 | } |
| 328 | 328 | else { |
| 329 | 329 | // If centre is not set and there are no results, centre on the default coordinates. |