Merge branch 'develop'

Author: Aries Yuwono

.jshintrc

@@ -2,8 +2,9 @@
   "node":   true,
   "curly":  true,
   "eqeqeq": true,
+  "eqnull": true,
   "noarg":  true,
   "nonew":  true,
   "undef":  true,
   "unused": true
-}
+}

README.md

@@ -14,7 +14,7 @@ from Node.js applications.
 
 ## Status
 
-Release 1.0.3 of the MarkLogic Node.js API
+Release 1.0.4 of the MarkLogic Node.js API
 
 ## Sample
 

etc/test-setup.js

@@ -163,6 +163,28 @@ function setup(manager) {
                 };
               rangeElementIndex.push(indexdef);
             }
+
+            var geospatialElementIndex = response.data['geospatial-element-index'];
+
+            var pointGeospatialIndex = {
+                'namespace-uri':         '',
+                localname:               'point',
+                'coordinate-system':     'wgs84',
+                'range-value-positions': false,
+                'point-format':          'point',
+                'invalid-values':        'ignore'
+              };
+
+            if (valcheck.isNullOrUndefined(geospatialElementIndex)) {
+              geospatialElementIndex = [pointGeospatialIndex];
+            } else if (geospatialElementIndex.some(
+                makeIndexTester(pointGeospatialIndex.localname)
+                )) {
+              geospatialElementIndex = null;
+            } else {
+              geospatialElementIndex.push(pointGeospatialIndex);
+            }
+
             var body = {
                 'collection-lexicon':   true,
                 'triple-index':         true,
@@ -174,6 +196,10 @@ function setup(manager) {
             if (valcheck.isArray(rangeElementIndex) && rangeElementIndex.length > 0) {
               body['range-element-index'] = rangeElementIndex;
             }
+            if (valcheck.isArray(geospatialElementIndex) &&
+                geospatialElementIndex.length > 0) {
+              body['geospatial-element-index'] = geospatialElementIndex;
+            }
 
             console.log('adding custom indexes for '+testconfig.testServerName);
             return manager.put({
@@ -285,3 +311,9 @@ function setup(manager) {
     }
   });
 }
+
+function makeIndexTester(testLocalname) {
+  return function indexTester(index) {
+    return (index.localname === testLocalname);
+  };
+}