| Index: branches/SemanticMaps0.8/SM_Settings.php |
| — | — | @@ -21,31 +21,8 @@ |
| 22 | 22 | |
| 23 | 23 | |
| 24 | 24 | |
| 25 | | -# Features configuration |
| 26 | | - |
| 27 | | - # (named) Array of String. This array contains the available features for Maps. |
| 28 | | - # Commenting out the inclusion of any feature will make Maps completely ignore it, and so improve performance. |
| 29 | | - |
| 30 | | - # Query printers |
| 31 | | - include_once $smgDir . 'includes/queryprinters/SM_QueryPrinters.php'; |
| 32 | | - # Form imputs |
| 33 | | - include_once $smgDir . 'includes/forminputs/SM_FormInputs.php'; |
| 34 | | - |
| 35 | | - |
| 36 | | - |
| 37 | 25 | # Mapping services configuration |
| 38 | 26 | |
| 39 | | - # Include the mapping services that should be loaded into Semantic Maps. |
| 40 | | - # Commenting or removing a mapping service will cause Semantic Maps to completely ignore it, and so improve performance. |
| 41 | | - # Google Maps API v2 |
| 42 | | - //include_once $smgDir . 'includes/services/GoogleMaps/SM_GoogleMaps.php'; |
| 43 | | - # Google Maps API v3 |
| 44 | | - include_once $smgDir . 'includes/services/GoogleMaps3/SM_GoogleMaps3.php'; |
| 45 | | - # OpenLayers API |
| 46 | | - include_once $smgDir . 'includes/services/OpenLayers/SM_OpenLayers.php'; |
| 47 | | - # Yahoo! Maps API |
| 48 | | - //include_once $smgDir . 'includes/services/YahooMaps/SM_YahooMaps.php'; |
| 49 | | - |
| 50 | 27 | # Array of String. The default mapping service for each feature, which will be used when no valid service is provided by the user. |
| 51 | 28 | # Each service needs to be enabled, if not, the first one from the available services will be taken. |
| 52 | 29 | # Note: The default service needs to be available for the feature you set it for, since it's used as a fallback mechanism. |
| Index: branches/SemanticMaps0.8/includes/services/GoogleMaps3/SM_GoogleMaps3.php |
| — | — | @@ -20,9 +20,9 @@ |
| 21 | 21 | die( 'Not an entry point.' ); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | | -$wgHooks['MappingServiceLoad'][] = 'smfInitGoogleMaps'; |
| | 24 | +$wgHooks['MappingServiceLoad'][] = 'smfInitGoogleMaps3'; |
| 25 | 25 | |
| 26 | | -function smfInitGoogleMaps() { |
| | 26 | +function smfInitGoogleMaps3() { |
| 27 | 27 | global $wgAutoloadClasses; |
| 28 | 28 | |
| 29 | 29 | $wgAutoloadClasses['SMGoogleMaps3QP'] = dirname( __FILE__ ) . '/SM_GoogleMaps3QP.php'; |
| Index: branches/SemanticMaps0.8/includes/queryprinters/SM_MapPrinter.php |
| — | — | @@ -278,7 +278,7 @@ |
| 279 | 279 | global $wgTitle; |
| 280 | 280 | |
| 281 | 281 | $parser = new Parser(); |
| 282 | | - $iconUrl = MapsMapper::getImageUrl( $params['icon'] ); |
| | 282 | + $iconUrl = MapsMapper::getFileUrl( $params['icon'] ); |
| 283 | 283 | $params['locations'] = array(); |
| 284 | 284 | |
| 285 | 285 | foreach ( array_merge( $params['staticlocations'], $queryLocations ) as $location ) { |
| Index: branches/SemanticMaps0.8/includes/queryprinters/SM_QueryHandler.php |
| — | — | @@ -408,7 +408,7 @@ |
| 409 | 409 | } |
| 410 | 410 | } // Icon can be set even for regular, non-compound queries If it is, though, we have to translate the name into a URL here |
| 411 | 411 | elseif ( $this->icon != '' ) { |
| 412 | | - $icon = MapsMapper::getImageUrl( $this->icon ); |
| | 412 | + $icon = MapsMapper::getFileUrl( $this->icon ); |
| 413 | 413 | } |
| 414 | 414 | |
| 415 | 415 | return $icon; |
| Index: branches/SemanticMaps0.8/SemanticMaps.php |
| — | — | @@ -53,6 +53,26 @@ |
| 54 | 54 | // Include the settings file. |
| 55 | 55 | require_once 'SM_Settings.php'; |
| 56 | 56 | |
| | 57 | + # (named) Array of String. This array contains the available features for Maps. |
| | 58 | + # Commenting out the inclusion of any feature will make Maps completely ignore it, and so improve performance. |
| | 59 | + |
| | 60 | + # Query printers |
| | 61 | + include_once $smgDir . 'includes/queryprinters/SM_QueryPrinters.php'; |
| | 62 | + # Form imputs |
| | 63 | + include_once $smgDir . 'includes/forminputs/SM_FormInputs.php'; |
| | 64 | + |
| | 65 | + # Include the mapping services that should be loaded into Semantic Maps. |
| | 66 | + # Commenting or removing a mapping service will cause Semantic Maps to completely ignore it, and so improve performance. |
| | 67 | + |
| | 68 | + # Google Maps API v2 |
| | 69 | + include_once $smgDir . 'includes/services/GoogleMaps/SM_GoogleMaps.php'; |
| | 70 | + # Google Maps API v3 |
| | 71 | + include_once $smgDir . 'includes/services/GoogleMaps3/SM_GoogleMaps3.php'; |
| | 72 | + # OpenLayers API |
| | 73 | + include_once $smgDir . 'includes/services/OpenLayers/SM_OpenLayers.php'; |
| | 74 | + # Yahoo! Maps API |
| | 75 | + include_once $smgDir . 'includes/services/YahooMaps/SM_YahooMaps.php'; |
| | 76 | + |
| 57 | 77 | $wgExtensionFunctions[] = 'smfSetup'; |
| 58 | 78 | |
| 59 | 79 | $wgExtensionMessagesFiles['SemanticMaps'] = $smgDir . 'SemanticMaps.i18n.php'; |
| — | — | @@ -101,19 +121,12 @@ |
| 102 | 122 | foreach ( MapsMappingServices::getServiceIdentifiers() as $identifier ) $services[] = wfMsg( 'maps_' . $identifier ); |
| 103 | 123 | $servicesList = $wgLang->listToText( $services ); |
| 104 | 124 | |
| 105 | | - // This function has been deprecated in 1.16, but needed for earlier versions. |
| 106 | | - // It's present in 1.16 as a stub, but lets check if it exists in case it gets removed at some point. |
| 107 | | - if ( function_exists( 'wfLoadExtensionMessages' ) ) { |
| 108 | | - wfLoadExtensionMessages( 'SemanticMaps' ); |
| 109 | | - } |
| 110 | | - |
| 111 | 125 | $wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' : 'other'][] = array( |
| 112 | 126 | 'path' => __FILE__, |
| 113 | 127 | 'name' => wfMsg( 'semanticmaps_name' ), |
| 114 | 128 | 'version' => SM_VERSION, |
| 115 | 129 | 'author' => array( |
| 116 | | - '[http://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]', |
| 117 | | - '[http://www.mediawiki.org/wiki/Extension:Semantic_Maps/Credits ' . wfMsg( 'maps-others' ) . ']' |
| | 130 | + '[http://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]' |
| 118 | 131 | ), |
| 119 | 132 | 'url' => 'http://www.mediawiki.org/wiki/Extension:Semantic_Maps', |
| 120 | 133 | 'description' => wfMsgExt( 'semanticmaps_desc', 'parsemag', $servicesList ), |