pelias-query - npm Package Compare versions

Comparing version 7.0.2 to 8.0.0

defaults.json

@@ -13,6 +13,4 @@ {
   "boundary:circle:optimize_bbox": "indexed",
-  "boundary:circle:_cache": true,
 
   "boundary:rect:type": "indexed",
-  "boundary:rect:_cache": true,
 
@@ -19,0 +17,0 @@ "ngram:analyzer": "peliasOneEdgeGram",

layout/FilteredBooleanQuery.js

@@ -30,8 +30,8 @@
       var view = condition[0], operator = condition[1];
-      if( !q.query.filtered.query.bool.hasOwnProperty( operator ) ){
-        q.query.filtered.query.bool[ operator ] = [];
-      }
       var rendered = view( vs );
       if( rendered ){
-        q.query.filtered.query.bool[ operator ].push( rendered );
+        if( !q.query.bool.hasOwnProperty( operator ) ){
+          q.query.bool[ operator ] = [];
+        }
+        q.query.bool[ operator ].push( rendered );
       }
@@ -46,6 +46,6 @@ });
       if( rendered ){
-        if( !q.query.filtered.hasOwnProperty( 'filter' ) ){
-          q.query.filtered.filter = { bool: { must: [] } };
+        if( !q.query.bool.hasOwnProperty( 'filter' ) ){
+          q.query.bool.filter = [];
         }
-        q.query.filtered.filter.bool.must.push( rendered );
+        q.query.bool.filter.push( rendered );
       }
@@ -71,7 +71,3 @@ });
     query: {
-      filtered: {
-        query: {
-          bool: {}
-        }
-      }
+      bool: {}
     },
@@ -78,0 +74,0 @@ size: vs.var('size'),

package.json

@@ -38,3 +38,3 @@ {
   ],
-  "version": "7.0.2"
+  "version": "8.0.0"
 }

test/layout/FilteredBooleanQuery.js

@@ -18,7 +18,3 @@ var FilteredBooleanQuery = require('../../layout/FilteredBooleanQuery');
       query: {
-        filtered: {
-          query: {
-            bool: {}
-          }
-        }
+        bool: {}
       },
@@ -73,15 +69,11 @@ size: { $: 'size value' },
       query: {
-        filtered: {
-          query: {
-            bool: {
-              must: [
-                { 'score field 1': 'score value 1'},
-                { 'score field 3': 'score value 3'}
-              ],
-              should: [
-                { 'score field 2': 'score value 2'},
-                { 'score field 4': 'score value 4'}
-              ]
-            }
-          }
+        bool: {
+          must: [
+            { 'score field 1': 'score value 1'},
+            { 'score field 3': 'score value 3'}
+          ],
+          should: [
+            { 'score field 2': 'score value 2'},
+            { 'score field 4': 'score value 4'}
+          ]
         }
@@ -116,10 +108,6 @@ },
       query: {
-        filtered: {
-          query: {
-            bool: {
-              should: [
-                { 'score field': 'score value'}
-              ]
-            }
-          }
+        bool: {
+          should: [
+            { 'score field': 'score value'}
+          ]
         }
@@ -154,10 +142,6 @@ },
       query: {
-        filtered: {
-          query: {
-            bool: {
-              should: [
-                { 'score field': 'score value'}
-              ]
-            }
-          }
+        bool: {
+          should: [
+            { 'score field': 'score value'}
+          ]
         }
@@ -202,11 +186,7 @@ },
       query: {
-        filtered: {
-          query: {
-            bool: {
-              should: [
-                { 'score field 1': 'score value 1'},
-                { 'score field 2': 'score value 2'}
-              ]
-            }
-          }
+        bool: {
+          should: [
+            { 'score field 1': 'score value 1'},
+            { 'score field 2': 'score value 2'}
+          ]
         }
@@ -257,14 +237,7 @@ },
       query: {
-        filtered: {
-          query: {
-            bool: {}
-          },
-          filter: {
-            bool: {
-              must: [
-                { 'filter field 1': 'filter value 1'},
-                { 'filter field 2': 'filter value 2'}
-              ]
-            }
-          }
+        bool: {
+          filter: [
+            { 'filter field 1': 'filter value 1'},
+            { 'filter field 2': 'filter value 2'}
+          ]
         }
@@ -314,7 +287,3 @@ },
       query: {
-        filtered: {
-          query: {
-            bool: {}
-          }
-        }
+        bool: {}
       },
@@ -321,0 +290,0 @@ size: { $: 'size value' },

test/view/boundary_circle.js

@@ -11,3 +11,2 @@ var boundary_circle = require('../../view/boundary_circle');
   vs.var('boundary:circle:optimize_bbox', 'optimize_bbox value');
-  vs.var('boundary:circle:_cache', 'cache value');
   vs.var('centroid:field', 'field value');
@@ -60,3 +59,2 @@
         optimize_bbox: { $: 'optimize_bbox value' },
-        _cache: { $: 'cache value' },
         'field value': {
@@ -63,0 +61,0 @@ lat: { $: 'lat value' },

test/view/boundary_rect.js

@@ -11,3 +11,2 @@ var boundary_rect = require('../../view/boundary_rect');
   vs.var('boundary:rect:type', 'type value');
-  vs.var('boundary:rect:_cache', 'cache value');
   vs.var('centroid:field', 'field value');
@@ -58,3 +57,2 @@
         type: { $: 'type value' },
-        _cache: { $: 'cache value' },
         'field value': {
@@ -61,0 +59,0 @@ top: { $: 'top value' },

view/boundary_circle.js

@@ -10,3 +10,2 @@
       !vs.isset('boundary:circle:optimize_bbox') ||
-      !vs.isset('boundary:circle:_cache') ||
       !vs.isset('centroid:field') ){
@@ -21,4 +20,3 @@ return null;
       distance_type: vs.var('boundary:circle:distance_type'),
-      optimize_bbox: vs.var('boundary:circle:optimize_bbox'),
-      _cache: vs.var('boundary:circle:_cache')
+      optimize_bbox: vs.var('boundary:circle:optimize_bbox')
     }
@@ -34,2 +32,2 @@ };
   return view;
-};
+};

view/boundary_rect.js

@@ -10,3 +10,2 @@
       !vs.isset('boundary:rect:type') ||
-      !vs.isset('boundary:rect:_cache') ||
       !vs.isset('centroid:field') ){
@@ -19,4 +18,3 @@ return null;
     geo_bounding_box: {
-      type: vs.var('boundary:rect:type'),
-      _cache: vs.var('boundary:rect:_cache')
+      type: vs.var('boundary:rect:type')
     }
@@ -34,2 +32,2 @@ };
   return view;
-};
+};

Fixed alerts

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Number of medium supply chain risk alerts

0

decreased by-100%

Worsened metrics

Total package byte prevSize

98756

decreased by-1.18%

Lines of code

2557

decreased by-1.65%

No dependency changes