Massima distanza nela ricerca fixed

diff --git a/client/assets/images/BERNABEI.jpg b/client/assets/images/BERNABEI.jpg
new file mode 100644 (file)
index 0000000..6487b40
Binary files /dev/null and b/client/assets/images/BERNABEI.jpg differ

diff --git a/client/assets/images/icon-fb.png b/client/assets/images/icon-fb.png
new file mode 100644 (file)
index 0000000..70e8f6e
Binary files /dev/null and b/client/assets/images/icon-fb.png differ

diff --git a/client/components/footer/footer.html b/client/components/footer/footer.html
index 3d20e05..ca12ca8 100755 (executable)
--- a/client/components/footer/footer.html
+++ b/client/components/footer/footer.html
@@ -4,8 +4,9 @@
        <li><a ui-sref="signup">Iscriviti</a></li>
        <li><a ui-sref="seguici">Seguici</a></li>
        <li><a ui-sref="partner">Partner</a></li>
-       <li><a ui-sref="FAQ">FAQ</a></li>
-       <li><a ui-sref="t&c">Termini e Condizioni</a></li>
-       <li><a>F T</a></li>
+       <li><br /><a ui-sref="FAQ">FAQ</a></li>
+       <li><br /><a ui-sref="t&c">Termini e Condizioni</a></li>
+       <li><br /><a><img src="assets/images/icon-fb.png" resizewin ng-style="style(625)"/></a></li>
+       <li><br /><img src="assets/images/BERNABEI.jpg" resizewin ng-style="style(525)"/></li>
   </ul>
 </div>

diff --git a/client/components/footer/footer.scss b/client/components/footer/footer.scss
index aea472c..c07649d 100755 (executable)
--- a/client/components/footer/footer.scss
+++ b/client/components/footer/footer.scss
@@ -3,7 +3,7 @@ footer.footer {
     bottom: 0;
     left: 0;
     right: 0;
-    height: 200px;
+    height: 220px;
     background: #EDEFED;
     margin-top: 0 !important;
 }
@@ -34,5 +34,5 @@ height: 70px;
 height: 0px;
 }
 .push-footerApp{
-height: 200px;
+height: 220px;
 }

diff --git a/client/index.html b/client/index.html
index 4b28bc2..28fcd46 100755 (executable)
--- a/client/index.html
+++ b/client/index.html
@@ -62,16 +62,8 @@
     <!-- build:js({.tmp,client}) app/app.js -->
       <script src="app/app.js"></script>
       <!-- injector:js -->
-      <script src="app/contact/contact.controller.js"></script>
-      <script src="app/contact/contact.js"></script>
-      <script src="app/seguici/seguici.controller.js"></script>
-      <script src="app/seguici/seguici.js"></script>
-      <script src="app/partner/partner.controller.js"></script>
-      <script src="app/partner/partner.js"></script>
       <script src="app/FAQ/FAQ.controller.js"></script>
       <script src="app/FAQ/FAQ.js"></script>
-      <script src="app/t&c/t&c.controller.js"></script>
-      <script src="app/t&c/t&c.js"></script>      
       <script src="app/account/account.js"></script>
       <script src="app/account/login/login.controller.js"></script>
       <script src="app/account/settings/settings.controller.js"></script>
@@ -82,6 +74,8 @@
       <script src="app/come_funziona/come_funziona.js"></script>
       <script src="app/community/community.controller.js"></script>
       <script src="app/community/community.js"></script>
+      <script src="app/contact/contact.controller.js"></script>
+      <script src="app/contact/contact.js"></script>
       <script src="app/main/main.controller.js"></script>
       <script src="app/main/main.js"></script>
       <script src="app/organizza/organizza.controller.js"></script>
@@ -89,6 +83,12 @@
       <script src="app/partecipa/partecipa.controller.js"></script>
       <script src="app/partecipa/partecipa.js"></script>
       <script src="app/partecipa/show/show.controller.js"></script>
+      <script src="app/partner/partner.controller.js"></script>
+      <script src="app/partner/partner.js"></script>
+      <script src="app/seguici/seguici.controller.js"></script>
+      <script src="app/seguici/seguici.js"></script>
+      <script src="app/t&c/t&c.controller.js"></script>
+      <script src="app/t&c/t&c.js"></script>
       <script src="components/auth/auth.service.js"></script>
       <script src="components/auth/user.service.js"></script>
       <script src="components/footer/footer.directive.js"></script>

diff --git a/server/api/show/show.controller.js b/server/api/show/show.controller.js
index b70dce4..a26f352 100755 (executable)
--- a/server/api/show/show.controller.js
+++ b/server/api/show/show.controller.js
@@ -89,7 +89,7 @@ exports.index = function(req, res) {
   var fulltext = req.query.fulltext;
   var lat = req.query.lat;
   var lng = req.query.lng;
-  var maxDistance = 20; 
+  var maxDistance = 20/6371; 
   if (date) {
     sq.date = {
       $gte: date
@@ -100,7 +100,7 @@ exports.index = function(req, res) {
   }
   if (lat && lng) {
     sq.location = {
-      $near: [lng, lat],
+      $nearSphere: [lng, lat],
       $maxDistance: maxDistance
     };
   }

diff --git a/server/api/show/show.model.js b/server/api/show/show.model.js
index 2bb15d6..2e0ed33 100755 (executable)
--- a/server/api/show/show.model.js
+++ b/server/api/show/show.model.js
@@ -13,7 +13,7 @@ var ShowSchema = new Schema({
   info: String,
   location: {
     type: [Number],
-    index: '2d'
+    index: '2dsphere'
   },
   place: String,
   categoryId: String,