uk_bin_collection 0.98.4__tar.gz → 0.99.0__tar.gz

Sign up to get free protection for your applications and to get access to all the features.
Files changed (220) hide show
  1. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/PKG-INFO +1 -1
  2. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/pyproject.toml +1 -1
  3. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/tests/input.json +24 -1
  4. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py +24 -7
  5. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py +4 -0
  6. uk_bin_collection-0.99.0/uk_bin_collection/uk_bin_collection/councils/LincolnCouncil.py +96 -0
  7. uk_bin_collection-0.99.0/uk_bin_collection/uk_bin_collection/councils/PerthAndKinrossCouncil.py +95 -0
  8. uk_bin_collection-0.99.0/uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py +90 -0
  9. uk_bin_collection-0.99.0/uk_bin_collection/uk_bin_collection/councils/TunbridgeWellsCouncil.py +71 -0
  10. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WestBerkshireCouncil.py +45 -24
  11. uk_bin_collection-0.98.4/uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py +0 -52
  12. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/LICENSE +0 -0
  13. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/README.md +0 -0
  14. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/README.rst +0 -0
  15. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/tests/council_feature_input_parity.py +0 -0
  16. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/tests/features/environment.py +0 -0
  17. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/tests/features/validate_council_outputs.feature +0 -0
  18. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/tests/output.schema +0 -0
  19. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/tests/step_defs/step_helpers/file_handler.py +0 -0
  20. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/tests/step_defs/test_validate_council.py +0 -0
  21. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/tests/test_collect_data.py +0 -0
  22. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/tests/test_common_functions.py +0 -0
  23. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/tests/test_conftest.py +0 -0
  24. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/tests/test_get_data.py +0 -0
  25. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/collect_data.py +0 -0
  26. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/common.py +0 -0
  27. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py +0 -0
  28. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ArmaghBanbridgeCraigavonCouncil.py +0 -0
  29. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ArunCouncil.py +0 -0
  30. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/AylesburyValeCouncil.py +0 -0
  31. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py +0 -0
  32. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py +0 -0
  33. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py +0 -0
  34. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BasingstokeCouncil.py +0 -0
  35. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BathAndNorthEastSomersetCouncil.py +0 -0
  36. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BedfordBoroughCouncil.py +0 -0
  37. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BedfordshireCouncil.py +0 -0
  38. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BelfastCityCouncil.py +0 -0
  39. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BexleyCouncil.py +0 -0
  40. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BirminghamCityCouncil.py +0 -0
  41. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BlackburnCouncil.py +0 -0
  42. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BoltonCouncil.py +0 -0
  43. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BracknellForestCouncil.py +0 -0
  44. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py +0 -0
  45. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BrightonandHoveCityCouncil.py +0 -0
  46. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BristolCityCouncil.py +0 -0
  47. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BromleyBoroughCouncil.py +0 -0
  48. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BroxtoweBoroughCouncil.py +0 -0
  49. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BuckinghamshireCouncil.py +0 -0
  50. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/BuryCouncil.py +0 -0
  51. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/CalderdaleCouncil.py +0 -0
  52. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/CannockChaseDistrictCouncil.py +0 -0
  53. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/CardiffCouncil.py +0 -0
  54. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/CastlepointDistrictCouncil.py +0 -0
  55. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/CharnwoodBoroughCouncil.py +0 -0
  56. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py +0 -0
  57. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py +0 -0
  58. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py +0 -0
  59. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ChichesterDistrictCouncil.py +0 -0
  60. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ChorleyCouncil.py +0 -0
  61. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ColchesterCityCouncil.py +0 -0
  62. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ConwyCountyBorough.py +0 -0
  63. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/CornwallCouncil.py +0 -0
  64. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py +0 -0
  65. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py +0 -0
  66. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/DacorumBoroughCouncil.py +0 -0
  67. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/DartfordBoroughCouncil.py +0 -0
  68. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/DerbyshireDalesDistrictCouncil.py +0 -0
  69. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/DoncasterCouncil.py +0 -0
  70. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py +0 -0
  71. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/DoverDistrictCouncil.py +0 -0
  72. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/DurhamCouncil.py +0 -0
  73. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/EalingCouncil.py +0 -0
  74. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/EastCambridgeshireCouncil.py +0 -0
  75. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/EastDevonDC.py +0 -0
  76. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py +0 -0
  77. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/EastRenfrewshireCouncil.py +0 -0
  78. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/EastRidingCouncil.py +0 -0
  79. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/EastSuffolkCouncil.py +0 -0
  80. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/EastleighBoroughCouncil.py +0 -0
  81. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ElmbridgeBoroughCouncil.py +0 -0
  82. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/EnfieldCouncil.py +0 -0
  83. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/EnvironmentFirst.py +0 -0
  84. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/EppingForestDistrictCouncil.py +0 -0
  85. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ErewashBoroughCouncil.py +0 -0
  86. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/FalkirkCouncil.py +0 -0
  87. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/FarehamBoroughCouncil.py +0 -0
  88. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/FenlandDistrictCouncil.py +0 -0
  89. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ForestOfDeanDistrictCouncil.py +0 -0
  90. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/GatesheadCouncil.py +0 -0
  91. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/GedlingBoroughCouncil.py +0 -0
  92. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py +0 -0
  93. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/GloucesterCityCouncil.py +0 -0
  94. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/GuildfordCouncil.py +0 -0
  95. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/HaringeyCouncil.py +0 -0
  96. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/HarrogateBoroughCouncil.py +0 -0
  97. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/HighPeakCouncil.py +0 -0
  98. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/HighlandCouncil.py +0 -0
  99. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/HounslowCouncil.py +0 -0
  100. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/HullCityCouncil.py +0 -0
  101. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/HuntingdonDistrictCouncil.py +0 -0
  102. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/IslingtonCouncil.py +0 -0
  103. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/KingstonUponThamesCouncil.py +0 -0
  104. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/KirkleesCouncil.py +0 -0
  105. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/KnowsleyMBCouncil.py +0 -0
  106. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/LancasterCityCouncil.py +0 -0
  107. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/LeedsCityCouncil.py +0 -0
  108. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/LichfieldDistrictCouncil.py +0 -0
  109. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/LisburnCastlereaghCityCouncil.py +0 -0
  110. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/LiverpoolCityCouncil.py +0 -0
  111. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughEaling.py +0 -0
  112. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughHarrow.py +0 -0
  113. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughHounslow.py +0 -0
  114. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughLambeth.py +0 -0
  115. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughRedbridge.py +0 -0
  116. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/MaldonDistrictCouncil.py +0 -0
  117. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/MalvernHillsDC.py +0 -0
  118. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ManchesterCityCouncil.py +0 -0
  119. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/MansfieldDistrictCouncil.py +0 -0
  120. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/MertonCouncil.py +0 -0
  121. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/MidAndEastAntrimBoroughCouncil.py +0 -0
  122. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/MidSussexDistrictCouncil.py +0 -0
  123. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py +0 -0
  124. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py +0 -0
  125. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py +0 -0
  126. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py +0 -0
  127. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NewarkAndSherwoodDC.py +0 -0
  128. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NewcastleCityCouncil.py +0 -0
  129. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NewhamCouncil.py +0 -0
  130. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NewportCityCouncil.py +0 -0
  131. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthAyrshireCouncil.py +0 -0
  132. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthEastDerbyshireDistrictCouncil.py +0 -0
  133. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthEastLincs.py +0 -0
  134. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthKestevenDistrictCouncil.py +0 -0
  135. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthLanarkshireCouncil.py +0 -0
  136. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthLincolnshireCouncil.py +0 -0
  137. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthNorfolkDistrictCouncil.py +0 -0
  138. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthNorthamptonshireCouncil.py +0 -0
  139. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthSomersetCouncil.py +0 -0
  140. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthTynesideCouncil.py +0 -0
  141. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthWestLeicestershire.py +0 -0
  142. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthYorkshire.py +0 -0
  143. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NorthumberlandCouncil.py +0 -0
  144. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/NottinghamCityCouncil.py +0 -0
  145. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/OldhamCouncil.py +0 -0
  146. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/PortsmouthCityCouncil.py +0 -0
  147. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/PrestonCityCouncil.py +0 -0
  148. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ReadingBoroughCouncil.py +0 -0
  149. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ReigateAndBansteadBoroughCouncil.py +0 -0
  150. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/RenfrewshireCouncil.py +0 -0
  151. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/RhonddaCynonTaffCouncil.py +0 -0
  152. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/RochdaleCouncil.py +0 -0
  153. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py +0 -0
  154. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py +0 -0
  155. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/RugbyBoroughCouncil.py +0 -0
  156. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/RushcliffeBoroughCouncil.py +0 -0
  157. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/RushmoorCouncil.py +0 -0
  158. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SalfordCityCouncil.py +0 -0
  159. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SevenoaksDistrictCouncil.py +0 -0
  160. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SheffieldCityCouncil.py +0 -0
  161. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ShropshireCouncil.py +0 -0
  162. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SolihullCouncil.py +0 -0
  163. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SomersetCouncil.py +0 -0
  164. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SouthAyrshireCouncil.py +0 -0
  165. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SouthCambridgeshireCouncil.py +0 -0
  166. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SouthDerbyshireDistrictCouncil.py +0 -0
  167. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SouthGloucestershireCouncil.py +0 -0
  168. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SouthKestevenDistrictCouncil.py +0 -0
  169. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SouthLanarkshireCouncil.py +0 -0
  170. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SouthNorfolkCouncil.py +0 -0
  171. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SouthOxfordshireCouncil.py +0 -0
  172. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SouthTynesideCouncil.py +0 -0
  173. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SouthwarkCouncil.py +0 -0
  174. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/StAlbansCityAndDistrictCouncil.py +0 -0
  175. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/StHelensBC.py +0 -0
  176. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/StaffordBoroughCouncil.py +0 -0
  177. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/StaffordshireMoorlandsDistrictCouncil.py +0 -0
  178. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/StockportBoroughCouncil.py +0 -0
  179. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/StokeOnTrentCityCouncil.py +0 -0
  180. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/StratfordUponAvonCouncil.py +0 -0
  181. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/StroudDistrictCouncil.py +0 -0
  182. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SunderlandCityCouncil.py +0 -0
  183. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/SwanseaCouncil.py +0 -0
  184. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/TamesideMBCouncil.py +0 -0
  185. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/TandridgeDistrictCouncil.py +0 -0
  186. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/TelfordAndWrekinCouncil.py +0 -0
  187. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/TendringDistrictCouncil.py +0 -0
  188. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/TestValleyBoroughCouncil.py +0 -0
  189. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ThreeRiversDistrictCouncil.py +0 -0
  190. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/TonbridgeAndMallingBC.py +0 -0
  191. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/TorbayCouncil.py +0 -0
  192. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/TorridgeDistrictCouncil.py +0 -0
  193. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py +0 -0
  194. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ValeofGlamorganCouncil.py +0 -0
  195. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py +0 -0
  196. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py +0 -0
  197. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WalsallCouncil.py +0 -0
  198. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WalthamForest.py +0 -0
  199. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WarwickDistrictCouncil.py +0 -0
  200. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WaverleyBoroughCouncil.py +0 -0
  201. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WealdenDistrictCouncil.py +0 -0
  202. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WelhatCouncil.py +0 -0
  203. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WestLindseyDistrictCouncil.py +0 -0
  204. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WestLothianCouncil.py +0 -0
  205. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WestMorlandAndFurness.py +0 -0
  206. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WestNorthamptonshireCouncil.py +0 -0
  207. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py +0 -0
  208. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WiganBoroughCouncil.py +0 -0
  209. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WiltshireCouncil.py +0 -0
  210. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WinchesterCityCouncil.py +0 -0
  211. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py +0 -0
  212. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WirralCouncil.py +0 -0
  213. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WokingBoroughCouncil.py +0 -0
  214. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py +0 -0
  215. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WychavonDistrictCouncil.py +0 -0
  216. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py +0 -0
  217. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py +0 -0
  218. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py +0 -0
  219. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/create_new_council.py +0 -0
  220. {uk_bin_collection-0.98.4 → uk_bin_collection-0.99.0}/uk_bin_collection/uk_bin_collection/get_bin_data.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: uk_bin_collection
3
- Version: 0.98.4
3
+ Version: 0.99.0
4
4
  Summary: Python Lib to collect UK Bin Data
5
5
  Author: Robert Bradley
6
6
  Author-email: robbrad182@gmail.com
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "uk_bin_collection"
3
- version = "0.98.4"
3
+ version = "0.99.0"
4
4
  description = "Python Lib to collect UK Bin Data"
5
5
  readme = "README.md"
6
6
  authors = ["Robert Bradley <robbrad182@gmail.com>"]
@@ -620,6 +620,14 @@
620
620
  "wiki_name": "Lichfield District Council",
621
621
  "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
622
622
  },
623
+ "LincolnCouncil": {
624
+ "url": "https://lincoln.gov.uk",
625
+ "wiki_command_url_override": "https://lincoln.gov.uk",
626
+ "uprn": "000235024846",
627
+ "postcode": "LN5 7SH",
628
+ "wiki_name": "Tunbridge Wells Council",
629
+ "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
630
+ },
623
631
  "LisburnCastlereaghCityCouncil": {
624
632
  "house_number": "97",
625
633
  "postcode": "BT28 1JN",
@@ -871,6 +879,13 @@
871
879
  "wiki_name": "Oldham Council",
872
880
  "wiki_note": "Replace UPRN in URL with your own UPRN."
873
881
  },
882
+ "PerthAndKinrossCouncil": {
883
+ "url": "https://www.pkc.gov.uk",
884
+ "wiki_command_url_override": "https://www.pkc.gov.uk",
885
+ "uprn": "124032322",
886
+ "wiki_name": "Perth and Kinross Council",
887
+ "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
888
+ },
874
889
  "PortsmouthCityCouncil": {
875
890
  "postcode": "PO4 0LE",
876
891
  "skip_get_url": true,
@@ -1128,7 +1143,8 @@
1128
1143
  "SwaleBoroughCouncil": {
1129
1144
  "postcode": "ME12 2NQ",
1130
1145
  "skip_get_url": true,
1131
- "uprn": "100061081168",
1146
+ "house_number": "81",
1147
+ "web_driver": "http://selenium:4444",
1132
1148
  "url": "https://swale.gov.uk/bins-littering-and-the-environment/bins/collection-days",
1133
1149
  "wiki_name": "Swale Borough Council"
1134
1150
  },
@@ -1199,6 +1215,13 @@
1199
1215
  "url": "https://collections-torridge.azurewebsites.net/WebService2.asmx",
1200
1216
  "wiki_name": "Torridge District Council"
1201
1217
  },
1218
+ "TunbridgeWellsCouncil": {
1219
+ "url": "https://tunbridgewells.gov.uk",
1220
+ "wiki_command_url_override": "https://tunbridgewells.gov.uk",
1221
+ "uprn": "10090058289",
1222
+ "wiki_name": "Tunbridge Wells Council",
1223
+ "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
1224
+ },
1202
1225
  "UttlesfordDistrictCouncil": {
1203
1226
  "house_number": "72, Birchanger Lane",
1204
1227
  "postcode": "CM23 5QF",
@@ -74,13 +74,30 @@ class CouncilClass(AbstractGetBinDataClass):
74
74
 
75
75
  driver.get(page)
76
76
 
77
+ wait = WebDriverWait(driver, 10)
78
+ accept_cookies_button = wait.until(
79
+ EC.element_to_be_clickable(
80
+ (
81
+ By.XPATH,
82
+ "//button[contains(text(), 'Accept additional cookies')]",
83
+ )
84
+ )
85
+ )
86
+ accept_cookies_button.click()
87
+
77
88
  # Wait for the element to be clickable
78
- find_your_collection_button = WebDriverWait(driver, 10).until(
89
+ wait = WebDriverWait(driver, 10)
90
+ find_your_collection_button = wait.until(
79
91
  EC.element_to_be_clickable(
80
- (By.XPATH, '//a[contains(text(), "Find your household collection day")]')
92
+ (By.LINK_TEXT, "Find your household collection day")
81
93
  )
82
94
  )
83
95
 
96
+ # Scroll to the element (in case something is blocking it)
97
+ driver.execute_script(
98
+ "arguments[0].scrollIntoView();", find_your_collection_button
99
+ )
100
+
84
101
  # Click the element
85
102
  find_your_collection_button.click()
86
103
 
@@ -107,12 +124,12 @@ class CouncilClass(AbstractGetBinDataClass):
107
124
 
108
125
  postcode_input.send_keys(user_postcode)
109
126
 
110
- find_address_button = WebDriverWait(driver, 10).until(
111
- EC.presence_of_element_located(
112
- (By.CSS_SELECTOR, '[value="Find address"]')
113
- )
127
+ find_address_button = WebDriverWait(driver, 30).until(
128
+ EC.element_to_be_clickable((By.CSS_SELECTOR, '[value="Find address"]'))
114
129
  )
115
- find_address_button.click()
130
+ driver.execute_script("arguments[0].scrollIntoView();", find_address_button)
131
+ driver.execute_script("arguments[0].click();", find_address_button)
132
+ # find_address_button.click()
116
133
 
117
134
  time.sleep(15)
118
135
  # Wait for address box to be visible
@@ -80,6 +80,10 @@ class CouncilClass(AbstractGetBinDataClass):
80
80
  )
81
81
  )
82
82
  search_btn.send_keys(Keys.ENTER)
83
+ WebDriverWait(driver, 10).until(
84
+ EC.presence_of_element_located((By.ID, "collectionTabs"))
85
+ )
86
+
83
87
  soup = BeautifulSoup(driver.page_source, features="html.parser")
84
88
 
85
89
  # Find all tab panels within the collectionTabs
@@ -0,0 +1,96 @@
1
+ import time
2
+
3
+ import requests
4
+
5
+ from uk_bin_collection.uk_bin_collection.common import *
6
+ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
7
+
8
+
9
+ # import the wonderful Beautiful Soup and the URL grabber
10
+ class CouncilClass(AbstractGetBinDataClass):
11
+ """
12
+ Concrete classes have to implement all abstract operations of the
13
+ base class. They can also override some operations with a default
14
+ implementation.
15
+ """
16
+
17
+ def parse_data(self, page: str, **kwargs) -> dict:
18
+
19
+ user_uprn = kwargs.get("uprn")
20
+ user_postcode = kwargs.get("postcode")
21
+ check_uprn(user_uprn)
22
+ check_postcode(user_postcode)
23
+ bindata = {"bins": []}
24
+
25
+ SESSION_URL = "https://contact.lincoln.gov.uk/authapi/isauthenticated?uri=https://contact.lincoln.gov.uk/AchieveForms/?mode=fill&consentMessage=yes&form_uri=sandbox-publish://AF-Process-503f9daf-4db9-4dd8-876a-6f2029f11196/AF-Stage-a1c0af0f-fec1-4419-80c0-0dd4e1d965c9/definition.json&process=1&process_uri=sandbox-processes://AF-Process-503f9daf-4db9-4dd8-876a-6f2029f11196&process_id=AF-Process-503f9daf-4db9-4dd8-876a-6f2029f11196&hostname=contact.lincoln.gov.uk&withCredentials=true"
26
+
27
+ API_URL = "https://contact.lincoln.gov.uk/apibroker/runLookup"
28
+
29
+ data = {
30
+ "formValues": {
31
+ "Section 1": {
32
+ "chooseaddress": {"value": user_uprn},
33
+ "postcode": {"value": user_postcode},
34
+ }
35
+ },
36
+ }
37
+
38
+ headers = {
39
+ "Content-Type": "application/json",
40
+ "Accept": "application/json",
41
+ "User-Agent": "Mozilla/5.0",
42
+ "X-Requested-With": "XMLHttpRequest",
43
+ "Referer": "https://contact.lincoln.gov.uk/fillform/?iframe_id=fillform-frame-1&db_id=",
44
+ }
45
+ s = requests.session()
46
+ r = s.get(SESSION_URL)
47
+ r.raise_for_status()
48
+ session_data = r.json()
49
+ sid = session_data["auth-session"]
50
+ params = {
51
+ "id": "62aafd258f72c",
52
+ "repeat_against": "",
53
+ "noRetry": "false",
54
+ "getOnlyTokens": "undefined",
55
+ "log_id": "",
56
+ "app_name": "AF-Renderer::Self",
57
+ # unix_timestamp
58
+ "_": str(int(time.time() * 1000)),
59
+ "sid": sid,
60
+ }
61
+
62
+ r = s.post(API_URL, json=data, headers=headers, params=params)
63
+ r.raise_for_status()
64
+ data = r.json()
65
+ rows_data = data["integration"]["transformed"]["rows_data"]
66
+ if not isinstance(rows_data, dict):
67
+ raise ValueError("Invalid data returned from API")
68
+
69
+ BIN_TYPES = [
70
+ ("refusenextdate", "Black Bin", "refuse_freq"),
71
+ ("recyclenextdate", "Brown Bin", "recycle_freq"),
72
+ ("gardennextdate", "Green Bin", "garden_freq"),
73
+ ]
74
+
75
+ for uprn, data in rows_data.items():
76
+ if uprn != user_uprn:
77
+ continue
78
+ for key, bin_type, freq in BIN_TYPES:
79
+ if not data[key]:
80
+ continue
81
+ offsets = [0]
82
+ if data[freq] == "fortnightly":
83
+ offsets.extend(list(range(14, 30, 14)))
84
+ elif data[freq] == "weekly":
85
+ offsets.extend(list(range(7, 30, 7)))
86
+ date = datetime.strptime(data[key], "%Y-%m-%d").date()
87
+ for offset in offsets:
88
+ dict_data = {
89
+ "type": bin_type,
90
+ "collectionDate": (date + timedelta(days=offset)).strftime(
91
+ "%d/%m/%Y"
92
+ ),
93
+ }
94
+ bindata["bins"].append(dict_data)
95
+
96
+ return bindata
@@ -0,0 +1,95 @@
1
+ import time
2
+
3
+ import requests
4
+
5
+ from uk_bin_collection.uk_bin_collection.common import *
6
+ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
7
+
8
+
9
+ # import the wonderful Beautiful Soup and the URL grabber
10
+ class CouncilClass(AbstractGetBinDataClass):
11
+ """
12
+ Concrete classes have to implement all abstract operations of the
13
+ base class. They can also override some operations with a default
14
+ implementation.
15
+ """
16
+
17
+ def parse_data(self, page: str, **kwargs) -> dict:
18
+
19
+ user_uprn = kwargs.get("uprn")
20
+ check_uprn(user_uprn)
21
+ bindata = {"bins": []}
22
+
23
+ SESSION_URL = "https://pkc-self.achieveservice.com/authapi/isauthenticated?uri=https%253A%252F%252Fpkc-self.achieveservice.com%252Fen%252FAchieveForms%252F%253Fform_uri%253Dsandbox-publish%253A%252F%252FAF-Process-de9223b1-a7c6-408f-aaa3-aee33fd7f7fa%252FAF-Stage-9fa33e2e-4c1b-4963-babf-4348ab8154bc%252Fdefinition.json%2526redirectlink%253D%25252Fen%2526cancelRedirectLink%253D%25252Fen%2526consentMessage%253Dyes&hostname=pkc-self.achieveservice.com&withCredentials=true"
24
+
25
+ API_URL = "https://pkc-self.achieveservice.com/apibroker/runLookup"
26
+
27
+ data = {
28
+ "formValues": {
29
+ "Bin collections": {"propertyUPRNQuery": {"value": user_uprn}}
30
+ },
31
+ }
32
+
33
+ headers = {
34
+ "Content-Type": "application/json",
35
+ "Accept": "application/json",
36
+ "User-Agent": "Mozilla/5.0",
37
+ "X-Requested-With": "XMLHttpRequest",
38
+ "Referer": "https://pkc-self.achieveservice.com/fillform/?iframe_id=fillform-frame-1&db_id=",
39
+ }
40
+ s = requests.session()
41
+ r = s.get(SESSION_URL)
42
+ r.raise_for_status()
43
+ session_data = r.json()
44
+ sid = session_data["auth-session"]
45
+ params = {
46
+ "id": "5c9267cee5efe",
47
+ "repeat_against": "",
48
+ "noRetry": "true",
49
+ "getOnlyTokens": "undefined",
50
+ "log_id": "",
51
+ "app_name": "AF-Renderer::Self",
52
+ # unix_timestamp
53
+ "_": str(int(time.time() * 1000)),
54
+ "sid": sid,
55
+ }
56
+
57
+ r = s.post(API_URL, json=data, headers=headers, params=params)
58
+ r.raise_for_status()
59
+
60
+ data = r.json()
61
+ rows_data = data["integration"]["transformed"]["rows_data"]["0"]
62
+ if not isinstance(rows_data, dict):
63
+ raise ValueError("Invalid data returned from API")
64
+
65
+ schedule = {
66
+ "Green Bin": [
67
+ rows_data.get("nextGeneralWasteCollectionDate"),
68
+ rows_data.get("nextGeneralWasteCollectionDate2nd"),
69
+ ],
70
+ "Blue Bin": [
71
+ rows_data.get("nextBlueCollectionDate"),
72
+ rows_data.get("nextBlueWasteCollectionDate2nd"),
73
+ ],
74
+ "Grey Bin": [
75
+ rows_data.get("nextGreyWasteCollectionDate"),
76
+ rows_data.get("nextGreyWasteCollectionDate2nd"),
77
+ ],
78
+ "Brown Bin": [
79
+ rows_data.get("nextGardenandFoodWasteCollectionDate"),
80
+ rows_data.get("nextGardenandFoodWasteCollectionDate2nd"),
81
+ ],
82
+ "Paper Waste": [
83
+ rows_data.get("nextPaperWasteCollectionDate"),
84
+ rows_data.get("nextPaperWasteCollectionDate2nd"),
85
+ ],
86
+ }
87
+
88
+ # Format and output the schedule
89
+ for bin_type, dates in schedule.items():
90
+ if any(dates):
91
+ for date in dates:
92
+ dict_data = {"type": bin_type, "collectionDate": date}
93
+ bindata["bins"].append(dict_data)
94
+
95
+ return bindata
@@ -0,0 +1,90 @@
1
+ from bs4 import BeautifulSoup
2
+ from selenium.webdriver.common.by import By
3
+ from selenium.webdriver.support import expected_conditions as EC
4
+ from selenium.webdriver.support.wait import WebDriverWait
5
+
6
+ from uk_bin_collection.uk_bin_collection.common import *
7
+ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
8
+
9
+ # import the wonderful Beautiful Soup and the URL grabber
10
+
11
+
12
+ class CouncilClass(AbstractGetBinDataClass):
13
+ """
14
+ Concrete classes have to implement all abstract operations of the
15
+ base class. They can also override some operations with a default
16
+ implementation.
17
+ """
18
+
19
+ def parse_data(self, page: str, **kwargs) -> dict:
20
+ # Get postcode and UPRN from kwargs
21
+ user_postcode = kwargs.get("postcode")
22
+ user_paon = kwargs.get("paon")
23
+ web_driver = kwargs.get("web_driver")
24
+ headless = kwargs.get("headless")
25
+ check_postcode(user_postcode)
26
+ check_paon(user_paon)
27
+
28
+ # Build URL to parse
29
+ council_url = "https://swale.gov.uk/bins-littering-and-the-environment/bins/my-collection-day"
30
+
31
+ # Create Selenium webdriver
32
+ driver = create_webdriver(web_driver, headless, None, __name__)
33
+ driver.get(council_url)
34
+
35
+ # Wait for the postcode field to appear then populate it
36
+ try:
37
+ inputElement_postcode = WebDriverWait(driver, 10).until(
38
+ EC.presence_of_element_located((By.ID, "q462406_q1"))
39
+ )
40
+ inputElement_postcode.send_keys(user_postcode)
41
+ except Exception:
42
+ print("Page failed to load. Probably due to Cloudflare robot check!")
43
+
44
+ # Click search button
45
+ findAddress = WebDriverWait(driver, 10).until(
46
+ EC.presence_of_element_located((By.ID, "form_email_462397_submit"))
47
+ )
48
+ driver.execute_script("arguments[0].click();", findAddress)
49
+
50
+ # Wait for the 'Select address' dropdown to appear and select option matching the house name/number
51
+ WebDriverWait(driver, 10).until(
52
+ EC.element_to_be_clickable(
53
+ (
54
+ By.XPATH,
55
+ "//select[@id='SBCYBDAddressList']//option[contains(., '"
56
+ + user_paon
57
+ + "')]",
58
+ )
59
+ )
60
+ ).click()
61
+
62
+ # Click search button
63
+ getBins = WebDriverWait(driver, 10).until(
64
+ EC.presence_of_element_located((By.ID, "form_email_462397_submit"))
65
+ )
66
+ driver.execute_script("arguments[0].click();", getBins)
67
+
68
+ BinTable = WebDriverWait(driver, 30).until(
69
+ EC.presence_of_element_located((By.ID, "SBC-YBD-Main"))
70
+ )
71
+
72
+ soup = BeautifulSoup(driver.page_source, features="html.parser")
73
+ soup.prettify()
74
+
75
+ data = {"bins": []}
76
+
77
+ # Get the collection bullet points on the page and parse them
78
+ nextCollections = soup.find("div", {"id": "nextCollections"})
79
+ for c in nextCollections:
80
+ collection = c.find_all("strong")
81
+ for bin in collection:
82
+ split = (bin.text).split(" on ")
83
+ bin_type = split[0]
84
+ bin_date = datetime.strptime(split[1], "%A %d %b %Y").strftime(
85
+ "%d/%m/%Y"
86
+ )
87
+ dict_data = {"type": bin_type, "collectionDate": bin_date}
88
+ data["bins"].append(dict_data)
89
+
90
+ return data
@@ -0,0 +1,71 @@
1
+ import time
2
+
3
+ import requests
4
+
5
+ from uk_bin_collection.uk_bin_collection.common import *
6
+ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
7
+
8
+
9
+ # import the wonderful Beautiful Soup and the URL grabber
10
+ class CouncilClass(AbstractGetBinDataClass):
11
+ """
12
+ Concrete classes have to implement all abstract operations of the
13
+ base class. They can also override some operations with a default
14
+ implementation.
15
+ """
16
+
17
+ def parse_data(self, page: str, **kwargs) -> dict:
18
+
19
+ user_uprn = kwargs.get("uprn")
20
+ check_uprn(user_uprn)
21
+ bindata = {"bins": []}
22
+
23
+ SESSION_URL = "https://mytwbc.tunbridgewells.gov.uk/authapi/isauthenticated?uri=https%3A%2F%2Fmytwbc.tunbridgewells.gov.uk%2FAchieveForms%2F%3Fmode%3Dfill%26consentMessage%3Dyes%26form_uri%3Dsandbox-publish%3A%2F%2FAF-Process-e01af4d4-eb0f-4cfe-a5ac-c47b63f017ed%2FAF-Stage-88caf66c-378f-4082-ad1d-07b7a850af38%2Fdefinition.json%26process%3D1%26process_uri%3Dsandbox-processes%3A%2F%2FAF-Process-e01af4d4-eb0f-4cfe-a5ac-c47b63f017ed%26process_id%3DAF-Process-e01af4d4-eb0f-4cfe-a5ac-c47b63f017ed&hostname=mytwbc.tunbridgewells.gov.uk&withCredentials=true"
24
+
25
+ API_URL = "https://mytwbc.tunbridgewells.gov.uk/apibroker/runLookup"
26
+
27
+ data = {
28
+ "formValues": {"Property": {"siteReference": {"value": user_uprn}}},
29
+ }
30
+
31
+ headers = {
32
+ "Content-Type": "application/json",
33
+ "Accept": "application/json",
34
+ "User-Agent": "Mozilla/5.0",
35
+ "X-Requested-With": "XMLHttpRequest",
36
+ "Referer": "https://mytwbc.tunbridgewells.gov.uk/fillform/?iframe_id=fillform-frame-1&db_id=",
37
+ }
38
+ s = requests.session()
39
+ r = s.get(SESSION_URL)
40
+ r.raise_for_status()
41
+ session_data = r.json()
42
+ sid = session_data["auth-session"]
43
+ params = {
44
+ "id": "6314720683f30",
45
+ "repeat_against": "",
46
+ "noRetry": "false",
47
+ "getOnlyTokens": "undefined",
48
+ "log_id": "",
49
+ "app_name": "AF-Renderer::Self",
50
+ # unix_timestamp
51
+ "_": str(int(time.time() * 1000)),
52
+ "sid": sid,
53
+ }
54
+
55
+ r = s.post(API_URL, json=data, headers=headers, params=params)
56
+ r.raise_for_status()
57
+
58
+ data = r.json()
59
+ rows_data = data["integration"]["transformed"]["rows_data"]
60
+ if not isinstance(rows_data, dict):
61
+ raise ValueError("Invalid data returned from API")
62
+
63
+ for _, item in rows_data.items():
64
+ bin_type = item["collectionType"]
65
+ date = datetime.strptime(item["nextDateUnformatted"], "%d/%m/%Y").strftime(
66
+ "%d/%m/%Y"
67
+ )
68
+ dict_data = {"type": bin_type, "collectionDate": date}
69
+ bindata["bins"].append(dict_data)
70
+
71
+ return bindata
@@ -74,30 +74,51 @@ class CouncilClass(AbstractGetBinDataClass):
74
74
  soup = BeautifulSoup(driver.page_source, features="html.parser")
75
75
  soup.prettify()
76
76
 
77
- rubbish_date = datetime.strptime(
78
- " ".join(
79
- soup.find("div", {"id": "FINDYOURBINDAYS_RUBBISHDATE_OUTERDIV"})
80
- .get_text(strip=True)
81
- .split()[6:8]
82
- ),
83
- "%d %B",
84
- ).replace(year=datetime.now().year)
85
- recycling_date = datetime.strptime(
86
- " ".join(
87
- soup.find("div", {"id": "FINDYOURBINDAYS_RECYCLINGDATE_OUTERDIV"})
88
- .get_text(strip=True)
89
- .split()[6:8]
90
- ),
91
- "%d %B",
92
- ).replace(year=datetime.now().year)
93
- food_date = datetime.strptime(
94
- " ".join(
95
- soup.find("div", {"id": "FINDYOURBINDAYS_FOODWASTEDATE_OUTERDIV"})
96
- .get_text(strip=True)
97
- .split()[8:10]
98
- ),
99
- "%d %B",
100
- ).replace(year=datetime.now().year)
77
+ rubbish_div = soup.find(
78
+ "div", {"id": "FINDYOURBINDAYS_RUBBISHDATE_OUTERDIV"}
79
+ )
80
+ try:
81
+ rubbish_date = rubbish_div.find_all("div")[2]
82
+ rubbish_date = datetime.strptime(
83
+ rubbish_date.text,
84
+ "%A %d %B",
85
+ ).replace(year=datetime.now().year)
86
+ except:
87
+ rubbish_date = rubbish_div.find_all("div")[3]
88
+ rubbish_date = datetime.strptime(
89
+ rubbish_date.text,
90
+ "%A %d %B",
91
+ ).replace(year=datetime.now().year)
92
+ recycling_div = soup.find(
93
+ "div", {"id": "FINDYOURBINDAYS_RECYCLINGDATE_OUTERDIV"}
94
+ )
95
+ try:
96
+ recycling_date = recycling_div.find_all("div")[2]
97
+ recycling_date = datetime.strptime(
98
+ recycling_date.text,
99
+ "%A %d %B",
100
+ ).replace(year=datetime.now().year)
101
+ except:
102
+ rubbish_date = recycling_div.find_all("div")[3]
103
+ rubbish_date = datetime.strptime(
104
+ rubbish_date.text,
105
+ "%A %d %B",
106
+ ).replace(year=datetime.now().year)
107
+ food_div = soup.find(
108
+ "div", {"id": "FINDYOURBINDAYS_RECYCLINGDATE_OUTERDIV"}
109
+ )
110
+ try:
111
+ food_date = food_div.find_all("div")[2]
112
+ food_date = datetime.strptime(
113
+ food_date.text,
114
+ "%A %d %B",
115
+ ).replace(year=datetime.now().year)
116
+ except:
117
+ food_date = food_div.find_all("div")[3]
118
+ food_date = datetime.strptime(
119
+ food_date.text,
120
+ "%A %d %B",
121
+ ).replace(year=datetime.now().year)
101
122
 
102
123
  if datetime.now().month == 12 and rubbish_date.month == 1:
103
124
  rubbish_date = rubbish_date + relativedelta(years=1)
@@ -1,52 +0,0 @@
1
- import requests
2
- from bs4 import BeautifulSoup
3
- from uk_bin_collection.uk_bin_collection.common import *
4
- from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
5
-
6
-
7
- # import the wonderful Beautiful Soup and the URL grabber
8
-
9
-
10
- class CouncilClass(AbstractGetBinDataClass):
11
- """
12
- Concrete classes have to implement all abstract operations of the
13
- base class. They can also override some operations with a default
14
- implementation.
15
- """
16
-
17
- def parse_data(self, page: str, **kwargs) -> dict:
18
- # Get postcode and UPRN from kwargs
19
- user_postcode = kwargs.get("postcode")
20
- user_uprn = kwargs.get("uprn")
21
- check_postcode(user_postcode)
22
- check_uprn(user_uprn)
23
-
24
- # Build URL to parse
25
- council_url = f"https://swale.gov.uk/bins-littering-and-the-environment/bins/collection-days?postcode={user_postcode.replace(' ', '+')}&addresses={user_uprn}&address-submit="
26
-
27
- # Parse URL and read if connection successful
28
- requests.packages.urllib3.disable_warnings()
29
- response = requests.get(council_url, verify=False)
30
- if response.status_code == 200:
31
- soup = BeautifulSoup(response.text, features="html.parser")
32
- soup.prettify()
33
- else:
34
- raise ConnectionAbortedError("Could not parse council website.")
35
-
36
- data = {"bins": []}
37
-
38
- # Get the collection bullet points on the page and parse them
39
- form_area = soup.find("form", {"class": "integration bin-lookup"})
40
- collections = [
41
- item.text.strip().split(",") for item in form_area.find_all("li")
42
- ]
43
- for c in collections:
44
- bin_type = c[0].strip()
45
- # temp_date = c[2].strip() + " " + str(datetime.now().year)
46
- bin_date = datetime.strptime(
47
- c[2].strip() + " " + str(datetime.now().year), "%d %B %Y"
48
- ).strftime(date_format)
49
- dict_data = {"type": bin_type, "collectionDate": bin_date}
50
- data["bins"].append(dict_data)
51
-
52
- return data