From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 23 Mar 2015 17:28:59 +0000 (+0100)
Subject: Add option to disable usage of current user location
X-Git-Tag: 2.1.2~6^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=00695fcc5bdc56baf94f7a80ef473b728c028e8f;p=GitHub%2FWoltLab%2FWCF.git

Add option to disable usage of current user location
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 2746778c07..f3b8b7ccbf 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -747,6 +747,11 @@ physical:wcf.acp.option.google_maps_type.physical]]></selectoptions>
 				<optiontype>float</optiontype>
 				<defaultvalue>13.4</defaultvalue>
 			</option>
+			<option name="google_maps_user_location_as_default">
+				<categoryname>general.system.googleMaps</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
 			<!-- /general.system.googleMaps -->
 			
 			<!-- general.mail.general -->
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index c46afd4b79..f17ec4d764 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -95,6 +95,7 @@
 		<instruction type="template">templates_update.tar</instruction>
 		
 		<instruction type="language" run="standalone">language/*.xml</instruction>
+		<instruction type="option">option.xml</instruction>
 		
 		<instruction type="sql">update_212.sql</instruction>
 	</instructions>
diff --git a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
index e2ce2c0ad8..84fdd5284e 100644
--- a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
+++ b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
@@ -19,7 +19,8 @@
 			type: '{@GOOGLE_MAPS_TYPE}',
 			zoom: {@GOOGLE_MAPS_ZOOM},
 			defaultLatitude: {@GOOGLE_MAPS_DEFAULT_LATITUDE},
-			defaultLongitude: {@GOOGLE_MAPS_DEFAULT_LONGITUDE}
+			defaultLongitude: {@GOOGLE_MAPS_DEFAULT_LONGITUDE},
+			userLocationAsDefault: {@GOOGLE_MAPS_USER_LOCATION_AS_DEFAULT}
 		});
 		
 		{event name='javascriptInit'}
diff --git a/wcfsetup/install/files/js/WCF.Location.js b/wcfsetup/install/files/js/WCF.Location.js
index 046315aa23..001b43a6e5 100644
--- a/wcfsetup/install/files/js/WCF.Location.js
+++ b/wcfsetup/install/files/js/WCF.Location.js
@@ -22,7 +22,8 @@ WCF.Location.Util = {
 	 * @param	integer		timeout
 	 */
 	getLocation: function(callback, timeout) {
-		if (navigator.geolocation) {
+		var $userLocationAsDefault = WCF.Location.GoogleMaps.Settings.get('userLocationAsDefault');
+		if (navigator.geolocation && $userLocationAsDefault !== null && $userLocationAsDefault) {
 			navigator.geolocation.getCurrentPosition(function(position) {
 				callback(position.coords.latitude, position.coords.longitude);
 			}, function() {
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 675454741f..a02308591d 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1010,6 +1010,8 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.option.google_maps_enable_double_click_zoom"><![CDATA[Zoom durch Doppelklick zulassen]]></item>
 		<item name="wcf.acp.option.google_maps_default_latitude"><![CDATA[Standard-Kartenposition (Breitengrad)]]></item>
 		<item name="wcf.acp.option.google_maps_default_longitude"><![CDATA[Standard-Kartenposition (Längengrad)]]></item>
+		<item name="wcf.acp.option.google_maps_user_location_as_default"><![CDATA[Aktuelle Benutzerposition verwenden]]></item>
+		<item name="wcf.acp.option.google_maps_user_location_as_default.description"><![CDATA[Bei der Angabe von Positionen wird die aktuelle Position des Benutzers als Ausgangspunkt auf der Karte verwendet.]]></item>
 		<item name="wcf.acp.option.message_sidebar_enable_user_online_marking"><![CDATA[„Benutzer online“-Darstellung für Benutzernamen verwenden]]></item>
 		<item name="wcf.acp.option.module_privacy_policy_page"><![CDATA[Datenschutzerklärung aktivieren]]></item>
 		<item name="wcf.acp.option.module_privacy_policy_page.description"><![CDATA[Die Datenschutzerklärung informiert Nutzer über die Erfassung personenbezogener Daten.]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index bd8b6edb7a..571044b92f 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1009,6 +1009,8 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.option.google_maps_enable_double_click_zoom"><![CDATA[Enable Zoom by Double-Clicking]]></item>
 		<item name="wcf.acp.option.google_maps_default_latitude"><![CDATA[Default Map Position (Latitude)]]></item>
 		<item name="wcf.acp.option.google_maps_default_longitude"><![CDATA[Default Map Position (Longitude)]]></item>
+		<item name="wcf.acp.option.google_maps_user_location_as_default"><![CDATA[Use Current User Location]]></item>
+		<item name="wcf.acp.option.google_maps_user_location_as_default.description"><![CDATA[When entering a location, the current location of the user is used as start point on the map.]]></item>
 		<item name="wcf.acp.option.message_sidebar_enable_user_online_marking"><![CDATA[Apply “Users Online” markings for usernames]]></item>
 		<item name="wcf.acp.option.module_privacy_policy_page"><![CDATA[Enable Privacy Policy Page]]></item>
 		<item name="wcf.acp.option.module_privacy_policy_page.description"><![CDATA[Inform users regarding the use of their personal data.]]></item>