From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 22 Mar 2014 20:51:27 +0000 (+0100)
Subject: Added settings for default map position
X-Git-Tag: 2.0.5~27
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ceaa4d3854ec2ba98decbbcd9a34a732dbe443c7;p=GitHub%2FWoltLab%2FWCF.git

Added settings for default map position
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 731a4eeda2..e22db648d6 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -575,6 +575,16 @@ physical:wcf.acp.option.google_maps_type.physical]]></selectoptions>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
+			<option name="google_maps_default_latitude">
+				<categoryname>general.system.googleMaps</categoryname>
+				<optiontype>float</optiontype>
+				<defaultvalue>52.517</defaultvalue>
+			</option>
+			<option name="google_maps_default_longitude">
+				<categoryname>general.system.googleMaps</categoryname>
+				<optiontype>float</optiontype>
+				<defaultvalue>13.4</defaultvalue>
+			</option>
 			<!-- /general.system.googleMaps -->
 			
 			<!-- general.mail.general -->
diff --git a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
index 173694fb74..e666440f0c 100644
--- a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
+++ b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
@@ -10,7 +10,9 @@
 			scaleControl: {@GOOGLE_MAPS_ENABLE_SCALE_CONTROL},
 			scrollwheel: {@GOOGLE_MAPS_ENABLE_SCROLL_WHEEL_ZOOM},
 			type: '{@GOOGLE_MAPS_TYPE}',
-			zoom: {@GOOGLE_MAPS_ZOOM}
+			zoom: {@GOOGLE_MAPS_ZOOM},
+			defaultLatitude: {@GOOGLE_MAPS_DEFAULT_LATITUDE},
+			defaultLongitude: {@GOOGLE_MAPS_DEFAULT_LONGITUDE}
 		});
 		
 		{event name='javascriptInit'}
diff --git a/wcfsetup/install/files/js/WCF.Location.js b/wcfsetup/install/files/js/WCF.Location.js
index 379669f8c0..9f93078496 100644
--- a/wcfsetup/install/files/js/WCF.Location.js
+++ b/wcfsetup/install/files/js/WCF.Location.js
@@ -129,7 +129,7 @@ WCF.Location.GoogleMaps.Map = Class.extend({
 		var $defaultMapOptions = { };
 		
 		// dummy center value
-		$defaultMapOptions.center = new google.maps.LatLng(52.517, 13.4); // Berlin
+		$defaultMapOptions.center = new google.maps.LatLng(WCF.Location.GoogleMaps.Settings.get('defaultLatitude'), WCF.Location.GoogleMaps.Settings.get('defaultLongitude'));
 		
 		// double click to zoom
 		$defaultMapOptions.disableDoubleClickZoom = WCF.Location.GoogleMaps.Settings.get('disableDoubleClickZoom');