| Index: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispMap.php |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | |
| 33 | 33 | public function getSpecificParameterInfo() { |
| 34 | 34 | global $egMapsGMapOverlays; |
| 35 | | - $this->spesificParameters = array( |
| | 35 | + $this->specificParameters = array( |
| 36 | 36 | 'overlays' => array( |
| 37 | 37 | 'type' => array( 'string', 'list' ), |
| 38 | 38 | 'criteria' => array( |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | 'default' => $egMapsGMapOverlays, |
| 42 | 42 | ), |
| 43 | 43 | ); |
| 44 | | - return $this->spesificParameters; |
| | 44 | + return $this->specificParameters; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /** |
| Index: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php |
| — | — | @@ -34,7 +34,7 @@ |
| 35 | 35 | public function getSpecificParameterInfo() { |
| 36 | 36 | global $egMapsGMapOverlays; |
| 37 | 37 | // TODO: it'd be cool to have this static so it can be cheched in order to only init it once. |
| 38 | | - $this->spesificParameters = array( |
| | 38 | + $this->specificParameters = array( |
| 39 | 39 | 'overlays' => array( |
| 40 | 40 | 'type' => array( 'string', 'list' ), |
| 41 | 41 | 'criteria' => array( |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | 'default' => $egMapsGMapOverlays, |
| 45 | 45 | ), |
| 46 | 46 | ); |
| 47 | | - return $this->spesificParameters; |
| | 47 | + return $this->specificParameters; |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
| Index: trunk/extensions/Maps/Includes/Maps_CoordinateParser.php |
| — | — | @@ -24,8 +24,8 @@ |
| 25 | 25 | */ |
| 26 | 26 | class MapsCoordinateParser { |
| 27 | 27 | |
| 28 | | - protected static $mSeperators = array( ',', ';' ); |
| 29 | | - protected static $mSeperatorsRegex = false; |
| | 28 | + protected static $mSeparators = array( ',', ';' ); |
| | 29 | + protected static $mSeparatorsRegex = false; |
| 30 | 30 | |
| 31 | 31 | protected static $mI18nDirections = false; // Cache for localised direction labels |
| 32 | 32 | protected static $mDirections; // Cache for English direction labels |
| — | — | @@ -55,8 +55,8 @@ |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | // Split the coodrinates string into a lat and lon part. |
| 59 | | - foreach ( self::$mSeperators as $seperator ) { |
| 60 | | - $split = explode( $seperator, $coordinates ); |
| | 59 | + foreach ( self::$mSeparators as $separator ) { |
| | 60 | + $split = explode( $separator, $coordinates ); |
| 61 | 61 | if ( count( $split ) == 2 ) break; |
| 62 | 62 | } |
| 63 | 63 | |
| — | — | @@ -136,7 +136,7 @@ |
| 137 | 137 | * array with lat and lon keys, or a numbered aray with lat on index 0, and lon on index 1. |
| 138 | 138 | * @param coordinate type $targetFormat The notation to which they should be formatted. Defaults to floats. |
| 139 | 139 | * @param boolean $directional Indicates if the target notation should be directional. Defaults to false. |
| 140 | | - * @param string $separator Delimiter to seperate the latitude and longitude with. |
| | 140 | + * @param string $separator Delimiter to separate the latitude and longitude with. |
| 141 | 141 | * |
| 142 | 142 | * @return string |
| 143 | 143 | */ |
| — | — | @@ -284,7 +284,7 @@ |
| 285 | 285 | * @return boolean |
| 286 | 286 | */ |
| 287 | 287 | public static function areFloatCoordinates( $coordinates ) { |
| 288 | | - $sep = self::getSeperatorsRegex(); |
| | 288 | + $sep = self::getSeparatorsRegex(); |
| 289 | 289 | return preg_match( '/^(-)?\d{1,3}(\.\d{1,20})?' . $sep . '(\s)?(-)?\d{1,3}(\.\d{1,20})?$/', $coordinates ) // Non-directional |
| 290 | 290 | || preg_match( '/^\d{1,3}(\.\d{1,20})?(\s)?(N|S)' . $sep . '(\s)?\d{1,3}(\.\d{1,20})?(\s)?(E|W)$/', $coordinates ); // Directional |
| 291 | 291 | } |
| — | — | @@ -297,7 +297,7 @@ |
| 298 | 298 | * @return boolean |
| 299 | 299 | */ |
| 300 | 300 | public static function areDMSCoordinates( $coordinates ) { |
| 301 | | - $sep = self::getSeperatorsRegex(); |
| | 301 | + $sep = self::getSeparatorsRegex(); |
| 302 | 302 | return preg_match( '/^(-)?(\d{1,3}°)((\s)?\d{1,2}(\′|\'))?(((\s)?\d{1,2}(″|"))?|((\s)?\d{1,2}\.\d{1,2}(″|"))?)' |
| 303 | 303 | . $sep . '(\s)?(-)?(\d{1,3}°)((\s)?\d{1,2}(\′|\'))?(((\s)?\d{1,2}(″|"))?|((\s)?\d{1,2}\.\d{1,2}(″|"))?)$/', $coordinates ) // Non-directional |
| 304 | 304 | || preg_match( '/^(\d{1,3}°)((\s)?\d{1,2}(\′|\'))?(((\s)?\d{1,2}(″|"))?|((\s)?\d{1,2}\.\d{1,2}(″|"))?)(\s)?(N|S)' |
| — | — | @@ -312,7 +312,7 @@ |
| 313 | 313 | * @return boolean |
| 314 | 314 | */ |
| 315 | 315 | public static function areDDCoordinates( $coordinates ) { |
| 316 | | - $sep = self::getSeperatorsRegex(); |
| | 316 | + $sep = self::getSeparatorsRegex(); |
| 317 | 317 | return preg_match( '/^(-)?\d{1,3}(|\.\d{1,20})°' . $sep . '(\s)?(-)?(\s)?\d{1,3}(|\.\d{1,20})°$/', $coordinates ) // Non-directional |
| 318 | 318 | || preg_match( '/^\d{1,3}(|\.\d{1,20})°(\s)?(N|S)' . $sep . '(\s)?(\s)?\d{1,3}(|\.\d{1,20})°(\s)?(E|W)?$/', $coordinates ); // Directional |
| 319 | 319 | } |
| — | — | @@ -325,7 +325,7 @@ |
| 326 | 326 | * @return boolean |
| 327 | 327 | */ |
| 328 | 328 | public static function areDMCoordinates( $coordinates ) { |
| 329 | | - $sep = self::getSeperatorsRegex(); |
| | 329 | + $sep = self::getSeparatorsRegex(); |
| 330 | 330 | return preg_match( '/(-)?\d{1,3}°(\s)?\d{1,2}(\.\d{1,20}\')?' . $sep . '(\s)?(-)?\d{1,3}°(\s)?\d{1,2}(\.\d{1,20}\')?$/', $coordinates ) // Non-directional |
| 331 | 331 | || preg_match( '/\d{1,3}°(\s)?\d{1,2}(\.\d{1,20}\')?(\s)?(N|S)' . $sep . '(\s)?\d{1,3}°(\s)?\d{1,2}(\.\d{1,20}\')?(\s)?(E|W)?$/', $coordinates ); // Directional |
| 332 | 332 | } |
| — | — | @@ -495,9 +495,9 @@ |
| 496 | 496 | return $coordinate; |
| 497 | 497 | } |
| 498 | 498 | |
| 499 | | - protected static function getSeperatorsRegex() { |
| 500 | | - if ( !self::$mSeperatorsRegex ) self::$mSeperatorsRegex = '(' . implode( '|', self::$mSeperators ) . ')'; |
| 501 | | - return self::$mSeperatorsRegex; |
| | 499 | + protected static function getSeparatorsRegex() { |
| | 500 | + if ( !self::$mSeparatorsRegex ) self::$mSeparatorsRegex = '(' . implode( '|', self::$mSeparators ) . ')'; |
| | 501 | + return self::$mSeparatorsRegex; |
| 502 | 502 | } |
| 503 | 503 | |
| 504 | 504 | /** |
| — | — | @@ -518,4 +518,4 @@ |
| 519 | 519 | } |
| 520 | 520 | } |
| 521 | 521 | |
| 522 | | -} |
| \ No newline at end of file |
| | 522 | +} |
| Index: trunk/extensions/Maps/Includes/Maps_Mapper.php |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | <?php |
| 3 | 3 | /** |
| 4 | | - * A class that holds static helper functions for common functionality that is not map-spesific. |
| | 4 | + * A class that holds static helper functions for common functionality that is not map-specific. |
| 5 | 5 | * |
| 6 | 6 | * @file Maps_Mapper.php |
| 7 | 7 | * @ingroup Maps |
| — | — | @@ -36,9 +36,9 @@ |
| 37 | 37 | * |
| 38 | 38 | * @return boolean |
| 39 | 39 | */ |
| 40 | | - public static function isLocation( $location, $name, array $parameters, $metaDataSeperator = false ) { |
| 41 | | - if ( $metaDataSeperator !== false ) { |
| 42 | | - $parts = explode( $metaDataSeperator, $location ); |
| | 40 | + public static function isLocation( $location, $name, array $parameters, $metaDataSeparator = false ) { |
| | 41 | + if ( $metaDataSeparator !== false ) { |
| | 42 | + $parts = explode( $metaDataSeparator, $location ); |
| 43 | 43 | $location = $parts[0]; |
| 44 | 44 | } |
| 45 | 45 | |
| — | — | @@ -58,10 +58,10 @@ |
| 59 | 59 | * |
| 60 | 60 | * @return boolean |
| 61 | 61 | */ |
| 62 | | - public static function areLocations( $locations, $name, array $parameters, $metaDataSeperator = false ) { |
| | 62 | + public static function areLocations( $locations, $name, array $parameters, $metaDataSeparator = false ) { |
| 63 | 63 | $locations = (array)$locations; |
| 64 | 64 | foreach ( $locations as $location ) { |
| 65 | | - if ( !self::isLocation( $location, $name, $parameters, $metaDataSeperator ) ) { |
| | 65 | + if ( !self::isLocation( $location, $name, $parameters, $metaDataSeparator ) ) { |
| 66 | 66 | return false; |
| 67 | 67 | } |
| 68 | 68 | } |
| — | — | @@ -304,4 +304,4 @@ |
| 305 | 305 | ), |
| 306 | 306 | ); |
| 307 | 307 | } |
| 308 | | -} |
| \ No newline at end of file |
| | 308 | +} |
| Index: trunk/extensions/Maps/Geocoders/Maps_Geocoder.php |
| — | — | @@ -97,7 +97,7 @@ |
| 98 | 98 | |
| 99 | 99 | $service = self::getValidGeoService( $service, $mappingService ); |
| 100 | 100 | |
| 101 | | - // Call the geocode function in the spesific geocoder class. |
| | 101 | + // Call the geocode function in the specific geocoder class. |
| 102 | 102 | $coordinates = call_user_func( array( $egMapsGeoServices[$service], 'geocode' ), $address ); |
| 103 | 103 | |
| 104 | 104 | // If there address could not be geocoded, and contains comma's, try again without the comma's. |
| — | — | @@ -165,4 +165,4 @@ |
| 166 | 166 | |
| 167 | 167 | return $service; |
| 168 | 168 | } |
| 169 | | -} |
| \ No newline at end of file |
| | 169 | +} |
| Index: trunk/extensions/Maps/Features/DisplayPoint/Maps_DisplayPoint.php |
| — | — | @@ -76,16 +76,16 @@ |
| 77 | 77 | * @param string $name The name of the parameter. |
| 78 | 78 | * @param array $parameters Array containing data about the so far handled parameters. |
| 79 | 79 | */ |
| 80 | | - public static function formatGeoPoints( &$locations, $name, array $parameters, $metaDataSeperator = false ) { |
| | 80 | + public static function formatGeoPoints( &$locations, $name, array $parameters, $metaDataSeparator = false ) { |
| 81 | 81 | $locations = (array)$locations; |
| 82 | 82 | foreach ( $locations as &$location ) { |
| 83 | | - self::formatGeoPoint( $location, $name, $parameters, $metaDataSeperator ); |
| | 83 | + self::formatGeoPoint( $location, $name, $parameters, $metaDataSeparator ); |
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | | - public static function formatGeoPoint( &$location, $name, array $parameters, $metaDataSeperator = false ) { |
| 88 | | - if ( $metaDataSeperator !== false ) { |
| 89 | | - $segments = explode( $metaDataSeperator, $location ); |
| | 87 | + public static function formatGeoPoint( &$location, $name, array $parameters, $metaDataSeparator = false ) { |
| | 88 | + if ( $metaDataSeparator !== false ) { |
| | 89 | + $segments = explode( $metaDataSeparator, $location ); |
| 90 | 90 | } |
| 91 | 91 | else { |
| 92 | 92 | $segments = array( $location ); |
| — | — | @@ -96,4 +96,4 @@ |
| 97 | 97 | $location = $segments; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | | -} |
| \ No newline at end of file |
| | 100 | +} |
| Index: trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * Abstract class MapsBasePointMap provides the scafolding for classes handling display_point(s) |
| 19 | | - * calls for a spesific mapping service. It inherits from MapsMapFeature and therefore forces |
| | 19 | + * calls for a specific mapping service. It inherits from MapsMapFeature and therefore forces |
| 20 | 20 | * inheriting classes to implement sereveral methods. |
| 21 | 21 | * |
| 22 | 22 | * @ingroup Maps |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | |
| 32 | 32 | protected $output = ''; |
| 33 | 33 | |
| 34 | | - protected $spesificParameters = false; |
| | 34 | + protected $specificParameters = false; |
| 35 | 35 | protected $featureParameters = false; |
| 36 | 36 | |
| 37 | 37 | private $markerData = array(); |
| — | — | @@ -248,4 +248,4 @@ |
| 249 | 249 | $this->centreLat = $egMapsMapLat; |
| 250 | 250 | $this->centreLon = $egMapsMapLon; |
| 251 | 251 | } |
| 252 | | -} |
| \ No newline at end of file |
| | 252 | +} |
| Index: trunk/extensions/Maps/Features/DisplayMap/Maps_BaseMap.php |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * Abstract class MapsBaseMap provides the scafolding for classes handling display_map |
| 19 | | - * calls for a spesific mapping service. It inherits from MapsMapFeature and therefore |
| | 19 | + * calls for a specific mapping service. It inherits from MapsMapFeature and therefore |
| 20 | 20 | * forces inheriting classes to implement sereveral methods. |
| 21 | 21 | * |
| 22 | 22 | * @ingroup Maps |
| — | — | @@ -32,7 +32,7 @@ |
| 33 | 33 | |
| 34 | 34 | protected $parser; |
| 35 | 35 | |
| 36 | | - protected $spesificParameters = false; |
| | 36 | + protected $specificParameters = false; |
| 37 | 37 | protected $featureParameters = false; |
| 38 | 38 | |
| 39 | 39 | /** |
| — | — | @@ -141,4 +141,4 @@ |
| 142 | 142 | } |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | | -} |
| \ No newline at end of file |
| | 145 | +} |
| Index: trunk/extensions/Maps/Features/Maps_ParserFunctions.php |
| — | — | @@ -84,9 +84,9 @@ |
| 85 | 85 | /* |
| 86 | 86 | * Assembliy of the allowed parameters and their information. |
| 87 | 87 | * The main parameters (the ones that are shared by everything) are overidden |
| 88 | | - * by the feature parameters (the ones spesific to a feature). The result is then |
| 89 | | - * again overidden by the service parameters (the ones spesific to the service), |
| 90 | | - * and finally by the spesific parameters (the ones spesific to a service-feature combination). |
| | 88 | + * by the feature parameters (the ones specific to a feature). The result is then |
| | 89 | + * again overidden by the service parameters (the ones specific to the service), |
| | 90 | + * and finally by the specific parameters (the ones specific to a service-feature combination). |
| 91 | 91 | */ |
| 92 | 92 | $parameterInfo = array_merge_recursive( MapsMapper::getCommonParameters(), $mapClass->getFeatureParameters() ); |
| 93 | 93 | $parameterInfo = array_merge_recursive( $parameterInfo, $egMapsServices[$service]['parameters'] ); |
| — | — | @@ -134,4 +134,4 @@ |
| 135 | 135 | |
| 136 | 136 | return $equals; |
| 137 | 137 | } |
| 138 | | -} |
| \ No newline at end of file |
| | 138 | +} |