Merge pull request #77 from GIScience/refactor/remove-v2-requirement

Refactor/remove v2 requirement

src/OrsBase.js

@@ -95,17 +95,12 @@ class OrsBase {
 
     this.requestArgs = orsUtil.fillArgs(this.defaultArgs, this.requestArgs)
 
-    if (this.requestArgs[Constants.propNames.apiVersion] === Constants.defaultAPIVersion) {
-      this.argsCache = orsUtil.saveArgsToCache(this.requestArgs)
+    this.argsCache = orsUtil.saveArgsToCache(this.requestArgs)
 
-      this.httpArgs = orsUtil.prepareRequest(this.requestArgs)
-      const postBody = this.getBody(this.httpArgs)
+    this.httpArgs = orsUtil.prepareRequest(this.requestArgs)
+    const postBody = this.getBody(this.httpArgs)
 
-      return await this.createRequest(postBody)
-    } else {
-      // eslint-disable-next-line no-console
-      console.error(Constants.useAPIV2Msg)
-    }
+    return await this.createRequest(postBody)
   }
 }
 

src/__tests__/OrsBase.cy.js

@@ -20,19 +20,6 @@ describe('Test Base class', () => {
       }
     })
 
-    it('fails when API version not default API version', () => {
-      let base
-      try {
-        base = new OrsBase({
-          'api_key': 'test',
-          'apiVersion': 'v1'
-        })
-      } catch (err) {
-        expect(err.message).to.equal(constants.useAPIV2Msg)
-        expect(base.calculate()).to.throw(console.error)
-      }
-    })
-
     it('passes Host correctly', () => {
       const base = new OrsBase({
         'api_key': 'test',

src/__tests__/OrsDirections.cy.js

@@ -1,5 +1,4 @@
 import OrsDirections from '../OrsDirections.js'
-import Constants from '../constants.js'
 
 const key = Cypress.env('api_key')
 const orsDirections = new OrsDirections({ 'api_key': key })
@@ -93,16 +92,6 @@ describe('Test Directions', () => {
           expect(req.headers).to.include({'Accept': 'application/json'})
         })
       })
-
-      it('fails when API version not default API version', () => {
-        orsDirections.calculate({
-          coordinates: [[8.690958, 49.404662], [8.687868, 49.390139]],
-          profile: 'driving-car',
-          api_version: 'v1'
-        }).catch((err) => {
-          expect(err.message).to.equal(Constants.useAPIV2Msg)
-        })
-      })
     })
   })
 })

src/__tests__/OrsIsochrones.cy.js

@@ -11,17 +11,6 @@ describe('Isochrone Test', () => {
       expect(orsIsochrones.defaultArgs.service).to.equal('isochrones')
       expect(orsIsochrones.defaultArgs.api_version).to.equal('v2')
     })
-
-    it('fails when API version not default API version', () => {
-      try {
-        new OrsIsochrones({
-          'api_key': 'test',
-          'apiVersion': 'v1'
-        })
-      } catch (err) {
-        expect(err.message).to.equal(Constants.useAPIV2Msg)
-      }
-    })
   })
 
   context('methods', () => {

src/__tests__/OrsMatrix.cy.js

@@ -1,5 +1,4 @@
 import OrsMatrix from '../OrsMatrix.js'
-import Constants from '../constants.js'
 
 const key = Cypress.env('api_key')
 const orsMatrix = new OrsMatrix({ api_key: key })
@@ -11,17 +10,6 @@ describe('Matrix Test', () => {
       expect(orsMatrix.defaultArgs.service).to.equal('matrix')
       expect(orsMatrix.defaultArgs.api_version).to.equal('v2')
     })
-
-    it('fails when API version not default API version', () => {
-      try {
-        new OrsMatrix({
-          'api_key': 'test',
-          'apiVersion': 'v1'
-        })
-      } catch (err) {
-        expect(err.message).to.equal(Constants.useAPIV2Msg)
-      }
-    })
   })
 
   context('methods', () => {

src/constants.js

@@ -2,7 +2,6 @@ const constants = {
   defaultAPIVersion: 'v2',
   defaultHost: 'https://api.openrouteservice.org',
   missingAPIKeyMsg: 'Please add your openrouteservice api_key..',
-  useAPIV2Msg: 'Please use ORS API v2',
   baseUrlConstituents: ['host', 'service', 'api_version', 'mime_type'],
   propNames: {
     apiKey: 'api_key',