- Timestamp:
- Sep 28, 2015 11:40:30 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
geovis/trunk/RendererCmd.cpp
r5888 r5889 1547 1547 if (driver[0] == 'o' && strcmp(driver, "ogr") == 0) { 1548 1548 osgEarth::Drivers::OGRFeatureOptions opts; 1549 opts.name() = name; 1549 1550 if (osgDB::getLowerCaseFileExtension(url) == "csv") { 1550 1551 url = loadCSVLayer(url.c_str()); … … 1554 1555 } else if (driver[0] == 't' && strcmp(driver, "tfs") == 0) { 1555 1556 osgEarth::Drivers::TFSFeatureOptions opts; 1557 opts.name() = name; 1556 1558 opts.url() = url; 1557 1559 opts.format() = format; … … 1559 1561 } else if (driver[0] == 'w' && strcmp(driver, "wfs") == 0) { 1560 1562 osgEarth::Drivers::WFSFeatureOptions opts; 1563 opts.name() = name; 1561 1564 opts.url() = url; 1562 1565 opts.outputFormat() = format; … … 1655 1658 if (driver[0] == 'o' && strcmp(driver, "ogr") == 0) { 1656 1659 osgEarth::Drivers::OGRFeatureOptions opts; 1660 opts.name() = name; 1657 1661 if (osgDB::getLowerCaseFileExtension(url) == "csv") { 1658 1662 url = loadCSVLayer(url.c_str()); … … 1662 1666 } else if (driver[0] == 't' && strcmp(driver, "tfs") == 0) { 1663 1667 osgEarth::Drivers::TFSFeatureOptions opts; 1668 opts.name() = name; 1664 1669 opts.url() = url; 1665 1670 opts.format() = format; … … 1667 1672 } else if (driver[0] == 'w' && strcmp(driver, "wfs") == 0) { 1668 1673 osgEarth::Drivers::WFSFeatureOptions opts; 1674 opts.name() = name; 1669 1675 opts.url() = url; 1670 1676 opts.outputFormat() = format; … … 1753 1759 if (driver[0] == 'o' && strcmp(driver, "ogr") == 0) { 1754 1760 osgEarth::Drivers::OGRFeatureOptions opts; 1761 opts.name() = name; 1755 1762 if (osgDB::getLowerCaseFileExtension(url) == "csv") { 1756 1763 url = loadCSVLayer(url.c_str()); … … 1760 1767 } else if (driver[0] == 't' && strcmp(driver, "tfs") == 0) { 1761 1768 osgEarth::Drivers::TFSFeatureOptions opts; 1769 opts.name() = name; 1762 1770 opts.url() = url; 1763 1771 opts.format() = format; … … 1765 1773 } else if (driver[0] == 'w' && strcmp(driver, "wfs") == 0) { 1766 1774 osgEarth::Drivers::WFSFeatureOptions opts; 1775 opts.name() = name; 1767 1776 opts.url() = url; 1768 1777 opts.outputFormat() = format; … … 1870 1879 if (driver[0] == 'o' && strcmp(driver, "ogr") == 0) { 1871 1880 osgEarth::Drivers::OGRFeatureOptions opts; 1881 opts.name() = name; 1872 1882 if (osgDB::getLowerCaseFileExtension(url) == "csv") { 1873 1883 url = loadCSVLayer(url.c_str()); … … 1877 1887 } else if (driver[0] == 't' && strcmp(driver, "tfs") == 0) { 1878 1888 osgEarth::Drivers::TFSFeatureOptions opts; 1889 opts.name() = name; 1879 1890 opts.url() = url; 1880 1891 opts.format() = format; … … 1882 1893 } else if (driver[0] == 'w' && strcmp(driver, "wfs") == 0) { 1883 1894 osgEarth::Drivers::WFSFeatureOptions opts; 1895 opts.name() = name; 1884 1896 opts.url() = url; 1885 1897 opts.outputFormat() = format; … … 1998 2010 if (driver[0] == 'o' && strcmp(driver, "ogr") == 0) { 1999 2011 osgEarth::Drivers::OGRFeatureOptions opts; 2012 opts.name() = name; 2000 2013 if (osgDB::getLowerCaseFileExtension(url) == "csv") { 2001 2014 url = loadCSVLayer(url.c_str()); … … 2005 2018 } else if (driver[0] == 't' && strcmp(driver, "tfs") == 0) { 2006 2019 osgEarth::Drivers::TFSFeatureOptions opts; 2020 opts.name() = name; 2007 2021 opts.url() = url; 2008 2022 opts.format() = format; … … 2010 2024 } else if (driver[0] == 'w' && strcmp(driver, "wfs") == 0) { 2011 2025 osgEarth::Drivers::WFSFeatureOptions opts; 2026 opts.name() = name; 2012 2027 opts.url() = url; 2013 2028 opts.outputFormat() = format; … … 2109 2124 if (driver[0] == 'o' && strcmp(driver, "ogr") == 0) { 2110 2125 osgEarth::Drivers::OGRFeatureOptions opts; 2126 opts.name() = name; 2111 2127 if (osgDB::getLowerCaseFileExtension(url) == "csv") { 2112 2128 url = loadCSVLayer(url.c_str()); … … 2116 2132 } else if (driver[0] == 't' && strcmp(driver, "tfs") == 0) { 2117 2133 osgEarth::Drivers::TFSFeatureOptions opts; 2134 opts.name() = name; 2118 2135 opts.url() = url; 2119 2136 opts.format() = format; … … 2121 2138 } else if (driver[0] == 'w' && strcmp(driver, "wfs") == 0) { 2122 2139 osgEarth::Drivers::WFSFeatureOptions opts; 2140 opts.name() = name; 2123 2141 opts.url() = url; 2124 2142 opts.outputFormat() = format;
Note: See TracChangeset
for help on using the changeset viewer.