-
Notifications
You must be signed in to change notification settings - Fork 468
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Initial rust implementation #71
Merged
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
77685cd
Initial rust implementation
JamesFysh 52553ca
Revise Cargo.toml
JamesFysh 33eeb97
TravisCI
JamesFysh ad2dfed
Install rust/cargo before using them!
JamesFysh 3f11946
This time, for sure!
JamesFysh 15831b4
Ahh, the joys of working with remote CI
JamesFysh ee42858
Stab in the dark #13
JamesFysh 8cd36b6
Revise the public interface
JamesFysh e25df37
Ignore rust.iml when publishing
JamesFysh 655ff46
Incorporate PR feedback
JamesFysh 464ecef
Merge remote-tracking branch 'upstream/master'
JamesFysh 37b2c36
Fix travis unit-tests
JamesFysh 904c44b
Use a PPA that actually exists?
JamesFysh c0fa5de
TravisCI, again
JamesFysh 2ab0872
Helps if we specify actually-existing packages!
JamesFysh c6ecb22
Dependencies
JamesFysh 019f8b4
Further deps
JamesFysh 5e8614b
More deps?
JamesFysh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,36 @@ | ||
sudo: false | ||
# Travis only supports one language per project, so we need to put something | ||
# here. node_js is as good as any other I suppose. | ||
language: node_js | ||
node_js: | ||
- "0.10" | ||
|
||
# For rust, we need to install cargo, rustc. In order to do that, we'll use | ||
# apt-get, which requires sudo. | ||
sudo: true | ||
|
||
# The rust-nightly package is only built for 14.04 (Trusty) and 16.04 (Xenial), | ||
# so we cannot use the default Travis ubuntu image (Precise) for these tests. | ||
dist: trusty | ||
|
||
# Install package dependencies. See | ||
# http://docs.travis-ci.com/user/installing-dependencies/ | ||
# gulp: required for JS testing | ||
before_install: | ||
- npm install -g gulp | ||
- yes | sudo add-apt-repository ppa:jonathonf/rustlang | ||
- yes | sudo add-apt-repository ppa:jonathonf/llvm | ||
- yes | sudo add-apt-repository ppa:jonathonf/gcc | ||
- sudo apt-get update | ||
|
||
install: | ||
sudo apt-get -y install libstd-rust-1.16 libstd-rust-dev rustc cargo | ||
|
||
# Define the list of directories to execute tests in. | ||
env: | ||
- TEST_DIR=js | ||
- TEST_DIR=go | ||
- TEST_DIR=ruby | ||
- TEST_DIR=rust | ||
|
||
# Test script to run. This is called once for each TEST_DIR value above. | ||
script: ./run_tests.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
[package] | ||
name = "open-location-code" | ||
description = "Library for translating between GPS coordinates (WGS84) and Open Location Code" | ||
version = "0.1.0" | ||
authors = ["James Fysh <james.fysh@gmail.com>"] | ||
license = "Apache-2.0" | ||
repository = "https://github.com/google/open-location-code" | ||
keywords = ["geography", "geospatial", "gis", "gps", "olc"] | ||
exclude = ["rust.iml"] | ||
|
||
[dependencies] | ||
geo = "^0.4.3" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
use geo::{Point}; | ||
|
||
pub struct CodeArea { | ||
pub south: f64, | ||
pub west: f64, | ||
pub north: f64, | ||
pub east: f64, | ||
pub center: Point<f64>, | ||
pub code_length: usize, | ||
} | ||
|
||
impl CodeArea { | ||
pub fn new(south: f64, west: f64, north: f64, east: f64, code_length: usize) -> CodeArea { | ||
CodeArea { | ||
south: south, west: west, north: north, east: east, | ||
center: Point::new((west + east) / 2f64, (south + north) / 2f64), | ||
code_length: code_length | ||
} | ||
} | ||
|
||
pub fn merge(self, other: CodeArea) -> CodeArea { | ||
CodeArea::new( | ||
self.south + other.south, | ||
self.west + other.west, | ||
self.north + other.north, | ||
self.east + other.east, | ||
self.code_length + other.code_length | ||
) | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
// A separator used to break the code into two parts to aid memorability. | ||
pub const SEPARATOR: char = '+'; | ||
|
||
// The number of characters to place before the separator. | ||
pub const SEPARATOR_POSITION: usize = 8; | ||
|
||
// The character used to pad codes. | ||
pub const PADDING_CHAR: char = '0'; | ||
pub const PADDING_CHAR_STR: &'static str = "0"; | ||
|
||
// The character set used to encode the values. | ||
pub const CODE_ALPHABET: [char; 20] = [ | ||
'2', '3', '4', '5', '6', | ||
'7', '8', '9', 'C', 'F', | ||
'G', 'H', 'J', 'M', 'P', | ||
'Q', 'R', 'V', 'W', 'X', | ||
]; | ||
|
||
// The base to use to convert numbers to/from. | ||
pub const ENCODING_BASE: f64 = 20f64; | ||
|
||
// The maximum value for latitude in degrees. | ||
pub const LATITUDE_MAX: f64 = 90f64; | ||
|
||
// The maximum value for longitude in degrees. | ||
pub const LONGITUDE_MAX: f64 = 180f64; | ||
|
||
// Maxiumum code length using lat/lng pair encoding. The area of such a | ||
// code is approximately 13x13 meters (at the equator), and should be suitable | ||
// for identifying buildings. This excludes prefix and separator characters. | ||
pub const PAIR_CODE_LENGTH: usize = 10; | ||
|
||
// The resolution values in degrees for each position in the lat/lng pair | ||
// encoding. These give the place value of each position, and therefore the | ||
// dimensions of the resulting area. | ||
pub const PAIR_RESOLUTIONS: [f64; 5] = [ | ||
20.0f64, 1.0f64, 0.05f64, 0.0025f64, 0.000125f64 | ||
]; | ||
|
||
// Number of columns in the grid refinement method. | ||
pub const GRID_COLUMNS: f64 = 4f64; | ||
|
||
// Number of rows in the grid refinement method. | ||
pub const GRID_ROWS: f64 = 5f64; | ||
|
||
// Minimum length of a code that can be shortened. | ||
pub const MIN_TRIMMABLE_CODE_LEN: usize = 6; | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AFAICT most other travis configs are using apt-get to fetch and install rust-nightly. Is this possible?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, that was painful to implement! I'll have to invest a bit of time in a local setup of TravisCI so I can verify it works before pushing changes, going forward!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I know, Travis changes can be painful.