| Index: trunk/extensions/SemanticMaps/YahooMaps/SM_YahooMaps.php |
| — | — | @@ -20,5 +20,5 @@ |
| 21 | 21 | die( 'Not an entry point.' ); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | | -$egMapsServices['yahoomaps']['qp'] = array('class' => 'SMYahooMapsQP', 'file' => 'extensions/SemanticMaps/YahooMaps/SM_YahooMapsQP.php', 'local' => false); |
| 25 | | -$egMapsServices['yahoomaps']['fi'] = array('class' => 'SMYahooMapsFormInput', 'file' => 'extensions/SemanticMaps/YahooMaps/SM_YahooMapsFormInput.php', 'local' => false); |
| \ No newline at end of file |
| | 24 | +$egMapsServices['yahoomaps']['qp'] = array('class' => 'SMYahooMapsQP', 'file' => 'YahooMaps/SM_YahooMapsQP.php', 'local' => true); |
| | 25 | +$egMapsServices['yahoomaps']['fi'] = array('class' => 'SMYahooMapsFormInput', 'file' => 'YahooMaps/SM_YahooMapsFormInput.php', 'local' => true); |
| \ No newline at end of file |
| Index: trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayers.php |
| — | — | @@ -20,5 +20,5 @@ |
| 21 | 21 | die( 'Not an entry point.' ); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | | -$egMapsServices['openlayers']['qp'] = array('class' => 'SMOpenLayersQP', 'file' => 'extensions/SemanticMaps/OpenLayers/SM_OpenLayersQP.php', 'local' => false); |
| 25 | | -$egMapsServices['openlayers']['fi'] = array('class' => 'SMOpenLayersFormInput', 'file' => 'extensions/SemanticMaps/OpenLayers/SM_OpenLayersFormInput.php', 'local' => false); |
| \ No newline at end of file |
| | 24 | +$egMapsServices['openlayers']['qp'] = array('class' => 'SMOpenLayersQP', 'file' => 'OpenLayers/SM_OpenLayersQP.php', 'local' => true); |
| | 25 | +$egMapsServices['openlayers']['fi'] = array('class' => 'SMOpenLayersFormInput', 'file' => 'OpenLayers/SM_OpenLayersFormInput.php', 'local' => true); |
| \ No newline at end of file |
| Index: trunk/extensions/SemanticMaps/FormInputs/SM_FormInputs.php |
| — | — | @@ -43,11 +43,10 @@ |
| 44 | 44 | |
| 45 | 45 | // Loop through the service alliases, and add them as form input types. |
| 46 | 46 | foreach ($serviceData['aliases'] as $alias) self::initFormHook($alias, $serviceData['fi'], $serviceName); |
| 47 | | - } |
| | 47 | + } |
| 48 | 48 | |
| 49 | 49 | // Add the 'map' form input type if there are mapping services that have FI's loaded. |
| 50 | 50 | if ($hasFormInputs) self::initFormHook('map'); |
| 51 | | - |
| 52 | 51 | } |
| 53 | 52 | } |
| 54 | 53 | |
| — | — | @@ -73,7 +72,9 @@ |
| 74 | 73 | ), |
| 75 | 74 | 'service_name' => array(), |
| 76 | 75 | 'part_of_multiple' => array(), |
| 77 | | - 'possible_values' => array(), |
| | 76 | + 'possible_values' => array( |
| | 77 | + 'type' => array('string', 'array'), |
| | 78 | + ), |
| 78 | 79 | 'is_list' => array(), |
| 79 | 80 | 'semantic_property' => array(), |
| 80 | 81 | 'value_labels' => array(), |
| — | — | @@ -92,7 +93,7 @@ |
| 93 | 94 | |
| 94 | 95 | if (isset($fi)) { |
| 95 | 96 | if (! array_key_exists($fi['class'], $wgAutoloadClasses)) { |
| 96 | | - $file = $fi['local'] ? $smgIP . '/' . $fi['file'] : $fi['file']; |
| | 97 | + $file = array_key_exists('local', $fi) && $fi['local'] ? $smgIP . '/' . $fi['file'] : $fi['file']; |
| 97 | 98 | $wgAutoloadClasses[$fi['class']] = $file; |
| 98 | 99 | } |
| 99 | 100 | } |
| Index: trunk/extensions/SemanticMaps/OpenStreetMap/SM_OSM.php |
| — | — | @@ -20,5 +20,5 @@ |
| 21 | 21 | die( 'Not an entry point.' ); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | | -$egMapsServices['osm']['qp'] = array('class' => 'SMOSMQP', 'file' => 'extensions/SemanticMaps/OpenStreetMap/SM_OSMQP.php', 'local' => false); |
| | 24 | +$egMapsServices['osm']['qp'] = array('class' => 'SMOSMQP', 'file' => 'OpenStreetMap/SM_OSMQP.php', 'local' => true); |
| 25 | 25 | //$egMapsServices['osm']['fi'] = array('class' => 'SMOSMFormInput', 'file' => 'extensions/SemanticMaps/OpenStreetMap/SM_OSMFormInput.php', 'local' => false); |
| \ 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.5.1 rc1'); |
| | 39 | + define('SM_VERSION', '0.5.1 rc2'); |
| 40 | 40 | |
| 41 | 41 | $smgScriptPath = $wgScriptPath . '/extensions/SemanticMaps'; |
| 42 | 42 | $smgIP = $IP . '/extensions/SemanticMaps'; |
| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMaps.php |
| — | — | @@ -20,5 +20,5 @@ |
| 21 | 21 | die( 'Not an entry point.' ); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | | -$egMapsServices['googlemaps']['qp'] = array('class' => 'SMGoogleMapsQP', 'file' => 'extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsQP.php', 'local' => false); |
| 25 | | -$egMapsServices['googlemaps']['fi'] = array('class' => 'SMGoogleMapsFormInput', 'file' => 'extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsFormInput.php', 'local' => false); |
| \ No newline at end of file |
| | 24 | +$egMapsServices['googlemaps']['qp'] = array('class' => 'SMGoogleMapsQP', 'file' => 'GoogleMaps/SM_GoogleMapsQP.php', 'local' => true); |
| | 25 | +$egMapsServices['googlemaps']['fi'] = array('class' => 'SMGoogleMapsFormInput', 'file' => 'GoogleMaps/SM_GoogleMapsFormInput.php', 'local' => true); |
| \ No newline at end of file |