Skip to content
Permalink
Browse files

Merge pull request #3122 from manisandro/arcgis_rest

Add provider for ArcGIS Map and Feature REST services
  • Loading branch information
manisandro committed Jun 2, 2016
2 parents 49eaf07 + 1f02d4a commit 45c0ef02bcd8f169b71e319baf2abd96bf7fbe1c
Showing with 6,191 additions and 22 deletions.
  1. +1 −0 CMakeLists.txt
  2. +4 −0 images/images.qrc
  3. +520 −0 images/themes/default/mActionAddAfsLayer.svg
  4. +542 −0 images/themes/default/mActionAddAmsLayer.svg
  5. +480 −0 images/themes/default/mIconAfs.svg
  6. +503 −0 images/themes/default/mIconAms.svg
  7. +3 −0 python/core/geometry/qgswkbtypes.sip
  8. +6 −1 python/core/qgsowsconnection.sip
  9. +14 −5 python/core/raster/qgsrasterdataprovider.sip
  10. +1 −0 python/gui/gui.sip
  11. +4 −0 python/gui/qgisinterface.sip
  12. +43 −0 python/gui/qgssourceselectdialog.sip
  13. +120 −0 src/app/qgisapp.cpp
  14. +10 −0 src/app/qgisapp.h
  15. +2 −0 src/app/qgisappinterface.cpp
  16. +4 −0 src/app/qgisappinterface.h
  17. +1 −1 src/core/composer/qgslegendmodel.cpp
  18. +11 −0 src/core/geometry/qgswkbtypes.h
  19. +1 −1 src/core/qgsmaplayerlegend.cpp
  20. +1 −1 src/core/qgsowsconnection.cpp
  21. +6 −1 src/core/qgsowsconnection.h
  22. +1 −1 src/core/raster/qgsrasterdataprovider.cpp
  23. +14 −5 src/core/raster/qgsrasterdataprovider.h
  24. +2 −0 src/gui/CMakeLists.txt
  25. +4 −0 src/gui/qgisinterface.h
  26. +487 −0 src/gui/qgssourceselectdialog.cpp
  27. +104 −0 src/gui/qgssourceselectdialog.h
  28. +3 −0 src/providers/CMakeLists.txt
  29. +75 −0 src/providers/arcgisrest/CMakeLists.txt
  30. +155 −0 src/providers/arcgisrest/qgsafsdataitems.cpp
  31. +61 −0 src/providers/arcgisrest/qgsafsdataitems.h
  32. +105 −0 src/providers/arcgisrest/qgsafsfeatureiterator.cpp
  33. +57 −0 src/providers/arcgisrest/qgsafsfeatureiterator.h
  34. +253 −0 src/providers/arcgisrest/qgsafsprovider.cpp
  35. +86 −0 src/providers/arcgisrest/qgsafsprovider.h
  36. +102 −0 src/providers/arcgisrest/qgsafsproviderextern.cpp
  37. +141 −0 src/providers/arcgisrest/qgsafssourceselect.cpp
  38. +42 −0 src/providers/arcgisrest/qgsafssourceselect.h
  39. +152 −0 src/providers/arcgisrest/qgsamsdataitems.cpp
  40. +63 −0 src/providers/arcgisrest/qgsamsdataitems.h
  41. +450 −0 src/providers/arcgisrest/qgsamsprovider.cpp
  42. +106 −0 src/providers/arcgisrest/qgsamsprovider.h
  43. +103 −0 src/providers/arcgisrest/qgsamsproviderextern.cpp
  44. +99 −0 src/providers/arcgisrest/qgsamssourceselect.cpp
  45. +41 −0 src/providers/arcgisrest/qgsamssourceselect.h
  46. +591 −0 src/providers/arcgisrest/qgsarcgisrestutils.cpp
  47. +81 −0 src/providers/arcgisrest/qgsarcgisrestutils.h
  48. +1 −1 src/providers/gdal/qgsgdalprovider.cpp
  49. +1 −1 src/providers/gdal/qgsgdalprovider.h
  50. +1 −1 src/providers/wcs/qgswcsprovider.cpp
  51. +1 −1 src/providers/wcs/qgswcsprovider.h
  52. +1 −1 src/providers/wms/qgswmsprovider.cpp
  53. +4 −1 src/providers/wms/qgswmsprovider.h
  54. +26 −0 src/ui/qgisapp.ui
  55. +259 −0 src/ui/qgssourceselectdialogbase.ui
  56. +242 −0 tests/src/python/test_qgsgeometry.py
@@ -200,6 +200,7 @@ FIND_PACKAGE(GDAL)
FIND_PACKAGE(Expat REQUIRED)
FIND_PACKAGE(Spatialindex REQUIRED)
FIND_PACKAGE(Qwt REQUIRED)
FIND_PACKAGE(QJSON)

IF (WITH_INTERNAL_QEXTSERIALPORT)
SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/gps/qextserialport)
@@ -589,6 +589,10 @@
<file>themes/default/styleicons/paletted.svg</file>
<file>themes/default/styleicons/singlebandgray.svg</file>
<file>themes/default/styleicons/singlebandpseudocolor.svg</file>
<file>themes/default/mIconAfs.svg</file>
<file>themes/default/mIconAms.svg</file>
<file>themes/default/mActionAddAmsLayer.svg</file>
<file>themes/default/mActionAddAfsLayer.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

0 comments on commit 45c0ef0

Please sign in to comment.
You can’t perform that action at this time.