http://www.mediawiki.org/wiki/Special:Code/MediaWiki/67251
Revision: 67251
Author: jeroendedauw
Date: 2010-06-02 21:27:16 +0000 (Wed, 02 Jun 2010)
Log Message:
-----------
Small style fixes
Modified Paths:
--------------
trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php
trunk/extensions/Maps/Geocoders/Maps_Geocoder.php
trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispPoint.php
Modified: trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php
===================================================================
--- trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php
2010-06-02 21:26:44 UTC (rev 67250)
+++ trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php
2010-06-02 21:27:16 UTC (rev 67251)
@@ -194,6 +194,7 @@
$markerData['lat'] = Xml::escapeJsString(
$markerData['lat'] );
$markerData['icon'] = Xml::escapeJsString(
$markerData['icon'] );
+ // TODO: Replace this by by some json_encode stuff.
$markerItems[] = str_replace(
array( 'lon', 'lat', 'title', 'label', 'icon' ),
array( $markerData['lon'], $markerData['lat'],
$title, $label, $markerData['icon'] ),
Modified: trunk/extensions/Maps/Geocoders/Maps_Geocoder.php
===================================================================
--- trunk/extensions/Maps/Geocoders/Maps_Geocoder.php 2010-06-02 21:26:44 UTC
(rev 67250)
+++ trunk/extensions/Maps/Geocoders/Maps_Geocoder.php 2010-06-02 21:27:16 UTC
(rev 67251)
@@ -96,7 +96,9 @@
}
$service = self::getValidGeoService( $service, $mappingService
);
-
+
+ var_dump($address);exit;
+
// Call the geocode function in the spesific geocoder class.
$coordinates = call_user_func( array(
$egMapsGeoServices[$service], 'geocode' ), $address );
Modified: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
===================================================================
--- trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
2010-06-02 21:26:44 UTC (rev 67250)
+++ trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
2010-06-02 21:27:16 UTC (rev 67251)
@@ -24,7 +24,7 @@
public $serviceName = MapsGoogleMaps::SERVICE_NAME;
- protected $markerStringFormat = 'getGMarkerData(lat, lon, \'title\',
\'label\', "icon")';
+ protected $markerStringFormat = 'getGMarkerData(lat, lon, "title",
"label", "icon")';
protected function getDefaultZoom() {
global $egMapsGoogleMapsZoom;
Modified:
trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
===================================================================
--- trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
2010-06-02 21:26:44 UTC (rev 67250)
+++ trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
2010-06-02 21:27:16 UTC (rev 67251)
@@ -24,7 +24,7 @@
public $serviceName = MapsGoogleMaps3::SERVICE_NAME;
- protected $markerStringFormat = 'getGMaps3MarkerData(lat, lon,
\'title\', \'label\', "icon")';
+ protected $markerStringFormat = 'getGMaps3MarkerData(lat, lon, "title",
"label", "icon")';
protected function getDefaultZoom() {
global $egMapsGMaps3Zoom;
Modified: trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
===================================================================
--- trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
2010-06-02 21:26:44 UTC (rev 67250)
+++ trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
2010-06-02 21:27:16 UTC (rev 67251)
@@ -22,7 +22,7 @@
public $serviceName = MapsOpenLayers::SERVICE_NAME;
- protected $markerStringFormat = 'getOLMarkerData(lon, lat, \'title\',
\'label\', "icon")';
+ protected $markerStringFormat = 'getOLMarkerData(lon, lat, "title",
"label", "icon")';
protected function getDefaultZoom() {
global $egMapsOpenLayersZoom;
Modified: trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispPoint.php
===================================================================
--- trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispPoint.php
2010-06-02 21:26:44 UTC (rev 67250)
+++ trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispPoint.php
2010-06-02 21:27:16 UTC (rev 67251)
@@ -22,7 +22,7 @@
public $serviceName = MapsYahooMaps::SERVICE_NAME;
- protected $markerStringFormat = 'getYMarkerData(lat, lon, \'title\',
\'label\', "icon")';
+ protected $markerStringFormat = 'getYMarkerData(lat, lon, "title",
"label", "icon")';
protected function getDefaultZoom() {
global $egMapsYahooMapsZoom;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
