"+error+"
",
+ okText: "Please fix again"
+ });
+ };
+ $scope.$apply(() => {
+ checkObj.statusState = false;
+ recomputeFn();
+ });
+ return error;
+ });
+ }
+
+ let refreshChecks = function(checksList, recomputeFn) {
+ let checkPromises = checksList.map((lc) => lc.refresh());
+ console.log(checkPromises);
+ Promise.all(checkPromises)
+ .then((result) => recomputeFn())
+ .catch((error) => recomputeFn())
+ }
+
+ $scope.setupAndroidLocChecks = function(platform, version) {
+ let fixSettings = function() {
+ console.log("Fix and refresh location settings");
+ return checkOrFix(locSettingsCheck, $window.cordova.plugins.BEMDataCollection.fixLocationSettings,
+ $scope.recomputeLocStatus, showError=true);
+ };
+ let checkSettings = function() {
+ console.log("Refresh location settings");
+ return checkOrFix(locSettingsCheck, $window.cordova.plugins.BEMDataCollection.isValidLocationSettings,
+ $scope.recomputeLocStatus, showError=false);
+ };
+ let fixPerms = function() {
+ console.log("fix and refresh location permissions");
+ return checkOrFix(locPermissionsCheck, $window.cordova.plugins.BEMDataCollection.fixLocationPermissions,
+ $scope.recomputeLocStatus, showError=true).then((error) => locPermissionsCheck.desc = error);
+ };
+ let checkPerms = function() {
+ console.log("fix and refresh location permissions");
+ return checkOrFix(locPermissionsCheck, $window.cordova.plugins.BEMDataCollection.isValidLocationPermissions,
+ $scope.recomputeLocStatus, showError=false);
+ };
+ var androidSettingsDescTag = "intro.appstatus.locsettings.description.android-gte-9";
+ if (version < 9) {
+ androidSettingsDescTag = "intro.appstatus.locsettings.description.android-lt-9";
+ }
+ var androidPermDescTag = "intro.appstatus.locperms.description.android-gte-11";
+ if($scope.osver < 6) {
+ androidPermDescTag = 'intro.appstatus.locperms.description.android-lt-6';
+ } else if ($scope.osver < 10) {
+ androidPermDescTag = "intro.appstatus.locperms.description.android-6-9";
+ } else if ($scope.osver < 11) {
+ androidPermDescTag= "intro.appstatus.locperms.description.android-10";
+ }
+ console.log("description tags are "+androidSettingsDescTag+" "+androidPermDescTag);
+ // location settings
+ let locSettingsCheck = {
+ name: $translate.instant("intro.appstatus.locsettings.name"),
+ desc: $translate.instant(androidSettingsDescTag),
+ statusState: false,
+ fix: fixSettings,
+ refresh: checkSettings
+ }
+ let locPermissionsCheck = {
+ name: $translate.instant("intro.appstatus.locperms.name"),
+ desc: $translate.instant(androidPermDescTag),
+ statusState: false,
+ fix: fixPerms,
+ refresh: checkPerms
+ }
+ $scope.locChecks = [locSettingsCheck, locPermissionsCheck];
+ refreshChecks($scope.locChecks, $scope.recomputeLocStatus);
+ }
+
+ $scope.setupIOSLocChecks = function(platform, version) {
+ let fixSettings = function() {
+ console.log("Fix and refresh location settings");
+ return checkOrFix(locSettingsCheck, $window.cordova.plugins.BEMDataCollection.fixLocationSettings,
+ $scope.recomputeLocStatus, showError=true);
+ };
+ let checkSettings = function() {
+ console.log("Refresh location settings");
+ return checkOrFix(locSettingsCheck, $window.cordova.plugins.BEMDataCollection.isValidLocationSettings,
+ $scope.recomputeLocStatus, showError=false);
+ };
+ let fixPerms = function() {
+ console.log("fix and refresh location permissions");
+ return checkOrFix(locPermissionsCheck, $window.cordova.plugins.BEMDataCollection.fixLocationPermissions,
+ $scope.recomputeLocStatus, showError=true).then((error) => locPermissionsCheck.desc = error);
+ };
+ let checkPerms = function() {
+ console.log("fix and refresh location permissions");
+ return checkOrFix(locPermissionsCheck, $window.cordova.plugins.BEMDataCollection.isValidLocationPermissions,
+ $scope.recomputeLocStatus, showError=false);
+ };
+ var iOSSettingsDescTag = "intro.appstatus.locsettings.description.ios";
+ var iOSPermDescTag = "intro.appstatus.locperms.description.ios-gte-13";
+ if($scope.osver < 13) {
+ iOSPermDescTag = 'intro.appstatus.locperms.description.ios-lt-13';
+ }
+ console.log("description tags are "+iOSSettingsDescTag+" "+iOSPermDescTag);
+ // location settings
+ let locSettingsCheck = {
+ name: $translate.instant("intro.appstatus.locsettings.name"),
+ desc: $translate.instant(iOSSettingsDescTag),
+ statusState: false,
+ fix: fixSettings,
+ refresh: checkSettings
+ }
+ let locPermissionsCheck = {
+ name: $translate.instant("intro.appstatus.locperms.name"),
+ desc: $translate.instant(iOSPermDescTag),
+ statusState: false,
+ fix: fixPerms,
+ refresh: checkPerms
+ }
+ $scope.locChecks = [locSettingsCheck, locPermissionsCheck];
+ refreshChecks($scope.locChecks, $scope.recomputeLocStatus);
+ }
+
+ $scope.setupAndroidFitnessChecks = function(platform, version) {
+ $scope.fitnessPermNeeded = ($scope.osver >= 10);
+
+ let fixPerms = function() {
+ console.log("fix and refresh fitness permissions");
+ return checkOrFix(fitnessPermissionsCheck, $window.cordova.plugins.BEMDataCollection.fixFitnessPermissions,
+ $scope.recomputeFitnessStatus, showError=true).then((error) => fitnessPermissionsCheck.desc = error);
+ };
+ let checkPerms = function() {
+ console.log("fix and refresh fitness permissions");
+ return checkOrFix(fitnessPermissionsCheck, $window.cordova.plugins.BEMDataCollection.isValidFitnessPermissions,
+ $scope.recomputeFitnessStatus, showError=false);
+ };
+
+ let fitnessPermissionsCheck = {
+ name: $translate.instant("intro.appstatus.fitnessperms.name"),
+ desc: $translate.instant("intro.appstatus.fitnessperms.description.android"),
+ fix: fixPerms,
+ refresh: checkPerms
+ }
+ $scope.overallFitnessName = $translate.instant("intro.appstatus.overall-fitness-name-android");
+ $scope.fitnessChecks = [fitnessPermissionsCheck];
+ refreshChecks($scope.fitnessChecks, $scope.recomputeFitnessStatus);
+ }
+
+ $scope.setupIOSFitnessChecks = function(platform, version) {
+ $scope.fitnessPermNeeded = true;
+
+ let fixPerms = function() {
+ console.log("fix and refresh fitness permissions");
+ return checkOrFix(fitnessPermissionsCheck, $window.cordova.plugins.BEMDataCollection.fixFitnessPermissions,
+ $scope.recomputeFitnessStatus, showError=true).then((error) => fitnessPermissionsCheck.desc = error);
+ };
+ let checkPerms = function() {
+ console.log("fix and refresh fitness permissions");
+ return checkOrFix(fitnessPermissionsCheck, $window.cordova.plugins.BEMDataCollection.isValidFitnessPermissions,
+ $scope.recomputeFitnessStatus, showError=false);
+ };
+
+ let fitnessPermissionsCheck = {
+ name: $translate.instant("intro.appstatus.fitnessperms.name"),
+ desc: $translate.instant("intro.appstatus.fitnessperms.description.ios"),
+ fix: fixPerms,
+ refresh: checkPerms
+ }
+ $scope.overallFitnessName = $translate.instant("intro.appstatus.overall-fitness-name-ios");
+ $scope.fitnessChecks = [fitnessPermissionsCheck];
+ refreshChecks($scope.fitnessChecks, $scope.recomputeFitnessStatus);
+ }
+
+ $scope.setupAndroidNotificationChecks = function() {
+ let fixPerms = function() {
+ console.log("fix and refresh notification permissions");
+ return checkOrFix(appAndChannelNotificationsCheck, $window.cordova.plugins.BEMDataCollection.fixShowNotifications,
+ $scope.recomputeNotificationStatus, showError=true);
+ };
+ let checkPerms = function() {
+ console.log("fix and refresh notification permissions");
+ return checkOrFix(appAndChannelNotificationsCheck, $window.cordova.plugins.BEMDataCollection.isValidShowNotifications,
+ $scope.recomputeNotificationStatus, showError=false);
+ };
+ let appAndChannelNotificationsCheck = {
+ name: $translate.instant("intro.appstatus.notificationperms.app-enabled-name"),
+ desc: $translate.instant("intro.appstatus.notificationperms.description.android-enable"),
+ fix: fixPerms,
+ refresh: checkPerms
+ }
+ $scope.notificationChecks = [appAndChannelNotificationsCheck];
+ refreshChecks($scope.notificationChecks, $scope.recomputeNotificationStatus);
+ }
+
+ $scope.setupAndroidBackgroundRestrictionChecks = function() {
+ let fixPerms = function() {
+ console.log("fix and refresh backgroundRestriction permissions");
+ return checkOrFix(unusedAppsUnrestrictedCheck, $window.cordova.plugins.BEMDataCollection.fixUnusedAppRestrictions,
+ $scope.recomputeBackgroundRestrictionStatus, showError=true);
+ };
+ let checkPerms = function() {
+ console.log("fix and refresh backgroundRestriction permissions");
+ return checkOrFix(unusedAppsUnrestrictedCheck, $window.cordova.plugins.BEMDataCollection.isUnusedAppUnrestricted,
+ $scope.recomputeBackgroundRestrictionStatus, showError=false);
+ };
+ let unusedAppsUnrestrictedCheck = {
+ name: $translate.instant("intro.appstatus.unusedapprestrict.name"),
+ desc: $translate.instant("intro.appstatus.unusedapprestrict.description.android-disable"),
+ fix: fixPerms,
+ refresh: checkPerms
+ }
+ $scope.backgroundRestrictionChecks = [unusedAppsUnrestrictedCheck];
+ refreshChecks($scope.backgroundRestrictionChecks, $scope.recomputeBackgroundRestrictionStatus);
+ }
+
+ $scope.setupPermissionText = function() {
+ if($scope.platform.toLowerCase() == "ios") {
+ if($scope.osver < 13) {
+ $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-ios-lt-13");
+ } else {
+ $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-ios-gte-13");
+ }
+ }
+
+ $scope.backgroundRestricted = false;
+ if($window.device.manufacturer.toLowerCase() == "samsung") {
+ $scope.backgroundRestricted = true;
+ $scope.allowBackgroundInstructions = $translate.instant("intro.allow_background.samsung");
+ }
+
+ console.log("Explanation = "+$scope.locationPermExplanation);
+ }
+
+ $scope.checkLocationServicesEnabled = function() {
+ console.log("About to see if location services are enabled");
+ }
+ $ionicPlatform.ready().then(function() {
+ console.log("app is launched, should refresh");
+ $scope.platform = $window.device.platform;
+ $scope.osver = $window.device.version.split(".")[0];
+ $scope.setupPermissionText();
+ $scope.setupLocChecks($scope.platform, $scope.osver);
+ $scope.setupFitnessChecks($scope.platform, $scope.osver);
+ $scope.setupNotificationChecks($scope.platform, $scope.osver);
+ $scope.setupBackgroundRestrictionChecks($scope.platform, $scope.osver);
+ });
+
+ $ionicPlatform.on("resume", function() {
+ console.log("PERMISSION CHECK: app has resumed, should refresh");
+ refreshChecks($scope.locChecks, $scope.recomputeLocStatus);
+ refreshChecks($scope.fitnessChecks, $scope.recomputeFitnessStatus);
+ refreshChecks($scope.notificationChecks, $scope.recomputeNotificationStatus);
+ refreshChecks($scope.backgroundRestrictionChecks, $scope.recomputeBackgroundRestrictionStatus);
+ });
+
+ $scope.$on("recomputeAppStatus", function() {
+ console.log("PERMISSION CHECK: recomputing state");
+ refreshChecks($scope.locChecks, $scope.recomputeLocStatus);
+ refreshChecks($scope.fitnessChecks, $scope.recomputeFitnessStatus);
+ refreshChecks($scope.notificationChecks, $scope.recomputeNotificationStatus);
+ refreshChecks($scope.backgroundRestrictionChecks, $scope.recomputeBackgroundRestrictionStatus);
+ });
+});
diff --git a/www/js/config/imperial.js b/www/js/config/imperial.js
new file mode 100644
index 000000000..7ca224ac5
--- /dev/null
+++ b/www/js/config/imperial.js
@@ -0,0 +1,41 @@
+'use strict';
+
+angular.module('emission.config.imperial', ['emission.plugin.logger'])
+.factory('ImperialConfig', function() {
+ // change to true if we want to use imperial units such as miles
+ // I didn't want to do this since the US is one of the only countries that
+ // still uses imperial units, but it looks like this will primarily be
+ // funded by a US source, so I guess we have to support this for now.
+
+ // TODO: Convert this to a config option when we use config stuff
+ const USE_IMPERIAL = false;
+ const KM_TO_MILES = 0.621371;
+
+ var ic = {}
+
+ ic.getFormattedDistanceInKm = function(dist_in_meters) {
+ if (dist_in_meters > 1000) {
+ return Number.parseFloat((dist_in_meters/1000).toFixed(0));
+ } else {
+ return Number.parseFloat((dist_in_meters/1000).toFixed(3));
+ }
+ }
+
+ ic.getFormattedDistanceInMiles = function(dist_in_meters) {
+ return Number.parseFloat((KM_TO_MILES * ic.getFormattedDistanceInKm(dist_in_meters)).toFixed(1));
+ }
+
+ ic.getKmph = function(metersPerSec) {
+ return (metersPerSec * 3.6).toFixed(2);
+ };
+
+ ic.getMph = function(metersPerSecond) {
+ return (KM_TO_MILES * Number.parseFloat(ic.getKmph(metersPerSecond))).toFixed(2);
+ };
+
+ ic.getFormattedDistance = USE_IMPERIAL? ic.getFormattedDistanceInMiles : ic.getFormattedDistanceInKm;
+ ic.getFormattedSpeed = USE_IMPERIAL? ic.getMph : ic.getKmph;
+ ic.getDistanceSuffix = USE_IMPERIAL? "mi" : "km";
+ ic.getSpeedSuffix = USE_IMPERIAL? "mph" : "kmph";
+ return ic;
+});
diff --git a/www/js/control/general-settings.js b/www/js/control/general-settings.js
index 66bb9420d..fa2da8bee 100644
--- a/www/js/control/general-settings.js
+++ b/www/js/control/general-settings.js
@@ -12,12 +12,13 @@ angular.module('emission.main.control',['emission.services',
'emission.main.metrics.factory',
'emission.stats.clientstats',
'emission.plugin.kvstore',
- 'emission.survey.launch',
+ 'emission.survey.external.launch',
'emission.plugin.logger'])
.controller('ControlCtrl', function($scope, $window, $ionicScrollDelegate,
$ionicPlatform,
$state, $ionicPopup, $ionicActionSheet, $ionicPopover,
+ $ionicModal, $stateParams,
$rootScope, KVStore, SurveyLaunch, ionicDatePicker,
StartPrefs, ControlHelper, EmailHelper, UploadHelper,
ControlCollectionHelper, ControlSyncHelper,
@@ -27,6 +28,8 @@ angular.module('emission.main.control',['emission.services',
CalorieCal, ClientStats, CommHelper, Logger,
$translate) {
+ console.log("controller ControlCtrl called without params");
+
var datepickerObject = {
todayLabel: $translate.instant('list-datepicker-today'), //Optional
closeLabel: $translate.instant('list-datepicker-close'), //Optional
@@ -50,6 +53,18 @@ angular.module('emission.main.control',['emission.services',
closeOnSelect: true //Optional
}
+ $scope.overallAppStatus = false;
+
+ $ionicModal.fromTemplateUrl('templates/control/app-status-modal.html', {
+ scope: $scope
+ }).then(function(modal) {
+ $scope.appStatusModal = modal;
+ if ($stateParams.launchAppStatusModal == true) {
+ $scope.$broadcast("recomputeAppStatus");
+ $scope.appStatusModal.show();
+ }
+ });
+
$scope.openDatePicker = function(){
ionicDatePicker.openDatePicker(datepickerObject);
};
@@ -81,6 +96,18 @@ angular.module('emission.main.control',['emission.services',
}
}
+ $scope.fixAppStatus = function() {
+ $scope.$broadcast("recomputeAppStatus");
+ $scope.appStatusModal.show();
+ }
+
+ $scope.appStatusChecked = function() {
+ // Hardcoded value so we can publish the hacky version today and then debug/fix the
+ // infinite loop around waiting_for_trip_start -> tracking_error
+ $window.cordova.plugins.notification.local.clearAll();
+ $scope.appStatusModal.hide();
+ }
+
$scope.userData = []
$scope.getUserData = function() {
return CalorieCal.get().then(function(userDataFromStorage) {
@@ -276,8 +303,13 @@ angular.module('emission.main.control',['emission.services',
}
$scope.$on('$ionicView.afterEnter', function() {
+ console.log("afterEnter called with stateparams", $stateParams);
$ionicPlatform.ready().then(function() {
- $scope.refreshScreen();
+ $scope.refreshScreen();
+ if ($stateParams.launchAppStatusModal == true) {
+ $scope.$broadcast("recomputeAppStatus");
+ $scope.appStatusModal.show();
+ }
});
})
diff --git a/www/js/controllers.js b/www/js/controllers.js
index 7105f8176..dedc94529 100644
--- a/www/js/controllers.js
+++ b/www/js/controllers.js
@@ -5,9 +5,9 @@ angular.module('emission.controllers', ['emission.splash.updatecheck',
'emission.splash.pushnotify',
'emission.splash.storedevicesettings',
'emission.splash.localnotify',
- 'emission.survey.launch',
+ 'emission.splash.remotenotify',
'emission.stats.clientstats',
- 'emission.tripconfirm.posttrip.prompt'])
+ 'emission.survey.multilabel.posttrip.prompt'])
.controller('RootCtrl', function($scope) {})
@@ -15,7 +15,7 @@ angular.module('emission.controllers', ['emission.splash.updatecheck',
.controller('SplashCtrl', function($scope, $state, $interval, $rootScope,
UpdateCheck, StartPrefs, PushNotify, StoreDeviceSettings,
- LocalNotify, ClientStats, PostTripAutoPrompt, SurveyLaunch) {
+ LocalNotify, RemoteNotify, ClientStats, PostTripAutoPrompt) {
console.log('SplashCtrl invoked');
// alert("attach debugger!");
// PushNotify.startupInit();
diff --git a/www/js/diary.js b/www/js/diary.js
index 30da4e9f5..71a8e903b 100644
--- a/www/js/diary.js
+++ b/www/js/diary.js
@@ -1,5 +1,6 @@
angular.module('emission.main.diary',['emission.main.diary.list',
'emission.main.diary.infscrolllist',
+ 'emission.main.diary.infscrolldetail',
'emission.main.diary.detail',
'emission.main.diary.services',
'emission.main.diary.current',])
@@ -34,7 +35,16 @@ angular.module('emission.main.diary',['emission.main.diary.list',
controller: 'InfiniteDiaryListCtrl'
},
}
-
+ })
+
+ .state('root.main.inf_scroll-detail', {
+ url: "/inf_scroll/:tripId",
+ views: {
+ 'main-inf-scroll': {
+ templateUrl: "templates/diary/infinite_scroll_detail.html",
+ controller: 'InfiniteDiaryDetailCtrl'
+ },
+ }
})
.state('root.main.current', {
diff --git a/www/js/diary/detail.js b/www/js/diary/detail.js
index 4f5794275..0db872e28 100644
--- a/www/js/diary/detail.js
+++ b/www/js/diary/detail.js
@@ -1,15 +1,22 @@
'use strict';
angular.module('emission.main.diary.detail',['ui-leaflet', 'ng-walkthrough',
'nvd3', 'emission.plugin.kvstore',
- 'emission.services', 'emission.plugin.logger',
+ 'emission.services',
+ 'emission.config.imperial',
+ 'emission.plugin.logger',
+ 'emission.stats.clientstats',
'emission.incident.posttrip.manual'])
-.controller("DiaryDetailCtrl", function($scope, $rootScope, $window, $stateParams, $ionicActionSheet,
+.controller("DiaryDetailCtrl", function($scope, $rootScope, $window, $injector, $ionicPlatform,
+ $state, $stateParams, ClientStats, $ionicActionSheet,
leafletData, leafletMapEvents, nzTour, KVStore,
- Logger, Timeline, DiaryHelper, Config,
+ Logger, Timeline, DiaryHelper, SurveyOptions, Config, ImperialConfig,
CommHelper, PostTripManualMarker, $translate) {
console.log("controller DiaryDetailCtrl called with params = "+
JSON.stringify($stateParams));
+ $scope.surveyOpt = SurveyOptions.MULTILABEL;
+ $scope.tripFilterFactory = $injector.get($scope.surveyOpt.filter);
+ $scope.filterInputs = $scope.tripFilterFactory.configuredFilters;
$scope.mapCtrl = {};
angular.extend($scope.mapCtrl, {
@@ -23,9 +30,19 @@ angular.module('emission.main.diary.detail',['ui-leaflet', 'ng-walkthrough',
for (var k in mapEvents) {
var eventName = 'leafletDirectiveMap.detail.' + mapEvents[k];
$scope.$on(eventName, function(event, data){
- console.log("in mapEvents, event = "+JSON.stringify(event.name)+
- " leafletEvent = "+JSON.stringify(data.leafletEvent.type)+
- " leafletObject = "+JSON.stringify(data.leafletObject.getBounds()));
+ try {
+ console.log("in mapEvents, event = "+JSON.stringify(event.name)+
+ " leafletEvent = "+JSON.stringify(data.leafletEvent.type)+
+ " leafletObject = "+JSON.stringify(data.leafletObject.getBounds()));
+ } catch (e) {
+ if (e instanceof TypeError) {
+ console.log("in mapEvents, event = "+JSON.stringify(event.name)+
+ " leafletEvent = "+JSON.stringify(data.leafletEvent.type)+
+ " leafletObject is undefined");
+ } else {
+ console.log(e);
+ }
+ }
$scope.eventDetected = event.name;
});
}
@@ -47,34 +64,41 @@ angular.module('emission.main.diary.detail',['ui-leaflet', 'ng-walkthrough',
$scope.$broadcast('invalidateSize');
};
- $scope.getFormattedDate = DiaryHelper.getFormattedDate;
- $scope.arrowColor = DiaryHelper.arrowColor;
- $scope.parseEarlierOrLater = DiaryHelper.parseEarlierOrLater;
- $scope.getEarlierOrLater = DiaryHelper.getEarlierOrLater;
- $scope.getLongerOrShorter = DiaryHelper.getLongerOrShorter;
- $scope.getIcon = DiaryHelper.getIcon;
- $scope.getHumanReadable = DiaryHelper.getHumanReadable;
$scope.trip = Timeline.getTrip($stateParams.tripId);
- $scope.getKmph = DiaryHelper.getKmph;
- $scope.getFormattedDistance = DiaryHelper.getFormattedDistance;
- $scope.getSectionDetails = DiaryHelper.getSectionDetails;
- $scope.getFormattedTime = DiaryHelper.getFormattedTime;
- $scope.getLocalTimeString = DiaryHelper.getLocalTimeString;
- $scope.getFormattedTimeRange = DiaryHelper.getFormattedTimeRange;
- $scope.getFormattedDuration = DiaryHelper.getFormattedDuration;
- $scope.getTripDetails = DiaryHelper.getTripDetails
- $scope.tripgj = Timeline.getTripWrapper($stateParams.tripId);
+ $scope.tripgj = $scope.trip == undefined? {"sections": []} : Timeline.getTripWrapper($stateParams.tripId);
$scope.formattedSectionProperties = $scope.tripgj.sections.map(function(s) {
return {"fmt_time": DiaryHelper.getLocalTimeString(s.properties.start_local_dt),
"fmt_time_range": DiaryHelper.getFormattedTimeRange(s.properties.end_ts, s.properties.start_ts),
- "fmt_distance": DiaryHelper.getFormattedDistance(s.properties.distance),
+ "fmt_distance": ImperialConfig.getFormattedDistance(s.properties.distance),
+ "fmt_distance_suffix": ImperialConfig.getDistanceSuffix,
"icon": DiaryHelper.getIcon(s.properties.sensed_mode),
"colorStyle": {color: DiaryHelper.getColor(s.properties.sensed_mode)}
};
});
- console.log("trip.start_place = " + JSON.stringify($scope.trip.start_place));
+ $scope.recomputeDisplayTrips = function() {
+ console.log("Called diary details.recomputeDisplayTrips");
+ // Let's copy over the userInput to the field expected by the checks (user_input)
+ // We definitely need to unify this ASAP
+ $scope.tripgj.user_input = $scope.tripgj.userInput;
+ const filterMap = $scope.filterInputs.map((f) => f.filter($scope.tripgj));
+ // again, we cannot use both filters in the detail screen because the trip
+ // version of in the list view doesn't have the expectation value filled
+ // out. We really need to unify ASAP!
+ console.log("filterMap = "+filterMap+" we will only use the second (unlabeled check)");
+ // if the trip was going to stay (not be filtered), we should not go back to the scroll list
+ // TODO: Unify with infinite scroll and remove this hack
+ if (!filterMap[1]) {
+ $state.go("root.main.diary");
+ }
+ };
+
+ if (!angular.isDefined($scope.trip) || !angular.isDefined($scope.tripgj)) {
+ console.log("Detail trip not defined, going back to the list view")
+ $state.go("root.main.diary");
+ } else {
+ console.log("trip.start_place = " , $scope.trip);
var data = [];
var start_ts = $scope.trip.properties.start_ts;
@@ -114,6 +138,7 @@ angular.module('emission.main.diary.detail',['ui-leaflet', 'ng-walkthrough',
//Update the chart when window resizes.
nv.utils.windowResize(chart.update);
nv.addGraph(chart);
+ }
/* START: ng-walkthrough code */
// Tour steps
@@ -162,11 +187,38 @@ angular.module('emission.main.diary.detail',['ui-leaflet', 'ng-walkthrough',
}
$scope.$on('$ionicView.afterEnter', function(ev) {
- // Workaround from
+ // Workaround from
// https://github.com/driftyco/ionic/issues/3433#issuecomment-195775629
if(ev.targetScope !== $scope)
return;
checkDetailTutorialDone();
});
+
+ $scope.$on('$ionicView.enter',function(){
+ $scope.startTime = moment().utc()
+ ClientStats.addEvent(ClientStats.getStatKeys().EXPANDED_TRIP).then(
+ function() {
+ console.log("Added "+ClientStats.getStatKeys().EXPANDED_TRIP+" event");
+ }
+ );
+ });
+
+ $scope.$on('$ionicView.leave',function() {
+ var timeOnPage = moment().utc() - $scope.startTime;
+ ClientStats.addReading(ClientStats.getStatKeys().DIARY_TIME, timeOnPage);
+ });
+
+ $ionicPlatform.on("pause", function() {
+ if ($state.$current == "root.main.diary.detail") {
+ var timeOnPage = moment().utc() - $scope.startTime;
+ ClientStats.addReading(ClientStats.getStatKeys().DIARY_TIME, timeOnPage);
+ }
+ })
+
+ $ionicPlatform.on("resume", function() {
+ if ($state.$current == "root.main.diary.detail") {
+ $scope.startTime = moment().utc()
+ }
+ })
/* END: ng-walkthrough code */
})
diff --git a/www/js/diary/infinite_scroll_detail.js b/www/js/diary/infinite_scroll_detail.js
new file mode 100644
index 000000000..317534cd6
--- /dev/null
+++ b/www/js/diary/infinite_scroll_detail.js
@@ -0,0 +1,175 @@
+'use strict';
+angular.module('emission.main.diary.infscrolldetail',['ui-leaflet', 'ng-walkthrough',
+ 'nvd3', 'emission.plugin.kvstore',
+ 'emission.services',
+ 'emission.config.imperial',
+ 'emission.plugin.logger',
+ 'emission.stats.clientstats',
+ 'emission.incident.posttrip.manual'])
+
+.controller("InfiniteDiaryDetailCtrl", function($scope, $rootScope, $injector, $window, $ionicPlatform,
+ $state, $stateParams, ClientStats, $ionicActionSheet,
+ leafletData, leafletMapEvents, nzTour, KVStore,
+ Logger, Timeline, DiaryHelper, SurveyOptions, Config, ImperialConfig,
+ CommHelper, PostTripManualMarker, $translate) {
+ console.log("controller InfiniteDiaryDetailCtrl called with params = "+
+ JSON.stringify($stateParams));
+ $scope.surveyOpt = SurveyOptions.MULTILABEL;
+ $scope.tripFilterFactory = $injector.get($scope.surveyOpt.filter);
+ $scope.filterInputs = $scope.tripFilterFactory.configuredFilters;
+
+ $scope.mapCtrl = {};
+ angular.extend($scope.mapCtrl, {
+ defaults : {
+ }
+ });
+
+ angular.extend($scope.mapCtrl.defaults, Config.getMapTiles())
+
+ var mapEvents = leafletMapEvents.getAvailableMapEvents();
+ for (var k in mapEvents) {
+ var eventName = 'leafletDirectiveMap.infscroll-detail.' + mapEvents[k];
+ $scope.$on(eventName, function(event, data){
+ try {
+ console.log("in mapEvents, event = "+JSON.stringify(event.name)+
+ " leafletEvent = "+JSON.stringify(data.leafletEvent.type)+
+ " leafletObject = "+JSON.stringify(data.leafletObject.getBounds()));
+ } catch (e) {
+ if (e instanceof TypeError) {
+ console.log("in mapEvents, event = "+JSON.stringify(event.name)+
+ " leafletEvent = "+JSON.stringify(data.leafletEvent.type)+
+ " leafletObject is undefined");
+ } else {
+ console.log(e);
+ }
+ }
+ $scope.eventDetected = event.name;
+ });
+ }
+
+ /*
+ leafletData.getMap('detail').then(function(map) {
+ map.on('touch', function(ev) {
+ alert("touch" + ev.latlng); // ev is an event object (MouseEvent in this case)
+ });
+ });
+ */
+
+ $scope.$on('leafletDirectiveMap.infscroll-detail.resize', function(event, data) {
+ console.log("diary/detail received resize event, invalidating map size");
+ data.leafletObject.invalidateSize();
+ });
+
+ $scope.refreshTiles = function() {
+ $scope.$broadcast('invalidateSize');
+ };
+
+ $scope.trip = Timeline.getConfirmedTrip($stateParams.tripId);
+ Timeline.confirmedTrip2Geojson($scope.trip).then((tripgj) => {
+ $scope.$apply(() => {
+ $scope.tripgj = $scope.trip;
+ $scope.tripgj.data = tripgj;
+ $scope.tripgj.common = {};
+ $scope.tripgj.common.earlierOrLater = '';
+ $scope.tripgj.pointToLayer = DiaryHelper.pointFormat;
+
+ if (!angular.isDefined($scope.trip) || !angular.isDefined($scope.tripgj)) {
+ console.log("Detail trip = "+$scope.trip+" tripgj = "+$scope.tripgj+" not defined, going back to the list view")
+ $state.go("root.main.inf_scroll");
+ }
+ });
+ });
+
+ $scope.recomputeDisplayTrips = function() {
+ console.log("Called inf scroll details.recomputeDisplayTrips");
+ const filterMap = $scope.filterInputs.map((f) => f.filter($scope.trip));
+ const filterValue = filterMap.reduce((a, b) => a || b, false);
+ console.log("filterMap = "+filterMap+" value = "+filterValue);
+ // if the trip was going to stay (not be filtered), we should not go back to the scroll list
+ if (!filterValue) {
+ $state.go("root.main.inf_scroll");
+ }
+ };
+
+ /* START: ng-walkthrough code */
+ // Tour steps
+ var tour = {
+ config: {
+ mask: {
+ visibleOnNoTarget: true,
+ clickExit: true
+ },
+ previousText: $translate.instant('tour-previous'),
+ nextText: $translate.instant('tour-next'),
+ finishText: $translate.instant('tour-finish')
+ },
+ steps: [{
+ target: '#detail',
+ content: $translate.instant('details.tour-detail-content')
+ }, {
+ target: '#sectionList',
+ content: $translate.instant('details.tour-sectionList-content')
+ }, {
+ target: '#sectionPct',
+ content: $translate.instant('details.tour-sectionPct-content')
+ }]
+ };
+
+ var startWalkthrough = function () {
+ nzTour.start(tour).then(function(result) {
+ Logger.log("detail walkthrough start completed, no error");
+ }).catch(function(err) {
+ Logger.displayError("detail walkthrough start errored", err);
+ });
+ };
+
+
+ var checkDetailTutorialDone = function () {
+ var DETAIL_DONE_KEY = 'detail_tutorial_done';
+ var detailTutorialDone = KVStore.getDirect(DETAIL_DONE_KEY);
+ if (!detailTutorialDone) {
+ startWalkthrough();
+ KVStore.set(DETAIL_DONE_KEY, true);
+ }
+ };
+
+ $scope.startWalkthrough = function () {
+ startWalkthrough();
+ }
+
+ $scope.$on('$ionicView.afterEnter', function(ev) {
+ // Workaround from
+ // https://github.com/driftyco/ionic/issues/3433#issuecomment-195775629
+ if(ev.targetScope !== $scope)
+ return;
+ checkDetailTutorialDone();
+ });
+
+ $scope.$on('$ionicView.enter',function(){
+ $scope.startTime = moment().utc()
+ ClientStats.addEvent(ClientStats.getStatKeys().EXPANDED_TRIP).then(
+ function() {
+ console.log("Added "+ClientStats.getStatKeys().EXPANDED_TRIP+" event");
+ }
+ );
+ });
+
+ $scope.$on('$ionicView.leave',function() {
+ var timeOnPage = moment().utc() - $scope.startTime;
+ ClientStats.addReading(ClientStats.getStatKeys().DIARY_TIME, timeOnPage);
+ });
+
+ $ionicPlatform.on("pause", function() {
+ if ($state.$current == "root.main.diary.detail") {
+ var timeOnPage = moment().utc() - $scope.startTime;
+ ClientStats.addReading(ClientStats.getStatKeys().DIARY_TIME, timeOnPage);
+ }
+ })
+
+ $ionicPlatform.on("resume", function() {
+ if ($state.$current == "root.main.diary.detail") {
+ $scope.startTime = moment().utc()
+ }
+ })
+ /* END: ng-walkthrough code */
+})
diff --git a/www/js/diary/infinite_scroll_list.js b/www/js/diary/infinite_scroll_list.js
index de60ab8a8..c4c3e22e9 100644
--- a/www/js/diary/infinite_scroll_list.js
+++ b/www/js/diary/infinite_scroll_list.js
@@ -11,48 +11,42 @@
angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
'ionic-datepicker',
'emission.main.common.services',
- 'emission.incident.posttrip.manual',
- 'emission.tripconfirm.services',
'emission.services',
+ 'emission.config.imperial',
+ 'emission.survey',
'ng-walkthrough', 'nzTour', 'emission.plugin.kvstore',
- 'emission.main.diary.infscrollfilters',
'emission.stats.clientstats',
'emission.plugin.logger'])
-.controller("InfiniteDiaryListCtrl", function($window, $scope, $rootScope, $ionicPlatform, $state,
+.controller("InfiniteDiaryListCtrl", function($window, $scope, $rootScope, $injector,
+ $ionicPlatform, $state,
$ionicScrollDelegate, $ionicPopup, ClientStats,
$ionicLoading,
$ionicActionSheet,
$timeout,
- ionicDatePicker,
leafletData, Timeline, CommonGraph, DiaryHelper,
- InfScrollFilters,
- Config, PostTripManualMarker, ConfirmHelper, nzTour, KVStore, Logger, UnifiedDataLoader, $ionicPopover, $ionicModal, $translate, $q) {
+ SurveyOptions,
+ Config, ImperialConfig, PostTripManualMarker, nzTour, KVStore, Logger, UnifiedDataLoader, $ionicModal, $translate) {
// TODO: load only a subset of entries instead of everything
console.log("controller InfiniteDiaryListCtrl called");
+ const DEFAULT_ITEM_HT = 150;
+ $scope.surveyOpt = SurveyOptions.MULTILABEL;
+ $scope.itemHt = DEFAULT_ITEM_HT;
// Add option
const placeLimiter = new Bottleneck({ maxConcurrent: 2, minTime: 500 });
- $scope.userInputDetails = [];
- ConfirmHelper.INPUTS.forEach(function(item, index) {
- const currInput = angular.copy(ConfirmHelper.inputDetails[item]);
- currInput.name = item;
- $scope.userInputDetails.push(currInput);
- });
-
$scope.data = {};
+ $scope.tripFilterFactory = $injector.get($scope.surveyOpt.filter);
+ $scope.filterInputs = $scope.tripFilterFactory.configuredFilters;
+
+ $scope.labelPopulateFactory = $injector.get($scope.surveyOpt.service);
$scope.getActiveFilters = function() {
return $scope.filterInputs.filter(sf => sf.state).map(sf => sf.key);
}
- // reset all filters
- $scope.filterInputs = [
- InfScrollFilters.TO_LABEL,
- InfScrollFilters.UNLABELED
- ];
$scope.filterInputs.forEach((f) => {
f.state = false;
});
@@ -91,29 +85,28 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
}
$scope.readDataFromServer = function() {
+ Logger.log("Called readDataFromServer");
$scope.infScrollControl.fromBottom = getFromBottom()
$scope.infScrollControl.callback = adjustScrollAfterDownload;
console.log("calling readDataFromServer with "+
JSON.stringify($scope.infScrollControl));
const currEnd = $scope.infScrollControl.currentEnd;
if (!angular.isDefined(currEnd)) {
- console.log("trying to read data too early, early return");
+ Logger.log("trying to read data too early, early return");
+ $ionicLoading.hide();
$scope.$broadcast('scroll.infiniteScrollComplete')
return;
}
+ Logger.log("Turning on the ionic loading overlay in setupInfScroll");
+ $ionicLoading.show({
+ template: $translate.instant('service.reading-server')
+ });
Timeline.readAllConfirmedTrips(currEnd, ONE_WEEK).then((ctList) => {
Logger.log("Received batch of size "+ctList.length);
ctList.forEach($scope.populateBasicClasses);
ctList.forEach((trip, tIndex) => {
- // console.log("Expectation: "+JSON.stringify(trip.expectation));
- // console.log("Inferred labels from server: "+JSON.stringify(trip.inferred_labels));
- trip.userInput = {};
- ConfirmHelper.INPUTS.forEach(function(item, index) {
- $scope.populateManualInputs(trip, ctList[tIndex+1], item, $scope.data.manualResultMap[item]);
- });
- trip.finalInference = {};
- $scope.inferFinalLabels(trip);
- $scope.updateVerifiability(trip);
+ trip.nextTrip = ctList[tIndex+1];
+ $scope.labelPopulateFactory.populateInputsAndInferences(trip, $scope.data.manualResultMap);
});
// Fill places on a reversed copy of the list so we fill from the bottom up
ctList.slice().reverse().forEach(function(trip, index) {
@@ -121,6 +114,7 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
});
$scope.data.allTrips = ctList.concat($scope.data.allTrips);
Logger.log("After adding batch of size "+ctList.length+" cumulative size = "+$scope.data.allTrips.length);
+ Timeline.setInfScrollConfirmedTripList($scope.data.allTrips);
const oldestTrip = ctList[0];
if (oldestTrip) {
if (oldestTrip.start_ts <= $scope.infScrollControl.pipelineRange.start_ts) {
@@ -140,6 +134,7 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
}
$scope.recomputeDisplayTrips();
Logger.log("Broadcasting infinite scroll complete");
+ $ionicLoading.hide();
$scope.$broadcast('scroll.infiniteScrollComplete');
}).catch((err) => {
@@ -147,18 +142,27 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
Logger.log("Reached the end of the scrolling");
$scope.infScrollControl.reachedEnd = true;
Logger.log("Broadcasting infinite scroll complete");
+ $ionicLoading.hide();
$scope.$broadcast('scroll.infiniteScrollComplete');
});
};
$scope.setupInfScroll = function() {
Logger.log("Setting up the scrolling");
+ $scope.itemHt = DEFAULT_ITEM_HT;
$scope.infScrollControl.reachedEnd = false;
$scope.data.allTrips = [];
$scope.data.displayTrips = [];
+ Logger.log("Turning on the ionic loading overlay in setupInfScroll");
+ $ionicLoading.show({
+ template: $translate.instant('service.reading-server')
+ });
Timeline.getUnprocessedLabels().then(([pipelineRange, manualResultMap]) => {
if (pipelineRange.end_ts) {
- $scope.data.manualResultMap = manualResultMap;
+ $scope.$apply(() => {
+ $scope.data.manualResultMap = manualResultMap;
+ });
+ console.log("After reading in the label controller, manualResultMap "+JSON.stringify($scope.manualResultMap), $scope.data.manualResultMap);
$scope.infScrollControl.pipelineRange = pipelineRange;
$scope.infScrollControl.currentEnd = pipelineRange.end_ts;
$scope.infScrollControl.callback = function() {
@@ -169,6 +173,7 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
$scope.$apply(() => {
$scope.infScrollControl.reachedEnd = true;
});
+ $ionicLoading.hide();
$scope.$broadcast('scroll.infiniteScrollComplete')
}
});
@@ -182,22 +187,9 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
}
});
- $ionicModal.fromTemplateUrl("templates/diary/trip-detail-popover.html", {
- scope: $scope,
- animation: 'slide-in-up'
- }).then((popover) => {
- $scope.tripDetailPopover = popover;
- });
-
$scope.showDetail = function($event, trip) {
- Timeline.confirmedTrip2Geojson(trip).then((tripgj) => {
- $scope.currgj = trip;
- $scope.currgj.data = tripgj;
- $scope.currgj.pointToLayer = DiaryHelper.pointFormat;
- $scope.tripDetailPopover.show();
- leafletData.getMap("detailPopoverMap").then(function(map) {
- map.invalidateSize();
- });
+ $state.go("root.main.inf_scroll-detail", {
+ tripId: trip.id
});
}
@@ -238,7 +230,7 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
} else {
// console.log("Trip n before: "+$scope.data.displayTrips.length);
$scope.data.displayTrips = $scope.data.allTrips.filter(
- t => InfScrollFilters.waitingForMod(t) || f.filter(t));
+ t => (t.waitingForMod == true) || f.filter(t));
// console.log("Trip n after: "+$scope.data.displayTrips.length);
alreadyFiltered = true;
}
@@ -310,178 +302,22 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
$scope.listColRightClass = "col-50 list-col-right"
$scope.differentCommon = function(tripgj) {
- return ($scope.isCommon(tripgj.id))? ((DiaryHelper.getEarlierOrLater(tripgj.data.properties.start_ts, tripgj.data.id) == '')? false : true) : false;
+ return (DiaryHelper.isCommon(tripgj.id))? ((DiaryHelper.getEarlierOrLater(tripgj.data.properties.start_ts, tripgj.data.id) == '')? false : true) : false;
}
$scope.stopTimeTagClass = function(tripgj) {
return ($scope.differentCommon(tripgj))? "stop-time-tag-lower" : "stop-time-tag";
}
- /**
- * MODE (becomes manual/mode_confirm) becomes mode_confirm
- */
- $scope.inputType2retKey = function(inputType) {
- return ConfirmHelper.inputDetails[inputType].key.split("/")[1];
- }
-
- /**
- * Insert the given userInputLabel into the given inputType's slot in inputField
- */
- $scope.populateInput = function(tripField, inputType, userInputLabel) {
- if (angular.isDefined(userInputLabel)) {
- var userInputEntry = $scope.inputParams[inputType].value2entry[userInputLabel];
- if (!angular.isDefined(userInputEntry)) {
- userInputEntry = ConfirmHelper.getFakeEntry(userInputLabel);
- $scope.inputParams[inputType].options.push(userInputEntry);
- $scope.inputParams[inputType].value2entry[userInputLabel] = userInputEntry;
- }
- // console.log("Mapped label "+userInputLabel+" to entry "+JSON.stringify(userInputEntry));
- tripField[inputType] = userInputEntry;
- }
- }
-
- /**
- * Embed 'inputType' to the trip
- */
- $scope.populateManualInputs = function (tripgj, nextTripgj, inputType, inputList) {
- // Check unprocessed labels first since they are more recent
- // Massage the input to meet getUserInputForTrip expectations
- const unprocessedLabelEntry = DiaryHelper.getUserInputForTrip(
- {data: {properties: tripgj, features: [{}, {}, {}]}},
- {data: {properties: nextTripgj, features: [{}, {}, {}]}},
- inputList);
- var userInputLabel = unprocessedLabelEntry? unprocessedLabelEntry.data.label : undefined;
- if (!angular.isDefined(userInputLabel)) {
- userInputLabel = tripgj.user_input[$scope.inputType2retKey(inputType)];
- }
- $scope.populateInput(tripgj.userInput, inputType, userInputLabel);
- // Logger.log("Set "+ inputType + " " + JSON.stringify(userInputEntry) + " for trip starting at " + JSON.stringify(tripgj.start_fmt_time));
- $scope.editingTrip = angular.undefined;
- }
-
- /*
- * Embody the logic for delayed update:
- * the recompute logic already keeps trips that are waitingForModification
- * even if they would be filtered otherwise.
- * so here:
- * - set the trip as waiting for potential modifications
- * - create a one minute timeout that will remove the wait and recompute
- * - clear the existing timeout (if any)
- */
- $scope.updateVisibilityAfterDelay = function(trip) {
- // We have just edited this trip, and are now waiting to see if the user
- // is going to modify it further
- trip.waitingForMod = true;
- let currTimeoutPromise = trip.timeoutPromise;
- let THIRTY_SECS = 30 * 1000;
- Logger.log("trip starting at "+trip.start_fmt_time+": creating new timeout");
- trip.timeoutPromise = $timeout(function() {
- Logger.log("trip starting at "+trip.start_fmt_time+": executing recompute");
- trip.waitingForMod = false;
- trip.timeoutPromise = undefined;
- $scope.recomputeDisplayTrips();
- }, THIRTY_SECS);
- Logger.log("trip starting at "+trip.start_fmt_time+": cancelling existing timeout "+currTimeoutPromise);
- $timeout.cancel(currTimeoutPromise);
- }
-
- $scope.updateTripProperties = function(trip) {
- $scope.inferFinalLabels(trip);
- $scope.updateVerifiability(trip);
- $scope.updateVisibilityAfterDelay(trip);
- }
-
- /**
- * Given the list of possible label tuples we've been sent and what the user has already input for the trip, choose the best labels to actually present to the user.
- * The algorithm below operationalizes these principles:
- * - Never consider label tuples that contradict a green label
- * - Obey "conservation of uncertainty": the sum of probabilities after filtering by green labels must equal the sum of probabilities before
- * - After filtering, predict the most likely choices at the level of individual labels, not label tuples
- * - Never show user yellow labels that have a lower probability of being correct than confidenceThreshold
- */
- $scope.inferFinalLabels = function(trip) {
- // Deep copy the possibility tuples
- let labelsList = [];
- if (angular.isDefined(trip.inferred_labels)) {
- labelsList = JSON.parse(JSON.stringify(trip.inferred_labels));
- }
-
- // Capture the level of certainty so we can reconstruct it later
- const totalCertainty = labelsList.map(item => item.p).reduce(((item, rest) => item + rest), 0);
-
- // Filter out the tuples that are inconsistent with existing green labels
- for (const inputType of ConfirmHelper.INPUTS) {
- const userInput = trip.userInput[inputType];
- if (userInput) {
- const retKey = $scope.inputType2retKey(inputType);
- labelsList = labelsList.filter(item => item.labels[retKey] == userInput.value);
- }
- }
-
- // Red labels if we have no possibilities left
- if (labelsList.length == 0) {
- for (const inputType of ConfirmHelper.INPUTS) $scope.populateInput(trip.finalInference, inputType, undefined);
- }
- else {
- // Normalize probabilities to previous level of certainty
- const certaintyScalar = totalCertainty/labelsList.map(item => item.p).reduce((item, rest) => item + rest);
- labelsList.forEach(item => item.p*=certaintyScalar);
-
- for (const inputType of ConfirmHelper.INPUTS) {
- // For each label type, find the most probable value by binning by label value and summing
- const retKey = $scope.inputType2retKey(inputType);
- let valueProbs = new Map();
- for (const tuple of labelsList) {
- const labelValue = tuple.labels[retKey];
- if (!valueProbs.has(labelValue)) valueProbs.set(labelValue, 0);
- valueProbs.set(labelValue, valueProbs.get(labelValue) + tuple.p);
- }
- let max = {p: 0, labelValue: undefined};
- for (const [thisLabelValue, thisP] of valueProbs) {
- // In the case of a tie, keep the label with earlier first appearance in the labelsList (we used a Map to preserve this order)
- if (thisP > max.p) max = {p: thisP, labelValue: thisLabelValue};
- }
-
- // Display a label as red if its most probable inferred value has a probability less than or equal to the trip's confidence_threshold
- // Fails safe if confidence_threshold doesn't exist
- if (max.p <= trip.confidence_threshold) max.labelValue = undefined;
-
- $scope.populateInput(trip.finalInference, inputType, max.labelValue);
- }
- }
- }
-
- /**
- * For a given trip, compute how the "verify" button should behave.
- * If the trip has at least one yellow label, the button should be clickable.
- * If the trip has all green labels, the button should be disabled because everything has already been verified.
- * If the trip has all red labels or a mix of red and green, the button should be disabled because we need more detailed user input.
- */
- $scope.updateVerifiability = function(trip) {
- var allGreen = true;
- var someYellow = false;
- for (const inputType of ConfirmHelper.INPUTS) {
- const green = trip.userInput[inputType];
- const yellow = trip.finalInference[inputType] && !green;
- if (yellow) someYellow = true;
- if (!green) allGreen = false;
- }
- trip.verifiability = someYellow ? "can-verify" : (allGreen ? "already-verified" : "cannot-verify");
- }
-
- $scope.getFormattedDistanceInMiles = function(input) {
- return (0.621371 * $scope.getFormattedDistance(input)).toFixed(1);
- }
-
$scope.populateBasicClasses = function(tripgj) {
tripgj.display_start_time = DiaryHelper.getLocalTimeString(tripgj.start_local_dt);
tripgj.display_end_time = DiaryHelper.getLocalTimeString(tripgj.end_local_dt);
- tripgj.display_distance = $scope.getFormattedDistanceInMiles(tripgj.distance);
+ tripgj.display_distance = ImperialConfig.getFormattedDistance(tripgj.distance);
+ tripgj.display_distance_suffix = ImperialConfig.getDistanceSuffix;
tripgj.display_date = moment(tripgj.start_ts * 1000).format('ddd DD MMM YY');
- tripgj.display_time = $scope.getFormattedTimeRange(tripgj.start_ts,
+ tripgj.display_time = DiaryHelper.getFormattedTimeRange(tripgj.start_ts,
tripgj.end_ts);
tripgj.background = "bg-light";
tripgj.listCardClass = $scope.listCardClass(tripgj);
- tripgj.verifiability = "cannot-verify";
// Pre-populate start and end names with so they take up the same amount of vertical space in the UI before they are populated with real data
tripgj.start_display_name = "\xa0";
tripgj.end_display_name = "\xa0";
@@ -506,100 +342,20 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
tripgj.common = {}
DiaryHelper.fillCommonTripCount(tripgj);
tripgj.common.different = $scope.differentCommon(tripgj);
- tripgj.common.longerOrShorter = $scope.getLongerOrShorter(tripgj.data, tripgj.data.id);
+ tripgj.common.longerOrShorter = DiaryHelper.getLongerOrShorter(tripgj.data, tripgj.data.id);
tripgj.common.listColLeftClass = $scope.listColLeftClass(tripgj.common.longerOrShorter[0]);
tripgj.common.stopTimeTagClass = $scope.stopTimeTagClass(tripgj);
- tripgj.common.arrowColor = $scope.arrowColor(tripgj.common.longerOrShorter[0]);
- tripgj.common.arrowClass = $scope.getArrowClass(tripgj.common.longerOrShorter[0]);
-
- tripgj.common.earlierOrLater = $scope.getEarlierOrLater(tripgj.data.properties.start_ts, tripgj.data.id);
- tripgj.common.displayEarlierLater = $scope.parseEarlierOrLater(tripgj.common.earlierOrLater);
- }
+ tripgj.common.arrowColor = DiaryHelper.arrowColor(tripgj.common.longerOrShorter[0]);
+ tripgj.common.arrowClass = DiaryHelper.getArrowClass(tripgj.common.longerOrShorter[0]);
- $scope.explainDraft = function($event) {
- $event.stopPropagation();
- $ionicPopup.alert({
- template: $translate.instant('list-explainDraft-alert')
- });
- // don't want to go to the detail screen
+ tripgj.common.earlierOrLater = DiaryHelper.getEarlierOrLater(tripgj.data.properties.start_ts, tripgj.data.id);
+ tripgj.common.displayEarlierLater = DiaryHelper.parseEarlierOrLater(tripgj.common.earlierOrLater);
}
- /*
- * Disabling the reload of the page on background sync because it doesn't
- * work correctly. on iOS, plugins are not loaded if backgroundFetch or
- * remote push are invoked, since they don't initialize the app. On
- * android, it looks like the thread ends before the maps are fully loaded,
- * so we have half displayed, frozen maps. We should really check the
- * status, reload here if active and reload everything on resume.
- * For now, we just add a refresh button to avoid maintaining state.
- window.broadcaster.addEventListener( "edu.berkeley.eecs.emission.sync.NEW_DATA", function( e ) {
- window.Logger.log(window.Logger.LEVEL_INFO,
- "new data received! reload data for the current day"+$scope.data.currDay);
- $window.location.reload();
- // readAndUpdateForDay($scope.data.currDay);
- });
- */
-
$scope.refresh = function() {
$scope.setupInfScroll();
};
- /* For UI control */
- $scope.groups = [];
- for (var i=0; i<10; i++) {
- $scope.groups[i] = {
- name: i,
- items: ["good1", "good2", "good3"]
- };
- for (var j=0; j<3; j++) {
- $scope.groups[i].items.push(i + '-' + j);
- }
- }
- $scope.toggleGroup = function(group) {
- if ($scope.isGroupShown(group)) {
- $scope.shownGroup = null;
- } else {
- $scope.shownGroup = group;
- }
- };
- $scope.isGroupShown = function(group) {
- return $scope.shownGroup === group;
- };
- $scope.getEarlierOrLater = DiaryHelper.getEarlierOrLater;
- $scope.getLongerOrShorter = DiaryHelper.getLongerOrShorter;
- $scope.getHumanReadable = DiaryHelper.getHumanReadable;
- $scope.getKmph = DiaryHelper.getKmph;
- $scope.getPercentages = DiaryHelper.getPercentages;
- $scope.getFormattedDistance = DiaryHelper.getFormattedDistance;
- $scope.getSectionDetails = DiaryHelper.getSectionDetails;
- $scope.getFormattedTime = DiaryHelper.getFormattedTime;
- $scope.getFormattedTimeRange = DiaryHelper.getFormattedTimeRange;
- $scope.getFormattedDuration = DiaryHelper.getFormattedDuration;
- $scope.getTripDetails = DiaryHelper.getTripDetails;
- $scope.starColor = DiaryHelper.starColor;
- $scope.arrowColor = DiaryHelper.arrowColor;
- $scope.getArrowClass = DiaryHelper.getArrowClass;
- $scope.isCommon = DiaryHelper.isCommon;
- $scope.isDraft = DiaryHelper.isDraft;
- // $scope.expandEarlierOrLater = DiaryHelper.expandEarlierOrLater;
- // $scope.increaseRestElementsTranslate3d = DiaryHelper.increaseRestElementsTranslate3d;
-
- $scope.makeCurrent = function() {
- $ionicPopup.alert({
- template: "Coming soon, after Shankari's quals in early March!"
- });
- }
-
- $scope.parseEarlierOrLater = DiaryHelper.parseEarlierOrLater;
-
- $scope.getTimeSplit = function(tripList) {
- var retVal = {};
- var tripTimes = tripList.map(function(dt) {
- return dt.data.properties.duration;
- });
-
- };
-
// Tour steps
var tour = {
config: {
@@ -638,19 +394,19 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
}
},
{
- target: '.input-confirm-row',
+ target: '.diary-entry',
content: $translate.instant('new_label_tour.5')
},
{
- target: '.input-confirm-row',
+ target: '.diary-entry',
content: $translate.instant('new_label_tour.6')
},
{
- target: '.diary-checkmark-container i',
+ target: '.diary-entry',
content: $translate.instant('new_label_tour.7')
},
{
- target: '.input-confirm-row',
+ target: '.diary-entry',
content: $translate.instant('new_label_tour.8'),
after: function() {
return new Promise(function(resolve, reject) {
@@ -676,14 +432,32 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
var startWalkthrough = function () {
nzTour.start(tour).then(function(result) {
- // $ionicScrollDelegate.scrollBottom();
Logger.log("list walkthrough start completed, no error");
}).catch(function(err) {
- // $ionicScrollDelegate.scrollBottom();
Logger.displayError("list walkthrough start errored", err);
});
};
+ $scope.increaseHeight = function () {
+ // let's increase by a small amount to workaround the issue with the
+ // card not resizing the first time
+ $scope.itemHt = $scope.itemHt + 20;
+ const oldDisplayTrips = $scope.data.displayTrips;
+ const TEN_MS = 10;
+ $scope.data.displayTrips = [];
+ $timeout(() => {
+ $scope.$apply(() => {
+ // make sure that the new item-height is calculated by resetting the list
+ // that we iterate over
+ $scope.data.displayTrips = oldDisplayTrips;
+ // make sure that the cards within the items are set to the new
+ // size. Apparently, `ng-style` is not recalulated although the
+ // variable has changed and the items have changed.
+ $(".list-card").css("height", $scope.itemHt + "px");
+ });
+ }, TEN_MS);
+ };
+
/*
* Checks if it is the first time the user has loaded the new label tab. If it is then
* show a walkthrough and store the info that the user has seen the tutorial.
@@ -730,193 +504,6 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
}
})
- $scope.prevDay = function() {
- console.log("Called prevDay when currDay = "+Timeline.data.currDay.format('YYYY-MM-DD'));
- var prevDay = moment(Timeline.data.currDay).subtract(1, 'days');
- console.log("prevDay = "+prevDay.format('YYYY-MM-DD'));
- readAndUpdateForDay(prevDay);
- };
-
- $scope.nextDay = function() {
- console.log("Called nextDay when currDay = "+Timeline.data.currDay.format('YYYY-MM-DD'));
- var nextDay = moment(Timeline.data.currDay).add(1, 'days');
- console.log("nextDay = "+nextDay);
- readAndUpdateForDay(nextDay);
- };
-
- $scope.toDetail = function (param) {
- $state.go('root.main.diary-detail', {
- tripId: param
- });
- };
-
- $scope.showModes = DiaryHelper.showModes;
-
- $scope.popovers = {};
- ConfirmHelper.INPUTS.forEach(function(item, index) {
- let popoverPath = 'templates/diary/'+item.toLowerCase()+'-popover.html';
- return $ionicPopover.fromTemplateUrl(popoverPath, {
- scope: $scope
- }).then(function (popover) {
- $scope.popovers[item] = popover;
- });
- });
-
- $scope.openPopover = function ($event, tripgj, inputType) {
- var userInput = tripgj.userInput[inputType];
- if (angular.isDefined(userInput)) {
- $scope.selected[inputType].value = userInput.value;
- } else {
- $scope.selected[inputType].value = '';
- }
- $scope.draftInput = {
- "start_ts": tripgj.start_ts,
- "end_ts": tripgj.end_ts
- };
- $scope.editingTrip = tripgj;
- Logger.log("in openPopover, setting draftInput = " + JSON.stringify($scope.draftInput));
- $scope.popovers[inputType].show($event);
- };
-
- var closePopover = function (inputType) {
- $scope.selected[inputType] = {
- value: ''
- };
- $scope.popovers[inputType].hide();
- };
-
- /**
- * verifyTrip turns all of a given trip's yellow labels green
- */
- $scope.verifyTrip = function($event, trip) {
- if (trip.verifiability != "can-verify") {
- ClientStats.addReading(ClientStats.getStatKeys().VERIFY_TRIP, {"verifiable": false});
- return;
- }
- ClientStats.addReading(ClientStats.getStatKeys().VERIFY_TRIP, {"verifiable": true, "userInput": angular.toJson(trip.userInput), "finalInference": angular.toJson(trip.finalInference)});
-
- $scope.draftInput = {
- "start_ts": trip.start_ts,
- "end_ts": trip.end_ts
- };
- $scope.editingTrip = trip;
-
- for (const inputType of ConfirmHelper.INPUTS) {
- const inferred = trip.finalInference[inputType];
- // TODO: figure out what to do with "other". For now, do not verify.
- if (inferred && !trip.userInput[inputType] && inferred != "other") $scope.store(inputType, inferred, false);
- }
- }
-
- /**
- * Store selected value for options
- * $scope.selected is for display only
- * the value is displayed on popover selected option
- */
- $scope.selected = {}
- ConfirmHelper.INPUTS.forEach(function(item, index) {
- $scope.selected[item] = {value: ''};
- });
- $scope.selected.other = {text: '', value: ''};
-
- /*
- * This is a curried function that curries the `$scope` variable
- * while returing a function that takes `e` as the input
- */
- var checkOtherOptionOnTap = function ($scope, inputType) {
- return function (e) {
- if (!$scope.selected.other.text) {
- e.preventDefault();
- } else {
- Logger.log("in choose other, other = " + JSON.stringify($scope.selected));
- $scope.store(inputType, $scope.selected.other, true /* isOther */);
- $scope.selected.other = '';
- return $scope.selected.other;
- }
- }
- };
-
- $scope.choose = function (inputType) {
- ClientStats.addReading(ClientStats.getStatKeys().SELECT_LABEL, {
- "userInput": angular.toJson($scope.editingTrip.userInput),
- "finalInference": angular.toJson($scope.editingTrip.finalInference),
- "inputKey": inputType,
- "inputVal": $scope.selected[inputType].value
- });
- var isOther = false
- if ($scope.selected[inputType].value != "other") {
- $scope.store(inputType, $scope.selected[inputType], isOther);
- } else {
- isOther = true
- ConfirmHelper.checkOtherOption(inputType, checkOtherOptionOnTap, $scope);
- }
- closePopover(inputType);
- };
-
- $scope.$on('$ionicView.loaded', function() {
- $scope.inputParams = {}
- ConfirmHelper.INPUTS.forEach(function(item) {
- ConfirmHelper.getOptionsAndMaps(item).then(function(omObj) {
- $scope.inputParams[item] = omObj;
- });
- });
- });
-
- $scope.store = function (inputType, input, isOther) {
- if(isOther) {
- // Let's make the value for user entered inputs look consistent with our
- // other values
- input.value = ConfirmHelper.otherTextToValue(input.text);
- }
- $scope.draftInput.label = input.value;
- Logger.log("in storeInput, after setting input.value = " + input.value + ", draftInput = " + JSON.stringify($scope.draftInput));
- var tripToUpdate = $scope.editingTrip;
- $window.cordova.plugins.BEMUserCache.putMessage(ConfirmHelper.inputDetails[inputType].key, $scope.draftInput).then(function () {
- $scope.$apply(function() {
- if (isOther) {
- tripToUpdate.userInput[inputType] = ConfirmHelper.getFakeEntry(input.value);
- $scope.inputParams[inputType].options.push(tripToUpdate.userInput[inputType]);
- $scope.inputParams[inputType].value2entry[input.value] = tripToUpdate.userInput[inputType];
- } else {
- tripToUpdate.userInput[inputType] = $scope.inputParams[inputType].value2entry[input.value];
- }
- $scope.updateTripProperties(tripToUpdate); // Redo our inferences, filters, etc. based on this new information
- });
- });
- if (isOther == true)
- $scope.draftInput = angular.undefined;
- }
-
- $scope.redirect = function(){
- $state.go("root.main.current");
- };
-
- var in_trip;
- $scope.checkTripState = function() {
- window.cordova.plugins.BEMDataCollection.getState().then(function(result) {
- Logger.log("Current trip state" + JSON.stringify(result));
- if(JSON.stringify(result) == "\"STATE_ONGOING_TRIP\"" ||
- JSON.stringify(result) == "\"local.state.ongoing_trip\"") {
- in_trip = true;
- } else {
- in_trip = false;
- }
- });
- };
-
- // storing boolean to in_trip and return it in inTrip function
- // work because ng-show is watching the inTrip function.
- // Returning a promise to ng-show did not work.
- // Changing in_trip = bool value; in checkTripState function
- // to return bool value and using checkTripState function in ng-show
- // did not work.
- $scope.inTrip = function() {
- $ionicPlatform.ready().then(function() {
- $scope.checkTripState();
- return in_trip;
- });
- };
-
$ionicPlatform.ready().then(function() {
$scope.setupInfScroll();
$scope.isAndroid = $window.device.platform.toLowerCase() === "android";
@@ -935,6 +522,21 @@ angular.module('emission.main.diary.infscrolllist',['ui-leaflet',
ClientStats.addEvent(ClientStats.getStatKeys().CHECKED_INF_SCROLL).then(function() {
console.log("Added "+ClientStats.getStatKeys().CHECKED_INF_SCROLL+" event");
});
+ $scope.$apply(() => {
+ if ($scope.data && $scope.data.allTrips) {
+ $scope.data.allTrips.forEach(function(tripgj, tripIndex, array) {
+ let tripFromDiary = Timeline.getTripWrapper(tripgj.id);
+ // Since the label screen has trips from multiple days, we
+ // may not always find a matching trip in the diary
+ if (tripFromDiary) {
+ $scope.labelPopulateFactory.copyInputIfNewer(tripFromDiary, tripgj);
+ }
+ });
+ $scope.recomputeDisplayTrips();
+ } else {
+ console.log("No trips loaded yet, no inputs to copy over");
+ }
+ });
if($rootScope.barDetail){
readAndUpdateForDay($rootScope.barDetailDate);
$rootScope.barDetail = false;
diff --git a/www/js/diary/list.js b/www/js/diary/list.js
index 5a35bc0b4..020c3a966 100644
--- a/www/js/diary/list.js
+++ b/www/js/diary/list.js
@@ -11,41 +11,40 @@
angular.module('emission.main.diary.list',['ui-leaflet',
'ionic-datepicker',
'emission.main.common.services',
- 'emission.incident.posttrip.manual',
- 'emission.tripconfirm.services',
'emission.services',
+ 'emission.config.imperial',
+ 'emission.survey',
'emission.enketo-survey.launch',
'ng-walkthrough', 'nzTour', 'emission.plugin.kvstore',
- 'emission.plugin.logger'
+ 'emission.stats.clientstats',
+ 'emission.plugin.logger'
])
-.controller("DiaryListCtrl", function($window, $scope, $rootScope, $ionicPlatform, $state,
- $ionicScrollDelegate, $ionicPopup,
+.controller("DiaryListCtrl", function($window, $scope, $rootScope, $injector,
+ $ionicPlatform, $state,
+ $ionicScrollDelegate, $ionicPopup, ClientStats,
$ionicLoading,
$ionicActionSheet,
+ $timeout,
ionicDatePicker,
leafletData, Timeline, CommonGraph, DiaryHelper,
- Config, PostTripManualMarker, ConfirmHelper, nzTour, KVStore, Logger, UnifiedDataLoader, EnketoSurveyLaunch, $ionicPopover, $translate) {
+ SurveyOptions,
+ Config, ImperialConfig, PostTripManualMarker, nzTour, KVStore, Logger, UnifiedDataLoader, $ionicPopover, $translate) {
console.log("controller DiaryListCtrl called");
+ const DEFAULT_ITEM_HT = 335;
+ $scope.surveyOpt = SurveyOptions.MULTILABEL;
+ ClientStats.addReading(ClientStats.getStatKeys().LABEL_TAB_SWITCH,
+ {"source": null, "dest": $scope.data? $scope.data.currDay : undefined});
// Add option
-
- $scope.$on('leafletDirectiveMap.resize', function(event, data) {
- console.log("diary/list received resize event, invalidating map size");
- data.leafletObject.invalidateSize();
- });
-
- $scope.userInputDetails = [];
- ConfirmHelper.INPUTS.forEach(function(item, index) {
- const currInput = angular.copy(ConfirmHelper.inputDetails[item]);
- currInput.name = item;
- $scope.userInputDetails.push(currInput);
- });
+ $scope.labelPopulateFactory = $injector.get($scope.surveyOpt.service);
+ $scope.itemHt = DEFAULT_ITEM_HT;
var readAndUpdateForDay = function(day) {
// This just launches the update. The update can complete in the background
// based on the time when the database finishes reading.
// TODO: Convert the usercache calls into promises so that we don't have to
// do this juggling
+ $scope.itemHt = DEFAULT_ITEM_HT;
Timeline.updateForDay(day);
// This will be used to show the date of datePicker in the user language.
$scope.currDay = moment(day).format('LL');
@@ -114,7 +113,7 @@ angular.module('emission.main.diary.list',['ui-leaflet',
$scope.listColRightClass = "col-50 list-col-right"
$scope.differentCommon = function(tripgj) {
- return ($scope.isCommon(tripgj.id))? ((DiaryHelper.getEarlierOrLater(tripgj.data.properties.start_ts, tripgj.data.id) == '')? false : true) : false;
+ return (DiaryHelper.isCommon(tripgj.id))? ((DiaryHelper.getEarlierOrLater(tripgj.data.properties.start_ts, tripgj.data.id) == '')? false : true) : false;
}
$scope.stopTimeTagClass = function(tripgj) {
return ($scope.differentCommon(tripgj))? "stop-time-tag-lower" : "stop-time-tag";
@@ -163,69 +162,34 @@ angular.module('emission.main.diary.list',['ui-leaflet',
ionicDatePicker.openDatePicker($scope.datepickerObject);
}
- /**
- * Embed 'inputType' to the trip
- */
- $scope.populateInputFromTimeline = function (tripgj, nextTripgj, inputType, inputList) {
- var userInput = DiaryHelper.getUserInputForTrip(tripgj, nextTripgj, inputList);
- if (angular.isDefined(userInput)) {
- // userInput is an object with data + metadata
- // the label is the "value" from the options
- var userInputEntry;
- switch(inputType) {
- case 'SURVEY':
- userInputEntry = {text: userInput.data.label};
- break;
- default:
- userInputEntry = $scope.inputParams[inputType].value2entry[userInput.data.label];
- if (!angular.isDefined(userInputEntry)) {
- userInputEntry = ConfirmHelper.getFakeEntry(userInput.data.label);
- $scope.inputParams[inputType].options.push(userInputEntry);
- $scope.inputParams[inputType].value2entry[userInput.data.label] = userInputEntry;
- }
- break;
- }
- console.log("Mapped label "+userInput.data.label+" to entry "+JSON.stringify(userInputEntry));
- tripgj.userInput[inputType] = userInputEntry;
- }
- Logger.log("Set "+ inputType + " " + JSON.stringify(userInputEntry) + " for trip id " + JSON.stringify(tripgj.data.id));
- $scope.editingTrip = angular.undefined;
- }
-
$scope.populateBasicClasses = function(tripgj) {
tripgj.display_start_time = DiaryHelper.getLocalTimeString(tripgj.data.properties.start_local_dt);
tripgj.display_end_time = DiaryHelper.getLocalTimeString(tripgj.data.properties.end_local_dt);
- tripgj.display_distance = $scope.getFormattedDistance(tripgj.data.properties.distance);
- tripgj.display_time = $scope.getFormattedTimeRange(tripgj.data.properties.start_ts,
+ tripgj.display_distance = ImperialConfig.getFormattedDistance(tripgj.data.properties.distance);
+ tripgj.display_distance_suffix = ImperialConfig.getDistanceSuffix;
+ tripgj.display_date = moment(tripgj.data.properties.start_ts * 1000).format('ddd DD MMM YY');
+ tripgj.display_time = DiaryHelper.getFormattedTimeRange(tripgj.data.properties.start_ts,
tripgj.data.properties.end_ts);
- tripgj.isDraft = $scope.isDraft(tripgj);
+ tripgj.isDraft = DiaryHelper.isDraft(tripgj);
tripgj.background = DiaryHelper.getTripBackground(tripgj);
tripgj.listCardClass = $scope.listCardClass(tripgj);
- tripgj.percentages = $scope.getPercentages(tripgj)
+ tripgj.percentages = DiaryHelper.getPercentages(tripgj)
}
$scope.populateCommonInfo = function(tripgj) {
tripgj.common = {}
DiaryHelper.fillCommonTripCount(tripgj);
tripgj.common.different = $scope.differentCommon(tripgj);
- tripgj.common.longerOrShorter = $scope.getLongerOrShorter(tripgj.data, tripgj.data.id);
+ tripgj.common.longerOrShorter = DiaryHelper.getLongerOrShorter(tripgj.data, tripgj.data.id);
tripgj.common.listColLeftClass = $scope.listColLeftClass(tripgj.common.longerOrShorter[0]);
tripgj.common.stopTimeTagClass = $scope.stopTimeTagClass(tripgj);
- tripgj.common.arrowColor = $scope.arrowColor(tripgj.common.longerOrShorter[0]);
- tripgj.common.arrowClass = $scope.getArrowClass(tripgj.common.longerOrShorter[0]);
+ tripgj.common.arrowColor = DiaryHelper.arrowColor(tripgj.common.longerOrShorter[0]);
+ tripgj.common.arrowClass = DiaryHelper.getArrowClass(tripgj.common.longerOrShorter[0]);
- tripgj.common.earlierOrLater = $scope.getEarlierOrLater(tripgj.data.properties.start_ts, tripgj.data.id);
- tripgj.common.displayEarlierLater = $scope.parseEarlierOrLater(tripgj.common.earlierOrLater);
+ tripgj.common.earlierOrLater = DiaryHelper.getEarlierOrLater(tripgj.data.properties.start_ts, tripgj.data.id);
+ tripgj.common.displayEarlierLater = DiaryHelper.parseEarlierOrLater(tripgj.common.earlierOrLater);
}
- var isNotEmpty = function (obj) {
- for (var prop in obj) {
- if (obj.hasOwnProperty(prop))
- return true;
- }
- return false;
- };
-
$scope.explainDraft = function($event) {
$event.stopPropagation();
$ionicPopup.alert({
@@ -246,12 +210,24 @@ angular.module('emission.main.diary.list',['ui-leaflet',
DiaryHelper.directiveForTrip);
Timeline.setTripWrappers(currDayTripWrappers);
+ // Add "next" pointers to make it easier to use trip linkages for display
$scope.data.currDayTripWrappers.forEach(function(tripgj, tripIndex, array) {
- tripgj.userInput = {};
- ConfirmHelper.INPUTS.forEach(function(item, index) {
- $scope.populateInputFromTimeline(tripgj, array[tripIndex+1], item, $scope.data.unifiedConfirmsResults[item]);
- });
+ tripgj.nextTripgj = array[tripIndex+1];
+
+ // First populate basic classes so that we can use `isDraft` during
+ // the matching code
$scope.populateBasicClasses(tripgj);
+
+ // add additional data structures to make the trip gj similar to a
+ // trip object so that the unified populate code works
+ tripgj.start_ts = tripgj.data.properties.start_ts;
+ tripgj.end_ts = tripgj.data.properties.end_ts;
+ tripgj.inferred_labels = tripgj.data.properties.inferred_labels;
+ tripgj.user_input = tripgj.data.properties.user_input;
+ if (tripgj.user_input == undefined) {
+ console.log("while populating trips, user_input not found", tripgj.data.properties);
+ }
+ $scope.labelPopulateFactory.populateInputsAndInferences(tripgj, $scope.data.unifiedConfirmsResults);
$scope.populateCommonInfo(tripgj);
});
if ($rootScope.displayingIncident) {
@@ -327,51 +303,8 @@ angular.module('emission.main.diary.list',['ui-leaflet',
*/
$scope.refresh = function() {
- if ($ionicScrollDelegate.getScrollPosition().top < 20) {
readAndUpdateForDay(Timeline.data.currDay);
- $scope.$broadcast('invalidateSize');
- }
- };
-
- /* For UI control */
- $scope.groups = [];
- for (var i=0; i<10; i++) {
- $scope.groups[i] = {
- name: i,
- items: ["good1", "good2", "good3"]
- };
- for (var j=0; j<3; j++) {
- $scope.groups[i].items.push(i + '-' + j);
- }
- }
- $scope.toggleGroup = function(group) {
- if ($scope.isGroupShown(group)) {
- $scope.shownGroup = null;
- } else {
- $scope.shownGroup = group;
- }
};
- $scope.isGroupShown = function(group) {
- return $scope.shownGroup === group;
- };
- $scope.getEarlierOrLater = DiaryHelper.getEarlierOrLater;
- $scope.getLongerOrShorter = DiaryHelper.getLongerOrShorter;
- $scope.getHumanReadable = DiaryHelper.getHumanReadable;
- $scope.getKmph = DiaryHelper.getKmph;
- $scope.getPercentages = DiaryHelper.getPercentages;
- $scope.getFormattedDistance = DiaryHelper.getFormattedDistance;
- $scope.getSectionDetails = DiaryHelper.getSectionDetails;
- $scope.getFormattedTime = DiaryHelper.getFormattedTime;
- $scope.getFormattedTimeRange = DiaryHelper.getFormattedTimeRange;
- $scope.getFormattedDuration = DiaryHelper.getFormattedDuration;
- $scope.getTripDetails = DiaryHelper.getTripDetails;
- $scope.starColor = DiaryHelper.starColor;
- $scope.arrowColor = DiaryHelper.arrowColor;
- $scope.getArrowClass = DiaryHelper.getArrowClass;
- $scope.isCommon = DiaryHelper.isCommon;
- $scope.isDraft = DiaryHelper.isDraft;
- // $scope.expandEarlierOrLater = DiaryHelper.expandEarlierOrLater;
- // $scope.increaseRestElementsTranslate3d = DiaryHelper.increaseRestElementsTranslate3d;
$scope.makeCurrent = function() {
$ionicPopup.alert({
@@ -379,16 +312,6 @@ angular.module('emission.main.diary.list',['ui-leaflet',
});
}
- $scope.parseEarlierOrLater = DiaryHelper.parseEarlierOrLater;
-
- $scope.getTimeSplit = function(tripList) {
- var retVal = {};
- var tripTimes = tripList.map(function(dt) {
- return dt.data.properties.duration;
- });
-
- };
-
// Tour steps
var tour = {
config: {
@@ -423,10 +346,27 @@ angular.module('emission.main.diary.list',['ui-leaflet',
});
};
- $scope.refreshTiles = function() {
- $scope.$broadcast('invalidateSize');
+ $scope.increaseHeight = function () {
+ // let's increase by a small amount to workaround the issue with the
+ // card not resizing the first time
+ $scope.itemHt = $scope.itemHt + 5;
+ const oldDisplayTrips = $scope.data.currDayTripWrappers;
+ const TEN_MS = 10;
+ $scope.data.currDayTripWrappers = [];
+ $timeout(() => {
+ $scope.$apply(() => {
+ // make sure that the new item-height is calculated by resetting the list
+ // that we iterate over
+ $scope.data.currDayTripWrappers = oldDisplayTrips;
+ // make sure that the cards within the items are set to the new
+ // size. Apparently, `ng-style` is not recalulated although the
+ // variable has changed and the items have changed.
+ $(".list-card").css("height", $scope.itemHt + "px");
+ });
+ }, TEN_MS);
};
+
/*
* Checks if it is the first time the user has loaded the diary tab. If it is then
* show a walkthrough and store the info that the user has seen the tutorial.
@@ -466,121 +406,6 @@ angular.module('emission.main.diary.list',['ui-leaflet',
$scope.showModes = DiaryHelper.showModes;
- $scope.popovers = {};
- ConfirmHelper.INPUTS.forEach(function(item, index) {
- let popoverPath = 'templates/diary/'+item.toLowerCase()+'-popover.html';
- return $ionicPopover.fromTemplateUrl(popoverPath, {
- scope: $scope
- }).then(function (popover) {
- $scope.popovers[item] = popover;
- });
- });
-
- $scope.openPopover = function ($event, tripgj, inputType) {
- if (inputType === 'SURVEY') {
- return EnketoSurveyLaunch
- .launch($scope, 'TripConfirmSurvey', { trip: tripgj })
- .then(result => {
- if (!result) {
- return;
- }
- $scope.$apply(() => tripgj.userInput[inputType] = {text: result.label});
- });
- }
- var userInput = tripgj.userInput[inputType];
- if (angular.isDefined(userInput)) {
- $scope.selected[inputType].value = userInput.value;
- } else {
- $scope.selected[inputType].value = '';
- }
- $scope.draftInput = {
- "start_ts": tripgj.data.properties.start_ts,
- "end_ts": tripgj.data.properties.end_ts
- };
- $scope.editingTrip = tripgj;
- Logger.log("in openPopover, setting draftInput = " + JSON.stringify($scope.draftInput));
- $scope.popovers[inputType].show($event);
- };
-
- var closePopover = function (inputType) {
- $scope.selected[inputType] = {
- value: ''
- };
- $scope.popovers[inputType].hide();
- };
-
- /**
- * Store selected value for options
- * $scope.selected is for display only
- * the value is displayed on popover selected option
- */
- $scope.selected = {}
- ConfirmHelper.INPUTS.forEach(function(item, index) {
- $scope.selected[item] = {value: ''};
- });
- $scope.selected.other = {text: '', value: ''};
-
- /*
- * This is a curried function that curries the `$scope` variable
- * while returing a function that takes `e` as the input
- */
- var checkOtherOptionOnTap = function ($scope, inputType) {
- return function (e) {
- if (!$scope.selected.other.text) {
- e.preventDefault();
- } else {
- Logger.log("in choose other, other = " + JSON.stringify($scope.selected));
- $scope.store(inputType, $scope.selected.other, true /* isOther */);
- $scope.selected.other = '';
- return $scope.selected.other;
- }
- }
- };
-
- $scope.choose = function (inputType) {
- var isOther = false
- if ($scope.selected[inputType].value != "other") {
- $scope.store(inputType, $scope.selected[inputType], isOther);
- } else {
- isOther = true
- ConfirmHelper.checkOtherOption(inputType, checkOtherOptionOnTap, $scope);
- }
- closePopover(inputType);
- };
-
- $scope.$on('$ionicView.loaded', function() {
- $scope.inputParams = {}
- ConfirmHelper.INPUTS.forEach(function(item) {
- ConfirmHelper.getOptionsAndMaps(item).then(function(omObj) {
- $scope.inputParams[item] = omObj;
- });
- });
- });
-
- $scope.store = function (inputType, input, isOther) {
- if(isOther) {
- // Let's make the value for user entered inputs look consistent with our
- // other values
- input.value = ConfirmHelper.otherTextToValue(input.text);
- }
- $scope.draftInput.label = input.value;
- Logger.log("in storeInput, after setting input.value = " + input.value + ", draftInput = " + JSON.stringify($scope.draftInput));
- var tripToUpdate = $scope.editingTrip;
- $window.cordova.plugins.BEMUserCache.putMessage(ConfirmHelper.inputDetails[inputType].key, $scope.draftInput).then(function () {
- $scope.$apply(function() {
- if (isOther) {
- tripToUpdate.userInput[inputType] = ConfirmHelper.getFakeEntry(input.value);
- $scope.inputParams[inputType].options.push(tripToUpdate.userInput[inputType]);
- $scope.inputParams[inputType].value2entry[input.value] = tripToUpdate.userInput[inputType];
- } else {
- tripToUpdate.userInput[inputType] = $scope.inputParams[inputType].value2entry[input.value];
- }
- });
- });
- if (isOther == true)
- $scope.draftInput = angular.undefined;
- }
-
$scope.redirect = function(){
$state.go("root.main.current");
};
@@ -589,7 +414,7 @@ angular.module('emission.main.diary.list',['ui-leaflet',
$scope.checkTripState = function() {
window.cordova.plugins.BEMDataCollection.getState().then(function(result) {
Logger.log("Current trip state" + JSON.stringify(result));
- if(JSON.stringify(result) == "\"STATE_ONGOING_TRIP\"" ||
+ if(JSON.stringify(result) == "\"STATE_ONGOING_TRIP\"" ||
JSON.stringify(result) == "\"local.state.ongoing_trip\"") {
in_trip = true;
} else {
@@ -601,7 +426,7 @@ angular.module('emission.main.diary.list',['ui-leaflet',
// storing boolean to in_trip and return it in inTrip function
// work because ng-show is watching the inTrip function.
// Returning a promise to ng-show did not work.
- // Changing in_trip = bool value; in checkTripState function
+ // Changing in_trip = bool value; in checkTripState function
// to return bool value and using checkTripState function in ng-show
// did not work.
$scope.inTrip = function() {
@@ -611,10 +436,15 @@ angular.module('emission.main.diary.list',['ui-leaflet',
});
};
+ $scope.recomputeDisplayTrips = function() {
+ console.log("recomputing is a NOP on the diary since we always show all trips");
+ };
+
$ionicPlatform.ready().then(function() {
readAndUpdateForDay(moment().startOf('day'));
$scope.$on('$ionicView.enter', function(ev) {
+ $scope.startTime = moment().utc()
// Workaround from
// https://github.com/driftyco/ionic/issues/3433#issuecomment-195775629
if(ev.targetScope !== $scope)
@@ -622,7 +452,49 @@ angular.module('emission.main.diary.list',['ui-leaflet',
checkDiaryTutorialDone();
});
+ $scope.$on('$ionicView.leave',function() {
+ var timeOnPage = moment().utc() - $scope.startTime;
+ ClientStats.addReading(ClientStats.getStatKeys().DIARY_TIME, timeOnPage);
+ });
+
+ $ionicPlatform.on("pause", function() {
+ if ($state.$current == "root.main.diary.list") {
+ var timeOnPage = moment().utc() - $scope.startTime;
+ ClientStats.addReading(ClientStats.getStatKeys().DIARY_TIME, timeOnPage);
+ }
+ })
+
+ $ionicPlatform.on("resume", function() {
+ if ($state.$current == "root.main.diary.list") {
+ $scope.startTime = moment().utc()
+ }
+ })
+
$scope.$on('$ionicView.afterEnter', function() {
+ ClientStats.addEvent(ClientStats.getStatKeys().CHECKED_DIARY).then(function() {
+ console.log("Added "+ClientStats.getStatKeys().CHECKED_DIARY+" event");
+ });
+ /*
+ In case we have set the labels in the label screen, we want them to
+ show up when we come to this screen. It is really hard to do this
+ using the original code, because the unification is not complete, and
+ the code to read the manual inputs is completely different.
+ Instead, let's find the corresponding trip from the label view and
+ copy over the `userInput` (and potentially the `user_input`) values over
+ $scope.$apply(() => {
+ if ($scope.data && $scope.data.currDayTripWrappers) {
+ $scope.data.currDayTripWrappers.forEach(function(tripgj, tripIndex, array) {
+ let tripFromLabel = Timeline.getConfirmedTrip(tripgj.data.id);
+ // Should we just copy over the entry from the label screen
+ // NO, what if the user changed the labels here, then went to
+ // the profile and came back. Don't want to lose the upgraded entries
+ $scope.labelPopulateFactory.copyInputIfNewer(tripFromLabel, tripgj);
+ });
+ } else {
+ console.log("No trips loaded yet, no inputs to copy over");
+ }
+ });
+ */
if($rootScope.barDetail){
readAndUpdateForDay($rootScope.barDetailDate);
$rootScope.barDetail = false;
diff --git a/www/js/diary/services.js b/www/js/diary/services.js
index 62501aa0d..05a3b39bd 100644
--- a/www/js/diary/services.js
+++ b/www/js/diary/services.js
@@ -2,7 +2,7 @@
angular.module('emission.main.diary.services', ['emission.plugin.logger',
'emission.services', 'emission.main.common.services',
- 'emission.incident.posttrip.manual', 'emission.tripconfirm.services', 'emission.enketo-survey.answer'])
+ 'emission.incident.posttrip.manual', 'emission.survey.multilabel.services', 'emission.enketo-survey.answer'])
.factory('DiaryHelper', function(CommonGraph, PostTripManualMarker, $translate){
var dh = {};
// dh.expandEarlierOrLater = function(id) {
@@ -144,29 +144,6 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
return background;
}
- dh.getKmph = function(section) {
- var metersPerSec = section.properties.distance / section.properties.duration;
- return (metersPerSec * 3.6).toFixed(2);
- };
- dh.getFormattedDistance = function(dist_in_meters) {
- if (dist_in_meters > 1000) {
- return (dist_in_meters/1000).toFixed(0);
- } else {
- return (dist_in_meters/1000).toFixed(3);
- }
- }
- dh.getSectionDetails = function(section) {
- var startMoment = moment(section.properties.start_ts * 1000);
- var endMoment = moment(section.properties.end_ts * 1000);
- var retVal = [startMoment.format('LT'),
- endMoment.format('LT'),
- endMoment.to(startMoment, true),
- formatDistance(section.properties.distance),
- tokmph(section.properties.distance, section.properties.duration).toFixed(2),
- dh.getHumanReadable(section.properties.sensed_mode)];
- return retVal;
- };
-
dh.getLocalTimeString = function (dt) {
//correcting the date of the processed trips knowing that local_dt months are from 1 -> 12 and for the moment function they need to be between 0 -> 11
let mdt = angular.copy(dt)
@@ -405,7 +382,7 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
" " + ui.data.label + " logged at "+ ui.metadata.write_ts;
}
- dh.getUserInputForTrip = function(tripgj, nextTripgj, userInputList) {
+ dh.getUserInputForTrip = function(trip, nextTrip, userInputList) {
// If there is only one item in the list, return it.
// This make it compatible when fake list is given (for Enketo Survey).
// As well as optimize the performance.
@@ -415,18 +392,18 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
if (userInputList.length < 20) {
console.log("Input list = "+userInputList.map(printUserInput));
}
- var tripProp = tripgj.data.properties;
- var isDraft = dh.isDraft(tripgj);
+ // undefined != true, so this covers the label view case as well
+ var isDraft = trip.isDraft == true;
var potentialCandidates = userInputList.filter(function(userInput) {
/*
console.log("startDelta "+userInput.data.label+
"= user("+fmtTs(userInput.data.start_ts, userInput.metadata.time_zone)+
") - trip("+fmtTs(userInput.data.start_ts, userInput.metadata.time_zone)+") = "+
- (userInput.data.start_ts - tripProp.start_ts)+" should be positive");
+ (userInput.data.start_ts - trip.start_ts)+" should be positive");
console.log("endDelta = "+userInput.data.label+
"user("+fmtTs(userInput.data.end_ts, userInput.metadata.time_zone)+
- ") - trip("+fmtTs(tripProp.end_ts, userInput.metadata.time_zone)+") = "+
- (userInput.data.end_ts - tripProp.end_ts)+" should be negative");
+ ") - trip("+fmtTs(trip.end_ts, userInput.metadata.time_zone)+") = "+
+ (userInput.data.end_ts - trip.end_ts)+" should be negative");
*/
// logic described in
// https://github.com/e-mission/e-mission-docs/issues/423
@@ -434,19 +411,19 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
if (userInputList.length < 20) {
var logStr = "Draft trip: comparing user = "+fmtTs(userInput.data.start_ts, userInput.metadata.time_zone)
+" -> "+fmtTs(userInput.data.end_ts, userInput.metadata.time_zone)
- +" trip = "+fmtTs(tripProp.start_ts, userInput.metadata.time_zone)
- +" -> "+fmtTs(tripProp.end_ts, userInput.metadata.time_zone)
- +" checks are ("+(userInput.data.start_ts >= tripProp.start_ts)
- +" && "+(userInput.data.start_ts <= tripProp.end_ts)
- +" || "+(-(userInput.data.start_ts - tripProp.start_ts) <= 15 * 60)
- +") && "+(userInput.data.end_ts <= tripProp.end_ts);
+ +" trip = "+fmtTs(trip.start_ts, userInput.metadata.time_zone)
+ +" -> "+fmtTs(trip.end_ts, userInput.metadata.time_zone)
+ +" checks are ("+(userInput.data.start_ts >= trip.start_ts)
+ +" && "+(userInput.data.start_ts <= trip.end_ts)
+ +" || "+(-(userInput.data.start_ts - trip.start_ts) <= 15 * 60)
+ +") && "+(userInput.data.end_ts <= trip.end_ts);
console.log(logStr);
// Logger.log(logStr);
}
- return (userInput.data.start_ts >= tripProp.start_ts
- && userInput.data.start_ts <= tripProp.end_ts
- || -(userInput.data.start_ts - tripProp.start_ts) <= 15 * 60)
- && userInput.data.end_ts <= tripProp.end_ts;
+ return (userInput.data.start_ts >= trip.start_ts
+ && userInput.data.start_ts <= trip.end_ts
+ || -(userInput.data.start_ts - trip.start_ts) <= 15 * 60)
+ && userInput.data.end_ts <= trip.end_ts;
} else {
// we know that the trip is cleaned so we can use the fmt_time
// but the confirm objects are not necessarily filled out
@@ -454,23 +431,23 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
var logStr = "Cleaned trip: comparing user = "
+fmtTs(userInput.data.start_ts, userInput.metadata.time_zone)
+" -> "+fmtTs(userInput.data.end_ts, userInput.metadata.time_zone)
- +" trip = "+tripProp.start_fmt_time
- +" -> "+tripProp.end_fmt_time
- +" start checks are "+(userInput.data.start_ts >= tripProp.start_ts)
- +" && "+(userInput.data.start_ts <= tripProp.end_ts)
- +" end checks are "+(userInput.data.end_ts <= tripProp.end_ts)
- +" || "+((userInput.data.end_ts - tripProp.end_ts) <= 15 * 60)+")";
+ +" trip = "+trip.start_fmt_time
+ +" -> "+trip.end_fmt_time
+ +" start checks are "+(userInput.data.start_ts >= trip.start_ts)
+ +" && "+(userInput.data.start_ts <= trip.end_ts)
+ +" end checks are "+(userInput.data.end_ts <= trip.end_ts)
+ +" || "+((userInput.data.end_ts - trip.end_ts) <= 15 * 60)+")";
Logger.log(logStr);
}
// https://github.com/e-mission/e-mission-docs/issues/476#issuecomment-747222181
- const startChecks = userInput.data.start_ts >= tripProp.start_ts &&
- userInput.data.start_ts <= tripProp.end_ts;
- var endChecks = (userInput.data.end_ts <= tripProp.end_ts ||
- (userInput.data.end_ts - tripProp.end_ts) <= 15 * 60);
+ const startChecks = userInput.data.start_ts >= trip.start_ts &&
+ userInput.data.start_ts <= trip.end_ts;
+ var endChecks = (userInput.data.end_ts <= trip.end_ts ||
+ (userInput.data.end_ts - trip.end_ts) <= 15 * 60);
if (startChecks && !endChecks) {
- if (angular.isDefined(nextTripgj)) {
- endChecks = userInput.data.end_ts <= nextTripgj.data.properties.start_ts;
- Logger.log("Second level of end checks when the next trip is defined("+userInput.data.end_ts+" <= "+ nextTripgj.data.properties.start_ts+") = "+endChecks);
+ if (angular.isDefined(nextTrip)) {
+ endChecks = userInput.data.end_ts <= nextTrip.start_ts;
+ Logger.log("Second level of end checks when the next trip is defined("+userInput.data.end_ts+" <= "+ nextTrip.start_ts+") = "+endChecks);
} else {
// next trip is not defined, last trip
endChecks = (userInput.data.end_local_dt.day == userInput.data.start_local_dt.day)
@@ -480,10 +457,10 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
if (endChecks) {
// If we have flipped the values, check to see that there
// is sufficient overlap
- const overlapDuration = Math.min(userInput.data.end_ts, tripProp.end_ts) - Math.max(userInput.data.start_ts, tripProp.start_ts)
+ const overlapDuration = Math.min(userInput.data.end_ts, trip.end_ts) - Math.max(userInput.data.start_ts, trip.start_ts)
Logger.log("Flipped endCheck, overlap("+overlapDuration+
- ")/trip("+tripProp.duration+") = "+ (overlapDuration / tripProp.duration));
- endChecks = (overlapDuration/tripProp.duration) > 0.5;
+ ")/trip("+trip.duration+") = "+ (overlapDuration / trip.duration));
+ endChecks = (overlapDuration/trip.duration) > 0.5;
}
}
return startChecks && endChecks;
@@ -566,7 +543,11 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
return Promise.all(readPromises)
.then(([ctList]) => {
$ionicLoading.hide();
- return ctList.phone_data.map((ct) => ct.data);
+ return ctList.phone_data.map((ct) => {
+ const retVal = ct.data;
+ retVal.id = ct._id["$oid"];
+ return retVal;
+ });
})
.catch((err) => {
Logger.displayError("while reading confirmed trips", err);
@@ -639,7 +620,7 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
+" end of current day = "
+eod+"("+moment.unix(eod).toString()+")"
+" retVal = "+retVal);
- return retVal;
+ return [result.complete_ts, retVal];
});
}
@@ -846,6 +827,10 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
start_local_dt: moment2localdate(startMoment),
start_ts: startPoint.data.ts,
times: times,
+ inferred_labels: [],
+ expectation: 0,
+ confidence_threshold: 0,
+ user_input: {},
trip_id: {$oid: tripAndSectionId}
}
}
@@ -885,6 +870,9 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
}
timeline.confirmedTrip2Geojson = function(trip) {
+ if (trip == undefined) {
+ return Promise.resolve(undefined);
+ }
Logger.log("About to pull location data for range "
+ moment.unix(trip.start_ts).toString() + " -> "
+ moment.unix(trip.end_ts).toString());
@@ -968,6 +956,10 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
id: section_gj.features[0].id,
type: "FeatureCollection",
features: features,
+ inferred_labels: [],
+ expectation: 0,
+ confidence_threshold: 0,
+ user_input: {},
properties: angular.copy(section_gj.features[0].properties)
}
@@ -1111,41 +1103,22 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
var localCacheReadFn = timeline.updateFromDatabase;
- // Functions
- timeline.updateForDay = function(day) { // currDay is a moment
- // First, we try the server
- var tripsFromServerPromise = timeline.updateFromServer(day);
- var isProcessingCompletePromise = timeline.isProcessingComplete(day);
-
- // Also mode/purpose and (currently disabled) survey answers
- var tq = $window.cordova.plugins.BEMUserCache.getAllTimeQuery();
- var manualPromises = ConfirmHelper.INPUTS.map(function(inp) {
- var key = ConfirmHelper.inputDetails[inp].key;
- return UnifiedDataLoader.getUnifiedMessagesForInterval(key, tq).then(function(results) {
- switch(key) {
- // Post-process survey answers
- case 'manual/survey_response':
- return EnketoSurveyAnswer.filterByNameAndVersion('TripConfirmSurvey', results);
- default:
- return results;
- }
- });
- });
-
- // Deal with all the trip retrieval
- Promise.all([tripsFromServerPromise, isProcessingCompletePromise].concat(manualPromises))
- .then(function([processedTripList, completeStatus, ...manualResults]) {
- console.log("Promise.all() finished successfully with length "
- +processedTripList.length+" completeStatus = "+completeStatus);
- var mrString = 'with ' + manualResults.map(function(item, index) {
- return ` ${mr.length} ${ConfirmHelper.INPUTS[index]}`;
- });
+ var processManualInputs = function(manualResults) {
+ var mrString = 'unprocessed manual inputs '
+ + manualResults.map(function(item, index) {
+ return ` ${item.length} ${ConfirmHelper.INPUTS[index]}`;
+ });
console.log(mrString);
- var tripList = processedTripList;
timeline.data.unifiedConfirmsResults = {}
manualResults.forEach(function(mr, index) {
+ if (ConfirmHelper.INPUTS[index].key == "manual/survey_response") {
+ }
timeline.data.unifiedConfirmsResults[ConfirmHelper.INPUTS[index]] = mr;
});
+ }
+
+ var addUnprocessedTrips = function(processedTripList, day, completeStatus) {
+ var tripList = processedTripList;
if (!completeStatus) {
return timeline.readUnprocessedTrips(day, processedTripList)
.then(function(unprocessedTripList) {
@@ -1158,54 +1131,81 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
} else {
return tripList;
}
- }).then(function(combinedTripList) {
- processOrDisplayNone(day, combinedTripList);
- }).catch(function(error) {
- // If there is any error reading from the server, we fallback on the local cache
- Logger.log("while reading data from server for "+day +" error = "+JSON.stringify(error));
- console.log("About to hide loading overlay");
- $ionicLoading.hide();
-
- var tripsFromCachePromise = localCacheReadFn(day);
+ }
- // Also mode/purpose and (currently disabled) survey answers
- var tq = $window.cordova.plugins.BEMUserCache.getAllTimeQuery();
- var manualPromises = ConfirmHelper.INPUTS.map(function(inp) {
- return UnifiedDataLoader.getUnifiedMessagesForInterval(
- ConfirmHelper.inputDetails[inp].key, tq);
+ var readTripsAndUnprocessedInputs = function(day, tripReadFn, completeStatus, tq) {
+ var manualPromises = ConfirmHelper.INPUTS.map(function(inp) {
+ return UnifiedDataLoader.getUnifiedMessagesForInterval(
+ ConfirmHelper.inputDetails[inp].key, tq).then(function(results) {
+ switch(ConfirmHelper.inputDetails[inp].key) {
+ // Post-process survey answers
+ case 'manual/survey_response':
+ return EnketoSurveyAnswer.filterByNameAndVersion('TripConfirmSurvey', results);
+ default:
+ return results;
+ }
});
- Promise.all([tripsFromCachePromise].concat(manualPromises)).then(function(
- [processedTripList, ...manualResults]) {
- console.log(' in local cache, found ${modes.length} modes, ${purposes.length} purposes');
- var tripList = processedTripList;
- timeline.data.unifiedConfirmsResults = {}
- manualResults.forEach(function(mr, index) {
- timeline.data.unifiedConfirmsResults[ConfirmHelper.INPUTS[index]] = mr;
- });
- return timeline.readUnprocessedTrips(day, processedTripList)
- .then(function(unprocessedTripList) {
- Logger.log("tripList.length = "+tripList.length
- +"unprocessedTripList.length = "+unprocessedTripList.length);
- Array.prototype.push.apply(tripList, unprocessedTripList);
- console.log("After merge, returning trip list of size "+tripList.length);
- return tripList;
- })
- }).then(function(combinedTripList) {
- processOrDisplayNone(day, combinedTripList);
- }).catch(function(error) {
- console.log("About to hide loading overlay");
- $ionicLoading.hide();
- Logger.displayError("while reading data from cache for "+day, error);
- })
});
+ let tripsReadPromise = tripReadFn(day);
+ // var surveyAnswersPromise = EnketoSurvey.getAllSurveyAnswers("manual/confirm_survey", { populateLabels: true });
+ let allManualPromise = Promise.all(manualPromises).then(processManualInputs);
+
+ let allTripsPromise = tripsReadPromise.then((processedTripList) => {
+ console.log("Reading trips from server finished successfully with length "
+ +processedTripList.length+" completeStatus = "+completeStatus);
+ return addUnprocessedTrips(processedTripList, day, completeStatus);
+ }).then((combinedTripList) => processOrDisplayNone(day, combinedTripList));
+ return Promise.all([allManualPromise, allTripsPromise]).then(() => {
+ console.log("Finished reading processed/unprocessed trips with length "
+ +timeline.data.currDayTrips.length);
+ });
+ }
+
+ // Functions
+ timeline.updateForDay = function(day) { // currDay is a moment
+ // First, we try the server
+ var isProcessingCompletePromise = timeline.isProcessingComplete(day);
+
+ // First get the pipeline complete timestamp
+ isProcessingCompletePromise.then(([completeTs, completeStatus]) => {
+ // then, in parallel, read unprocessed user inputs
+ // and trips
+ // Also mode/purpose and (currently disabled) survey answers
+ var pendingTq = {
+ key: "write_ts",
+ startTs: completeTs,
+ endTs: moment().unix()
+ };
+ readTripsAndUnprocessedInputs(day, timeline.updateFromServer,
+ completeStatus, pendingTq)
+ .catch(function(error) {
+ // If there is any error reading from the server, we fallback on the local cache
+ Logger.log("while reading data from server for "+day +" error = "+JSON.stringify(error));
+ console.log("About to hide loading overlay");
+ $ionicLoading.hide();
+
+ // Also mode/purpose and (currently disabled) survey answers
+ let allTq = $window.cordova.plugins.BEMUserCache.getAllTimeQuery();
+ readTripsAndUnprocessedInputs(day, localCacheReadFn, undefined, allTq)
+ .catch(function(error) {
+ console.log("About to hide loading overlay");
+ $ionicLoading.hide();
+ Logger.displayError("while reading data from cache for "+day, error);
+ })
+ });
+ });
}
timeline.getTrip = function(tripId) {
- return timeline.data.tripMap[tripId];
+ return angular.isDefined(timeline.data.tripMap)? timeline.data.tripMap[tripId] : undefined;
};
timeline.getTripWrapper = function(tripId) {
- return timeline.data.tripWrapperMap[tripId];
+ return angular.isDefined(timeline.data.tripWrapperMap)? timeline.data.tripWrapperMap[tripId] : undefined;
+ };
+
+ timeline.getConfirmedTrip = function(tripId) {
+ return angular.isDefined(timeline.data.infScrollConfirmedTripMap)? timeline.data.infScrollConfirmedTripMap[tripId] : undefined;
};
/*
@@ -1289,6 +1289,16 @@ angular.module('emission.main.diary.services', ['emission.plugin.logger',
});
}
+ timeline.setInfScrollConfirmedTripList = function(confirmedTripList) {
+ timeline.data.infScrollConfirmedTripList = confirmedTripList;
+
+ timeline.data.infScrollConfirmedTripMap = {};
+
+ timeline.data.infScrollConfirmedTripList.forEach(function(trip, index, array) {
+ timeline.data.infScrollConfirmedTripMap[trip.id] = trip;
+ });
+ }
+
// TODO: Should this be in the factory or in the scope?
var generateDaySummary = function() {
var dayMovingTime = 0;
diff --git a/www/js/goals.js b/www/js/goals.js
index 9bed3b80b..8261b2fc0 100644
--- a/www/js/goals.js
+++ b/www/js/goals.js
@@ -2,7 +2,7 @@
angular.module('emission.main.goals',['emission.services', 'emission.plugin.logger',
'emission.plugin.kvstore',
- 'emission.survey.launch',
+ 'emission.survey.external.launch',
'ngSanitize', 'ngAnimate',
'emission.splash.referral',
'ng-walkthrough', 'nzTour'])
diff --git a/www/js/intro.js b/www/js/intro.js
index 79d192986..4f961e2b6 100644
--- a/www/js/intro.js
+++ b/www/js/intro.js
@@ -2,7 +2,8 @@
angular.module('emission.intro', ['emission.splash.startprefs',
'emission.splash.updatecheck',
- 'emission.survey.launch',
+ 'emission.survey.external.launch',
+ 'emission.appstatus.permissioncheck',
'emission.i18n.utils',
'ionic-toast'])
@@ -23,42 +24,7 @@ angular.module('emission.intro', ['emission.splash.startprefs',
.controller('IntroCtrl', function($scope, $rootScope, $http, $state, $window,
$ionicPlatform, $ionicSlideBoxDelegate,
- $ionicPopup, $ionicHistory, ionicToast, $timeout, CommHelper, StartPrefs, SurveyLaunch, UpdateCheck, $translate, i18nUtils) {
-
- $scope.setupPermissionText = function() {
- $scope.platform = $window.device.platform;
- $scope.osver = $window.device.version.split(".")[0];
- if($scope.platform.toLowerCase() == "android") {
- if($scope.osver < 6) {
- $scope.locationPermExplanation = $translate.instant('intro.permissions.locationPermExplanation-android-lt-6');
- } else if ($scope.osver < 10) {
- $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-6-9");
- } else if ($scope.osver < 11) {
- $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-10");
- } else {
- $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-gte-11");
- }
- }
-
- if($scope.platform.toLowerCase() == "ios") {
- if($scope.osver < 13) {
- $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-ios-lt-13");
- } else {
- $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-ios-gte-13");
- }
- }
-
- $scope.backgroundRestricted = false;
- if($window.device.manufacturer.toLowerCase() == "samsung") {
- $scope.backgroundRestricted = true;
- $scope.allowBackgroundInstructions = $translate.instant("intro.allow_background.samsung");
- }
-
- $scope.fitnessPermNeeded = ($scope.platform.toLowerCase() == "ios" ||
- (($scope.platform.toLowerCase() == "android") && ($scope.osver >= 10)));
-
- console.log("Explanation = "+$scope.locationPermExplanation);
- }
+ $ionicPopup, $ionicHistory, ionicToast, $timeout, CommHelper, StartPrefs, SurveyLaunch, UpdateCheck, i18nUtils) {
var allIntroFiles = Promise.all([
i18nUtils.geti18nFileName("templates/", "intro/summary", ".html"),
@@ -100,6 +66,8 @@ angular.module('emission.intro', ['emission.splash.startprefs',
});
};
+ $scope.overallStatus = false;
+
$scope.disagree = function() {
$state.go('root.main.heatmap');
};
@@ -224,7 +192,7 @@ angular.module('emission.intro', ['emission.splash.startprefs',
}
$ionicPlatform.ready().then(function() {
- $scope.setupPermissionText();
+ console.log("app is launched, currently NOP");
});
});
diff --git a/www/js/main.js b/www/js/main.js
index c32526973..1c986b22d 100644
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -7,7 +7,7 @@ angular.module('emission.main', ['emission.main.recent',
'emission.main.common',
'emission.main.heatmap',
'emission.main.metrics',
- 'emission.tripconfirm.posttrip.map',
+ 'emission.survey.multilabel.posttrip.map',
'emission.services',
'emission.services.upload'])
@@ -54,6 +54,9 @@ angular.module('emission.main', ['emission.main.recent',
.state('root.main.control', {
url: '/control',
+ params: {
+ launchAppStatusModal: false
+ },
views: {
'main-control': {
templateUrl: 'templates/control/main-control.html',
diff --git a/www/js/metrics-factory.js b/www/js/metrics-factory.js
index f0207c834..c762da72f 100644
--- a/www/js/metrics-factory.js
+++ b/www/js/metrics-factory.js
@@ -1,18 +1,35 @@
'use strict';
-angular.module('emission.main.metrics.factory', ['emission.services', 'emission.plugin.kvstore'])
+angular.module('emission.main.metrics.factory',
+ ['emission.main.metrics.mappings',
+ 'emission.plugin.kvstore'])
-.factory('FootprintHelper', function(CarbonDatasetHelper) {
+.factory('FootprintHelper', function(CarbonDatasetHelper, CustomDatasetHelper) {
var fh = {};
+ var highestFootprint = 0;
+
var mtokm = function(v) {
return v / 1000;
}
+ fh.useCustom = false;
+
+ fh.setUseCustomFootprint = function () {
+ fh.useCustom = true;
+ }
+
+ fh.getFootprint = function() {
+ if (this.useCustom == true) {
+ return CustomDatasetHelper.getCustomFootprint();
+ } else {
+ return CarbonDatasetHelper.getCurrentCarbonDatasetFootprint();
+ }
+ }
fh.readableFormat = function(v) {
return v > 999? Math.round(v / 1000) + 'k kg CO₂' : Math.round(v) + ' kg CO₂';
}
- fh.getFootprintForMetrics = function(userMetrics) {
- var footprint = CarbonDatasetHelper.getCurrentCarbonDatasetFootprint();
+ fh.getFootprintForMetrics = function(userMetrics, defaultIfMissing=0) {
+ var footprint = fh.getFootprint();
var result = 0;
for (var i in userMetrics) {
var mode = userMetrics[i].key;
@@ -27,12 +44,13 @@ angular.module('emission.main.metrics.factory', ['emission.services', 'emission.
}
else {
console.warn('WARNING FootprintHelper.getFootprintFromMetrics() was requested for an unknown mode: ' + mode + " metrics JSON: " + JSON.stringify(userMetrics));
+ result += defaultIfMissing * mtokm(userMetrics[i].values);
}
}
return result;
}
fh.getLowestFootprintForDistance = function(distance) {
- var footprint = CarbonDatasetHelper.getCurrentCarbonDatasetFootprint();
+ var footprint = fh.getFootprint();
var lowestFootprint = Number.MAX_SAFE_INTEGER;
for (var mode in footprint) {
if (mode == 'WALKING' || mode == 'BICYCLING') {
@@ -44,21 +62,103 @@ angular.module('emission.main.metrics.factory', ['emission.services', 'emission.
}
return lowestFootprint * mtokm(distance);
}
+
+ fh.getHighestFootprint = function() {
+ if (!highestFootprint) {
+ var footprint = fh.getFootprint();
+ let footprintList = [];
+ for (var mode in footprint) {
+ footprintList.push(footprint[mode]);
+ }
+ highestFootprint = Math.max(...footprintList);
+ }
+ return highestFootprint;
+ }
+
fh.getHighestFootprintForDistance = function(distance) {
- var footprint = CarbonDatasetHelper.getCurrentCarbonDatasetFootprint();
- var highestFootprint = 0;
+ return fh.getHighestFootprint() * mtokm(distance);
+ }
+
+ var getLowestMotorizedNonAirFootprint = function(footprint, rlmCO2) {
+ var lowestFootprint = Number.MAX_SAFE_INTEGER;
for (var mode in footprint) {
- highestFootprint = Math.max(highestFootprint, footprint[mode]);
+ if (mode == 'AIR_OR_HSR' || mode == 'air') {
+ console.log("Air mode, ignoring");
+ }
+ else {
+ if (footprint[mode] == 0 || footprint[mode] <= rlmCO2) {
+ console.log("Non motorized mode or footprint <= range_limited_motorized", mode, footprint[mode], rlmCO2);
+ } else {
+ lowestFootprint = Math.min(lowestFootprint, footprint[mode]);
+ }
+ }
}
- return highestFootprint * mtokm(distance);
+ return lowestFootprint;
}
+
+ fh.getOptimalDistanceRanges = function() {
+ const FIVE_KM = 5 * 1000;
+ const SIX_HUNDRED_KM = 600 * 1000;
+ if (!fh.useCustom) {
+ const defaultFootprint = CarbonDatasetHelper.getCurrentCarbonDatasetFootprint();
+ const lowestMotorizedNonAir = getLowestMotorizedNonAirFootprint(defaultFootprint);
+ const airFootprint = defaultFootprint["AIR_OR_HSR"];
+ return [
+ {low: 0, high: FIVE_KM, optimal: 0},
+ {low: FIVE_KM, high: SIX_HUNDRED_KM, optimal: lowestMotorizedNonAir},
+ {low: SIX_HUNDRED_KM, high: Number.MAX_VALUE, optimal: airFootprint}];
+ } else {
+ // custom footprint, let's get the custom values
+ const customFootprint = CustomDatasetHelper.getCustomFootprint();
+ let airFootprint = customFootprint["air"]
+ if (!airFootprint) {
+ // 2341 BTU/PMT from
+ // https://tedb.ornl.gov/wp-content/uploads/2021/02/TEDB_Ed_39.pdf#page=68
+ // 159.25 lb per million BTU from EIA
+ // https://www.eia.gov/environment/emissions/co2_vol_mass.php
+ // (2341 * (159.25/1000000))/(1.6*2.2) = 0.09975, rounded up a bit
+ console.log("No entry for air in ", customFootprint," using default");
+ airFootprint = 0.1;
+ }
+ const rlm = CustomDatasetHelper.range_limited_motorized;
+ if (!rlm) {
+ return [
+ {low: 0, high: FIVE_KM, optimal: 0},
+ {low: FIVE_KM, high: SIX_HUNDRED_KM, optimal: lowestMotorizedNonAir},
+ {low: SIX_HUNDRED_KM, high: Number.MAX_VALUE, optimal: airFootprint}];
+ } else {
+ console.log("Found range_limited_motorized mode", rlm);
+ const lowestMotorizedNonAir = getLowestMotorizedNonAirFootprint(customFootprint, rlm.co2PerMeter);
+ return [
+ {low: 0, high: FIVE_KM, optimal: 0},
+ {low: FIVE_KM, high: rlm.range_limit_km * 1000, optimal: rlm.co2PerMeter},
+ {low: rlm.range_limit_km * 1000, high: SIX_HUNDRED_KM, optimal: lowestMotorizedNonAir},
+ {low: SIX_HUNDRED_KM, high: Number.MAX_VALUE, optimal: airFootprint}];
+ }
+ }
+ }
+
return fh;
})
-.factory('CalorieCal', function(KVStore){
+.factory('CalorieCal', function(KVStore, METDatasetHelper, CustomDatasetHelper) {
var cc = {};
+ var highestMET = 0;
var USER_DATA_KEY = "user-data";
+ cc.useCustom = false;
+
+ cc.setUseCustomFootprint = function () {
+ cc.useCustom = true;
+ }
+
+ cc.getMETs = function() {
+ if (this.useCustom == true) {
+ return CustomDatasetHelper.getCustomMETs();
+ } else {
+ return METDatasetHelper.getStandardMETs();
+ }
+ }
cc.set = function(info) {
return KVStore.set(USER_DATA_KEY, info);
@@ -72,18 +172,33 @@ angular.module('emission.main.metrics.factory', ['emission.services', 'emission.
Number.prototype.between = function (min, max) {
return this >= min && this <= max;
};
- cc.getMet = function(mode, speed) {
+ cc.getHighestMET = function() {
+ if (!highestMET) {
+ var met = cc.getMETs();
+ let metList = [];
+ for (var mode in met) {
+ var rangeList = met[mode];
+ for (var range in rangeList) {
+ metList.push(rangeList[range].mets);
+ }
+ }
+ highestMET = Math.max(...metList);
+ }
+ return highestMET;
+ }
+ cc.getMet = function(mode, speed, defaultIfMissing) {
if (mode == 'ON_FOOT') {
console.log("CalorieCal.getMet() converted 'ON_FOOT' to 'WALKING'");
mode = 'WALKING';
}
- if (!standardMETs[mode]) {
- console.log("CalorieCal.getMet() Illegal mode: " + mode);
- return 0; //So the calorie sum does not break with wrong return type
+ let currentMETs = cc.getMETs();
+ if (!currentMETs[mode]) {
+ console.warn("CalorieCal.getMet() Illegal mode: " + mode);
+ return defaultIfMissing; //So the calorie sum does not break with wrong return type
}
- for (var i in standardMETs[mode]) {
- if (mpstomph(speed).between(standardMETs[mode][i].range[0], standardMETs[mode][i].range[1])) {
- return standardMETs[mode][i].mets;
+ for (var i in currentMETs[mode]) {
+ if (mpstomph(speed).between(currentMETs[mode][i].range[0], currentMETs[mode][i].range[1])) {
+ return currentMETs[mode][i].mets;
} else if (mpstomph(speed) < 0 ) {
console.log("CalorieCal.getMet() Negative speed: " + mpstomph(speed));
return 0;
@@ -116,128 +231,5 @@ angular.module('emission.main.metrics.factory', ['emission.services', 'emission.
cc.getCalories = function(weightInKg, durationInMin, met) {
return weightInKg * durationInMin * met;
}
- var standardMETs = {
- "WALKING": {
- "VERY_SLOW": {
- range: [0, 2.0],
- mets: 2.0
- },
- "SLOW": {
- range: [2.0, 2.5],
- mets: 2.8
- },
- "MODERATE_0": {
- range: [2.5, 2.8],
- mets: 3.0
- },
- "MODERATE_1": {
- range: [2.8, 3.2],
- mets: 3.5
- },
- "FAST": {
- range: [3.2, 3.5],
- mets: 4.3
- },
- "VERY_FAST_0": {
- range: [3.5, 4.0],
- mets: 5.0
- },
- "VERY_FAST_!": {
- range: [4.0, 4.5],
- mets: 6.0
- },
- "VERY_VERY_FAST": {
- range: [4.5, 5],
- mets: 7.0
- },
- "SUPER_FAST": {
- range: [5, 6],
- mets: 8.3
- },
- "RUNNING": {
- range: [6, Number.MAX_VALUE],
- mets: 9.8
- }
- },
- "BICYCLING": {
- "VERY_VERY_SLOW": {
- range: [0, 5.5],
- mets: 3.5
- },
- "VERY_SLOW": {
- range: [5.5, 10],
- mets: 5.8
- },
- "SLOW": {
- range: [10, 12],
- mets: 6.8
- },
- "MODERATE": {
- range: [12, 14],
- mets: 8.0
- },
- "FAST": {
- range: [14, 16],
- mets: 10.0
- },
- "VERT_FAST": {
- range: [16, 19],
- mets: 12.0
- },
- "RACING": {
- range: [20, Number.MAX_VALUE],
- mets: 15.8
- }
- },
- "IN_VEHICLE": {
- "ALL": {
- range: [0, Number.MAX_VALUE],
- mets: 0
- }
- },
- "CAR": {
- "ALL": {
- range: [0, Number.MAX_VALUE],
- mets: 0
- }
- },
- "BUS": {
- "ALL": {
- range: [0, Number.MAX_VALUE],
- mets: 0
- }
- },
- "LIGHT_RAIL": {
- "ALL": {
- range: [0, Number.MAX_VALUE],
- mets: 0
- }
- },
- "TRAIN": {
- "ALL": {
- range: [0, Number.MAX_VALUE],
- mets: 0
- }
- },
- "TRAM": {
- "ALL": {
- range: [0, Number.MAX_VALUE],
- mets: 0
- }
- },
- "SUBWAY": {
- "ALL": {
- range: [0, Number.MAX_VALUE],
- mets: 0
- }
- },
- "AIR_OR_HSR": {
- "ALL": {
- range: [0, Number.MAX_VALUE],
- mets: 0
- }
- }
- }
return cc;
-
});
diff --git a/www/js/metrics-mappings.js b/www/js/metrics-mappings.js
new file mode 100644
index 000000000..776d63ffa
--- /dev/null
+++ b/www/js/metrics-mappings.js
@@ -0,0 +1,385 @@
+angular.module('emission.main.metrics.mappings', ['emission.plugin.logger',
+ 'emission.survey.multilabel.services',
+ 'emission.plugin.kvstore'])
+
+.service('CarbonDatasetHelper', function(KVStore) {
+ var CARBON_DATASET_KEY = 'carbon_dataset_locale';
+
+ // Values are in Kg/PKm (kilograms per passenger-kilometer)
+ // Sources for EU values:
+ // - Tremod: 2017, CO2, CH4 and N2O in CO2-equivalent
+ // - HBEFA: 2020, CO2 (per country)
+ // German data uses Tremod. Other EU countries (and Switzerland) use HBEFA for car and bus,
+ // and Tremod for train and air (because HBEFA doesn't provide these).
+ // EU data is an average of the Tremod/HBEFA data for the countries listed;
+ // for this average the HBEFA data was used also in the German set (for car and bus).
+ var carbonDatasets = {
+ US: {
+ regionName: "United States",
+ footprintData: {
+ WALKING: 0,
+ BICYCLING: 0,
+ CAR: 267/1609,
+ BUS: 278/1609,
+ LIGHT_RAIL: 120/1609,
+ SUBWAY: 74/1609,
+ TRAM: 90/1609,
+ TRAIN: 92/1609,
+ AIR_OR_HSR: 217/1609
+ }
+ },
+ EU: { // Plain average of values for the countries below (using HBEFA for car and bus, Tremod for others)
+ regionName: "European Union",
+ footprintData: {
+ WALKING: 0,
+ BICYCLING: 0,
+ CAR: 0.14515,
+ BUS: 0.04751,
+ LIGHT_RAIL: 0.064,
+ SUBWAY: 0.064,
+ TRAM: 0.064,
+ TRAIN: 0.048,
+ AIR_OR_HSR: 0.201
+ }
+ },
+ DE: {
+ regionName: "Germany",
+ footprintData: {
+ WALKING: 0,
+ BICYCLING: 0,
+ CAR: 0.139, // Tremod (passenger car)
+ BUS: 0.0535, // Tremod (average city/coach)
+ LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
+ SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAIN: 0.048, // Tremod (DE average short/long distance)
+ AIR_OR_HSR: 0.201 // Tremod (DE airplane)
+ }
+ },
+ FR: {
+ regionName: "France",
+ footprintData: {
+ WALKING: 0,
+ BICYCLING: 0,
+ CAR: 0.13125, // HBEFA (passenger car, considering 1 passenger)
+ BUS: 0.04838, // HBEFA (average short/long distance, considering 16/25 passengers)
+ LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
+ SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAIN: 0.048, // Tremod (DE average short/long distance)
+ AIR_OR_HSR: 0.201 // Tremod (DE airplane)
+ }
+ },
+ AT: {
+ regionName: "Austria",
+ footprintData: {
+ WALKING: 0,
+ BICYCLING: 0,
+ CAR: 0.14351, // HBEFA (passenger car, considering 1 passenger)
+ BUS: 0.04625, // HBEFA (average short/long distance, considering 16/25 passengers)
+ LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
+ SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAIN: 0.048, // Tremod (DE average short/long distance)
+ AIR_OR_HSR: 0.201 // Tremod (DE airplane)
+ }
+ },
+ SE: {
+ regionName: "Sweden",
+ footprintData: {
+ WALKING: 0,
+ BICYCLING: 0,
+ CAR: 0.13458, // HBEFA (passenger car, considering 1 passenger)
+ BUS: 0.04557, // HBEFA (average short/long distance, considering 16/25 passengers)
+ LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
+ SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAIN: 0.048, // Tremod (DE average short/long distance)
+ AIR_OR_HSR: 0.201 // Tremod (DE airplane)
+ }
+ },
+ NO: {
+ regionName: "Norway",
+ footprintData: {
+ WALKING: 0,
+ BICYCLING: 0,
+ CAR: 0.13265, // HBEFA (passenger car, considering 1 passenger)
+ BUS: 0.04185, // HBEFA (average short/long distance, considering 16/25 passengers)
+ LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
+ SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAIN: 0.048, // Tremod (DE average short/long distance)
+ AIR_OR_HSR: 0.201 // Tremod (DE airplane)
+ }
+ },
+ CH: {
+ regionName: "Switzerland",
+ footprintData: {
+ WALKING: 0,
+ BICYCLING: 0,
+ CAR: 0.17638, // HBEFA (passenger car, considering 1 passenger)
+ BUS: 0.04866, // HBEFA (average short/long distance, considering 16/25 passengers)
+ LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
+ SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
+ TRAIN: 0.048, // Tremod (DE average short/long distance)
+ AIR_OR_HSR: 0.201 // Tremod (DE airplane)
+ }
+ }
+ };
+
+ var defaultCarbonDatasetCode = 'US';
+ var currentCarbonDatasetCode = defaultCarbonDatasetCode;
+
+ // we need to call the method from within a promise in initialize()
+ // and using this.setCurrentCarbonDatasetLocale doesn't seem to work
+ var setCurrentCarbonDatasetLocale = function(localeCode) {
+ for (var code in carbonDatasets) {
+ if (code == localeCode) {
+ currentCarbonDatasetCode = localeCode;
+ break;
+ }
+ }
+ }
+
+ this.loadCarbonDatasetLocale = function() {
+ return KVStore.get(CARBON_DATASET_KEY).then(function(localeCode) {
+ Logger.log("CarbonDatasetHelper.loadCarbonDatasetLocale() obtained value from storage [" + localeCode + "]");
+ if (!localeCode) {
+ localeCode = defaultCarbonDatasetCode;
+ Logger.log("CarbonDatasetHelper.loadCarbonDatasetLocale() no value in storage, using [" + localeCode + "] instead");
+ }
+ setCurrentCarbonDatasetLocale(localeCode);
+ });
+ }
+
+ this.saveCurrentCarbonDatasetLocale = function (localeCode) {
+ setCurrentCarbonDatasetLocale(localeCode);
+ KVStore.set(CARBON_DATASET_KEY, currentCarbonDatasetCode);
+ Logger.log("CarbonDatasetHelper.saveCurrentCarbonDatasetLocale() saved value [" + currentCarbonDatasetCode + "] to storage");
+ }
+
+ this.getCarbonDatasetOptions = function() {
+ var options = [];
+ for (var code in carbonDatasets) {
+ options.push({
+ text: code, //carbonDatasets[code].regionName,
+ value: code
+ });
+ }
+ return options;
+ };
+
+ this.getCurrentCarbonDatasetCode = function () {
+ return currentCarbonDatasetCode;
+ };
+
+ this.getCurrentCarbonDatasetFootprint = function () {
+ return carbonDatasets[currentCarbonDatasetCode].footprintData;
+ };
+})
+.service('METDatasetHelper', function(KVStore) {
+ var standardMETs = {
+ "WALKING": {
+ "VERY_SLOW": {
+ range: [0, 2.0],
+ mets: 2.0
+ },
+ "SLOW": {
+ range: [2.0, 2.5],
+ mets: 2.8
+ },
+ "MODERATE_0": {
+ range: [2.5, 2.8],
+ mets: 3.0
+ },
+ "MODERATE_1": {
+ range: [2.8, 3.2],
+ mets: 3.5
+ },
+ "FAST": {
+ range: [3.2, 3.5],
+ mets: 4.3
+ },
+ "VERY_FAST_0": {
+ range: [3.5, 4.0],
+ mets: 5.0
+ },
+ "VERY_FAST_!": {
+ range: [4.0, 4.5],
+ mets: 6.0
+ },
+ "VERY_VERY_FAST": {
+ range: [4.5, 5],
+ mets: 7.0
+ },
+ "SUPER_FAST": {
+ range: [5, 6],
+ mets: 8.3
+ },
+ "RUNNING": {
+ range: [6, Number.MAX_VALUE],
+ mets: 9.8
+ }
+ },
+ "BICYCLING": {
+ "VERY_VERY_SLOW": {
+ range: [0, 5.5],
+ mets: 3.5
+ },
+ "VERY_SLOW": {
+ range: [5.5, 10],
+ mets: 5.8
+ },
+ "SLOW": {
+ range: [10, 12],
+ mets: 6.8
+ },
+ "MODERATE": {
+ range: [12, 14],
+ mets: 8.0
+ },
+ "FAST": {
+ range: [14, 16],
+ mets: 10.0
+ },
+ "VERT_FAST": {
+ range: [16, 19],
+ mets: 12.0
+ },
+ "RACING": {
+ range: [20, Number.MAX_VALUE],
+ mets: 15.8
+ }
+ },
+ "UNKNOWN": {
+ "ALL": {
+ range: [0, Number.MAX_VALUE],
+ mets: 0
+ }
+ },
+ "IN_VEHICLE": {
+ "ALL": {
+ range: [0, Number.MAX_VALUE],
+ mets: 0
+ }
+ },
+ "CAR": {
+ "ALL": {
+ range: [0, Number.MAX_VALUE],
+ mets: 0
+ }
+ },
+ "BUS": {
+ "ALL": {
+ range: [0, Number.MAX_VALUE],
+ mets: 0
+ }
+ },
+ "LIGHT_RAIL": {
+ "ALL": {
+ range: [0, Number.MAX_VALUE],
+ mets: 0
+ }
+ },
+ "TRAIN": {
+ "ALL": {
+ range: [0, Number.MAX_VALUE],
+ mets: 0
+ }
+ },
+ "TRAM": {
+ "ALL": {
+ range: [0, Number.MAX_VALUE],
+ mets: 0
+ }
+ },
+ "SUBWAY": {
+ "ALL": {
+ range: [0, Number.MAX_VALUE],
+ mets: 0
+ }
+ },
+ "AIR_OR_HSR": {
+ "ALL": {
+ range: [0, Number.MAX_VALUE],
+ mets: 0
+ }
+ }
+ }
+ this.getStandardMETs = function() {
+ return standardMETs;
+ }
+})
+.service('CustomDatasetHelper', function(ConfirmHelper, METDatasetHelper) {
+ this.getCustomMETs = function() {
+ console.log("Getting custom METs", this.customMETs);
+ return this.customMETs;
+ };
+
+ this.getCustomFootprint = function() {
+ console.log("Getting custom footprint", this.customPerMeterFootprint);
+ return this.customPerMeterFootprint;
+ };
+
+ this.populateCustomMETs = function() {
+ let standardMETs = METDatasetHelper.getStandardMETs();
+ let modeOptions = this.inputParams["MODE"].options;
+ let modeMETEntries = modeOptions.map((opt) => {
+ if (opt.met_equivalent) {
+ let currMET = standardMETs[opt.met_equivalent];
+ return [opt.value, currMET];
+ } else {
+ if (opt.met) {
+ let currMET = opt.met;
+ // if the user specifies a custom MET, they can't specify
+ // Number.MAX_VALUE since it is not valid JSON
+ // we assume that they specify -1 instead, and we will
+ // map -1 to Number.MAX_VALUE here by iterating over all the ranges
+ for (const rangeName in currMET) {
+ // console.log("Handling range ", rangeName);
+ currMET[rangeName].range = currMET[rangeName].range.map((i) => i == -1? Number.MAX_VALUE : i);
+ }
+ return [opt.value, currMET];
+ } else {
+ console.warn("Did not find either met_equivalent or met for "
+ +opt.value+" ignoring entry");
+ return undefined;
+ }
+ }
+ });
+ this.customMETs = Object.fromEntries(modeMETEntries.filter((e) => angular.isDefined(e)));
+ console.log("After populating, custom METs = ", this.customMETs);
+ };
+
+ this.populateCustomFootprints = function() {
+ let modeOptions = this.inputParams["MODE"].options;
+ let modeCO2PerMeter = modeOptions.map((opt) => {
+ if (opt.range_limit_km) {
+ if (this.range_limited_motorized) {
+ Logger.displayError("Found two range limited motorized options", {
+ first: this.range_limited_motorized, second: opt});
+ }
+ this.range_limited_motorized = opt;
+ console.log("Found range limited motorized mode", this.range_limited_motorized);
+ }
+ if (angular.isDefined(opt.co2PerMeter)) {
+ return [opt.value, opt.co2PerMeter];
+ } else {
+ return undefined;
+ }
+ }).filter((modeCO2) => angular.isDefined(modeCO2));;
+ this.customPerMeterFootprint = Object.fromEntries(modeCO2PerMeter);
+ console.log("After populating, custom perMeterFootprint", this.customPerMeterFootprint);
+ }
+
+ this.init = function() {
+ ConfirmHelper.inputParamsPromise.then((inputParams) => {
+ console.log("Input params = ", inputParams);
+ this.inputParams = inputParams;
+ this.populateCustomMETs();
+ this.populateCustomFootprints();
+ });
+ }
+ this.init();
+});
diff --git a/www/js/metrics.js b/www/js/metrics.js
index 313581dcb..35233ecd4 100644
--- a/www/js/metrics.js
+++ b/www/js/metrics.js
@@ -3,30 +3,94 @@
angular.module('emission.main.metrics',['nvd3',
'emission.services',
'ionic-datepicker',
+ 'emission.config.imperial',
'emission.main.metrics.factory',
+ 'emission.main.metrics.mappings',
+ 'emission.stats.clientstats',
'emission.plugin.kvstore',
'emission.plugin.logger'])
.controller('MetricsCtrl', function($scope, $ionicActionSheet, $ionicLoading,
- CommHelper, $window, $ionicPopup,
+ ClientStats, CommHelper, $window, $ionicPopup,
ionicDatePicker, $ionicPlatform,
- FootprintHelper, CalorieCal, $ionicModal, $timeout, KVStore, CarbonDatasetHelper,
+ FootprintHelper, CalorieCal, ImperialConfig, $ionicModal, $timeout, KVStore, CarbonDatasetHelper,
$rootScope, $location, $state, ReferHelper, Logger,
$translate) {
var lastTwoWeeksQuery = true;
- var first = true;
- var lastWeekCalories = 0;
- var lastWeekCarbon = "0 kg CO₂";
- var twoWeeksAgoCarbon = "";
- var lastWeekCarbonInt = 0;
- var twoWeeksAgoCarbonInt = 0;
- var twoWeeksAgoCalories = 0;
+ $scope.defaultTwoWeekUserCall = true;
var DURATION = "duration";
- var MEDIAN_SPEED = "median_speed";
+ var MEAN_SPEED = "mean_speed";
var COUNT = "count";
var DISTANCE = "distance";
+ var METRIC_LIST = [DURATION, MEAN_SPEED, COUNT, DISTANCE];
+ var COMPUTATIONAL_METRIC_LIST = [DURATION, MEAN_SPEED, DISTANCE];
+
+ /*
+ * BEGIN: Data structures to parse and store the data in different formats.
+ * So that we don't have to keep re-creating them over and over as we used
+ * to, slowing down the processing.
+ */
+
+ /*
+ These are metric maps, with the key as the metric, and the value as a
+ list of ModeStatTimeSummary objects for the metric.
+ i.e. {count: [
+ {fmt_time: "2021-12-03T00:00:00+00:00",
+ label_drove_alone: 4 label_walk: 1
+ local_dt: {year: 2021, month: 12, day: 3, hour: 0, minute: 0, …}
+ nUsers: 1
+ ts: 1638489600},....],
+ duration: [...]
+ distance: [...]
+ mean_speed: [...]}
+ */
+ $scope.userCurrentResults = {};
+ $scope.userTwoWeeksAgo = {};
+ $scope.aggCurrentResults = {};
+
+ /*
+ These are metric mode maps, with a nested map of maps. The outer key is
+ the metric, and the inner key is the , with the key as the metric, and the
+ inner key is the mode. The innermost value is the list of
+ ModeStatTimeSummary objects for that mode.
+ list of ModeStatTimeSummary objects for the metric.
+ i.e. {
+ count: [
+ {key: drove_alone, values: : [[1638489600, 4, "2021-12-03T00:00:00+00:00"], ...]},
+ { key: walk, values: [[1638489600, 4, "2021-12-03T00:00:00+00:00"],...]}],
+ duration: [ { key: drove_alone, values: [...]}, {key: walk, values: [...]} ],
+ distance: [ { key: drove_alone, values: [...]}, {key: walk, values: [...]} ],
+ mean_speed: [ { key: drove_alone, values: [...]}, {key: walk, values: [...]} ]
+ }
+ */
+ $scope.userCurrentModeMap = {};
+ $scope.userTwoWeeksAgoModeMap = {};
+ $scope.userCurrentModeMapFormatted = {};
+ $scope.aggCurrentModeMap = {};
+ $scope.aggCurrentModeMapFormatted = {};
+ $scope.aggCurrentPerCapitaModeMap = {};
+
+ /*
+ These are summary mode maps, which have the same structure as the mode
+ maps, but with a value that is a single array instead of an array of arrays.
+ The single array is the summation of the values in the individual arrays of the non-summary mode maps.
+ i.e. {
+ count: [{key: "drove_alone", values: [10, "trips", "10 trips"],
+ {key: "walk", values: [5, "trips", "5 trips"]}],
+
+ duration: [ { key: drove_alone, values: [...]}, {key: walk, values: [...]} ],
+ distance: [ { key: drove_alone, values: [...]}, {key: walk, values: [...]} ],
+ mean_speed: [ { key: drove_alone, values: [...]}, {key: walk, values: [...]} ]
+ }
+ */
+ $scope.userCurrentSummaryModeMap = {};
+ $scope.userTwoWeeksAgoSummaryModeMap = {};
+ $scope.aggCurrentSummaryModeMap = {};
+ $scope.aggCurrentSummaryPerCapitaModeMap = {};
+
+ /*
$scope.onCurrentTrip = function() {
// window.cordova.plugins.BEMDataCollection.getState().then(function(result) {
// Logger.log("Current trip state" + JSON.stringify(result));
@@ -36,12 +100,13 @@ angular.module('emission.main.metrics',['nvd3',
// }
// });
};
+ */
$ionicPlatform.ready(function() {
CarbonDatasetHelper.loadCarbonDatasetLocale().then(function(result) {
getData();
});
- $scope.onCurrentTrip();
+ // $scope.onCurrentTrip();
});
// If we want to share this function (see the pun?) between the control screen and the dashboard, we need to put it into a service/factory.
@@ -388,9 +453,11 @@ angular.module('emission.main.metrics',['nvd3',
var tempFrom = moment2Timestamp(moment().utc().startOf('day').subtract(14, 'days'));
var tempTo = moment2Timestamp(moment().utc().startOf('day').subtract(1, 'days'))
lastTwoWeeksQuery = false; // Only get last week's data once
+ $scope.defaultTwoWeekUserCall = true;
} else {
var tempFrom = moment2Timestamp($scope.selectCtrl.fromDateTimestamp);
var tempTo = moment2Timestamp($scope.selectCtrl.toDateTimestamp);
+ $scope.defaultTwoWeekUserCall = false;
}
data = {
freq: $scope.selectCtrl.pandaFreq,
@@ -409,7 +476,7 @@ angular.module('emission.main.metrics',['nvd3',
var getUserMetricsFromServer = function() {
var clonedData = angular.copy(data);
delete clonedData.metric;
- clonedData.metric_list = [DURATION, MEDIAN_SPEED, COUNT, DISTANCE];
+ clonedData.metric_list = METRIC_LIST;
clonedData.is_return_aggregate = false;
var getMetricsResult = CommHelper.getMetrics(theMode, clonedData);
return getMetricsResult;
@@ -417,7 +484,7 @@ angular.module('emission.main.metrics',['nvd3',
var getAggMetricsFromServer = function() {
var clonedData = angular.copy(data);
delete clonedData.metric;
- clonedData.metric_list = [DURATION, MEDIAN_SPEED, COUNT, DISTANCE];
+ clonedData.metric_list = METRIC_LIST;
clonedData.is_return_aggregate = true;
var getMetricsResult = CommHelper.getAggregateData(
"result/metrics/timestamp", clonedData)
@@ -436,7 +503,7 @@ angular.module('emission.main.metrics',['nvd3',
$ionicLoading.show({
template: $translate.instant('loading')
});
- if(!first){
+ if(!$scope.defaultTwoWeekUserCall){
$scope.uictrl.currentString = $translate.instant('metrics.custom');
$scope.uictrl.current = false;
}
@@ -449,19 +516,8 @@ angular.module('emission.main.metrics',['nvd3',
$scope.caloriesData = {};
$scope.carbonData = {};
$scope.summaryData = {};
- $scope.caloriesData.userCalories = 0;
- $scope.caloriesData.aggrCalories = 0;
- $scope.caloriesData.lastWeekUserCalories = 0;
- $scope.caloriesData.changeInPercentage = "0%"
- $scope.caloriesData.change = $translate.instant('metrics.calorie-data-change');
-
- $scope.carbonData.userCarbon = "0 kg CO₂";
- $scope.carbonData.aggrCarbon = $translate.instant('metrics.carbon-data-calculating');;
+
$scope.carbonData.optimalCarbon = "0 kg CO₂";
- $scope.carbonData.worstCarbon = "0 kg CO₂";
- $scope.carbonData.lastWeekUserCarbon = "0 kg CO₂";
- $scope.carbonData.changeInPercentage = "0%";
- $scope.carbonData.change = $translate.instant('metrics.carbon-data-change');
$scope.summaryData.userSummary = [];
$scope.chartDataUser = {};
@@ -471,18 +527,24 @@ angular.module('emission.main.metrics',['nvd3',
'vanillaIceCream' : 137, //1/2 cup
'banana' : 105, //medium banana 118g
};
+ // calculation is at
+ // https://github.com/e-mission/e-mission-docs/issues/696#issuecomment-1018181638
+ $scope.carbon = {
+ 'phoneCharge' : 8.22 * 10**(-3), // 8.22 x 10^-6 metric tons CO2/smartphone charge
+ };
getUserMetricsFromServer().then(function(results) {
$ionicLoading.hide();
+ console.log("user results ", results);
if(results.user_metrics.length == 1){
- console.log("first = "+first);
- first = false;
+ console.log("$scope.defaultTwoWeekUserCall = "+$scope.defaultTwoWeekUserCall);
+ $scope.defaultTwoWeekUserCall = false;
// If there is no data from last week (ex. new user)
// Don't store the any other data as last we data
}
$scope.fillUserValues(results.user_metrics);
$scope.summaryData.defaultSummary = $scope.summaryData.userSummary;
- first = false; //If there is data from last week store the data only first time
+ $scope.defaultTwoWeekUserCall = false; //If there is data from last week store the data only first time
$scope.uictrl.showContent = true;
if (angular.isDefined($scope.chartDataUser)) {
$scope.$apply(function() {
@@ -503,6 +565,7 @@ angular.module('emission.main.metrics',['nvd3',
})
getAggMetricsFromServer().then(function(results) {
+ console.log("aggregate results ", results);
$scope.fillAggregateValues(results.aggregate_metrics);
$scope.uictrl.hasAggr = true;
if (angular.isDefined($scope.chartDataAggr)) { //Only have to check one because
@@ -530,162 +593,205 @@ angular.module('emission.main.metrics',['nvd3',
$scope.fillUserValues = function(user_metrics_arr) {
var seventhDayAgo = moment().utc().startOf('day').subtract(7, 'days');
- var twoWeeksAgoDuration = [];
- var twoWeeksAgoMedianSpeed = [];
- var twoWeeksAgoDistance = [];
- var userDuration = [];
- var userMedianSpeed = [];
- var userCount = [];
- var userDistance = [];
-
- if(first){
+ METRIC_LIST.forEach((m) => $scope.userCurrentResults[m] = []);
+
+ METRIC_LIST.forEach((m) => $scope.userTwoWeeksAgo[m] = []);
+
+ if($scope.defaultTwoWeekUserCall){
for(var i in user_metrics_arr[0]) {
if(seventhDayAgo.isSameOrBefore(moment.unix(user_metrics_arr[0][i].ts).utc())){
- userDuration.push(user_metrics_arr[0][i]);
- userMedianSpeed.push(user_metrics_arr[1][i]);
- userCount.push(user_metrics_arr[2][i]);
- userDistance.push(user_metrics_arr[3][i]);
+ METRIC_LIST.forEach((m, idx) => $scope.userCurrentResults[m].push(user_metrics_arr[idx][i]));
} else {
- twoWeeksAgoDuration.push(user_metrics_arr[0][i]);
- twoWeeksAgoMedianSpeed.push(user_metrics_arr[1][i]);
- twoWeeksAgoDistance.push(user_metrics_arr[3][i]);
+ METRIC_LIST.forEach((m, idx) => $scope.userTwoWeeksAgo[m].push(user_metrics_arr[idx][i]));
}
}
- console.log("twoWeeksAgoDuration = "+twoWeeksAgoDuration);
- console.log("twoWeeksAgoMedianSpeed = "+twoWeeksAgoMedianSpeed);
- console.log("twoWeeksAgoDistance = "+twoWeeksAgoDistance);
+ METRIC_LIST.forEach((m) => console.log("userTwoWeeksAgo."+m+" = "+$scope.userTwoWeeksAgo[m]));
} else {
- var userDuration = user_metrics_arr[0];
- var userMedianSpeed = user_metrics_arr[1];
- var userCount = user_metrics_arr[2];
- var userDistance = user_metrics_arr[3];
+ METRIC_LIST.forEach((m, idx) => $scope.userCurrentResults[m] = user_metrics_arr[idx]);
}
- $scope.summaryData.userSummary.duration = getSummaryData(userDuration, "duration");
- $scope.summaryData.userSummary.median_speed = getSummaryData(userMedianSpeed, "median_speed");
- $scope.summaryData.userSummary.count = getSummaryData(userCount, "count");
- $scope.summaryData.userSummary.distance = getSummaryData(userDistance, "distance");
- $scope.chartDataUser.duration = userDuration? userDuration : [];
- $scope.chartDataUser.speed = userMedianSpeed? userMedianSpeed : [];
- $scope.chartDataUser.count = userCount? userCount : [];
- $scope.chartDataUser.distance = userDistance? userDistance : [];
+
+ METRIC_LIST.forEach((m) =>
+ $scope.userCurrentModeMap[m] = getDataFromMetrics($scope.userCurrentResults[m], metric2valUser));
+
+ COMPUTATIONAL_METRIC_LIST.forEach((m) =>
+ $scope.userTwoWeeksAgoModeMap[m] = getDataFromMetrics($scope.userTwoWeeksAgo[m], metric2valUser));
+
+ METRIC_LIST.forEach((m) =>
+ $scope.userCurrentModeMapFormatted[m] = formatModeMap($scope.userCurrentModeMap[m], m));
+
+ METRIC_LIST.forEach((m) =>
+ $scope.userCurrentSummaryModeMap[m] = getSummaryDataRaw($scope.userCurrentModeMap[m], m));
+
+ COMPUTATIONAL_METRIC_LIST.forEach((m) =>
+ $scope.userTwoWeeksAgoSummaryModeMap[m] = getSummaryDataRaw($scope.userTwoWeeksAgoModeMap[m], m));
+
+ METRIC_LIST.forEach((m) =>
+ $scope.summaryData.userSummary[m] = getSummaryDataRaw($scope.userCurrentModeMap[m], m));
+
+ $scope.isCustomLabelResult = isCustomLabels($scope.userCurrentModeMap);
+ FootprintHelper.setUseCustomFootprint($scope.isCustomLabelResult);
+ CalorieCal.setUseCustomFootprint($scope.isCustomLabelResult);
+
+ $scope.chartDataUser = $scope.userCurrentModeMapFormatted;
// Fill in user calorie information
- $scope.fillCalorieCardUserVals(userDuration, userMedianSpeed,
- twoWeeksAgoDuration, twoWeeksAgoMedianSpeed);
- $scope.fillFootprintCardUserVals(userDistance, twoWeeksAgoDistance);
+ $scope.fillCalorieCardUserVals($scope.userCurrentSummaryModeMap.duration,
+ $scope.userCurrentSummaryModeMap.mean_speed,
+ $scope.userTwoWeeksAgoSummaryModeMap.duration,
+ $scope.userTwoWeeksAgoSummaryModeMap.mean_speed);
+ $scope.fillFootprintCardUserVals($scope.userCurrentModeMap.distance,
+ $scope.userCurrentSummaryModeMap.distance,
+ $scope.userTwoWeeksAgoModeMap.distance,
+ $scope.userTwoWeeksAgoSummaryModeMap.distance);
}
$scope.fillAggregateValues = function(agg_metrics_arr) {
- if (first) {
- var aggDuration = agg_metrics_arr[0].slice(0, 7);
- var aggMedianSpeed = agg_metrics_arr[1].slice(0, 7);
- var aggCount = agg_metrics_arr[2].slice(0, 7);
- var aggDistance = agg_metrics_arr[3].slice(0, 7);
+ METRIC_LIST.forEach((m) => $scope.aggCurrentResults[m] = []);
+ if ($scope.defaultTwoWeekUserCall) {
+ METRIC_LIST.forEach((m, idx) => $scope.aggCurrentResults[m] = agg_metrics_arr[idx].slice(0,7));
} else {
- var aggDuration = agg_metrics_arr[0];
- var aggMedianSpeed = agg_metrics_arr[1];
- var aggCount = agg_metrics_arr[2];
- var aggDistance = agg_metrics_arr[3];
+ METRIC_LIST.forEach((m, idx) => $scope.aggCurrentResults[m] = agg_metrics_arr[idx]);
}
- $scope.chartDataAggr.duration = aggDuration? aggDuration : [];
- $scope.chartDataAggr.speed = aggMedianSpeed? aggMedianSpeed : [];
- $scope.chartDataAggr.count = aggCount? aggCount : [];
- $scope.chartDataAggr.distance = aggDistance? aggDistance : [];
+ METRIC_LIST.forEach((m) =>
+ $scope.aggCurrentModeMap[m] = getDataFromMetrics($scope.aggCurrentResults[m], metric2valUser));
- $scope.fillCalorieAggVals(aggDuration, aggMedianSpeed);
- $scope.fillFootprintAggVals(aggDistance);
- }
+ METRIC_LIST.forEach((m) =>
+ $scope.aggCurrentModeMapFormatted[m] = formatModeMap($scope.aggCurrentModeMap[m], m));
- $scope.fillCalorieCardUserVals = function(userDuration, userMedianSpeed,
- twoWeeksAgoDuration, twoWeeksAgoMedianSpeed) {
- if (userDuration) {
- var durationData = getSummaryDataRaw(userDuration, "duration");
- }
- if (userMedianSpeed) {
- var speedData = getSummaryDataRaw(userMedianSpeed, "median_speed");
- }
- for (var i in durationData) {
- var met = $scope.getCorrectedMetFromUserData(durationData[i], speedData[i])
- $scope.caloriesData.userCalories +=
- Math.round(CalorieCal.getuserCalories(durationData[i].values / 3600, met)) //+ ' cal'
- }
-
- if(first){
- lastWeekCalories = $scope.caloriesData.userCalories;
- }
+ COMPUTATIONAL_METRIC_LIST.forEach((m) =>
+ $scope.aggCurrentPerCapitaModeMap[m] = getDataFromMetrics($scope.aggCurrentResults[m], metric2valAvg));
- $scope.numberOfCookies = Math.floor($scope.caloriesData.userCalories/
- $scope.food.chocolateChip);
- $scope.numberOfIceCreams = Math.floor($scope.caloriesData.userCalories/
- $scope.food.vanillaIceCream);
- $scope.numberOfBananas = Math.floor($scope.caloriesData.userCalories/
- $scope.food.banana);
+ COMPUTATIONAL_METRIC_LIST.forEach((m) =>
+ $scope.aggCurrentSummaryPerCapitaModeMap[m] = getSummaryDataRaw($scope.aggCurrentPerCapitaModeMap[m], m));
- if(first){
- if (twoWeeksAgoDuration) {
- var durationData = getSummaryDataRaw(twoWeeksAgoDuration, "duration");
- }
- if (twoWeeksAgoMedianSpeed) {
- var speedData = getSummaryDataRaw(twoWeeksAgoMedianSpeed, "median_speed");
- }
- for (var i in durationData) {
- var met = $scope.getCorrectedMetFromUserData(durationData[i], speedData[i])
- twoWeeksAgoCalories +=
- Math.round(CalorieCal.getuserCalories(durationData[i].values / 3600, met));
- }
- }
+ $scope.chartDataAggr = $scope.aggCurrentModeMapFormatted;
+ $scope.fillCalorieAggVals($scope.aggCurrentSummaryPerCapitaModeMap.duration,
+ $scope.aggCurrentSummaryPerCapitaModeMap.mean_speed);
+ $scope.fillFootprintAggVals($scope.aggCurrentSummaryPerCapitaModeMap.distance);
+ }
- if (first) {
- $scope.caloriesData.lastWeekUserCalories = twoWeeksAgoCalories;
- } else {
- $scope.caloriesData.lastWeekUserCalories = ""
- }
+ /*
+ * We use the results to determine whether these results are from custom
+ * labels or from the automatically sensed labels. Automatically sensedV
+ * labels are in all caps, custom labels are prefixed by label, but have had
+ * the label_prefix stripped out before this. Results should have either all
+ * sensed labels or all custom labels.
+ */
+ var isCustomLabels = function(modeMap) {
+ const isSensed = (mode) => mode == mode.toUpperCase();
+ const isCustom = (mode) => mode == mode.toLowerCase();
+ const metricSummaryChecksCustom = [];
+ const metricSummaryChecksSensed = [];
+ for (const metric in modeMap) {
+ const metricKeys = modeMap[metric].map((e) => e.key);
+ const isSensedKeys = metricKeys.map(isSensed);
+ const isCustomKeys = metricKeys.map(isCustom);
+ console.log("Checking metric keys", metricKeys, " sensed ", isSensedKeys,
+ " custom ", isCustomKeys);
+ const isAllCustomForMetric = isAllCustom(isSensedKeys, isCustomKeys);
+ metricSummaryChecksSensed.push(!isAllCustomForMetric);
+ metricSummaryChecksCustom.push(isAllCustomForMetric);
+ }
+ console.log("overall custom/not results for each metric = ", metricSummaryChecksCustom);
+ return isAllCustom(metricSummaryChecksSensed, metricSummaryChecksCustom);
+ }
+ var isAllCustom = function(isSensedKeys, isCustomKeys) {
+ const allSensed = isSensedKeys.reduce((a, b) => a && b, true);
+ const anySensed = isSensedKeys.reduce((a, b) => a || b, false);
+ const allCustom = isCustomKeys.reduce((a, b) => a && b, true);
+ const anyCustom = isCustomKeys.reduce((a, b) => a || b, false);
+ if ((allSensed && !anyCustom)) {
+ return false; // sensed, not custom
+ }
+ if ((!anySensed && allCustom)) {
+ return true; // custom, not sensed; false implies that the other option is true
+ }
+ Logger.displayError("Mixed entries that combine sensed and custom labels",
+ "Please report to your program admin");
+ return undefined;
+ }
- console.log("Running calorieData with "
- + (lastWeekCalories)
- + " and "
- + (twoWeeksAgoCalories));
- // TODO: Refactor this so that we can filter out bad values ahead of time
- // instead of having to work around it here
- var calorieCalculation = Math.abs(Math.round((lastWeekCalories/twoWeeksAgoCalories) * 100 - 100));
- if (isValidNumber(calorieCalculation)) {
- $scope.caloriesData.changeInPercentage = calorieCalculation + "%";
- if(lastWeekCalories > twoWeeksAgoCalories){
- $scope.caloriesData.change = $translate.instant('metrics.calorie-data-change-increase');
- $scope.caloriesUp = true;
- $scope.caloriesDown = false;
- } else {
- $scope.caloriesData.change = $translate.instant('metrics.calorie-data-change-decrease');
- $scope.caloriesUp = false;
- $scope.caloriesDown = true;
- }
+ $scope.fillCalorieCardUserVals = function(userDurationSummary, userMeanSpeedSummary,
+ twoWeeksAgoDurationSummary, twoWeeksAgoMeanSpeedSummary) {
+ $scope.caloriesData.userCalories = {low: 0, high: 0};
+ const highestMET = CalorieCal.getHighestMET();
+ for (var i in userDurationSummary) {
+ var lowMET = $scope.getCorrectedMetFromUserData(userDurationSummary[i], userMeanSpeedSummary[i], 0);
+ var highMET = $scope.getCorrectedMetFromUserData(userDurationSummary[i], userMeanSpeedSummary[i], highestMET);
+ $scope.caloriesData.userCalories.low +=
+ Math.round(CalorieCal.getuserCalories(userDurationSummary[i].values / 3600, lowMET)) //+ ' cal'
+ $scope.caloriesData.userCalories.high +=
+ Math.round(CalorieCal.getuserCalories(userDurationSummary[i].values / 3600, highMET)) //+ ' cal'
}
- }
- $scope.fillCalorieAggVals = function(aggDuration, aggMedianSpeed) {
- if (aggDuration) {
- var avgDurationData = getAvgSummaryDataRaw(aggDuration, "duration");
- }
- if (aggMedianSpeed) {
- var avgSpeedData = getAvgSummaryDataRaw(aggMedianSpeed, "median_speed");
+ $scope.numberOfCookies = {
+ low: Math.floor($scope.caloriesData.userCalories.low/
+ $scope.food.chocolateChip),
+ high: Math.floor($scope.caloriesData.userCalories.high/
+ $scope.food.chocolateChip),
+ };
+ $scope.numberOfIceCreams = {
+ low: Math.floor($scope.caloriesData.userCalories.low/
+ $scope.food.vanillaIceCream),
+ high: Math.floor($scope.caloriesData.userCalories.high/
+ $scope.food.vanillaIceCream),
+ };
+ $scope.numberOfBananas = {
+ low: Math.floor($scope.caloriesData.userCalories.low/
+ $scope.food.banana),
+ high: Math.floor($scope.caloriesData.userCalories.high/
+ $scope.food.banana),
+ };
+
+ if($scope.defaultTwoWeekUserCall) {
+ if (twoWeeksAgoDurationSummary.length > 0) {
+ var twoWeeksAgoCalories = {low: 0, high: 0};
+ for (var i in twoWeeksAgoDurationSummary) {
+ var lowMET = $scope.getCorrectedMetFromUserData(twoWeeksAgoDurationSummary[i],
+ twoWeeksAgoMeanSpeedSummary[i], 0)
+ var highMET = $scope.getCorrectedMetFromUserData(twoWeeksAgoDurationSummary[i],
+ twoWeeksAgoMeanSpeedSummary[i], highestMET)
+ twoWeeksAgoCalories.low +=
+ Math.round(CalorieCal.getuserCalories(twoWeeksAgoDurationSummary[i].values / 3600, lowMET));
+ twoWeeksAgoCalories.high +=
+ Math.round(CalorieCal.getuserCalories(twoWeeksAgoDurationSummary[i].values / 3600, highMET));
+ }
+ $scope.caloriesData.lastWeekUserCalories = {
+ low: twoWeeksAgoCalories.low,
+ high: twoWeeksAgoCalories.high
+ };
+ console.log("Running calorieData with ", $scope.caloriesData);
+ // TODO: Refactor this so that we can filter out bad values ahead of time
+ // instead of having to work around it here
+ $scope.caloriesData.greaterLesserPct = {
+ low: ($scope.caloriesData.userCalories.low/$scope.caloriesData.lastWeekUserCalories.low) * 100 - 100,
+ high: ($scope.caloriesData.userCalories.high/$scope.caloriesData.lastWeekUserCalories.high) * 100 - 100,
+ }
+ }
}
- for (var i in avgDurationData) {
-
- var met = CalorieCal.getMet(avgDurationData[i].key, avgSpeedData[i].values);
+ }
- $scope.caloriesData.aggrCalories +=
- Math.round(CalorieCal.getuserCalories(avgDurationData[i].values / 3600, met)) //+ ' cal'
+ $scope.fillCalorieAggVals = function(aggDurationSummaryAvg, aggMeanSpeedSummaryAvg) {
+ $scope.caloriesData.aggrCalories = {low: 0, high: 0};
+ const highestMET = CalorieCal.getHighestMET();
+ for (var i in aggDurationSummaryAvg) {
+ var lowMET = CalorieCal.getMet(aggDurationSummaryAvg[i].key, aggMeanSpeedSummaryAvg[i].values, 0);
+ var highMET = CalorieCal.getMet(aggDurationSummaryAvg[i].key, aggMeanSpeedSummaryAvg[i].values, highestMET);
+ $scope.caloriesData.aggrCalories.low +=
+ CalorieCal.getuserCalories(aggDurationSummaryAvg[i].values / 3600, lowMET); //+ ' cal'
+ $scope.caloriesData.aggrCalories.high +=
+ CalorieCal.getuserCalories(aggDurationSummaryAvg[i].values / 3600, highMET); //+ ' cal'
}
}
- $scope.getCorrectedMetFromUserData = function(currDurationData, currSpeedData) {
+ $scope.getCorrectedMetFromUserData = function(currDurationData, currSpeedData, defaultIfMissing) {
if ($scope.userDataSaved()) {
// this is safe because userDataSaved will never be set unless there
// is stored user data that we have loaded
var userDataFromStorage = $scope.savedUserData;
- var met = CalorieCal.getMet(currDurationData.key, currSpeedData.values);
+ var met = CalorieCal.getMet(currDurationData.key, currSpeedData.values, defaultIfMissing);
var gender = userDataFromStorage.gender;
var heightUnit = userDataFromStorage.heightUnit;
var height = userDataFromStorage.height;
@@ -694,71 +800,78 @@ angular.module('emission.main.metrics',['nvd3',
var age = userDataFromStorage.age;
return CalorieCal.getCorrectedMet(met, gender, age, height, heightUnit, weight, weightUnit);
} else {
- return CalorieCal.getMet(currDurationData.key, currSpeedData.values);
+ return CalorieCal.getMet(currDurationData.key, currSpeedData.values, defaultIfMissing);
}
};
- $scope.fillFootprintCardUserVals = function(userDistance, twoWeeksAgoDistance) {
+ $scope.fillFootprintCardUserVals = function(
+ userDistance, userDistanceSummary,
+ twoWeeksAgoDistance, twoWeeksAgoDistanceSummary) {
if (userDistance) {
- var userCarbonData = getSummaryDataRaw(userDistance, 'distance');
+ // var optimalDistance = getOptimalFootprintDistance(userDistance);
+ var worstDistance = getWorstFootprintDistance(userDistanceSummary);
- var optimalDistance = getOptimalFootprintDistance(userDistance);
- var worstDistance = getWorstFootprintDistance(userDistance);
var date1 = $scope.selectCtrl.fromDateTimestamp;
var date2 = $scope.selectCtrl.toDateTimestamp;
var duration = moment.duration(date2.diff(date1));
var days = duration.asDays();
- $scope.carbonData.ca2035 = Math.round(40.142892 / 5 * days) + ' kg CO₂'; // kg/day
- $scope.carbonData.ca2050 = Math.round(8.28565 / 5 * days) + ' kg CO₂';
-
- $scope.carbonData.userCarbon = FootprintHelper.readableFormat(FootprintHelper.getFootprintForMetrics(userCarbonData));
- $scope.carbonData.optimalCarbon = FootprintHelper.readableFormat(FootprintHelper.getLowestFootprintForDistance(optimalDistance));
- $scope.carbonData.worstCarbon = FootprintHelper.readableFormat(FootprintHelper.getHighestFootprintForDistance(worstDistance));
- lastWeekCarbonInt = FootprintHelper.getFootprintForMetrics(userCarbonData);
+ /*
+ * 54 and 14 are the per-week CO2 estimates.
+ * https://github.com/e-mission/e-mission-docs/issues/688
+ * Since users can choose a custom range which can be less or greater
+ * than 7 days, we calculate the per day value by dividing by 7 and
+ * then multiplying by the actual number of days.
+ */
+ $scope.carbonData.us2030 = Math.round(54 / 7 * days); // kg/day
+ $scope.carbonData.us2050 = Math.round(14 / 7 * days);
+
+ $scope.carbonData.userCarbon = {
+ low: FootprintHelper.getFootprintForMetrics(userDistanceSummary,0),
+ high: FootprintHelper.getFootprintForMetrics(userDistanceSummary,
+ FootprintHelper.getHighestFootprint()),
+ };
+ // $scope.carbonData.optimalCarbon = FootprintHelper.getLowestFootprintForDistance(optimalDistance);
+ $scope.carbonData.worstCarbon = FootprintHelper.getHighestFootprintForDistance(worstDistance);
+ $scope.carbonData.carbonAvoided = {
+ low: $scope.carbonData.worstCarbon - $scope.carbonData.userCarbon.high,
+ high: $scope.carbonData.worstCarbon - $scope.carbonData.userCarbon.low,
+ };
}
- if (first) {
- if (twoWeeksAgoDistance) {
- var userCarbonDataTwoWeeks = getSummaryDataRaw(twoWeeksAgoDistance, 'distance');
- twoWeeksAgoCarbon = 0;
- twoWeeksAgoCarbonInt = 0;
-
- twoWeeksAgoCarbonInt = FootprintHelper.getFootprintForMetrics(userCarbonDataTwoWeeks);
+ $scope.numberOfCharges = {
+ low: Math.floor($scope.carbonData.carbonAvoided.low/
+ $scope.carbon.phoneCharge),
+ high: Math.floor($scope.carbonData.carbonAvoided.high/
+ $scope.carbon.phoneCharge),
+ };
- twoWeeksAgoCarbon = FootprintHelper.readableFormat(twoWeeksAgoCarbonInt);
- lastWeekCarbon = twoWeeksAgoCarbon;
+ if ($scope.defaultTwoWeekUserCall) {
+ // This is a default call in which we retrieved the current week and
+ // the previous week of data
+ if (twoWeeksAgoDistance.length > 0) {
+ // and this user has been around long enough that they have two weeks
+ // of data, or they haven't turned off tracking for all of last week,
+ // or....
+ $scope.carbonData.lastWeekUserCarbon = {
+ low: FootprintHelper.getFootprintForMetrics(twoWeeksAgoDistanceSummary,0),
+ high: FootprintHelper.getFootprintForMetrics(twoWeeksAgoDistanceSummary,
+ FootprintHelper.getHighestFootprint()),
+ };
+
+ console.log("Running calculation with " + $scope.carbonData.userCarbon + " and " + $scope.carbonData.lastWeekUserCarbon);
+ console.log("Running calculation with ", $scope.carbonData);
+ $scope.carbonData.greaterLesserPct = {
+ low: ($scope.carbonData.userCarbon.low/$scope.carbonData.lastWeekUserCarbon.low) * 100 - 100,
+ high: ($scope.carbonData.userCarbon.high/$scope.carbonData.lastWeekUserCarbon.high) * 100 - 100,
}
}
- $scope.carbonData.lastWeekUserCarbon = lastWeekCarbon;
-
- var change = "";
- console.log("Running calculation with " + lastWeekCarbonInt + " and " + twoWeeksAgoCarbonInt);
- var calculation = (lastWeekCarbonInt/twoWeeksAgoCarbonInt) * 100 - 100;
-
- // TODO: Refactor this so that we can filter out bad values ahead of time
- // instead of having to work around it here
- if (isValidNumber(calculation)) {
- if(lastWeekCarbonInt > twoWeeksAgoCarbonInt){
- $scope.carbonData.change = $translate.instant('metrics.carbon-data-change-increase');
- $scope.carbonUp = true;
- $scope.carbonDown = false;
- } else {
- $scope.carbonData.change = $translate.instant('metrics.carbon-data-change-decrease');
- $scope.carbonUp = false;
- $scope.carbonDown = true;
- }
- $scope.carbonData.changeInPercentage = Math.abs(Math.round(calculation)) + "%"
- }
- else {
- $scope.carbonData.change = "";
- $scope.carbonData.changeInPercentage = "0%";
- }
+ }
};
$scope.fillFootprintAggVals = function(aggDistance) {
if (aggDistance) {
- var aggrCarbonData = getAvgSummaryDataRaw(aggDistance, 'distance');
+ var aggrCarbonData = aggDistance;
// Issue 422:
// https://github.com/e-mission/e-mission-docs/issues/422
@@ -769,23 +882,24 @@ angular.module('emission.main.metrics',['nvd3',
}
}
- $scope.carbonData.aggrCarbon = FootprintHelper.readableFormat(FootprintHelper.getFootprintForMetrics(aggrCarbonData));
+ $scope.carbonData.aggrCarbon = {
+ low: FootprintHelper.getFootprintForMetrics(aggrCarbonData, 0),
+ high: FootprintHelper.getFootprintForMetrics(aggrCarbonData,
+ FootprintHelper.getHighestFootprint()),
+ };
}
};
$scope.showCharts = function(agg_metrics) {
- $scope.data.count = getDataFromMetrics(agg_metrics.count, metric2valUser);
- $scope.data.distance = getDataFromMetrics(agg_metrics.distance, metric2valUser);
- $scope.data.duration = getDataFromMetrics(agg_metrics.duration, metric2valUser);
- $scope.data.speed = getDataFromMetrics(agg_metrics.speed, metric2valUser);
+ $scope.data = agg_metrics;
$scope.countOptions = angular.copy($scope.options)
$scope.countOptions.chart.yAxis.axisLabel = $translate.instant('metrics.trips-yaxis-number');
$scope.distanceOptions = angular.copy($scope.options)
- $scope.distanceOptions.chart.yAxis.axisLabel = 'm';
+ $scope.distanceOptions.chart.yAxis.axisLabel = ImperialConfig.getDistanceSuffix;
$scope.durationOptions = angular.copy($scope.options)
- $scope.durationOptions.chart.yAxis.axisLabel = 'secs'
+ $scope.durationOptions.chart.yAxis.axisLabel = $translate.instant('metrics.hours');
$scope.speedOptions = angular.copy($scope.options)
- $scope.speedOptions.chart.yAxis.axisLabel = 'm/sec'
+ $scope.speedOptions.chart.yAxis.axisLabel = ImperialConfig.getSpeedSuffix;
};
$scope.pandaFreqOptions = [
{text: $translate.instant('metrics.pandafreqoptions-daily'), value: 'D'},
@@ -816,14 +930,14 @@ angular.module('emission.main.metrics',['nvd3',
}
var getDataFromMetrics = function(metrics, metric2val) {
+ console.log("Called getDataFromMetrics on ", metrics);
var mode_bins = {};
metrics.forEach(function(metric) {
var on_foot_val = 0;
for (var field in metric) {
- // TODO: Consider creating a prefix such as M_ to signal
- // modes. Is that really less fragile than caps, though?
- // Here, we check if the string is all upper case by
- // converting it to upper case and seeing if it is changed
+ // For modes inferred from sensor data, we check if the string
+ // is all upper case by converting it to upper case and seeing
+ // if it is changed
if (field == field.toUpperCase()) {
// since we can have multiple possible ON_FOOT modes, we
// add all of them up here
@@ -838,8 +952,19 @@ angular.module('emission.main.metrics',['nvd3',
// since we can have multiple on_foot entries, let's hold
// off on handling them until we have considered all fields
if (field != "ON_FOOT") {
- mode_bins[field].push([metric.ts, Math.round(metric2val(metric, field)), metric.fmt_time]);
+ mode_bins[field].push([metric.ts, metric2val(metric, field), metric.fmt_time]);
+ }
+ }
+ // For modes from user labels, we assume that the field stars with
+ // the label_ prefix
+ if (field.startsWith("label_")) {
+ // "label_" is 6 characters
+ let actualMode = field.slice(6, field.length);
+ console.log("Mapped field "+field+" to mode "+actualMode);
+ if (actualMode in mode_bins == false) {
+ mode_bins[actualMode] = []
}
+ mode_bins[actualMode].push([metric.ts, Math.round(metric2val(metric, field)), moment(metric.fmt_time).format()]);
}
}
// here's where we handle the ON_FOOT
@@ -856,27 +981,42 @@ angular.module('emission.main.metrics',['nvd3',
return rtn;
}
- var getSummaryDataRaw = function(metrics, metric) {
- var data = getDataFromMetrics(metrics, metric2valUser);
- for (var i = 0; i < data.length; i++) {
+ var getSummaryDataRaw = function(modeMap, metric) {
+ console.log("Invoked getSummaryDataRaw on ", modeMap, "with", metric);
+ let summaryMap = angular.copy(modeMap);
+ for (var i = 0; i < modeMap.length; i++) {
var temp = 0;
- for (var j = 0; j < data[i].values.length; j++) {
- temp += data[i].values[j][1];
+ for (var j = 0; j < modeMap[i].values.length; j++) {
+ temp += modeMap[i].values[j][1];
}
- if (metric === "median_speed") {
- data[i].values = Math.round(temp / data[i].values.length);
+ if (metric === "mean_speed") {
+ summaryMap[i].values = Math.round(temp / modeMap[i].values.length);
} else {
- data[i].values = Math.round(temp);
+ summaryMap[i].values = Math.round(temp);
}
}
- return data;
+ return summaryMap;
}
/*var sortNumber = function(a,b) {
return a - b;
}*/
+ /*
+ * This is _broken_ because what we see on the client is summary values,
+ * not individual trip values. So value > longTrip just means that the
+ * overall travel by that mode was long, not that each individual trip
+ * was long.
+ *
+ * As an obvious example, if I had 10 1k car trips, they would show up as
+ * daily travel of 10k by car, and be counted as a long trip, although each
+ * individual trip was actually 1k and short.
+ *
+ * Leaving this disabled until we come up with a principled solution.
+ * https://github.com/e-mission/e-mission-docs/issues/688#issuecomment-1000626564
+ */
+
var getOptimalFootprintDistance = function(metrics){
var data = getDataFromMetrics(metrics, metric2valUser);
var distance = 0;
@@ -893,66 +1033,64 @@ angular.module('emission.main.metrics',['nvd3',
}
return distance;
}
- var getWorstFootprintDistance = function(metrics){
- var data = getDataFromMetrics(metrics, metric2valUser);
- var distance = 0;
- for(var i = 0; i < data.length; i++) {
- for(var j = 0; j < data[i].values.length; j++){
- distance += data[i].values[j][1];
- }
- }
- return distance;
+ var getWorstFootprintDistance = function(modeMapSummary) {
+ var totalDistance = modeMapSummary.reduce((prevDistance, currModeSummary) => prevDistance + currModeSummary.values, 0);
+ return totalDistance;
}
- var getAvgSummaryDataRaw = function(metrics, metric) {
- var data = getDataFromMetrics(metrics, metric2valAvg);
- for (var i = 0; i < data.length; i++) {
- var temp = 0;
- for (var j = 0; j < data[i].values.length; j++) {
- temp += data[i].values[j][1];
- }
- if (metric === "median_speed") {
- data[i].values = Math.round(temp / data[i].values.length);
- } else {
- data[i].values = Math.round(temp);
- }
- }
- return data;
+ $scope.formatCount = function(value) {
+ const formatVal = Math.round(value);
+ const unit = $translate.instant('metrics.trips');
+ const stringRep = formatVal + " " + unit;
+ return [formatVal, unit, stringRep];
}
- var getSummaryData = function(metrics, metric) {
- var data = getDataFromMetrics(metrics, metric2valUser);
- for (var i = 0; i < data.length; i++) {
- var temp = 0;
- for (var j = 0; j < data[i].values.length; j++) {
- temp += data[i].values[j][1];
- }
- var unit = "";
- switch(metric) {
- case "count":
- unit = $translate.instant('metrics.trips');
- break;
- case "distance":
- unit = "m";
- break;
- case "duration":
- unit = "s";
- break;
- case "median_speed":
- unit = "m/s";
- break;
- }
- if (metric === "median_speed") {
- data[i].values = Math.round(temp / data[i].values.length ) + ' ' + unit;
- } else if(metric === "distance" && temp.toString().length > 4){
- data[i].values = Math.round(temp / 1000) + ' ' + "km";
- } else if(metric === "duration" && temp > 60){
- data[i].values = Math.round(temp / 60) + ' ' + "mins";
- } else {
- data[i].values = Math.round(temp) + ' ' + unit;
- }
- }
- return data;
+ $scope.formatDistance = function(value) {
+ const formatVal = Number.parseFloat(ImperialConfig.getFormattedDistance(value));
+ const unit = ImperialConfig.getDistanceSuffix;
+ const stringRep = formatVal + " " + unit;
+ return [formatVal, unit, stringRep];
+ }
+
+ $scope.formatDuration = function(value) {
+ const durM = moment.duration(value * 1000);
+ const formatVal = durM.asHours();
+ const unit = $translate.instant('metrics.hours');
+ const stringRep = durM.humanize();
+ return [formatVal, unit, stringRep];
+ }
+
+ $scope.formatMeanSpeed = function(value) {
+ const formatVal = Number.parseFloat(ImperialConfig.getFormattedSpeed(value));
+ const unit = ImperialConfig.getSpeedSuffix;
+ const stringRep = formatVal + " " + unit;
+ return [formatVal, unit, stringRep];
+ }
+
+ $scope.formatterMap = {
+ count: $scope.formatCount,
+ distance: $scope.formatDistance,
+ duration: $scope.formatDuration,
+ mean_speed: $scope.formatMeanSpeed
+ }
+
+ var formatModeMap = function(modeMapList, metric) {
+ const formatter = $scope.formatterMap[metric];
+ let formattedModeList = [];
+ modeMapList.forEach((modeMap) => {
+ let currMode = modeMap["key"];
+ let modeStatList = modeMap["values"];
+ let formattedModeStatList = modeStatList.map((modeStat) => {
+ let [formatVal, unit, stringRep] = formatter(modeStat[1]);
+ let copiedModeStat = angular.copy(modeStat);
+ copiedModeStat[1] = formatVal;
+ copiedModeStat.push(unit);
+ copiedModeStat.push(stringRep);
+ return copiedModeStat;
+ });
+ formattedModeList.push({key: currMode, values: formattedModeStatList});
+ });
+ return formattedModeList;
}
$scope.changeFromWeekday = function() {
@@ -1063,10 +1201,69 @@ angular.module('emission.main.metrics',['nvd3',
initSelect();
$scope.doRefresh = function() {
- first = true;
getMetrics();
}
+ $scope.$on('$ionicView.enter',function(){
+ $scope.startTime = moment().utc()
+ ClientStats.addEvent(ClientStats.getStatKeys().OPENED_APP).then(
+ function() {
+ console.log("Added "+ClientStats.getStatKeys().OPENED_APP+" event");
+ });
+ });
+
+ $scope.$on('$ionicView.leave',function() {
+ var timeOnPage = moment().utc() - $scope.startTime;
+ ClientStats.addReading(ClientStats.getStatKeys().METRICS_TIME, timeOnPage);
+ });
+
+ $ionicPlatform.on("pause", function() {
+ if ($state.$current == "root.main.metrics") {
+ var timeOnPage = moment().utc() - $scope.startTime;
+ ClientStats.addReading(ClientStats.getStatKeys().METRICS_TIME, timeOnPage);
+ }
+ })
+
+ $ionicPlatform.on("resume", function() {
+ if ($state.$current == "root.main.metrics") {
+ $scope.startTime = moment().utc()
+ }
+ })
+
+ $scope.linkToMaps = function() {
+ let start = $scope.suggestionData.startCoordinates[1] + ',' + $scope.suggestionData.startCoordinates[0];
+ let destination = $scope.suggestionData.endCoordinates[1] + ',' + $scope.suggestionData.endCoordinates[0];
+ var mode = $scope.suggestionData.mode
+ if(ionic.Platform.isIOS()){
+ if (mode === 'bike') {
+ mode = 'b';
+ } else if (mode === 'public') {
+ mode = 'r';
+ } else if (mode === 'walk') {
+ mode = 'w';
+ }
+ window.open('https://www.maps.apple.com/?saddr=' + start + '&daddr=' + destination + '&dirflg=' + mode, '_system');
+ } else {
+ if (mode === 'bike') {
+ mode = 'b';
+ } else if (mode === 'public') {
+ mode = 'r';
+ } else if (mode === 'walk') {
+ mode = 'w';
+ }
+ window.open('https://www.google.com/maps?saddr=' + start + '&daddr=' + destination +'&dirflg=' + mode, '_system');
+ }
+ }
+
+ $scope.linkToDiary = function(trip_id) {
+ console.log("Loading trip "+trip_id);
+ window.location.href = "#/root/main/diary/" + trip_id;
+ }
+
+ $scope.hasUsername = function(obj) {
+ return (obj.hasOwnProperty('username'));
+ }
+
$scope.modeIcon = function(key) {
var icons = {"BICYCLING":"ion-android-bicycle",
"ON_FOOT":" ion-android-walk",
@@ -1086,8 +1283,10 @@ angular.module('emission.main.metrics',['nvd3',
$scope.setCurDayFrom = function(val) {
if (val) {
$scope.selectCtrl.fromDateTimestamp = moment(val).utc();
+ $scope.datepickerObjFrom.inputMoment = $scope.selectCtrl.fromDateTimestamp;
$scope.datepickerObjFrom.inputDate = $scope.selectCtrl.fromDateTimestamp.toDate();
} else {
+ $scope.datepickerObjFrom.inputMoment = $scope.selectCtrl.fromDateTimestamp;
$scope.datepickerObjFrom.inputDate = $scope.selectCtrl.fromDateTimestamp.toDate();
}
@@ -1095,11 +1294,12 @@ angular.module('emission.main.metrics',['nvd3',
$scope.setCurDayTo = function(val) {
if (val) {
$scope.selectCtrl.toDateTimestamp = moment(val).utc();
+ $scope.datepickerObjTo.inputMoment = $scope.selectCtrl.toDateTimestamp;
$scope.datepickerObjTo.inputDate = $scope.selectCtrl.toDateTimestamp.toDate();
} else {
+ $scope.datepickerObjTo.inputMoment = $scope.selectCtrl.toDateTimestamp;
$scope.datepickerObjTo.inputDate = $scope.selectCtrl.toDateTimestamp.toDate();
}
-
};
@@ -1132,9 +1332,8 @@ angular.module('emission.main.metrics',['nvd3',
]
});
}
- $scope.datepickerObjFrom = {
- callback: $scope.setCurDayFrom,
- inputDate: $scope.selectCtrl.fromDateTimestamp.toDate(),
+
+ $scope.datepickerObjBase = {
todayLabel: $translate.instant('list-datepicker-today'), //Optional
closeLabel: $translate.instant('list-datepicker-close'), //Optional
setLabel: $translate.instant('list-datepicker-set'), //Optional
@@ -1146,28 +1345,23 @@ angular.module('emission.main.metrics',['nvd3',
from: new Date(2015, 1, 1),
to: new Date(),
showTodayButton: true,
- dateFormat: 'dd/MM/yyyy',
closeOnSelect: false,
// add this instruction if you want to exclude a particular weekday, e.g. Saturday disableWeekdays: [6]
};
- $scope.datepickerObjTo = {
+
+ $scope.datepickerObjFrom = angular.copy($scope.datepickerObjBase);
+ angular.extend($scope.datepickerObjFrom, {
+ callback: $scope.setCurDayFrom,
+ inputDate: $scope.selectCtrl.fromDateTimestamp.toDate(),
+ inputMoment: $scope.selectCtrl.fromDateTimestamp,
+ });
+
+ $scope.datepickerObjTo = angular.copy($scope.datepickerObjBase);
+ angular.extend($scope.datepickerObjTo, {
callback: $scope.setCurDayTo,
inputDate: $scope.selectCtrl.toDateTimestamp.toDate(),
- todayLabel: $translate.instant('list-datepicker-today'), //Optional
- closeLabel: $translate.instant('list-datepicker-close'), //Optional
- setLabel: $translate.instant('list-datepicker-set'), //Optional
- titleLabel: $translate.instant('metrics.pick-a-date'),
- mondayFirst: false,
- weeksList: moment.weekdaysMin(),
- monthsList: moment.monthsShort(),
- templateType: 'popup',
- from: new Date(2015, 1, 1),
- to: new Date(),
- showTodayButton: true,
- dateFormat: 'dd/MM/yyyy',
- closeOnSelect: false,
- // add this instruction if you want to exclude a particular weekday, e.g. Saturday disableWeekdays: [6]
- };
+ inputMoment: $scope.selectCtrl.toDateTimestamp,
+ });
$scope.pickFromDay = function() {
ionicDatePicker.openDatePicker($scope.datepickerObjFrom);
@@ -1207,4 +1401,41 @@ angular.module('emission.main.metrics',['nvd3',
}
+})
+.directive('diffdisplay', function() {
+ return {
+ scope: {
+ change: "="
+ },
+ link: function(scope) {
+ if (isNaN(scope.change.low)) scope.change.low = 0;
+ if (isNaN(scope.change.high)) scope.change.high = 0;
+ console.log("In diffdisplay, after changes, scope = ", scope);
+ },
+ templateUrl: "templates/metrics/arrow-greater-lesser.html"
+ }
+})
+.directive('rangedisplay', function() {
+ return {
+ scope: {
+ range: "="
+ },
+ link: function(scope) {
+ // console.log("RANGE DISPLAY "+JSON.stringify(scope.range));
+ var humanize = function(num) {
+ if (Math.abs(num) < 1) {
+ return num.toFixed(2);
+ } else {
+ return num.toFixed(0);
+ }
+ }
+
+ if (Math.abs(scope.range.high - scope.range.low) < 1) {
+ scope.tinyDiff = true;
+ }
+ scope.lowFmt = humanize(scope.range.low);
+ scope.highFmt = humanize(scope.range.high);
+ },
+ templateUrl: "templates/metrics/range-display.html"
+ }
});
diff --git a/www/js/services.js b/www/js/services.js
index 3571228d7..6c1733182 100644
--- a/www/js/services.js
+++ b/www/js/services.js
@@ -430,183 +430,6 @@ angular.module('emission.services', ['emission.plugin.logger',
})
-.service('CarbonDatasetHelper', function(KVStore) {
- var CARBON_DATASET_KEY = 'carbon_dataset_locale';
-
- // Values are in Kg/PKm (kilograms per passenger-kilometer)
- // Sources for EU values:
- // - Tremod: 2017, CO2, CH4 and N2O in CO2-equivalent
- // - HBEFA: 2020, CO2 (per country)
- // German data uses Tremod. Other EU countries (and Switzerland) use HBEFA for car and bus,
- // and Tremod for train and air (because HBEFA doesn't provide these).
- // EU data is an average of the Tremod/HBEFA data for the countries listed;
- // for this average the HBEFA data was used also in the German set (for car and bus).
- var carbonDatasets = {
- US: {
- regionName: "United States",
- footprintData: {
- WALKING: 0,
- BICYCLING: 0,
- CAR: 267/1609,
- BUS: 278/1609,
- LIGHT_RAIL: 120/1609,
- SUBWAY: 74/1609,
- TRAM: 90/1609,
- TRAIN: 92/1609,
- AIR_OR_HSR: 217/1609
- }
- },
- EU: { // Plain average of values for the countries below (using HBEFA for car and bus, Tremod for others)
- regionName: "European Union",
- footprintData: {
- WALKING: 0,
- BICYCLING: 0,
- CAR: 0.14515,
- BUS: 0.04751,
- LIGHT_RAIL: 0.064,
- SUBWAY: 0.064,
- TRAM: 0.064,
- TRAIN: 0.048,
- AIR_OR_HSR: 0.201
- }
- },
- DE: {
- regionName: "Germany",
- footprintData: {
- WALKING: 0,
- BICYCLING: 0,
- CAR: 0.139, // Tremod (passenger car)
- BUS: 0.0535, // Tremod (average city/coach)
- LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
- SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAIN: 0.048, // Tremod (DE average short/long distance)
- AIR_OR_HSR: 0.201 // Tremod (DE airplane)
- }
- },
- FR: {
- regionName: "France",
- footprintData: {
- WALKING: 0,
- BICYCLING: 0,
- CAR: 0.13125, // HBEFA (passenger car, considering 1 passenger)
- BUS: 0.04838, // HBEFA (average short/long distance, considering 16/25 passengers)
- LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
- SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAIN: 0.048, // Tremod (DE average short/long distance)
- AIR_OR_HSR: 0.201 // Tremod (DE airplane)
- }
- },
- AT: {
- regionName: "Austria",
- footprintData: {
- WALKING: 0,
- BICYCLING: 0,
- CAR: 0.14351, // HBEFA (passenger car, considering 1 passenger)
- BUS: 0.04625, // HBEFA (average short/long distance, considering 16/25 passengers)
- LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
- SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAIN: 0.048, // Tremod (DE average short/long distance)
- AIR_OR_HSR: 0.201 // Tremod (DE airplane)
- }
- },
- SE: {
- regionName: "Sweden",
- footprintData: {
- WALKING: 0,
- BICYCLING: 0,
- CAR: 0.13458, // HBEFA (passenger car, considering 1 passenger)
- BUS: 0.04557, // HBEFA (average short/long distance, considering 16/25 passengers)
- LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
- SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAIN: 0.048, // Tremod (DE average short/long distance)
- AIR_OR_HSR: 0.201 // Tremod (DE airplane)
- }
- },
- NO: {
- regionName: "Norway",
- footprintData: {
- WALKING: 0,
- BICYCLING: 0,
- CAR: 0.13265, // HBEFA (passenger car, considering 1 passenger)
- BUS: 0.04185, // HBEFA (average short/long distance, considering 16/25 passengers)
- LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
- SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAIN: 0.048, // Tremod (DE average short/long distance)
- AIR_OR_HSR: 0.201 // Tremod (DE airplane)
- }
- },
- CH: {
- regionName: "Switzerland",
- footprintData: {
- WALKING: 0,
- BICYCLING: 0,
- CAR: 0.17638, // HBEFA (passenger car, considering 1 passenger)
- BUS: 0.04866, // HBEFA (average short/long distance, considering 16/25 passengers)
- LIGHT_RAIL: 0.064, // Tremod (DE tram, urban rail and subway)
- SUBWAY: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAM: 0.064, // Tremod (DE tram, urban rail and subway)
- TRAIN: 0.048, // Tremod (DE average short/long distance)
- AIR_OR_HSR: 0.201 // Tremod (DE airplane)
- }
- }
- };
-
- var defaultCarbonDatasetCode = 'US';
- var currentCarbonDatasetCode = defaultCarbonDatasetCode;
-
- // we need to call the method from within a promise in initialize()
- // and using this.setCurrentCarbonDatasetLocale doesn't seem to work
- var setCurrentCarbonDatasetLocale = function(localeCode) {
- for (var code in carbonDatasets) {
- if (code == localeCode) {
- currentCarbonDatasetCode = localeCode;
- break;
- }
- }
- }
-
- this.loadCarbonDatasetLocale = function() {
- return KVStore.get(CARBON_DATASET_KEY).then(function(localeCode) {
- Logger.log("CarbonDatasetHelper.loadCarbonDatasetLocale() obtained value from storage [" + localeCode + "]");
- if (!localeCode) {
- localeCode = defaultCarbonDatasetCode;
- Logger.log("CarbonDatasetHelper.loadCarbonDatasetLocale() no value in storage, using [" + localeCode + "] instead");
- }
- setCurrentCarbonDatasetLocale(localeCode);
- });
- }
-
- this.saveCurrentCarbonDatasetLocale = function (localeCode) {
- setCurrentCarbonDatasetLocale(localeCode);
- KVStore.set(CARBON_DATASET_KEY, currentCarbonDatasetCode);
- Logger.log("CarbonDatasetHelper.saveCurrentCarbonDatasetLocale() saved value [" + currentCarbonDatasetCode + "] to storage");
- }
-
- this.getCarbonDatasetOptions = function() {
- var options = [];
- for (var code in carbonDatasets) {
- options.push({
- text: code, //carbonDatasets[code].regionName,
- value: code
- });
- }
- return options;
- };
-
- this.getCurrentCarbonDatasetCode = function () {
- return currentCarbonDatasetCode;
- };
-
- this.getCurrentCarbonDatasetFootprint = function () {
- return carbonDatasets[currentCarbonDatasetCode].footprintData;
- };
-})
-
// common configuration methods across all screens
// e.g. maps
// for consistent L&F
diff --git a/www/js/splash/localnotify.js b/www/js/splash/localnotify.js
index dde7012bc..e81462ff7 100644
--- a/www/js/splash/localnotify.js
+++ b/www/js/splash/localnotify.js
@@ -17,17 +17,18 @@ angular.module('emission.splash.localnotify', ['emission.plugin.logger',
localNotify.getRedirectState = function(notification) {
// TODO: Think whether this should be in data or in category
if (angular.isDefined(notification.data)) {
- return notification.data.redirectTo;
+ return [notification.data.redirectTo, notification.data.redirectParams];
}
return undefined;
}
- localNotify.handleLaunch = function(targetState) {
+ localNotify.handleLaunch = function(targetState, targetParams) {
$rootScope.redirectTo = targetState;
- $state.go(targetState);
+ $rootScope.redirectParams = targetParams;
+ $state.go(targetState, targetParams, { reload : true });
}
- localNotify.handlePrompt = function(notification, targetState) {
+ localNotify.handlePrompt = function(notification, targetState, targetParams) {
Logger.log("Prompting for notification "+notification.title+" and text "+notification.text);
var promptPromise = $ionicPopup.show({title: notification.title,
template: notification.text,
@@ -48,7 +49,7 @@ angular.module('emission.splash.localnotify', ['emission.plugin.logger',
});
promptPromise.then(function(handle) {
if (handle == true) {
- localNotify.handleLaunch(targetState);
+ localNotify.handleLaunch(targetState, targetParams);
} else {
Logger.log("Ignoring notification "+notification.title+" and text "+notification.text);
}
@@ -56,13 +57,17 @@ angular.module('emission.splash.localnotify', ['emission.plugin.logger',
}
localNotify.handleNotification = function(notification,state,data) {
- var targetState = localNotify.getRedirectState(notification);
+ // Comment this out for ease of testing. But in the real world, we do in fact want to
+ // cancel the notification to avoid "hey! I just fixed this, why is the notification still around!"
+ // issues
+ // $window.cordova.plugins.notification.local.cancel(notification.id);
+ var [targetState, targetParams] = localNotify.getRedirectState(notification);
Logger.log("targetState = "+targetState);
if (angular.isDefined(targetState)) {
- if (state == "foreground") {
- localNotify.handlePrompt(notification, targetState);
+ if (state.foreground == true) {
+ localNotify.handlePrompt(notification, targetState, targetParams);
} else {
- localNotify.handleLaunch(targetState);
+ localNotify.handleLaunch(targetState, targetParams);
}
}
}
@@ -79,10 +84,7 @@ angular.module('emission.splash.localnotify', ['emission.plugin.logger',
// alert("notification cancelled, no report");
});
$window.cordova.plugins.notification.local.on('trigger', function (notification, state, data) {
- Logger.log("triggered, no action");
- if ($ionicPlatform.is('ios')) {
- localNotify.handleNotification(notification, state, data);
- }
+ localNotify.handleNotification(notification, state, data);
});
$window.cordova.plugins.notification.local.on('click', function (notification, state, data) {
localNotify.handleNotification(notification, state, data);
@@ -91,6 +93,8 @@ angular.module('emission.splash.localnotify', ['emission.plugin.logger',
$ionicPlatform.ready().then(function() {
localNotify.registerRedirectHandler();
+ Logger.log("finished registering handlers, about to fire queued events");
+ $window.cordova.plugins.notification.local.fireQueuedEvents();
});
return localNotify;
diff --git a/www/js/splash/pushnotify.js b/www/js/splash/pushnotify.js
index f72312677..07699add6 100644
--- a/www/js/splash/pushnotify.js
+++ b/www/js/splash/pushnotify.js
@@ -1,3 +1,18 @@
+/*
+ * This module deals with the interaction with the push plugin, the redirection
+ * of silent push notifications and the re-parsing of iOS pushes. It then
+ * re-emits a CLOUD_NOTIFICATION_EVENT that other modules can listen to.
+ *
+ * Other modules, such as the survey code, and the remotenotify module, listen
+ * to these CLOUD_NOTIFICATION_EVENTs and handle them through launching
+ * surveys, displaying popups, etc.
+ *
+ * This allows us to decouple the push handling logic from push notification
+ * interface. Note that the local notification is not currently decoupled since
+ * it only supports redirection to a specific app page. If the local
+ * notification handling gets more complex, we should consider decoupling it as well.
+ */
+
angular.module('emission.splash.pushnotify', ['emission.plugin.logger',
'emission.services',
'emission.splash.startprefs'])
@@ -17,9 +32,8 @@ angular.module('emission.splash.pushnotify', ['emission.plugin.logger',
"clearBadge": true
},
"android": {
- "senderID": "1096592179912",
"iconColor": "#54DCC1",
- "icon": "ic_question_answer",
+ "icon": "ic_mood_question",
"clearNotifications": true
}
});
diff --git a/www/js/splash/remotenotify.js b/www/js/splash/remotenotify.js
new file mode 100644
index 000000000..0d95d8faa
--- /dev/null
+++ b/www/js/splash/remotenotify.js
@@ -0,0 +1,76 @@
+/*
+ * This module deals with handling specific push messages that open web pages
+ * or popups. It does not interface with the push plugin directly. Instead, it
+ * assumes that another module (currently `pushnotify`) deals with the plugin
+ * interface and emits a CLOUD_NOTIFICATION_EVENT when a push notification is
+ * received.
+ *
+ * This allows us to decouple the push handling logic from push notification
+ * interface. Note that the local notification is not currently decoupled since
+ * it only supports redirection to a specific app page. If the local
+ * notification handling gets more complex, we should consider decoupling it as well.
+ */
+'use strict';
+
+angular.module('emission.splash.remotenotify', ['emission.plugin.logger',
+ 'emission.splash.startprefs',
+ 'emission.stats.clientstats'])
+
+.factory('RemoteNotify', function($http, $window, $ionicPopup, $rootScope, ClientStats,
+ CommHelper, Logger) {
+
+ var remoteNotify = {};
+ remoteNotify.options = "location=yes,clearcache=no,toolbar=yes,hideurlbar=yes";
+
+ /*
+ TODO: Potentially unify with the survey URL loading
+ */
+ remoteNotify.launchWebpage = function(url) {
+ // THIS LINE FOR inAppBrowser
+ let iab = $window.cordova.InAppBrowser.open(url, '_blank', remoteNotify.options);
+ }
+
+ remoteNotify.launchPopup = function(title, text) {
+ // THIS LINE FOR inAppBrowser
+ let alertPopup = $ionicPopup.alert({
+ title: title,
+ template: text
+ });
+ }
+
+ remoteNotify.init = function() {
+ $rootScope.$on('cloud:push:notification', function(event, data) {
+ ClientStats.addEvent(ClientStats.getStatKeys().NOTIFICATION_OPEN).then(
+ function() {
+ console.log("Added "+ClientStats.getStatKeys().NOTIFICATION_OPEN+" event. Data = " + JSON.stringify(data));
+ });
+ Logger.log("data = "+JSON.stringify(data));
+ if (angular.isDefined(data.additionalData) &&
+ angular.isDefined(data.additionalData.payload) &&
+ angular.isDefined(data.additionalData.payload.alert_type))
+ if(data.additionalData.payload.alert_type == "website") {
+ var webpage_spec = data.additionalData.payload.spec;
+ if (angular.isDefined(webpage_spec) &&
+ angular.isDefined(webpage_spec.url) &&
+ webpage_spec.url.startsWith("https://")) {
+ remoteNotify.launchWebpage(webpage_spec.url);
+ } else {
+ $ionicPopup.alert("webpage was not specified correctly. spec is "+JSON.stringify(webpage_spec));
+ }
+ }
+ if(data.additionalData.payload.alert_type == "popup") {
+ var popup_spec = data.additionalData.payload.spec;
+ if (angular.isDefined(popup_spec) &&
+ angular.isDefined(popup_spec.title) &&
+ angular.isDefined(popup_spec.text)) {
+ remoteNotify.launchPopup(popup_spec.title, popup_spec.text);
+ } else {
+ $ionicPopup.alert("webpage was not specified correctly. spec is "+JSON.stringify(popup_spec));
+ }
+ }
+ });
+ }
+
+ remoteNotify.init();
+ return remoteNotify;
+});
diff --git a/www/js/splash/startprefs.js b/www/js/splash/startprefs.js
index e18c4054d..0ee47fc81 100644
--- a/www/js/splash/startprefs.js
+++ b/www/js/splash/startprefs.js
@@ -172,8 +172,10 @@ angular.module('emission.splash.startprefs', ['emission.plugin.logger',
return {state: 'root.main.diary'};
} else if (angular.isDefined($rootScope.redirectTo)) {
var redirState = $rootScope.redirectTo;
+ var redirParams = $rootScope.redirectParams;
$rootScope.redirectTo = undefined;
- return {state: redirState, params: {}};
+ $rootScope.redirectParams = undefined;
+ return {state: redirState, params: redirParams};
} else {
return {state: 'root.main.inf_scroll', params: {}};
}
diff --git a/www/js/stats/clientstats.js b/www/js/stats/clientstats.js
index c94dc07f4..3053b0282 100644
--- a/www/js/stats/clientstats.js
+++ b/www/js/stats/clientstats.js
@@ -4,7 +4,7 @@ angular.module('emission.stats.clientstats', [])
.factory('ClientStats', function($window) {
var clientStat = {};
-
+
clientStat.CLIENT_TIME = "stats/client_time";
clientStat.CLIENT_ERROR = "stats/client_error";
clientStat.CLIENT_NAV_EVENT = "stats/client_nav_event";
@@ -13,11 +13,16 @@ angular.module('emission.stats.clientstats', [])
return {
STATE_CHANGED: "state_changed",
BUTTON_FORCE_SYNC: "button_sync_forced",
+ CHECKED_DIARY: "checked_diary",
+ DIARY_TIME: "diary_time",
+ METRICS_TIME: "metrics_time",
CHECKED_INF_SCROLL: "checked_inf_scroll",
INF_SCROLL_TIME: "inf_scroll_time",
VERIFY_TRIP: "verify_trip",
LABEL_TAB_SWITCH: "label_tab_switch",
- SELECT_LABEL: "select_label"
+ SELECT_LABEL: "select_label",
+ EXPANDED_TRIP: "expanded_trip",
+ NOTIFICATION_OPEN: "notification_open"
};
}
@@ -81,4 +86,3 @@ angular.module('emission.stats.clientstats', [])
return clientStat;
})
-
diff --git a/www/js/survey/launch.js b/www/js/survey/external/launch.js
similarity index 96%
rename from www/js/survey/launch.js
rename to www/js/survey/external/launch.js
index 99447ed59..3c6cea1c5 100644
--- a/www/js/survey/launch.js
+++ b/www/js/survey/external/launch.js
@@ -1,9 +1,10 @@
'use strict';
-angular.module('emission.survey.launch', ['emission.services',
- 'emission.plugin.logger'])
+angular.module('emission.survey.external.launch', ['emission.services',
+ 'emission.plugin.logger',
+ 'emission.stats.clientstats'])
-.factory('SurveyLaunch', function($http, $window, $ionicPopup, $rootScope,
+.factory('SurveyLaunch', function($http, $window, $ionicPopup, $rootScope, ClientStats,
CommHelper, Logger) {
var surveylaunch = {};
@@ -212,6 +213,10 @@ angular.module('emission.survey.launch', ['emission.services',
surveylaunch.init = function() {
$rootScope.$on('cloud:push:notification', function(event, data) {
+ ClientStats.addEvent(ClientStats.getStatKeys().NOTIFICATION_OPEN).then(
+ function() {
+ console.log("Added "+ClientStats.getStatKeys().NOTIFICATION_OPEN+" event. Data = " + JSON.stringify(data));
+ });
Logger.log("data = "+JSON.stringify(data));
if (angular.isDefined(data.additionalData) &&
angular.isDefined(data.additionalData.payload) &&
diff --git a/www/js/survey/time_insert.js b/www/js/survey/external/time_insert.js
similarity index 100%
rename from www/js/survey/time_insert.js
rename to www/js/survey/external/time_insert.js
diff --git a/www/js/survey/uuid_insert_id.js b/www/js/survey/external/uuid_insert_id.js
similarity index 100%
rename from www/js/survey/uuid_insert_id.js
rename to www/js/survey/external/uuid_insert_id.js
diff --git a/www/js/survey/uuid_insert_xpath.js b/www/js/survey/external/uuid_insert_xpath.js
similarity index 100%
rename from www/js/survey/uuid_insert_xpath.js
rename to www/js/survey/external/uuid_insert_xpath.js
diff --git a/www/js/diary/infinite_scroll_filters.js b/www/js/survey/multilabel/infinite_scroll_filters.js
similarity index 85%
rename from www/js/diary/infinite_scroll_filters.js
rename to www/js/survey/multilabel/infinite_scroll_filters.js
index 1f441b330..ea9de3ed1 100644
--- a/www/js/diary/infinite_scroll_filters.js
+++ b/www/js/survey/multilabel/infinite_scroll_filters.js
@@ -8,12 +8,11 @@
* All UI elements should only use $scope variables.
*/
-angular.module('emission.main.diary.infscrollfilters',[
- 'emission.tripconfirm.services',
- 'emission.stats.clientstats',
+angular.module('emission.survey.multilabel.infscrollfilters',[
+ 'emission.survey.multilabel.services',
'emission.plugin.logger'
])
-.factory('InfScrollFilters', function(Logger, ConfirmHelper, ClientStats, $translate){
+.factory('InfScrollFilters', function(Logger, ConfirmHelper, $translate){
var sf = {};
var unlabeledCheck = function(t) {
return ConfirmHelper.INPUTS
@@ -39,10 +38,6 @@ angular.module('emission.main.diary.infscrollfilters',[
}
}
- sf.waitingForMod = function(t) {
- return t.waitingForMod == true;
- }
-
sf.UNLABELED = {
key: "unlabeled",
text: $translate.instant(".unlabeled"),
@@ -62,5 +57,10 @@ angular.module('emission.main.diary.infscrollfilters',[
filter: toLabelCheck,
width: "col-50"
}
+
+ sf.configuredFilters = [
+ sf.TO_LABEL,
+ sf.UNLABELED
+ ];
return sf;
});
diff --git a/www/js/survey/multilabel/multi-label-ui.js b/www/js/survey/multilabel/multi-label-ui.js
new file mode 100644
index 000000000..1ca55fc96
--- /dev/null
+++ b/www/js/survey/multilabel/multi-label-ui.js
@@ -0,0 +1,466 @@
+/*
+ * Directive to display a set of configurable labels for each trip
+ * Assumptions:
+ * - The directive is embedded within an ion-view
+ * - The controller for the ion-view has a function called
+ * 'recomputeDisplayTrips` which modifies the trip *list* as necessary. An
+ * example with the label view is removing the labeled trips from the
+ * "toLabel" filter. Function can be a no-op (for example, in
+ * the diary view)
+ * - The view is associated with a state which we can record in the client stats.
+ * - The directive implements a `verifyTrip` function that can be invoked by
+ * other components.
+ */
+
+angular.module('emission.survey.multilabel.buttons',
+ ['emission.survey.multilabel.services',
+ 'emission.stats.clientstats',
+ 'emission.enketo-survey.launch',
+ 'emission.main.diary.services'])
+.directive('multilabel', function() {
+ return {
+ scope: {
+ trip: "=",
+ unifiedConfirmsResults: "=",
+ recomputedelay: "@",
+ },
+ controller: "MultiLabelCtrl",
+ templateUrl: 'templates/survey/multilabel/multi-label-ui.html'
+ };
+})
+.controller("MultiLabelCtrl", function($scope, $element, $attrs,
+ ConfirmHelper, EnketoSurveyLaunch, $ionicPopover, $window, ClientStats, MultiLabelService) {
+ console.log("Invoked multilabel directive controller for labels "+ConfirmHelper.INPUTS);
+
+ var findViewElement = function() {
+ // console.log("$element is ", $element);
+ // console.log("parent row is", $element.parents("ion-item"));
+ let rowElement = $element.parents("ion-view")
+ // console.log("row Element is", rowElement);
+ return angular.element(rowElement);
+ }
+
+ var findViewState = function() {
+ let viewState = findViewElement().attr("state")
+ // console.log("view state is ", viewState);
+ return viewState;
+ }
+
+ var findViewScope = function() {
+ let viewScope = findViewElement().scope();
+ // console.log("view scope is ", viewScope);
+ return viewScope;
+ }
+
+ /**
+ * BEGIN: Required external interface for all label directives
+ * These methods will be invoked by the verifycheck directive
+ * For more details on cooperating directives in this situation, please see:
+ * e-mission/e-mission-docs#674 (comment)
+ * to
+ * e-mission/e-mission-docs#674 (comment)
+ *
+ * Input: none
+ * Side effect: verifies the trip (partially if needed) and updates the trip
+ * verifiability status.
+ */
+
+ /**
+ * verifyTrip turns all of a given trip's yellow labels green
+ */
+ $scope.verifyTrip = function() {
+ console.log("About to verify trip "+$scope.trip.start_ts
+ +" -> "+$scope.trip.end_ts+" with current visibility"
+ + $scope.trip.verifiability);
+ if ($scope.trip.verifiability != "can-verify") {
+ ClientStats.addReading(ClientStats.getStatKeys().VERIFY_TRIP,
+ {"verifiable": false, "currView": $scope.currentViewState});
+ return;
+ }
+ ClientStats.addReading(ClientStats.getStatKeys().VERIFY_TRIP,
+ {"verifiable": true,
+ "currView": $scope.currentViewState,
+ "userInput": angular.toJson($scope.trip.userInput),
+ "finalInference": angular.toJson($scope.trip.finalInference)});
+
+ $scope.draftInput = {
+ "start_ts": $scope.trip.start_ts,
+ "end_ts": $scope.trip.end_ts
+ };
+ $scope.editingTrip = $scope.trip;
+
+ for (const inputType of ConfirmHelper.INPUTS) {
+ const inferred = $scope.trip.finalInference[inputType];
+ // TODO: figure out what to do with "other". For now, do not verify.
+ if (inferred && !$scope.trip.userInput[inputType] && inferred != "other") $scope.store(inputType, inferred, false);
+ }
+ }
+
+ /*
+ * END: Required external interface for all label directives
+ */
+
+ if ($scope.recomputedelay == "") {
+ let THIRTY_SECS = 30 * 1000;
+ $scope.recomputedelay = THIRTY_SECS;
+ } else {
+ $scope.recomputedelay = $scope.recomputedelay * 1000;
+ }
+
+ MultiLabelService.setRecomputeDelay($scope.recomputedelay);
+
+ $scope.fillUserInputsGeojson = function() {
+ console.log("Checking to fill user inputs for "
+ +$scope.trip.display_start_time+" -> "+$scope.trip.display_end_time);
+ if (angular.isDefined($scope.trip)) {
+ $scope.$apply(() => {
+ $scope.trip.userInput = {};
+ ConfirmHelper.INPUTS.forEach(function(item, index) {
+ MultiLabelService.populateInputFromTimeline($scope.trip, $scope.trip.nextTripgj,
+ item, $scope.unifiedConfirmsResults[item]);
+ });
+ });
+ } else {
+ console.log("Trip information not yet bound, skipping fill");
+ }
+ }
+
+ $scope.popovers = {};
+ ConfirmHelper.INPUTS.forEach(function(item, index) {
+ let popoverPath = 'templates/diary/'+item.toLowerCase()+'-popover.html';
+ return $ionicPopover.fromTemplateUrl(popoverPath, {
+ scope: $scope
+ }).then(function (popover) {
+ $scope.popovers[item] = popover;
+ });
+ });
+
+ $scope.openPopover = function ($event, trip, inputType) {
+ if (inputType === 'SURVEY') {
+ return EnketoSurveyLaunch
+ .launch($scope, 'TripConfirmSurvey', { trip: trip })
+ .then(result => {
+ if (!result) {
+ return;
+ }
+ $scope.$apply(() => trip.userInput[inputType] = {text: result.label});
+ });
+ }
+ var userInput = trip.userInput[inputType];
+ if (angular.isDefined(userInput)) {
+ $scope.selected[inputType].value = userInput.value;
+ } else {
+ $scope.selected[inputType].value = '';
+ }
+ $scope.draftInput = {
+ "start_ts": trip.start_ts,
+ "end_ts": trip.end_ts
+ };
+ $scope.editingTrip = trip;
+ Logger.log("in openPopover, setting draftInput = " + JSON.stringify($scope.draftInput));
+ $scope.popovers[inputType].show($event);
+ };
+
+ var closePopover = function (inputType) {
+ $scope.selected[inputType] = {
+ value: ''
+ };
+ $scope.popovers[inputType].hide();
+ };
+
+
+ /**
+ * Store selected value for options
+ * $scope.selected is for display only
+ * the value is displayed on popover selected option
+ */
+ $scope.selected = {}
+ ConfirmHelper.INPUTS.forEach(function(item, index) {
+ $scope.selected[item] = {value: ''};
+ });
+ $scope.selected.other = {text: '', value: ''};
+
+ /*
+ * This is a curried function that curries the `$scope` variable
+ * while returing a function that takes `e` as the input
+ */
+ var checkOtherOptionOnTap = function ($scope, inputType) {
+ return function (e) {
+ if (!$scope.selected.other.text) {
+ e.preventDefault();
+ } else {
+ Logger.log("in choose other, other = " + JSON.stringify($scope.selected));
+ $scope.store(inputType, $scope.selected.other, true /* isOther */);
+ $scope.selected.other = '';
+ return $scope.selected.other;
+ }
+ }
+ };
+
+ $scope.choose = function (inputType) {
+ ClientStats.addReading(ClientStats.getStatKeys().SELECT_LABEL, {
+ "userInput": angular.toJson($scope.editingTrip.userInput),
+ "finalInference": angular.toJson($scope.editingTrip.finalInference),
+ "currView": $scope.currentViewState,
+ "inputKey": inputType,
+ "inputVal": $scope.selected[inputType].value
+ });
+ var isOther = false
+ if ($scope.selected[inputType].value != "other") {
+ $scope.store(inputType, $scope.selected[inputType], isOther);
+ } else {
+ isOther = true
+ ConfirmHelper.checkOtherOption(inputType, checkOtherOptionOnTap, $scope);
+ }
+ closePopover(inputType);
+ };
+
+ $scope.store = function (inputType, input, isOther) {
+ if(isOther) {
+ // Let's make the value for user entered inputs look consistent with our
+ // other values
+ input.value = ConfirmHelper.otherTextToValue(input.text);
+ }
+ $scope.draftInput.label = input.value;
+ Logger.log("in storeInput, after setting input.value = " + input.value + ", draftInput = " + JSON.stringify($scope.draftInput));
+ var tripToUpdate = $scope.editingTrip;
+ $window.cordova.plugins.BEMUserCache.putMessage(ConfirmHelper.inputDetails[inputType].key, $scope.draftInput).then(function () {
+ $scope.$apply(function() {
+ if (isOther) {
+ let fakeEntry = ConfirmHelper.getFakeEntry(input.value);
+ $scope.inputParams[inputType].options.push(fakeEntry);
+ $scope.inputParams[inputType].value2entry[input.value] = fakeEntry;
+ tripToUpdate.userInput[inputType] = angular.copy(fakeEntry);
+ tripToUpdate.userInput[inputType].write_ts = Date.now();
+ } else {
+ tripToUpdate.userInput[inputType] = angular.copy($scope.inputParams[inputType].value2entry[input.value]);
+ tripToUpdate.userInput[inputType].write_ts = Date.now();
+ }
+ let viewScope = findViewScope();
+ MultiLabelService.updateTripProperties(tripToUpdate, viewScope); // Redo our inferences, filters, etc. based on this new information
+ });
+ });
+ if (isOther == true)
+ $scope.draftInput = angular.undefined;
+ }
+
+ $scope.init = function() {
+ console.log("During initialization, trip is ", $scope.trip);
+ $scope.userInputDetails = [];
+ ConfirmHelper.INPUTS.forEach(function(item, index) {
+ const currInput = angular.copy(ConfirmHelper.inputDetails[item]);
+ currInput.name = item;
+ $scope.userInputDetails.push(currInput);
+ });
+ ConfirmHelper.inputParamsPromise.then((inputParams) => $scope.inputParams = inputParams);
+ console.log("Finished initializing directive, userInputDetails = ", $scope.userInputDetails);
+ $scope.currViewState = findViewState();
+ }
+
+ $scope.init();
+})
+.factory("MultiLabelService", function(ConfirmHelper, DiaryHelper, $timeout) {
+ var mls = {};
+ console.log("Creating MultiLabelService");
+ ConfirmHelper.inputParamsPromise.then((inputParams) => mls.inputParams = inputParams);
+
+ /**
+ * Embed 'inputType' to the trip.
+ */
+
+ mls.populateInputsAndInferences = function(trip, manualResultMap) {
+ if (angular.isDefined(trip)) {
+ // console.log("Expectation: "+JSON.stringify(trip.expectation));
+ // console.log("Inferred labels from server: "+JSON.stringify(trip.inferred_labels));
+ trip.userInput = {};
+ ConfirmHelper.INPUTS.forEach(function(item, index) {
+ mls.populateManualInputs(trip, trip.nextTrip, item,
+ manualResultMap[item]);
+ });
+ trip.finalInference = {};
+ mls.inferFinalLabels(trip);
+ mls.updateVerifiability(trip);
+ } else {
+ console.log("Trip information not yet bound, skipping fill");
+ }
+ }
+
+ /**
+ * Embed 'inputType' to the trip
+ * This is the version that is called from the list, which focuses only on
+ * manual inputs. It also sets some additional values
+ */
+ mls.populateManualInputs = function (trip, nextTrip, inputType, inputList) {
+ // Check unprocessed labels first since they are more recent
+ const unprocessedLabelEntry = DiaryHelper.getUserInputForTrip(trip, nextTrip,
+ inputList);
+ var userInputLabel = unprocessedLabelEntry? unprocessedLabelEntry.data.label : undefined;
+ if (!angular.isDefined(userInputLabel)) {
+ userInputLabel = trip.user_input[mls.inputType2retKey(inputType)];
+ }
+ mls.populateInput(trip.userInput, inputType, userInputLabel);
+ // Logger.log("Set "+ inputType + " " + JSON.stringify(userInputEntry) + " for trip starting at " + JSON.stringify(trip.start_fmt_time));
+ mls.editingTrip = angular.undefined;
+ }
+
+ /**
+ * Insert the given userInputLabel into the given inputType's slot in inputField
+ */
+ mls.populateInput = function(tripField, inputType, userInputLabel) {
+ if (angular.isDefined(userInputLabel)) {
+ var userInputEntry;
+ switch(inputType) {
+ case 'SURVEY':
+ userInputEntry = {text: userInputLabel};
+ break;
+ default:
+ userInputEntry = mls.inputParams[inputType].value2entry[userInputLabel];
+ if (!angular.isDefined(userInputEntry)) {
+ userInputEntry = ConfirmHelper.getFakeEntry(userInputLabel);
+ mls.inputParams[inputType].options.push(userInputEntry);
+ mls.inputParams[inputType].value2entry[userInputLabel] = userInputEntry;
+ }
+ break;
+ }
+ console.log("Mapped label "+userInputLabel+" to entry "+JSON.stringify(userInputEntry));
+ tripField[inputType] = userInputEntry;
+ }
+ }
+
+ /*
+ * This is a HACK to work around the issue that the label screen and diary
+ * screen are not unified. We should remove this, and the timestamp in the
+ * userInput field when we do.
+ */
+ mls.copyInputIfNewer = function(potentiallyModifiedTrip, originalTrip) {
+ ConfirmHelper.INPUTS.forEach(function(item, index) {
+ let pmInput = potentiallyModifiedTrip.userInput;
+ let origInput = originalTrip.userInput;
+ if (((pmInput[item] || {}).write_ts || 0) > ((origInput[item] || {}).write_ts || 0)) {
+ origInput[item] = pmInput[item];
+ }
+ });
+ }
+
+ mls.updateTripProperties = function(trip, viewScope) {
+ mls.inferFinalLabels(trip);
+ mls.updateVerifiability(trip);
+ mls.updateVisibilityAfterDelay(trip, viewScope);
+ }
+ /**
+ * Given the list of possible label tuples we've been sent and what the user has already input for the trip, choose the best labels to actually present to the user.
+ * The algorithm below operationalizes these principles:
+ * - Never consider label tuples that contradict a green label
+ * - Obey "conservation of uncertainty": the sum of probabilities after filtering by green labels must equal the sum of probabilities before
+ * - After filtering, predict the most likely choices at the level of individual labels, not label tuples
+ * - Never show user yellow labels that have a lower probability of being correct than confidenceThreshold
+ */
+ mls.inferFinalLabels = function(trip) {
+ // Deep copy the possibility tuples
+ let labelsList = [];
+ if (angular.isDefined(trip.inferred_labels)) {
+ labelsList = JSON.parse(JSON.stringify(trip.inferred_labels));
+ }
+
+ // Capture the level of certainty so we can reconstruct it later
+ const totalCertainty = labelsList.map(item => item.p).reduce(((item, rest) => item + rest), 0);
+
+ // Filter out the tuples that are inconsistent with existing green labels
+ for (const inputType of ConfirmHelper.INPUTS) {
+ const userInput = trip.userInput[inputType];
+ if (userInput) {
+ const retKey = mls.inputType2retKey(inputType);
+ labelsList = labelsList.filter(item => item.labels[retKey] == userInput.value);
+ }
+ }
+
+ // Red labels if we have no possibilities left
+ if (labelsList.length == 0) {
+ for (const inputType of ConfirmHelper.INPUTS) mls.populateInput(trip.finalInference, inputType, undefined);
+ }
+ else {
+ // Normalize probabilities to previous level of certainty
+ const certaintyScalar = totalCertainty/labelsList.map(item => item.p).reduce((item, rest) => item + rest);
+ labelsList.forEach(item => item.p*=certaintyScalar);
+
+ for (const inputType of ConfirmHelper.INPUTS) {
+ // For each label type, find the most probable value by binning by label value and summing
+ const retKey = mls.inputType2retKey(inputType);
+ let valueProbs = new Map();
+ for (const tuple of labelsList) {
+ const labelValue = tuple.labels[retKey];
+ if (!valueProbs.has(labelValue)) valueProbs.set(labelValue, 0);
+ valueProbs.set(labelValue, valueProbs.get(labelValue) + tuple.p);
+ }
+ let max = {p: 0, labelValue: undefined};
+ for (const [thisLabelValue, thisP] of valueProbs) {
+ // In the case of a tie, keep the label with earlier first appearance in the labelsList (we used a Map to preserve this order)
+ if (thisP > max.p) max = {p: thisP, labelValue: thisLabelValue};
+ }
+
+ // Display a label as red if its most probable inferred value has a probability less than or equal to the trip's confidence_threshold
+ // Fails safe if confidence_threshold doesn't exist
+ if (max.p <= trip.confidence_threshold) max.labelValue = undefined;
+
+ mls.populateInput(trip.finalInference, inputType, max.labelValue);
+ }
+ }
+ }
+
+ /**
+ * MODE (becomes manual/mode_confirm) becomes mode_confirm
+ */
+ mls.inputType2retKey = function(inputType) {
+ return ConfirmHelper.inputDetails[inputType].key.split("/")[1];
+ }
+
+ /**
+ * For a given trip, compute how the "verify" button should behave.
+ * If the trip has at least one yellow label, the button should be clickable.
+ * If the trip has all green labels, the button should be disabled because everything has already been verified.
+ * If the trip has all red labels or a mix of red and green, the button should be disabled because we need more detailed user input.
+ */
+
+ mls.setRecomputeDelay = function(rd) {
+ mls.recomputedelay = rd;
+ }
+
+ mls.updateVerifiability = function(trip) {
+ var allGreen = true;
+ var someYellow = false;
+ for (const inputType of ConfirmHelper.INPUTS) {
+ const green = trip.userInput[inputType];
+ const yellow = trip.finalInference[inputType] && !green;
+ if (yellow) someYellow = true;
+ if (!green) allGreen = false;
+ }
+ trip.verifiability = someYellow ? "can-verify" : (allGreen ? "already-verified" : "cannot-verify");
+ }
+
+ /*
+ * Embody the logic for delayed update:
+ * the recompute logic already keeps trips that are waitingForModification
+ * even if they would be filtered otherwise.
+ * so here:
+ * - set the trip as waiting for potential modifications
+ * - create a one minute timeout that will remove the wait and recompute
+ * - clear the existing timeout (if any)
+ */
+ mls.updateVisibilityAfterDelay = function(trip, viewScope) {
+ // We have just edited this trip, and are now waiting to see if the user
+ // is going to modify it further
+ trip.waitingForMod = true;
+ let currTimeoutPromise = trip.timeoutPromise;
+ Logger.log("trip starting at "+trip.start_fmt_time+": creating new timeout of "+mls.recomputedelay);
+ trip.timeoutPromise = $timeout(function() {
+ Logger.log("trip starting at "+trip.start_fmt_time+": executing recompute");
+ trip.waitingForMod = false;
+ trip.timeoutPromise = undefined;
+ console.log("Recomputing display trips on ", viewScope);
+ viewScope.recomputeDisplayTrips();
+ }, mls.recomputedelay);
+ Logger.log("trip starting at "+trip.start_fmt_time+": cancelling existing timeout "+currTimeoutPromise);
+ $timeout.cancel(currTimeoutPromise);
+ }
+ return mls;
+});
diff --git a/www/js/tripconfirm/post-trip-map-display.js b/www/js/survey/multilabel/post-trip-map-display.js
similarity index 98%
rename from www/js/tripconfirm/post-trip-map-display.js
rename to www/js/survey/multilabel/post-trip-map-display.js
index 4d25a4a84..90c11fdcd 100644
--- a/www/js/tripconfirm/post-trip-map-display.js
+++ b/www/js/survey/multilabel/post-trip-map-display.js
@@ -1,8 +1,8 @@
'use strict';
-angular.module('emission.tripconfirm.posttrip.map',['ui-leaflet', 'ng-walkthrough',
+angular.module('emission.survey.multilabel.posttrip.map',['ui-leaflet', 'ng-walkthrough',
'emission.plugin.kvstore',
'emission.services',
- 'emission.tripconfirm.services',
+ 'emission.survey.multilabel.services',
'emission.plugin.logger',
'emission.main.diary.services'])
diff --git a/www/js/tripconfirm/post-trip-prompt.js b/www/js/survey/multilabel/post-trip-prompt.js
similarity index 99%
rename from www/js/tripconfirm/post-trip-prompt.js
rename to www/js/survey/multilabel/post-trip-prompt.js
index e9b011427..ecf173aa5 100644
--- a/www/js/tripconfirm/post-trip-prompt.js
+++ b/www/js/survey/multilabel/post-trip-prompt.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('emission.tripconfirm.posttrip.prompt', ['emission.plugin.logger'])
+angular.module('emission.survey.multilabel.posttrip.prompt', ['emission.plugin.logger'])
.factory("PostTripAutoPrompt", function($window, $ionicPlatform, $rootScope, $state,
$ionicPopup, Logger, $translate) {
var ptap = {};
diff --git a/www/js/tripconfirm/trip-confirm-services.js b/www/js/survey/multilabel/trip-confirm-services.js
similarity index 88%
rename from www/js/tripconfirm/trip-confirm-services.js
rename to www/js/survey/multilabel/trip-confirm-services.js
index 22b323eeb..5820266ed 100644
--- a/www/js/tripconfirm/trip-confirm-services.js
+++ b/www/js/survey/multilabel/trip-confirm-services.js
@@ -1,4 +1,4 @@
-angular.module('emission.tripconfirm.services', ['ionic', 'emission.i18n.utils', "emission.plugin.logger"])
+angular.module('emission.survey.multilabel.services', ['ionic', 'emission.i18n.utils', "emission.plugin.logger"])
.factory("ConfirmHelper", function($http, $ionicPopup, $translate, i18nUtils, Logger) {
var ch = {};
// ch.INPUTS = ["MODE", "PURPOSE"]
@@ -138,5 +138,19 @@ angular.module('emission.tripconfirm.services', ['ionic', 'emission.i18n.utils',
value: otherValue};
}
+ ch.inputParamsPromise = new Promise(function(resolve, reject) {
+ inputParams = {};
+ console.log("Starting promise execution with ", inputParams);
+ omPromises = ch.INPUTS.map((item) => ch.getOptionsAndMaps(item));
+ console.log("Promise list ", omPromises);
+ Promise.all(omPromises).then((omObjList) =>
+ ch.INPUTS.forEach(function(item, index) {
+ inputParams[item] = omObjList[index];
+ }));
+ console.log("Read all inputParams, resolving with ", inputParams);
+ resolve(inputParams);
+ });
+
+
return ch;
});
diff --git a/www/js/survey/one-click-button.js b/www/js/survey/one-click-button.js
new file mode 100644
index 000000000..6cc68c2ef
--- /dev/null
+++ b/www/js/survey/one-click-button.js
@@ -0,0 +1,39 @@
+angular.module('emission.survey.verifycheck', [])
+.directive('verifycheck', function($timeout) {
+ return {
+ scope: {
+ linkedtag: "@",
+ linkedid: "@", // specific ID, if present, simplifies the dom traversal logic
+ },
+ controller: "OneClickButtonCtrl",
+ templateUrl: 'templates/survey/one-click-button.html'
+ };
+})
+.controller("OneClickButtonCtrl", function($scope, $element, $attrs) {
+ var findLinkedLabelScope = function() {
+ if ($scope.linkedid) {
+ let linkedsurveytag = angular.element(document.getElementById($scope.linkedid));
+ console.log("matching linkedsurvey with id "+$scope.linkedid+" is ",linkedsurveytag);
+ let linkedlabel = linkedsurveytag.find($scope.linkedtag);
+ console.log("child linkedlabel is", linkedlabel);
+ let linkedlabelScope = angular.element(linkedlabel).isolateScope();
+ console.log("linkedlabel scope is", linkedlabelScope);
+ return linkedlabelScope;
+ } else {
+ console.log("$element is ", $element, "linkedtag is ",$scope.linkedtag);
+ console.log("parent row is", $element.parents("ion-item"));
+ let rowElement = $element.parents("ion-item")
+ console.log("row Element is", rowElement);
+ let linkedlabel = rowElement.find($scope.linkedtag);
+ console.log("child linkedlabel is", linkedlabel);
+ let linkedlabelScope = angular.element(linkedlabel).isolateScope();
+ console.log("linkedlabel scope is", linkedlabelScope);
+ return linkedlabelScope;
+ }
+ };
+
+ $scope.verifyTrip = function() {
+ let linkedLabelScope = findLinkedLabelScope();
+ linkedLabelScope.verifyTrip();
+ }
+});
diff --git a/www/js/survey/survey.js b/www/js/survey/survey.js
new file mode 100644
index 000000000..3c9b40291
--- /dev/null
+++ b/www/js/survey/survey.js
@@ -0,0 +1,30 @@
+'use strict';
+
+angular.module('emission.survey', [
+ "emission.survey.verifycheck",
+ "emission.survey.external.launch",
+ "emission.survey.multilabel.buttons",
+ "emission.survey.multilabel.infscrollfilters",
+ ])
+
+.factory("SurveyOptions", function() {
+ var surveyoptions = {};
+ console.log("This is currently a NOP; we load the individual components dynamically");
+ surveyoptions.MULTILABEL = {
+ filter: "InfScrollFilters",
+ service: "MultiLabelService",
+ elementTag: "multilabel"
+ }
+
+ return surveyoptions;
+})
+.directive("linkedsurvey", function($compile) {
+ return {
+ scope: {
+ elementTag:"@",
+ trip: "=",
+ recomputedelay: "@",
+ },
+ templateUrl: "templates/survey/wrapper.html",
+ };
+});
diff --git a/www/json/trip_confirm_options.json.sample b/www/json/trip_confirm_options.json.sample
index 58388932a..7f1e83d83 100644
--- a/www/json/trip_confirm_options.json.sample
+++ b/www/json/trip_confirm_options.json.sample
@@ -1,16 +1,16 @@
{
"MODE" : [
- {"text":"Vehicle Driver", "value":"driver"},
- {"text":"Vehicle Passenger","value":"passenger"},
- {"text":"Walk","value":"walk"},
- {"text":"Train","value":"train"},
- {"text":"Bus","value":"bus"},
- {"text":"Tram","value":"tram"},
- {"text":"Ferry","value":"ferry"},
- {"text":"Taxi & Uber","value":"taxi"},
- {"text":"Bicycle","value":"bike"},
- {"text":"Motorcycle","value":"motorbike"},
- {"text":"Trip not valid","value":"spurious_trip"}],
+ {"text":"Vehicle Driver", "value":"driver", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.22031},
+ {"text":"Vehicle Passenger","value":"passenger", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.11015},
+ {"text":"Walk","value":"walk", "met_equivalent": "WALKING", "co2PerMeter": 0},
+ {"text":"Train","value":"train", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.12256},
+ {"text":"Bus","value":"bus", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.20727},
+ {"text":"Tram","value":"tram", "met_equivalent": "UNKNOWN", "co2PerMeter": 0},
+ {"text":"Ferry","value":"ferry", "met_equivalent": "UNKNOWN", "co2PerMeter": 0},
+ {"text":"Taxi & Uber","value":"taxi", "met_equivalent": "IN_VEHICLE", "co2PerMeter": 0.30741},
+ {"text":"Bicycle","value":"bike", "met_equivalent": "BICYCLING", "co2PerMeter": 0},
+ {"text":"Motorcycle","value":"motorbike", "met_equivalent": "UNKNOWN", "co2PerMeter": 0},
+ {"text":"Trip not valid","value":"spurious_trip", "met_equivalent": "UNKNOWN", "co2PerMeter": 0}],
"PURPOSE" : [
{"text":"Go Home", "value":"home"},
{"text":"Work related","value":"work"},
diff --git a/www/manual_lib/leaflet/.bower.json b/www/manual_lib/leaflet/.bower.json
deleted file mode 100644
index f58a99ddd..000000000
--- a/www/manual_lib/leaflet/.bower.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "name": "leaflet",
- "version": "0.7.7",
- "description": "JavaScript library for mobile-friendly interactive maps",
- "main": [
- "dist/leaflet.css",
- "dist/leaflet-src.js",
- "dist/images/layers-2x.png",
- "dist/images/layers.png",
- "dist/images/marker-icon-2x.png",
- "dist/images/marker-icon.png",
- "dist/images/marker-shadow.png"
- ],
- "ignore": [
- ".*",
- "CHANGELOG.json",
- "FAQ.md",
- "debug",
- "spec",
- "src",
- "build"
- ],
- "homepage": "https://github.com/Leaflet/Leaflet",
- "_release": "0.7.7",
- "_resolution": {
- "type": "version",
- "tag": "v0.7.7",
- "commit": "197f9d43b7bbc73c0492bf62cd666a5a98038098"
- },
- "_source": "git://github.com/Leaflet/Leaflet.git",
- "_target": "^0.7.7",
- "_originalSource": "leaflet",
- "_direct": true
-}
\ No newline at end of file
diff --git a/www/manual_lib/leaflet/CHANGELOG.md b/www/manual_lib/leaflet/CHANGELOG.md
deleted file mode 100644
index d10e6188f..000000000
--- a/www/manual_lib/leaflet/CHANGELOG.md
+++ /dev/null
@@ -1,957 +0,0 @@
-Leaflet Changelog
-=================
-
-(all changes without author notice are by [@mourner](https://github.com/mourner))
-
-## 0.7.7 (October 26, 2015)
-
-* Fixed a regression that could sometimes cause tiles to disappear when pinch-zooming on iOS devices.
-* Fixed a regression related to msPointer detection in IE10 (affecting Leaflet.draw and some other plugins) (by @danzel) #3842 #3839 #3804
-* Fixed a bug where a mouseout could fire after a vector element was removed (by @sambernet). #3849 #3829
-* Fixed touch interactions in Edge browser (by @mitchless & @Neorth). #3853 #3379
-* Fixed a bug where removing a layer group from a feature group would throw an error (by @Lambdac0re). #3869
-
-Note tha we skipped 0.7.6 version for which we accidentally published a broken build to NPM.
-
-## 0.7.5 (September 2, 2015)
-
-* Fixed a regression that broke animation in Leaflet.markercluster. [#3796](https://github.com/Leaflet/Leaflet/issues/3796)
-
-## 0.7.4 (September 1, 2015)
-
-* Fixed a bug introduced by a recent Chrome update that caused the map not to react to interactions until all tiles are loaded. [#3689](https://github.com/Leaflet/Leaflet/issues/3689)
-* Fixed a bug where tile layers were not respecting their `minZoom` or `maxZoom` options (by [@ivansanchez](https://github.com/ivansanchez)) [#3778](https://github.com/Leaflet/Leaflet/pull/3778)
-* Improved detection of touch-capable web browsers, in particular fixing touch interactions in device emulation mode in Chrome and Firefox (by [@ivansanchez](https://github.com/ivansanchez)) [#3520](https://github.com/Leaflet/Leaflet/pull/3520) [#3710](https://github.com/Leaflet/Leaflet/pull/3710)
-* Fixed a bug where tile layers with `maxNativeZoom` were not checking bounds properly (by [@jlaxon](https://github.com/jlaxon)) [#3415](https://github.com/Leaflet/Leaflet/pull/3152)
-* Fixed a bug where popups were not remembering which layer originated them after calling `bindPopup(popup)` (by [@Eschon](https://github.com/Eschon)) [#3675](https://github.com/Leaflet/Leaflet/pull/3765)
-* Fixed a race condition between markers and zoom animation (by [@perliedman](https://github.com/perliedman)) [#3152](https://github.com/Leaflet/Leaflet/pull/3152)
-* Fixed a bug with `Map.fitBounds` padding (by [@bsstoner](https://github.com/bsstoner)). [#2489](https://github.com/Leaflet/Leaflet/issues/2489)
-* Allow canvas paths to fire `dblclick` and `contextmenu` events (by [@ivansanchez](https://github.com/ivansanchez)) [#3482](https://github.com/Leaflet/Leaflet/pull/3482)
-* Allow canvas filled polygons to use the `fillRule` option (by [@w8r](https://github.com/w8r)) [#3477](https://github.com/Leaflet/Leaflet/pull/3477)
-* Allow canvas lines to use `lineCap` and `lineJoin` options (by [@northerneyes](https://github.com/northerneyes)) [#3156](https://github.com/Leaflet/Leaflet/pull/3156)
-* Updated bower definitions to comply with best practices (by [@guptaso2](https://github.com/guptaso2)) [#2726](https://github.com/Leaflet/Leaflet/pull/2726) [#3448](https://github.com/Leaflet/Leaflet/pull/3448)
-
-## 0.7.3 (May 23, 2014)
-
-* Added proper **bower** and **component** support (by [@calvinmetcalf](https://github.com/calvinmetcalf)). [#2561](https://github.com/Leaflet/Leaflet/pull/2561) [#1903](https://github.com/Leaflet/Leaflet/issues/1903)
-* Fixed a bug where dragging the map outside the window caused an error on FF. [#2610](https://github.com/Leaflet/Leaflet/issues/2610)
-* Fixed a bug where some taps on Android where not working, often falsely perceived as drags (by [@axefrog](https://github.com/axefrog)). [#2503](https://github.com/Leaflet/Leaflet/pull/2503)
-* Fixed a bug where tapping too quickly on Android ignored most taps. [#2303](https://github.com/Leaflet/Leaflet/issues/2303)
-* Fixed a bug where calling `setView` (or similar methods) several times in succession could freeze the map. [#2521](https://github.com/Leaflet/Leaflet/issues/2521) [#2236](https://github.com/Leaflet/Leaflet/issues/2236) [#2485](https://github.com/Leaflet/Leaflet/issues/2485)
-* Fixed a bug where `Control.Layers` wasn't properly removed (by [@jack-kerouac](https://github.com/jack-kerouac)). [#2569](https://github.com/Leaflet/Leaflet/pull/2569)
-* Fixed a bug that caused `TileLayer` `load` event not to fire properly. [#2510](https://github.com/Leaflet/Leaflet/issues/2510)
-* Fixed Canvas-based paths not triggering `remove` event when removed (by @adimitrov). [#2486](https://github.com/Leaflet/Leaflet/pull/2486)
-* Fixed a bug where you could end up with fractional zoom after pinch-zooming in some cases (by [@danzel](https://github.com/danzel). [#2400](https://github.com/Leaflet/Leaflet/pull/2400) [#1943](https://github.com/Leaflet/Leaflet/issues/1934)
-
-## 0.7.2 (January 17, 2013)
-
-* Fixed a bug that appeared with **Chrome 32 update** that made all **mouse events shifted on scrolled pages**. [#2352](https://github.com/Leaflet/Leaflet/issues/2352)
-* Fixed a bug that could break tile loading when using non-standard tile sizes. [#2288](https://github.com/Leaflet/Leaflet/issues/2288)
-* Fixed a bug where `maxNativeZoom` option didn't work with TMS tile layers (by [@perliedman](https://github.com/perliedman)). [#2321](https://github.com/Leaflet/Leaflet/issues/2321) [#2314](https://github.com/Leaflet/Leaflet/issues/2314)
-
-## 0.7.1 (December 6, 2013)
-
-* Fixed a bug where pinch-zooming quickly could occasionally leave the map at a fractional zoom thus breaking tile loading (by [@danzel](https://github.com/danzel)). [#2269](https://github.com/Leaflet/Leaflet/pull/2269) [#2255](https://github.com/Leaflet/Leaflet/issues/2255) [#1934](https://github.com/Leaflet/Leaflet/issues/1934)
-* Fixed tile flickering issues on some old Android 2/3 devices by disabling buggy hardware accelerated CSS there (by [@danzel](https://github.com/danzel)). [#2216](https://github.com/Leaflet/Leaflet/pull/2216) [#2198](https://github.com/Leaflet/Leaflet/issues/2198)
-* Fixed a regression that sometimes led to an error when you started pinch-zoom as the first action on the map (by [@danzel](https://github.com/danzel)). [#2259](https://github.com/Leaflet/Leaflet/pull/2259) [#2256](https://github.com/Leaflet/Leaflet/issues/2256)
-* Reverted `L.Util.template` optimizations to allow Leaflet to be used in eval-banning environments like browser extensions (performance gain was insignificant anyway) (by [@calvinmetcalf](https://github.com/calvinmetcalf)). [#2217](https://github.com/Leaflet/Leaflet/issues/2217) [#2209](https://github.com/Leaflet/Leaflet/issues/2209) [#1968](https://github.com/Leaflet/Leaflet/issues/1968)
-* Fixed a regression where `Map` `invalidateSize` could lead to unexpected results when called before map initialization (by [@Zverik](https://github.com/Zverik)). [#2250](https://github.com/Leaflet/Leaflet/issues/2250) [#2249](https://github.com/Leaflet/Leaflet/issues/2249)
-* Fixed a regression where `FeatureGroup` containing other group overwrote original `e.layer` value in mouse events (by [@gumballhead](https://github.com/gumballhead)). [#2253](https://github.com/Leaflet/Leaflet/pull/2253) [#2252](https://github.com/Leaflet/Leaflet/issues/2252)
-* Fixed a regression where `CircleMarker` `setLatLngs` didn't return `this` (by [@radicalbiscuit](https://github.com/radicalbiscuit)). [#2206](https://github.com/Leaflet/Leaflet/pull/2206)
-
-## 0.7 (November 18, 2013)
-
-### Improvements
-
-#### Usability improvements
-
-* Added **support for IE11 touch devices** (by [@danzel](https://github.com/danzel), [@DanielX2](https://github.com/DanielX2) and [@fnicollet](https://github.com/fnicollet)). [#2039](https://github.com/Leaflet/Leaflet/pull/2039) [#2066](https://github.com/Leaflet/Leaflet/pull/2066) [#2037](https://github.com/Leaflet/Leaflet/issues/2037) [#2102](https://github.com/Leaflet/Leaflet/issues/2102)
-* Added shift-double-click to zoom out shortcut. [#2185](https://github.com/Leaflet/Leaflet/issues/2185)
-* Significantly improved **controls design on mobile** devices. [#1868](https://github.com/Leaflet/Leaflet/issues/1868) [#2012](https://github.com/Leaflet/Leaflet/issues/2012)
-* Fixed and improved IE7-8 control and popup styles.
-* Made subtle improvements to control styles on desktop browsers.
-* Improved keyboard nav support so that map doesn't loose focus when you click on a control (by [@jacobtoye](https://github.com/jacobtoye)). [#2150](https://github.com/Leaflet/Leaflet/issues/2150) [#2148](https://github.com/Leaflet/Leaflet/issues/2148)
-* Improved `maxBounds` behavior: now it doesn't force higher minimal zoom, and anchors to max bounds edges properly when zooming (by [@kapouer](https://github.com/kapouer) and [@mourner](https://github.com/mourner)). [#2187](https://github.com/Leaflet/Leaflet/pull/2187) [#1946](https://github.com/Leaflet/Leaflet/pull/1946) [#2081](https://github.com/Leaflet/Leaflet/issues/2081) [#2168](https://github.com/Leaflet/Leaflet/issues/2168) [#1908](https://github.com/Leaflet/Leaflet/issues/1908)
-
-#### Map API improvements
-
-* Made `Map` `setView` `zoom` argument optional. [#2056](https://github.com/Leaflet/Leaflet/issues/2056)
-* Added `maxZoom` option to `Map` `fitBounds`. [#2101](https://github.com/Leaflet/Leaflet/issues/2101)
-* Added `Map` `bounceAtZoomLimits` option that makes the map bounce when you pinch-zoom past limits (it worked like this before, but now you can disable this) (by [@trevorpowell](https://github.com/trevorpowell)). [#1864](https://github.com/Leaflet/Leaflet/issues/1864) [#2072](https://github.com/Leaflet/Leaflet/pull/2072)
-* Added `distance` property to `Map` and `Marker` `dragend` events. [#2158](https://github.com/Leaflet/Leaflet/issues/2158) [#872](https://github.com/Leaflet/Leaflet/issues/872)
-* Added optional support for center-oriented scroll and double-click zoom (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1939](https://github.com/Leaflet/Leaflet/issues/1939)
-* Added `timestamp` to `Map` `locationfound` event. [#584](https://github.com/Leaflet/Leaflet/pull/584)
-* Improved `Map` `invalidateSize` to call `moveend` immediately unless given `debounceMoveend: true` option (by [@jfirebaugh](https://github.com/jfirebaugh)). [#2181](https://github.com/Leaflet/Leaflet/issues/2181)
-
-#### TileLayer API improvements
-
-* Added `TileLayer` `maxNativeZoom` option that allows displaying tile layers on zoom levels above their maximum by **upscaling tiles**. [#1802](https://github.com/Leaflet/Leaflet/issues/1802) [#1798](https://github.com/Leaflet/Leaflet/issues/1798)
-* Added `TileLayer` `tileloadstart` event (by [@tmcw](https://github.com/tmcw)). [#2142](https://github.com/Leaflet/Leaflet/pull/2142) [#2140](https://github.com/Leaflet/Leaflet/issues/2140)
-* Improved `TileLayer` world size (used for wrapping and limiting tiles) to be derived from CRS instead of hardcoded, making it easier to use with custom projections (by [@perliedman](https://github.com/perliedman)). [#2160](https://github.com/Leaflet/Leaflet/pull/2160)
-
-#### Marker API improvements
-
-* Added CSS classes to draggable markers for easier customization (by [@snkashis](https://github.com/snkashis)). [#1902](https://github.com/Leaflet/Leaflet/issues/1902) [#1916](https://github.com/Leaflet/Leaflet/issues/1916)
-* Added `Marker` `add` event (by [@tohaocean](https://github.com/tohaocean)). [#1942](https://github.com/Leaflet/Leaflet/issues/1942)
-* Added `Marker` `getPopup` method (by [@scottharvey](https://github.com/scottharvey)). [#618](https://github.com/Leaflet/Leaflet/issues/618) [#1197](https://github.com/Leaflet/Leaflet/pull/1197)
-* Added `Marker` `alt` option for adding `alt` text to markers (by [@jimmytidey](https://github.com/jimmytidey)). [#2112](https://github.com/Leaflet/Leaflet/pull/2112)
-
-#### Vector layers API improvements
-
-* Added `Path` `className` option for adding custom class names to vector layers.
-* Added `Path` `lineCap` and `lineJoin` options (by [@palewire](https://github.com/palewire)). [#1843](https://github.com/Leaflet/Leaflet/issues/1843) [#1863](https://github.com/Leaflet/Leaflet/issues/1863) [#1881](https://github.com/Leaflet/Leaflet/issues/1881)
-* Added ability to pass vector options to `GeoJSON` (by [@kapouer](https://github.com/kapouer)). [#2075](https://github.com/Leaflet/Leaflet/pull/2075)
-* Improved `Polygon` `setLatLngs` to also accept holes (by [@aparshin](https://github.com/aparshin)). [#2095](https://github.com/Leaflet/Leaflet/pull/2095) [#1518](https://github.com/Leaflet/Leaflet/issues/1518)
-* Added `GeoJSON` 3D format support and optional `altitude` argument to `LatLng` constructor (by [@Starefossen](https://github.com/Starefossen)). [#1822](https://github.com/Leaflet/Leaflet/pull/1822)
-* Added `MultiPolygon` and `MultiPolyline` `openPopup` method. [#2046](https://github.com/Leaflet/Leaflet/issues/2046)
-
-#### Popup API improvements
-
-* Added `Popup` `update` method. [#1959](https://github.com/Leaflet/Leaflet/issues/1959)
-* Added `Popup` `autoPanPaddingTopLeft` and `autoPanPaddingBottomRight` options (by [@albburtsev](https://github.com/albburtsev)). [#1972](https://github.com/Leaflet/Leaflet/issues/1972) [#1588](https://github.com/Leaflet/Leaflet/issues/1588)
-* Added `Popup` `getContent` method. [#2100](https://github.com/Leaflet/Leaflet/issues/2100)
-* Added `Popup` `getLatLng` method (by [@AndreyGeonya](https://github.com/AndreyGeonya)). [#2097](https://github.com/Leaflet/Leaflet/pull/2097)
-
-#### Misc API improvements
-
-* Added `ImageOverlay` `setUrl` and `getAttribution` methods and `attribution` option (by [@stsydow](https://github.com/stsydow)). [#1957](https://github.com/Leaflet/Leaflet/issues/1957) [#1958](https://github.com/Leaflet/Leaflet/issues/1958)
-* Added localization support for the zoom control (by [@Danielku15](https://github.com/Danielku15)). [#1953](https://github.com/Leaflet/Leaflet/issues/1953) [#1643](https://github.com/Leaflet/Leaflet/issues/1643) [#1953](https://github.com/Leaflet/Leaflet/pull/1953)
-* Significantly improved `L.Util.template` performance (affects `L.TileLayer`) by introducing cached template compilation (by [@calvinmetcalf](https://github.com/calvinmetcalf)). [#1969](https://github.com/Leaflet/Leaflet/issues/1969) [#1968](https://github.com/Leaflet/Leaflet/issues/1968) [#1554](https://github.com/Leaflet/Leaflet/issues/1554)
-* Added `CRS` `getSize` for getting the world size in pixels (by [@perliedman](https://github.com/perliedman)). [#2160](https://github.com/Leaflet/Leaflet/pull/2160)
-* Added `leaflet-drag-target` CSS class to an element under cursor when dragging for more flexible customization. [#2164](https://github.com/Leaflet/Leaflet/issues/2164) [#1902](https://github.com/Leaflet/Leaflet/issues/1902)
-* Improved `L.DomUtil` `addClass`, `removeClass`, `hasClass` methods performance and fixed it to work with SVG elements. [#2164](https://github.com/Leaflet/Leaflet/issues/2164)
-
-#### Dev workflow improvements
-
-* Added an [official FAQ](https://github.com/Leaflet/Leaflet/blob/master/FAQ.md).
-* Cleaned up and moved old IE styles to `leaflet.css` and removed `leaflet.ie.css`, so **no need for IE conditional comment** when including Leaflet now. [#2159](https://github.com/Leaflet/Leaflet/issues/2159)
-* Added `leaflet-oldie` CSS class to map container in IE7-8 for easier styling. [#2159](https://github.com/Leaflet/Leaflet/issues/2159)
-* Officially **dropped support for IE6**. Nobody cares anyway, and Leaflet should still be accessible on it. [#2159](https://github.com/Leaflet/Leaflet/issues/2159)
-* Improved the build system to check JS errors in spec files. [#2151](https://github.com/Leaflet/Leaflet/issues/2151)
-* Fixed `jake` command to run tests before building the source. [#2151](https://github.com/Leaflet/Leaflet/issues/2151)
-* Switched the main file in `package.json` to unminified version for NPM/Browserify (by [@icetan](https://github.com/icetan)). [#2109](https://github.com/Leaflet/Leaflet/pull/2109)
-
-### Bugfixes
-
-#### 0.6 regression fixes
-
-* Fixed a **memory leak in iOS7** that could crash Safari when handling lots of objects (e.g. 1000 markers) (by [@danzel](https://github.com/danzel)). [#2149](https://github.com/Leaflet/Leaflet/pull/2149) [#2122](https://github.com/Leaflet/Leaflet/issues/2122)
-* Fixed a bug that caused lag at the beginning of panning in Chrome (by [@jfirebaugh](https://github.com/jfirebaugh)). [#2163](https://github.com/Leaflet/Leaflet/issues/2163)
-* Fixed a regression that made the layers control unscrollable in Firefox. [#2029](https://github.com/Leaflet/Leaflet/issues/2029)
-* Fixed a regression that broke `worldCopyJump: true` option (by [@fastrde](https://github.com/fastrde)). [#1904](https://github.com/Leaflet/Leaflet/issues/1904) [#1831](https://github.com/Leaflet/Leaflet/issues/1831) [#1982](https://github.com/Leaflet/Leaflet/issues/1982)
-* Fixed a regression where a first map click after popup close button click was ignored (by [@fastrde](https://github.com/fastrde)). [#1537](https://github.com/Leaflet/Leaflet/issues/1537) [#1963](https://github.com/Leaflet/Leaflet/issues/1963) [#1925](https://github.com/Leaflet/Leaflet/issues/1925)
-* Fixed a regression where `L.DomUtil.getMousePosition` would throw an error if container argument not provided (by [@scooterw](https://github.com/scooterw)). [#1826](https://github.com/Leaflet/Leaflet/issues/1826) [#1928](https://github.com/Leaflet/Leaflet/issues/1928) [#1926](https://github.com/Leaflet/Leaflet/issues/1926)
-* Fixed a regression with vector layers positioning when zooming on IE10+ touch devices (by [@danzel](https://github.com/danzel)). [#2002](https://github.com/Leaflet/Leaflet/issues/2002) [#2000](https://github.com/Leaflet/Leaflet/issues/2000)
-* Fixed a regression with `maxBounds` behaving weirdly on panning inertia out of bounds. [#2168](https://github.com/Leaflet/Leaflet/issues/2168)
-
-#### General bugfixes
-
-* Fixed a bug where the map could freeze if centered and immediately recentered on initialization. [#2071](https://github.com/Leaflet/Leaflet/issues/2071)
-* Fixed a bug where all maps except the first one on a page didn't track window resize. [#1980](https://github.com/Leaflet/Leaflet/issues/1980)
-* Fixed a bug where tiles in `EPSG:3395` projection were shifted (by [@aparshin](https://github.com/aparshin)). [#2020](https://github.com/Leaflet/Leaflet/issues/2020)
-* Fixed a bug where scale control displayed wrong scale when on pages with `box-sizing: border-box`.
-* Fixed a bug where zoom control button didn't appear as disabled if map was initialized at the zoom limit. [#2083](https://github.com/Leaflet/Leaflet/issues/2083)
-* Fixed a bug where box zoom also triggered a map click event (by [@fastrde](https://github.com/fastrde)). [#1951](https://github.com/Leaflet/Leaflet/issues/1951) [#1884](https://github.com/Leaflet/Leaflet/issues/1884)
-* Fixed a bug where shift-clicking on a map immediately after a drag didn't trigger a click event (by [@fastrde](https://github.com/fastrde)). [#1952](https://github.com/Leaflet/Leaflet/issues/1952) [#1950](https://github.com/Leaflet/Leaflet/issues/1950)
-* Fixed a bug where content was updated twice when opening a popup. [#2137](https://github.com/Leaflet/Leaflet/issues/2137)
-* Fixed a bug that could sometimes cause infinite panning loop when using `maxBounds` (by [@kapouer](https://github.com/kapouer) and [@mourner](https://github.com/mourner)). [#2187](https://github.com/Leaflet/Leaflet/pull/2187) [#1946](https://github.com/Leaflet/Leaflet/pull/1946) [#2081](https://github.com/Leaflet/Leaflet/issues/2081) [#2168](https://github.com/Leaflet/Leaflet/issues/2168) [#1908](https://github.com/Leaflet/Leaflet/issues/1908)
-
-#### Browser bugfixes
-
-* Fixed a bug where keyboard `+` no longer zoomed the map on FF 22+ (by [@fastrde](https://github.com/fastrde)). [#1943](https://github.com/Leaflet/Leaflet/issues/1943) [#1981](https://github.com/Leaflet/Leaflet/issues/1981)
-* Fixed a bug where calling `Map` `remove` throwed an error in IE6-8. [#2015](https://github.com/Leaflet/Leaflet/issues/2015)
-* Fixed a bug where `isArray` didn't work in rare cases in IE9. [#2077](https://github.com/Leaflet/Leaflet/issues/2077)
-* Fixed a bug where FF sometimes produced console warnings when animating markers. [#2090](https://github.com/Leaflet/Leaflet/issues/2090)
-* Fixed a bug where mouse wasn't handled correctly on RTL pages in some cases (by [@danzel](https://github.com/danzel)). [#1986](https://github.com/Leaflet/Leaflet/issues/1986) [#2136](https://github.com/Leaflet/Leaflet/pull/2136)
-
-#### Mobile bugfixes
-
-* Fixed a bug where tiles could **disappear after zooming on Chrome 30+ for Android** (by [@danzel](https://github.com/danzel)). [#2152](https://github.com/Leaflet/Leaflet/pull/2152) [#2078](https://github.com/Leaflet/Leaflet/issues/2078)
-* Fixed a bug on IE10+ touch where pinch-zoom also caused click (by [@danzel](https://github.com/danzel)). [#2117](https://github.com/Leaflet/Leaflet/pull/2117) [#2094](https://github.com/Leaflet/Leaflet/issues/2094)
-* Fixed a bug on IE10+ touch where controls didn't loose the pressed state after tapping (by [@danzel](https://github.com/danzel)). [#2111](https://github.com/Leaflet/Leaflet/pull/2111) [#2103](https://github.com/Leaflet/Leaflet/issues/2103)
-* Fixed a bug where clicking on layers control labels on iOS throwed an error (by [@olemarkus](https://github.com/olemarkus) and [@dagjomar](https://github.com/dagjomar)). [#1984](https://github.com/Leaflet/Leaflet/issues/1984) [#1989](https://github.com/Leaflet/Leaflet/issues/1989)
-
-#### Map API bugfixes
-
-* Fixed a bug where `Map` `getCenter` returned old result after map container size changed (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1940](https://github.com/Leaflet/Leaflet/issues/1940) [#1919](https://github.com/Leaflet/Leaflet/issues/1919)
-* Fixed `Map` `invalidateSize` rounding issues when changing map size by an odd pixel amount (by [@russelldavis](https://github.com/russelldavis)). [#1931](https://github.com/Leaflet/Leaflet/issues/1931)
-* Fixed a bug where `Map` `removeLayer` didn't return `this` in a corner case (by [@jfirebaugh](https://github.com/jfirebaugh)).
-* Fixed a bug where calling `Map` `setZoom` before `setView` would throw an error. [#1449](https://github.com/Leaflet/Leaflet/issues/1449)
-
-#### Layers API bugfixes
-
-* Fixed a bug where `Popup` `setLatLng` unnecessarily reset content and updated layout; works much faster now. [#2167](https://github.com/Leaflet/Leaflet/issues/2167)
-* Fixed a bug where `toGeoJSON` of layers originated from GeoJSON GeometryCollection and MultiPoint didn't work properly (wasn't round-tripped). [#1956](https://github.com/Leaflet/Leaflet/issues/1956)
-* Fixed `GeoJSON` dependencies in build configuration that could lead to a broken custom build in some situations (by [@alubchuk](https://github.com/alubchuk)). [#1909](https://github.com/Leaflet/Leaflet/issues/1909)
-* Fixed a bug where `CircleMarker` popup placement wasn't updated after calling `setLatLng` (by [@snkashis](https://github.com/snkashis)). [#1921](https://github.com/Leaflet/Leaflet/issues/1921) [#1927](https://github.com/Leaflet/Leaflet/issues/1927)
-* Fixed a bug where popup anchor wasn't updated on `Marker` `setIcon` (by [@snkashis](https://github.com/snkashis)). [#1874](https://github.com/Leaflet/Leaflet/issues/1874) [#1891](https://github.com/Leaflet/Leaflet/issues/1891)
-* Fixed a bug with GeoJSON not throwing a descriptive error if a polygon has zero length inner ring (by [@snkashis](https://github.com/snkashis)). [#1917](https://github.com/Leaflet/Leaflet/issues/1917) [#1918](https://github.com/Leaflet/Leaflet/issues/1918)
-* Fixed a bug where `FeatureGroup` would break when using non-evented children layers (by [@tmcw](https://github.com/tmcw)). [#2032](https://github.com/Leaflet/Leaflet/pull/2032) [#1962](https://github.com/Leaflet/Leaflet/issues/1962)
-* Fixed a bug where `CircleMarker` `getRadius` would always return `null`. [#2016](https://github.com/Leaflet/Leaflet/issues/2016) [#2017](https://github.com/Leaflet/Leaflet/pull/2017)
-* Fixed a bug where `TileLayer.WMS` didn't work with WMS 1.3 & EPSG4326 projection (by [@Bobboya](https://github.com/Bobboya)). [#1897](https://github.com/Leaflet/Leaflet/pull/1897)
-* Fixed a bug where `FeatureGroup` events `e.layer` was sometimes empty in old IE. [#1938](https://github.com/Leaflet/Leaflet/issues/1938)
-
-#### Misc API bugfixes
-
-* Fixed a bug where `L.latLngBounds` didn't accept simple object `LatLng` form (by [@Gnurfos](https://github.com/Gnurfos)). [#2025](https://github.com/Leaflet/Leaflet/issues/2025) [#1915](https://github.com/Leaflet/Leaflet/issues/1915)
-* Fixed a bug where `L.Util.tempalate` wouldn't work with double quotes in the string (by [@jieter](https://github.com/jieter)). [#1968](https://github.com/Leaflet/Leaflet/issues/1968) [#2121](https://github.com/Leaflet/Leaflet/pull/2121) [#2120](https://github.com/Leaflet/Leaflet/issues/2120)
-* Fixed a bug where attribution control that was added to a map after attributed layers didn't have the corresponding attributions (by [@snkashis](https://github.com/snkashis)). [#2177](https://github.com/Leaflet/Leaflet/issues/2177) [#2178](https://github.com/Leaflet/Leaflet/pull/2178)
-
-
-## 0.6.4 (July 25, 2013)
-
-* Fixed a regression where `fitBounds` and `setMaxBounds` could freeze the browser in some situations. [#1895](https://github.com/Leaflet/Leaflet/issues/1895) [1866](https://github.com/Leaflet/Leaflet/issues/1866)
-* Fixed a bug where click on a map on a page with horizontal scroll caused the page to scroll right (by [@mstrelan](https://github.com/mstrelan)). [#1901](https://github.com/Leaflet/Leaflet/issues/1901)
-
-## 0.6.3 (July 17, 2013)
-
-### Regression fixes
-
-* Fixed a regression where mouse interaction had incorrect coordinates in some map positioning cases (by [@scooterw](https://github.com/scooterw)). [#1826](https://github.com/Leaflet/Leaflet/issues/1826) [#1684](https://github.com/Leaflet/Leaflet/issues/1684) [#1745](https://github.com/Leaflet/Leaflet/issues/1745) [#1](https://github.com/Leaflet/Leaflet/issues/1)
-* Fixed a regression that prevented the map from responding to drag on areas covered with `ImageOverlay` (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1821](https://github.com/Leaflet/Leaflet/issues/1821)
-* Fixed a regression where `layerremove` and `layeradd` were fired before the corresponding action finishes (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1846](https://github.com/Leaflet/Leaflet/issues/1846)
-* Fixed a regression with `worldCopyJump: true` breaking the map on small zoom levels (by [@danzel](https://github.com/danzel)). [#1831](https://github.com/Leaflet/Leaflet/issues/1831)
-* Fixed a regression where `Marker` shadow didn't animate on zoom after using `setIcon`. [#1768](https://github.com/Leaflet/Leaflet/issues/1768)
-* Fixed a regression where the map would stuck when trying to animate zoom before any tile layers are added to the map. [#1484](https://github.com/Leaflet/Leaflet/issues/1484) [#1845](https://github.com/Leaflet/Leaflet/issues/1845)
-* Fixed a regression with the layers control and popups closing on inside click in IE < 9. [#1850](https://github.com/Leaflet/Leaflet/issues/1850)
-* Fixed a regression where scrolled popup content woudln't scroll in FF (by [@jfirebaugh](https://github.com/jfirebaugh)).
-
-### Bug fixes
-
-* Fixed vector feature flickering on Safari Mac for screen < 2000px. [#902](https://github.com/Leaflet/Leaflet/issues/902)
-* Fixed a bug where `GeoJSON` ignored non-feature geometries passed in an array. [#1840](https://github.com/Leaflet/Leaflet/issues/1840)
-* Fixed a bug where `Map` `minZoom` and `maxZoom` didn't always override values derived from the added tile layers. [1848](https://github.com/Leaflet/Leaflet/issues/1848)
-* Fixed a bug where `TileLayer.Canvas` wasn't immediately redrawn when `redraw` is called (by [@tofferrosen](https://github.com/tofferrosen)). [#1797](https://github.com/Leaflet/Leaflet/issues/1797) [#1817](https://github.com/Leaflet/Leaflet/issues/1817)
-* Fixed a bug where `FeatureGroup` still fired `layerremove` event on `removeLayer` even if the given layer wan't present in the group (by (by [@danzel](https://github.com/danzel))). [#1847](https://github.com/Leaflet/Leaflet/issues/1847) [#1858](https://github.com/Leaflet/Leaflet/issues/1858)
-* Fixed a bug where `Marker` `setOpacity` wasn't returning the marker (by [@freepius44](https://github.com/freepius44)). [#1851](https://github.com/Leaflet/Leaflet/issues/1851)
-* Fixed a bug where removing the map element from the DOM before panning transition has finished could keep a setInterval loop running forever (by [@rutkovsky](https://github.com/rutkovsky)). [#1825](https://github.com/Leaflet/Leaflet/issues/1825) [#1856](https://github.com/Leaflet/Leaflet/issues/1856)
-* Fixed mobile styles to apply to `leaflet-bar` elements.
-
-### Improvements
-
-* Added ability to pass zoom/pan animation options to `setMaxBounds` (by [@davidjb](http://git.io/djb)). [#1834](https://github.com/Leaflet/Leaflet/pull/1834)
-* Added `MultiPolyline` and `MultiPolygon` `getLatLngs` method. [#1839](https://github.com/Leaflet/Leaflet/issues/1839)
-
-### Dev Workflow improvements
-
-* Leaflet builds (*.js files in the `dist` folder) were removed from the repo and are now done automatically on each commit for `master` and `stable` branches by [Travis CI](travis-ci.org/Leaflet/Leaflet). The download links are on the [Leafet download page](http://leafletjs.com/download.html).
-
-## 0.6.2 (June 28, 2013)
-
- * Fixed a bug that caused wrong tile layers stacking order when using opacity < 1 (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1804](https://github.com/Leaflet/Leaflet/issues/1804) [#1790](https://github.com/Leaflet/Leaflet/issues/1790) [#1667](https://github.com/Leaflet/Leaflet/issues/1667)
- * Fixed a regression that caused tiles selection when double-clicking absolutely positioned maps with vector layers in it in Firefox (WTF!) (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1807](https://github.com/Leaflet/Leaflet/issues/1807)
- * Fixed a regression with a wrong cursor when dragging a map with vector layers, and tiles becoming selected on double click (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1800](https://github.com/Leaflet/Leaflet/issues/1800)
- * Fixed a regression that caused flickering of tiles near map border on zoom animation in Chrome.
-
-## 0.6.1 (June 27, 2013)
-
- * Fixed a regression with mouse wheel zooming too fast on Firefox (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1788](https://github.com/Leaflet/Leaflet/issues/1788)
- * Fixed a regression with broken zooming on maps with EPSG3395 projection. [#1796](https://github.com/Leaflet/Leaflet/issues/1796)
- * Fixed a bug where zoom buttons inherited Bootstrap link hover styles. [#1791](https://github.com/Leaflet/Leaflet/issues/1791)
-
-## 0.6 (June 26, 2013)
-
-### Breaking changes
-
- * Moved polyline editing code into [Leaflet.draw](https://github.com/Leaflet/Leaflet.draw) plugin (where it fits much better along with all other editing and drawing handlers). The API remains the same.
- * Dropped support for environments that augment `Object.prototype` (luckily it's a thing of the past nowadays).
- * `Map` `invalidateSize` no longer fires `move` and `moveend` events if the map size didn't change. [#1819](https://github.com/Leaflet/Leaflet/issues/1819)
-
-### Improvements
-
-#### Usability and performance improvements
-
- * **Improved zoom control design** - cleaner, simpler, more accessible (mostly by [@jacobtoye](https://github.com/jacobtoye)). [#1313](https://github.com/Leaflet/Leaflet/issues/1313)
- * Updated `Control.Layers` icon (designed by Volker Kinkelin), added retina version and SVG source. [#1739](https://github.com/Leaflet/Leaflet/issues/1739)
- * Added keyboard accessibility to markers (you can now tab to them and press enter for click behavior). [#1355](https://github.com/Leaflet/Leaflet/issues/1355)
- * Improved `TileLayer` zoom animation to eliminate flickering in case one tile layer on top of another or when zooming several times quickly (by [@mourner](https://github.com/mourner) with lots of fixes from [@danzel](https://github.com/danzel)). [#1140](https://github.com/Leaflet/Leaflet/issues/1140) [#1437](https://github.com/Leaflet/Leaflet/issues/1437) [#52](https://github.com/Leaflet/Leaflet/issues/52)
- * Subtly improved default popup styles
- * Improved attribution control to be much less obtrusive (no "powered by", just a Leaflet link). You can still remove the prefix with `map.attributionControl.setPrefix('')` if you need.
- * Improved zoom behavior so that there's no drift of coordinates when you change zoom back and forth without panning. [#426](https://github.com/Leaflet/Leaflet/issues/426)
- * Improved double click behavior to zoom while keeping the clicked point fixed (by [@ansis](https://github.com/ansis)). [#1582](https://github.com/Leaflet/Leaflet/issues/1582)
- * Improved dragging behavior to not get stuck if mouse moved outside of an iframe containing the map (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1277](https://github.com/Leaflet/Leaflet/issues/1277) [#1782](https://github.com/Leaflet/Leaflet/issues/1782) [#1786](https://github.com/Leaflet/Leaflet/issues/1786)
- * Improved box zoom to be cancelable by pressing Escape (by [@yohanboniface](https://github.com/yohanboniface)). [#1438](https://github.com/Leaflet/Leaflet/issues/1438)
- * Improved `Marker` popups to close on marker click if opened (by [@popox](https://github.com/popox)). [#1761](https://github.com/Leaflet/Leaflet/issues/1761)
- * Significantly improved mass layer removal performance (by [@jfgirard](https://github.com/jfgirard) with fixes from [@danzel](https://github.com/danzel)). [#1141](https://github.com/Leaflet/Leaflet/pull/1141) [#1514](https://github.com/Leaflet/Leaflet/pull/1514)
-
-#### API improvements
-
-##### Layers API improvements
-
- * Added `toGeoJSON` method to various layer types, allowing you to **save your Leaflet layers as GeoJSON**. (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1462](https://github.com/Leaflet/Leaflet/issues/1462) [#712](https://github.com/Leaflet/Leaflet/issues/712) [#1779](https://github.com/Leaflet/Leaflet/issues/1779)
- * Added `GeoJSON` `coordsToLatLng` option for dealing with GeoJSON that has non-WGS84 coords (thanks to [@moonlite](https://github.com/moonlite)). [#888](https://github.com/Leaflet/Leaflet/issues/888) [#886](https://github.com/Leaflet/Leaflet/issues/886)
- * Improved `Marker` to reuse icon DOM elements when changing icons on the fly (e.g. fixes problems when changing icon on mouse hover) (by [@robpvn](https://github.com/robpvn) & [@danzel](https://github.com/danzel)). [#1726](https://github.com/Leaflet/Leaflet/issues/1726) [#561](https://github.com/Leaflet/Leaflet/issues/561) [#1753](https://github.com/Leaflet/Leaflet/issues/1753) [#1754](https://github.com/Leaflet/Leaflet/pull/1754)
- * Added `latlng` property to `Marker` mouse event data. [#1613](https://github.com/Leaflet/Leaflet/issues/1613)
- * Added `LayerGroup` `hasLayer` method (by [@rvlasveld](https://github.com/rvlasveld)). [#1282](https://github.com/Leaflet/Leaflet/issues/1282) [#1300](https://github.com/Leaflet/Leaflet/pull/1300)
- * Added `LayerGroup` `getLayers` method (by [@tmcw](https://github.com/tmcw)). [#1469](https://github.com/Leaflet/Leaflet/pull/1469)
- * Added `LayerGroup` `getLayer` method (by [@gumballhead](https://github.com/gumballhead)). [#1650](https://github.com/Leaflet/Leaflet/pull/1650)
- * Improved `LayerGroup` `removeLayer` method to also accept layer `id` (by [@gumballhead](https://github.com/gumballhead)). [#1642](https://github.com/Leaflet/Leaflet/pull/1642)
- * Added `Path` `pointerEvents` option for setting pointer-events on SVG-powered vector layers (by [@inpursuit](https://github.com/inpursuit)). [#1053](https://github.com/Leaflet/Leaflet/pull/1053)
- * Improved `Polygon` to filter out last point if it's equal to the first one (to fix GeoJSON polygon issues) (by [@snkashis](https://github.com/snkashis)). [#1153](https://github.com/Leaflet/Leaflet/pull/1153) [#1135](https://github.com/Leaflet/Leaflet/issues/1135)
- * Improved paths with `clickable: false` to allow mouse events to pass through to objects underneath (by [@snkashis](https://github.com/snkashis)). [#1384](https://github.com/Leaflet/Leaflet/pull/1384) [#1281](https://github.com/Leaflet/Leaflet/issues/1281)
- * Improved `L.Util.template` (and correspondingly url-related `TileLayer` options) to support functions for data values (by [@olegsmith](https://github.com/olegsmith)). [#1554](https://github.com/Leaflet/Leaflet/pull/1554)
- * Added `TileLayer` `getContainer` method (by [@tmcw](https://github.com/tmcw)). [#1433](https://github.com/Leaflet/Leaflet/pull/1433)
- * Fixed `TileLayer.Canvas` `redraw` method chaining (by [@jieter](https://github.com/jieter)). [#1287](https://github.com/Leaflet/Leaflet/pull/1287)
- * Added `TileLayer.WMS` `crs` option to be able to use WMS of CRS other than the map CRS (by [@kengu](https://github.com/kengu)). [#942](https://github.com/Leaflet/Leaflet/issues/942) [#945](https://github.com/Leaflet/Leaflet/issues/945)
- * Added `popupopen` and `popupclose` events to various layers (by [@Koc](https://github.com/Koc)). [#738](https://github.com/Leaflet/Leaflet/pull/738)
- * Added `Popup` `keepInView` option (thanks to [@lapo-luchini](https://github.com/lapo-luchini)) that prevents the popup from going off-screen while it's opened. [#1308](https://github.com/Leaflet/Leaflet/pull/1308) [#1052](https://github.com/Leaflet/Leaflet/issues/1052)
- * Added `Marker` `togglePopup` method (by [@popox](https://github.com/popox)). [#1761](https://github.com/Leaflet/Leaflet/issues/1761)
- * Added `Popup` `closeOnClick` option that overrides the same `Map` option for specific popups (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1669](https://github.com/Leaflet/Leaflet/issues/1669)
- * Improved `Marker` and `Path` `bindPopup` method to also accept `Popup` objects (by [@snkashis](https://github.com/snkashis)). [#1385](https://github.com/Leaflet/Leaflet/pull/1385) [#1208](https://github.com/Leaflet/Leaflet/issues/1208) [#1402](https://github.com/Leaflet/Leaflet/pull/1402)
- * Added `Marker` `setPopupContent` method (by [@snkashis](https://github.com/snkashis)). [#1373](https://github.com/Leaflet/Leaflet/pull/1373)
-
-##### Map API improvements
-
- * Improved all view changing methods of `Map` (`setView`, `panTo`, `setZoom`, `fitBounds`, etc.) to accept an options object, including the ability to precisely control zoom/pan animations they cause (force disable/enable, etc.). [#1617](https://github.com/Leaflet/Leaflet/pull/1617) [#1616](https://github.com/Leaflet/Leaflet/issues/1616) [#340](https://github.com/Leaflet/Leaflet/issues/340) [#483](https://github.com/Leaflet/Leaflet/issues/483) [#1164](https://github.com/Leaflet/Leaflet/issues/1164) [#1420](https://github.com/Leaflet/Leaflet/issues/1420)
- * Improved `Map` `fitBounds` method to accept `padding` (or `paddingTopLeft` and `paddingBottomRight`) options, allowing you to zoom to an area with a certain padding in pixels (usually left for controls). [#859](https://github.com/Leaflet/Leaflet/issues/859)
- * Improved `Map` `invalidateSize` to accept options object (`animate` and `pan`, the latter controls if it pans the map on size change). (by [@jacobtoye](https://github.com/jacobtoye) and [@mourner](https://github.com/mourner)). [#1766](https://github.com/Leaflet/Leaflet/issues/1766) [#1767](https://github.com/Leaflet/Leaflet/issues/1767)
- * Added `Map` `setZoomAround` method for zooming while keeping a certain point fixed (used by scroll and double-click zooming). [#1157](https://github.com/Leaflet/Leaflet/issues/1157)
- * Added `Map` `remove` method to properly destroy the map and clean up all events, and added corresponding `unload` event (by [@jfirebaugh](https://github.com/jfirebaugh) and [@mourner](https://github.com/mourner)). [#1434](https://github.com/Leaflet/Leaflet/issues/1434) [#1101](https://github.com/Leaflet/Leaflet/issues/1101) [#1621](https://github.com/Leaflet/Leaflet/issues/1621)
- * Added `Map` `tap` handler that now contains all mobile hacks for enabling quick taps and long holds and `tapTolerance` option specifying the number of pixels you can shift your finger for click to still fire.
- * Added `Map` `zoomAnimationThreshold` for setting the max zoom difference with which zoom animation can occur. [#1377](https://github.com/Leaflet/Leaflet/issues/1377)
- * Improved `Map` `openPopup` method to also accept `(content, latlng)` signature as a shortcut.
- * Improved `Map` `closePopup` method to optionally accept a popup object to close. [#1641](https://github.com/Leaflet/Leaflet/issues/1641)
- * Improved `Map` `stopLocate` method to abort resetting map view if calling `locate` with `setView` option. [#747](https://github.com/Leaflet/Leaflet/issues/747)
- * Improved `Map` to throw exception if the specified container id is not found (by [@tmcw](htts://github.com/tmcw)). [#1574](https://github.com/Leaflet/Leaflet/pull/1574)
- * Improved `Map` `locationfound` event to pass all location data (heading, speed, etc.). [#984](https://github.com/Leaflet/Leaflet/issues/984) [#584](https://github.com/Leaflet/Leaflet/issues/584) [#987](https://github.com/Leaflet/Leaflet/issues/987) [#1028](https://github.com/Leaflet/Leaflet/issues/1028)
- * Added `Map` `resize` event. [#1564](https://github.com/Leaflet/Leaflet/issues/1564)
- * Added `Map` `zoomlevelschange` event that triggers when the current zoom range (min/max) changes (by [@moonlite](https://github.com/moonlite)). [#1376](https://github.com/Leaflet/Leaflet/pull/1376)
-
-##### Controls API improvements
-
- * Added **generic toolbar classes** for reuse by plugin developers (used by zoom control).
- * Added `Map` `baselayerchange`, `overlayadd` and `overlayremove` events fired by `Control.Layers` (by [@calvinmetcalf](https://github.com/calvinmetcalf) and [@Xelio](https://github.com/Xelio)). [#1286](https://github.com/Leaflet/Leaflet/issues/1286) [#1634](https://github.com/Leaflet/Leaflet/issues/1634)
- * Added `Control` `getContainer` method. [#1409](https://github.com/Leaflet/Leaflet/issues/1409)
-
-##### Misc API improvements
-
- * Made Leaflet classes compatible with **CoffeeScript class inheritance** syntax (by [@calvinmetcalf](https://github.com/calvinmetcalf)). [#1345](https://github.com/Leaflet/Leaflet/pull/1345) [#1314](https://github.com/Leaflet/Leaflet/issues/1314)
- * Added `cleanAllEventListeners` method (aliased to `off` without arguments) to all events-enabled objects (by [@iirvine](https://github.com/iirvine)). [#1599](https://github.com/Leaflet/Leaflet/issues/1599)
- * Added `addOneTimeEventListener` method (aliased to `once`) to all events-enabled objects (by [@iirvine](https://github.com/iirvine)). [#473](https://github.com/Leaflet/Leaflet/issues/473) [#1596](https://github.com/Leaflet/Leaflet/issues/1596)
- * Added ability to pass coordinates as simple objects (`{lat: 50, lon: 30}` or `{lat: 50, lng: 30}`). [#1412](https://github.com/Leaflet/Leaflet/issues/1412)
- * Added `LatLngBounds` `getNorth`, `getEast`, `getSouth`, `getWest` methods (by [@yohanboniface](https://github.com/yohanboniface)). [#1318](https://github.com/Leaflet/Leaflet/issues/1318)
- * Added `AMD` support (Leaflet now registers itself as a `leaflet` AMD module) (with fixes from [@sheppard](https://github.com/sheppard)). [#1364](https://github.com/Leaflet/Leaflet/issues/1364) [#1778](https://github.com/Leaflet/Leaflet/issues/1778)
- * Added `L.Util.trim` function (by [@kristerkari](https://github.com/kristerkari)). [#1607](https://github.com/Leaflet/Leaflet/pull/1607)
-
-#### Development workflow improvements
-
- * Switched from Jasmine to [Mocha](http://visionmedia.github.io/mocha/) with Expect.js (matchers) and Sinon (spies) for tests (by [@tmcw](https://github.com/tmcw) & [@jfirebaugh](https://github.com/jfirebaugh)). [#1479](https://github.com/Leaflet/Leaflet/issues/1479)
- * Added [Karma](http://karma-runner.github.io) integration for running tests in a headless PhantomJS instance and code coverage reporting (by [@edjafarov](https://github.com/edjafarov)). [#1326](https://github.com/Leaflet/Leaflet/issues/1326) [#1340](https://github.com/Leaflet/Leaflet/pull/1340)
- * Added [Travis CI integration](https://travis-ci.org/Leaflet/Leaflet) for linting and running tests for each commit and pull request automatically (by [@edjafarov](https://github.com/edjafarov)). [#1336](https://github.com/Leaflet/Leaflet/issues/1336)
- * Significantly improved test coverage
- * Added compatibility with lazy evaluation scripts (by [@kristerkari](https://github.com/kristerkari)). [#1288](https://github.com/Leaflet/Leaflet/issues/1288) [#1607](https://github.com/Leaflet/Leaflet/issues/1607) [#1288](https://github.com/Leaflet/Leaflet/issues/1288)
-
-### Bugfixes
-
-#### General bugfixes
-
- * Fixed lots of issues with extent restriction by `Map` `maxBounds`. [#1491](https://github.com/Leaflet/Leaflet/issues/1491) [#1475](https://github.com/Leaflet/Leaflet/issues/1475) [#1194](https://github.com/Leaflet/Leaflet/issues/1194) [#900](https://github.com/Leaflet/Leaflet/issues/900) [#1333](https://github.com/Leaflet/Leaflet/issues/1333)
- * Fixed occasional crashes by disabling zoom animation if changing zoom level by more than 4 levels. [#1377](https://github.com/Leaflet/Leaflet/issues/1377)
- * Fixed a bug with that caused stuttery keyboard panning in some cases (by [@tmcw](https://github.com/tmcw)). [#1710](https://github.com/Leaflet/Leaflet/issues/1710)
- * Fixed a bug that caused unwanted scrolling of the page to the top of the map on focus. [#1228](https://github.com/Leaflet/Leaflet/issues/1228) [#1540](https://github.com/Leaflet/Leaflet/issues/1540)
- * Fixed a bug where clicking on a marker with an open popup caused the popup to faded in again (by [@snkashis](https://github.com/snkashis)). [#506](https://github.com/Leaflet/Leaflet/issues/560) [#1386](https://github.com/Leaflet/Leaflet/pull/1386)
- * Fixed a bug where zoom buttons disabled state didn't update on min/max zoom change (by [@snkashis](https://github.com/snkashis)). [#1372](https://github.com/Leaflet/Leaflet/pull/1372) [#1328](https://github.com/Leaflet/Leaflet/issues/1328)
- * Fixed a bug where scrolling slightly wouldn't always zoom out the map (by [@cschwarz](https://github.com/cschwarz)). [#1575](https://github.com/Leaflet/Leaflet/pull/1575)
- * Fixed popup close button to not leave an outline after clicking on it and reopening the popup (by [@dotCypress](https://github.com/dotCypress)). [#1537](https://github.com/Leaflet/Leaflet/pull/1537)
- * Fixed a bug that prevented tiles from loading during pan animation.
- * Fixed a bug with `contextmenu` events on popups falling through to map (by [@snkashis](https://github.com/snkashis)). [#1730](https://github.com/Leaflet/Leaflet/issues/1730) [#1732](https://github.com/Leaflet/Leaflet/issues/1732)
- * Fixed `404` tile loading errors when browsing the map off the world bounds.
- * Fixed shifted mouse events in some cases with map inside a relatively positioned parent (by [@scooterw](https://github.com/scooterw) and [@jec006](https://github.com/jec006)). [#1670](https://github.com/Leaflet/Leaflet/issues/1670) [#1684](https://github.com/Leaflet/Leaflet/issues/1684) [#1745](https://github.com/Leaflet/Leaflet/issues/1745) [#1744](https://github.com/Leaflet/Leaflet/issues/1744)
- * Fixed a bug where tile layer z-index order sometimes broke after view reset. [#1422](https://github.com/Leaflet/Leaflet/issues/1422)
-
-#### Browser bugfixes
-
- * Fixed a bug with undesirable page scrolling in Firefox 17+ when you zoom the map by scrolling (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1789](https://github.com/Leaflet/Leaflet/issues/1789) [#1788](https://github.com/Leaflet/Leaflet/issues/1788)
- * Fixed a bug where mouse coordinates where shifted in Firefox if the map was inside a positioned block on a scrolled page (by [@joschka](https://github.com/joschka)). [#1365](https://github.com/Leaflet/Leaflet/pull/1365) [#1322](https://github.com/Leaflet/Leaflet/issues/1322)
- * Fixed a bug where box zoom didn't work in some cases in Firefox 18+ (by [@fabriceds](https://github.com/fabriceds)). [#1405](https://github.com/Leaflet/Leaflet/pull/1405)
- * Fixed a bug where `TileLayer` opacity didn't work in IE 7-8 (by [@javisantana](https://github.com/javisantana) & [@danzel](https://gi
-.com/danzel)). [#1084](https://github.com/Leaflet/Leaflet/issues/1084) [#1396](https://github.com/Leaflet/Leaflet/pull/1396) [#1371](https://github.com/Leaflet/Leaflet/issues/1371)
- * Fixed Leaflet not working correctly in PhantomJS (by [@rassie](https://github.com/rassie)). [#1501](https://github.com/Leaflet/Leaflet/pull/1501)
-
-#### Mobile bugfixes
-
- * Fixed a bug with layers control on WinPhone8/IE10 Touch (by [@danzel](https://github.com/danzel)). [#1635](https://github.com/Leaflet/Leaflet/pull/1635) [#1539](https://github.com/Leaflet/Leaflet/issues/1539)
- * Fixed a bug with click sometimes firing twice on WinPhone8/IE10 Touch (by [@danzel](https://github.com/danzel)). [#1694](https://github.com/Leaflet/Leaflet/issues/1694)
- * Fixed a bug in Android where click was triggered twice on one tap (by [@jerel](https://github.com/jerel) & [@mourner](https://github.com/mourner)). [#1227](https://github.com/Leaflet/Leaflet/pull/1227) [#1263](https://github.com/Leaflet/Leaflet/issues/1263) [#1785](https://github.com/Leaflet/Leaflet/issues/1785) [#1694](https://github.com/Leaflet/Leaflet/issues/1694)
- * Fixed a bug in Android where click on a collapsed layers control would immediately select one of the layers (by [@danzel](https://github.com/danzel)). [#1784](https://github.com/Leaflet/Leaflet/issues/1784) [#1694](https://github.com/Leaflet/Leaflet/issues/1694)
-
-#### API bugfixes
-
-##### General API bugfixes
-
- * Fixed click mouse event inside popups **not propagating outside the map** (fixes issues with jQuery.live and some mobile frameworks that rely on document click listeners). [#301](https://github.com/Leaflet/Leaflet/issues/301)
- * Fixed a bug where event listener still fired even if it was removed on the same event in other listener (by [@spamdaemon](https://github.com/spamdaemon)). [#1661](https://github.com/Leaflet/Leaflet/issues/1661) [#1654](https://github.com/Leaflet/Leaflet/issues/1654)
- * Fixed a bug where `L.point` and `L.latLng` factories weren't passing `null` and `undefined` values through.
- * Fixed `DomEvent` `removeListener` function chaining (by [@pagameba](https://github.com/pagameba)).
- * Fixed a bug where `removeEventListener` would throw an error if no events are registered on the object (by [@tjoekbezoer](https://github.com/tjoekbezoer)). [#1632](https://github.com/Leaflet/Leaflet/pull/1632) [#1631](https://github.com/Leaflet/Leaflet/issues/1631)
- * Fixed a bug where `Point` `equals` and `contains` methods didn't accept points in array form.
- * Fixed a bug where `LatLngBounds` `extend` of an undefined object would cause an error (by [@korzhyk](https://github.com/korzhyk)). [#1688](https://github.com/Leaflet/Leaflet/issues/1688)
- * Fixed a bug where `Control.Attribution` `removeAttribution` of inexistant attribution corrupted the attribution text. [#1410](https://github.com/Leaflet/Leaflet/issues/1410)
- * Fixed a bug where `setView` on an invisible map caused an error (by [@jfire](https://github.com/jfire)). [#1707](https://github.com/Leaflet/Leaflet/issues/1707)
- * Fixed compatibility with Browserify (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1572](https://github.com/Leaflet/Leaflet/pull/1572)
-
-##### Layers API bugfixes
-
- * Fixed a bug where default marker icon path wasn't properly detected in some cases in IE6-7 (by [@calvinmetcalf](https://github.com/calvinmetcalf)). [#1294](https://github.com/Leaflet/Leaflet/pull/1294)
- * Fixed a bug where `TileLayer.WMS` param values weren't escaped in URLs (by [@yohanboniface](https://github.com/yohanboniface)). [#1317](https://github.com/Leaflet/Leaflet/issues/1317)
- * Fixed a bug where layers that belong to multiple feature groups didn't propagate events correctly (by [@danzel](https://github.com/danzel)). [#1359](https://github.com/Leaflet/Leaflet/pull/1359)
- * Fixed a bug where `TileLayer.WMS` `tileSize` option was ignored (by [@brianhatchl](https://github.com/brianhatchl)). [#1080](https://github.com/brianhatchl)
- * Fixed a bug where `Polyline` constructor could overwrite the source array (by [@snkashis](https://github.com/snkashis) and [@danzel](https://github.com/danzel)). [#1439](https://github.com/Leaflet/Leaflet/pull/1439) [#1092](https://github.com/Leaflet/Leaflet/issues/1092) [#1246](https://github.com/Leaflet/Leaflet/issues/1246) [#1426](https://github.com/Leaflet/Leaflet/issues/1426)
- * Fixed a bug where marker dragging disabling/enabling wouldn't always work correctly (by [@snkashis](https://github.com/snkashis) and [@escaped](https://github.com/escaped)). [#1471](https://github.com/Leaflet/Leaflet/pull/1471) [#1551](https://github.com/Leaflet/Leaflet/pull/1551)
- * Fixed `TileLayer` to prevent incorrect subdomain in case of negative tile coordinates (by [@malexeev](https://github.com/malexeev)). [#1532](https://github.com/Leaflet/Leaflet/pull/1532)
- * Fixed polygons to normalize holes (remove last point if it's equal to the first one) (by [@jfirebaugh](https://github.com/jfirebaugh)). [#](https://github.com/Leaflet/Leaflet/pull/1467) [#1459](https://github.com/Leaflet/Leaflet/issues/1459)
- * Fixed `DivIcon` `html` option to accept `0` as a value (by [@stuporglue](https://github.com/stuporglue)). [#1633](https://github.com/Leaflet/Leaflet/pull/1633)
- * Fixed a bug with Canvas-based paths throwing an error on `mousemove` in certain conditions. [#1615](https://github.com/Leaflet/Leaflet/issues/1615)
- * Fixed a bug where copies of the world wouldn't load if you set `TileLayer` `bounds` (by [@ansis](https://github.com/ansis)). [#1618](https://github.com/Leaflet/Leaflet/issues/1618)
- * Fixed a bug where `TileLayer` `load` event wouldn't always fire correctly. [#1565](https://github.com/Leaflet/Leaflet/issues/1565)
- * Fixed `TileLayer.WMS` compatibility with some old servers that only accepted request parameters in uppercase. [#1751](https://github.com/Leaflet/Leaflet/issues/1751)
- * Fixed a bug with incorrect `L.Icon.Default.imagePath` detection in some cases. [#1657](https://github.com/Leaflet/Leaflet/issues/1657)
- * Fixed a bug where layer `onRemove` was still called even if it was never added (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1729](https://github.com/Leaflet/Leaflet/issues/1729)
- * Fixed a bug where calling `setRadius` on a Canvas-powered `CircleMarker` would cause an infinite loop (by [@snkashis](https://github.com/snkashis)). [#1712](https://github.com/Leaflet/Leaflet/issues/1712) [#1713](https://github.com/Leaflet/Leaflet/issues/1713) [#1728](https://github.com/Leaflet/Leaflet/issues/1728)
- * Renamed `marker-icon@2x.png` to `marker-icon-2x.png` to fix compatibility with Google AppEngine. [#1552](https://github.com/Leaflet/Leaflet/issues/1552) [#1553](https://github.com/Leaflet/Leaflet/issues/1553)
- * Fixed a bug where `popupclose` and `popupopen` events weren't fired for multipolygons and multipolylines (by [@tmcw](https://github.com/tmcw)). [#1681](https://github.com/Leaflet/Leaflet/issues/1681)
-
-##### Map API bugfixes
-
- * Fixed a bug where `Map` `fitBounds` wouldn't work correctly with large bounds (thanks to [@MaZderMind](https://github.com/MaZderMind)). [#1069](https://github.com/Leaflet/Leaflet/issues/1069)
- * Fixed a bug where `Map` `hasLayer` wasn't handling `null` objects (by [@rvlasveld](https://github.com/rvlasveld)). [#1282](https://github.com/Leaflet/Leaflet/issues/1282) [#1302](https://github.com/Leaflet/Leaflet/pull/1302)
- * Fixed a bug where `Map` `moveend` fired before `dragend` on drag (by [@oslek](https://github.com/oslek)). [#1374](https://github.com/Leaflet/Leaflet/pull/1374)
- * Fixed a bug where panning with inertia produced an excessive `Map` `movestart` event on inertia start (by [@oslek](https://github.com/oslek)). [#1374](https://github.com/Leaflet/Leaflet/pull/1374)
- * Fixed a bug where `Map` `moveend` fired repeatedly on window resize even if the actual map size didn't change (by [@oslek](https://github.com/oslek)). [#1374](https://github.com/Leaflet/Leaflet/pull/1374)
- * Fixed a bug where `Map` `moveend` sometimes wasn't fired after drag (particularly often when dragging with a trackpad).
- * Fixed a bug that would cause an error when trying to get the state of the map in a `Map` `load` event listener. [#962](https://github.com/Leaflet/Leaflet/issues/962)
- * Added `Map` `autopanstart` event back (it was removed occasionally in previous version). [#1375](https://github.com/Leaflet/Leaflet/issues/1375)
- * Fixed a bug with removing previously set `Map` `maxBounds` (by [@jec006](https://github.com/jec006)). [#1749](https://github.com/Leaflet/Leaflet/issues/1749) [#1750](https://github.com/Leaflet/Leaflet/issues/1750)
-
-
-## 0.5.1 (February 6, 2013)
-
- * Fixed a regression with `GeoJSON` not accepting arrays of `FeatureCollection` (by [@snkashis](https://github.com/snkashis)). [#1299](https://github.com/Leaflet/Leaflet/pull/1299) [#1298](https://github.com/Leaflet/Leaflet/issues/1298)
- * Fixed a regression with `CirleMarker` `setRadius` not working if called before adding the layer to the map (by [@danzel](https://github.com/danzel)). [#1342](https://github.com/Leaflet/Leaflet/issues/1342) [#1297](https://github.com/Leaflet/Leaflet/issues/1297)
-
-## 0.5 (January 17, 2013)
-
-### Breaking changes
-
-Be sure to read through these changes to avoid any issues when upgrading from older versions:
-
- * Removed default `LatLng` wrapping/clamping of coordinates (`-180, -90` to `180, 90`), wrapping moved to an explicit method (`LatLng` `wrap`).
- * Disabled `Map` `worldCopyJump` option by default (jumping back to the original world copy when panning out of it). Enable it explicitly if you need it.
- * Changed styles for the zoom control (you may need to update your custom styles for it).
-
-### Improvements
-
-#### Usability improvements
-
-##### Interaction
-
- * Added touch zoom, pan and double tap support for **IE10 touch devices and Metro apps** (by [@danzel](https://github.com/danzel) and [@veproza](https://github.com/veproza) with help from [@oliverheilig](https://github.com/oliverheilig)). [#1076](https://github.com/Leaflet/Leaflet/pull/1076) [#871](https://github.com/Leaflet/Leaflet/issues/871)
- * **Improved panning inertia** to be much more natural and smooth.
- * **Improved dragging cursors** in Chrome, Safari and Firefox (now grabbing hand cursors are used).
- * Improved zoom animation curve for a better feel overall.
- * Improved scroll wheel zoom to be more responsive.
- * Improved panning animation performance in IE6-8.
-
-##### Controls
-
- * **Improved zoom control design** to look better, more neutral and in line with other controls, making it easier to customize and fit different website designs. Replaced +/- images with text.
- * Improved zoom control to zoom by 3 levels if you hold shift while clicking on a button.
- * Improved zoom control buttons to become visually disabled when min/max zoom is reached. [#917](https://github.com/Leaflet/Leaflet/issues/917)
- * Improved scale control styles.
- * Improved fallback control styles for IE6-8.
-
-##### Other
-
- * Added **retina support for markers** (through `Icon` `iconRetinaUrl` and `shadowRetinaUrl` options) (by [@danzel](https://github.com/danzel)). [#1048](https://github.com/Leaflet/Leaflet/issues/1048) [#1174](https://github.com/Leaflet/Leaflet/pull/1174)
- * Added retina-sized default marker icon in addition to standard one (along with its SVG source and with some subtle design improvements) (by [@danzel](https://github.com/danzel)). [#1048](https://github.com/Leaflet/Leaflet/issues/1048) [#1174](https://github.com/Leaflet/Leaflet/pull/1174)
- * Improved vectors updating/removing performance on Canvas backend (by [@danzel](https://github.com/danzel)). [#961](https://github.com/Leaflet/Leaflet/pull/961)
- * Cut total images size from 10KB to 3.2KB with [Yahoo Smush.it](http://www.smushit.com/ysmush.it/). Thanks to Peter Rounce for suggestion.
-
-#### API improvements
-
- * Replaced `L.Transition` with a much better and simpler `L.PosAnimation`.
- * Added `Class` `addInitHook` method for **adding constructor hooks to any classes** (great extension point for plugin authors). [#1123](https://github.com/Leaflet/Leaflet/issues/1123)
- * Added `Map` `whenReady` method (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1063](https://github.com/Leaflet/Leaflet/pull/1063)
- * Added optional `delta` argument to `Map` `zoomIn` and `zoomOut` (1 by default).
- * Added `isValid` method to `LatLngBounds` and `Bounds` (by [@domoritz](https://github.com/domoritz)). [#972](https://github.com/Leaflet/Leaflet/pull/972)
- * Added `Point` `equals` method.
- * Added `Bounds` `getSize` method.
- * Improved markers and vectors click event so that it propagates to map if no one is listening to it (by [@danzel](https://github.com/danzel)). [#834](https://github.com/Leaflet/Leaflet/issues/834) [#1033](https://github.com/Leaflet/Leaflet/pull/1033)
- * Added `Path` `unbindPopup` and `closePopup` methods.
- * Added `Path` `add` and `remove` event.
- * Added `Marker` `riseOnHover` and `riseOffset` options (for bringing markers to front on hover, disabled by default) (by [jacobtoye](https://github.com/jacobtoye)). [#914](https://github.com/Leaflet/Leaflet/pull/914) [#920](https://github.com/Leaflet/Leaflet/issues/920)
- * Added `Marker` `move` and `remove` events.
- * Added `Marker` `contextmenu` event. [#223](https://github.com/Leaflet/Leaflet/issues/223)
- * Added `Popup` `zoomAnimation` option (useful to disable when displaying flash content inside popups [#999](https://github.com/Leaflet/Leaflet/issues/999)).
- * Added `FeatureGroup` `layeradd` and `layerremove` events (by [@jacobtoye](https://github.com/jacobtoye)). [#1122](https://github.com/Leaflet/Leaflet/issues/1122)
- * Added `Control.Layers` `baselayerchange` event (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1064](https://github.com/Leaflet/Leaflet/pull/1064)
- * Improved `Control.Layers` to support HTML in layer names (by [@aparshin](https://github.com/aparshin)). [#1055](https://github.com/Leaflet/Leaflet/pull/1055) [#1099](https://github.com/Leaflet/Leaflet/issues/1099)
- * Added `CRS.Simple` to the list of built-in CRS and improved it to be more usable out of the box (it has different default scaling and transformation now), see `debug/map/simple-proj.html` for an example.
- * Removed `Browser` `ua`, `gecko`, `opera` properties (no longer needed).
- * Added `L.extend`, `L.bind`, `L.stamp`, `L.setOptions` shortcuts for corresponding `L.Util` methods.
- * Disabled clearing of map container contents on map initialization (as a result of fixing [#278](https://github.com/Leaflet/Leaflet/issues/278)).
- * Added `L.Util.isArray` function (by [@oslek](https://github.com/oslek)). [#1279](https://github.com/Leaflet/Leaflet/pull/1279)
- * Added `mouseover` and `mouseout` events to canvas-based vector layers (by [@snkashis](https://github.com/snkashis)). [#1403](https://github.com/Leaflet/Leaflet/pull/1403)
- * Added `Map` `eachLayer` to iterate over all layers added to the map (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1457](https://github.com/Leaflet/Leaflet/pull/1457)
- * Added `TileLayer` `bounds` option to limit tile loading to a specific region (by [@adimitrov](https://github.com/adimitrov)). [#991](https://github.com/Leaflet/Leaflet/pull/991)
-
-### Bugfixes
-
-#### General bugfixes
-
- * Fixed broken tiles and zooming in RTL layouts (by [@danzel](https://github.com/danzel)). [#1099](https://github.com/Leaflet/Leaflet/pull/1099) [#1095](https://github.com/Leaflet/Leaflet/issues/1095)
- * Fixed a bug with pan animation where it jumped to its end position if you tried to drag the map.
- * Fixed a bug where shift-clicking on a map would zoom it to the max zoom level.
- * Fixed a glitch with zooming in while panning animation is running.
- * Fixed a glitch with dragging the map while zoom animation is running.
- * Fixed a bug where slight touchpad scrolling or one-wheel scrolling wouln't always perform zooming. [#1039](https://github.com/Leaflet/Leaflet/issues/1039)
- * Fixed a bug where `panBy` wouldn't round the offset values (so it was possible to make the map blurry with it). [#1085](https://github.com/Leaflet/Leaflet/issues/1085)
- * Fixed a bug where you couldn't scroll the layers control with a mouse wheel.
- * Fixed a regression where WMS tiles wouldn't wrap on date lines. [#970](https://github.com/Leaflet/Leaflet/issues/970)
- * Fixed a bug where mouse interaction was affected by map container border width (by [@mohlendo](https://github.com/mohlendo)). [#1204](https://github.com/Leaflet/Leaflet/issues/1205) [#1205](https://github.com/Leaflet/Leaflet/pull/1205)
- * Fixed a bug with weird vector zoom animation when using Canvas for rendering (by [@danzel](https://github.com/danzel)). [#1187](https://github.com/Leaflet/Leaflet/issues/1187) [#1188](https://github.com/Leaflet/Leaflet/pull/1188)
- * Fixed a bug where max bounds limitation didn't work when navigating the map with a keyboard (by [@snkashis](https://github.com/snkashis)). [#989](https://github.com/Leaflet/Leaflet/issues/989) [#1221](https://github.com/Leaflet/Leaflet/pull/1221)
-
-#### API bugfixes
-
- * Fixed a bug where `TileLayer` `bringToBack` didn't work properly in some cases (by [@danzel](https://github.com/danzel)). [#963](https://github.com/Leaflet/Leaflet/pull/963) [#959](https://github.com/Leaflet/Leaflet/issues/959)
- * Fixed a bug where removing a tile layer while dragging would throw an error (by [@danzel](https://github.com/danzel)). [#965](https://github.com/Leaflet/Leaflet/issues/965) [#968](https://github.com/Leaflet/Leaflet/pull/968)
- * Fixed a bug where middle marker wasn't removed after deleting 2 end nodes from a polyline (by [@Svad](https://github.com/Svad)). [#1022](https://github.com/Leaflet/Leaflet/issues/1022) [#1023](https://github.com/Leaflet/Leaflet/pull/1023)
- * Fixed a bug where `Map` `load` event happened too late (after `moveend`, etc.) (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1027](https://github.com/Leaflet/Leaflet/pull/1027)
- * Fixed `Circle` `getBounds` to return correct bounds and work without adding the circle to a map. [#1068](https://github.com/Leaflet/Leaflet/issues/1068)
- * Fixed a bug where removing `Popup` on `viewreset` throwed an error (by [fnicollet](https://github.com/fnicollet) and [@danzel](https://github.com/danzel)). [#1098](https://github.com/Leaflet/Leaflet/pull/1098) [#1094](https://github.com/Leaflet/Leaflet/issues/1094)
- * Fixed a bug where `TileLayer.Canvas` `drawTile` didn't receive tile zoom level in arguments.
- * Fixed a bug where `GeoJSON` `resetStyle` would not fully reset a layer to its default style. [#1112](https://github.com/Leaflet/Leaflet/issues/1112)
- * Fixed a bug that caused infinite recursion when using `latLngBounds` factory with coordinates as string values. [#933](https://github.com/Leaflet/Leaflet/issues/933)
- * Fixed chaining on `Marker` `setIcon`, `setZIndexOffset`, `update` methods. [#1176](https://github.com/Leaflet/Leaflet/issues/1176)
- * Fixed a bug with mouse interaction when the map container contained children with position other than absolute. [#278](https://github.com/Leaflet/Leaflet/issues/278)
- * Fixed a bug with fill/stroke opacity conflicts when using Canvas for rendering (by [@danzel](https://github.com/danzel)). [#1186](https://github.com/Leaflet/Leaflet/issues/1186) [#1889](https://github.com/Leaflet/Leaflet/pull/1189)
- * Fixed a bug where `FeatureGroup` `bindPopup` didn't take options into account.
- * Fixed a bug where Canvas-based vector layers didn't cleanup click event on removal properly (by [@snkashis](https://github.com/snkashis)). [#1006](https://github.com/Leaflet/Leaflet/issues/1006) [#1273](https://github.com/Leaflet/Leaflet/pull/1273)
- * Fixed a bug where `CircleMarker` `setStyle` didn't take `radius` into account (by [@fdlk](https://github.com/fdlk)). [#1012](https://github.com/Leaflet/Leaflet/issues/1012) [#1013](https://github.com/Leaflet/Leaflet/pull/1013)
- * Fixed a bug where null GeoJSON geometries would throw an error instead of skipping (by [@brianherbert](https://github.com/brianherbert)). [#1240](https://github.com/Leaflet/Leaflet/pull/1240)
- * Fixed a bug where Canvas-based vector layers passed incorrect `layer` event property on click (by [@snkashis](https://github.com/snkashis)). [#1215](https://github.com/Leaflet/Leaflet/issues/1215) [#1243](https://github.com/Leaflet/Leaflet/pull/1243)
- * Fixed a bug where `TileLayer.WMS` didn't work correctly if the base URL contained query parameters (by [@snkashis](https://github.com/snkashis)). [#973](https://github.com/Leaflet/Leaflet/issues/973) [#1231](https://github.com/Leaflet/Leaflet/pull/1231)
- * Fixed a bug where removing a polyline in editing state wouldn't clean up the editing handles (by [@mehmeta](https://github.com/mehmeta)). [#1233](https://github.com/Leaflet/Leaflet/pull/1233)
- * Fixed a bug where removing a vector layer with a bound popup wouldn't clean up its click event properly (by [@yohanboniface](https://github.com/yohanboniface)). [#1229](https://github.com/Leaflet/Leaflet/pull/1229)
- * Fixed a bug where `GeoJSON` features with `GeometryCollection` didn't pass properties to `pointToLayer` function (by [@calvinmetcalf](https://github.com/calvinmetcalf)). [#1097](https://github.com/Leaflet/Leaflet/pull/1097)
- * Fixed `FeatureGroup` `eachLayer` chaining. [#1452](https://github.com/Leaflet/Leaflet/issues/1452)
-
-#### Browser bugfixes
-
- * Fixed a bug with map **freezing after zoom on Android 4.1**. [#1182](https://github.com/Leaflet/Leaflet/issues/1182)
- * Fixed a bug where "Not implemented" error sometimes appeared in IE6-8 (by [@bryguy](https://github.com/bryguy) and [@lookfirst](https://github.com/lookfirst)). [#892](https://github.com/Leaflet/Leaflet/issues/892) [#893](https://github.com/Leaflet/Leaflet/pull/893)
- * Fixed compatibility with SmoothWheel extension for Firefox (by [@waldir](https://github.com/waldir)). [#1011](https://github.com/Leaflet/Leaflet/pull/1011)
- * Fixed a bug with popup layout in IE6-7 (by [@danzel](https://github.com/danzel)). [#1117](https://github.com/Leaflet/Leaflet/issues/1117)
- * Fixed a bug with incorrect box zoom opacity in IE6-7 (by [@jacobtoye](https://github.com/jacobtoye)). [#1072](https://githubcom/Leaflet/Leaflet/pull/1072)
- * Fixed a bug with box zoom throwing a JS error in IE6-7 (by [@danzel](https://github.com/danzel)). [#1071](https://github.com/Leaflet/Leaflet/pull/1071)
- * Fixed a bug where `TileLayer` `bringToFront/Back()` throwed an error in IE6-8. [#1168](https://github.com/Leaflet/Leaflet/issues/1168)
- * Fixed array type checking in the code to be more consistent in a cross-frame environment (by [@oslek](https://github.com/oslek)). [#1279](https://github.com/Leaflet/Leaflet/pull/1279)
- * Fixed a bug with `-` key not working in Firefox 15+ (thanks to [@mattesCZ](https://github.com/mattesCZ)). [#869](https://github.com/Leaflet/Leaflet/issues/869)
-
-## 0.4.5 (October 25, 2012)
-
- * Fixed a bug with **wonky zoom animation in IE10** (by [@danzel](https://github.com/danzel)). [#1007](https://github.com/Leaflet/Leaflet/pull/1007)
- * Fixed a bug with **wonky zoom animation in Chrome 23+** (by [@danzel](https://github.com/danzel)). [#1060](https://github.com/Leaflet/Leaflet/pull/1060) [#1056](https://github.com/Leaflet/Leaflet/issues/1056)
-
-## 0.4.4 (August 7, 2012)
-
-### Improvements
-
- * Improved `GeoJSON` `setStyle` to also accept function (like the corresponding option).
- * Added `GeoJSON` `resetStyle(layer)`, useful for resetting hover state.
- * Added `feature` property to layers created with `GeoJSON` (containing the GeoJSON feature data).
- * Added `FeatureGroup` `bringToFront` and `bringToBack` methods (so that they would work for multipolys).
- * Added optional `animate` argument to `Map` `invalidateSize` (by [@ajbeaven](https://github.com/ajbeaven)). [#857](https://github.com/Leaflet/Leaflet/pull/857)
-
-### Bugfixes
-
- * Fixed a bug where tiles sometimes disappeared on initial map load on Android 2/3 (by [@danzel](https://github.com/danzel)). [#868](https://github.com/Leaflet/Leaflet/pull/868)
- * Fixed a bug where map would occasionally flicker near the border on zoom or pan on Chrome.
- * Fixed a bug where `Path` `bringToFront` and `bringToBack` didn't return `this`.
- * Removed zoom out on Win/Meta key binding (since it interferes with global keyboard shortcuts). [#869](https://github.com/Leaflet/Leaflet/issues/869)
-
-## 0.4.2 (August 1, 2012)
-
- * Fixed a bug where layers control radio buttons would not work correctly in IE7 (by [@danzel](https://github.com/danzel)). [#862](https://github.com/Leaflet/Leaflet/pull/862)
- * Fixed a bug where `FeatureGroup` `removeLayer` would unbind popups of removed layers even if the popups were not put by the group (affected [Leaflet.markercluster](https://github.com/danzel/Leaflet.markercluster) plugin) (by [@danzel](https://github.com/danzel)). [#861](https://github.com/Leaflet/Leaflet/pull/861)
-
-## 0.4.1 (July 31, 2012)
-
- * Fixed a bug that caused marker shadows appear as opaque black in IE6-8. [#850](https://github.com/Leaflet/Leaflet/issues/850)
- * Fixed a bug with incorrect calculation of scale by the scale control. [#852](https://github.com/Leaflet/Leaflet/issues/852)
- * Fixed broken L.tileLayer.wms class factory (by [@mattcurrie](https://github.com/mattcurrie)). [#856](https://github.com/Leaflet/Leaflet/issues/856)
- * Improved retina detection for `TileLayer` `detectRetina` option (by [@sxua](https://github.com/sxua)). [#854](https://github.com/Leaflet/Leaflet/issues/854)
-
-## 0.4 (July 30, 2012)
-
-### API simplification
-
-Leaflet 0.4 contains several API improvements that allow simpler, jQuery-like syntax ([example](https://gist.github.com/3038879)) while being backwards compatible with the previous approach (so you can use both styles):
-
- * Improved most methods and options to accept `LatLng`, `LatLngBounds`, `Point` and `Bounds` values in an array form (e.g. `map.panTo([lat, lng])` will be the same as `map.panTo(new L.LatLng(lat, lng))`)
- * Added `addTo` method to all layer classes, e.g. `marker.addTo(map)` is equivalent to `map.addLayer(marker)`
- * Added factory methods to most classes to be able to write code without `new` keyword, named the same as classes but starting with a lowercase letter, e.g. `L.map('map')` is the same as `new L.Map('map')`
-
-### Notable new features
-
- * Added configurable **panning inertia** - after a quick pan, the map slows down in the same direction.
- * Added **keyboard navigation** for panning/zooming with keyboard arrows and +/- keys (by [@ericmmartinez](https://github.com/ericmmartinez)). [#663](https://github.com/Leaflet/Leaflet/pull/663) [#646](https://github.com/Leaflet/Leaflet/issues/646)
- * Added smooth **zoom animation of markers, vector layers, image overlays and popups** (by [@danzel](https://github.com/danzel)). [#740](https://github.com/Leaflet/Leaflet/pull/740) [#758](https://github.com/Leaflet/Leaflet/issues/758)
- * Added **Android 4+ pinch-zoom** support (by [@danzel](https://github.com/danzel)). [#774](https://github.com/Leaflet/Leaflet/pull/774)
- * Added **polyline and polygon editing**. [#174](https://github.com/Leaflet/Leaflet/issues/174)
- * Added an unobtrusive **scale control**.
- * Added **DivIcon** class that easily allows you to create lightweight div-based markers.
- * Added **Rectangle** vector layer (by [@JasonSanford](https://github.com/JasonSanford)). [#504](https://github.com/Leaflet/Leaflet/pull/504)
-
-### Improvements
-
-#### Usability improvements
-
- * Improved zooming so that you don't get a blank map when you zoom in or out twice quickly (by [@danzel](https://github.com/danzel)). [#7](https://github.com/Leaflet/Leaflet/issues/7) [#729](https://github.com/Leaflet/Leaflet/pull/729)
- * Drag-panning now works even when there are markers in the starting point (helps on maps with lots of markers). [#506](https://github.com/Leaflet/Leaflet/issues/506)
- * Improved panning performance even more (there are no wasted frames now).
- * Improved pinch-zoom performance in mobile Chrome and Firefox.
- * Improved map performance on window resize.
- * Replaced box-shadow with border on controls for mobile devices to improve performance.
- * Slightly improved default popup styling.
- * Added `TileLayer` `detectRetina` option (`false` by default) that makes tiles show in a higher resolution on iOS retina displays (by [@Mithgol](https://github.com/Mithgol)). [#586](https://github.com/Leaflet/Leaflet/pull/586)
-
-#### GeoJSON API changes
-
-GeoJSON API was improved to be simpler and more flexible ([example](https://gist.github.com/3062900)). The changes are not backwards-compatible, so be sure to update your old code.
-
- * Added `style` option for styling vector layers, passed either as an object or as a function (to style vector layers according to GeoJSON properties).
- * Added `filter` option to leave out features that don't correspond to a certain criteria (e.g. based on properties).
- * Added `onEachFeature` option to execute certain code on each feature layer based on its properties (binding popups, etc).
- * Changed `pointToLayer` function signature to provide `geojson` in addition to `latlng` when creating point features for more flexibility.
-
-#### Icon API changes
-
-Icon API was improved to be more flexible, but one of the changes is backwards-incompatible: you now need to pass different icon properties (like `iconUrl`) inside an options object ([example](https://gist.github.com/3076084)).
-
- * Converted `Icon` properties to options, changed constructor signature to `Icon(options)`.
- * Moved default marker icon options to `L.Icon.Default` class (which extends from `L.Icon`).
- * Added `Icon` `className` option to assign a custom class to an icon.
- * Added `Icon` `shadowAnchor` option to set the anchor of the shadow.
- * Made all `Icon` options except `iconUrl` optional (if not specified, they'll be chosen automatically or implemented using CSS). Anchor is centered by default (if size is specified), and otherwise can be set through CSS using negative margins.
-
-#### Control API changes
-
- * Added `setPosition` and `getPosition` to all controls, as well as ability to pass certain position as an option when creating a control.
- * Made controls implementation easier (now more magic happens under the hood).
- * Replaced ugly control position constants (e.g. `L.Control.Position.TOP_LEFT`) with light strings (`'topleft'`, `'bottomright'`, etc.)
-
-#### Other breaking API changes
-
- * Improved `TileLayer` constructor to interpolate URL template values from options (removed third `urlParams` argument).
- * Changed `TileLayer` `scheme: 'tms'` option to `tms: true`.
- * Removed `Map` `locateAndSetView` method (use `locate` with `setView: true` option)
- * Changed popup `minWidth` and `maxWidth` options to be applied to content element, not the whole popup.
- * Moved `prefix` argument to `options` in `Control.Attribution` constructor.
- * Renamed `L.VERSION` to `L.version`.
-
-#### Other API improvements
-
- * Improved `on` and `off` methods to also accept `(eventHash[, context])`, as well as multiple space-separated events (by [@Guiswa](https://github.com/Guiswa)). [#770](https://github.com/Leaflet/Leaflet/pull/770)
- * Improved `off` to remove all listeners of the event if no function was specified (by [@Guiswa](https://github.com/Guiswa)). [#770](https://github.com/Leaflet/Leaflet/pull/770) [#691](https://github.com/Leaflet/Leaflet/issues/691)
- * Added `TileLayer` `setZIndex` method for controlling the order of tile layers (thanks to [@mattcurrie](https://github.com/mattcurrie)). [#837](https://github.com/Leaflet/Leaflet/pull/837)
- * Added `Control.Layers` `autoZIndex` option (on by default) to preserve the order of tile layers when switching.
- * Added `TileLayer` `redraw` method for re-requesting tiles (by [@greeninfo](https://github.com/greeninfo)). [#719](https://github.com/Leaflet/Leaflet/issues/719)
- * Added `TileLayer` `setUrl` method for dynamically changing the tile URL template.
- * Added `bringToFront` and `bringToBack` methods to `TileLayer`, `ImageOverlay` and vector layers. [#185](https://github.com/Leaflet/Leaflet/issues/185) [#505](https://github.com/Leaflet/Leaflet/issues/505)
- * Added `TileLayer` `loading` event that fires when its tiles start to load (thanks to [@lapinos03](https://github.com/lapinos03)). [#177](https://github.com/Leaflet/Leaflet/issues/177)
- * Added `TileLayer.WMS` `setParams` method for setting WMS parameters at runtime (by [@greeninfo](https://github.com/greeninfo)). [#719](https://github.com/Leaflet/Leaflet/issues/719)
- * Added `TileLayer.WMS` subdomain support (`{s}` in the url) (by [@greeninfo](https://github.com/greeninfo)). [#735](https://github.com/Leaflet/Leaflet/issues/735)
- * Added `originalEvent` property to `MouseEvent` (by [@k4](https://github.com/k4)). [#521](https://github.com/Leaflet/Leaflet/pull/521)
- * Added `containerPoint` property to `MouseEvent`. [#413](https://github.com/Leaflet/Leaflet/issues/413)
- * Added `contextmenu` event to vector layers (by [@ErrorProne](https://github.com/ErrorProne)). [#500](https://github.com/Leaflet/Leaflet/pull/500)
- * Added `LayerGroup` `eachLayer` method for iterating over its members.
- * Added `FeatureGroup` `mousemove` and `contextmenu` events (by [@jacobtoye](https://github.com/jacobtoye)). [#816](https://github.com/Leaflet/Leaflet/pull/816)
- * Added chaining to `DomEvent` methods.
- * Added `on` and `off` aliases for `DomEvent` `addListener` and `removeListener` methods.
- * Added `L_NO_TOUCH` global variable switch (set it before Leaflet inclusion) which disables touch detection, helpful for desktop apps built using QT. [#572](https://github.com/Leaflet/Leaflet/issues/572)
- * Added `dashArray` option to vector layers for making dashed strokes (by [jacobtoye](https://github.com/jacobtoye)). [#821](https://github.com/Leaflet/Leaflet/pull/821) [#165](https://github.com/Leaflet/Leaflet/issues/165)
- * Added `Circle` `getBounds` method. [#440](https://github.com/Leaflet/Leaflet/issues/440)
- * Added `Circle` `getLatLng` and `getRadius` methods (by [@Guiswa](https://github.com/Guiswa)). [#655](https://github.com/Leaflet/Leaflet/pull/655)
- * Added `openPopup` method to all vector layers. [#246](https://github.com/Leaflet/Leaflet/issues/246)
- * Added public `redraw` method to vector layers (useful if you manipulate their `LatLng` points directly).
- * Added `Marker` `opacity` option and `setOpacity` method.
- * Added `Marker` `update` method. [#392](https://github.com/Leaflet/Leaflet/issues/392)
- * Improved `Marker` `openPopup` not to raise an error if it doesn't have a popup. [#507](https://github.com/Leaflet/Leaflet/issues/507)
- * Added `ImageOverlay` `opacity` option and `setOpacity` method. [#438](https://github.com/Leaflet/Leaflet/issues/438)
- * Added `Popup` `maxHeight` option that makes content inside the popup scrolled if it doesn't fit the specified max height.
- * Added `Popup` `openOn(map)` method (similar to `Map` `openPopup`).
- * Added `Map` `getContainer` method (by [@Guiswa](https://github.com/Guiswa)). [#654](https://github.com/Leaflet/Leaflet/pull/654)
- * Added `Map` `containerPointToLatLng` and `latLngToContainerPoint` methods. [#474](https://github.com/Leaflet/Leaflet/issues/474)
- * Added `Map` `addHandler` method.
- * Added `Map` `mouseup` and `autopanstart` events.
- * Added `LatLngBounds` `pad` method that returns bounds extended by a percentage (by [@jacobtoye](https://github.com/jacobtoye)). [#492](https://github.com/Leaflet/Leaflet/pull/492)
- * Moved dragging cursor styles from JS code to CSS.
-
-### Bug fixes
-
-#### General bugfixes
-
- * Fixed a bug where the map was zooming incorrectly inside a `position: fixed` container (by [@chx007](https://github.com/chx007)). [#602](https://github.com/Leaflet/Leaflet/pull/602)
- * Fixed a bug where scaled tiles weren't cleared up after zoom in some cases (by [@cfis](https://github.com/cfis)) [#683](https://github.com/Leaflet/Leaflet/pull/683)
- * Fixed a bug where map wouldn't drag over a polygon with a `mousedown` listener. [#834](https://github.com/Leaflet/Leaflet/issues/834)
-
-#### API bugfixes
-
- * Fixed a regression where removeLayer would not remove corresponding attribution. [#488](https://github.com/Leaflet/Leaflet/issues/488)
- * Fixed a bug where popup close button wouldn't work on manually added popups. [#423](https://github.com/Leaflet/Leaflet/issues/423)
- * Fixed a bug where marker click event would stop working if you dragged it and then disabled dragging. [#434](https://github.com/Leaflet/Leaflet/issues/434)
- * Fixed a bug where `TileLayer` `setOpacity` wouldn't work when setting it back to 1.
- * Fixed a bug where vector layer `setStyle({stroke: false})` wouldn't remove stroke and the same for fill. [#441](https://github.com/Leaflet/Leaflet/issues/441)
- * Fixed a bug where `Marker` `bindPopup` method wouldn't take `offset` option into account.
- * Fixed a bug where `TileLayer` `load` event wasn't fired if some tile didn't load (by [@lapinos03](https://github.com/lapinos03) and [@cfis](https://github.com/cfis)) [#682](https://github.com/Leaflet/Leaflet/pull/682)
- * Fixed error when removing `GeoJSON` layer. [#685](https://github.com/Leaflet/Leaflet/issues/685)
- * Fixed error when calling `GeoJSON` `clearLayer` (by [@runderwood](https://github.com/runderwood)). [#617](https://github.com/Leaflet/Leaflet/pull/617)
- * Fixed a bug where `Control` `setPosition` wasn't always working correctly (by [@ericmmartinez](https://github.com/ericmmartinez)). [#657](https://github.com/Leaflet/Leaflet/pull/657)
- * Fixed a bug with `Util.bind` sometimes losing arguments (by [@johtso](https://github.com/johtso)). [#588](https://github.com/Leaflet/Leaflet/pull/588)
- * Fixed a bug where `drag` event was sometimes fired after `dragend`. [#555](https://github.com/Leaflet/Leaflet/issues/555)
- * Fixed a bug where `TileLayer` `load` event was firing only once (by [@lapinos03](https://github.com/lapinos03) and [shintonik](https://github.com/shintonik)). [#742](https://github.com/Leaflet/Leaflet/pull/742) [#177](https://github.com/Leaflet/Leaflet/issues/177)
- * Fixed a bug where `FeatureGroup` popup events where not cleaned up after removing a layer from it (by [@danzel](https://github.com/danzel)). [#775](https://github.com/Leaflet/Leaflet/pull/775)
- * Fixed a bug where `DomUtil.removeClass` didn't remove trailing spaces (by [@jieter](https://github.com/jieter)). [#784](https://github.com/Leaflet/Leaflet/pull/784)
- * Fixed a bug where marker popup didn't take popup offset into account.
- * Fixed a bug that led to an error when polyline was removed inside a `moveend` listener.
- * Fixed a bug where `LayerGroup` `addLayer` wouldn't check if a layer has already been added (by [@danzel](https://github.com/danzel)). [798](https://github.com/Leaflet/Leaflet/pull/798)
-
-#### Browser bugfixes
-
- * Fixed broken zooming on IE10 beta (by [@danzel](https://github.com/danzel)). [#650](https://github.com/Leaflet/Leaflet/issues/650) [#751](https://github.com/Leaflet/Leaflet/pull/751)
- * Fixed a bug that broke Leaflet for websites that had XHTML content-type header set (by [lars-sh](https://github.com/lars-sh)). [#801](https://github.com/Leaflet/Leaflet/pull/801)
- * Fixed a bug that caused popups to be empty in IE when passing a DOM node as the content (by [@nrenner](https://github.com/nrenner)). [#472](https://github.com/Leaflet/Leaflet/pull/472)
- * Fixed inability to use scrolled content inside popup due to mouse wheel propagation.
- * Fixed a bug that caused jumping/stuttering of panning animation in some cases.
- * Fixed a bug where popup size was calculated incorrectly in IE.
- * Fixed a bug where cursor would flicker when dragging a marker.
- * Fixed a bug where clickable paths on IE9 didn't have a hand cursor (by [naehrstoff](https://github.com/naehrstoff)). [#671](https://github.com/Leaflet/Leaflet/pull/671)
- * Fixed a bug in IE with disappearing icons when changing opacity (by [@tagliala](https://github.com/tagliala) and [DamonOehlman](https://github.com/DamonOehlman)). [#667](https://github.com/Leaflet/Leaflet/pull/667) [#600](https://github.com/Leaflet/Leaflet/pull/600)
- * Fixed a bug with setting opacity on IE10 (by [@danzel](https://github.com/danzel)). [796](https://github.com/Leaflet/Leaflet/pull/796)
- * Fixed a bug where `Control.Layers` didn't work on IE7. [#652](https://github.com/Leaflet/Leaflet/issues/652)
- * Fixed a bug that could cause false `mousemove` events on click in Chrome (by [@stsydow](https://github.com/stsydow)). [#757](https://github.com/Leaflet/Leaflet/pull/757)
- * Fixed a bug in IE6-8 where adding fill or stroke on vector layers after initialization with `setStyle` would break the map. [#641](https://github.com/Leaflet/Leaflet/issues/641)
- * Fixed a bug with setOpacity in IE where it would not work correctly if used more than once on the same element (by [@ajbeaven](https://github.com/ajbeaven)). [#827](https://github.com/Leaflet/Leaflet/pull/827)
- * Fixed a bug in Chrome where transparent control corners sometimes couldn't be clicked through (by [@danzel](https://github.com/danzel)). [#836](https://github.com/Leaflet/Leaflet/pull/836) [#575](https://github.com/Leaflet/Leaflet/issues/575)
-
-#### Mobile browser bugfixes
-
- * Fixed a bug that sometimes caused map to disappear completely after zoom on iOS (by [@fr1n63](https://github.com/fr1n63)). [#580](https://github.com/Leaflet/Leaflet/issues/580) [#777](https://github.com/Leaflet/Leaflet/pull/777)
- * Fixed a bug that often caused vector layers to flicker on drag end on iOS (by [@krawaller](https://github.com/krawaller)). [#18](https://github.com/Leaflet/Leaflet/issues/18)
- * Fixed a bug with false map click events on pinch-zoom and zoom/layers controls click. [#485](https://github.com/Leaflet/Leaflet/issues/485)
- * Fixed a bug where touching the map with two or more fingers simultaneously would raise an error.
- * Fixed a bug where zoom control wasn't always visible on Android 3. [#335](https://github.com/Leaflet/Leaflet/issues/335)
- * Fixed a bug where opening the layers control would propagate a click to the map (by [@jacobtoye](https://github.com/jacobtoye)). [#638](https://github.com/Leaflet/Leaflet/pull/638)
- * Fixed a bug where `ImageOverlay` wouldn't stretch properly on zoom on Android 2. [#651](https://github.com/Leaflet/Leaflet/issues/651)
- * Fixed a bug where `clearLayers` for vector layers on a Canvas backend (e.g. on Android 2) would take unreasonable amount of time. [#785](https://github.com/Leaflet/Leaflet/issues/785)
- * Fixed a bug where `setLatLngs` and similar methods on vector layers on a Canvas backend would not update the layers immediately. [#732](https://github.com/Leaflet/Leaflet/issues/732)
-
-## 0.3.1 (February 14, 2012)
-
- * Fixed a regression where default marker icons wouldn't work if Leaflet include url contained a query string.
- * Fixed a regression where tiles sometimes flickered with black on panning in iOS.
-
-## 0.3 (February 13, 2012)
-
-### Major features
-
- * Added **Canvas backend** for vector layers (polylines, polygons, circles). This enables vector support on Android < 3, and it can also be optionally preferred over SVG for a performance gain in some cases. Thanks to [@florianf](https://github.com/florianf) for a big part of this work.
- * Added **layers control** (`Control.Layers`) for convenient layer switching.
- * Added ability to set **max bounds** within which users can pan/zoom. [#93](https://github.com/Leaflet/Leaflet/issues/93)
-
-### Improvements
-
-#### Usability improvements
-
- * Map now preserves its center after resize.
- * When panning to another copy of the world (that's infinite horizontally), map overlays now jump to corresponding positions. [#273](https://github.com/Leaflet/Leaflet/issues/273)
- * Limited maximum zoom change on a single mouse wheel movement (so you won't zoom across the whole zoom range in one scroll). [#149](https://github.com/Leaflet/Leaflet/issues/149)
- * Significantly improved line simplification performance (noticeable when rendering polylines/polygons with tens of thousands of points)
- * Improved circles performance by not drawing them if they're off the clip region.
- * Improved stability of zoom animation (less flickering of tiles).
-
-#### API improvements
-
- * Added ability to add a tile layer below all others (`map.addLayer(layer, true)`) (useful for switching base tile layers).
- * Added `Map` `zoomstart` event (thanks to [@Fabiz](https://github.com/Fabiz)). [#377](https://github.com/Leaflet/Leaflet/pull/377)
- * Improved `Map` `locate` method, added ability to watch location continuously and more options. [#212](https://github.com/Leaflet/Leaflet/issues/212)
- * Added second argument `inside` to `Map` `getBoundsZoom` method that allows you to get appropriate zoom for the view to fit *inside* the given bounds.
- * Added `hasLayer` method to `Map`.
- * Added `Marker` `zIndexOffset` option to be able to set certain markers below/above others. [#65](https://github.com/Leaflet/Leaflet/issues/65)
- * Added `urlParams` third optional argument to `TileLayer` constructor for convenience: an object with properties that will be evaluated in the URL template.
- * Added `TileLayer` `continuousWorld` option to disable tile coordinates checking/wrapping.
- * Added `TileLayer` `tileunload` event fired when tile gets removed after panning (by [@CodeJosch](https://github.com/CodeJosch)). [#256](https://github.com/Leaflet/Leaflet/pull/256)
- * Added `TileLayer` `zoomOffset` option useful for non-256px tiles (by [@msaspence](https://github.com/msaspence)).
- * Added `TileLayer` `zoomReverse` option to reverse zoom numbering (by [@Majiir](https://github.com/Majiir)). [#406](https://github.com/Leaflet/Leaflet/pull/406)
- * Added `TileLayer.Canvas` `redraw` method (by [@mortenbekditlevsen](https://github.com/mortenbekditlevsen)). [#459](https://github.com/Leaflet/Leaflet/pull/459)
- * Added `Polyline` `closestLayerPoint` method that's can be useful for interaction features (by [@anru](https://github.com/anru)). [#186](https://github.com/Leaflet/Leaflet/pull/186)
- * Added `setLatLngs` method to `MultiPolyline` and `MultiPolygon` (by [@anru](https://github.com/anru)). [#194](https://github.com/Leaflet/Leaflet/pull/194)
- * Added `getBounds` method to `Polyline` and `Polygon` (by [@JasonSanford](https://github.com/JasonSanford)). [#253](https://github.com/Leaflet/Leaflet/pull/253)
- * Added `getBounds` method to `FeatureGroup` (by [@JasonSanford](https://github.com/JasonSanford)). [#557](https://github.com/Leaflet/Leaflet/pull/557)
- * Added `FeatureGroup` `setStyle` method (also inherited by `MultiPolyline` and `MultiPolygon`). [#353](https://github.com/Leaflet/Leaflet/issues/353)
- * Added `FeatureGroup` `invoke` method to call a particular method on all layers of the group with the given arguments.
- * Added `ImageOverlay` `load` event. [#213](https://github.com/Leaflet/Leaflet/issues/213)
- * Added `minWidth` option to `Popup` (by [@marphi](https://github.com/marphi)). [#214](https://github.com/Leaflet/Leaflet/pull/214)
- * Improved `LatLng` constructor to be more tolerant (and throw descriptive error if latitude or longitude can't be interpreted as a number). [#136](https://github.com/Leaflet/Leaflet/issues/136)
- * Added `LatLng` `distanceTo` method (great circle distance) (by [@mortenbekditlevsen](https://github.com/mortenbekditlevsen)). [#462](https://github.com/Leaflet/Leaflet/pull/462)
- * Added `LatLngBounds` `toBBoxString` method for convenience (by [@JasonSanford](https://github.com/JasonSanford)). [#263](https://github.com/Leaflet/Leaflet/pull/263)
- * Added `LatLngBounds` `intersects(otherBounds)` method (thanks to [@pagameba](https://github.com/pagameba)). [#350](https://github.com/Leaflet/Leaflet/pull/350)
- * Made `LatLngBounds` `extend` method to accept other `LatLngBounds` in addition to `LatLng` (by [@JasonSanford](https://github.com/JasonSanford)). [#553](https://github.com/Leaflet/Leaflet/pull/553)
- * Added `Bounds` `intersects(otherBounds)` method. [#461](https://github.com/Leaflet/Leaflet/issues/461)
- * Added `L.Util.template` method for simple string template evaluation.
- * Added `DomUtil.removeClass` method (by [@anru](https://github.com/anru)).
- * Improved browser-specific code to rely more on feature detection rather than user agent string.
- * Improved superclass access mechanism to work with inheritance chains of 3 or more classes; now you should use `Klass.superclass` instead of `this.superclass` (by [@anru](https://github.com/anru)). [#179](https://github.com/Leaflet/Leaflet/pull/179)
- * Added `Map` `boxzoomstart` and `boxzoomend` events (by [@zedd45](https://github.com/zedd45)). [#554](https://github.com/Leaflet/Leaflet/pull/554)
- * Added `Popup` `contentupdate` event (by [@mehmeta](https://github.com/mehmeta)). [#548](https://github.com/Leaflet/Leaflet/pull/548)
-
-#### Breaking API changes
-
- * `shiftDragZoom` map option/property renamed to `boxZoom`.
- * Removed `mouseEventToLatLng` method (bringed back in 0.4).
-
-#### Development workflow improvements
-
- * Build system completely overhauled to be based on Node.js, Jake, JSHint and UglifyJS.
- * All code is now linted for errors and conformity with a strict code style (with JSHint), and wont build unless the check passes.
-
-### Bugfixes
-
-#### General bugfixes
-
- * Fixed a bug where `Circle` was rendered with incorrect radius (didn't take projection exagerration into account). [#331](https://github.com/Leaflet/Leaflet/issues/331)
- * Fixed a bug where `Map` `getBounds` would work incorrectly on a date line cross. [#295](https://github.com/Leaflet/Leaflet/issues/295)
- * Fixed a bug where polygons and polylines sometimes rendered incorrectly on some zoom levels. [#381](https://github.com/Leaflet/Leaflet/issues/381)
- * Fixed a bug where fast mouse wheel zoom worked incorrectly when approaching min/max zoom values.
- * Fixed a bug where `GeoJSON` `pointToLayer` option wouldn't work in a `GeometryCollection`. [#391](https://github.com/Leaflet/Leaflet/issues/391)
- * Fixed a bug with incorrect rendering of GeoJSON on a date line cross. [#354](https://github.com/Leaflet/Leaflet/issues/354)
- * Fixed a bug where map panning would stuck forever after releasing the mouse over an iframe or a flash object (thanks to [@sten82](https://github.com/sten82)). [#297](https://github.com/Leaflet/Leaflet/pull/297) [#64](https://github.com/Leaflet/Leaflet/issues/64)
- * Fixed a bug where mouse wheel zoom worked incorrectly if map is inside scrolled container (partially by [@chrillo](https://github.com/chrillo)). [#206](https://github.com/Leaflet/Leaflet/issues/206)
- * Fixed a bug where it was possible to add the same listener twice. [#281](https://github.com/Leaflet/Leaflet/issues/281)
- * Fixed a bug where `Circle` was rendered with incorrect radius (didn't take projection exaggeration into account). [#331](https://github.com/Leaflet/Leaflet/issues/331)
- * Fixed a bug where `Marker` `setIcon` was not working properly (by [@marphi](https://github.com/marphi)). [#218](https://github.com/Leaflet/Leaflet/pull/218) [#311](https://github.com/Leaflet/Leaflet/issues/311)
- * Fixed a bug where `Marker` `setLatLng` was not working if it's set before adding the marker to a map. [#222](https://github.com/Leaflet/Leaflet/issues/222)
- * Fixed a bug where marker popup would not move on `Marker` `setLatLng` (by [@tjarratt](https://github.com/tjarratt)). [#272](https://github.com/Leaflet/Leaflet/pull/272)
- * Fixed a bug where static properties of a child class would not override the parent ones.
- * Fixed broken popup `closePopup` option (by [@jgerigmeyer](https://github.com/jgerigmeyer)).
- * Fixed a bug that caused en error when dragging marker with icon without shadow (by [@anru](https://github.com/anru)). [#178](https://github.com/Leaflet/Leaflet/issues/178)
- * Fixed a typo in `Bounds` `contains` method (by [@anru](https://github.com/anru)). [#180](https://github.com/Leaflet/Leaflet/pull/180)
- * Fixed a bug where creating an empty `Polygon` with `new L.Polygon()` would raise an error.
- * Fixed a bug where drag event fired before the actual movement of layer (by [@anru](https://github.com/anru)). [#197](https://github.com/Leaflet/Leaflet/pull/197)
- * Fixed a bug where map click caused an error if dragging is initially disabled. [#196](https://github.com/Leaflet/Leaflet/issues/196)
- * Fixed a bug where map `movestart` event would fire after zoom animation.
- * Fixed a bug where attribution prefix would not update on `setPrefix`. [#195](https://github.com/Leaflet/Leaflet/issues/195)
- * Fixed a bug where `TileLayer` `load` event wouldn't fire in some edge cases (by [@dravnic](https://github.com/dravnic)).
- * Fixed a bug related to clearing background tiles after zooming (by [@neno-giscloud](https://github.com/neno-giscloud) & [@dravnic](https://github.com/dravnic)).
- * Fixed a bug that sometimes caused map flickering after zoom animation.
- * Fixed a bug related to cleaning up after removing tile layers (by [@dravnic](https://github.com/dravnic)). [#276](https://github.com/Leaflet/Leaflet/pull/276)
- * Fixed a bug that made selecting text in the attribution control impossible. [#279](https://github.com/Leaflet/Leaflet/issues/279)
- * Fixed a bug when initializing a map in a non-empty div. [#278](https://github.com/Leaflet/Leaflet/issues/278)
- * Fixed a bug where `movestart` didn't fire on panning animation.
- * Fixed a bug in Elliptical Mercator formula that affeted `EPSG:3395` CRS (by [@Savvkin](https://github.com/Savvkin)). [#358](https://github.com/Leaflet/Leaflet/pull/358)
-
-#### Browser bugfixes
-
- * Fixed occasional crashes on Mac Safari (thanks to [@lapinos03](https://github.com/lapinos03)). [#191](https://github.com/Leaflet/Leaflet/issues/191)
- * Fixed a bug where resizing the map would sometimes make it blurry on WebKit (by [@mortenbekditlevsen](https://github.com/mortenbekditlevsen)). [#453](https://github.com/Leaflet/Leaflet/pull/453)
- * Fixed a bug that raised error in IE6-8 when clicking on popup close button. [#235](https://github.com/Leaflet/Leaflet/issues/235)
- * Fixed a bug with Safari not redrawing UI immediately after closing a popup. [#296](https://github.com/Leaflet/Leaflet/issues/296)
- * Fixed a bug that caused performance drop and high CPU usage when calling `setView` or `panTo` to the current center. [#231](https://github.com/Leaflet/Leaflet/issues/231)
- * Fixed a bug that caused map overlays to appear blurry in some cases under WebKit browsers.
- * Fixed a bug that was causing errors in some Webkit/Linux builds (requestAnimationFrame-related), thanks to Chris Martens.
-
-#### Mobile browser bugfixes
-
- * Fixed a bug that caused an error when clicking vector layers under iOS. [#204](https://github.com/Leaflet/Leaflet/issues/204)
- * Fixed crash on Android 3+ when panning or zooming (by [@florian](https://github.com/florianf)). [#137](https://github.com/Leaflet/Leaflet/issues/137)
- * Fixed a bug on Android 2/3 that sometimes caused the map to disappear after zooming. [#69](https://github.com/Leaflet/Leaflet/issues/69)
- * Fixed a bug on Android 3 that caused tiles to shift position on a big map.
- * Fixed a bug that caused the map to pan when touch-panning inside a popup. [#452](https://github.com/Leaflet/Leaflet/issues/452)
- * Fixed a bug that caused click delays on zoom control.
-
-
-## 0.2.1 (2011-06-18)
-
- * Fixed regression that caused error in `TileLayer.Canvas`.
-
-## 0.2 (2011-06-17)
-
-### Major features
-
- * Added **WMS** support (`TileLayer.WMS` layer).
- * Added different **projections** support, having `EPSG:3857`, `EPSG:4326` and `EPSG:3395` out of the box (through `crs` option in `Map`). Thanks to [@Miroff](https://github.com/Miroff) & [@Komzpa](https://github.com/Komzpa) for great advice and explanation regarding this.
- * Added **GeoJSON** layer support.
-
-### Improvements
-
-#### Usability improvements
-
- * Improved panning performance in Chrome and FF considerably with the help of `requestAnimationFrame`. [#130](https://github.com/Leaflet/Leaflet/issues/130)
- * Improved click responsiveness in mobile WebKit (now it happens without delay). [#26](https://github.com/Leaflet/Leaflet/issues/26)
- * Added tap tolerance (so click happens even if you moved your finger slighly when tapping).
- * Improved geolocation error handling: better error messages, explicit timeout, set world view on locateAndSetView failure. [#61](https://github.com/Leaflet/Leaflet/issues/61)
-
-#### API improvements
-
- * Added **MultiPolyline** and **MultiPolygon** layers. [#77](https://github.com/Leaflet/Leaflet/issues/77)
- * Added **LayerGroup** and **FeatureGroup** layers for grouping other layers.
- * Added **TileLayer.Canvas** for easy creation of canvas-based tile layers.
- * Changed `Circle` to be zoom-dependent (with radius in meters); circle of a permanent size is now called `CircleMarker`.
- * Added `mouseover` and `mouseout` events to map, markers and paths; added map `mousemove` event.
- * Added `setLatLngs`, `spliceLatLngs`, `addLatLng`, `getLatLngs` methods to polylines and polygons.
- * Added `setLatLng` and `setRadius` methods to `Circle` and `CircleMarker`.
- * Improved `LatLngBounds contains` method to accept `LatLng` in addition to `LatLngBounds`, the same for `Bounds contains` and `Point`
- * Improved `LatLngBounds` & `Bounds` to allow their instantiation without arguments (by [@snc](https://github.com/snc)).
- * Added TMS tile numbering support through `TileLayer` `scheme: 'tms'` option (by [@tmcw](https://github.com/tmcw)).
- * Added `TileLayer` `noWrap` option to disable wrapping `x` tile coordinate (by [@jasondavies](https://github.com/jasondavies)).
- * Added `opacity` option and `setOpacity` method to `TileLayer`.
- * Added `setLatLng` and `setIcon` methods to `Marker`.
- * Added `title` option to `Marker`.
- * Added `maxZoom` argument to `map.locateAndSetView` method.
- * Added ability to pass Geolocation options to map `locate` and `locateAndSetView` methods (by [@JasonSanford](https://github.com/JasonSanford)).
- * Improved `Popup` to accept HTML elements in addition to strings as its content.
-
-#### Development workflow improvements
-
- * Added `Makefile` for building `leaflet.js` on non-Windows machines (by [@tmcw](https://github.com/tmcw)).
- * Improved `debug/leaflet-include.js` script to allow using it outside of `debug` folder (by [@antonj](https://github.com/antonj)).
- * Improved `L` definition to be compatible with CommonJS. [#122](https://github.com/Leaflet/Leaflet/issues/122)
-
-### Bug fixes
-
-#### General bugfixes
-
- * Fixed a bug where zooming is broken if the map contains a polygon and you zoom to an area where it's not visible. [#47](https://github.com/Leaflet/Leaflet/issues/47)
- * Fixed a bug where closed polylines would not appear on the map.
- * Fixed a bug where marker that was added, removed and then added again would not appear on the map. [#66](https://github.com/Leaflet/Leaflet/issues/66)
- * Fixed a bug where tile layer that was added, removed and then added again would not appear on the map.
- * Fixed a bug where some tiles would not load when panning across the date line. [#97](https://github.com/Leaflet/Leaflet/issues/97)
- * Fixed a bug where map div with `position: absolute` is reset to `relative`. [#100](https://github.com/Leaflet/Leaflet/issues/100)
- * Fixed a bug that caused an error when trying to add a marker without shadow in its icon.
- * Fixed a bug where popup content would not update on `setContent` call. [#94](https://github.com/Leaflet/Leaflet/issues/94)
- * Fixed a bug where double click zoom wouldn't work if popup is opened on map click
- * Fixed a bug with click propagation on popup close button. [#99](https://github.com/Leaflet/Leaflet/issues/99)
- * Fixed inability to remove ImageOverlay layer.
-
-#### Browser bugfixes
-
- * Fixed a bug where paths would not appear in IE8.
- * Fixed a bug where there were occasional slowdowns before zoom animation in WebKit. [#123](https://github.com/Leaflet/Leaflet/issues/123)
- * Fixed incorrect zoom animation & popup styling in Opera 11.11.
- * Fixed popup fade animation in Firefox and Opera.
- * Fixed a bug where map isn't displayed in Firefox when there's an `img { max-width: 100% }` rule.
-
-#### Mobile browsers bugfixes
-
- * Fixed a bug that prevented panning on some Android 2.1 (and possibly older) devices. [#84](https://github.com/Leaflet/Leaflet/issues/84)
- * Disabled zoom animation on Android by default because it's buggy on some devices (will be enabled back when it's stable enough). [#32](https://github.com/Leaflet/Leaflet/issues/32)
- * Fixed a bug where map would occasionally break while multi-touch-zooming on iOS. [#32](https://github.com/Leaflet/Leaflet/issues/32)
- * Fixed a bug that prevented panning/clicking on Android 3 tablets. [#121](https://github.com/Leaflet/Leaflet/issues/121)
- * Fixed a bug that prevented panning/clicking on Opera Mobile. [#138](https://github.com/Leaflet/Leaflet/issues/138)
- * Fixed potentional memory leak on WebKit when removing tiles, thanks to [@Scalar4eg](https://github.com/Scalar4eg). [#107](https://github.com/Leaflet/Leaflet/issues/107)
-
-## 0.1 (2011-05-13)
-
-Initial Leaflet release.
diff --git a/www/manual_lib/leaflet/CONTRIBUTING.md b/www/manual_lib/leaflet/CONTRIBUTING.md
deleted file mode 100644
index 052240d19..000000000
--- a/www/manual_lib/leaflet/CONTRIBUTING.md
+++ /dev/null
@@ -1,155 +0,0 @@
-Contributing to Leaflet
-=======================
-
- 1. [Getting Involved](#getting-involved)
- 2. [Reporting Bugs](#reporting-bugs)
- 3. [Contributing Code](#contributing-code)
- 4. [Improving Documentation](#improving-documentation)
-
-## Getting Involved
-
-Third-party patches are absolutely essential on our quest to create the best mapping library that will ever exist.
-However, they're not the only way to get involved with the development of Leaflet.
-You can help the project tremendously by discovering and [reporting bugs](#reporting-bugs),
-[improving documentation](#improving-documentation),
-helping others on the [Leaflet forum](https://groups.google.com/forum/#!forum/leaflet-js)
-and [GitHub issues](https://github.com/Leaflet/Leaflet/issues),
-showing your support for your favorite feature suggestions on [Leaflet UserVoice page](http://leaflet.uservoice.com),
-tweeting to [@LeafletJS](http://twitter.com/LeafletJS)
-and spreading the word about Leaflet among your colleagues and friends.
-
-## Reporting Bugs
-
-Before reporting a bug on the project's [issues page](https://github.com/Leaflet/Leaflet/issues),
-first make sure that your issue is caused by Leaflet, not your application code
-(e.g. passing incorrect arguments to methods, etc.).
-Second, search the already reported issues for similar cases,
-and if it's already reported, just add any additional details in the comments.
-
-After you made sure that you've found a new Leaflet bug,
-here are some tips for creating a helpful report that will make fixing it much easier and quicker:
-
- * Write a **descriptive, specific title**. Bad: *Problem with polylines*. Good: *Doing X in IE9 causes Z*.
- * Include **browser, OS and Leaflet version** info in the description.
- * Create a **simple test case** that demonstrates the bug (e.g. using [JSFiddle](http://jsfiddle.net/)).
- * Check whether the bug can be reproduced in **other browsers**.
- * Check if the bug occurs in the stable version, master, or both.
- * *Bonus tip:* if the bug only appears in the master version but the stable version is fine,
- use `git bisect` to find the exact commit that introduced the bug.
-
-If you just want some help with your project,
-try asking [on the Leaflet forum](https://groups.google.com/forum/#!forum/leaflet-js) instead.
-
-## Contributing Code
-
-### Considerations for Accepting Patches
-
-While we happily accept patches, we're also commited to keeping Leaflet simple, lightweight and blazingly fast.
-So bugfixes, performance optimizations and small improvements that don't add a lot of code
-are much more likely to get accepted quickly.
-
-Before sending a pull request with a new feature, first check if it's been discussed before already
-(either on [GitHub issues](https://github.com/Leaflet/Leaflet/issues)
-or [Leaflet UserVoice](http://leaflet.uservoice.com/)),
-and then ask yourself two questions:
-
- 1. Are you sure that this new feature is important enough to justify its presense in the Leaflet core?
- Or will it look better as a plugin in a separate repository?
- 2. Is it written in a simple, concise way that doesn't add bulk to the codebase?
-
-If your feature or API improvement did get merged into master,
-please consider submitting another pull request with the corresponding [documentation update](#improving-documentation).
-
-### Setting up the Build System
-
-To set up the Leaflet build system, install [Node](http://nodejs.org/),
-then run the following commands in the project root:
-
-```
-npm install -g jake
-npm install
-```
-
-You can build minified Leaflet by running `jake` (it will be built from source in the `dist` folder).
-For a custom build with selected components, open `build/build.html` in the browser and follow the instructions from there.
-
-### Making Changes to Leaflet Source
-
-If you're not yet familiar with the way GitHub works (forking, pull requests, etc.),
-be sure to check out the awesome [article about forking](https://help.github.com/articles/fork-a-repo)
-on the GitHub Help website — it will get you started quickly.
-
-You should always write each batch of changes (feature, bugfix, etc.) in **its own topic branch**.
-Please do not commit to the `master` branch, or your unrelated changes will go into the same pull request.
-
-You should also follow the code style and whitespace conventions of the original codebase.
-In particular, use tabs for indentation and spaces for alignment.
-
-Before commiting your changes, run `jake lint` to catch any JS errors in the code and fix them.
-If you add any new files to the Leaflet source, make sure to also add them to `build/deps.js`
-so that the build system knows about them.
-
-Also, please make sure that you have [line endings configured properly](https://help.github.com/articles/dealing-with-line-endings) in Git! Otherwise the diff will show that all lines of a file were changed even if you touched only one.
-
-Happy coding!
-
-## Running the Tests
-
-To run the tests from the command line,
-install [PhantomJS](http://phantomjs.org/) (and make sure it's in your `PATH`),
-then run:
-
-```
-jake test
-```
-
-To run all the tests in actual browsers at the same time, you can do:
-
-```
-jake test --ff --chrome --safari --ie
-```
-
-To run the tests in a browser manually, open `spec/index.html`.
-
-## Code Coverage
-
-To generate a detailed report about test coverage (which helps tremendously when working on test improvements), run:
-
-```
-jake test --cov
-```
-
-After that, open `spec/coverage/-If you have a new class, put it directly in the `L` namespace (`L.MyPlugin`).
-If you inherit one of the existing classes, make it a sub-property (`L.TileLayer.Banana`).
-If you want to add new methods to existing Leaflet classes, you can do it like this: `L.Marker.include({myPlugin: …})`. - -Function, method and property names should be in `camelCase`.
-Class names should be in `CapitalizedCamelCase`. - -If you have a lot of arguments in your function, consider accepting an options object instead -(putting default values where possible so that users don't need specify all of them): - -```js -// bad -marker.myPlugin('bla', 'foo', null, {}, 5, 0); - - // good -marker.myPlugin('bla', { - optionOne: 'foo', - optionThree: 5 -}); -``` - -And most importantly, keep it simple. Leaflet is all about *simplicity*. diff --git a/www/manual_lib/leaflet/README.md b/www/manual_lib/leaflet/README.md deleted file mode 100644 index 220b74ecc..000000000 --- a/www/manual_lib/leaflet/README.md +++ /dev/null @@ -1,34 +0,0 @@ -
-
-Leaflet is an open source JavaScript library for **mobile-friendly interactive maps**.
-It is developed by [Vladimir Agafonkin][] of [MapBox][] with a team of dedicated [contributors][].
-Weighing just about 30 KB of gzipped JS code, it has all the [features][] most developers ever need for online maps.
-
-Leaflet is designed with *simplicity*, *performance* and *usability* in mind.
-It works efficiently across all major desktop and mobile platforms out of the box,
-taking advantage of HTML5 and CSS3 on modern browsers while being accessible on older ones too.
-It can be extended with a huge amount of [plugins][],
-has a beautiful, easy to use and [well-documented][] API
-and a simple, readable [source code][] that is a joy to [contribute][] to.
-
-For more info, docs and tutorials, check out the [official website][].-For **Leaflet downloads** (including the built master version), check out the [download page][]. - -We're happy to meet new contributors. -If you want to **get involved** with Leaflet development, check out the [contribution guide][contribute]. -Let's make the best mapping library that will ever exist, -and push the limits of what's possible with online maps! - -[](https://travis-ci.org/Leaflet/Leaflet) - - [Vladimir Agafonkin]: http://agafonkin.com/en - [contributors]: https://github.com/Leaflet/Leaflet/graphs/contributors - [features]: http://leafletjs.com/features.html - [plugins]: http://leafletjs.com/plugins.html - [well-documented]: http://leafletjs.com/reference.html "Leaflet API reference" - [source code]: https://github.com/Leaflet/Leaflet "Leaflet GitHub repository" - [hosted on GitHub]: http://github.com/Leaflet/Leaflet - [contribute]: https://github.com/Leaflet/Leaflet/blob/master/CONTRIBUTING.md "A guide to contributing to Leaflet" - [official website]: http://leafletjs.com - [download page]: http://leafletjs.com/download.html - [MapBox]: https://mapbox.com diff --git a/www/manual_lib/leaflet/bower.json b/www/manual_lib/leaflet/bower.json deleted file mode 100644 index 001fcf183..000000000 --- a/www/manual_lib/leaflet/bower.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "leaflet", - "version": "0.7.7", - "description": "JavaScript library for mobile-friendly interactive maps", - "main": [ - "dist/leaflet.css", - "dist/leaflet-src.js", - "dist/images/layers-2x.png", - "dist/images/layers.png", - "dist/images/marker-icon-2x.png", - "dist/images/marker-icon.png", - "dist/images/marker-shadow.png" - ], - "ignore": [ - ".*", - "CHANGELOG.json", - "FAQ.md", - "debug", - "spec", - "src", - "build" - ] -} diff --git a/www/manual_lib/leaflet/component.json b/www/manual_lib/leaflet/component.json deleted file mode 100644 index 2bef5e904..000000000 --- a/www/manual_lib/leaflet/component.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "leaflet", - "version": "0.7.7", - "description": "JavaScript library for mobile-friendly interactive maps", - "scripts": [ - "dist/leaflet.js", - "dist/leaflet-src.js" - ], - "images": [ - "dist/images/layers-2x.png", - "dist/images/layers.png", - "dist/images/marker-icon-2x.png", - "dist/images/marker-icon.png", - "dist/images/marker-shadow.png" - ], - "styles": [ - "dist/leaflet.css" - ], - "main": "dist/leaflet-src.js" -} diff --git a/www/manual_lib/leaflet/dist/images/layers-2x.png b/www/manual_lib/leaflet/dist/images/layers-2x.png deleted file mode 100644 index a2cf7f9ef..000000000 Binary files a/www/manual_lib/leaflet/dist/images/layers-2x.png and /dev/null differ diff --git a/www/manual_lib/leaflet/dist/images/layers.png b/www/manual_lib/leaflet/dist/images/layers.png deleted file mode 100644 index bca0a0e42..000000000 Binary files a/www/manual_lib/leaflet/dist/images/layers.png and /dev/null differ diff --git a/www/manual_lib/leaflet/dist/images/marker-icon-2x.png b/www/manual_lib/leaflet/dist/images/marker-icon-2x.png deleted file mode 100644 index 0015b6495..000000000 Binary files a/www/manual_lib/leaflet/dist/images/marker-icon-2x.png and /dev/null differ diff --git a/www/manual_lib/leaflet/dist/images/marker-icon.png b/www/manual_lib/leaflet/dist/images/marker-icon.png deleted file mode 100644 index e2e9f757f..000000000 Binary files a/www/manual_lib/leaflet/dist/images/marker-icon.png and /dev/null differ diff --git a/www/manual_lib/leaflet/dist/images/marker-shadow.png b/www/manual_lib/leaflet/dist/images/marker-shadow.png deleted file mode 100644 index d1e773c71..000000000 Binary files a/www/manual_lib/leaflet/dist/images/marker-shadow.png and /dev/null differ diff --git a/www/manual_lib/leaflet/dist/leaflet-src.js b/www/manual_lib/leaflet/dist/leaflet-src.js deleted file mode 100644 index 6c754ca3e..000000000 --- a/www/manual_lib/leaflet/dist/leaflet-src.js +++ /dev/null @@ -1,9183 +0,0 @@ -/* - Leaflet, a JavaScript library for mobile-friendly interactive maps. http://leafletjs.com - (c) 2010-2013, Vladimir Agafonkin - (c) 2010-2011, CloudMade -*/ -(function (window, document, undefined) { -var oldL = window.L, - L = {}; - -L.version = '0.7.7'; - -// define Leaflet for Node module pattern loaders, including Browserify -if (typeof module === 'object' && typeof module.exports === 'object') { - module.exports = L; - -// define Leaflet as an AMD module -} else if (typeof define === 'function' && define.amd) { - define(L); -} - -// define Leaflet as a global L variable, saving the original L to restore later if needed - -L.noConflict = function () { - window.L = oldL; - return this; -}; - -window.L = L; - - -/* - * L.Util contains various utility functions used throughout Leaflet code. - */ - -L.Util = { - extend: function (dest) { // (Object[, Object, ...]) -> - var sources = Array.prototype.slice.call(arguments, 1), - i, j, len, src; - - for (j = 0, len = sources.length; j < len; j++) { - src = sources[j] || {}; - for (i in src) { - if (src.hasOwnProperty(i)) { - dest[i] = src[i]; - } - } - } - return dest; - }, - - bind: function (fn, obj) { // (Function, Object) -> Function - var args = arguments.length > 2 ? Array.prototype.slice.call(arguments, 2) : null; - return function () { - return fn.apply(obj, args || arguments); - }; - }, - - stamp: (function () { - var lastId = 0, - key = '_leaflet_id'; - return function (obj) { - obj[key] = obj[key] || ++lastId; - return obj[key]; - }; - }()), - - invokeEach: function (obj, method, context) { - var i, args; - - if (typeof obj === 'object') { - args = Array.prototype.slice.call(arguments, 3); - - for (i in obj) { - method.apply(context, [i, obj[i]].concat(args)); - } - return true; - } - - return false; - }, - - limitExecByInterval: function (fn, time, context) { - var lock, execOnUnlock; - - return function wrapperFn() { - var args = arguments; - - if (lock) { - execOnUnlock = true; - return; - } - - lock = true; - - setTimeout(function () { - lock = false; - - if (execOnUnlock) { - wrapperFn.apply(context, args); - execOnUnlock = false; - } - }, time); - - fn.apply(context, args); - }; - }, - - falseFn: function () { - return false; - }, - - formatNum: function (num, digits) { - var pow = Math.pow(10, digits || 5); - return Math.round(num * pow) / pow; - }, - - trim: function (str) { - return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, ''); - }, - - splitWords: function (str) { - return L.Util.trim(str).split(/\s+/); - }, - - setOptions: function (obj, options) { - obj.options = L.extend({}, obj.options, options); - return obj.options; - }, - - getParamString: function (obj, existingUrl, uppercase) { - var params = []; - for (var i in obj) { - params.push(encodeURIComponent(uppercase ? i.toUpperCase() : i) + '=' + encodeURIComponent(obj[i])); - } - return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&'); - }, - template: function (str, data) { - return str.replace(/\{ *([\w_]+) *\}/g, function (str, key) { - var value = data[key]; - if (value === undefined) { - throw new Error('No value provided for variable ' + str); - } else if (typeof value === 'function') { - value = value(data); - } - return value; - }); - }, - - isArray: Array.isArray || function (obj) { - return (Object.prototype.toString.call(obj) === '[object Array]'); - }, - - emptyImageUrl: 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=' -}; - -(function () { - - // inspired by http://paulirish.com/2011/requestanimationframe-for-smart-animating/ - - function getPrefixed(name) { - var i, fn, - prefixes = ['webkit', 'moz', 'o', 'ms']; - - for (i = 0; i < prefixes.length && !fn; i++) { - fn = window[prefixes[i] + name]; - } - - return fn; - } - - var lastTime = 0; - - function timeoutDefer(fn) { - var time = +new Date(), - timeToCall = Math.max(0, 16 - (time - lastTime)); - - lastTime = time + timeToCall; - return window.setTimeout(fn, timeToCall); - } - - var requestFn = window.requestAnimationFrame || - getPrefixed('RequestAnimationFrame') || timeoutDefer; - - var cancelFn = window.cancelAnimationFrame || - getPrefixed('CancelAnimationFrame') || - getPrefixed('CancelRequestAnimationFrame') || - function (id) { window.clearTimeout(id); }; - - - L.Util.requestAnimFrame = function (fn, context, immediate, element) { - fn = L.bind(fn, context); - - if (immediate && requestFn === timeoutDefer) { - fn(); - } else { - return requestFn.call(window, fn, element); - } - }; - - L.Util.cancelAnimFrame = function (id) { - if (id) { - cancelFn.call(window, id); - } - }; - -}()); - -// shortcuts for most used utility functions -L.extend = L.Util.extend; -L.bind = L.Util.bind; -L.stamp = L.Util.stamp; -L.setOptions = L.Util.setOptions; - - -/* - * L.Class powers the OOP facilities of the library. - * Thanks to John Resig and Dean Edwards for inspiration! - */ - -L.Class = function () {}; - -L.Class.extend = function (props) { - - // extended class with the new prototype - var NewClass = function () { - - // call the constructor - if (this.initialize) { - this.initialize.apply(this, arguments); - } - - // call all constructor hooks - if (this._initHooks) { - this.callInitHooks(); - } - }; - - // instantiate class without calling constructor - var F = function () {}; - F.prototype = this.prototype; - - var proto = new F(); - proto.constructor = NewClass; - - NewClass.prototype = proto; - - //inherit parent's statics - for (var i in this) { - if (this.hasOwnProperty(i) && i !== 'prototype') { - NewClass[i] = this[i]; - } - } - - // mix static properties into the class - if (props.statics) { - L.extend(NewClass, props.statics); - delete props.statics; - } - - // mix includes into the prototype - if (props.includes) { - L.Util.extend.apply(null, [proto].concat(props.includes)); - delete props.includes; - } - - // merge options - if (props.options && proto.options) { - props.options = L.extend({}, proto.options, props.options); - } - - // mix given properties into the prototype - L.extend(proto, props); - - proto._initHooks = []; - - var parent = this; - // jshint camelcase: false - NewClass.__super__ = parent.prototype; - - // add method for calling all hooks - proto.callInitHooks = function () { - - if (this._initHooksCalled) { return; } - - if (parent.prototype.callInitHooks) { - parent.prototype.callInitHooks.call(this); - } - - this._initHooksCalled = true; - - for (var i = 0, len = proto._initHooks.length; i < len; i++) { - proto._initHooks[i].call(this); - } - }; - - return NewClass; -}; - - -// method for adding properties to prototype -L.Class.include = function (props) { - L.extend(this.prototype, props); -}; - -// merge new default options to the Class -L.Class.mergeOptions = function (options) { - L.extend(this.prototype.options, options); -}; - -// add a constructor hook -L.Class.addInitHook = function (fn) { // (Function) || (String, args...) - var args = Array.prototype.slice.call(arguments, 1); - - var init = typeof fn === 'function' ? fn : function () { - this[fn].apply(this, args); - }; - - this.prototype._initHooks = this.prototype._initHooks || []; - this.prototype._initHooks.push(init); -}; - - -/* - * L.Mixin.Events is used to add custom events functionality to Leaflet classes. - */ - -var eventsKey = '_leaflet_events'; - -L.Mixin = {}; - -L.Mixin.Events = { - - addEventListener: function (types, fn, context) { // (String, Function[, Object]) or (Object[, Object]) - - // types can be a map of types/handlers - if (L.Util.invokeEach(types, this.addEventListener, this, fn, context)) { return this; } - - var events = this[eventsKey] = this[eventsKey] || {}, - contextId = context && context !== this && L.stamp(context), - i, len, event, type, indexKey, indexLenKey, typeIndex; - - // types can be a string of space-separated words - types = L.Util.splitWords(types); - - for (i = 0, len = types.length; i < len; i++) { - event = { - action: fn, - context: context || this - }; - type = types[i]; - - if (contextId) { - // store listeners of a particular context in a separate hash (if it has an id) - // gives a major performance boost when removing thousands of map layers - - indexKey = type + '_idx'; - indexLenKey = indexKey + '_len'; - - typeIndex = events[indexKey] = events[indexKey] || {}; - - if (!typeIndex[contextId]) { - typeIndex[contextId] = []; - - // keep track of the number of keys in the index to quickly check if it's empty - events[indexLenKey] = (events[indexLenKey] || 0) + 1; - } - - typeIndex[contextId].push(event); - - - } else { - events[type] = events[type] || []; - events[type].push(event); - } - } - - return this; - }, - - hasEventListeners: function (type) { // (String) -> Boolean - var events = this[eventsKey]; - return !!events && ((type in events && events[type].length > 0) || - (type + '_idx' in events && events[type + '_idx_len'] > 0)); - }, - - removeEventListener: function (types, fn, context) { // ([String, Function, Object]) or (Object[, Object]) - - if (!this[eventsKey]) { - return this; - } - - if (!types) { - return this.clearAllEventListeners(); - } - - if (L.Util.invokeEach(types, this.removeEventListener, this, fn, context)) { return this; } - - var events = this[eventsKey], - contextId = context && context !== this && L.stamp(context), - i, len, type, listeners, j, indexKey, indexLenKey, typeIndex, removed; - - types = L.Util.splitWords(types); - - for (i = 0, len = types.length; i < len; i++) { - type = types[i]; - indexKey = type + '_idx'; - indexLenKey = indexKey + '_len'; - - typeIndex = events[indexKey]; - - if (!fn) { - // clear all listeners for a type if function isn't specified - delete events[type]; - delete events[indexKey]; - delete events[indexLenKey]; - - } else { - listeners = contextId && typeIndex ? typeIndex[contextId] : events[type]; - - if (listeners) { - for (j = listeners.length - 1; j >= 0; j--) { - if ((listeners[j].action === fn) && (!context || (listeners[j].context === context))) { - removed = listeners.splice(j, 1); - // set the old action to a no-op, because it is possible - // that the listener is being iterated over as part of a dispatch - removed[0].action = L.Util.falseFn; - } - } - - if (context && typeIndex && (listeners.length === 0)) { - delete typeIndex[contextId]; - events[indexLenKey]--; - } - } - } - } - - return this; - }, - - clearAllEventListeners: function () { - delete this[eventsKey]; - return this; - }, - - fireEvent: function (type, data) { // (String[, Object]) - if (!this.hasEventListeners(type)) { - return this; - } - - var event = L.Util.extend({}, data, { type: type, target: this }); - - var events = this[eventsKey], - listeners, i, len, typeIndex, contextId; - - if (events[type]) { - // make sure adding/removing listeners inside other listeners won't cause infinite loop - listeners = events[type].slice(); - - for (i = 0, len = listeners.length; i < len; i++) { - listeners[i].action.call(listeners[i].context, event); - } - } - - // fire event for the context-indexed listeners as well - typeIndex = events[type + '_idx']; - - for (contextId in typeIndex) { - listeners = typeIndex[contextId].slice(); - - if (listeners) { - for (i = 0, len = listeners.length; i < len; i++) { - listeners[i].action.call(listeners[i].context, event); - } - } - } - - return this; - }, - - addOneTimeEventListener: function (types, fn, context) { - - if (L.Util.invokeEach(types, this.addOneTimeEventListener, this, fn, context)) { return this; } - - var handler = L.bind(function () { - this - .removeEventListener(types, fn, context) - .removeEventListener(types, handler, context); - }, this); - - return this - .addEventListener(types, fn, context) - .addEventListener(types, handler, context); - } -}; - -L.Mixin.Events.on = L.Mixin.Events.addEventListener; -L.Mixin.Events.off = L.Mixin.Events.removeEventListener; -L.Mixin.Events.once = L.Mixin.Events.addOneTimeEventListener; -L.Mixin.Events.fire = L.Mixin.Events.fireEvent; - - -/* - * L.Browser handles different browser and feature detections for internal Leaflet use. - */ - -(function () { - - var ie = 'ActiveXObject' in window, - ielt9 = ie && !document.addEventListener, - - // terrible browser detection to work around Safari / iOS / Android browser bugs - ua = navigator.userAgent.toLowerCase(), - webkit = ua.indexOf('webkit') !== -1, - chrome = ua.indexOf('chrome') !== -1, - phantomjs = ua.indexOf('phantom') !== -1, - android = ua.indexOf('android') !== -1, - android23 = ua.search('android [23]') !== -1, - gecko = ua.indexOf('gecko') !== -1, - - mobile = typeof orientation !== undefined + '', - msPointer = !window.PointerEvent && window.MSPointerEvent, - pointer = (window.PointerEvent && window.navigator.pointerEnabled) || - msPointer, - retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) || - ('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') && - window.matchMedia('(min-resolution:144dpi)').matches), - - doc = document.documentElement, - ie3d = ie && ('transition' in doc.style), - webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()) && !android23, - gecko3d = 'MozPerspective' in doc.style, - opera3d = 'OTransition' in doc.style, - any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d) && !phantomjs; - - var touch = !window.L_NO_TOUCH && !phantomjs && (pointer || 'ontouchstart' in window || - (window.DocumentTouch && document instanceof window.DocumentTouch)); - - L.Browser = { - ie: ie, - ielt9: ielt9, - webkit: webkit, - gecko: gecko && !webkit && !window.opera && !ie, - - android: android, - android23: android23, - - chrome: chrome, - - ie3d: ie3d, - webkit3d: webkit3d, - gecko3d: gecko3d, - opera3d: opera3d, - any3d: any3d, - - mobile: mobile, - mobileWebkit: mobile && webkit, - mobileWebkit3d: mobile && webkit3d, - mobileOpera: mobile && window.opera, - - touch: touch, - msPointer: msPointer, - pointer: pointer, - - retina: retina - }; - -}()); - - -/* - * L.Point represents a point with x and y coordinates. - */ - -L.Point = function (/*Number*/ x, /*Number*/ y, /*Boolean*/ round) { - this.x = (round ? Math.round(x) : x); - this.y = (round ? Math.round(y) : y); -}; - -L.Point.prototype = { - - clone: function () { - return new L.Point(this.x, this.y); - }, - - // non-destructive, returns a new point - add: function (point) { - return this.clone()._add(L.point(point)); - }, - - // destructive, used directly for performance in situations where it's safe to modify existing point - _add: function (point) { - this.x += point.x; - this.y += point.y; - return this; - }, - - subtract: function (point) { - return this.clone()._subtract(L.point(point)); - }, - - _subtract: function (point) { - this.x -= point.x; - this.y -= point.y; - return this; - }, - - divideBy: function (num) { - return this.clone()._divideBy(num); - }, - - _divideBy: function (num) { - this.x /= num; - this.y /= num; - return this; - }, - - multiplyBy: function (num) { - return this.clone()._multiplyBy(num); - }, - - _multiplyBy: function (num) { - this.x *= num; - this.y *= num; - return this; - }, - - round: function () { - return this.clone()._round(); - }, - - _round: function () { - this.x = Math.round(this.x); - this.y = Math.round(this.y); - return this; - }, - - floor: function () { - return this.clone()._floor(); - }, - - _floor: function () { - this.x = Math.floor(this.x); - this.y = Math.floor(this.y); - return this; - }, - - distanceTo: function (point) { - point = L.point(point); - - var x = point.x - this.x, - y = point.y - this.y; - - return Math.sqrt(x * x + y * y); - }, - - equals: function (point) { - point = L.point(point); - - return point.x === this.x && - point.y === this.y; - }, - - contains: function (point) { - point = L.point(point); - - return Math.abs(point.x) <= Math.abs(this.x) && - Math.abs(point.y) <= Math.abs(this.y); - }, - - toString: function () { - return 'Point(' + - L.Util.formatNum(this.x) + ', ' + - L.Util.formatNum(this.y) + ')'; - } -}; - -L.point = function (x, y, round) { - if (x instanceof L.Point) { - return x; - } - if (L.Util.isArray(x)) { - return new L.Point(x[0], x[1]); - } - if (x === undefined || x === null) { - return x; - } - return new L.Point(x, y, round); -}; - - -/* - * L.Bounds represents a rectangular area on the screen in pixel coordinates. - */ - -L.Bounds = function (a, b) { //(Point, Point) or Point[] - if (!a) { return; } - - var points = b ? [a, b] : a; - - for (var i = 0, len = points.length; i < len; i++) { - this.extend(points[i]); - } -}; - -L.Bounds.prototype = { - // extend the bounds to contain the given point - extend: function (point) { // (Point) - point = L.point(point); - - if (!this.min && !this.max) { - this.min = point.clone(); - this.max = point.clone(); - } else { - this.min.x = Math.min(point.x, this.min.x); - this.max.x = Math.max(point.x, this.max.x); - this.min.y = Math.min(point.y, this.min.y); - this.max.y = Math.max(point.y, this.max.y); - } - return this; - }, - - getCenter: function (round) { // (Boolean) -> Point - return new L.Point( - (this.min.x + this.max.x) / 2, - (this.min.y + this.max.y) / 2, round); - }, - - getBottomLeft: function () { // -> Point - return new L.Point(this.min.x, this.max.y); - }, - - getTopRight: function () { // -> Point - return new L.Point(this.max.x, this.min.y); - }, - - getSize: function () { - return this.max.subtract(this.min); - }, - - contains: function (obj) { // (Bounds) or (Point) -> Boolean - var min, max; - - if (typeof obj[0] === 'number' || obj instanceof L.Point) { - obj = L.point(obj); - } else { - obj = L.bounds(obj); - } - - if (obj instanceof L.Bounds) { - min = obj.min; - max = obj.max; - } else { - min = max = obj; - } - - return (min.x >= this.min.x) && - (max.x <= this.max.x) && - (min.y >= this.min.y) && - (max.y <= this.max.y); - }, - - intersects: function (bounds) { // (Bounds) -> Boolean - bounds = L.bounds(bounds); - - var min = this.min, - max = this.max, - min2 = bounds.min, - max2 = bounds.max, - xIntersects = (max2.x >= min.x) && (min2.x <= max.x), - yIntersects = (max2.y >= min.y) && (min2.y <= max.y); - - return xIntersects && yIntersects; - }, - - isValid: function () { - return !!(this.min && this.max); - } -}; - -L.bounds = function (a, b) { // (Bounds) or (Point, Point) or (Point[]) - if (!a || a instanceof L.Bounds) { - return a; - } - return new L.Bounds(a, b); -}; - - -/* - * L.Transformation is an utility class to perform simple point transformations through a 2d-matrix. - */ - -L.Transformation = function (a, b, c, d) { - this._a = a; - this._b = b; - this._c = c; - this._d = d; -}; - -L.Transformation.prototype = { - transform: function (point, scale) { // (Point, Number) -> Point - return this._transform(point.clone(), scale); - }, - - // destructive transform (faster) - _transform: function (point, scale) { - scale = scale || 1; - point.x = scale * (this._a * point.x + this._b); - point.y = scale * (this._c * point.y + this._d); - return point; - }, - - untransform: function (point, scale) { - scale = scale || 1; - return new L.Point( - (point.x / scale - this._b) / this._a, - (point.y / scale - this._d) / this._c); - } -}; - - -/* - * L.DomUtil contains various utility functions for working with DOM. - */ - -L.DomUtil = { - get: function (id) { - return (typeof id === 'string' ? document.getElementById(id) : id); - }, - - getStyle: function (el, style) { - - var value = el.style[style]; - - if (!value && el.currentStyle) { - value = el.currentStyle[style]; - } - - if ((!value || value === 'auto') && document.defaultView) { - var css = document.defaultView.getComputedStyle(el, null); - value = css ? css[style] : null; - } - - return value === 'auto' ? null : value; - }, - - getViewportOffset: function (element) { - - var top = 0, - left = 0, - el = element, - docBody = document.body, - docEl = document.documentElement, - pos; - - do { - top += el.offsetTop || 0; - left += el.offsetLeft || 0; - - //add borders - top += parseInt(L.DomUtil.getStyle(el, 'borderTopWidth'), 10) || 0; - left += parseInt(L.DomUtil.getStyle(el, 'borderLeftWidth'), 10) || 0; - - pos = L.DomUtil.getStyle(el, 'position'); - - if (el.offsetParent === docBody && pos === 'absolute') { break; } - - if (pos === 'fixed') { - top += docBody.scrollTop || docEl.scrollTop || 0; - left += docBody.scrollLeft || docEl.scrollLeft || 0; - break; - } - - if (pos === 'relative' && !el.offsetLeft) { - var width = L.DomUtil.getStyle(el, 'width'), - maxWidth = L.DomUtil.getStyle(el, 'max-width'), - r = el.getBoundingClientRect(); - - if (width !== 'none' || maxWidth !== 'none') { - left += r.left + el.clientLeft; - } - - //calculate full y offset since we're breaking out of the loop - top += r.top + (docBody.scrollTop || docEl.scrollTop || 0); - - break; - } - - el = el.offsetParent; - - } while (el); - - el = element; - - do { - if (el === docBody) { break; } - - top -= el.scrollTop || 0; - left -= el.scrollLeft || 0; - - el = el.parentNode; - } while (el); - - return new L.Point(left, top); - }, - - documentIsLtr: function () { - if (!L.DomUtil._docIsLtrCached) { - L.DomUtil._docIsLtrCached = true; - L.DomUtil._docIsLtr = L.DomUtil.getStyle(document.body, 'direction') === 'ltr'; - } - return L.DomUtil._docIsLtr; - }, - - create: function (tagName, className, container) { - - var el = document.createElement(tagName); - el.className = className; - - if (container) { - container.appendChild(el); - } - - return el; - }, - - hasClass: function (el, name) { - if (el.classList !== undefined) { - return el.classList.contains(name); - } - var className = L.DomUtil._getClass(el); - return className.length > 0 && new RegExp('(^|\\s)' + name + '(\\s|$)').test(className); - }, - - addClass: function (el, name) { - if (el.classList !== undefined) { - var classes = L.Util.splitWords(name); - for (var i = 0, len = classes.length; i < len; i++) { - el.classList.add(classes[i]); - } - } else if (!L.DomUtil.hasClass(el, name)) { - var className = L.DomUtil._getClass(el); - L.DomUtil._setClass(el, (className ? className + ' ' : '') + name); - } - }, - - removeClass: function (el, name) { - if (el.classList !== undefined) { - el.classList.remove(name); - } else { - L.DomUtil._setClass(el, L.Util.trim((' ' + L.DomUtil._getClass(el) + ' ').replace(' ' + name + ' ', ' '))); - } - }, - - _setClass: function (el, name) { - if (el.className.baseVal === undefined) { - el.className = name; - } else { - // in case of SVG element - el.className.baseVal = name; - } - }, - - _getClass: function (el) { - return el.className.baseVal === undefined ? el.className : el.className.baseVal; - }, - - setOpacity: function (el, value) { - - if ('opacity' in el.style) { - el.style.opacity = value; - - } else if ('filter' in el.style) { - - var filter = false, - filterName = 'DXImageTransform.Microsoft.Alpha'; - - // filters collection throws an error if we try to retrieve a filter that doesn't exist - try { - filter = el.filters.item(filterName); - } catch (e) { - // don't set opacity to 1 if we haven't already set an opacity, - // it isn't needed and breaks transparent pngs. - if (value === 1) { return; } - } - - value = Math.round(value * 100); - - if (filter) { - filter.Enabled = (value !== 100); - filter.Opacity = value; - } else { - el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')'; - } - } - }, - - testProp: function (props) { - - var style = document.documentElement.style; - - for (var i = 0; i < props.length; i++) { - if (props[i] in style) { - return props[i]; - } - } - return false; - }, - - getTranslateString: function (point) { - // on WebKit browsers (Chrome/Safari/iOS Safari/Android) using translate3d instead of translate - // makes animation smoother as it ensures HW accel is used. Firefox 13 doesn't care - // (same speed either way), Opera 12 doesn't support translate3d - - var is3d = L.Browser.webkit3d, - open = 'translate' + (is3d ? '3d' : '') + '(', - close = (is3d ? ',0' : '') + ')'; - - return open + point.x + 'px,' + point.y + 'px' + close; - }, - - getScaleString: function (scale, origin) { - - var preTranslateStr = L.DomUtil.getTranslateString(origin.add(origin.multiplyBy(-1 * scale))), - scaleStr = ' scale(' + scale + ') '; - - return preTranslateStr + scaleStr; - }, - - setPosition: function (el, point, disable3D) { // (HTMLElement, Point[, Boolean]) - - // jshint camelcase: false - el._leaflet_pos = point; - - if (!disable3D && L.Browser.any3d) { - el.style[L.DomUtil.TRANSFORM] = L.DomUtil.getTranslateString(point); - } else { - el.style.left = point.x + 'px'; - el.style.top = point.y + 'px'; - } - }, - - getPosition: function (el) { - // this method is only used for elements previously positioned using setPosition, - // so it's safe to cache the position for performance - - // jshint camelcase: false - return el._leaflet_pos; - } -}; - - -// prefix style property names - -L.DomUtil.TRANSFORM = L.DomUtil.testProp( - ['transform', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform']); - -// webkitTransition comes first because some browser versions that drop vendor prefix don't do -// the same for the transitionend event, in particular the Android 4.1 stock browser - -L.DomUtil.TRANSITION = L.DomUtil.testProp( - ['webkitTransition', 'transition', 'OTransition', 'MozTransition', 'msTransition']); - -L.DomUtil.TRANSITION_END = - L.DomUtil.TRANSITION === 'webkitTransition' || L.DomUtil.TRANSITION === 'OTransition' ? - L.DomUtil.TRANSITION + 'End' : 'transitionend'; - -(function () { - if ('onselectstart' in document) { - L.extend(L.DomUtil, { - disableTextSelection: function () { - L.DomEvent.on(window, 'selectstart', L.DomEvent.preventDefault); - }, - - enableTextSelection: function () { - L.DomEvent.off(window, 'selectstart', L.DomEvent.preventDefault); - } - }); - } else { - var userSelectProperty = L.DomUtil.testProp( - ['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']); - - L.extend(L.DomUtil, { - disableTextSelection: function () { - if (userSelectProperty) { - var style = document.documentElement.style; - this._userSelect = style[userSelectProperty]; - style[userSelectProperty] = 'none'; - } - }, - - enableTextSelection: function () { - if (userSelectProperty) { - document.documentElement.style[userSelectProperty] = this._userSelect; - delete this._userSelect; - } - } - }); - } - - L.extend(L.DomUtil, { - disableImageDrag: function () { - L.DomEvent.on(window, 'dragstart', L.DomEvent.preventDefault); - }, - - enableImageDrag: function () { - L.DomEvent.off(window, 'dragstart', L.DomEvent.preventDefault); - } - }); -})(); - - -/* - * L.LatLng represents a geographical point with latitude and longitude coordinates. - */ - -L.LatLng = function (lat, lng, alt) { // (Number, Number, Number) - lat = parseFloat(lat); - lng = parseFloat(lng); - - if (isNaN(lat) || isNaN(lng)) { - throw new Error('Invalid LatLng object: (' + lat + ', ' + lng + ')'); - } - - this.lat = lat; - this.lng = lng; - - if (alt !== undefined) { - this.alt = parseFloat(alt); - } -}; - -L.extend(L.LatLng, { - DEG_TO_RAD: Math.PI / 180, - RAD_TO_DEG: 180 / Math.PI, - MAX_MARGIN: 1.0E-9 // max margin of error for the "equals" check -}); - -L.LatLng.prototype = { - equals: function (obj) { // (LatLng) -> Boolean - if (!obj) { return false; } - - obj = L.latLng(obj); - - var margin = Math.max( - Math.abs(this.lat - obj.lat), - Math.abs(this.lng - obj.lng)); - - return margin <= L.LatLng.MAX_MARGIN; - }, - - toString: function (precision) { // (Number) -> String - return 'LatLng(' + - L.Util.formatNum(this.lat, precision) + ', ' + - L.Util.formatNum(this.lng, precision) + ')'; - }, - - // Haversine distance formula, see http://en.wikipedia.org/wiki/Haversine_formula - // TODO move to projection code, LatLng shouldn't know about Earth - distanceTo: function (other) { // (LatLng) -> Number - other = L.latLng(other); - - var R = 6378137, // earth radius in meters - d2r = L.LatLng.DEG_TO_RAD, - dLat = (other.lat - this.lat) * d2r, - dLon = (other.lng - this.lng) * d2r, - lat1 = this.lat * d2r, - lat2 = other.lat * d2r, - sin1 = Math.sin(dLat / 2), - sin2 = Math.sin(dLon / 2); - - var a = sin1 * sin1 + sin2 * sin2 * Math.cos(lat1) * Math.cos(lat2); - - return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); - }, - - wrap: function (a, b) { // (Number, Number) -> LatLng - var lng = this.lng; - - a = a || -180; - b = b || 180; - - lng = (lng + b) % (b - a) + (lng < a || lng === b ? b : a); - - return new L.LatLng(this.lat, lng); - } -}; - -L.latLng = function (a, b) { // (LatLng) or ([Number, Number]) or (Number, Number) - if (a instanceof L.LatLng) { - return a; - } - if (L.Util.isArray(a)) { - if (typeof a[0] === 'number' || typeof a[0] === 'string') { - return new L.LatLng(a[0], a[1], a[2]); - } else { - return null; - } - } - if (a === undefined || a === null) { - return a; - } - if (typeof a === 'object' && 'lat' in a) { - return new L.LatLng(a.lat, 'lng' in a ? a.lng : a.lon); - } - if (b === undefined) { - return null; - } - return new L.LatLng(a, b); -}; - - - -/* - * L.LatLngBounds represents a rectangular area on the map in geographical coordinates. - */ - -L.LatLngBounds = function (southWest, northEast) { // (LatLng, LatLng) or (LatLng[]) - if (!southWest) { return; } - - var latlngs = northEast ? [southWest, northEast] : southWest; - - for (var i = 0, len = latlngs.length; i < len; i++) { - this.extend(latlngs[i]); - } -}; - -L.LatLngBounds.prototype = { - // extend the bounds to contain the given point or bounds - extend: function (obj) { // (LatLng) or (LatLngBounds) - if (!obj) { return this; } - - var latLng = L.latLng(obj); - if (latLng !== null) { - obj = latLng; - } else { - obj = L.latLngBounds(obj); - } - - if (obj instanceof L.LatLng) { - if (!this._southWest && !this._northEast) { - this._southWest = new L.LatLng(obj.lat, obj.lng); - this._northEast = new L.LatLng(obj.lat, obj.lng); - } else { - this._southWest.lat = Math.min(obj.lat, this._southWest.lat); - this._southWest.lng = Math.min(obj.lng, this._southWest.lng); - - this._northEast.lat = Math.max(obj.lat, this._northEast.lat); - this._northEast.lng = Math.max(obj.lng, this._northEast.lng); - } - } else if (obj instanceof L.LatLngBounds) { - this.extend(obj._southWest); - this.extend(obj._northEast); - } - return this; - }, - - // extend the bounds by a percentage - pad: function (bufferRatio) { // (Number) -> LatLngBounds - var sw = this._southWest, - ne = this._northEast, - heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio, - widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio; - - return new L.LatLngBounds( - new L.LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer), - new L.LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer)); - }, - - getCenter: function () { // -> LatLng - return new L.LatLng( - (this._southWest.lat + this._northEast.lat) / 2, - (this._southWest.lng + this._northEast.lng) / 2); - }, - - getSouthWest: function () { - return this._southWest; - }, - - getNorthEast: function () { - return this._northEast; - }, - - getNorthWest: function () { - return new L.LatLng(this.getNorth(), this.getWest()); - }, - - getSouthEast: function () { - return new L.LatLng(this.getSouth(), this.getEast()); - }, - - getWest: function () { - return this._southWest.lng; - }, - - getSouth: function () { - return this._southWest.lat; - }, - - getEast: function () { - return this._northEast.lng; - }, - - getNorth: function () { - return this._northEast.lat; - }, - - contains: function (obj) { // (LatLngBounds) or (LatLng) -> Boolean - if (typeof obj[0] === 'number' || obj instanceof L.LatLng) { - obj = L.latLng(obj); - } else { - obj = L.latLngBounds(obj); - } - - var sw = this._southWest, - ne = this._northEast, - sw2, ne2; - - if (obj instanceof L.LatLngBounds) { - sw2 = obj.getSouthWest(); - ne2 = obj.getNorthEast(); - } else { - sw2 = ne2 = obj; - } - - return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) && - (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng); - }, - - intersects: function (bounds) { // (LatLngBounds) - bounds = L.latLngBounds(bounds); - - var sw = this._southWest, - ne = this._northEast, - sw2 = bounds.getSouthWest(), - ne2 = bounds.getNorthEast(), - - latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat), - lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng); - - return latIntersects && lngIntersects; - }, - - toBBoxString: function () { - return [this.getWest(), this.getSouth(), this.getEast(), this.getNorth()].join(','); - }, - - equals: function (bounds) { // (LatLngBounds) - if (!bounds) { return false; } - - bounds = L.latLngBounds(bounds); - - return this._southWest.equals(bounds.getSouthWest()) && - this._northEast.equals(bounds.getNorthEast()); - }, - - isValid: function () { - return !!(this._southWest && this._northEast); - } -}; - -//TODO International date line? - -L.latLngBounds = function (a, b) { // (LatLngBounds) or (LatLng, LatLng) - if (!a || a instanceof L.LatLngBounds) { - return a; - } - return new L.LatLngBounds(a, b); -}; - - -/* - * L.Projection contains various geographical projections used by CRS classes. - */ - -L.Projection = {}; - - -/* - * Spherical Mercator is the most popular map projection, used by EPSG:3857 CRS used by default. - */ - -L.Projection.SphericalMercator = { - MAX_LATITUDE: 85.0511287798, - - project: function (latlng) { // (LatLng) -> Point - var d = L.LatLng.DEG_TO_RAD, - max = this.MAX_LATITUDE, - lat = Math.max(Math.min(max, latlng.lat), -max), - x = latlng.lng * d, - y = lat * d; - - y = Math.log(Math.tan((Math.PI / 4) + (y / 2))); - - return new L.Point(x, y); - }, - - unproject: function (point) { // (Point, Boolean) -> LatLng - var d = L.LatLng.RAD_TO_DEG, - lng = point.x * d, - lat = (2 * Math.atan(Math.exp(point.y)) - (Math.PI / 2)) * d; - - return new L.LatLng(lat, lng); - } -}; - - -/* - * Simple equirectangular (Plate Carree) projection, used by CRS like EPSG:4326 and Simple. - */ - -L.Projection.LonLat = { - project: function (latlng) { - return new L.Point(latlng.lng, latlng.lat); - }, - - unproject: function (point) { - return new L.LatLng(point.y, point.x); - } -}; - - -/* - * L.CRS is a base object for all defined CRS (Coordinate Reference Systems) in Leaflet. - */ - -L.CRS = { - latLngToPoint: function (latlng, zoom) { // (LatLng, Number) -> Point - var projectedPoint = this.projection.project(latlng), - scale = this.scale(zoom); - - return this.transformation._transform(projectedPoint, scale); - }, - - pointToLatLng: function (point, zoom) { // (Point, Number[, Boolean]) -> LatLng - var scale = this.scale(zoom), - untransformedPoint = this.transformation.untransform(point, scale); - - return this.projection.unproject(untransformedPoint); - }, - - project: function (latlng) { - return this.projection.project(latlng); - }, - - scale: function (zoom) { - return 256 * Math.pow(2, zoom); - }, - - getSize: function (zoom) { - var s = this.scale(zoom); - return L.point(s, s); - } -}; - - -/* - * A simple CRS that can be used for flat non-Earth maps like panoramas or game maps. - */ - -L.CRS.Simple = L.extend({}, L.CRS, { - projection: L.Projection.LonLat, - transformation: new L.Transformation(1, 0, -1, 0), - - scale: function (zoom) { - return Math.pow(2, zoom); - } -}); - - -/* - * L.CRS.EPSG3857 (Spherical Mercator) is the most common CRS for web mapping - * and is used by Leaflet by default. - */ - -L.CRS.EPSG3857 = L.extend({}, L.CRS, { - code: 'EPSG:3857', - - projection: L.Projection.SphericalMercator, - transformation: new L.Transformation(0.5 / Math.PI, 0.5, -0.5 / Math.PI, 0.5), - - project: function (latlng) { // (LatLng) -> Point - var projectedPoint = this.projection.project(latlng), - earthRadius = 6378137; - return projectedPoint.multiplyBy(earthRadius); - } -}); - -L.CRS.EPSG900913 = L.extend({}, L.CRS.EPSG3857, { - code: 'EPSG:900913' -}); - - -/* - * L.CRS.EPSG4326 is a CRS popular among advanced GIS specialists. - */ - -L.CRS.EPSG4326 = L.extend({}, L.CRS, { - code: 'EPSG:4326', - - projection: L.Projection.LonLat, - transformation: new L.Transformation(1 / 360, 0.5, -1 / 360, 0.5) -}); - - -/* - * L.Map is the central class of the API - it is used to create a map. - */ - -L.Map = L.Class.extend({ - - includes: L.Mixin.Events, - - options: { - crs: L.CRS.EPSG3857, - - /* - center: LatLng, - zoom: Number, - layers: Array, - */ - - fadeAnimation: L.DomUtil.TRANSITION && !L.Browser.android23, - trackResize: true, - markerZoomAnimation: L.DomUtil.TRANSITION && L.Browser.any3d - }, - - initialize: function (id, options) { // (HTMLElement or String, Object) - options = L.setOptions(this, options); - - - this._initContainer(id); - this._initLayout(); - - // hack for https://github.com/Leaflet/Leaflet/issues/1980 - this._onResize = L.bind(this._onResize, this); - - this._initEvents(); - - if (options.maxBounds) { - this.setMaxBounds(options.maxBounds); - } - - if (options.center && options.zoom !== undefined) { - this.setView(L.latLng(options.center), options.zoom, {reset: true}); - } - - this._handlers = []; - - this._layers = {}; - this._zoomBoundLayers = {}; - this._tileLayersNum = 0; - - this.callInitHooks(); - - this._addLayers(options.layers); - }, - - - // public methods that modify map state - - // replaced by animation-powered implementation in Map.PanAnimation.js - setView: function (center, zoom) { - zoom = zoom === undefined ? this.getZoom() : zoom; - this._resetView(L.latLng(center), this._limitZoom(zoom)); - return this; - }, - - setZoom: function (zoom, options) { - if (!this._loaded) { - this._zoom = this._limitZoom(zoom); - return this; - } - return this.setView(this.getCenter(), zoom, {zoom: options}); - }, - - zoomIn: function (delta, options) { - return this.setZoom(this._zoom + (delta || 1), options); - }, - - zoomOut: function (delta, options) { - return this.setZoom(this._zoom - (delta || 1), options); - }, - - setZoomAround: function (latlng, zoom, options) { - var scale = this.getZoomScale(zoom), - viewHalf = this.getSize().divideBy(2), - containerPoint = latlng instanceof L.Point ? latlng : this.latLngToContainerPoint(latlng), - - centerOffset = containerPoint.subtract(viewHalf).multiplyBy(1 - 1 / scale), - newCenter = this.containerPointToLatLng(viewHalf.add(centerOffset)); - - return this.setView(newCenter, zoom, {zoom: options}); - }, - - fitBounds: function (bounds, options) { - - options = options || {}; - bounds = bounds.getBounds ? bounds.getBounds() : L.latLngBounds(bounds); - - var paddingTL = L.point(options.paddingTopLeft || options.padding || [0, 0]), - paddingBR = L.point(options.paddingBottomRight || options.padding || [0, 0]), - - zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR)); - - zoom = (options.maxZoom) ? Math.min(options.maxZoom, zoom) : zoom; - - var paddingOffset = paddingBR.subtract(paddingTL).divideBy(2), - - swPoint = this.project(bounds.getSouthWest(), zoom), - nePoint = this.project(bounds.getNorthEast(), zoom), - center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom); - - return this.setView(center, zoom, options); - }, - - fitWorld: function (options) { - return this.fitBounds([[-90, -180], [90, 180]], options); - }, - - panTo: function (center, options) { // (LatLng) - return this.setView(center, this._zoom, {pan: options}); - }, - - panBy: function (offset) { // (Point) - // replaced with animated panBy in Map.PanAnimation.js - this.fire('movestart'); - - this._rawPanBy(L.point(offset)); - - this.fire('move'); - return this.fire('moveend'); - }, - - setMaxBounds: function (bounds) { - bounds = L.latLngBounds(bounds); - - this.options.maxBounds = bounds; - - if (!bounds) { - return this.off('moveend', this._panInsideMaxBounds, this); - } - - if (this._loaded) { - this._panInsideMaxBounds(); - } - - return this.on('moveend', this._panInsideMaxBounds, this); - }, - - panInsideBounds: function (bounds, options) { - var center = this.getCenter(), - newCenter = this._limitCenter(center, this._zoom, bounds); - - if (center.equals(newCenter)) { return this; } - - return this.panTo(newCenter, options); - }, - - addLayer: function (layer) { - // TODO method is too big, refactor - - var id = L.stamp(layer); - - if (this._layers[id]) { return this; } - - this._layers[id] = layer; - - // TODO getMaxZoom, getMinZoom in ILayer (instead of options) - if (layer.options && (!isNaN(layer.options.maxZoom) || !isNaN(layer.options.minZoom))) { - this._zoomBoundLayers[id] = layer; - this._updateZoomLevels(); - } - - // TODO looks ugly, refactor!!! - if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) { - this._tileLayersNum++; - this._tileLayersToLoad++; - layer.on('load', this._onTileLayerLoad, this); - } - - if (this._loaded) { - this._layerAdd(layer); - } - - return this; - }, - - removeLayer: function (layer) { - var id = L.stamp(layer); - - if (!this._layers[id]) { return this; } - - if (this._loaded) { - layer.onRemove(this); - } - - delete this._layers[id]; - - if (this._loaded) { - this.fire('layerremove', {layer: layer}); - } - - if (this._zoomBoundLayers[id]) { - delete this._zoomBoundLayers[id]; - this._updateZoomLevels(); - } - - // TODO looks ugly, refactor - if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) { - this._tileLayersNum--; - this._tileLayersToLoad--; - layer.off('load', this._onTileLayerLoad, this); - } - - return this; - }, - - hasLayer: function (layer) { - if (!layer) { return false; } - - return (L.stamp(layer) in this._layers); - }, - - eachLayer: function (method, context) { - for (var i in this._layers) { - method.call(context, this._layers[i]); - } - return this; - }, - - invalidateSize: function (options) { - if (!this._loaded) { return this; } - - options = L.extend({ - animate: false, - pan: true - }, options === true ? {animate: true} : options); - - var oldSize = this.getSize(); - this._sizeChanged = true; - this._initialCenter = null; - - var newSize = this.getSize(), - oldCenter = oldSize.divideBy(2).round(), - newCenter = newSize.divideBy(2).round(), - offset = oldCenter.subtract(newCenter); - - if (!offset.x && !offset.y) { return this; } - - if (options.animate && options.pan) { - this.panBy(offset); - - } else { - if (options.pan) { - this._rawPanBy(offset); - } - - this.fire('move'); - - if (options.debounceMoveend) { - clearTimeout(this._sizeTimer); - this._sizeTimer = setTimeout(L.bind(this.fire, this, 'moveend'), 200); - } else { - this.fire('moveend'); - } - } - - return this.fire('resize', { - oldSize: oldSize, - newSize: newSize - }); - }, - - // TODO handler.addTo - addHandler: function (name, HandlerClass) { - if (!HandlerClass) { return this; } - - var handler = this[name] = new HandlerClass(this); - - this._handlers.push(handler); - - if (this.options[name]) { - handler.enable(); - } - - return this; - }, - - remove: function () { - if (this._loaded) { - this.fire('unload'); - } - - this._initEvents('off'); - - try { - // throws error in IE6-8 - delete this._container._leaflet; - } catch (e) { - this._container._leaflet = undefined; - } - - this._clearPanes(); - if (this._clearControlPos) { - this._clearControlPos(); - } - - this._clearHandlers(); - - return this; - }, - - - // public methods for getting map state - - getCenter: function () { // (Boolean) -> LatLng - this._checkIfLoaded(); - - if (this._initialCenter && !this._moved()) { - return this._initialCenter; - } - return this.layerPointToLatLng(this._getCenterLayerPoint()); - }, - - getZoom: function () { - return this._zoom; - }, - - getBounds: function () { - var bounds = this.getPixelBounds(), - sw = this.unproject(bounds.getBottomLeft()), - ne = this.unproject(bounds.getTopRight()); - - return new L.LatLngBounds(sw, ne); - }, - - getMinZoom: function () { - return this.options.minZoom === undefined ? - (this._layersMinZoom === undefined ? 0 : this._layersMinZoom) : - this.options.minZoom; - }, - - getMaxZoom: function () { - return this.options.maxZoom === undefined ? - (this._layersMaxZoom === undefined ? Infinity : this._layersMaxZoom) : - this.options.maxZoom; - }, - - getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number - bounds = L.latLngBounds(bounds); - - var zoom = this.getMinZoom() - (inside ? 1 : 0), - maxZoom = this.getMaxZoom(), - size = this.getSize(), - - nw = bounds.getNorthWest(), - se = bounds.getSouthEast(), - - zoomNotFound = true, - boundsSize; - - padding = L.point(padding || [0, 0]); - - do { - zoom++; - boundsSize = this.project(se, zoom).subtract(this.project(nw, zoom)).add(padding); - zoomNotFound = !inside ? size.contains(boundsSize) : boundsSize.x < size.x || boundsSize.y < size.y; - - } while (zoomNotFound && zoom <= maxZoom); - - if (zoomNotFound && inside) { - return null; - } - - return inside ? zoom : zoom - 1; - }, - - getSize: function () { - if (!this._size || this._sizeChanged) { - this._size = new L.Point( - this._container.clientWidth, - this._container.clientHeight); - - this._sizeChanged = false; - } - return this._size.clone(); - }, - - getPixelBounds: function () { - var topLeftPoint = this._getTopLeftPoint(); - return new L.Bounds(topLeftPoint, topLeftPoint.add(this.getSize())); - }, - - getPixelOrigin: function () { - this._checkIfLoaded(); - return this._initialTopLeftPoint; - }, - - getPanes: function () { - return this._panes; - }, - - getContainer: function () { - return this._container; - }, - - - // TODO replace with universal implementation after refactoring projections - - getZoomScale: function (toZoom) { - var crs = this.options.crs; - return crs.scale(toZoom) / crs.scale(this._zoom); - }, - - getScaleZoom: function (scale) { - return this._zoom + (Math.log(scale) / Math.LN2); - }, - - - // conversion methods - - project: function (latlng, zoom) { // (LatLng[, Number]) -> Point - zoom = zoom === undefined ? this._zoom : zoom; - return this.options.crs.latLngToPoint(L.latLng(latlng), zoom); - }, - - unproject: function (point, zoom) { // (Point[, Number]) -> LatLng - zoom = zoom === undefined ? this._zoom : zoom; - return this.options.crs.pointToLatLng(L.point(point), zoom); - }, - - layerPointToLatLng: function (point) { // (Point) - var projectedPoint = L.point(point).add(this.getPixelOrigin()); - return this.unproject(projectedPoint); - }, - - latLngToLayerPoint: function (latlng) { // (LatLng) - var projectedPoint = this.project(L.latLng(latlng))._round(); - return projectedPoint._subtract(this.getPixelOrigin()); - }, - - containerPointToLayerPoint: function (point) { // (Point) - return L.point(point).subtract(this._getMapPanePos()); - }, - - layerPointToContainerPoint: function (point) { // (Point) - return L.point(point).add(this._getMapPanePos()); - }, - - containerPointToLatLng: function (point) { - var layerPoint = this.containerPointToLayerPoint(L.point(point)); - return this.layerPointToLatLng(layerPoint); - }, - - latLngToContainerPoint: function (latlng) { - return this.layerPointToContainerPoint(this.latLngToLayerPoint(L.latLng(latlng))); - }, - - mouseEventToContainerPoint: function (e) { // (MouseEvent) - return L.DomEvent.getMousePosition(e, this._container); - }, - - mouseEventToLayerPoint: function (e) { // (MouseEvent) - return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e)); - }, - - mouseEventToLatLng: function (e) { // (MouseEvent) - return this.layerPointToLatLng(this.mouseEventToLayerPoint(e)); - }, - - - // map initialization methods - - _initContainer: function (id) { - var container = this._container = L.DomUtil.get(id); - - if (!container) { - throw new Error('Map container not found.'); - } else if (container._leaflet) { - throw new Error('Map container is already initialized.'); - } - - container._leaflet = true; - }, - - _initLayout: function () { - var container = this._container; - - L.DomUtil.addClass(container, 'leaflet-container' + - (L.Browser.touch ? ' leaflet-touch' : '') + - (L.Browser.retina ? ' leaflet-retina' : '') + - (L.Browser.ielt9 ? ' leaflet-oldie' : '') + - (this.options.fadeAnimation ? ' leaflet-fade-anim' : '')); - - var position = L.DomUtil.getStyle(container, 'position'); - - if (position !== 'absolute' && position !== 'relative' && position !== 'fixed') { - container.style.position = 'relative'; - } - - this._initPanes(); - - if (this._initControlPos) { - this._initControlPos(); - } - }, - - _initPanes: function () { - var panes = this._panes = {}; - - this._mapPane = panes.mapPane = this._createPane('leaflet-map-pane', this._container); - - this._tilePane = panes.tilePane = this._createPane('leaflet-tile-pane', this._mapPane); - panes.objectsPane = this._createPane('leaflet-objects-pane', this._mapPane); - panes.shadowPane = this._createPane('leaflet-shadow-pane'); - panes.overlayPane = this._createPane('leaflet-overlay-pane'); - panes.markerPane = this._createPane('leaflet-marker-pane'); - panes.popupPane = this._createPane('leaflet-popup-pane'); - - var zoomHide = ' leaflet-zoom-hide'; - - if (!this.options.markerZoomAnimation) { - L.DomUtil.addClass(panes.markerPane, zoomHide); - L.DomUtil.addClass(panes.shadowPane, zoomHide); - L.DomUtil.addClass(panes.popupPane, zoomHide); - } - }, - - _createPane: function (className, container) { - return L.DomUtil.create('div', className, container || this._panes.objectsPane); - }, - - _clearPanes: function () { - this._container.removeChild(this._mapPane); - }, - - _addLayers: function (layers) { - layers = layers ? (L.Util.isArray(layers) ? layers : [layers]) : []; - - for (var i = 0, len = layers.length; i < len; i++) { - this.addLayer(layers[i]); - } - }, - - - // private methods that modify map state - - _resetView: function (center, zoom, preserveMapOffset, afterZoomAnim) { - - var zoomChanged = (this._zoom !== zoom); - - if (!afterZoomAnim) { - this.fire('movestart'); - - if (zoomChanged) { - this.fire('zoomstart'); - } - } - - this._zoom = zoom; - this._initialCenter = center; - - this._initialTopLeftPoint = this._getNewTopLeftPoint(center); - - if (!preserveMapOffset) { - L.DomUtil.setPosition(this._mapPane, new L.Point(0, 0)); - } else { - this._initialTopLeftPoint._add(this._getMapPanePos()); - } - - this._tileLayersToLoad = this._tileLayersNum; - - var loading = !this._loaded; - this._loaded = true; - - this.fire('viewreset', {hard: !preserveMapOffset}); - - if (loading) { - this.fire('load'); - this.eachLayer(this._layerAdd, this); - } - - this.fire('move'); - - if (zoomChanged || afterZoomAnim) { - this.fire('zoomend'); - } - - this.fire('moveend', {hard: !preserveMapOffset}); - }, - - _rawPanBy: function (offset) { - L.DomUtil.setPosition(this._mapPane, this._getMapPanePos().subtract(offset)); - }, - - _getZoomSpan: function () { - return this.getMaxZoom() - this.getMinZoom(); - }, - - _updateZoomLevels: function () { - var i, - minZoom = Infinity, - maxZoom = -Infinity, - oldZoomSpan = this._getZoomSpan(); - - for (i in this._zoomBoundLayers) { - var layer = this._zoomBoundLayers[i]; - if (!isNaN(layer.options.minZoom)) { - minZoom = Math.min(minZoom, layer.options.minZoom); - } - if (!isNaN(layer.options.maxZoom)) { - maxZoom = Math.max(maxZoom, layer.options.maxZoom); - } - } - - if (i === undefined) { // we have no tilelayers - this._layersMaxZoom = this._layersMinZoom = undefined; - } else { - this._layersMaxZoom = maxZoom; - this._layersMinZoom = minZoom; - } - - if (oldZoomSpan !== this._getZoomSpan()) { - this.fire('zoomlevelschange'); - } - }, - - _panInsideMaxBounds: function () { - this.panInsideBounds(this.options.maxBounds); - }, - - _checkIfLoaded: function () { - if (!this._loaded) { - throw new Error('Set map center and zoom first.'); - } - }, - - // map events - - _initEvents: function (onOff) { - if (!L.DomEvent) { return; } - - onOff = onOff || 'on'; - - L.DomEvent[onOff](this._container, 'click', this._onMouseClick, this); - - var events = ['dblclick', 'mousedown', 'mouseup', 'mouseenter', - 'mouseleave', 'mousemove', 'contextmenu'], - i, len; - - for (i = 0, len = events.length; i < len; i++) { - L.DomEvent[onOff](this._container, events[i], this._fireMouseEvent, this); - } - - if (this.options.trackResize) { - L.DomEvent[onOff](window, 'resize', this._onResize, this); - } - }, - - _onResize: function () { - L.Util.cancelAnimFrame(this._resizeRequest); - this._resizeRequest = L.Util.requestAnimFrame( - function () { this.invalidateSize({debounceMoveend: true}); }, this, false, this._container); - }, - - _onMouseClick: function (e) { - if (!this._loaded || (!e._simulated && - ((this.dragging && this.dragging.moved()) || - (this.boxZoom && this.boxZoom.moved()))) || - L.DomEvent._skipped(e)) { return; } - - this.fire('preclick'); - this._fireMouseEvent(e); - }, - - _fireMouseEvent: function (e) { - if (!this._loaded || L.DomEvent._skipped(e)) { return; } - - var type = e.type; - - type = (type === 'mouseenter' ? 'mouseover' : (type === 'mouseleave' ? 'mouseout' : type)); - - if (!this.hasEventListeners(type)) { return; } - - if (type === 'contextmenu') { - L.DomEvent.preventDefault(e); - } - - var containerPoint = this.mouseEventToContainerPoint(e), - layerPoint = this.containerPointToLayerPoint(containerPoint), - latlng = this.layerPointToLatLng(layerPoint); - - this.fire(type, { - latlng: latlng, - layerPoint: layerPoint, - containerPoint: containerPoint, - originalEvent: e - }); - }, - - _onTileLayerLoad: function () { - this._tileLayersToLoad--; - if (this._tileLayersNum && !this._tileLayersToLoad) { - this.fire('tilelayersload'); - } - }, - - _clearHandlers: function () { - for (var i = 0, len = this._handlers.length; i < len; i++) { - this._handlers[i].disable(); - } - }, - - whenReady: function (callback, context) { - if (this._loaded) { - callback.call(context || this, this); - } else { - this.on('load', callback, context); - } - return this; - }, - - _layerAdd: function (layer) { - layer.onAdd(this); - this.fire('layeradd', {layer: layer}); - }, - - - // private methods for getting map state - - _getMapPanePos: function () { - return L.DomUtil.getPosition(this._mapPane); - }, - - _moved: function () { - var pos = this._getMapPanePos(); - return pos && !pos.equals([0, 0]); - }, - - _getTopLeftPoint: function () { - return this.getPixelOrigin().subtract(this._getMapPanePos()); - }, - - _getNewTopLeftPoint: function (center, zoom) { - var viewHalf = this.getSize()._divideBy(2); - // TODO round on display, not calculation to increase precision? - return this.project(center, zoom)._subtract(viewHalf)._round(); - }, - - _latLngToNewLayerPoint: function (latlng, newZoom, newCenter) { - var topLeft = this._getNewTopLeftPoint(newCenter, newZoom).add(this._getMapPanePos()); - return this.project(latlng, newZoom)._subtract(topLeft); - }, - - // layer point of the current center - _getCenterLayerPoint: function () { - return this.containerPointToLayerPoint(this.getSize()._divideBy(2)); - }, - - // offset of the specified place to the current center in pixels - _getCenterOffset: function (latlng) { - return this.latLngToLayerPoint(latlng).subtract(this._getCenterLayerPoint()); - }, - - // adjust center for view to get inside bounds - _limitCenter: function (center, zoom, bounds) { - - if (!bounds) { return center; } - - var centerPoint = this.project(center, zoom), - viewHalf = this.getSize().divideBy(2), - viewBounds = new L.Bounds(centerPoint.subtract(viewHalf), centerPoint.add(viewHalf)), - offset = this._getBoundsOffset(viewBounds, bounds, zoom); - - return this.unproject(centerPoint.add(offset), zoom); - }, - - // adjust offset for view to get inside bounds - _limitOffset: function (offset, bounds) { - if (!bounds) { return offset; } - - var viewBounds = this.getPixelBounds(), - newBounds = new L.Bounds(viewBounds.min.add(offset), viewBounds.max.add(offset)); - - return offset.add(this._getBoundsOffset(newBounds, bounds)); - }, - - // returns offset needed for pxBounds to get inside maxBounds at a specified zoom - _getBoundsOffset: function (pxBounds, maxBounds, zoom) { - var nwOffset = this.project(maxBounds.getNorthWest(), zoom).subtract(pxBounds.min), - seOffset = this.project(maxBounds.getSouthEast(), zoom).subtract(pxBounds.max), - - dx = this._rebound(nwOffset.x, -seOffset.x), - dy = this._rebound(nwOffset.y, -seOffset.y); - - return new L.Point(dx, dy); - }, - - _rebound: function (left, right) { - return left + right > 0 ? - Math.round(left - right) / 2 : - Math.max(0, Math.ceil(left)) - Math.max(0, Math.floor(right)); - }, - - _limitZoom: function (zoom) { - var min = this.getMinZoom(), - max = this.getMaxZoom(); - - return Math.max(min, Math.min(max, zoom)); - } -}); - -L.map = function (id, options) { - return new L.Map(id, options); -}; - - -/* - * Mercator projection that takes into account that the Earth is not a perfect sphere. - * Less popular than spherical mercator; used by projections like EPSG:3395. - */ - -L.Projection.Mercator = { - MAX_LATITUDE: 85.0840591556, - - R_MINOR: 6356752.314245179, - R_MAJOR: 6378137, - - project: function (latlng) { // (LatLng) -> Point - var d = L.LatLng.DEG_TO_RAD, - max = this.MAX_LATITUDE, - lat = Math.max(Math.min(max, latlng.lat), -max), - r = this.R_MAJOR, - r2 = this.R_MINOR, - x = latlng.lng * d * r, - y = lat * d, - tmp = r2 / r, - eccent = Math.sqrt(1.0 - tmp * tmp), - con = eccent * Math.sin(y); - - con = Math.pow((1 - con) / (1 + con), eccent * 0.5); - - var ts = Math.tan(0.5 * ((Math.PI * 0.5) - y)) / con; - y = -r * Math.log(ts); - - return new L.Point(x, y); - }, - - unproject: function (point) { // (Point, Boolean) -> LatLng - var d = L.LatLng.RAD_TO_DEG, - r = this.R_MAJOR, - r2 = this.R_MINOR, - lng = point.x * d / r, - tmp = r2 / r, - eccent = Math.sqrt(1 - (tmp * tmp)), - ts = Math.exp(- point.y / r), - phi = (Math.PI / 2) - 2 * Math.atan(ts), - numIter = 15, - tol = 1e-7, - i = numIter, - dphi = 0.1, - con; - - while ((Math.abs(dphi) > tol) && (--i > 0)) { - con = eccent * Math.sin(phi); - dphi = (Math.PI / 2) - 2 * Math.atan(ts * - Math.pow((1.0 - con) / (1.0 + con), 0.5 * eccent)) - phi; - phi += dphi; - } - - return new L.LatLng(phi * d, lng); - } -}; - - - -L.CRS.EPSG3395 = L.extend({}, L.CRS, { - code: 'EPSG:3395', - - projection: L.Projection.Mercator, - - transformation: (function () { - var m = L.Projection.Mercator, - r = m.R_MAJOR, - scale = 0.5 / (Math.PI * r); - - return new L.Transformation(scale, 0.5, -scale, 0.5); - }()) -}); - - -/* - * L.TileLayer is used for standard xyz-numbered tile layers. - */ - -L.TileLayer = L.Class.extend({ - includes: L.Mixin.Events, - - options: { - minZoom: 0, - maxZoom: 18, - tileSize: 256, - subdomains: 'abc', - errorTileUrl: '', - attribution: '', - zoomOffset: 0, - opacity: 1, - /* - maxNativeZoom: null, - zIndex: null, - tms: false, - continuousWorld: false, - noWrap: false, - zoomReverse: false, - detectRetina: false, - reuseTiles: false, - bounds: false, - */ - unloadInvisibleTiles: L.Browser.mobile, - updateWhenIdle: L.Browser.mobile - }, - - initialize: function (url, options) { - options = L.setOptions(this, options); - - // detecting retina displays, adjusting tileSize and zoom levels - if (options.detectRetina && L.Browser.retina && options.maxZoom > 0) { - - options.tileSize = Math.floor(options.tileSize / 2); - options.zoomOffset++; - - if (options.minZoom > 0) { - options.minZoom--; - } - this.options.maxZoom--; - } - - if (options.bounds) { - options.bounds = L.latLngBounds(options.bounds); - } - - this._url = url; - - var subdomains = this.options.subdomains; - - if (typeof subdomains === 'string') { - this.options.subdomains = subdomains.split(''); - } - }, - - onAdd: function (map) { - this._map = map; - this._animated = map._zoomAnimated; - - // create a container div for tiles - this._initContainer(); - - // set up events - map.on({ - 'viewreset': this._reset, - 'moveend': this._update - }, this); - - if (this._animated) { - map.on({ - 'zoomanim': this._animateZoom, - 'zoomend': this._endZoomAnim - }, this); - } - - if (!this.options.updateWhenIdle) { - this._limitedUpdate = L.Util.limitExecByInterval(this._update, 150, this); - map.on('move', this._limitedUpdate, this); - } - - this._reset(); - this._update(); - }, - - addTo: function (map) { - map.addLayer(this); - return this; - }, - - onRemove: function (map) { - this._container.parentNode.removeChild(this._container); - - map.off({ - 'viewreset': this._reset, - 'moveend': this._update - }, this); - - if (this._animated) { - map.off({ - 'zoomanim': this._animateZoom, - 'zoomend': this._endZoomAnim - }, this); - } - - if (!this.options.updateWhenIdle) { - map.off('move', this._limitedUpdate, this); - } - - this._container = null; - this._map = null; - }, - - bringToFront: function () { - var pane = this._map._panes.tilePane; - - if (this._container) { - pane.appendChild(this._container); - this._setAutoZIndex(pane, Math.max); - } - - return this; - }, - - bringToBack: function () { - var pane = this._map._panes.tilePane; - - if (this._container) { - pane.insertBefore(this._container, pane.firstChild); - this._setAutoZIndex(pane, Math.min); - } - - return this; - }, - - getAttribution: function () { - return this.options.attribution; - }, - - getContainer: function () { - return this._container; - }, - - setOpacity: function (opacity) { - this.options.opacity = opacity; - - if (this._map) { - this._updateOpacity(); - } - - return this; - }, - - setZIndex: function (zIndex) { - this.options.zIndex = zIndex; - this._updateZIndex(); - - return this; - }, - - setUrl: function (url, noRedraw) { - this._url = url; - - if (!noRedraw) { - this.redraw(); - } - - return this; - }, - - redraw: function () { - if (this._map) { - this._reset({hard: true}); - this._update(); - } - return this; - }, - - _updateZIndex: function () { - if (this._container && this.options.zIndex !== undefined) { - this._container.style.zIndex = this.options.zIndex; - } - }, - - _setAutoZIndex: function (pane, compare) { - - var layers = pane.children, - edgeZIndex = -compare(Infinity, -Infinity), // -Infinity for max, Infinity for min - zIndex, i, len; - - for (i = 0, len = layers.length; i < len; i++) { - - if (layers[i] !== this._container) { - zIndex = parseInt(layers[i].style.zIndex, 10); - - if (!isNaN(zIndex)) { - edgeZIndex = compare(edgeZIndex, zIndex); - } - } - } - - this.options.zIndex = this._container.style.zIndex = - (isFinite(edgeZIndex) ? edgeZIndex : 0) + compare(1, -1); - }, - - _updateOpacity: function () { - var i, - tiles = this._tiles; - - if (L.Browser.ielt9) { - for (i in tiles) { - L.DomUtil.setOpacity(tiles[i], this.options.opacity); - } - } else { - L.DomUtil.setOpacity(this._container, this.options.opacity); - } - }, - - _initContainer: function () { - var tilePane = this._map._panes.tilePane; - - if (!this._container) { - this._container = L.DomUtil.create('div', 'leaflet-layer'); - - this._updateZIndex(); - - if (this._animated) { - var className = 'leaflet-tile-container'; - - this._bgBuffer = L.DomUtil.create('div', className, this._container); - this._tileContainer = L.DomUtil.create('div', className, this._container); - - } else { - this._tileContainer = this._container; - } - - tilePane.appendChild(this._container); - - if (this.options.opacity < 1) { - this._updateOpacity(); - } - } - }, - - _reset: function (e) { - for (var key in this._tiles) { - this.fire('tileunload', {tile: this._tiles[key]}); - } - - this._tiles = {}; - this._tilesToLoad = 0; - - if (this.options.reuseTiles) { - this._unusedTiles = []; - } - - this._tileContainer.innerHTML = ''; - - if (this._animated && e && e.hard) { - this._clearBgBuffer(); - } - - this._initContainer(); - }, - - _getTileSize: function () { - var map = this._map, - zoom = map.getZoom() + this.options.zoomOffset, - zoomN = this.options.maxNativeZoom, - tileSize = this.options.tileSize; - - if (zoomN && zoom > zoomN) { - tileSize = Math.round(map.getZoomScale(zoom) / map.getZoomScale(zoomN) * tileSize); - } - - return tileSize; - }, - - _update: function () { - - if (!this._map) { return; } - - var map = this._map, - bounds = map.getPixelBounds(), - zoom = map.getZoom(), - tileSize = this._getTileSize(); - - if (zoom > this.options.maxZoom || zoom < this.options.minZoom) { - return; - } - - var tileBounds = L.bounds( - bounds.min.divideBy(tileSize)._floor(), - bounds.max.divideBy(tileSize)._floor()); - - this._addTilesFromCenterOut(tileBounds); - - if (this.options.unloadInvisibleTiles || this.options.reuseTiles) { - this._removeOtherTiles(tileBounds); - } - }, - - _addTilesFromCenterOut: function (bounds) { - var queue = [], - center = bounds.getCenter(); - - var j, i, point; - - for (j = bounds.min.y; j <= bounds.max.y; j++) { - for (i = bounds.min.x; i <= bounds.max.x; i++) { - point = new L.Point(i, j); - - if (this._tileShouldBeLoaded(point)) { - queue.push(point); - } - } - } - - var tilesToLoad = queue.length; - - if (tilesToLoad === 0) { return; } - - // load tiles in order of their distance to center - queue.sort(function (a, b) { - return a.distanceTo(center) - b.distanceTo(center); - }); - - var fragment = document.createDocumentFragment(); - - // if its the first batch of tiles to load - if (!this._tilesToLoad) { - this.fire('loading'); - } - - this._tilesToLoad += tilesToLoad; - - for (i = 0; i < tilesToLoad; i++) { - this._addTile(queue[i], fragment); - } - - this._tileContainer.appendChild(fragment); - }, - - _tileShouldBeLoaded: function (tilePoint) { - if ((tilePoint.x + ':' + tilePoint.y) in this._tiles) { - return false; // already loaded - } - - var options = this.options; - - if (!options.continuousWorld) { - var limit = this._getWrapTileNum(); - - // don't load if exceeds world bounds - if ((options.noWrap && (tilePoint.x < 0 || tilePoint.x >= limit.x)) || - tilePoint.y < 0 || tilePoint.y >= limit.y) { return false; } - } - - if (options.bounds) { - var tileSize = this._getTileSize(), - nwPoint = tilePoint.multiplyBy(tileSize), - sePoint = nwPoint.add([tileSize, tileSize]), - nw = this._map.unproject(nwPoint), - se = this._map.unproject(sePoint); - - // TODO temporary hack, will be removed after refactoring projections - // https://github.com/Leaflet/Leaflet/issues/1618 - if (!options.continuousWorld && !options.noWrap) { - nw = nw.wrap(); - se = se.wrap(); - } - - if (!options.bounds.intersects([nw, se])) { return false; } - } - - return true; - }, - - _removeOtherTiles: function (bounds) { - var kArr, x, y, key; - - for (key in this._tiles) { - kArr = key.split(':'); - x = parseInt(kArr[0], 10); - y = parseInt(kArr[1], 10); - - // remove tile if it's out of bounds - if (x < bounds.min.x || x > bounds.max.x || y < bounds.min.y || y > bounds.max.y) { - this._removeTile(key); - } - } - }, - - _removeTile: function (key) { - var tile = this._tiles[key]; - - this.fire('tileunload', {tile: tile, url: tile.src}); - - if (this.options.reuseTiles) { - L.DomUtil.removeClass(tile, 'leaflet-tile-loaded'); - this._unusedTiles.push(tile); - - } else if (tile.parentNode === this._tileContainer) { - this._tileContainer.removeChild(tile); - } - - // for https://github.com/CloudMade/Leaflet/issues/137 - if (!L.Browser.android) { - tile.onload = null; - tile.src = L.Util.emptyImageUrl; - } - - delete this._tiles[key]; - }, - - _addTile: function (tilePoint, container) { - var tilePos = this._getTilePos(tilePoint); - - // get unused tile - or create a new tile - var tile = this._getTile(); - - /* - Chrome 20 layouts much faster with top/left (verify with timeline, frames) - Android 4 browser has display issues with top/left and requires transform instead - (other browsers don't currently care) - see debug/hacks/jitter.html for an example - */ - L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome); - - this._tiles[tilePoint.x + ':' + tilePoint.y] = tile; - - this._loadTile(tile, tilePoint); - - if (tile.parentNode !== this._tileContainer) { - container.appendChild(tile); - } - }, - - _getZoomForUrl: function () { - - var options = this.options, - zoom = this._map.getZoom(); - - if (options.zoomReverse) { - zoom = options.maxZoom - zoom; - } - - zoom += options.zoomOffset; - - return options.maxNativeZoom ? Math.min(zoom, options.maxNativeZoom) : zoom; - }, - - _getTilePos: function (tilePoint) { - var origin = this._map.getPixelOrigin(), - tileSize = this._getTileSize(); - - return tilePoint.multiplyBy(tileSize).subtract(origin); - }, - - // image-specific code (override to implement e.g. Canvas or SVG tile layer) - - getTileUrl: function (tilePoint) { - return L.Util.template(this._url, L.extend({ - s: this._getSubdomain(tilePoint), - z: tilePoint.z, - x: tilePoint.x, - y: tilePoint.y - }, this.options)); - }, - - _getWrapTileNum: function () { - var crs = this._map.options.crs, - size = crs.getSize(this._map.getZoom()); - return size.divideBy(this._getTileSize())._floor(); - }, - - _adjustTilePoint: function (tilePoint) { - - var limit = this._getWrapTileNum(); - - // wrap tile coordinates - if (!this.options.continuousWorld && !this.options.noWrap) { - tilePoint.x = ((tilePoint.x % limit.x) + limit.x) % limit.x; - } - - if (this.options.tms) { - tilePoint.y = limit.y - tilePoint.y - 1; - } - - tilePoint.z = this._getZoomForUrl(); - }, - - _getSubdomain: function (tilePoint) { - var index = Math.abs(tilePoint.x + tilePoint.y) % this.options.subdomains.length; - return this.options.subdomains[index]; - }, - - _getTile: function () { - if (this.options.reuseTiles && this._unusedTiles.length > 0) { - var tile = this._unusedTiles.pop(); - this._resetTile(tile); - return tile; - } - return this._createTile(); - }, - - // Override if data stored on a tile needs to be cleaned up before reuse - _resetTile: function (/*tile*/) {}, - - _createTile: function () { - var tile = L.DomUtil.create('img', 'leaflet-tile'); - tile.style.width = tile.style.height = this._getTileSize() + 'px'; - tile.galleryimg = 'no'; - - tile.onselectstart = tile.onmousemove = L.Util.falseFn; - - if (L.Browser.ielt9 && this.options.opacity !== undefined) { - L.DomUtil.setOpacity(tile, this.options.opacity); - } - // without this hack, tiles disappear after zoom on Chrome for Android - // https://github.com/Leaflet/Leaflet/issues/2078 - if (L.Browser.mobileWebkit3d) { - tile.style.WebkitBackfaceVisibility = 'hidden'; - } - return tile; - }, - - _loadTile: function (tile, tilePoint) { - tile._layer = this; - tile.onload = this._tileOnLoad; - tile.onerror = this._tileOnError; - - this._adjustTilePoint(tilePoint); - tile.src = this.getTileUrl(tilePoint); - - this.fire('tileloadstart', { - tile: tile, - url: tile.src - }); - }, - - _tileLoaded: function () { - this._tilesToLoad--; - - if (this._animated) { - L.DomUtil.addClass(this._tileContainer, 'leaflet-zoom-animated'); - } - - if (!this._tilesToLoad) { - this.fire('load'); - - if (this._animated) { - // clear scaled tiles after all new tiles are loaded (for performance) - clearTimeout(this._clearBgBufferTimer); - this._clearBgBufferTimer = setTimeout(L.bind(this._clearBgBuffer, this), 500); - } - } - }, - - _tileOnLoad: function () { - var layer = this._layer; - - //Only if we are loading an actual image - if (this.src !== L.Util.emptyImageUrl) { - L.DomUtil.addClass(this, 'leaflet-tile-loaded'); - - layer.fire('tileload', { - tile: this, - url: this.src - }); - } - - layer._tileLoaded(); - }, - - _tileOnError: function () { - var layer = this._layer; - - layer.fire('tileerror', { - tile: this, - url: this.src - }); - - var newUrl = layer.options.errorTileUrl; - if (newUrl) { - this.src = newUrl; - } - - layer._tileLoaded(); - } -}); - -L.tileLayer = function (url, options) { - return new L.TileLayer(url, options); -}; - - -/* - * L.TileLayer.WMS is used for putting WMS tile layers on the map. - */ - -L.TileLayer.WMS = L.TileLayer.extend({ - - defaultWmsParams: { - service: 'WMS', - request: 'GetMap', - version: '1.1.1', - layers: '', - styles: '', - format: 'image/jpeg', - transparent: false - }, - - initialize: function (url, options) { // (String, Object) - - this._url = url; - - var wmsParams = L.extend({}, this.defaultWmsParams), - tileSize = options.tileSize || this.options.tileSize; - - if (options.detectRetina && L.Browser.retina) { - wmsParams.width = wmsParams.height = tileSize * 2; - } else { - wmsParams.width = wmsParams.height = tileSize; - } - - for (var i in options) { - // all keys that are not TileLayer options go to WMS params - if (!this.options.hasOwnProperty(i) && i !== 'crs') { - wmsParams[i] = options[i]; - } - } - - this.wmsParams = wmsParams; - - L.setOptions(this, options); - }, - - onAdd: function (map) { - - this._crs = this.options.crs || map.options.crs; - - this._wmsVersion = parseFloat(this.wmsParams.version); - - var projectionKey = this._wmsVersion >= 1.3 ? 'crs' : 'srs'; - this.wmsParams[projectionKey] = this._crs.code; - - L.TileLayer.prototype.onAdd.call(this, map); - }, - - getTileUrl: function (tilePoint) { // (Point, Number) -> String - - var map = this._map, - tileSize = this.options.tileSize, - - nwPoint = tilePoint.multiplyBy(tileSize), - sePoint = nwPoint.add([tileSize, tileSize]), - - nw = this._crs.project(map.unproject(nwPoint, tilePoint.z)), - se = this._crs.project(map.unproject(sePoint, tilePoint.z)), - bbox = this._wmsVersion >= 1.3 && this._crs === L.CRS.EPSG4326 ? - [se.y, nw.x, nw.y, se.x].join(',') : - [nw.x, se.y, se.x, nw.y].join(','), - - url = L.Util.template(this._url, {s: this._getSubdomain(tilePoint)}); - - return url + L.Util.getParamString(this.wmsParams, url, true) + '&BBOX=' + bbox; - }, - - setParams: function (params, noRedraw) { - - L.extend(this.wmsParams, params); - - if (!noRedraw) { - this.redraw(); - } - - return this; - } -}); - -L.tileLayer.wms = function (url, options) { - return new L.TileLayer.WMS(url, options); -}; - - -/* - * L.TileLayer.Canvas is a class that you can use as a base for creating - * dynamically drawn Canvas-based tile layers. - */ - -L.TileLayer.Canvas = L.TileLayer.extend({ - options: { - async: false - }, - - initialize: function (options) { - L.setOptions(this, options); - }, - - redraw: function () { - if (this._map) { - this._reset({hard: true}); - this._update(); - } - - for (var i in this._tiles) { - this._redrawTile(this._tiles[i]); - } - return this; - }, - - _redrawTile: function (tile) { - this.drawTile(tile, tile._tilePoint, this._map._zoom); - }, - - _createTile: function () { - var tile = L.DomUtil.create('canvas', 'leaflet-tile'); - tile.width = tile.height = this.options.tileSize; - tile.onselectstart = tile.onmousemove = L.Util.falseFn; - return tile; - }, - - _loadTile: function (tile, tilePoint) { - tile._layer = this; - tile._tilePoint = tilePoint; - - this._redrawTile(tile); - - if (!this.options.async) { - this.tileDrawn(tile); - } - }, - - drawTile: function (/*tile, tilePoint*/) { - // override with rendering code - }, - - tileDrawn: function (tile) { - this._tileOnLoad.call(tile); - } -}); - - -L.tileLayer.canvas = function (options) { - return new L.TileLayer.Canvas(options); -}; - - -/* - * L.ImageOverlay is used to overlay images over the map (to specific geographical bounds). - */ - -L.ImageOverlay = L.Class.extend({ - includes: L.Mixin.Events, - - options: { - opacity: 1 - }, - - initialize: function (url, bounds, options) { // (String, LatLngBounds, Object) - this._url = url; - this._bounds = L.latLngBounds(bounds); - - L.setOptions(this, options); - }, - - onAdd: function (map) { - this._map = map; - - if (!this._image) { - this._initImage(); - } - - map._panes.overlayPane.appendChild(this._image); - - map.on('viewreset', this._reset, this); - - if (map.options.zoomAnimation && L.Browser.any3d) { - map.on('zoomanim', this._animateZoom, this); - } - - this._reset(); - }, - - onRemove: function (map) { - map.getPanes().overlayPane.removeChild(this._image); - - map.off('viewreset', this._reset, this); - - if (map.options.zoomAnimation) { - map.off('zoomanim', this._animateZoom, this); - } - }, - - addTo: function (map) { - map.addLayer(this); - return this; - }, - - setOpacity: function (opacity) { - this.options.opacity = opacity; - this._updateOpacity(); - return this; - }, - - // TODO remove bringToFront/bringToBack duplication from TileLayer/Path - bringToFront: function () { - if (this._image) { - this._map._panes.overlayPane.appendChild(this._image); - } - return this; - }, - - bringToBack: function () { - var pane = this._map._panes.overlayPane; - if (this._image) { - pane.insertBefore(this._image, pane.firstChild); - } - return this; - }, - - setUrl: function (url) { - this._url = url; - this._image.src = this._url; - }, - - getAttribution: function () { - return this.options.attribution; - }, - - _initImage: function () { - this._image = L.DomUtil.create('img', 'leaflet-image-layer'); - - if (this._map.options.zoomAnimation && L.Browser.any3d) { - L.DomUtil.addClass(this._image, 'leaflet-zoom-animated'); - } else { - L.DomUtil.addClass(this._image, 'leaflet-zoom-hide'); - } - - this._updateOpacity(); - - //TODO createImage util method to remove duplication - L.extend(this._image, { - galleryimg: 'no', - onselectstart: L.Util.falseFn, - onmousemove: L.Util.falseFn, - onload: L.bind(this._onImageLoad, this), - src: this._url - }); - }, - - _animateZoom: function (e) { - var map = this._map, - image = this._image, - scale = map.getZoomScale(e.zoom), - nw = this._bounds.getNorthWest(), - se = this._bounds.getSouthEast(), - - topLeft = map._latLngToNewLayerPoint(nw, e.zoom, e.center), - size = map._latLngToNewLayerPoint(se, e.zoom, e.center)._subtract(topLeft), - origin = topLeft._add(size._multiplyBy((1 / 2) * (1 - 1 / scale))); - - image.style[L.DomUtil.TRANSFORM] = - L.DomUtil.getTranslateString(origin) + ' scale(' + scale + ') '; - }, - - _reset: function () { - var image = this._image, - topLeft = this._map.latLngToLayerPoint(this._bounds.getNorthWest()), - size = this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(topLeft); - - L.DomUtil.setPosition(image, topLeft); - - image.style.width = size.x + 'px'; - image.style.height = size.y + 'px'; - }, - - _onImageLoad: function () { - this.fire('load'); - }, - - _updateOpacity: function () { - L.DomUtil.setOpacity(this._image, this.options.opacity); - } -}); - -L.imageOverlay = function (url, bounds, options) { - return new L.ImageOverlay(url, bounds, options); -}; - - -/* - * L.Icon is an image-based icon class that you can use with L.Marker for custom markers. - */ - -L.Icon = L.Class.extend({ - options: { - /* - iconUrl: (String) (required) - iconRetinaUrl: (String) (optional, used for retina devices if detected) - iconSize: (Point) (can be set through CSS) - iconAnchor: (Point) (centered by default, can be set in CSS with negative margins) - popupAnchor: (Point) (if not specified, popup opens in the anchor point) - shadowUrl: (String) (no shadow by default) - shadowRetinaUrl: (String) (optional, used for retina devices if detected) - shadowSize: (Point) - shadowAnchor: (Point) - */ - className: '' - }, - - initialize: function (options) { - L.setOptions(this, options); - }, - - createIcon: function (oldIcon) { - return this._createIcon('icon', oldIcon); - }, - - createShadow: function (oldIcon) { - return this._createIcon('shadow', oldIcon); - }, - - _createIcon: function (name, oldIcon) { - var src = this._getIconUrl(name); - - if (!src) { - if (name === 'icon') { - throw new Error('iconUrl not set in Icon options (see the docs).'); - } - return null; - } - - var img; - if (!oldIcon || oldIcon.tagName !== 'IMG') { - img = this._createImg(src); - } else { - img = this._createImg(src, oldIcon); - } - this._setIconStyles(img, name); - - return img; - }, - - _setIconStyles: function (img, name) { - var options = this.options, - size = L.point(options[name + 'Size']), - anchor; - - if (name === 'shadow') { - anchor = L.point(options.shadowAnchor || options.iconAnchor); - } else { - anchor = L.point(options.iconAnchor); - } - - if (!anchor && size) { - anchor = size.divideBy(2, true); - } - - img.className = 'leaflet-marker-' + name + ' ' + options.className; - - if (anchor) { - img.style.marginLeft = (-anchor.x) + 'px'; - img.style.marginTop = (-anchor.y) + 'px'; - } - - if (size) { - img.style.width = size.x + 'px'; - img.style.height = size.y + 'px'; - } - }, - - _createImg: function (src, el) { - el = el || document.createElement('img'); - el.src = src; - return el; - }, - - _getIconUrl: function (name) { - if (L.Browser.retina && this.options[name + 'RetinaUrl']) { - return this.options[name + 'RetinaUrl']; - } - return this.options[name + 'Url']; - } -}); - -L.icon = function (options) { - return new L.Icon(options); -}; - - -/* - * L.Icon.Default is the blue marker icon used by default in Leaflet. - */ - -L.Icon.Default = L.Icon.extend({ - - options: { - iconSize: [25, 41], - iconAnchor: [12, 41], - popupAnchor: [1, -34], - - shadowSize: [41, 41] - }, - - _getIconUrl: function (name) { - var key = name + 'Url'; - - if (this.options[key]) { - return this.options[key]; - } - - if (L.Browser.retina && name === 'icon') { - name += '-2x'; - } - - var path = L.Icon.Default.imagePath; - - if (!path) { - throw new Error('Couldn\'t autodetect L.Icon.Default.imagePath, set it manually.'); - } - - return path + '/marker-' + name + '.png'; - } -}); - -L.Icon.Default.imagePath = (function () { - var scripts = document.getElementsByTagName('script'), - leafletRe = /[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/; - - var i, len, src, matches, path; - - for (i = 0, len = scripts.length; i < len; i++) { - src = scripts[i].src; - matches = src.match(leafletRe); - - if (matches) { - path = src.split(leafletRe)[0]; - return (path ? path + '/' : '') + 'images'; - } - } -}()); - - -/* - * L.Marker is used to display clickable/draggable icons on the map. - */ - -L.Marker = L.Class.extend({ - - includes: L.Mixin.Events, - - options: { - icon: new L.Icon.Default(), - title: '', - alt: '', - clickable: true, - draggable: false, - keyboard: true, - zIndexOffset: 0, - opacity: 1, - riseOnHover: false, - riseOffset: 250 - }, - - initialize: function (latlng, options) { - L.setOptions(this, options); - this._latlng = L.latLng(latlng); - }, - - onAdd: function (map) { - this._map = map; - - map.on('viewreset', this.update, this); - - this._initIcon(); - this.update(); - this.fire('add'); - - if (map.options.zoomAnimation && map.options.markerZoomAnimation) { - map.on('zoomanim', this._animateZoom, this); - } - }, - - addTo: function (map) { - map.addLayer(this); - return this; - }, - - onRemove: function (map) { - if (this.dragging) { - this.dragging.disable(); - } - - this._removeIcon(); - this._removeShadow(); - - this.fire('remove'); - - map.off({ - 'viewreset': this.update, - 'zoomanim': this._animateZoom - }, this); - - this._map = null; - }, - - getLatLng: function () { - return this._latlng; - }, - - setLatLng: function (latlng) { - this._latlng = L.latLng(latlng); - - this.update(); - - return this.fire('move', { latlng: this._latlng }); - }, - - setZIndexOffset: function (offset) { - this.options.zIndexOffset = offset; - this.update(); - - return this; - }, - - setIcon: function (icon) { - - this.options.icon = icon; - - if (this._map) { - this._initIcon(); - this.update(); - } - - if (this._popup) { - this.bindPopup(this._popup); - } - - return this; - }, - - update: function () { - if (this._icon) { - this._setPos(this._map.latLngToLayerPoint(this._latlng).round()); - } - return this; - }, - - _initIcon: function () { - var options = this.options, - map = this._map, - animation = (map.options.zoomAnimation && map.options.markerZoomAnimation), - classToAdd = animation ? 'leaflet-zoom-animated' : 'leaflet-zoom-hide'; - - var icon = options.icon.createIcon(this._icon), - addIcon = false; - - // if we're not reusing the icon, remove the old one and init new one - if (icon !== this._icon) { - if (this._icon) { - this._removeIcon(); - } - addIcon = true; - - if (options.title) { - icon.title = options.title; - } - - if (options.alt) { - icon.alt = options.alt; - } - } - - L.DomUtil.addClass(icon, classToAdd); - - if (options.keyboard) { - icon.tabIndex = '0'; - } - - this._icon = icon; - - this._initInteraction(); - - if (options.riseOnHover) { - L.DomEvent - .on(icon, 'mouseover', this._bringToFront, this) - .on(icon, 'mouseout', this._resetZIndex, this); - } - - var newShadow = options.icon.createShadow(this._shadow), - addShadow = false; - - if (newShadow !== this._shadow) { - this._removeShadow(); - addShadow = true; - } - - if (newShadow) { - L.DomUtil.addClass(newShadow, classToAdd); - } - this._shadow = newShadow; - - - if (options.opacity < 1) { - this._updateOpacity(); - } - - - var panes = this._map._panes; - - if (addIcon) { - panes.markerPane.appendChild(this._icon); - } - - if (newShadow && addShadow) { - panes.shadowPane.appendChild(this._shadow); - } - }, - - _removeIcon: function () { - if (this.options.riseOnHover) { - L.DomEvent - .off(this._icon, 'mouseover', this._bringToFront) - .off(this._icon, 'mouseout', this._resetZIndex); - } - - this._map._panes.markerPane.removeChild(this._icon); - - this._icon = null; - }, - - _removeShadow: function () { - if (this._shadow) { - this._map._panes.shadowPane.removeChild(this._shadow); - } - this._shadow = null; - }, - - _setPos: function (pos) { - L.DomUtil.setPosition(this._icon, pos); - - if (this._shadow) { - L.DomUtil.setPosition(this._shadow, pos); - } - - this._zIndex = pos.y + this.options.zIndexOffset; - - this._resetZIndex(); - }, - - _updateZIndex: function (offset) { - this._icon.style.zIndex = this._zIndex + offset; - }, - - _animateZoom: function (opt) { - var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center).round(); - - this._setPos(pos); - }, - - _initInteraction: function () { - - if (!this.options.clickable) { return; } - - // TODO refactor into something shared with Map/Path/etc. to DRY it up - - var icon = this._icon, - events = ['dblclick', 'mousedown', 'mouseover', 'mouseout', 'contextmenu']; - - L.DomUtil.addClass(icon, 'leaflet-clickable'); - L.DomEvent.on(icon, 'click', this._onMouseClick, this); - L.DomEvent.on(icon, 'keypress', this._onKeyPress, this); - - for (var i = 0; i < events.length; i++) { - L.DomEvent.on(icon, events[i], this._fireMouseEvent, this); - } - - if (L.Handler.MarkerDrag) { - this.dragging = new L.Handler.MarkerDrag(this); - - if (this.options.draggable) { - this.dragging.enable(); - } - } - }, - - _onMouseClick: function (e) { - var wasDragged = this.dragging && this.dragging.moved(); - - if (this.hasEventListeners(e.type) || wasDragged) { - L.DomEvent.stopPropagation(e); - } - - if (wasDragged) { return; } - - if ((!this.dragging || !this.dragging._enabled) && this._map.dragging && this._map.dragging.moved()) { return; } - - this.fire(e.type, { - originalEvent: e, - latlng: this._latlng - }); - }, - - _onKeyPress: function (e) { - if (e.keyCode === 13) { - this.fire('click', { - originalEvent: e, - latlng: this._latlng - }); - } - }, - - _fireMouseEvent: function (e) { - - this.fire(e.type, { - originalEvent: e, - latlng: this._latlng - }); - - // TODO proper custom event propagation - // this line will always be called if marker is in a FeatureGroup - if (e.type === 'contextmenu' && this.hasEventListeners(e.type)) { - L.DomEvent.preventDefault(e); - } - if (e.type !== 'mousedown') { - L.DomEvent.stopPropagation(e); - } else { - L.DomEvent.preventDefault(e); - } - }, - - setOpacity: function (opacity) { - this.options.opacity = opacity; - if (this._map) { - this._updateOpacity(); - } - - return this; - }, - - _updateOpacity: function () { - L.DomUtil.setOpacity(this._icon, this.options.opacity); - if (this._shadow) { - L.DomUtil.setOpacity(this._shadow, this.options.opacity); - } - }, - - _bringToFront: function () { - this._updateZIndex(this.options.riseOffset); - }, - - _resetZIndex: function () { - this._updateZIndex(0); - } -}); - -L.marker = function (latlng, options) { - return new L.Marker(latlng, options); -}; - - -/* - * L.DivIcon is a lightweight HTML-based icon class (as opposed to the image-based L.Icon) - * to use with L.Marker. - */ - -L.DivIcon = L.Icon.extend({ - options: { - iconSize: [12, 12], // also can be set through CSS - /* - iconAnchor: (Point) - popupAnchor: (Point) - html: (String) - bgPos: (Point) - */ - className: 'leaflet-div-icon', - html: false - }, - - createIcon: function (oldIcon) { - var div = (oldIcon && oldIcon.tagName === 'DIV') ? oldIcon : document.createElement('div'), - options = this.options; - - if (options.html !== false) { - div.innerHTML = options.html; - } else { - div.innerHTML = ''; - } - - if (options.bgPos) { - div.style.backgroundPosition = - (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px'; - } - - this._setIconStyles(div, 'icon'); - return div; - }, - - createShadow: function () { - return null; - } -}); - -L.divIcon = function (options) { - return new L.DivIcon(options); -}; - - -/* - * L.Popup is used for displaying popups on the map. - */ - -L.Map.mergeOptions({ - closePopupOnClick: true -}); - -L.Popup = L.Class.extend({ - includes: L.Mixin.Events, - - options: { - minWidth: 50, - maxWidth: 300, - // maxHeight: null, - autoPan: true, - closeButton: true, - offset: [0, 7], - autoPanPadding: [5, 5], - // autoPanPaddingTopLeft: null, - // autoPanPaddingBottomRight: null, - keepInView: false, - className: '', - zoomAnimation: true - }, - - initialize: function (options, source) { - L.setOptions(this, options); - - this._source = source; - this._animated = L.Browser.any3d && this.options.zoomAnimation; - this._isOpen = false; - }, - - onAdd: function (map) { - this._map = map; - - if (!this._container) { - this._initLayout(); - } - - var animFade = map.options.fadeAnimation; - - if (animFade) { - L.DomUtil.setOpacity(this._container, 0); - } - map._panes.popupPane.appendChild(this._container); - - map.on(this._getEvents(), this); - - this.update(); - - if (animFade) { - L.DomUtil.setOpacity(this._container, 1); - } - - this.fire('open'); - - map.fire('popupopen', {popup: this}); - - if (this._source) { - this._source.fire('popupopen', {popup: this}); - } - }, - - addTo: function (map) { - map.addLayer(this); - return this; - }, - - openOn: function (map) { - map.openPopup(this); - return this; - }, - - onRemove: function (map) { - map._panes.popupPane.removeChild(this._container); - - L.Util.falseFn(this._container.offsetWidth); // force reflow - - map.off(this._getEvents(), this); - - if (map.options.fadeAnimation) { - L.DomUtil.setOpacity(this._container, 0); - } - - this._map = null; - - this.fire('close'); - - map.fire('popupclose', {popup: this}); - - if (this._source) { - this._source.fire('popupclose', {popup: this}); - } - }, - - getLatLng: function () { - return this._latlng; - }, - - setLatLng: function (latlng) { - this._latlng = L.latLng(latlng); - if (this._map) { - this._updatePosition(); - this._adjustPan(); - } - return this; - }, - - getContent: function () { - return this._content; - }, - - setContent: function (content) { - this._content = content; - this.update(); - return this; - }, - - update: function () { - if (!this._map) { return; } - - this._container.style.visibility = 'hidden'; - - this._updateContent(); - this._updateLayout(); - this._updatePosition(); - - this._container.style.visibility = ''; - - this._adjustPan(); - }, - - _getEvents: function () { - var events = { - viewreset: this._updatePosition - }; - - if (this._animated) { - events.zoomanim = this._zoomAnimation; - } - if ('closeOnClick' in this.options ? this.options.closeOnClick : this._map.options.closePopupOnClick) { - events.preclick = this._close; - } - if (this.options.keepInView) { - events.moveend = this._adjustPan; - } - - return events; - }, - - _close: function () { - if (this._map) { - this._map.closePopup(this); - } - }, - - _initLayout: function () { - var prefix = 'leaflet-popup', - containerClass = prefix + ' ' + this.options.className + ' leaflet-zoom-' + - (this._animated ? 'animated' : 'hide'), - container = this._container = L.DomUtil.create('div', containerClass), - closeButton; - - if (this.options.closeButton) { - closeButton = this._closeButton = - L.DomUtil.create('a', prefix + '-close-button', container); - closeButton.href = '#close'; - closeButton.innerHTML = '×'; - L.DomEvent.disableClickPropagation(closeButton); - - L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this); - } - - var wrapper = this._wrapper = - L.DomUtil.create('div', prefix + '-content-wrapper', container); - L.DomEvent.disableClickPropagation(wrapper); - - this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper); - - L.DomEvent.disableScrollPropagation(this._contentNode); - L.DomEvent.on(wrapper, 'contextmenu', L.DomEvent.stopPropagation); - - this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container); - this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer); - }, - - _updateContent: function () { - if (!this._content) { return; } - - if (typeof this._content === 'string') { - this._contentNode.innerHTML = this._content; - } else { - while (this._contentNode.hasChildNodes()) { - this._contentNode.removeChild(this._contentNode.firstChild); - } - this._contentNode.appendChild(this._content); - } - this.fire('contentupdate'); - }, - - _updateLayout: function () { - var container = this._contentNode, - style = container.style; - - style.width = ''; - style.whiteSpace = 'nowrap'; - - var width = container.offsetWidth; - width = Math.min(width, this.options.maxWidth); - width = Math.max(width, this.options.minWidth); - - style.width = (width + 1) + 'px'; - style.whiteSpace = ''; - - style.height = ''; - - var height = container.offsetHeight, - maxHeight = this.options.maxHeight, - scrolledClass = 'leaflet-popup-scrolled'; - - if (maxHeight && height > maxHeight) { - style.height = maxHeight + 'px'; - L.DomUtil.addClass(container, scrolledClass); - } else { - L.DomUtil.removeClass(container, scrolledClass); - } - - this._containerWidth = this._container.offsetWidth; - }, - - _updatePosition: function () { - if (!this._map) { return; } - - var pos = this._map.latLngToLayerPoint(this._latlng), - animated = this._animated, - offset = L.point(this.options.offset); - - if (animated) { - L.DomUtil.setPosition(this._container, pos); - } - - this._containerBottom = -offset.y - (animated ? 0 : pos.y); - this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x + (animated ? 0 : pos.x); - - // bottom position the popup in case the height of the popup changes (images loading etc) - this._container.style.bottom = this._containerBottom + 'px'; - this._container.style.left = this._containerLeft + 'px'; - }, - - _zoomAnimation: function (opt) { - var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center); - - L.DomUtil.setPosition(this._container, pos); - }, - - _adjustPan: function () { - if (!this.options.autoPan) { return; } - - var map = this._map, - containerHeight = this._container.offsetHeight, - containerWidth = this._containerWidth, - - layerPos = new L.Point(this._containerLeft, -containerHeight - this._containerBottom); - - if (this._animated) { - layerPos._add(L.DomUtil.getPosition(this._container)); - } - - var containerPos = map.layerPointToContainerPoint(layerPos), - padding = L.point(this.options.autoPanPadding), - paddingTL = L.point(this.options.autoPanPaddingTopLeft || padding), - paddingBR = L.point(this.options.autoPanPaddingBottomRight || padding), - size = map.getSize(), - dx = 0, - dy = 0; - - if (containerPos.x + containerWidth + paddingBR.x > size.x) { // right - dx = containerPos.x + containerWidth - size.x + paddingBR.x; - } - if (containerPos.x - dx - paddingTL.x < 0) { // left - dx = containerPos.x - paddingTL.x; - } - if (containerPos.y + containerHeight + paddingBR.y > size.y) { // bottom - dy = containerPos.y + containerHeight - size.y + paddingBR.y; - } - if (containerPos.y - dy - paddingTL.y < 0) { // top - dy = containerPos.y - paddingTL.y; - } - - if (dx || dy) { - map - .fire('autopanstart') - .panBy([dx, dy]); - } - }, - - _onCloseButtonClick: function (e) { - this._close(); - L.DomEvent.stop(e); - } -}); - -L.popup = function (options, source) { - return new L.Popup(options, source); -}; - - -L.Map.include({ - openPopup: function (popup, latlng, options) { // (Popup) or (String || HTMLElement, LatLng[, Object]) - this.closePopup(); - - if (!(popup instanceof L.Popup)) { - var content = popup; - - popup = new L.Popup(options) - .setLatLng(latlng) - .setContent(content); - } - popup._isOpen = true; - - this._popup = popup; - return this.addLayer(popup); - }, - - closePopup: function (popup) { - if (!popup || popup === this._popup) { - popup = this._popup; - this._popup = null; - } - if (popup) { - this.removeLayer(popup); - popup._isOpen = false; - } - return this; - } -}); - - -/* - * Popup extension to L.Marker, adding popup-related methods. - */ - -L.Marker.include({ - openPopup: function () { - if (this._popup && this._map && !this._map.hasLayer(this._popup)) { - this._popup.setLatLng(this._latlng); - this._map.openPopup(this._popup); - } - - return this; - }, - - closePopup: function () { - if (this._popup) { - this._popup._close(); - } - return this; - }, - - togglePopup: function () { - if (this._popup) { - if (this._popup._isOpen) { - this.closePopup(); - } else { - this.openPopup(); - } - } - return this; - }, - - bindPopup: function (content, options) { - var anchor = L.point(this.options.icon.options.popupAnchor || [0, 0]); - - anchor = anchor.add(L.Popup.prototype.options.offset); - - if (options && options.offset) { - anchor = anchor.add(options.offset); - } - - options = L.extend({offset: anchor}, options); - - if (!this._popupHandlersAdded) { - this - .on('click', this.togglePopup, this) - .on('remove', this.closePopup, this) - .on('move', this._movePopup, this); - this._popupHandlersAdded = true; - } - - if (content instanceof L.Popup) { - L.setOptions(content, options); - this._popup = content; - content._source = this; - } else { - this._popup = new L.Popup(options, this) - .setContent(content); - } - - return this; - }, - - setPopupContent: function (content) { - if (this._popup) { - this._popup.setContent(content); - } - return this; - }, - - unbindPopup: function () { - if (this._popup) { - this._popup = null; - this - .off('click', this.togglePopup, this) - .off('remove', this.closePopup, this) - .off('move', this._movePopup, this); - this._popupHandlersAdded = false; - } - return this; - }, - - getPopup: function () { - return this._popup; - }, - - _movePopup: function (e) { - this._popup.setLatLng(e.latlng); - } -}); - - -/* - * L.LayerGroup is a class to combine several layers into one so that - * you can manipulate the group (e.g. add/remove it) as one layer. - */ - -L.LayerGroup = L.Class.extend({ - initialize: function (layers) { - this._layers = {}; - - var i, len; - - if (layers) { - for (i = 0, len = layers.length; i < len; i++) { - this.addLayer(layers[i]); - } - } - }, - - addLayer: function (layer) { - var id = this.getLayerId(layer); - - this._layers[id] = layer; - - if (this._map) { - this._map.addLayer(layer); - } - - return this; - }, - - removeLayer: function (layer) { - var id = layer in this._layers ? layer : this.getLayerId(layer); - - if (this._map && this._layers[id]) { - this._map.removeLayer(this._layers[id]); - } - - delete this._layers[id]; - - return this; - }, - - hasLayer: function (layer) { - if (!layer) { return false; } - - return (layer in this._layers || this.getLayerId(layer) in this._layers); - }, - - clearLayers: function () { - this.eachLayer(this.removeLayer, this); - return this; - }, - - invoke: function (methodName) { - var args = Array.prototype.slice.call(arguments, 1), - i, layer; - - for (i in this._layers) { - layer = this._layers[i]; - - if (layer[methodName]) { - layer[methodName].apply(layer, args); - } - } - - return this; - }, - - onAdd: function (map) { - this._map = map; - this.eachLayer(map.addLayer, map); - }, - - onRemove: function (map) { - this.eachLayer(map.removeLayer, map); - this._map = null; - }, - - addTo: function (map) { - map.addLayer(this); - return this; - }, - - eachLayer: function (method, context) { - for (var i in this._layers) { - method.call(context, this._layers[i]); - } - return this; - }, - - getLayer: function (id) { - return this._layers[id]; - }, - - getLayers: function () { - var layers = []; - - for (var i in this._layers) { - layers.push(this._layers[i]); - } - return layers; - }, - - setZIndex: function (zIndex) { - return this.invoke('setZIndex', zIndex); - }, - - getLayerId: function (layer) { - return L.stamp(layer); - } -}); - -L.layerGroup = function (layers) { - return new L.LayerGroup(layers); -}; - - -/* - * L.FeatureGroup extends L.LayerGroup by introducing mouse events and additional methods - * shared between a group of interactive layers (like vectors or markers). - */ - -L.FeatureGroup = L.LayerGroup.extend({ - includes: L.Mixin.Events, - - statics: { - EVENTS: 'click dblclick mouseover mouseout mousemove contextmenu popupopen popupclose' - }, - - addLayer: function (layer) { - if (this.hasLayer(layer)) { - return this; - } - - if ('on' in layer) { - layer.on(L.FeatureGroup.EVENTS, this._propagateEvent, this); - } - - L.LayerGroup.prototype.addLayer.call(this, layer); - - if (this._popupContent && layer.bindPopup) { - layer.bindPopup(this._popupContent, this._popupOptions); - } - - return this.fire('layeradd', {layer: layer}); - }, - - removeLayer: function (layer) { - if (!this.hasLayer(layer)) { - return this; - } - if (layer in this._layers) { - layer = this._layers[layer]; - } - - if ('off' in layer) { - layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this); - } - - L.LayerGroup.prototype.removeLayer.call(this, layer); - - if (this._popupContent) { - this.invoke('unbindPopup'); - } - - return this.fire('layerremove', {layer: layer}); - }, - - bindPopup: function (content, options) { - this._popupContent = content; - this._popupOptions = options; - return this.invoke('bindPopup', content, options); - }, - - openPopup: function (latlng) { - // open popup on the first layer - for (var id in this._layers) { - this._layers[id].openPopup(latlng); - break; - } - return this; - }, - - setStyle: function (style) { - return this.invoke('setStyle', style); - }, - - bringToFront: function () { - return this.invoke('bringToFront'); - }, - - bringToBack: function () { - return this.invoke('bringToBack'); - }, - - getBounds: function () { - var bounds = new L.LatLngBounds(); - - this.eachLayer(function (layer) { - bounds.extend(layer instanceof L.Marker ? layer.getLatLng() : layer.getBounds()); - }); - - return bounds; - }, - - _propagateEvent: function (e) { - e = L.extend({ - layer: e.target, - target: this - }, e); - this.fire(e.type, e); - } -}); - -L.featureGroup = function (layers) { - return new L.FeatureGroup(layers); -}; - - -/* - * L.Path is a base class for rendering vector paths on a map. Inherited by Polyline, Circle, etc. - */ - -L.Path = L.Class.extend({ - includes: [L.Mixin.Events], - - statics: { - // how much to extend the clip area around the map view - // (relative to its size, e.g. 0.5 is half the screen in each direction) - // set it so that SVG element doesn't exceed 1280px (vectors flicker on dragend if it is) - CLIP_PADDING: (function () { - var max = L.Browser.mobile ? 1280 : 2000, - target = (max / Math.max(window.outerWidth, window.outerHeight) - 1) / 2; - return Math.max(0, Math.min(0.5, target)); - })() - }, - - options: { - stroke: true, - color: '#0033ff', - dashArray: null, - lineCap: null, - lineJoin: null, - weight: 5, - opacity: 0.5, - - fill: false, - fillColor: null, //same as color by default - fillOpacity: 0.2, - - clickable: true - }, - - initialize: function (options) { - L.setOptions(this, options); - }, - - onAdd: function (map) { - this._map = map; - - if (!this._container) { - this._initElements(); - this._initEvents(); - } - - this.projectLatlngs(); - this._updatePath(); - - if (this._container) { - this._map._pathRoot.appendChild(this._container); - } - - this.fire('add'); - - map.on({ - 'viewreset': this.projectLatlngs, - 'moveend': this._updatePath - }, this); - }, - - addTo: function (map) { - map.addLayer(this); - return this; - }, - - onRemove: function (map) { - map._pathRoot.removeChild(this._container); - - // Need to fire remove event before we set _map to null as the event hooks might need the object - this.fire('remove'); - this._map = null; - - if (L.Browser.vml) { - this._container = null; - this._stroke = null; - this._fill = null; - } - - map.off({ - 'viewreset': this.projectLatlngs, - 'moveend': this._updatePath - }, this); - }, - - projectLatlngs: function () { - // do all projection stuff here - }, - - setStyle: function (style) { - L.setOptions(this, style); - - if (this._container) { - this._updateStyle(); - } - - return this; - }, - - redraw: function () { - if (this._map) { - this.projectLatlngs(); - this._updatePath(); - } - return this; - } -}); - -L.Map.include({ - _updatePathViewport: function () { - var p = L.Path.CLIP_PADDING, - size = this.getSize(), - panePos = L.DomUtil.getPosition(this._mapPane), - min = panePos.multiplyBy(-1)._subtract(size.multiplyBy(p)._round()), - max = min.add(size.multiplyBy(1 + p * 2)._round()); - - this._pathViewport = new L.Bounds(min, max); - } -}); - - -/* - * Extends L.Path with SVG-specific rendering code. - */ - -L.Path.SVG_NS = 'http://www.w3.org/2000/svg'; - -L.Browser.svg = !!(document.createElementNS && document.createElementNS(L.Path.SVG_NS, 'svg').createSVGRect); - -L.Path = L.Path.extend({ - statics: { - SVG: L.Browser.svg - }, - - bringToFront: function () { - var root = this._map._pathRoot, - path = this._container; - - if (path && root.lastChild !== path) { - root.appendChild(path); - } - return this; - }, - - bringToBack: function () { - var root = this._map._pathRoot, - path = this._container, - first = root.firstChild; - - if (path && first !== path) { - root.insertBefore(path, first); - } - return this; - }, - - getPathString: function () { - // form path string here - }, - - _createElement: function (name) { - return document.createElementNS(L.Path.SVG_NS, name); - }, - - _initElements: function () { - this._map._initPathRoot(); - this._initPath(); - this._initStyle(); - }, - - _initPath: function () { - this._container = this._createElement('g'); - - this._path = this._createElement('path'); - - if (this.options.className) { - L.DomUtil.addClass(this._path, this.options.className); - } - - this._container.appendChild(this._path); - }, - - _initStyle: function () { - if (this.options.stroke) { - this._path.setAttribute('stroke-linejoin', 'round'); - this._path.setAttribute('stroke-linecap', 'round'); - } - if (this.options.fill) { - this._path.setAttribute('fill-rule', 'evenodd'); - } - if (this.options.pointerEvents) { - this._path.setAttribute('pointer-events', this.options.pointerEvents); - } - if (!this.options.clickable && !this.options.pointerEvents) { - this._path.setAttribute('pointer-events', 'none'); - } - this._updateStyle(); - }, - - _updateStyle: function () { - if (this.options.stroke) { - this._path.setAttribute('stroke', this.options.color); - this._path.setAttribute('stroke-opacity', this.options.opacity); - this._path.setAttribute('stroke-width', this.options.weight); - if (this.options.dashArray) { - this._path.setAttribute('stroke-dasharray', this.options.dashArray); - } else { - this._path.removeAttribute('stroke-dasharray'); - } - if (this.options.lineCap) { - this._path.setAttribute('stroke-linecap', this.options.lineCap); - } - if (this.options.lineJoin) { - this._path.setAttribute('stroke-linejoin', this.options.lineJoin); - } - } else { - this._path.setAttribute('stroke', 'none'); - } - if (this.options.fill) { - this._path.setAttribute('fill', this.options.fillColor || this.options.color); - this._path.setAttribute('fill-opacity', this.options.fillOpacity); - } else { - this._path.setAttribute('fill', 'none'); - } - }, - - _updatePath: function () { - var str = this.getPathString(); - if (!str) { - // fix webkit empty string parsing bug - str = 'M0 0'; - } - this._path.setAttribute('d', str); - }, - - // TODO remove duplication with L.Map - _initEvents: function () { - if (this.options.clickable) { - if (L.Browser.svg || !L.Browser.vml) { - L.DomUtil.addClass(this._path, 'leaflet-clickable'); - } - - L.DomEvent.on(this._container, 'click', this._onMouseClick, this); - - var events = ['dblclick', 'mousedown', 'mouseover', - 'mouseout', 'mousemove', 'contextmenu']; - for (var i = 0; i < events.length; i++) { - L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this); - } - } - }, - - _onMouseClick: function (e) { - if (this._map.dragging && this._map.dragging.moved()) { return; } - - this._fireMouseEvent(e); - }, - - _fireMouseEvent: function (e) { - if (!this._map || !this.hasEventListeners(e.type)) { return; } - - var map = this._map, - containerPoint = map.mouseEventToContainerPoint(e), - layerPoint = map.containerPointToLayerPoint(containerPoint), - latlng = map.layerPointToLatLng(layerPoint); - - this.fire(e.type, { - latlng: latlng, - layerPoint: layerPoint, - containerPoint: containerPoint, - originalEvent: e - }); - - if (e.type === 'contextmenu') { - L.DomEvent.preventDefault(e); - } - if (e.type !== 'mousemove') { - L.DomEvent.stopPropagation(e); - } - } -}); - -L.Map.include({ - _initPathRoot: function () { - if (!this._pathRoot) { - this._pathRoot = L.Path.prototype._createElement('svg'); - this._panes.overlayPane.appendChild(this._pathRoot); - - if (this.options.zoomAnimation && L.Browser.any3d) { - L.DomUtil.addClass(this._pathRoot, 'leaflet-zoom-animated'); - - this.on({ - 'zoomanim': this._animatePathZoom, - 'zoomend': this._endPathZoom - }); - } else { - L.DomUtil.addClass(this._pathRoot, 'leaflet-zoom-hide'); - } - - this.on('moveend', this._updateSvgViewport); - this._updateSvgViewport(); - } - }, - - _animatePathZoom: function (e) { - var scale = this.getZoomScale(e.zoom), - offset = this._getCenterOffset(e.center)._multiplyBy(-scale)._add(this._pathViewport.min); - - this._pathRoot.style[L.DomUtil.TRANSFORM] = - L.DomUtil.getTranslateString(offset) + ' scale(' + scale + ') '; - - this._pathZooming = true; - }, - - _endPathZoom: function () { - this._pathZooming = false; - }, - - _updateSvgViewport: function () { - - if (this._pathZooming) { - // Do not update SVGs while a zoom animation is going on otherwise the animation will break. - // When the zoom animation ends we will be updated again anyway - // This fixes the case where you do a momentum move and zoom while the move is still ongoing. - return; - } - - this._updatePathViewport(); - - var vp = this._pathViewport, - min = vp.min, - max = vp.max, - width = max.x - min.x, - height = max.y - min.y, - root = this._pathRoot, - pane = this._panes.overlayPane; - - // Hack to make flicker on drag end on mobile webkit less irritating - if (L.Browser.mobileWebkit) { - pane.removeChild(root); - } - - L.DomUtil.setPosition(root, min); - root.setAttribute('width', width); - root.setAttribute('height', height); - root.setAttribute('viewBox', [min.x, min.y, width, height].join(' ')); - - if (L.Browser.mobileWebkit) { - pane.appendChild(root); - } - } -}); - - -/* - * Popup extension to L.Path (polylines, polygons, circles), adding popup-related methods. - */ - -L.Path.include({ - - bindPopup: function (content, options) { - - if (content instanceof L.Popup) { - this._popup = content; - } else { - if (!this._popup || options) { - this._popup = new L.Popup(options, this); - } - this._popup.setContent(content); - } - - if (!this._popupHandlersAdded) { - this - .on('click', this._openPopup, this) - .on('remove', this.closePopup, this); - - this._popupHandlersAdded = true; - } - - return this; - }, - - unbindPopup: function () { - if (this._popup) { - this._popup = null; - this - .off('click', this._openPopup) - .off('remove', this.closePopup); - - this._popupHandlersAdded = false; - } - return this; - }, - - openPopup: function (latlng) { - - if (this._popup) { - // open the popup from one of the path's points if not specified - latlng = latlng || this._latlng || - this._latlngs[Math.floor(this._latlngs.length / 2)]; - - this._openPopup({latlng: latlng}); - } - - return this; - }, - - closePopup: function () { - if (this._popup) { - this._popup._close(); - } - return this; - }, - - _openPopup: function (e) { - this._popup.setLatLng(e.latlng); - this._map.openPopup(this._popup); - } -}); - - -/* - * Vector rendering for IE6-8 through VML. - * Thanks to Dmitry Baranovsky and his Raphael library for inspiration! - */ - -L.Browser.vml = !L.Browser.svg && (function () { - try { - var div = document.createElement('div'); - div.innerHTML = '