arnaucube/commonroutesApp
1
0
Fork 0
mirror of https://github.com/arnaucube/commonroutesApp.git synced 2026-02-07 19:46:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

geolocation added on offerCar and travel page

Browse Source
This commit is contained in:
arnaucode
2017-01-27 17:49:04 +01:00
parent d76ea5ca19
commit 2b36c80084
727 changed files with 299906 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/js/app.js
View File

@@ -6,9 +6,9 @@
// 'starter.controllers' is found in controllers.js
//var urlapi = "http://localhost:3000/api/";
var urlapi = "http://localhost:3000/api/";
//var urlapi="https://collectivecar.paas.primustech.io/api/";
var urlapi="http://147.83.7.158:3000/api/";
//var urlapi="http://147.83.7.158:3000/api/";
angular.module('starter', [

44
www/js/offerCar.js
View File

@@ -1,9 +1,24 @@
angular.module('app.offerCar', ['pascalprecht.translate'])
angular.module('app.offerCar', ['pascalprecht.translate', 'ui-leaflet'])
.controller('OfferCarCtrl', function($scope, $stateParams, $translate,
$http, $filter) {
$scope.newtravel={};
$scope.newtravel.from={
lat: 0,
long:0
};
$scope.newtravel.to={
lat: 0,
long:0
};
$scope.center= {
lat: 0,
lng: 0,
zoom: 1
};
$scope.markers=new Array();
$scope.createTravel =function(){
$scope.newtravel.type="offering";
$http({
@@ -20,4 +35,31 @@ angular.module('app.offerCar', ['pascalprecht.translate'])
console.log(data);
});
};
$scope.getGeo = function(){
$scope.markers=[];
console.log($scope.newtravel.from.name);
console.log($scope.newtravel.to.name);
$http.get('http://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.from.name + '&format=json&limit=1')
.then(function(data) {
$scope.newtravel.from.lat=data.data[0].lat;
$scope.newtravel.from.long=data.data[0].lon;
$scope.markers.push({
lat: Number(data.data[0].lat),
lng: Number(data.data[0].lon),
message: data.data[0].display_name
});
$http.get('http://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.to.name + '&format=json&limit=1')
.then(function(data) {
$scope.newtravel.to.lat=data.data[0].lat;
$scope.newtravel.to.long=data.data[0].lon;
$scope.markers.push({
lat: Number(data.data[0].lat),
lng: Number(data.data[0].lon),
message: data.data[0].display_name
});
});
});
};
});

23
www/js/travel.js
View File

@@ -1,6 +1,14 @@
angular.module('app.travel', ['pascalprecht.translate'])
angular.module('app.travel', ['pascalprecht.translate', 'ui-leaflet'])
.controller('TravelCtrl', function($scope, $stateParams, $http, $ionicModal, $ionicLoading, $ionicPopup, $filter) {
.controller('TravelCtrl', function($scope, $stateParams, $http,
$ionicModal, $ionicLoading, $ionicPopup, $filter) {
$scope.center= {
lat: 0,
lng: 0,
zoom: 1
};
$scope.markers=[];
$scope.travel={};
$scope.doRefresh = function() {
@@ -10,6 +18,17 @@ angular.module('app.travel', ['pascalprecht.translate'])
console.log('data success travels');
console.log(data); // for browser console
$scope.travel = data.data; // for UI
$scope.markers=[];
$scope.markers.push({
lat: Number($scope.travel.from.lat),
lng: Number($scope.travel.from.long),
message: $scope.travel.from.name
});
$scope.markers.push({
lat: Number($scope.travel.to.lat),
lng: Number($scope.travel.to.long),
message: $scope.travel.to.name
});
$scope.$broadcast('scroll.refreshComplete');//refresher stop
}, function(data){