| Index: trunk/extensions/SemanticMaps/SM_Settings.php |
| — | — | @@ -51,21 +51,8 @@ |
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | |
| | 55 | +# Queries |
| 55 | 56 | |
| 56 | | - |
| 57 | | - |
| 58 | | -# Geographical Coordinate data type settings |
| 59 | | - |
| 60 | | -# Integer. The default distance value to be used in geographical distance queries. |
| 61 | | -# This value will only be used when the user does not provide one. |
| 62 | | -$smgGeoCoordDistance = 5; |
| 63 | | - |
| 64 | | - |
| 65 | | - |
| 66 | | - |
| 67 | | - |
| 68 | | -# Query Printers |
| 69 | | - |
| 70 | 57 | # Boolean. The default value for the forceshow parameter. Will force a map to be shown even when there are no query results |
| 71 | 58 | # when set to true. This value will only be used when the user does not provide one. |
| 72 | 59 | $smgQPForceShow = false; |
| — | — | @@ -84,3 +71,18 @@ |
| 85 | 72 | |
| 86 | 73 | # Boolean. Indicates if coordinates should be outputted in directional notation by default. |
| 87 | 74 | $smgQPCoodDirectional = $egMapsCoordinateDirectional; |
| | 75 | + |
| | 76 | +# Integer. The default distance value to be used in geographical distance queries. |
| | 77 | +# This value will only be used when the user does not provide one. |
| | 78 | +$smgGeoCoordDistance = 5; |
| | 79 | + |
| | 80 | + |
| | 81 | + |
| | 82 | + |
| | 83 | + |
| | 84 | +# Forms |
| | 85 | + |
| | 86 | +# Integer or string. The default width and height of maps in forms created by using Semantic Forms. |
| | 87 | +# These values only be used when the user does not provide them. |
| | 88 | +$smgFIWidth = 665; |
| | 89 | +$smgFIHeight = $egMapsMapHeight; |
| \ No newline at end of file |
| Index: trunk/extensions/SemanticMaps/SemanticMaps.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | |
| 37 | 37 | // Only initialize the extension when all dependencies are present. |
| 38 | 38 | if ( defined( 'Maps_VERSION' ) && defined( 'SMW_VERSION' ) ) { |
| 39 | | - define( 'SM_VERSION', '0.6 a20' ); |
| | 39 | + define( 'SM_VERSION', '0.6 rc1' ); |
| 40 | 40 | |
| 41 | 41 | $smgScriptPath = ( isset( $wgExtensionAssetsPath ) && $wgExtensionAssetsPath ? $wgExtensionAssetsPath : $wgScriptPath . '/extensions' ) . '/SemanticMaps'; |
| 42 | 42 | $smgDir = dirname( __FILE__ ) . '/'; |
| Index: trunk/extensions/SemanticMaps/Features/FormInputs/SM_FormInputs.php |
| — | — | @@ -58,8 +58,15 @@ |
| 59 | 59 | |
| 60 | 60 | private static function initializeParams() { |
| 61 | 61 | global $egMapsAvailableServices, $egMapsDefaultServices, $egMapsAvailableGeoServices, $egMapsDefaultGeoService; |
| | 62 | + global $smgFIWidth, $smgFIHeight; |
| 62 | 63 | |
| 63 | 64 | self::$parameters = array( |
| | 65 | + 'width' => array( |
| | 66 | + 'default' => $smgFIWidth |
| | 67 | + ), |
| | 68 | + 'height' => array( |
| | 69 | + 'default' => $smgFIHeight |
| | 70 | + ), |
| 64 | 71 | 'centre' => array( |
| 65 | 72 | 'aliases' => array( 'center' ), |
| 66 | 73 | ), |
| Index: trunk/extensions/SemanticMaps/Features/QueryPrinters/SM_QueryPrinters.php |
| — | — | @@ -55,10 +55,16 @@ |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | private static function initializeParams() { |
| 59 | | - global $egMapsDefaultServices, $egMapsAvailableGeoServices, $egMapsDefaultGeoService; |
| | 59 | + global $egMapsDefaultServices, $egMapsAvailableGeoServices, $egMapsDefaultGeoService, $egMapsMapWidth, $egMapsMapHeight; |
| 60 | 60 | global $smgQPForceShow, $smgQPShowTitle, $smgQPTemplate; |
| 61 | 61 | |
| 62 | 62 | self::$parameters = array( |
| | 63 | + 'width' => array( |
| | 64 | + 'default' => $egMapsMapWidth |
| | 65 | + ), |
| | 66 | + 'height' => array( |
| | 67 | + 'default' => $egMapsMapHeight |
| | 68 | + ), |
| 63 | 69 | 'geoservice' => array( |
| 64 | 70 | 'criteria' => array( |
| 65 | 71 | 'in_array' => $egMapsAvailableGeoServices |