# HG changeset patch
# User ecology
# Date 1560439755 14400
# Node ID 5b2417aa0b62f7186a24655dae3c1fa0827b574f
# Parent  7bdf6ee695a80d18a92c1be0c371287e9868ada6
planemo upload for repository https://github.com/galaxyecology/tools-ecology/tree/master/tools/gdal commit d2c064afb4680f459012473e4de8653079e32c15

diff -r 7bdf6ee695a8 -r 5b2417aa0b62 gdal_macros.xml
--- a/gdal_macros.xml	Thu Feb 28 04:43:13 2019 -0500
+++ b/gdal_macros.xml	Thu Jun 13 11:29:15 2019 -0400
@@ -1,5 +1,5 @@
 <macros>
-    <token name="@VERSION@">2.4.0</token>  
+    <token name="@VERSION@">3.0.0</token>  
     <xml name="gdal_requirements">
         <requirements>
             <requirement type="package" version="@VERSION@">gdal</requirement>
diff -r 7bdf6ee695a8 -r 5b2417aa0b62 ogrinfo.xml
--- a/ogrinfo.xml	Thu Feb 28 04:43:13 2019 -0500
+++ b/ogrinfo.xml	Thu Jun 13 11:29:15 2019 -0400
@@ -5,19 +5,25 @@
     </macros>
     <expand macro="gdal_requirements" />
     <command detect_errors="exit_code"><![CDATA[
-        ogrinfo -ro '$input1'  -al 
-            #if $settings.advanced=='advanced'
-                #if $settings.condi_sql.sql=='sql':
-                    #if str($settings.condi_sql.sql_statement).strip()!='':
-                        -sql '$settings.condi_sql.sql_statement'
-                    #end if
+    ogrinfo -ro
+        #if $input1.is_of_type("shp") 
+            ${os.path.join( $input1.extra_files_path, 'shapefile.shp' )} 
+        #else
+            '$input1' 
+        #end if
+        -al
+        #if $settings.advanced=='advanced'
+            #if $settings.condi_sql.sql=='sql':
+                #if str($settings.condi_sql.sql_statement).strip()!='':
+                    -sql '$settings.condi_sql.sql_statement'
                 #end if
-                $settings.so
             #end if
+            $settings.so
+        #end if
         > '$output'
     ]]></command>
     <inputs>
-        <param type="data" name="input1" format="xml,txt,netcdf" label="Gdal supported vector input file" help="Currently supported format are GeoJSON GML KML and WFS"/>
+        <param type="data" name="input1" format="xml,txt,netcdf,shp" label="Gdal supported vector input file" help="Currently supported format are GeoJSON GML KML, WFS and Shapefile"/>
         <conditional name="settings">
             <expand macro="gdal_advanced_params_select"/>
             <when value="advanced">
@@ -46,20 +52,20 @@
         <test>
             <param name="input1" value="custom.geo.json"/>
             <param name="advanced" value="simple"/>
-            <output name="output" file="ogrinfo_test1_out2.txt" lines_diff="82"/>
+            <output name="output" file="ogrinfo_test1_out2.txt" lines_diff="85"/>
         </test>
-<!--
-     #Layername OGRGeoJSON is basicaly input filename, so in Galaxy it become "dataset_X". I couldn't create a test using the sql option, "X" will change every time we add or remove a testfile.
-     <test>
-            <param name="input1" value="custom.geo.json"/>
-            <param name="advanced" value="advanced"/>
-            <param name="sql" value="sql"/>
-            <param name="sql_statement" value="SELECT * FROM OGRGeoJSON"/> 
-            <param name="so" value="-so"/>
-            <output name="output" file="ogrinfo_test2_out2.txt" lines_diff="4"/>
+        <test>
+            <param name="input1" value="shp_compositefiles/shapefile.html" ftype="shp">
+                <composite_data value="shp_compositefiles/shapefile.shp"/>
+                <composite_data value="shp_compositefiles/shapefile.shx"/>
+                <composite_data value="shp_compositefiles/shapefile.dbf"/>
+                <composite_data value="shp_compositefiles/shapefile.sbn"/>
+                <composite_data value="shp_compositefiles/shapefile.sbx"/>
+            </param>
+            <param name="advanced" value="simple"/>
+            <output name="output" file="ogrinfo_shp.txt" lines_diff="2"/>
         </test>
--->
-   </tests>
+    </tests>
     <help><![CDATA[
 ========
 Ogrinfo
@@ -83,7 +89,7 @@
 
 http://www.gdal.org
 
-http://www.gdal.org/ogr_utilities.html
+https://gdal.org/programs/ogrinfo.html
 
 http://download.osgeo.org/gdal/workshop/foss4ge2015/workshop_gdal.pdf
     ]]></help>
diff -r 7bdf6ee695a8 -r 5b2417aa0b62 test-data/ogrinfo_shp.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/ogrinfo_shp.txt	Thu Jun 13 11:29:15 2019 -0400
@@ -0,0 +1,163 @@
+INFO: Open of `/tmp/tmp5x4JIA/files/000/dataset_1_files/shapefile.shp'
+      using driver `ESRI Shapefile' successful.
+
+Layer name: shapefile
+Metadata:
+  DBF_DATE_LAST_UPDATE=1996-04-30
+Geometry: Line String
+Feature Count: 30
+Extent: (-115.041496, 15.439924) - (-90.658142, 32.720833)
+Layer SRS WKT:
+(unknown)
+NAME: String (40.0)
+SYSTEM: String (40.0)
+OGRFeature(shapefile):0
+  NAME (String) = Amajac
+  SYSTEM (String) = (null)
+  LINESTRING (-98.7458343505859 21.275203704834,-98.7814025878906 21.1805534362793,-98.9561157226562 21.0749969482422,-98.9625091552734 21.0119438171387,-99.0036163330078 21.0180549621582,-99.0561218261719 20.9449996948242,-99.0222320556641 20.8469429016113,-98.9613952636719 20.8163871765137,-98.8886260986328 20.5819435119629,-98.8352813720703 20.5222206115723,-98.8114013671875 20.3349990844727,-98.7308349609375 20.3258323669434,-98.6977844238281 20.2838859558105)
+
+OGRFeature(shapefile):1
+  NAME (String) = Balsas
+  SYSTEM (String) = Balsas
+  MULTILINESTRING ((-102.915557861328 19.9305534362793,-102.807342529297 19.8991508483887,-102.891403198242 19.8308296203613,-102.829452514648 19.7719421386719,-102.780288696289 19.4730529785156,-102.745010375977 19.4249992370605,-102.781402587891 19.3777770996094,-102.778625488281 19.2988624572754,-102.812225341797 19.3569412231445,-103.067230224609 19.4474983215332,-103.064727783203 19.556941986084),(-102.778625488281 19.2988624572754,-102.771392822266 19.1747207641602,-102.637222290039 19.0530548095703,-102.487228393555 19.0136108398438,-102.317779541016 18.8994407653809,-102.131958007812 18.8538856506348,-102.072509765625 18.8486099243164,-102.080291748047 18.892219543457,-102.052230834961 18.913330078125,-102.024726867676 18.8186073303223,-102.001106262207 18.9013862609863,-101.973068237305 18.8866653442383,-101.950286865234 18.9124984741211,-102.000839233398 18.7980537414551,-101.966667175293 18.7616653442383,-101.935012817383 18.7941665649414,-101.933616638184 18.7580528259277,-101.870292663574 18.752498626709,-101.892501831055 18.7308311462402,-101.871116638184 18.692497253418,-101.809448242188 18.7422218322754,-101.852783203125 18.6283302307129,-101.70556640625 18.6705551147461,-101.683059692383 18.6183319091797,-101.651123046875 18.6174964904785,-101.621948242188 18.6763877868652,-101.60334777832 18.594165802002,-101.561683654785 18.5991630554199,-101.559173583984 18.5347213745117,-101.513343811035 18.498607635498,-101.295562744141 18.5336074829102),(-102.131958007812 18.8538856506348,-102.016403198242 18.7838859558105,-102.000289916992 18.7316665649414,-101.926391601562 18.715274810791,-101.9375 18.6799964904785,-101.876106262207 18.6752777099609,-101.911392211914 18.6499977111816,-101.877227783203 18.6199989318848,-101.918060302734 18.5144424438477,-101.888343811035 18.494441986084,-101.888633728027 18.439998626709,-101.994743347168 18.4752769470215,-101.896118164062 18.4077758789062,-101.870292663574 18.3172187805176,-101.900283813477 18.2613868713379),(-101.295562744141 18.5336074829102,-101.347229003906 18.4622192382812,-101.436111450195 18.4661102294922,-101.427230834961 18.4272193908691,-101.587783813477 18.5158309936523,-101.634170532227 18.5922203063965,-101.725852966309 18.5322189331055,-101.769180297852 18.5769424438477,-101.847778320312 18.5477752685547,-101.870010375977 18.4916648864746,-101.851119995117 18.2958297729492,-101.787231445312 18.2894439697266,-101.836402893066 18.2391662597656,-101.900283813477 18.2613868713379),(-101.295562744141 18.5336074829102,-101.087509155273 18.5011100769043,-101.011123657227 18.517219543457,-100.946670532227 18.4419441223145,-100.909454345703 18.4499969482422,-100.915283203125 18.4774971008301,-100.793060302734 18.4722213745117,-100.732788085938 18.4063873291016,-100.692230224609 18.4152755737305,-100.695556640625 18.3058319091797,-100.628067016602 18.3344421386719,-100.54084777832 18.2024993896484,-100.493347167969 18.1983299255371,-100.496948242188 18.1488876342773,-100.330001831055 18.1702766418457,-100.335556030273 18.1099967956543,-100.270278930664 18.1249961853027,-100.111114501953 18.0508308410645,-100.040283203125 17.9697189331055,-99.9608459472656 17.9541664123535,-99.7630615234375 17.9949989318848,-99.5361175537109 17.9216651916504,-99.3944549560547 17.9524993896484,-99.2575073242188 17.9058303833008,-99.0338897705078 17.8908309936523,-98.9327850341797 17.9722213745117,-98.9294586181641 18.0255546569824,-98.8300018310547 18.0352745056152,-98.7564849853516 18.1204719543457,-98.6361236572266 18.0752754211426,-98.6341705322266 18.1080551147461,-98.5791778564453 18.1111106872559,-98.4800872802734 18.1897811889648),(-101.900283813477 18.2613868713379,-101.987503051758 18.202220916748,-102.146118164062 18.1741638183594,-102.179748535156 17.9216651916504),(-98.4800872802734 18.1897811889648,-98.4013977050781 18.323055267334,-98.2713928222656 18.4019432067871,-98.2536163330078 18.506664276123,-98.1908416748047 18.5886077880859,-97.9947357177734 18.6797218322754,-97.9061126708984 18.7616653442383,-97.9202880859375 18.8127746582031,-97.9955596923828 18.8308296203613,-98.1158447265625 18.9363861083984,-98.1552886962891 18.9216651916504,-98.2730560302734 18.9644432067871,-98.2227783203125 19.0413856506348,-98.2183380126953 19.1247215270996,-98.2836151123047 19.2830543518066,-98.1327819824219 19.3449974060059,-98.0258483886719 19.4288864135742),(-98.4800872802734 18.1897811889648,-98.4044494628906 18.1991653442383,-98.3350067138672 18.1627769470215,-98.2927856445312 18.0361099243164,-98.1600036621094 17.9724998474121,-98.1083374023438 17.673885345459,-98.0055694580078 17.6141662597656,-97.9466705322266 17.4630546569824,-97.8861236572266 17.4408302307129,-97.7783355712891 17.2572212219238,-97.7733459472656 17.0527763366699))
+
+OGRFeature(shapefile):2
+  NAME (String) = Bavispe
+  SYSTEM (String) = Yaqui
+  LINESTRING (-109.619186401367 28.9040546417236,-109.583618164062 28.9308319091797,-109.655563354492 29.1016654968262,-109.579177856445 29.1283302307129,-109.410278320312 29.1022186279297,-109.235000610352 29.2344436645508,-109.227508544922 29.4249992370605,-109.258346557617 29.4411087036133,-109.233901977539 29.5409545898438,-109.301956176758 29.8477745056152,-109.259170532227 29.9852752685547,-109.29362487793 30.009162902832,-109.260009765625 30.0269432067871,-109.259170532227 30.0761108398438,-109.316116333008 30.116943359375,-109.309722900391 30.2116661071777,-109.376113891602 30.3341636657715,-109.338623046875 30.5149993896484,-109.374725341797 30.6466636657715,-109.316955566406 30.6849975585938,-109.341674804688 30.7136077880859,-109.29084777832 30.7366638183594,-109.253341674805 30.8097190856934,-109.17333984375 30.8261108398438,-109.113342285156 30.8138885498047,-108.957504272461 30.6144409179688,-108.965835571289 30.5424995422363,-108.917785644531 30.4380531311035,-108.962509155273 30.2930526733398,-108.892791748047 30.275276184082,-108.901123046875 30.2219429016113,-108.813903808594 30.1852760314941,-108.757232666016 30.017219543457,-108.683624267578 29.9702758789062,-108.628616333008 29.850830078125,-108.569458007812 29.8061103820801,-108.552505493164 29.6744422912598,-108.423889160156 29.5672187805176,-108.418060302734 29.5038871765137)
+
+OGRFeature(shapefile):3
+  NAME (String) = Colorado
+  SYSTEM (String) = Colorado
+  LINESTRING (-114.721244812012 32.720832824707,-114.721260070801 32.7208099365234,-114.808601379395 32.6159934997559,-114.819305419922 32.5044479370117,-114.936698913574 32.4730491638184,-114.964202880859 32.3686103820801,-115.041496276855 32.2546691894531,-114.998901367188 32.1361083984375,-115.01789855957 31.94748878479)
+
+OGRFeature(shapefile):4
+  NAME (String) = Conchos
+  SYSTEM (String) = Rio Grande
+  MULTILINESTRING ((-106.904174804688 27.8444442749023,-106.622512817383 27.8161087036133,-106.484451293945 27.8469429016113,-106.425842285156 27.890552520752,-106.252227783203 27.823055267334,-106.197784423828 27.8780517578125,-106.083343505859 27.9172210693359,-105.924179077148 27.9074974060059,-105.765838623047 27.9888877868652,-105.76806640625 28.0441665649414,-105.676963806152 28.1488876342773,-105.54362487793 28.1799964904785,-105.39567565918 28.3470497131348,-105.431396484375 28.4688873291016,-105.388900756836 28.6027755737305,-105.462783813477 28.6369438171387,-105.459167480469 28.7436103820801,-105.488891601562 28.7913856506348,-105.461120605469 28.8302764892578,-105.311401367188 28.8758316040039,-105.328338623047 28.9211082458496,-105.298614501953 28.92138671875,-105.266403198242 29.0086097717285,-105.149169921875 29.0483322143555,-105.05500793457 29.1627769470215,-105.055282592773 29.2463874816895,-104.998611450195 29.2561073303223,-104.961944580078 29.3161087036133,-104.904449462891 29.3386077880859,-104.921401977539 29.3763885498047,-104.877227783203 29.4219436645508,-104.865005493164 29.4958305358887,-104.902236938477 29.5511093139648,-104.715286254883 29.5022201538086,-104.595001220703 29.5702743530273,-104.480560302734 29.5294418334961,-104.436172485352 29.5984878540039),(-105.39567565918 28.3470497131348,-105.274169921875 28.2361106872559,-105.310287475586 28.1533317565918,-105.270278930664 28.0441665649414,-105.175003051758 27.9247207641602,-105.158340454102 27.7019424438477,-105.222503662109 27.640552520752,-105.435287475586 27.5422210693359,-105.550003051758 27.5583305358887,-105.585563659668 27.5283317565918,-105.71028137207 27.5308303833008,-105.73779296875 27.5661087036133,-105.85334777832 27.4047203063965,-105.877227783203 27.4136085510254,-105.956680297852 27.325553894043,-106.034729003906 27.348331451416,-106.103622436523 27.4197196960449,-106.14111328125 27.408332824707,-106.209457397461 27.4458312988281,-106.276275634766 27.4065017700195,-106.290557861328 27.2411079406738,-106.332504272461 27.2099990844727,-106.341400146484 27.0311088562012,-106.282501220703 26.7638854980469,-106.221389770508 26.7019424438477,-106.244445800781 26.5074996948242,-106.195007324219 26.3661079406738,-106.330841064453 26.3058319091797,-106.428894042969 26.3966636657715,-106.429168701172 26.4330520629883))
+
+OGRFeature(shapefile):5
+  NAME (String) = Cutzamala
+  SYSTEM (String) = Rio Grande de Santiago
+  LINESTRING (-101.160308837891 20.5465469360352,-101.15055847168 20.4888877868652,-101.08528137207 20.4702758789062,-101.013336181641 20.3872184753418,-101.011123657227 20.288330078125,-100.920837402344 20.2674980163574,-100.883895874023 20.140552520752,-100.759735107422 20.0591659545898,-100.670562744141 20.0263862609863,-100.519729614258 20.0713882446289,-100.410003662109 19.9533309936523,-100.318344116211 19.9119415283203,-100.168334960938 20.0886077880859,-100.068069458008 20.0205535888672,-99.9772338867188 19.8633308410645,-99.9205627441406 19.8516654968262,-99.9355621337891 19.8299980163574,-99.8641815185547 19.73388671875,-99.8625030517578 19.6458320617676,-99.7791748046875 19.5961074829102,-99.7491760253906 19.5011100769043,-99.5413970947266 19.3691635131836,-99.5027923583984 19.129997253418)
+
+OGRFeature(shapefile):6
+  NAME (String) = Grijalva
+  SYSTEM (String) = Usumacinta
+  LINESTRING (-92.2174530029297 18.224967956543,-92.3066711425781 18.2261085510254,-92.4791717529297 18.2899971008301,-92.58056640625 18.3847198486328,-92.6656188964844 18.4067115783691,-92.7302856445312 18.1711082458496,-92.6925048828125 18.1597213745117,-92.7011260986328 18.1233329772949,-92.7572326660156 18.0738868713379,-92.8739013671875 18.0458297729492,-92.9111175537109 17.9583320617676,-92.9780578613281 17.9666633605957,-93.0249862670898 17.9239597320557,-93.1422271728516 17.9436092376709,-93.2641830444336 17.9913902282715,-93.3094482421875 17.9597206115723,-93.3919525146484 17.607780456543,-93.5171203613281 17.5156402587891,-93.4494476318359 17.3783302307129,-93.4080657958984 17.3627777099609,-93.4300079345703 17.3247184753418,-93.4991760253906 17.366943359375,-93.5433349609375 17.3522186279297,-93.5347290039062 17.2402763366699,-93.5960845947266 17.1846923828125,-93.5750122070312 17.1616630554199,-93.5058441162109 17.181941986084,-93.4941711425781 17.131664276123,-93.3944549560547 17.0944442749023,-93.3886260986328 17.0416641235352,-93.2833404541016 17.0063858032227,-93.2072296142578 17.035831451416,-93.1075134277344 16.9669418334961,-93.1136169433594 16.873607635498,-93.0686187744141 16.8411102294922,-93.0741729736328 16.7991638183594,-93.0219573974609 16.719165802002,-92.899169921875 16.5763854980469,-92.7639007568359 16.517219543457,-92.7561187744141 16.4047203063965,-92.8238983154297 16.2977752685547,-92.5969543457031 16.1827774047852,-92.4989013671875 16.2513885498047,-92.5361175537109 16.1474990844727,-92.1030578613281 15.9124984741211,-92.0655670166016 15.8541660308838,-92.1389007568359 15.8966655731201,-92.2350006103516 15.7841663360596,-92.1530609130859 15.6902770996094,-92.1602783203125 15.5972213745117,-92.1163940429688 15.5391654968262,-92.106071472168 15.4399242401123)
+
+OGRFeature(shapefile):7
+  NAME (String) = Lacantum
+  SYSTEM (String) = Usumacinta
+  LINESTRING (-91.1477966308594 16.1442794799805,-91.0291748046875 16.0986099243164,-90.9119567871094 16.1366653442383,-90.8825073242188 16.1772193908691,-90.9088897705078 16.204719543457,-90.8516693115234 16.2177772521973,-90.8700103759766 16.3136100769043,-90.7633361816406 16.3369407653809,-90.7611236572266 16.4258308410645,-90.7227783203125 16.470832824707,-90.7194519042969 16.4163856506348,-90.6763916015625 16.4599990844727,-90.6963958740234 16.4941635131836,-90.665283203125 16.5055541992188,-90.6838989257812 16.577220916748,-90.6581420898438 16.6442737579346)
+
+OGRFeature(shapefile):8
+  NAME (String) = Lerma
+  SYSTEM (String) = Rio Grande de Santiago
+  LINESTRING (-102.772399902344 20.196891784668,-102.622222900391 20.2291641235352,-102.443618774414 20.3380546569824,-102.211669921875 20.3430519104004,-102.10880279541 20.3890800476074,-101.995559692383 20.4030532836914,-101.994171142578 20.3269424438477,-101.98063659668 20.3673667907715,-101.950561523438 20.3644409179688,-101.920303344727 20.2110939025879,-101.888862609863 20.1911029815674,-101.820625305176 20.2117519378662,-101.673889160156 20.1908302307129,-101.606948852539 20.3180541992188,-101.460594177246 20.3336925506592,-101.4375 20.345832824707,-101.384170532227 20.4236106872559,-101.389450073242 20.4799995422363,-101.325561523438 20.5461082458496,-101.280563354492 20.5397186279297,-101.236953735352 20.5830535888672,-101.160308837891 20.5465469360352,-100.80778503418 20.4797210693359,-100.756958007812 20.5213851928711,-100.773345947266 20.5549964904785,-100.737228393555 20.6152763366699,-100.836944580078 20.8316650390625,-100.783615112305 20.9097213745117,-100.799453735352 21.0508308410645,-100.818893432617 21.1291656494141,-100.994735717773 21.3133316040039,-101.148345947266 21.3641662597656,-101.284729003906 21.3152770996094)
+
+OGRFeature(shapefile):9
+  NAME (String) = Moctezuma Panuco
+  SYSTEM (String) = (null)
+  MULTILINESTRING ((-97.7775115966797 22.2680549621582,-97.8491668701172 22.2138862609863,-97.9947357177734 22.2088851928711,-98.0119476318359 22.146110534668,-98.0519561767578 22.1438865661621,-98.0358428955078 22.1074981689453,-98.0652923583984 22.1019439697266,-98.0283355712891 22.0788879394531,-98.1072235107422 22.0774993896484,-98.1138916015625 22.0327758789062,-98.1441802978516 22.0663871765137,-98.1730651855469 22.0536079406738,-98.151123046875 22.1027755737305,-98.1830596923828 22.0855522155762,-98.2014007568359 22.1116638183594,-98.2808380126953 22.0444412231445,-98.3344573974609 22.0652770996094,-98.3658447265625 22.0202751159668,-98.4025115966797 22.0411109924316,-98.4263916015625 21.9574966430664,-98.5885620117188 21.9752597808838,-98.5733337402344 21.9411087036133,-98.5186157226562 21.9513854980469,-98.5550079345703 21.9333305358887,-98.5372314453125 21.9116630554199,-98.5639038085938 21.8844413757324,-98.5211181640625 21.8366661071777,-98.4902801513672 21.8519439697266,-98.4508361816406 21.7822189331055,-98.5252838134766 21.7205543518066,-98.5627899169922 21.7283325195312,-98.5627899169922 21.6894416809082,-98.61279296875 21.6947212219238,-98.6422653198242 21.6088275909424,-98.8155670166016 21.4761085510254,-98.8105621337891 21.4138870239258,-98.7158355712891 21.3099975585938,-98.7458343505859 21.275203704834),(-99.290283203125 21.1458320617676,-99.3175048828125 21.1013870239258,-99.3764038085938 21.0936088562012,-99.3450012207031 21.0452766418457,-99.3861236572266 20.9258308410645,-99.4263916015625 20.8677749633789,-99.4788970947266 20.8522186279297,-99.5191802978516 20.725830078125,-99.4541778564453 20.6269416809082,-99.2469482421875 20.5355529785156,-99.2066802978516 20.4555549621582,-99.1994476318359 20.2511100769043,-99.3519592285156 20.1591644287109,-99.3094482421875 19.9688873291016),(-98.7458343505859 21.275203704834,-99.2066802978516 21.1138877868652,-99.290283203125 21.1458320617676))
+
+OGRFeature(shapefile):10
+  NAME (String) = Moctezuma Yaqui
+  SYSTEM (String) = Yaqui
+  LINESTRING (-109.573059082031 30.5288887023926,-109.635284423828 30.3083305358887,-109.795013427734 30.1658325195312,-109.782791137695 30.0080528259277,-109.741958618164 29.9619407653809,-109.743621826172 29.8747215270996,-109.681396484375 29.7999992370605,-109.616958618164 29.533332824707,-109.664169311523 29.4469413757324,-109.651123046875 29.3861083984375,-109.75862121582 29.3558311462402,-109.71085357666 29.1061096191406,-109.619186401367 28.9040546417236)
+
+OGRFeature(shapefile):11
+  NAME (String) = Nazas
+  SYSTEM (String) = (null)
+  LINESTRING (-105.097229003906 24.035831451416,-105.186950683594 24.244441986084,-105.151947021484 24.3027763366699,-105.192230224609 24.3594436645508,-105.161117553711 24.4333305358887,-105.327514648438 24.7599983215332,-105.313064575195 24.8188858032227,-105.36279296875 24.8766632080078,-105.448059082031 25.2163887023926,-105.153060913086 25.5441665649414,-105.096954345703 25.5194435119629,-105.006118774414 25.5819435119629,-104.939178466797 25.5849990844727,-104.88166809082 25.4958305358887,-104.892501831055 25.4574966430664,-104.697509765625 25.3127746582031,-104.620010375977 25.3088874816895,-104.528900146484 25.1391639709473,-104.325286865234 25.1269416809082,-104.044174194336 25.2669410705566,-103.728897094727 25.2697219848633,-103.72917175293 25.4491653442383,-103.495010375977 25.5394439697266,-103.349731445312 25.6780548095703,-103.265563964844 25.6919441223145,-103.204177856445 25.7513885498047,-103.039459228516 25.6799964904785,-102.878616333008 25.6927757263184)
+
+OGRFeature(shapefile):12
+  NAME (String) = Papigochic
+  SYSTEM (String) = Yaqui
+  MULTILINESTRING ((-108.7392578125 28.9675445556641,-108.709167480469 28.9058303833008,-108.720794677734 28.8204536437988,-108.663619995117 28.7072219848633,-108.5625 28.631664276123),(-109.233901977539 29.5409545898438,-109.170837402344 29.527774810791,-109.011947631836 29.3672218322754,-108.964172363281 29.3766632080078,-108.881393432617 29.1827774047852,-108.806945800781 29.1638870239258,-108.7392578125 28.9675445556641,-108.692504882812 28.9766654968262,-108.70361328125 29.083610534668,-108.570007324219 29.1847190856934,-108.583343505859 29.3177757263184,-108.485000610352 29.3883323669434,-108.38166809082 29.3844413757324,-108.346389770508 29.3466644287109,-108.348617553711 29.2263870239258,-108.269729614258 29.0424995422363,-108.220001220703 29.0099983215332,-108.095840454102 28.7847213745117,-107.959167480469 28.773609161377,-107.933334350586 28.9555549621582,-107.86279296875 29.0097198486328,-107.778625488281 28.9069442749023,-107.693893432617 28.7222213745117,-107.505844116211 28.6408309936523,-107.428344726562 28.2952766418457,-107.519180297852 28.1347198486328,-107.623901367188 28.1208305358887,-107.641677856445 28.1824989318848))
+
+OGRFeature(shapefile):13
+  NAME (String) = Pilon San Juan
+  SYSTEM (String) = Rio Grande
+  LINESTRING (-100.269180297852 25.2380523681641,-100.144180297852 25.1377754211426,-100.123901367188 25.0452766418457,-100.029724121094 25.0141639709473,-99.9325103759766 25.0380554199219,-99.8597259521484 25.1658325195312,-99.8005676269531 25.156665802002,-99.6588897705078 25.2511100769043,-99.5636138916016 25.3622207641602,-99.5291748046875 25.4897193908691,-99.4466705322266 25.4941635131836,-99.4302825927734 25.522777557373,-99.3586120605469 25.5036087036133,-99.3230590820312 25.5366630554199,-99.2875061035156 25.6852760314941,-99.2180633544922 25.719165802002,-99.2330627441406 25.7819442749023,-99.1755676269531 25.8016662597656,-99.1883392333984 26.0733299255371,-99.1344451904297 26.0563888549805,-99.0419464111328 26.1019439697266,-99.0030670166016 26.0644416809082,-98.9872283935547 26.1124992370605,-98.9372253417969 26.1269416809082,-98.9583435058594 26.1808319091797,-98.915283203125 26.2002754211426,-98.8219604492188 26.3747177124023)
+
+OGRFeature(shapefile):14
+  NAME (String) = Rio Fuerte
+  SYSTEM (String) = (null)
+  LINESTRING (-109.414169311523 25.8663864135742,-109.3466796875 25.8383331298828,-109.246398925781 25.954719543457,-109.129455566406 25.9347190856934,-109.045013427734 25.9583320617676,-108.956680297852 25.9247207641602,-108.880844116211 26.0238876342773,-108.75862121582 26.0911102294922,-108.734451293945 26.1755523681641,-108.779724121094 26.281665802002,-108.682235717773 26.3422203063965,-108.574432373047 26.5134601593018,-108.520278930664 26.5455551147461,-108.5 26.6433296203613,-108.549453735352 26.8244438171387,-108.415008544922 26.8116645812988,-108.35612487793 26.8547210693359,-108.332229614258 26.9202766418457,-108.268615722656 26.8886108398438,-108.193069458008 26.9044418334961,-108.170013427734 26.877498626709,-108.055847167969 26.898609161377,-107.993347167969 26.9452743530273,-107.923889160156 26.8913879394531,-107.874176025391 26.8933296203613,-107.788070678711 26.8124961853027,-107.503616333008 26.7186088562012,-107.427780151367 26.7319412231445,-107.260986328125 26.6385803222656,-107.049453735352 26.6749992370605,-106.967514038086 26.6533317565918,-106.827789306641 26.5430526733398,-106.848892211914 26.4738883972168,-106.658889770508 26.0088882446289)
+
+OGRFeature(shapefile):15
+  NAME (String) = Rio Grande
+  SYSTEM (String) = Rio Grande
+  MULTILINESTRING ((-106.538993835449 31.7862071990967,-106.538970947266 31.7861976623535,-106.383041381836 31.7337627410889,-106.212753295898 31.4781284332275,-105.998359680176 31.3938179016113,-105.769729614258 31.1707801818848,-105.603218078613 31.0864276885986,-105.554382324219 30.9982852935791,-105.409065246582 30.9025096893311,-105.390312194824 30.8530807495117,-105.313781738281 30.8165073394775,-105.28759765625 30.8319492340088,-105.258186340332 30.7976531982422,-105.214340209961 30.8120861053467,-105.060562133789 30.6878700256348,-104.997543334961 30.6843338012695,-104.986930847168 30.6413249969482,-104.890678405762 30.570556640625,-104.852996826172 30.3922634124756,-104.80647277832 30.3764476776123,-104.813957214355 30.3504695892334,-104.702613830566 30.238489151001,-104.674758911133 30.1489639282227,-104.696495056152 30.0573024749756,-104.674369812012 29.9092826843262,-104.577560424805 29.8079357147217,-104.535247802734 29.6794662475586,-104.436172485352 29.5984878540039,-104.377593994141 29.5506114959717,-104.204734802246 29.4840412139893,-104.16438293457 29.4007148742676,-104.045631408691 29.3281192779541,-103.786994934082 29.2672595977783,-103.767761230469 29.2812404632568,-103.782157897949 29.2297954559326,-103.739852905273 29.2303485870361,-103.720314025879 29.1906318664551,-103.526237487793 29.1466464996338,-103.474075317383 29.0721340179443,-103.375450134277 29.0321083068848,-103.335517883301 29.0503387451172,-103.280349731445 28.9863739013672,-103.266586303711 29.007453918457,-103.153465270996 28.9786815643311,-102.988098144531 29.1908626556396,-102.866172790527 29.2290363311768,-102.908325195312 29.2692031860352,-102.883010864258 29.3533706665039,-102.822204589844 29.41184425354,-102.804725646973 29.5301456451416,-102.676361083984 29.7442245483398,-102.63761138916 29.7323379516602,-102.576499938965 29.778247833252,-102.551948547363 29.7495002746582,-102.50309753418 29.7854557037354,-102.384796142578 29.7679462432861,-102.367561340332 29.8452892303467,-102.324333190918 29.8801155090332,-102.063995361328 29.7845706939697,-101.973320007324 29.8187732696533,-101.924224853516 29.788501739502,-101.81909942627 29.8141250610352,-101.805206298828 29.7799987792969,-101.759094238281 29.787166595459,-101.639671325684 29.7569599151611,-101.581489562988 29.7651500701904,-101.543952941895 29.8101196289062,-101.538345336914 29.7630176544189,-101.47046661377 29.7886905670166,-101.448425292969 29.7605857849121,-101.401275634766 29.769905090332,-101.41609954834 29.745433807373,-101.370613098145 29.6612586975098,-101.36840057373 29.6571617126465,-101.305862426758 29.6524314880371,-101.308929443359 29.5809097290039,-101.254585266113 29.6287498474121,-101.261428833008 29.5264739990234,-101.067359924316 29.4735527038574,-101.009056091309 29.373254776001,-100.796989440918 29.2425022125244,-100.768608093262 29.1665706634521,-100.668769836426 29.0800724029541,-100.64722442627 28.9223499298096,-100.589790344238 28.8942222595215,-100.497909545898 28.6609878540039,-100.403175354004 28.5897331237793,-100.419532775879 28.5441913604736,-100.345802307129 28.5008106231689,-100.376770019531 28.4786510467529,-100.351570129395 28.3941822052002,-100.292892456055 28.3203601837158,-100.297920227051 28.2803535461426,-100.22346496582 28.2414569854736,-100.214073181152 28.2019348144531,-100.096923828125 28.1542816162109,-99.9933090209961 28.0034599304199,-99.9418563842773 27.9868812561035,-99.8747329711914 27.7976856231689,-99.8157272338867 27.7801074981689,-99.7144927978516 27.6615581512451,-99.549186706543 27.6126270294189,-99.526741027832 27.5042839050293,-99.4904937744141 27.4907550811768,-99.543586730957 27.3186531066895,-99.4652709960938 27.2698841094971,-99.4371566772461 27.199197769165,-99.4550628662109 27.0286483764648,-99.3927154541016 26.9955501556396,-99.3905181884766 26.9466304779053,-99.2855224609375 26.8573608398438,-99.2847900390625 26.8556575775146),(-98.8219604492188 26.3747177124023,-98.8198318481445 26.3750705718994,-98.6779174804688 26.2420558929443,-98.599967956543 26.2604541778564,-98.4885177612305 26.2015438079834,-98.4533920288086 26.220911026001,-98.384521484375 26.1560306549072,-98.3471908569336 26.1586799621582,-98.3279342651367 26.1116466522217,-98.2922744750977 26.1328086853027,-98.271354675293 26.1208953857422,-98.2919464111328 26.0981044769287,-98.2006912231445 26.0553760528564,-98.0832138061523 26.0657577514648,-98.0763473510742 26.0346260070801,-98.0400695800781 26.0593948364258,-97.867431640625 26.0601406097412,-97.6479721069336 26.0234451293945,-97.612922668457 25.9620018005371,-97.5749359130859 25.9541721343994,-97.590087890625 25.9332313537598,-97.4343490600586 25.8451976776123,-97.3856430053711 25.8453617095947,-97.380989074707 25.9170207977295,-97.3044357299805 25.938663482666,-97.3071441650391 25.965124130249,-97.1722259521484 25.954568862915),(-99.2847900390625 26.8556575775146,-99.1658172607422 26.5798892974854,-99.1686782836914 26.5457286834717,-99.1014709472656 26.4883403778076,-99.1067276000977 26.4195308685303,-98.9392700195312 26.3953094482422,-98.9088973999023 26.3603286743164,-98.8219604492188 26.3747177124023))
+
+OGRFeature(shapefile):16
+  NAME (String) = Rio Grande de Santiago
+  SYSTEM (String) = Rio Grande de Santiago
+  MULTILINESTRING ((-102.776718139648 20.3134574890137,-102.720840454102 20.2597198486328,-102.772399902344 20.196891784668),(-104.078079223633 21.2025718688965,-104.049453735352 21.148609161377,-103.884170532227 21.0863876342773,-103.882507324219 21.0061073303223,-103.771392822266 20.9338874816895,-103.650283813477 20.9269409179688,-103.526397705078 20.9969444274902,-103.517227172852 21.0497207641602,-103.429458618164 21.0549964904785,-103.277786254883 20.7352752685547,-103.135009765625 20.6177749633789,-103.159729003906 20.4561080932617,-103.100280761719 20.4072189331055,-102.808059692383 20.3883323669434,-102.767791748047 20.3494415283203,-102.776718139648 20.3134574890137,-103.029449462891 20.3399963378906,-103.171112060547 20.2805519104004,-103.36279296875 20.2827758789062,-103.425842285156 20.2544441223145,-103.173889160156 20.1613883972168,-103.055847167969 20.1955528259277,-102.899436950684 20.1677742004395,-102.810012817383 20.1038856506348,-102.686683654785 20.1691665649414,-102.692497253418 20.2008323669434,-102.772399902344 20.196891784668))
+
+OGRFeature(shapefile):17
+  NAME (String) = Rio Salado
+  SYSTEM (String) = Rio Grande
+  LINESTRING (-102.473892211914 28.913330078125,-102.401947021484 28.9166641235352,-102.353897094727 28.8752746582031,-102.258346557617 28.6516647338867,-102.121948242188 28.6133308410645,-102.083068847656 28.5602760314941,-101.925842285156 28.5394439697266,-101.850845336914 28.4683303833008,-101.601959228516 28.3627777099609,-101.488616943359 28.2011108398438,-101.367233276367 28.1558303833008,-101.311950683594 27.9674987792969,-101.250289916992 27.9683303833008,-101.131118774414 27.8472213745117,-101.051681518555 27.8172187805176,-100.951126098633 27.6958312988281,-100.711669921875 27.6313858032227,-100.711669921875 27.5494422912598,-100.661117553711 27.4994430541992,-100.615570068359 27.5297203063965,-100.498611450195 27.4819412231445,-100.342224121094 27.3144416809082,-100.128067016602 27.2388877868652,-100.090835571289 27.1786079406738,-99.9694519042969 27.1686096191406,-99.9511260986328 27.1347198486328,-99.9950103759766 27.0583305358887,-99.9586181640625 27.0036087036133,-99.8580627441406 26.9649963378906,-99.854736328125 26.8997192382812,-99.6338958740234 26.8991661071777,-99.4633483886719 26.7799987792969,-99.2847900390625 26.8556575775146)
+
+OGRFeature(shapefile):18
+  NAME (String) = Rio Santiago
+  SYSTEM (String) = Rio Grande de Santiago
+  MULTILINESTRING ((-104.078079223633 21.2025718688965,-103.961395263672 21.2877769470215,-103.955841064453 21.3597221374512,-103.850845336914 21.5311088562012,-103.776123046875 21.7386093139648,-103.79084777832 21.9280548095703,-103.701675415039 22.0188865661621,-103.680511474609 22.1214218139648,-103.741668701172 22.2174987792969,-103.726959228516 22.396110534668,-103.675842285156 22.469165802002,-103.67529296875 22.6061096191406,-103.568618774414 22.7083320617676,-103.48112487793 22.8874969482422,-103.456954956055 22.9744415283203,-103.496948242188 23.0133323669434),(-105.448333740234 21.6730537414551,-105.362228393555 21.6799964904785,-105.313613891602 21.7227745056152,-105.286117553711 21.7072219848633,-105.271392822266 21.75,-105.234725952148 21.7288856506348,-105.217514038086 21.7991638183594,-105.063606262207 21.8049964904785,-105.013061523438 21.725830078125,-104.833068847656 21.7788887023926,-104.814453125 21.8233299255371,-104.730285644531 21.8530540466309,-104.621398925781 21.7161102294922,-104.516952514648 21.4752769470215,-104.457229614258 21.4719429016113,-104.326400756836 21.2691650390625,-104.263061523438 21.2447204589844,-104.227508544922 21.1777763366699,-104.078079223633 21.2025718688965))
+
+OGRFeature(shapefile):19
+  NAME (String) = Rio Santo Domingo
+  SYSTEM (String) = (null)
+  MULTILINESTRING ((-96.6470489501953 18.3383750915527,-96.5897369384766 18.3408317565918,-96.6869506835938 18.402774810791,-96.5675048828125 18.4199981689453,-96.5372314453125 18.381664276123,-96.6013946533203 18.3730545043945,-96.4630584716797 18.3155517578125,-96.3966598510742 18.2366638183594),(-96.6470489501953 18.3383750915527,-96.6044464111328 18.3030548095703,-96.6419525146484 18.2972221374512,-96.6019592285156 18.196662902832,-96.5052795410156 18.1283302307129,-96.4250030517578 18.1602745056152,-96.4091796875 18.0927772521973,-96.3858337402344 18.1736106872559,-96.4336242675781 18.2244415283203,-96.3589019775391 18.1947212219238,-96.3966598510742 18.2366638183594),(-96.9666748046875 18.6436080932617,-96.9019470214844 18.6744422912598,-96.8583374023438 18.5844421386719,-96.7905578613281 18.5433311462402,-96.7844543457031 18.4730529785156,-96.7263946533203 18.3849983215332,-96.6470489501953 18.3383750915527),(-96.3966598510742 18.2366638183594,-96.3275146484375 18.3002777099609,-96.236572265625 18.2137966156006,-96.2052917480469 18.180269241333,-96.1613922119141 18.1855506896973,-96.1502838134766 18.1416702270508,-96.0946502685547 18.1640796661377,-96.0853424072266 18.162281036377,-96.0672302246094 18.1774978637695,-96.0352783203125 18.1611099243164,-96.0244445800781 18.219165802002,-95.9983367919922 18.1866645812988,-95.9825134277344 18.2563858032227,-95.9572296142578 18.2186088562012,-95.9447326660156 18.25,-95.8997344970703 18.2369422912598,-95.9080657958984 18.2658309936523,-95.8114013671875 18.3222198486328,-95.8033447265625 18.3708305358887,-95.7514038085938 18.3144416809082,-95.760009765625 18.3683319091797,-95.7097320556641 18.379997253418,-95.7247314453125 18.5466651916504,-95.6966705322266 18.600830078125,-95.6636199951172 18.6005554199219,-95.6319580078125 18.6413879394531,-95.6389007568359 18.698055267334))
+
+OGRFeature(shapefile):20
+  NAME (String) = Rio Sonora
+  SYSTEM (String) = (null)
+  LINESTRING (-110.494735717773 31.2213859558105,-110.463348388672 31.1683311462402,-110.47639465332 31.0824966430664,-110.568344116211 31.0044441223145,-110.70361328125 30.8094444274902,-110.669174194336 30.6938858032227,-110.720001220703 30.2236099243164,-110.579177856445 29.8213882446289,-110.554458618164 29.6013870239258,-110.726959228516 29.5144424438477,-110.859451293945 29.2952766418457,-110.859725952148 29.1905517578125,-110.919052124023 29.0747909545898,-111.072784423828 29.1161079406738,-111.170837402344 29.1027755737305,-111.480010986328 28.9022216796875,-111.635833740234 28.8811073303223,-111.782501220703 28.7916641235352,-111.854446411133 28.798885345459)
+
+OGRFeature(shapefile):21
+  NAME (String) = Rio Trinidad
+  SYSTEM (String) = (null)
+  LINESTRING (-95.6636199951172 18.6005554199219,-95.5855560302734 18.513053894043,-95.5875091552734 18.429443359375,-95.5319519042969 18.3591651916504,-95.5086212158203 18.2355537414551,-95.4711151123047 18.2577743530273,-95.417236328125 18.1766662597656,-95.2397308349609 18.1047210693359,-95.2366790771484 18.0374984741211,-95.1416778564453 17.9416656494141,-95.1568450927734 17.8198776245117,-95.1219482421875 17.7930526733398,-95.1222229003906 17.7452774047852,-95.2491760253906 17.6216659545898,-95.3025054931641 17.504997253418,-95.4147338867188 17.4386100769043,-95.5825042724609 17.396110534668,-95.7197265625 17.2177772521973,-95.7105560302734 17.1811103820801,-95.7561187744141 17.1747207641602,-95.8075103759766 17.1141662597656,-95.8344573974609 17.013053894043,-95.9650115966797 17.0191650390625)
+
+OGRFeature(shapefile):22
+  NAME (String) = San Fernando
+  SYSTEM (String) = (null)
+  LINESTRING (-99.9827880859375 23.9386100769043,-99.7961120605469 24.0041656494141,-99.8186187744141 24.1108322143555,-99.7763977050781 24.1563873291016,-99.6977844238281 24.1344413757324,-99.6391754150391 24.1763877868652,-99.5600128173828 24.1399993896484,-99.5061187744141 24.17138671875,-99.4225006103516 24.1480522155762,-99.3363952636719 24.1894416809082,-99.2852783203125 24.1705551147461,-99.2794494628906 24.1172218322754,-99.1902923583984 24.0838851928711,-98.9566802978516 24.0666656494141,-98.7725067138672 24.0205535888672,-98.6864013671875 23.9658317565918,-98.6211242675781 23.9913864135742,-98.5872344970703 23.9372215270996,-98.5147247314453 23.9688873291016,-98.4839019775391 23.9169425964355,-98.4827880859375 23.9688873291016,-98.4375 23.9622192382812,-98.4247283935547 24.014720916748,-98.36279296875 24.0524978637695,-98.2605590820312 23.9866638183594,-98.2041778564453 23.8383331298828,-98.2450103759766 23.8027763366699,-98.1933441162109 23.7169418334961,-98.1627807617188 23.7766647338867,-98.0425262451172 23.7227783203125,-97.9808349609375 23.7922210693359,-97.8179779052734 23.7839279174805)
+
+OGRFeature(shapefile):23
+  NAME (String) = San Lorenzo
+  SYSTEM (String) = (null)
+  MULTILINESTRING ((-106.484642028809 24.7058620452881,-106.404449462891 24.7305526733398,-106.275848388672 24.8474998474121,-106.168334960938 24.8519439697266,-106.004730224609 25.0152740478516),(-106.484642028809 24.7058620452881,-106.392791748047 24.6311073303223,-106.333618164062 24.6541633605957,-106.190292358398 24.5924987792969,-106.128616333008 24.5255546569824,-105.845001220703 24.5722198486328),(-107.417785644531 24.2541656494141,-107.400283813477 24.2999992370605,-107.269454956055 24.3772201538086,-107.102233886719 24.4461097717285,-106.940567016602 24.4583320617676,-106.951950073242 24.4913864135742,-106.890289306641 24.5288887023926,-106.803344726562 24.5272216796875,-106.781677246094 24.5986099243164,-106.705841064453 24.629997253418,-106.711669921875 24.6586074829102,-106.484642028809 24.7058620452881),(-105.845001220703 24.5722198486328,-105.785278320312 24.708610534668,-105.78889465332 24.7791633605957,-105.887222290039 24.9513854980469),(-105.845001220703 24.5722198486328,-105.725006103516 24.6430549621582,-105.619171142578 24.6308326721191,-105.57389831543 24.5380554199219,-105.476669311523 24.5483322143555))
+
+OGRFeature(shapefile):24
+  NAME (String) = San Pedro
+  SYSTEM (String) = (null)
+  LINESTRING (-104.658889770508 24.192497253418,-104.609176635742 24.1969413757324,-104.583343505859 24.1283302307129,-104.445281982422 24.0847206115723,-104.398895263672 24.025276184082,-104.329452514648 24.0294418334961,-104.308624267578 23.9322204589844,-104.258895874023 23.8813858032227,-104.29084777832 23.7911109924316,-104.24528503418 23.7247200012207,-104.339736938477 23.6333312988281,-104.474731445312 23.2172203063965,-104.534454345703 23.1847190856934,-104.743347167969 23.168888092041,-104.796112060547 23.1122207641602,-105.008056640625 23.0205535888672,-105.001113891602 22.8497200012207,-104.921676635742 22.8219413757324,-104.894180297852 22.7413864135742,-104.91862487793 22.6799964904785,-104.881393432617 22.5844421386719,-104.925003051758 22.5033302307129,-104.999176025391 22.4947204589844,-105.040557861328 22.4341659545898,-105.036956787109 22.3247184753418,-104.920837402344 22.0799980163574,-104.947235107422 21.969165802002,-104.980010986328 21.9452743530273,-105.056121826172 21.9802742004395,-105.085845947266 21.9372215270996,-105.118621826172 21.9727745056152,-105.408065795898 21.9336090087891,-105.46452331543 21.8414726257324,-105.527229309082 21.8159255981445)
+
+OGRFeature(shapefile):25
+  NAME (String) = Santa Maria
+  SYSTEM (String) = (null)
+  LINESTRING (-100.960556030273 21.7558326721191,-100.901123046875 21.8430519104004,-100.814727783203 21.8980522155762,-100.750839233398 21.8677749633789,-100.725006103516 21.8038864135742,-100.5322265625 21.7586097717285,-100.411117553711 21.6799964904785,-100.267791748047 21.6391639709473,-100.051116943359 21.4677772521973,-99.8671569824219 21.4569435119629,-99.7269592285156 21.5113868713379,-99.6461181640625 21.4799995422363,-99.4950103759766 21.3183326721191,-99.42333984375 21.1666641235352,-99.290283203125 21.1458320617676)
+
+OGRFeature(shapefile):26
+  NAME (String) = Tampaon
+  SYSTEM (String) = (null)
+  LINESTRING (-99.1985626220703 21.6457099914551,-99.1650085449219 21.6780548095703,-99.181396484375 21.7094421386719,-99.1400146484375 21.8116645812988,-98.9969482421875 21.8169441223145,-99.0005645751953 21.8422203063965,-98.9655609130859 21.8316650390625,-98.9552917480469 21.8594436645508,-98.8188934326172 21.8530540466309,-98.8136138916016 21.942497253418,-98.7583465576172 21.9227752685547,-98.75 21.9883308410645,-98.6275024414062 22.002498626709,-98.5885620117188 21.9752597808838)
+
+OGRFeature(shapefile):27
+  NAME (String) = Tzanconeja
+  SYSTEM (String) = Usumacinta
+  LINESTRING (-92.1864013671875 16.9980545043945,-92.0605621337891 16.8852767944336,-91.9852905273438 16.8888854980469,-91.899169921875 16.836109161377,-91.8194580078125 16.8283309936523,-91.8086242675781 16.869441986084,-91.7608337402344 16.8744430541992,-91.6216735839844 16.7797203063965,-91.5761260986328 16.7055549621582,-91.5744476318359 16.5758323669434,-91.5314025878906 16.5238876342773,-91.4183349609375 16.4847221374512,-91.4000091552734 16.4247207641602,-91.3388977050781 16.3847198486328,-91.3408355712891 16.3219413757324,-91.3055572509766 16.3080520629883,-91.2894592285156 16.2424964904785,-91.2008361816406 16.2072219848633,-91.1477966308594 16.1442794799805)
+
+OGRFeature(shapefile):28
+  NAME (String) = Usumacinta
+  SYSTEM (String) = Usumacinta
+  MULTILINESTRING ((-92.4808349609375 18.656665802002,-92.4102783203125 18.4930534362793,-92.2755584716797 18.406665802002,-92.2769470214844 18.327220916748,-92.2174530029297 18.224967956543,-92.1844482421875 18.1186103820801,-92.1218719482422 18.0884857177734,-92.1408386230469 18.0022201538086,-92.1163940429688 17.9630546569824,-91.9902114868164 17.9119396209717,-91.9898986816406 17.9122200012207,-91.9505615234375 17.8955497741699,-91.945556640625 17.8547191619873,-91.9125137329102 17.8872203826904,-91.8233337402344 17.88916015625,-91.7866668701172 17.8555507659912,-91.7728729248047 17.7736892700195,-91.7936172485352 17.7266693115234,-91.6986236572266 17.7141609191895,-91.6985702514648 17.7140560150146,-91.6202850341797 17.7383308410645,-91.6575012207031 17.7716636657715,-91.6205596923828 17.7813873291016,-91.6161193847656 17.8266639709473,-91.5691680908203 17.8136100769043,-91.5519561767578 17.7469444274902,-91.5136260986328 17.8024978637695,-91.4794464111328 17.7608299255371,-91.4246978759766 17.7649536132812,-91.4525146484375 17.7008323669434,-91.3761138916016 17.7024993896484,-91.4027862548828 17.6424980163574,-91.3577880859375 17.5913887023926,-91.4064025878906 17.5652770996094,-91.5111236572266 17.5833320617676,-91.4305572509766 17.4883308410645,-91.5044555664062 17.4861106872559,-91.5075607299805 17.4697742462158,-91.4961166381836 17.4041595458984,-91.4263916015625 17.3869400024414,-91.3880615234375 17.32666015625,-91.4375 17.2411079406738,-91.352783203125 17.1763877868652,-91.2772369384766 17.1783332824707,-91.1844482421875 17.0355529785156,-91.1183471679688 17.0102767944336,-91.0627899169922 16.902774810791,-90.98583984375 16.8680534362793,-90.9833374023438 16.9030532836914,-90.9552917480469 16.8991661071777,-90.9661254882812 16.8719444274902,-90.9211120605469 16.829719543457,-90.8033447265625 16.8049964904785,-90.7142791748047 16.7264595031738,-90.6581420898438 16.6442737579346),(-92.1218719482422 18.0884857177734,-92.0816802978516 18.1216659545898,-92.0847320556641 18.2377777099609,-91.901123046875 18.3549995422363,-91.8577880859375 18.4291648864746))
+
+OGRFeature(shapefile):29
+  NAME (String) = Yaqui
+  SYSTEM (String) = Yaqui
+  LINESTRING (-109.619186401367 28.9040546417236,-109.636672973633 28.7522201538086,-109.552505493164 28.6002769470215,-109.550567626953 28.5308303833008,-109.521392822266 28.5341644287109,-109.520004272461 28.4683303833008,-109.682510375977 28.1736106872559,-109.798065185547 28.1430549621582,-109.832229614258 28.1683311462402,-109.878890991211 28.1324996948242,-109.789726257324 27.9897193908691,-109.802230834961 27.942497253418,-109.870826721191 27.9058303833008,-109.917793273926 27.958610534668,-109.894508361816 27.8341808319092,-109.922225952148 27.6377754211426,-110.113067626953 27.5424995422363,-110.131393432617 27.571662902832,-110.29833984375 27.594165802002,-110.369445800781 27.6419410705566,-110.463348388672 27.5924987792969,-110.599166870117 27.6577758789062)
+
diff -r 7bdf6ee695a8 -r 5b2417aa0b62 test-data/shp_compositefiles/shapefile.dbf
Binary file test-data/shp_compositefiles/shapefile.dbf has changed
diff -r 7bdf6ee695a8 -r 5b2417aa0b62 test-data/shp_compositefiles/shapefile.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/shp_compositefiles/shapefile.html	Thu Jun 13 11:29:15 2019 -0400
@@ -0,0 +1,17 @@
+<html><head><title>Shapefile Galaxy Composite Dataset</title></head><p/>
+<div>This composite dataset is composed of the following files:<p/><ul>
+<li><a href="shapefile.shp" type="application/binary">shapefile.shp (Geometry File (shp))</a></li>
+<li><a href="shapefile.shx" type="application/binary">shapefile.shx (Geometry index File (shx))</a></li>
+<li><a href="shapefile.dbf" type="application/binary">shapefile.dbf (Columnar attributes for each shape (dbf))</a></li>
+<li><a href="shapefile.prj" type="application/binary">shapefile.prj (Projection description (prj))</a> (optional)</li>
+<li><a href="shapefile.sbn" type="application/binary">shapefile.sbn (Spatial index of the features (sbn))</a> (optional)</li>
+<li><a href="shapefile.sbx" type="application/binary">shapefile.sbx (Spatial index of the features (sbx))</a> (optional)</li>
+<li><a href="shapefile.fbn" type="application/binary">shapefile.fbn (Read only spatial index of the features (fbn))</a> (optional)</li>
+<li><a href="shapefile.fbx" type="application/binary">shapefile.fbx (Read only spatial index of the features (fbx))</a> (optional)</li>
+<li><a href="shapefile.ain" type="application/binary">shapefile.ain (Attribute index of the active fields in a table (ain))</a> (optional)</li>
+<li><a href="shapefile.aih" type="application/binary">shapefile.aih (Attribute index of the active fields in a table (aih))</a> (optional)</li>
+<li><a href="shapefile.atx" type="application/binary">shapefile.atx (Attribute index for the dbf file (atx))</a> (optional)</li>
+<li><a href="shapefile.ixs" type="application/binary">shapefile.ixs (Geocoding index (ixs))</a> (optional)</li>
+<li><a href="shapefile.mxs" type="application/binary">shapefile.mxs (Geocoding index in ODB format (mxs))</a> (optional)</li>
+<li><a href="shapefile.shp.xml" type="application/binary">shapefile.shp.xml (Geospatial metadata in XML format (xml))</a> (optional)</li>
+</ul></div></html>
diff -r 7bdf6ee695a8 -r 5b2417aa0b62 test-data/shp_compositefiles/shapefile.sbn
Binary file test-data/shp_compositefiles/shapefile.sbn has changed
diff -r 7bdf6ee695a8 -r 5b2417aa0b62 test-data/shp_compositefiles/shapefile.sbx
Binary file test-data/shp_compositefiles/shapefile.sbx has changed
diff -r 7bdf6ee695a8 -r 5b2417aa0b62 test-data/shp_compositefiles/shapefile.shp
Binary file test-data/shp_compositefiles/shapefile.shp has changed
diff -r 7bdf6ee695a8 -r 5b2417aa0b62 test-data/shp_compositefiles/shapefile.shx
Binary file test-data/shp_compositefiles/shapefile.shx has changed