Skip to content

Commit

Permalink
Readded locations.json
Browse files Browse the repository at this point in the history
We plan to add future UI changes that will interact directly with this file. Better to have this in its own file for that UI change instead of it being in config.json
  • Loading branch information
Luis729 committed Feb 12, 2019
1 parent 8a48805 commit 66269f6
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
17 changes: 1 addition & 16 deletions resources/config.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
{
"fixtures": true,

"cache": false,
"geolocation": true,

"startLocation": "Cal Poly SLO",
"locations": {
"Cal Poly SLO": {
"latitude": 35.306205,
"longitude": -120.662227,
"zoom": 18
},
"Cal Poly Pomona": {
"latitude": 34.055869,
"longitude": -117.819964,
"zoom": 18
}
}
"geolocation": true
}
3 changes: 2 additions & 1 deletion resources/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import ugv from './images/markers/vehicles/ugv.png';
import geolocation_hover from './images/other/geolocation_hover.png';
import geolocation from './images/other/geolocation.png';

export { default as config, cache, fixtures, geolocation, locations, startLocation } from './config.json';
export { default as config, cache, fixtures, geolocation } from './config.json';
export { default as locations, startLocation } from './locations.json';
export * as macAddress from './mac-address.json';

export const images = {
Expand Down
15 changes: 15 additions & 0 deletions resources/locations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"startLocation": "Cal Poly SLO",
"locations": {
"Cal Poly SLO": {
"latitude": 35.306205,
"longitude": -120.662227,
"zoom": 18
},
"Cal Poly Pomona": {
"latitude": 34.055869,
"longitude": -117.819964,
"zoom": 18
}
}
}

0 comments on commit 66269f6

Please sign in to comment.