More work with subscriptions

imports/api/ActiveFires/ActiveFires.js

@@ -48,8 +48,8 @@ ActiveFires.deny({
  * */
 
 ActiveFires.schema = new SimpleSchema({
-  lat: SimpleSchema.Integer,
+  lat: Number,
-  lon: SimpleSchema.Integer,
+  lon: Number,
   scan: Number,
   type: String,
   acq_date: String,

imports/api/FireAlerts/FireAlerts.js

@@ -40,8 +40,8 @@ FireAlerts.deny({
 
 FireAlerts.schema = new SimpleSchema({
   location: Object,
-  'location.lat': SimpleSchema.Integer,
+  'location.lat': Number,
-  'location.lon': SimpleSchema.Integer,
+  'location.lon': Number,
   aviso: Date
 });
 

imports/api/Subscriptions/Subscriptions.js

@@ -39,12 +39,12 @@ Subscriptions.deny({
 
 Subscriptions.schema = new SimpleSchema({
   location: Object,
-  'location.lat': SimpleSchema.Integer,
+  'location.lat': Number,
-  'location.lon': SimpleSchema.Integer,
+  'location.lon': Number,
   distance: Number,
   owner: String
 });
 
-// Subscriptions.attachSchema(Subscriptions.schema);
+Subscriptions.attachSchema(Subscriptions.schema);
 
 export default Subscriptions;

imports/api/Subscriptions/methods.js

@@ -18,7 +18,7 @@ Meteor.methods({
   },
   'subscriptions.update': function subscriptionsUpdate(doc) {
     check(doc, {
-      _id: String,
+      _id: Meteor.Collection.ObjectID,
       location: Match.ObjectIncluding({ lat: Number, lon: Number }),
       distance: Number
     });

imports/api/Subscriptions/server/publications.js

@@ -1,6 +1,8 @@
 /* eslint-disable prefer-arrow-callback */
 
 import { Meteor } from 'meteor/meteor';
+import { Mongo } from 'meteor/mongo';
+import { check } from 'meteor/check';
 import Perlin from 'loms.perlin';
 import Subscriptions from '../Subscriptions';
 
@@ -42,5 +44,7 @@ Meteor.publish('subscriptions', function subscriptions() {
 // Note: subscriptions.view is also used when editing an existing subscription.
 Meteor.publish('subscriptions.view', function subscriptionsView(subscriptionId) {
   check(subscriptionId, String);
-  return Subscriptions.find({ _id: subscriptionId, owner: this.userId });
+  const id = new Mongo.ObjectID(subscriptionId);
+  check(id, Meteor.Collection.ObjectID);
+  return Subscriptions.find({ _id: id, owner: this.userId });
 });

imports/ui/components/SelectionMap/SelectionMap.js

@@ -174,6 +174,6 @@ SelectionMap.propTypes = {
 };
 
 export default translate([], { wait: true })(withTracker(props => ({
-  center: props.center[0] ? props.center : geolocation.get(),
+  center: props.center[0] !== null ? props.center : geolocation.get(),
   distance: props.distance
 }))(SelectionMap));

imports/ui/components/SelectionMap/SelectionMap.scss

@@ -13,3 +13,11 @@
      width: 85vw;
   }
 }
+
+.dist-slider {
+  margin: 0px 10px 30px 10px;
+}
+
+.center-in-my-pos {
+  margin: 10px;
+}

imports/ui/layouts/App/App.js

@@ -45,7 +45,6 @@ import Terms from '../../pages/Terms/Terms';
 import Privacy from '../../pages/Privacy/Privacy';
 import License from '../../pages/License/License';
 import Credits from '../../pages/Credits/Credits';
-import FireSubscription from '../../pages/FireSubscription/FireSubscription';
 import ReSendEmail from '../../components/ReSendEmail/ReSendEmail';
 import FiresMap from '../../pages/FiresMap/FiresMap';
 import Sandbox from '../../pages/Sandbox/Sandbox';

imports/ui/pages/EditSubscription/EditSubscription.js

@@ -28,6 +28,6 @@ export default createContainer(({ match }) => {
 
   return {
     loading: !subscription.ready(),
-    doc: Subscriptions.findOne(subscriptionId)
+    doc: Subscriptions.findOne(new Meteor.Collection.ObjectID(subscriptionId))
   };
 }, EditSubscription);

imports/ui/pages/FireSubscription/FireSubscription.js

@@ -68,7 +68,7 @@ class FireSubscription extends React.Component {
           </Col>
           <Col xs={12} sm={12} md={6} lg={6} >
             <DistanceSlider onChange={value => this.onSliderChange(value)} />
-            <Row className="align-items-center justify-content-center">
+            <Row className="center-in-my-pos">
               <CenterInMyPosition onClick={viewport => this.centerOnUserLocation(viewport)} />
             </Row>
           </Col>

imports/ui/pages/ViewSubscription/ViewSubscription.js

@@ -60,6 +60,6 @@ export default createContainer(({ match }) => {
 
   return {
     loading: !subscription.ready(),
-    doc: Subscriptions.findOne(subscriptionId)
+    doc: Subscriptions.findOne(new Meteor.Collection.ObjectID(subscriptionId))
   };
 }, ViewSubscription);

imports/ui/stylesheets/bootstrap-overrides.scss

@@ -15,3 +15,7 @@ body {
   /* for fixed header */
   padding-top: 50px;
 }
+
+.navbar-nav .nav-link {
+  white-space: nowrap;
+}