http://www.mediawiki.org/wiki/Special:Code/MediaWiki/54981
Revision: 54981
Author: jeroendedauw
Date: 2009-08-13 22:53:18 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/extensions/Maps/GoogleMaps/GoogleMapFunctions.js
trunk/extensions/Maps/YahooMaps/YahooMapFunctions.js
Modified: trunk/extensions/Maps/GoogleMaps/GoogleMapFunctions.js
===================================================================
--- trunk/extensions/Maps/GoogleMaps/GoogleMapFunctions.js 2009-08-13
22:38:32 UTC (rev 54980)
+++ trunk/extensions/Maps/GoogleMaps/GoogleMapFunctions.js 2009-08-13
22:53:18 UTC (rev 54981)
@@ -134,11 +134,10 @@
/**
* This function holds spesific functionallity for the Google Maps form input
of Semantic Maps
* TODO: Refactor as much code as possible to non specific functions
- * TODO: Centralize geocoding functionallity, and use that code instead of
local GG
*/
-function makeFormInputGoogleMap(mapName, locationFieldName, width, height,
lat, lon, zoom, marker_lat, marker_lon, type, control, scrollWheelZoom,
earthEnabled) {
- if (GBrowserIsCompatible()) { // TODO: This function should probably be
used after the loading of the G Maps API
- var map = createGoogleMap(document.getElementById(mapName), new
GSize(width, height), new GLatLng(lat, lon), zoom, type, control,
scrollWheelZoom, earthEnabled);
+function makeFormInputGoogleMap(mapName, locationFieldName, width, height,
lat, lon, zoom, type, types, controls, scrollWheelZoom, marker_lat, marker_lon)
{
+ if (GBrowserIsCompatible()) { // TODO: This function should probably
be used after the loading of the G Maps API
+ var map = createGoogleMap(document.getElementById(mapName), new
GSize(width, height), new GLatLng(lat, lon), zoom, type, types, controls,
scrollWheelZoom, [getGMarkerData(marker_lat, marker_lon, '', '', '')]);
// Show a starting marker only if marker coordinates are
provided
if (marker_lat != null && marker_lon != null) {
@@ -149,7 +148,7 @@
GEvent.addListener(map, "click",
function(overlay, point) {
if (overlay) {
- map.removeOverlay (overlay);
+ map.removeOverlay(overlay);
} else {
map.clearOverlays();
document.getElementById(locationFieldName).value = convertLatToDMS(point.y)+',
'+convertLngToDMS(point.x);
@@ -179,7 +178,7 @@
window.alert(address + ' ' + notFoundFormat);
} else {
map.clearOverlays();
- map.setCenter(point);
+ map.setCenter(point, 14);
var marker = new GMarker(point);
map.addOverlay(marker);
document.getElementById(outputElementName).value = convertLatToDMS(point.y) +
', ' + convertLngToDMS(point.x);
Modified: trunk/extensions/Maps/YahooMaps/YahooMapFunctions.js
===================================================================
--- trunk/extensions/Maps/YahooMaps/YahooMapFunctions.js 2009-08-13
22:38:32 UTC (rev 54980)
+++ trunk/extensions/Maps/YahooMaps/YahooMapFunctions.js 2009-08-13
22:53:18 UTC (rev 54981)
@@ -108,8 +108,8 @@
* This function holds spesific functionallity for the Yahoo! Maps form input
of Semantic Maps
* TODO: Refactor as much code as possible to non specific functions
*/
-function makeFormInputYahooMap(mapName, locationFieldName, lat, lon, zoom,
marker_lat, marker_lon, type, controls, scrollWheelZoom) {
- var map = createYahooMap(document.getElementById(mapName), new
YGeoPoint(lat, lon), zoom, type, controls, scrollWheelZoom);
+function makeFormInputYahooMap(mapName, locationFieldName, lat, lon, zoom,
type, types, controls, scrollWheelZoom, marker_lat, marker_lon) {
+ var map = createYahooMap(document.getElementById(mapName), new
YGeoPoint(lat, lon), zoom, type, types, controls, scrollWheelZoom,
[getYMarkerData(marker_lat, marker_lon, '', '', '')]);
// Show a starting marker only if marker coordinates are provided
if (marker_lat != null && marker_lon != null) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
