Added settings for default map position

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 731a4eeda26d0650038f58410fafc46b5f72a46a..e22db648d67f88ba4b564336e66647108dd4ee0a 100644 (file)
--- 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 173694fb748b334c23d3c583391707d00ad23313..e666440f0ccd6087f7e7acfafc01faf527c8cb8a 100644 (file)
--- 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 379669f8c090313454ad0beb459bf53b6a4f80a2..9f93078496bf4e60a22e3d1c1540334ab89caea9 100644 (file)
--- 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');