Merge pull request #57 from gdg-x/develop

ozasadnyy · ozasadnyy · commit 261527905bfc · 2015-02-20T23:48:08.000+02:00
Added a configuration for Jekyll to enable/disable auto directions on Logistics page
diff --git a/_config.yml b/_config.yml
@@ -215,6 +215,7 @@ findWayTransit: "TRANSIT"
 findWayFindFlight: "Find Flight"
 logisticsMapCenterCoordinates: "49.056728, 3.117289"
 logisticsMapMobileCenterCoordinates: "48.335365, 23.711648"
+logisticsMapAutoDirections: true
 
 # Logistics Direction Details Block
 directionDetailsImage: "direction-details.jpg"
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -53,6 +53,9 @@
     </script>
     {% elsif page.permalink == '/logistics/' %}
         <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=places,geometry"></script>
+        <script type="text/javascript">
+            var autoDirectionEnabled = {% if site.logisticsMapAutoDirections %} true {% else %} false {% endif %};
+        </script>
     {% endif %} 
     <script>
         Waves.displayEffect();
diff --git a/js/scripts.js b/js/scripts.js
@@ -483,6 +483,15 @@
                 setDirectionInput(origin);
                 $('#find-way h3').removeClass('fadeInUp').addClass('fadeOutDown');
             }
+            
+            function calcRouteFromMyLocation() {
+                if (navigator.geolocation) {
+                    navigator.geolocation.getCurrentPosition(function(position) {
+                        origin = new google.maps.LatLng(position.coords.latitude, position.coords.longitude);
+                        calcRoute(origin, 'TRANSIT');
+                    });
+                }
+            }
 
             function makeMarker(position) {
                 var directionMarker = new google.maps.Marker({
@@ -542,15 +551,7 @@
                 calcRoute(origin, selectedMode);
             });
 
-
-            $("#direction-locate").click(function() {
-                if (navigator.geolocation) {
-                    navigator.geolocation.getCurrentPosition(function(position) {
-                        origin = new google.maps.LatLng(position.coords.latitude, position.coords.longitude);
-                        calcRoute(origin, 'TRANSIT');
-                    });
-                }
-            });
+            $("#direction-locate").click(calcRouteFromMyLocation);
 
             $("#direction-cancel").click(function() {
                 $('#find-way').removeClass('location-active');
@@ -570,6 +571,10 @@
                 smoothZoom(5);
                 $('#find-way h3').removeClass('fadeOutDown').addClass('fadeInUp');
             });
+
+            if (autoDirectionEnabled) {
+                calcRouteFromMyLocation();
+            }
         }
 
         google.maps.event.addDomListener(window, 'load', initialize);
diff --git a/js/scripts.min.js b/js/scripts.min.js
