Skip to content

Commit 5ec7621

Browse files
author
Adam Collins
committed
revert naming of geospatial_kosher for old sandbox
1 parent ae8221b commit 5ec7621

File tree

6 files changed

+36
-36
lines changed

6 files changed

+36
-36
lines changed

‎grails-app/assets/javascripts/spApp/controller/areaReportCtrl.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
name: $i18n(365, "Number of species - spatially valid only"),
245245
query: {q: areaQ.q, bs: areaQ.bs, ws: areaQ.ws, wkt: areaQ.wkt, qid: areaQ.qid},
246246
map: false,
247-
extraQ: ["spatiallyValid:true"]
247+
extraQ: ["geospatial_kosher:true"]
248248
},
249249
{
250250
name: $i18n(366, "Number of endemic species"),
@@ -257,7 +257,7 @@
257257
endemic: true,
258258
query: {q: areaQ.q, bs: areaQ.bs, ws: areaQ.ws, wkt: areaQ.wkt, qid: areaQ.qid},
259259
map: false,
260-
extraQ: ["spatiallyValid:true"]
260+
extraQ: ["geospatial_kosher:true"]
261261
}];
262262

263263
// TODO: move this into config and retrieve from $SH
@@ -271,7 +271,7 @@
271271
name: $i18n(368, "Occurrences - spatially valid only"),
272272
query: {q: areaQ.q, bs: areaQ.bs, ws: areaQ.ws, wkt: areaQ.wkt, qid: areaQ.qid},
273273
occurrences: true,
274-
extraQ: ["spatiallyValid:true"]
274+
extraQ: ["geospatial_kosher:true"]
275275
},
276276
{
277277
name: $i18n(356, "Expert distributions"),

‎grails-app/assets/javascripts/spApp/directive/selectFacet.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@
5353
} else if (value.spatiallyValid) {
5454
//spatially-unknown && spatiallyValid
5555
//-> rule out of spatiallySuspect
56-
scope.fqsOfSpeciesOptions.push('-spatiallyValid:false');
56+
scope.fqsOfSpeciesOptions.push('-geospatial_kosher:false');
5757
}else if (value.spatiallySuspect) {
5858
//spatially-unknown && spatiallySuspect
5959
//-> rule out of spatiallyValid
60-
scope.fqsOfSpeciesOptions.push('-spatiallyValid:true');
60+
scope.fqsOfSpeciesOptions.push('-geospatial_kosher:true');
6161
}
6262
} else {
6363
//spatially-valid and spatially-suspect
6464
if (value.spatiallyValid && value.spatiallySuspect) {
65-
scope.fqsOfSpeciesOptions.push('spatiallyValid:*');
65+
scope.fqsOfSpeciesOptions.push('geospatial_kosher:*');
6666
} else if (value.spatiallyValid) {
67-
scope.fqsOfSpeciesOptions.push('spatiallyValid:true');
67+
scope.fqsOfSpeciesOptions.push('geospatial_kosher:true');
6868
} else if (value.spatiallySuspect) {
69-
scope.fqsOfSpeciesOptions.push('spatiallyValid:false');
69+
scope.fqsOfSpeciesOptions.push('geospatial_kosher:false');
7070
}
7171
}
7272

‎grails-app/assets/javascripts/spApp/directive/selectSpecies.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -251,23 +251,23 @@
251251
} else if (scope.spatiallyValid) {
252252
// spatially-unknown && spatiallyValid
253253
// Solution -> rule out of spatiallySuspect
254-
gs = ['-spatiallyValid:false'];
254+
gs = ['-geospatial_kosher:false'];
255255
} else if (scope.spatiallySuspect) {
256256
// spatially-unknown && spatiallySuspect
257257
// -> rule out of spatiallyValid
258-
gs = ['-spatiallyValid:true'];
258+
gs = ['-geospatial_kosher:true'];
259259
} else {
260260
//return records without spatial
261-
gs = ['-spatiallyValid:*'];
261+
gs = ['-geospatial_kosher:*'];
262262
}
263263
} else {
264264
//spatially-valid and spatially-suspect
265265
if (scope.spatiallyValid && scope.spatiallySuspect) {
266-
gs = ['spatiallyValid:*'];
266+
gs = ['geospatial_kosher:*'];
267267
} else if (scope.spatiallyValid){
268-
gs = ['spatiallyValid:true'];
268+
gs = ['geospatial_kosher:true'];
269269
} else if (scope.spatiallySuspect){
270-
gs = ['spatiallyValid:false'];
270+
gs = ['geospatial_kosher:false'];
271271
} else {
272272
// No records returned by default
273273
}

‎grails-app/assets/javascripts/spApp/service/biocacheService.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* "ws": "https://biocache.ala.org.au"
3939
* }
4040
* - fqs
41-
* ["spatiallyValid:true"]
41+
* ["geospatial_kosher:true"]
4242
*
4343
* Ouput:
4444
* 10
@@ -74,7 +74,7 @@
7474
* "ws": "https://biocache.ala.org.au"
7575
* }
7676
* - fqs
77-
* ["spatiallyValid:true"]
77+
* ["geospatial_kosher:true"]
7878
*
7979
* Ouput:
8080
* 2
@@ -115,7 +115,7 @@
115115
* "ws": "https://biocache.ala.org.au"
116116
* }
117117
* - fqs
118-
* ["spatiallyValid:true"]
118+
* ["geospatial_kosher:true"]
119119
* - config
120120
* Ouput:
121121
* "names_and_lsid","Species Name","Scientific Name Authorship","Taxon Rank","Kingdom","Phylum","Class","Order","Family","Genus","Vernacular Name","Number of records","Conservation","Invasive"
@@ -148,10 +148,10 @@
148148
* "ws": "https://biocache.ala.org.au"
149149
* }
150150
* - fqs
151-
* ["spatiallyValid:true"]
151+
* ["geospatial_kosher:true"]
152152
*
153153
* Output:
154-
* "https://biocache-ws.ala.org.au/ws/occurrences/facets/download?facets=names_and_lsid&lookup=true&count=true&lists=true&q=Macropus&fq=spatiallyValid:true"
154+
* "https://biocache-ws.ala.org.au/ws/occurrences/facets/download?facets=names_and_lsid&lookup=true&count=true&lists=true&q=Macropus&fq=geospatial_kosher:true"
155155
*/
156156
speciesListUrl: function (query, fqs) {
157157
var fqList = (fqs === undefined ? '' : '&fq=' + this.joinAndEncode(fqs));
@@ -178,7 +178,7 @@
178178
* "ws": "https://biocache.ala.org.au"
179179
* }
180180
* - fqs
181-
* ["spatiallyValid:true"]
181+
* ["geospatial_kosher:true"]
182182
*
183183
* Output:
184184
* ```
@@ -213,7 +213,7 @@
213213
* "ws": "https://biocache.ala.org.au"
214214
* }
215215
* - fqs
216-
* ["spatiallyValid:true"]
216+
* ["geospatial_kosher:true"]
217217
*
218218
* Output:
219219
* "http://biocache.ala.org.au/ws/explore/endemic/species/1234.csv?facets=names_and_lsid&lookup=true&count=true&lists=true"
@@ -251,7 +251,7 @@
251251
* "ws": "https://biocache.ala.org.au"
252252
* }
253253
* - fqs
254-
* ["spatiallyValid:true"]
254+
* ["geospatial_kosher:true"]
255255
*
256256
* Output:
257257
* []
@@ -284,7 +284,7 @@
284284
* "ws": "https://biocache.ala.org.au"
285285
* }
286286
* - fqs
287-
* ["spatiallyValid:true"]
287+
* ["geospatial_kosher:true"]
288288
*
289289
* Output:
290290
* 500
@@ -322,7 +322,7 @@
322322
* "ws": "https://biocache.ala.org.au"
323323
* }
324324
* - fqs
325-
* ["spatiallyValid:true"]
325+
* ["geospatial_kosher:true"]
326326
*
327327
* Output:
328328
* "<span>Macropus</span>"
@@ -364,10 +364,10 @@
364364
* "ws": "https://biocache.ala.org.au"
365365
* }
366366
* - fqs
367-
* ["spatiallyValid:true"]
367+
* ["geospatial_kosher:true"]
368368
*
369369
* Output:
370-
* "http://biocache-ws.ala.org.au/ws/occurrences/search?q=Macropus&fq=spatiallyValid:true&pageSize=1&offset=0&facet=false"
370+
* "http://biocache-ws.ala.org.au/ws/occurrences/search?q=Macropus&fq=geospatial_kosher:true&pageSize=1&offset=0&facet=false"
371371
*/
372372
constructSearchResultUrl: function (query, fqs, pageSize, offset, facet) {
373373
facet = facet || false;

‎grails-app/assets/javascripts/spApp/service/toolAddFacetService.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
var q = facet;
5353
if (speciesOptions.spatiallyUnknown) {
5454
if (speciesOptions.spatiallyValid && speciesOptions.spatiallySuspect) { /* do nothing */
55-
} else if (speciesOptions.spatiallyValid) q.push('-spatiallyValid:false');
56-
else if (speciesOptions.spatiallySuspect) q.push('-spatiallyValid:true');
55+
} else if (speciesOptions.spatiallyValid) q.push('-geospatial_kosher:false');
56+
else if (speciesOptions.spatiallySuspect) q.push('-geospatial_kosher:true');
5757
} else {
58-
if (speciesOptions.spatiallyValid && speciesOptions.spatiallySuspect) q.push('spatiallyValid:*');
59-
else if (speciesOptions.spatiallyValid) q.push('spatiallyValid:true');
60-
else if (speciesOptions.spatiallySuspect) q.push('spatiallyValid:false');
58+
if (speciesOptions.spatiallyValid && speciesOptions.spatiallySuspect) q.push('geospatial_kosher:*');
59+
else if (speciesOptions.spatiallyValid) q.push('geospatial_kosher:true');
60+
else if (speciesOptions.spatiallySuspect) q.push('geospatial_kosher:false');
6161
}
6262

6363
if (!speciesOptions.includeAbsences) {

‎grails-app/assets/javascripts/spApp/service/toolExportChecklistService.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@
6565

6666
if (speciesOptions.spatiallyUnknown) {
6767
if (speciesOptions.spatiallyValid && speciesOptions.spatiallySuspect) { /* do nothing */
68-
} else if (speciesOptions.spatiallyValid) q.push('-spatiallyValid:false');
69-
else if (speciesOptions.spatiallySuspect) q.push('-spatiallyValid:true');
68+
} else if (speciesOptions.spatiallyValid) q.push('-geospatial_kosher:false');
69+
else if (speciesOptions.spatiallySuspect) q.push('-geospatial_kosher:true');
7070
} else {
71-
if (speciesOptions.spatiallyValid && speciesOptions.spatiallySuspect) q.push('spatiallyValid:*');
72-
else if (speciesOptions.spatiallyValid) q.push('spatiallyValid:true');
73-
else if (speciesOptions.spatiallySuspect) q.push('spatiallyValid:false');
71+
if (speciesOptions.spatiallyValid && speciesOptions.spatiallySuspect) q.push('geospatial_kosher:*');
72+
else if (speciesOptions.spatiallyValid) q.push('geospatial_kosher:true');
73+
else if (speciesOptions.spatiallySuspect) q.push('geospatial_kosher:false');
7474
}
7575

7676
if (!speciesOptions.includeAbsences) {

0 commit comments

Comments
 (0)