From d1df1fd2bb274574fd895f6984892b3aba372f48 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 6 May 2015 11:57:43 +0200 Subject: Fixed #24207 -- Added 25D-type geometry field support to ogrinspect Thanks Michael Diener for the report and sample data, and Tim Graham for the review. --- tests/gis_tests/data/gas_lines/gas_leitung.dbf | Bin 0 -> 5454 bytes tests/gis_tests/data/gas_lines/gas_leitung.prj | 1 + tests/gis_tests/data/gas_lines/gas_leitung.shp | Bin 0 -> 38060 bytes tests/gis_tests/data/gas_lines/gas_leitung.shx | Bin 0 -> 1804 bytes tests/gis_tests/inspectapp/tests.py | 4 ++++ 5 files changed, 5 insertions(+) create mode 100644 tests/gis_tests/data/gas_lines/gas_leitung.dbf create mode 100644 tests/gis_tests/data/gas_lines/gas_leitung.prj create mode 100644 tests/gis_tests/data/gas_lines/gas_leitung.shp create mode 100644 tests/gis_tests/data/gas_lines/gas_leitung.shx (limited to 'tests') diff --git a/tests/gis_tests/data/gas_lines/gas_leitung.dbf b/tests/gis_tests/data/gas_lines/gas_leitung.dbf new file mode 100644 index 0000000000..6d660b9fe2 Binary files /dev/null and b/tests/gis_tests/data/gas_lines/gas_leitung.dbf differ diff --git a/tests/gis_tests/data/gas_lines/gas_leitung.prj b/tests/gis_tests/data/gas_lines/gas_leitung.prj new file mode 100644 index 0000000000..d9a43f4357 --- /dev/null +++ b/tests/gis_tests/data/gas_lines/gas_leitung.prj @@ -0,0 +1 @@ +PROJCS["MGI_Ferro_Austria_GK_East",GEOGCS["GCS_MGI_Ferro",DATUM["D_MGI",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Ferro",-17.66666666666667],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",-5000000.0],PARAMETER["Central_Meridian",34.0],PARAMETER["Scale_Factor",1.0],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]] \ No newline at end of file diff --git a/tests/gis_tests/data/gas_lines/gas_leitung.shp b/tests/gis_tests/data/gas_lines/gas_leitung.shp new file mode 100644 index 0000000000..6eb9df876a Binary files /dev/null and b/tests/gis_tests/data/gas_lines/gas_leitung.shp differ diff --git a/tests/gis_tests/data/gas_lines/gas_leitung.shx b/tests/gis_tests/data/gas_lines/gas_leitung.shx new file mode 100644 index 0000000000..273a6c91ef Binary files /dev/null and b/tests/gis_tests/data/gas_lines/gas_leitung.shx differ diff --git a/tests/gis_tests/inspectapp/tests.py b/tests/gis_tests/inspectapp/tests.py index f13390aa19..ca2dce72de 100644 --- a/tests/gis_tests/inspectapp/tests.py +++ b/tests/gis_tests/inspectapp/tests.py @@ -91,6 +91,10 @@ class OGRInspectTest(TestCase): shp_file = os.path.join(TEST_DATA, 'test_poly', 'test_poly.shp') model_def = ogrinspect(shp_file, 'MyModel', multi_geom=True) self.assertIn('geom = models.MultiPolygonField(srid=-1)', model_def) + # Same test with a 25D-type geometry field + shp_file = os.path.join(TEST_DATA, 'gas_lines', 'gas_leitung.shp') + model_def = ogrinspect(shp_file, 'MyModel', multi_geom=True) + self.assertIn('geom = models.MultiLineStringField(srid=-1)', model_def) def test_date_field(self): shp_file = os.path.join(TEST_DATA, 'cities', 'cities.shp') -- cgit v1.3