diff --git a/.meteor/packages b/.meteor/packages index 4158b765..319f06eb 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -25,8 +25,12 @@ keplerjs:pois keplerjs:tracks keplerjs:photos -keplerjs:robots -keplerjs:wunderground -keplerjs:googlemaps -keplerjs:openrouteservice +#keplerjs:robots +#keplerjs:wunderground +#keplerjs:googlemaps +#keplerjs:openrouteservice +##work in progress +#keplerjs:gtfs +#keplerjs:mapillary +#keplerjs:foursquare diff --git a/.meteor/versions b/.meteor/versions index 33b99ad3..f053d005 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -68,22 +68,18 @@ keplerjs:core-ui@1.6.3 keplerjs:edit@1.6.3 keplerjs:favorites@1.6.3 keplerjs:geoinfo@1.6.3 -keplerjs:googlemaps@1.6.3 keplerjs:i18n@1.6.3 keplerjs:import@1.6.3 keplerjs:lib@1.6.3 keplerjs:notifs@1.6.3 -keplerjs:openrouteservice@1.6.3 keplerjs:osm@1.6.3 keplerjs:photos@1.6.3 keplerjs:pois@1.6.3 -keplerjs:robots@1.6.3 keplerjs:share@1.6.3 keplerjs:stats@1.6.3 keplerjs:theme@1.6.3 keplerjs:tracks@1.6.3 keplerjs:upload@1.6.3 -keplerjs:wunderground@1.6.3 kidovate:bootstrap-slider@0.0.5 konecty:user-presence@2.4.0 less@2.8.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index cb1a98f7..1b1e561b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ [Downloadable releases](https://github.com/Keplerjs/Kepler/releases) ## Next version -... +- remove 3rd party kepler plugins from .meteor/packages ## v1.6.3 - renamed all caching settings in cacheTime diff --git a/packages/base/README.md b/packages/base/README.md index 73e08b6d..ad9b9e56 100644 --- a/packages/base/README.md +++ b/packages/base/README.md @@ -1,3 +1,6 @@ ## keplerjs:base -Keplerjs meta package to include base components \ No newline at end of file +Keplerjs meta package to include base kepler packages: + +keplerjs:core +keplerjs:core-ui \ No newline at end of file diff --git a/packages/categories/client/Cats.js b/packages/categories/client/Cats.js index 69d173da..2a59ab59 100644 --- a/packages/categories/client/Cats.js +++ b/packages/categories/client/Cats.js @@ -1,3 +1,12 @@ + +if(Meteor.isClient) { + Accounts.onLogin(function() { + + K.Cats.loadActiveCats(); + + }); +} + Kepler.Cats = { //TODO conver in function and sort by name @@ -46,11 +55,3 @@ Kepler.Cats = { }); } }; - -if(Meteor.isClient) { - Accounts.onLogin(function() { - - K.Cats.loadActiveCats(); - - }); -} \ No newline at end of file diff --git a/packages/categories/server/cats.js b/packages/categories/server/cats.js index 7d581600..c8345a71 100644 --- a/packages/categories/server/cats.js +++ b/packages/categories/server/cats.js @@ -27,7 +27,7 @@ Meteor.publish('catsActive', function() { { var cur = K.findCatsActive(); - console.log('Pub: catsActive' ); + //console.log('Pub: catsActive' ); return cur; } diff --git a/packages/core/server/pubs/places.js b/packages/core/server/pubs/places.js index 76a5f057..3a02a047 100644 --- a/packages/core/server/pubs/places.js +++ b/packages/core/server/pubs/places.js @@ -7,7 +7,9 @@ Meteor.publish('placesByBBox', function(bbox) { if(diag < K.settings.public.map.bboxMaxDiagonal) { var cur = K.findPlacesByBBox(bbox); - console.log('Pub: placesByBBox ', this.userId, cur.count()); + + //console.log('Pub: placesByBBox ', this.userId, cur.count()); + return cur; } else diff --git a/packages/osm/plugin.js b/packages/osm/plugin.js index 2a5d1d80..bb880fc2 100644 --- a/packages/osm/plugin.js +++ b/packages/osm/plugin.js @@ -19,7 +19,6 @@ K.Plugin({ }, settings: { "osm": { - //TODO cachetime "findByLocDist": 50, "findByLocLimit": 10, "findByBBoxLimit": 10,