Skip to content

Commit

Permalink
Merge pull request #70 from GIScience/refactor/BREAKING-remove-unused…
Browse files Browse the repository at this point in the history
…-functions

Refactor/breaking remove unused functions
  • Loading branch information
TheGreatRefrigerator committed Apr 19, 2023
2 parents d2af9b1 + d372680 commit 222abf5
Show file tree
Hide file tree
Showing 13 changed files with 0 additions and 151 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ Geocode.geocode({
console.log(str)
})

Geocode.clear()

Geocode.reverseGeocode({
point: { lat_lng: [49.412388, 8.681247], radius: 50 },
Expand All @@ -181,7 +180,6 @@ Geocode.reverseGeocode({
console.log(str);
})

Geocode.clear()

Geocode.structuredGeocode({
locality: "Heidelberg"
Expand Down
17 changes: 0 additions & 17 deletions src/OrsDirections.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,6 @@ class OrsDirections extends OrsBase {
}
}

clear() {
for (const variable in this.defaultArgs) {
if (variable !== Constants.propNames.apiKey) delete this.defaultArgs[variable]
}
}

clearPoints() {
if ('coordinates' in this.defaultArgs) this.defaultArgs.coordinates.length = 0
}

addWaypoint(latLon) {
if (!('coordinates' in this.defaultArgs)) {
this.defaultArgs.coordinates = []
}
this.defaultArgs.coordinates.push(latLon)
}

getBody(args) {
if (args.options && typeof args.options !== 'object') {
args.options = JSON.parse(args.options)
Expand Down
6 changes: 0 additions & 6 deletions src/OrsElevation.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@ import Constants from './constants.js'
import OrsBase from './OrsBase.js'

const orsUtil = new OrsUtil()

class OrsElevation extends OrsBase {
clear() {
for (const variable in this.defaultArgs) {
if (variable !== Constants.propNames.apiKey) delete this.defaultArgs[variable]
}
}

generatePayload(args) {
const payload = {}
Expand Down
6 changes: 0 additions & 6 deletions src/OrsGeocode.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,6 @@ class OrsGeocode extends OrsBase {
}
}

clear() {
for (const variable in this.defaultArgs) {
if (variable !== Constants.propNames.apiKey) delete this.defaultArgs[variable]
}
}

getParametersAsQueryString(args) {
let queryString = ''
for (const key in args) {
Expand Down
7 changes: 0 additions & 7 deletions src/OrsIsochrones.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ class OrsIsochrones extends OrsBase {
}
}

addLocation(latlon) {
if (!('locations' in this.defaultArgs)) {
this.defaultArgs.locations = []
}
this.defaultArgs.locations.push(latlon)
}

getBody(args) {
const options = {}

Expand Down
6 changes: 0 additions & 6 deletions src/OrsOptimization.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ import OrsBase from "./OrsBase.js"
const orsUtil = new OrsUtil()

class OrsOptimization extends OrsBase {
clear() {
for (let variable in this.defaultArgs) {
if (variable !== Constants.propNames.apiKey) delete this.defaultArgs[variable]
}
}

generatePayload(args) {
let payload = {}

Expand Down
6 changes: 0 additions & 6 deletions src/OrsPois.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ class OrsPois extends OrsBase {
}
}

clear() {
for (const variable in this.defaultArgs) {
if (variable !== Constants.propNames.apiKey) delete this.defaultArgs[variable]
}
}

generatePayload(args) {
const payload = {}

Expand Down
35 changes: 0 additions & 35 deletions src/__tests__/OrsDirections.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,39 +109,4 @@ describe('Test Directions', () => {
})
})
})

context('unused functions', () => {
it('clear() clears everything but API key', () => {
orsDirections.defaultArgs = {
variable1: 'v1',
api_key: 'API key'
}
orsDirections.clear()
expect(orsDirections.defaultArgs).to.deep.equal({api_key: 'API key'})
})

it('clearPoints() clears only coordinates', () => {
orsDirections.defaultArgs = {
'coordinates': [[8.690958, 49.404662], [8.687868, 49.390139]],
'otherArg': [1, 2]
}
orsDirections.clearPoints()
expect(orsDirections.defaultArgs.coordinates.length).to.equal(0)
expect(orsDirections.defaultArgs.otherArg.length).to.equal(2)
})

context('addWaypoint', () => {
it('addWaypoint() adds coordinates', () => {
orsDirections.defaultArgs.coordinates = [[8.690958, 49.404662]]
orsDirections.addWaypoint([8.687868, 49.390139])
expect(orsDirections.defaultArgs.coordinates.length).to.equal(2)
})

it('addWaypoint() creates property if not existing', () => {
orsDirections.defaultArgs = {}
orsDirections.addWaypoint()
expect(orsDirections.defaultArgs).to.have.property('coordinates')
})
})
})
})
11 changes: 0 additions & 11 deletions src/__tests__/OrsElevation.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,4 @@ describe('Test Elevation', () => {
})
})
})

context('unused functions', () => {
it('clear() clears everything but API key', () => {
orsElevation.defaultArgs = {
variable1: 'v1',
api_key: 'API key'
}
orsElevation.clear()
expect(orsElevation.defaultArgs).to.deep.equal({api_key: 'API key'})
})
})
})
11 changes: 0 additions & 11 deletions src/__tests__/OrsGeocode.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,16 +197,5 @@ describe('Geocode Test', () => {
})
})
})

context('unused functions', () => {
it('clear() clears everything but API key', () => {
orsGeocode.defaultArgs = {
variable1: 'v1',
api_key: 'API key'
}
orsGeocode.clear()
expect(orsGeocode.defaultArgs).to.deep.equal({api_key: 'API key'})
})
})
})

22 changes: 0 additions & 22 deletions src/__tests__/OrsIsochrones.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,26 +147,4 @@ describe('Isochrone Test', () => {
})
})
})

context('unused functions', () => {
context('addLocation', () => {
it('adds location to defaultArgs', () => {
const orsIsochrones = new OrsIsochrones({ api_key: key })
let locations = {
locations: [
[8.690958, 49.404662],
[8.687868, 49.390139]
]}
orsIsochrones.defaultArgs = {...orsIsochrones.defaultArgs,...locations}
orsIsochrones.addLocation([8.660958, 49.414662])
expect(orsIsochrones.defaultArgs.locations.length).to.equal(3)
})

it('adds location to defaultArgs if no location property', () => {
const orsIsochrones = new OrsIsochrones({ api_key: key })
orsIsochrones.addLocation([8.660958, 49.414662])
expect(orsIsochrones.defaultArgs.locations.length).to.equal(1)
})
})
})
})
11 changes: 0 additions & 11 deletions src/__tests__/OrsOptimization.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,4 @@ describe('Optimization Test', () => {
})
})
})

context('unused functions', () => {
it('clear() clears everything but API key', () => {
orsOptimization.defaultArgs = {
variable1: 'v1',
api_key: 'API key'
}
orsOptimization.clear()
expect(orsOptimization.defaultArgs).to.deep.equal({api_key: 'API key'})
})
})
})
11 changes: 0 additions & 11 deletions src/__tests__/OrsPOIs.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,4 @@ describe('POI Test', () => {
})
})
})

context('unused functions', () => {
it('clear() clears everything but API key', () => {
orsPois.defaultArgs = {
variable1: 'v1',
api_key: 'API key'
}
orsPois.clear()
expect(orsPois.defaultArgs).to.deep.equal({api_key: 'API key'})
})
})
})

0 comments on commit 222abf5

Please sign in to comment.