update to version 1.6.5

.meteor/versions

@@ -58,28 +58,28 @@ iron:[email protected]
 iron:[email protected]
 [email protected]
 juliancwirko:[email protected]
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
-keplerjs:[email protected].4
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
+keplerjs:[email protected].5
 kidovate:[email protected]
 konecty:[email protected]
 [email protected]

CHANGELOG.md

@@ -3,6 +3,10 @@
 [Downloadable releases](https://github.com/Keplerjs/Kepler/releases)
 
 ## Next version
+...
+
+## v1.6.5
+- new tab in panel place show nearby places
 - replace lib verron:autosize with npm version
 - plugin cats fix K.Util.sanitize.catName
 - plugin cats fica removeCat
@@ -14,6 +18,7 @@
 - plugin admin move urls under /admin
 - plugin convers move autoresize lib in core lib
 - map zoom dblclick
+- new tab tabPlace_ui_nearby
 
 ## v1.6.4
 - fix map markers glich

package.json

@@ -1,6 +1,6 @@
 {
   "name": "keplerjs",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "The open source full-stack geosocial network platform",
   "repository": {
     "type": "git",

packages/admin/package.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 
 Package.describe({
   version: version,

packages/api/package.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 
 Package.describe({
   version: version,

packages/base/package.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 
 Package.describe({
   version: version,

packages/categories/package.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 
 Package.describe({
   version: version,

packages/convers/package.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 
 Package.describe({
   version: version,

packages/core-ui/client/views/items/place.js

@@ -12,7 +12,7 @@ Template.place_btn_checkin.events({
 
 Template.place_btns.events({
 	'click .place-btn-map': function(e, tmpl) {
-		e.preventDefault()
+		e.preventDefault();
 		this.showLoc();
 	}
 });

packages/core-ui/client/views/panels/place.html

@@ -109,6 +109,8 @@ <h4 class="pull-left">
 			{{/each}}
 		</ul>		
 	{{else}}
-		<label class="text-gray">{{i18n 'label.nohistplace'}}</label>
+		<label class="text-gray">{{i18n 'label_notfound'}}</label>
 	{{/if}}
-</template>
+</template>
+
+

packages/core-ui/client/views/panels/place.js

@@ -0,0 +1,11 @@
+
+/*
+//TODO fix auto close sidebar before uncomment
+when click on popupt title sidebar not shown
+
+Template.panelPlace_ui_btns.events({
+	'click .place-btn-map': function(e, tmpl) {
+		e.preventDefault();
+		tmpl.data.showLoc();
+	}
+});*/

packages/core-ui/client/views/panels/place/nearby.html

@@ -0,0 +1,23 @@
+
+<template name="tabPlace_ui_nearby">
+
+	<div class="list-group">
+		<div class="list-group-item active">
+			{{i18n 'label_nearplaces'}}
+		</div>
+		{{#if getNearbyList.length}}
+		<ul class="list-group">
+			{{#each getNearbyList}}
+			<li class="list-group-item">
+				{{> item_place_search}}
+			</li>
+			{{/each}}
+		</ul>
+		{{else}}
+			<a class="list-group-item panel-btn-nearbyList" href="#">
+				<i class="icon icon-places"></i> {{i18n 'label_nearplaces'}}
+			</a>
+		{{/if}}
+	</div>
+
+</template>

packages/core-ui/client/views/panels/place/nearby.js

@@ -0,0 +1,39 @@
+
+Template.tabPlace_ui_nearby.onCreated(function() {
+	this.nearbyList = new ReactiveVar([]);
+});
+
+Template.tabPlace_ui_nearby.helpers({
+	getNearbyList: function() {
+		return Template.instance().nearbyList.get();
+	}
+});
+
+
+Template.tabPlace_ui_nearby.events({
+	'click .panel-btn-nearbyList': function(e, tmpl) {
+
+		var icon$ = $(e.target).find('.icon');
+		$(e.target).addClass('disabled');
+		icon$.addClass('icon-loader');
+
+		Meteor.subscribe('placesByNearby', tmpl.data.loc, function() {
+			$(e.target).removeClass('disabled');
+			icon$.removeClass('icon-loader');
+
+			var places = K.findPlacesByNearby(tmpl.data.loc, 5000).fetch();
+
+			places = _.filter(places, function(p) {
+				return p._id !== tmpl.data._id;
+			});
+
+			places = _.first(places, 5);
+
+			places = _.map(places, function(place) {
+				return K.placeById(place._id);
+			});
+
+			tmpl.nearbyList.set(places);
+		});
+	}
+});

packages/core-ui/client/views/panels/user/friends.html

@@ -14,7 +14,7 @@
 			{{/each}}
 		</ul>
 	{{else}}
-		<label class="text-gray"><i>{{i18n 'label_nofriendscomm'}}</i></label>
+		<label class="text-gray"><i>{{i18n 'label_notfound'}}</i></label>
 	{{/if}}
 
 	{{#if isFriend}}

packages/core-ui/client/views/panels/user/histuser.html

@@ -12,6 +12,6 @@
 			{{/each}}
 		</ul>
 	{{else}}
-		<label class="text-gray"><i>{{i18n 'label_nohist'}}</i></label>
+		<label class="text-gray"><i>{{i18n 'label_notfound'}}</i></label>
 	{{/if}}
 </template>

packages/core-ui/package.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 
 Package.describe({
   version: version,
@@ -41,30 +41,39 @@ Package.onUse(function(api) {
     'client/stylesheets/popups.css',
     'client/stylesheets/scrollbars.css',
     'client/stylesheets/sidebar.css',
+
     'client/views/btnConnect.html',
     'client/views/btnConnect.js',
     'client/views/errors.html',
     'client/views/footer.html',
     'client/views/formLogin.html',
     'client/views/formLogin.js',
     'client/views/header.html',
-    'client/views/items/place.html',
-    'client/views/items/place.js',
-    'client/views/items/user.html',
     'client/views/loaders.html',
     'client/views/markers.html',
     'client/views/navSidebar.html',
+
+    'client/views/items/place.html',
+    'client/views/items/place.js',
+    'client/views/items/user.html',
+
     'client/views/panels/friends.html',
     'client/views/panels/friends.js',
     'client/views/panels/panelList.html',
     'client/views/panels/panelList.js',
+
     'client/views/panels/place.html',
+    'client/views/panels/place.js',
+    'client/views/panels/place/nearby.html',
+    'client/views/panels/place/nearby.js',
+
     'client/views/panels/places.html',
     'client/views/panels/places.js',
     'client/views/panels/profile.html',
     'client/views/panels/search.html',
     'client/views/panels/search.js',
     'client/views/panels/settings.html',
+
     'client/views/panels/user.html',
     'client/views/panels/user.js',
     'client/views/panels/user/friends.html',

packages/core-ui/settings.js

@@ -4,6 +4,8 @@ Kepler.settings.public.templates = {
 	//TODO refact.. templates without placeholder
 	"tabPlace_ui_info": { "show": true},
 	"tabPlace_ui_hist": { "show": true},
+	"tabPlace_ui_nearby": { "show": true, order:-10},
+
 	"tabUser_ui_info": { "show": true},
 	"tabUser_ui_friends": { "show": true},
 	"tabUser_ui_hist": { "show": true},
@@ -36,11 +38,11 @@ Kepler.settings.public.templates = {
 	},
 	"panelPlace": {
 		"panelPlace_ui_btn_checkin": { order:-10 },
-		"panelPlace_ui_btns": { order:-10 },
-		"panelPlace_ui_info": { order:-10 }
+		"panelPlace_ui_btns": { order:-10 }
 	},
 	"tabPlace": {
-		"tabPlace_ui_info": { order:-10 }
+		"tabPlace_ui_info": { order:-10 },
+		"tabPlace_ui_nearby": { order:-10 },
 	},			
 	"panelUser": {
 		"panelUser_ui_bio": { order:-20 },

packages/core/Kepler.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 /**
  * @namespace
  * @name Kepler

packages/core/client/Map.js

@@ -272,6 +272,8 @@ Kepler.Map = {
 
 			if(!this.isVisible())
 				Session.set('showSidebar', false);
+			/*else
+				Session.set('showSidebar', true);*/
 
 			if(_.isFunction(cb))
 				this.map.once("moveend zoomend", cb);

packages/core/client/Router.js

@@ -341,7 +341,7 @@ Router.map(function() {
 		template: 'empty',
 		layoutTemplate: 'layoutMap',
 		waitOn: function() {
-			//Session.set('showSidebar', false);
+			Session.set('showSidebar', false);
 			return Meteor.subscribe('placeById', this.params.placeId);
 		},
 		onAfterAction: function() {

packages/core/collections/queries/places.js

@@ -62,18 +62,24 @@ K.extend({
 			}*/
 		}, _.deepExtend({}, K.filters.placeItem, {
 				sort: { createdAt: -1 },
-				limit: 30
+				limit: 20
 			})
 		);
 	},	
-	findPlacesByNearby: function(loc) {
+	findPlacesByNearby: function(loc, dist) {
+
+		dist = dist || K.settings.public.map.nearbyMaxDist;
+
+		//TODO https://forums.meteor.com/t/mongodb-geonear-query-and-match-aggregation-return-empty-result/36948
+		////sort by distance
+		///
 		return Places.find({
 			loc: {
 				'$near': loc,
-				'$maxDistance': K.Util.geo.meters2rad(K.settings.public.map.nearbyMaxDist)
+				'$maxDistance': K.Util.geo.meters2rad(dist)
 			}
 		}, _.deepExtend({}, K.filters.placeItem, {
-				limit: 30
+				limit: 20
 			})
 		);
 	},
@@ -85,7 +91,7 @@ K.extend({
 
 		var filters = _.deepExtend({}, K.filters.placeSearch, {
 			sort: { name:1 },
-			limit: 30
+			limit: 20
 		});
 
 		var ex = new RegExp('^'+ initial, 'i');

packages/core/package.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 
 Package.describe({
   version: version,

packages/edit/client/views/panels.html

@@ -60,7 +60,7 @@
 
 		{{else}}
 			<li class="list-group-item">
-				<label class="text-gray"><i>{{i18n 'label_nohist'}}</i></label>
+				<label class="text-gray"><i>{{i18n 'label_notfound'}}</i></label>
 			</li>
 		{{/if}}
 	</ul>

packages/edit/package.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 
 Package.describe({
   version: version,

packages/events/package.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 
 Package.describe({
   version: version,

packages/favorites/package.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 
 Package.describe({
   version: version,

packages/geoinfo/package.js

@@ -1,4 +1,4 @@
-var version = '1.6.4';
+var version = '1.6.5';
 
 Package.describe({
   version: version,