Skip to content

Commit 5b85b0f

Browse files
committed
[fix] Wot Map: disable bound filtering
1 parent 9cec083 commit 5b85b0f

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

www/plugins/map/js/controllers/wot-controllers.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ function MapWotViewController($scope, $filter, $templateCache, $interpolate, $ti
8282
};
8383

8484
$scope.loading = true;
85+
$scope.loadingMarker = true;
8586
$scope.mapId = 'map-wot-' + $scope.$id;
8687

8788
$scope.map = MapUtils.map({
@@ -130,8 +131,6 @@ function MapWotViewController($scope, $filter, $templateCache, $interpolate, $ti
130131

131132
if ($scope.loading) {
132133

133-
// $translate.get('')
134-
//$ionicBackdrop.retain();
135134
UIUtils.loading.show({
136135
noBackdrop: true // avoid a too long release
137136
});
@@ -308,8 +307,9 @@ function MapWotViewController($scope, $filter, $templateCache, $interpolate, $ti
308307

309308
// add bounding box
310309
if ($scope.map.bounds) {
311-
options.bounds = angular.copy($scope.map.bounds);
312-
delete options.bounds.options;
310+
// FIXME - this is not working well
311+
//options.bounds = angular.copy($scope.map.bounds);
312+
//delete options.bounds.options;
313313
}
314314

315315
// Load wot data, from service
@@ -338,15 +338,15 @@ function MapWotViewController($scope, $filter, $templateCache, $interpolate, $ti
338338
lat: hit.geoPoint.lat,
339339
lng: hit.geoPoint.lon,
340340
getMessageScope: function () {
341-
$scope.loading = true;
341+
$scope.loadingMarker = true;
342342
$scope.$applyAsync(function() {
343343
$scope.formData = {
344344
pubkey: hit.pubkey,
345345
uid: hit.uid,
346346
name: hit.name,
347347
profile: hit
348348
};
349-
$scope.loading = false;
349+
$scope.loadingMarker = false;
350350
});
351351
return $scope;
352352
},

www/plugins/map/templates/wot/popup_marker.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
<div class="item no-border no-padding item-avatar "
3-
ng-if="loading">
3+
ng-if="loadingMarker">
44

55
<i class="item-image icon ion-person"></i>
66

@@ -18,7 +18,7 @@ <h4 class="stable-bg col-50">
1818
</div>
1919

2020
<a class="item no-border no-padding item-avatar ink animate-fade-in animate-show-hide ng-hide"
21-
ng-show="!loading"
21+
ng-show="!loadingMarker"
2222
ui-sref="app.wot_identity({pubkey: formData.pubkey, uid: formData.uid})">
2323

2424
<i ng-if="formData.avatar" class="item-image avatar" style="background-image: url({{::formData.avatar.src}})"></i>
@@ -52,7 +52,7 @@ <h4 ng-if="formData.profile.city" class="gray" title="{{formData.profile.city}}"
5252
ng-class="{'ion-arrow-down-b': !showDescription, 'ion-arrow-up-b': showDescription}"
5353
ng-click="showDescription=!showDescription;"
5454
title="{{'PROFILE.DESCRIPTION'|translate}}"
55-
ng-show="!loading && formData.profile.description">
55+
ng-show="!loadingMarker && formData.profile.description">
5656
&nbsp;
5757
</a>
5858
</div>

0 commit comments

Comments
 (0)