ang-google-maps
Advanced tools
Comparing version 1.3.6 to 1.3.7
{ | ||
"name": "ang-google-maps", | ||
"version": "1.3.6", | ||
"version": "1.3.7", | ||
"homepage": "https://github.com/khalednobani/ang-google-maps", | ||
@@ -5,0 +5,0 @@ "description": "Initialise Google Maps, Set Location, Drop Pins, Get Connected Routes between the current location and the destination.", |
{ | ||
"name": "ang-google-maps", | ||
"version": "1.3.6", | ||
"version": "1.3.7", | ||
"description": "Module to initialize Google Maps API", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -27,3 +27,3 @@ (function(ang, g) { | ||
$Leg = $Directions.routes[0].legs[0], | ||
$ProcessedLeg = processLegs($Directions); | ||
$ProcessedLeg = processLegs($Directions, $Map); | ||
@@ -44,3 +44,3 @@ if (typeof $Map.ondirectionchange == 'function') $Map.ondirectionchange({$Leg: $ProcessedLeg, $parentScope: $rootScope, $Directions: $Directions}); | ||
function processLegs($Directions) { | ||
function processLegs($Directions, $Map) { | ||
@@ -61,3 +61,2 @@ var $Routes = $Directions.routes[0], | ||
if ($Legs.length == 1) { | ||
$Result['destination'] = { | ||
@@ -69,5 +68,3 @@ coords: $Legs[0]['end_location'], | ||
} | ||
} else { | ||
for (var index = 0, length = $Legs.length; index < length; index++) { | ||
@@ -89,14 +86,11 @@ | ||
$Result['waypoints'] = $Result['waypoints'].reverse(); | ||
} | ||
for (var index = 0, length = $Legs.length; index < length; index++) { | ||
if ($Map.isCurrentSameDestination && index + 1 == length) break; | ||
$Result['totalDistance'] += $Legs[index]['distance']['value']; | ||
$Result['totalDuration'] += $Legs[index]['duration']['value']; | ||
} | ||
} | ||
console.log($Result); | ||
return $Result; | ||
@@ -431,4 +425,4 @@ | ||
if (latlng == LatLng) { | ||
console.log("Matched"); | ||
console.log("Do Something"); | ||
//console.log("Matched"); | ||
//console.log("Do Something"); | ||
return this.processingSteps($Legs[index]['steps']); | ||
@@ -502,3 +496,2 @@ } | ||
function initMapModel() { | ||
window.map = this.$parent.map = this.map = new g.maps.Map(this.mapContainer, this.mapOptions); | ||
@@ -517,20 +510,28 @@ | ||
this.map.deletingMarker = deletingMarker; | ||
/* | ||
this.initMarkers = function() { | ||
for (var index = 0, length = this.configs.markers.length; index < length; index++) { | ||
this.map.markers.push(this.configs.markers[index]); | ||
} | ||
return this.map.markers; | ||
}; | ||
*/ | ||
//this.initMarkers(); | ||
attachMapEvents.call(this); | ||
ExtendsMaps(this.map); | ||
} | ||
// For incoming features | ||
function attachMapEvents() { | ||
var $Self = this; | ||
$Self.map.addListener('click', function($Event) { | ||
$Self.onmapclick({ | ||
$Coords: $Event.latLng, | ||
$Pixel: $Event.pixel, | ||
$Za: $Event.za, | ||
$Event: $Event | ||
}); | ||
}); | ||
/* | ||
$Self.map.addListener('dblclick', function($Event) { | ||
// $Event.stopPropagation(); | ||
console.log($Event); | ||
console.log("Double click"); | ||
}); | ||
*/ | ||
} | ||
@@ -574,29 +575,2 @@ | ||
// For incoming features | ||
function attachMapEvents() { | ||
var $Self = this; | ||
$Self.map.addListener('click', function($Event) { | ||
console.log("Clicking on the map"); | ||
$Self.onmapclick({ | ||
$Coords: $Event.latLng, | ||
$Pixel: $Event.pixel, | ||
$Za: $Event.za, | ||
$Event: $Event | ||
}) | ||
}); | ||
$Self.map.addListener('dblclick', function($Event) { | ||
// $Event.stopPropagation(); | ||
console.log($Event); | ||
console.log("Double click"); | ||
}); | ||
} | ||
/** | ||
@@ -829,5 +803,3 @@ * Handles auto-complete-temp directive's controller | ||
if (status == g.maps.DirectionsStatus.OK) { | ||
// Display the route on the map. | ||
console.log("Line 413"); | ||
console.log(response); | ||
// console.log(response); | ||
$DirectionDisplay.setDirections(response); | ||
@@ -856,4 +828,3 @@ } | ||
function addingMarker(options) { | ||
console.log(options); | ||
var indexOfCurrentMarker = findInList(this.markers || [], {key: 'name', value: options['name'] || ''}), | ||
@@ -860,0 +831,0 @@ options = options || {}, |
581476
1237