r60386 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r60385‎ | r60386 | r60387 >
Date:12:02, 25 December 2009
Author:jeroendedauw
Status:deferred
Tags:
Comment:
Changes for 0.5.1. http://www.mediawiki.org/wiki/Extension:Semantic_Maps/Future#Semantic_Maps_0.5.1
Modified paths:
  • /trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMaps.php (modified) (history)
  • /trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsQP.php (modified) (history)
  • /trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayers.php (modified) (history)
  • /trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersQP.php (modified) (history)
  • /trunk/extensions/SemanticMaps/OpenStreetMap/SM_OSM.php (modified) (history)
  • /trunk/extensions/SemanticMaps/OpenStreetMap/SM_OSMQP.php (modified) (history)
  • /trunk/extensions/SemanticMaps/SemanticMaps.php (modified) (history)
  • /trunk/extensions/SemanticMaps/YahooMaps/SM_YahooMaps.php (modified) (history)
  • /trunk/extensions/SemanticMaps/YahooMaps/SM_YahooMapsQP.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SemanticMaps/YahooMaps/SM_YahooMaps.php
——@@ -20,5 +20,5 @@
2121 die( 'Not an entry point.' );
2222 }
2323
24 -$egMapsServices['yahoomaps']['qp'] = array('class' => 'SMYahooMapsQP', 'file' => 'SemanticMaps/YahooMaps/SM_YahooMapsQP.php', 'local' => false);
25 -$egMapsServices['yahoomaps']['fi'] = array('class' => 'SMYahooMapsFormInput', 'file' => 'SemanticMaps/YahooMaps/SM_YahooMapsFormInput.php', 'local' => false);
\ No newline at end of file
 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
Index: trunk/extensions/SemanticMaps/YahooMaps/SM_YahooMapsQP.php
——@@ -25,13 +25,7 @@
2626
2727 $this->elementNamePrefix = $egMapsYahooMapsPrefix;
2828
29 - $this->defaultZoom = $egMapsYahooMapsZoom;
30 -
31 - $this->spesificParameters = array(
32 - 'zoom' => array(
33 - 'default' => '',
34 - )
35 - );
 29+ $this->defaultZoom = $egMapsYahooMapsZoom;
3630 }
3731
3832 /**
Index: trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayers.php
——@@ -20,5 +20,5 @@
2121 die( 'Not an entry point.' );
2222 }
2323
24 -$egMapsServices['openlayers']['qp'] = array('class' => 'SMOpenLayersQP', 'file' => 'SemanticMaps/OpenLayers/SM_OpenLayersQP.php', 'local' => false);
25 -$egMapsServices['openlayers']['fi'] = array('class' => 'SMOpenLayersFormInput', 'file' => 'SemanticMaps/OpenLayers/SM_OpenLayersFormInput.php', 'local' => false);
\ No newline at end of file
 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
Index: trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersQP.php
——@@ -25,13 +25,7 @@
2626 global $egMapsOpenLayersZoom, $egMapsOpenLayersPrefix;
2727
2828 $this->elementNamePrefix = $egMapsOpenLayersPrefix;
29 - $this->defaultZoom = $egMapsOpenLayersZoom;
30 -
31 - $this->spesificParameters = array(
32 - 'zoom' => array(
33 - 'default' => '',
34 - )
35 - );
 29+ $this->defaultZoom = $egMapsOpenLayersZoom;
3630 }
3731
3832 /**
Index: trunk/extensions/SemanticMaps/OpenStreetMap/SM_OSM.php
——@@ -20,5 +20,5 @@
2121 die( 'Not an entry point.' );
2222 }
2323
24 -$egMapsServices['osm']['qp'] = array('class' => 'SMOSMQP', 'file' => 'SemanticMaps/OpenStreetMap/SM_OSMQP.php', 'local' => false);
25 -//$egMapsServices['osm']['fi'] = array('class' => 'SMOSMFormInput', 'file' => 'SemanticMaps/OpenStreetMap/SM_OSMFormInput.php', 'local' => false);
\ No newline at end of file
 24+$egMapsServices['osm']['qp'] = array('class' => 'SMOSMQP', 'file' => 'extensions/SemanticMaps/OpenStreetMap/SM_OSMQP.php', 'local' => false);
 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/OpenStreetMap/SM_OSMQP.php
——@@ -25,13 +25,7 @@
2626 global $egMapsOSMZoom, $egMapsOSMPrefix;
2727
2828 $this->elementNamePrefix = $egMapsOSMPrefix;
29 - $this->defaultZoom = $egMapsOSMZoom;
30 -
31 - $this->spesificParameters = array(
32 - 'zoom' => array(
33 - 'default' => '',
34 - )
35 - );
 29+ $this->defaultZoom = $egMapsOSMZoom;
3630 }
3731
3832 /**
Index: trunk/extensions/SemanticMaps/SemanticMaps.php
——@@ -35,7 +35,7 @@
3636
3737 // Only initialize the extension when all dependencies are present.
3838 if (defined( 'Maps_VERSION' ) && defined( 'SMW_VERSION' )) {
39 - define('SM_VERSION', '0.5.1 a7');
 39+ define('SM_VERSION', '0.5.1 a8');
4040
4141 $smgScriptPath = $wgScriptPath . '/extensions/SemanticMaps';
4242 $smgIP = $IP . '/extensions/SemanticMaps';
Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMaps.php
——@@ -20,5 +20,5 @@
2121 die( 'Not an entry point.' );
2222 }
2323
24 -$egMapsServices['googlemaps']['qp'] = array('class' => 'SMGoogleMapsQP', 'file' => 'SemanticMaps/GoogleMaps/SM_GoogleMapsQP.php', 'local' => false);
25 -$egMapsServices['googlemaps']['fi'] = array('class' => 'SMGoogleMapsFormInput', 'file' => 'SemanticMaps/GoogleMaps/SM_GoogleMapsFormInput.php', 'local' => false);
\ No newline at end of file
 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
Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsQP.php
——@@ -25,22 +25,19 @@
2626 *
2727 */
2828 protected function setQueryPrinterSettings() {
29 - global $egMapsGoogleMapsZoom, $egMapsGoogleMapsPrefix;
 29+ global $egMapsGoogleMapsZoom, $egMapsGoogleMapsPrefix, $egMapsGMapOverlays;
3030
3131 $this->elementNamePrefix = $egMapsGoogleMapsPrefix;
3232
3333 $this->defaultZoom = $egMapsGoogleMapsZoom;
3434
3535 $this->spesificParameters = array(
36 - 'zoom' => array(
37 - 'default' => '',
38 - ),
3936 'overlays' => array(
4037 'type' => array('string', 'list'),
4138 'criteria' => array(
4239 'is_google_overlay' => array()
43 - ),
44 - 'output-type' => 'array'
 40+ ),
 41+ 'default' => $egMapsGMapOverlays,
4542 ),
4643 );
4744 }

Status & tagging log