Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More map fixes #188

Merged
merged 1 commit into from
Dec 15, 2024
Merged

More map fixes #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Our.Umbraco.GMaps.Core/Our.Umbraco.GMaps.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>

<Version>3.0.4</Version>
<Version>3.0.5</Version>
<Authors>Arnold Visser</Authors>
<Company>Arnold Visser</Company>
<Description>Basic Google Maps with autocomplete property editor for Umbraco 8+. This package contains the Core DLL only.</Description>
Expand Down
2 changes: 1 addition & 1 deletion Our.Umbraco.GMaps/Our.Umbraco.GMaps.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<IncludeBuildOutput>false</IncludeBuildOutput>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

<Version>3.0.4</Version>
<Version>3.0.5</Version>
<Authors>Arnold Visser</Authors>
<Company>Arnold Visser</Company>
<Description>Basic Google Maps with autocomplete property editor for Umbraco 8+</Description>
Expand Down
37 changes: 20 additions & 17 deletions Our.Umbraco.GMaps/wwwroot/js/maps.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ angular.module('umbraco').controller('GMapsMapsController', ['$scope', '$element
function clearLocation() {
actClearLocation.isDisabled = true
if (vm.marker) {
vm.marker.setVisible(true)
vm.map.setCenter(vm.defaultLocation)
vm.marker.setPosition(vm.defaultLocation)
vm.marker.setVisible(true)
vm.marker.vm.position = vm.defaultLocation
}
clearData()
}
Expand All @@ -68,9 +66,7 @@ angular.module('umbraco').controller('GMapsMapsController', ['$scope', '$element
$scope.mapCenter = vm.defaultLocation
}
if (vm.marker) {
vm.marker.setVisible(true)
vm.map.setCenter($scope.mapCenter)
vm.marker.setVisible(true)
}
saveData()
actResetCenter.isDisabled = true
Expand Down Expand Up @@ -98,6 +94,14 @@ angular.module('umbraco').controller('GMapsMapsController', ['$scope', '$element
}
}

function encodeMapCoordinates(coordinates) {
return new google.maps.LatLng(parseFloat(coordinates.lat), parseFloat(coordinates.lng))
}

function getPinCoordinates(coordinates) {
return new google.maps.LatLng(coordinates.lat(), coordinates.lng())
}

// Geocode based on coordinates
function geocodePosition (coordinates, callback) {
$scope.showLoader = true
Expand Down Expand Up @@ -190,7 +194,7 @@ angular.module('umbraco').controller('GMapsMapsController', ['$scope', '$element
const composedAddress = getAddressObject(address.address_components)
$scope.address = { ...composedAddress, ...{ full_address: address.formatted_address } }
}
$scope.address.coordinates = { lat: coordinates.lat(), lng: coordinates.lng() }
$scope.address.coordinates = { lat: coordinates.lat, lng: coordinates.lng }

if ($scope.address.full_address) {
$scope.searchedValue = $scope.address.full_address
Expand Down Expand Up @@ -241,8 +245,8 @@ angular.module('umbraco').controller('GMapsMapsController', ['$scope', '$element
actResetCenter.isDisabled = false
}

var latLng = new google.maps.LatLng(parseFloat(coordinates.lat), parseFloat(coordinates.lng))
var latLngMapCenter = new google.maps.LatLng(parseFloat(mapCenterCoordinates.lat), parseFloat(mapCenterCoordinates.lng))
var latLng = encodeMapCoordinates(coordinates)
var latLngMapCenter = encodeMapCoordinates(mapCenterCoordinates)

var mapTypeId = vm.mapType || google.maps.MapTypeId.ROADMAP

Expand Down Expand Up @@ -286,11 +290,12 @@ angular.module('umbraco').controller('GMapsMapsController', ['$scope', '$element
position: latLng,
title: 'Marker',
map: vm.map,
gmpDraggable: true,
draggable: true
})

google.maps.event.addListener(vm.marker, 'dragend', function () {
geocodePosition(vm.marker.getPosition(), function () {
geocodePosition(vm.marker.position, function () {
$scope.$apply(function () {
$scope.showLoader = false
})
Expand All @@ -299,8 +304,8 @@ angular.module('umbraco').controller('GMapsMapsController', ['$scope', '$element

google.maps.event.addListener(vm.map, 'click', function (event) {
var clickedMapLocation = event.latLng
vm.marker.setPosition(clickedMapLocation)
geocodePosition(clickedMapLocation, function () {
vm.marker.position = getPinCoordinates(clickedMapLocation)
geocodePosition(vm.marker.position, function () {
$scope.$apply(function () {
$scope.showLoader = false
})
Expand Down Expand Up @@ -330,7 +335,6 @@ angular.module('umbraco').controller('GMapsMapsController', ['$scope', '$element

autocomplete.addListener('place_changed', function () {

vm.marker.setVisible(false)
var place = autocomplete.getPlace()
if (!place.geometry) {
// User entered the name of a Place that was not suggested and pressed the Enter key, or the Place Details request failed.
Expand All @@ -339,8 +343,7 @@ angular.module('umbraco').controller('GMapsMapsController', ['$scope', '$element
$scope.address.coordinates = coordTest
// Set the map center as well.
$scope.mapCenter = coordTest
vm.marker.setPosition($scope.address.coordinates)
vm.marker.setVisible(true)
vm.marker.position = $scope.address.coordinates
vm.map.setCenter($scope.address.coordinates)
actResetCenter.isDisabled = true
} else {
Expand All @@ -356,9 +359,9 @@ angular.module('umbraco').controller('GMapsMapsController', ['$scope', '$element
vm.map.setCenter(place.geometry.location)
vm.map.setZoom(vm.zoomLevel)
}
vm.marker.setPosition(place.geometry.location)
vm.marker.setVisible(true)
updateMarkerAddress(place, place.geometry.location)
vm.map.map = vm.map
vm.marker.position = getPinCoordinates(place.geometry.location)
updateMarkerAddress(place, vm.marker.position)
}
})
}
Expand Down
Loading