Merge pull request #36 from jdroenner/travis

adapted travis.yml to GDAL 2.x from ubuntugis-stable on trusty
georust · Aug 20, 2017 · 6453a53 · 6453a53
2 parents d47e6c7 + 82b1076
commit 6453a53
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,16 @@
 language: rust
-sudo: false
+sudo: enabled
+dist: trusty
+
+before_install:
+  - sudo add-apt-repository ppa:ubuntugis/ppa -y
+  - sudo apt-get update -q
+  - sudo apt-get install -y libgdal-dev libgdal20
 
 addons:
-  apt:
-    packages:
-    - libgdal-dev
-    - libgdal1-dev
-    - libgdal1h
+ apt:
+  packages:
+    - build-essential
 
 rust:
   - stable

diff --git a/src/spatial_ref/tests.rs b/src/spatial_ref/tests.rs
@@ -50,7 +50,8 @@ fn transform_coordinates(){
 #[test]
 fn transform_ogr_geometry(){
     //let expected_value = "POLYGON ((5509543.150809700600803 1716062.191619219258428,5467122.000330002978444 1980151.204280239529908,5623571.028492723591626 2010213.310253676958382,5671834.921544363722205 1746968.078280254499987,5509543.150809700600803 1716062.191619219258428))";
-    let expected_value = "POLYGON ((5509543.15080969966948 1716062.191619222285226,5467122.000330002047122 1980151.204280242323875,5623571.028492721728981 2010213.31025367998518,5671834.921544362790883 1746968.078280256595463,5509543.15080969966948 1716062.191619222285226))";
+    //let expected_value = "POLYGON ((5509543.15080969966948 1716062.191619222285226,5467122.000330002047122 1980151.204280242323875,5623571.028492721728981 2010213.31025367998518,5671834.921544362790883 1746968.078280256595463,5509543.15080969966948 1716062.191619222285226))";
+    let expected_value = "POLYGON ((5509543.1508097 1716062.19161922,5467122.00033 1980151.20428024,5623571.02849272 2010213.31025368,5671834.92154436 1746968.07828026,5509543.1508097 1716062.19161922))";
     let geom = Geometry::from_wkt("POLYGON((23.43 37.58, 23.43 40.0, 25.29 40.0, 25.29 37.58, 23.43 37.58))").unwrap();
     let spatial_ref1 = SpatialRef::from_proj4("+proj=laea +lat_0=52 +lon_0=10 +x_0=4321000 +y_0=3210000 +ellps=GRS80 +units=m +no_defs").unwrap();
     let spatial_ref2 = SpatialRef::from_wkt("GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",7030]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY[\"EPSG\",6326]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",8901]],UNIT[\"DMSH\",0.0174532925199433,AUTHORITY[\"EPSG\",9108]],AXIS[\"Lat\",NORTH],AXIS[\"Long\",EAST],AUTHORITY[\"EPSG\",4326]]").unwrap();

diff --git a/src/vector/tests/mod.rs b/src/vector/tests/mod.rs
@@ -130,6 +130,7 @@ fn test_schema() {
         .map(|f| (f.name(), f.field_type()))
         .collect();
     let ok_names_types: Vec<(String, OGRFieldType)> = vec!(
+        ("id", OGRFieldType::OFTString),
         ("kind", OGRFieldType::OFTString),
         ("sort_key",  OGRFieldType::OFTReal),
         ("is_link", OGRFieldType::OFTString),