Upgraded OTM With New Features #3313
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Inat pull
custom-fields-web, moved the custom fields on the website as well
- Minor renames
- Additional step as placeholder for adding photos of different
labels
- Typeahead for species is now a dropdown as well
- Species is required, unless the missing site is explicitly set
ui-fixes-for-demo-20200405 - various UI fixes, which include
added an endpoint to sync to inat manually, and a few other fixes
ui-and-inaturalist-fixes-20200406 - fixed some debugger statements,
better fixes for embedding
better fixes for stewardship
photos are finally working
add a way to delete UDFs added some asterisks for required fields
creation, not edit
- add a bunch of required fields
ecobenefits report
commit 85e0494 Author: Tom Z <tzinckgraf@gmail.com> Date: Mon Apr 12 00:06:19 2021 -0400 feature/api-python-3 - additional final features commit 9f3bd4e Author: Tom Z <tzinckgraf@gmail.com> Date: Sun Apr 11 23:43:41 2021 -0400 feature/api-python-3 - final pieces of this feature commit f4866de Author: Tom Z <tzinckgraf@gmail.com> Date: Fri Apr 9 20:18:09 2021 -0400 feature/api-python-3 - some additional fixes commit 7c3de56 Author: Tom Z <tzinckgraf@gmail.com> Date: Sat Apr 3 23:15:48 2021 -0400 feature/api-python-3 - update the map page with new layers and finishing touches on other pieces commit bdb8183 Author: Tom Z <tzinckgraf@gmail.com> Date: Sat Mar 27 10:34:51 2021 -0400 feature/api-python-3 - validation errors are working commit 412ea36 Author: Tom Z <tzinckgraf@gmail.com> Date: Sun Mar 21 21:35:57 2021 -0400 feature/api-python-3 - fixed up the creation. various fixes to the UI. commit ed4d9bc Author: Tom Z <tzinckgraf@gmail.com> Date: Fri Mar 19 17:14:04 2021 -0400 feature/api-python-3 - more fixes commit d1dd629 Author: Tom Z <tzinckgraf@gmail.com> Date: Sat Mar 13 13:34:59 2021 -0500 feature/api-python-3 - fixes to the pagination and a sample for creation commit c451010 Merge: fc1765d 13d6c14 Author: Tom Z <tzinckgraf@gmail.com> Date: Sun Mar 7 21:48:28 2021 -0500 Merge branch 'feature/api-python-3' of github.com:sustainablejc/otm-core into feature/api-python-3 commit fc1765d Author: Tom Z <tzinckgraf@gmail.com> Date: Sun Mar 7 21:34:50 2021 -0500 feature/api-python-3 - updated bootstrap and everything associated with it commit 13d6c14 Author: Tom Z <tzinckgraf@gmail.com> Date: Sun Feb 28 21:48:17 2021 -0500 fixed the Dockerfile commit e0b4e92 Author: Tom Z <tzinckgraf@gmail.com> Date: Sun Feb 28 18:43:18 2021 -0500 feature/api-python-3 - added common trees. refactored some code to move it to easier places commit 7c88c3c Author: Tom Z <tzinckgraf@gmail.com> Date: Sat Feb 27 11:05:27 2021 -0500 feature/api-python-3 - the api features combined with python 3 commit c7e20ca Merge: e06bae0 8ee5891 Author: Tom Z <tzinckgraf@gmail.com> Date: Tue Feb 23 20:43:41 2021 -0500 Merge branch 'python3' into feature/api commit e06bae0 Author: Tom Z <tzinckgraf@gmail.com> Date: Sat Feb 20 17:05:37 2021 -0500 feature/api - fixed the styling to match the current OTM. the create tree feature almost works commit 8935e23 Author: Tom Z <tzinckgraf@gmail.com> Date: Mon Feb 15 22:40:30 2021 -0500 feature/api - frontend working with grids and the sidebar commit 8ee5891 Author: Tom Z <tzinckgraf@gmail.com> Date: Sun Jan 24 19:49:43 2021 -0500 python3 - fixed minor issues, getting closer to all test cases commit 15e5b8f Author: Tom Z <tzinckgraf@gmail.com> Date: Mon Jan 18 15:21:51 2021 -0500 feature/api - included the build_all script commit 9d5c0b1 Author: Tom Z <tzinckgraf@gmail.com> Date: Sun Jan 17 17:36:27 2021 -0500 feature/api - added the tree popup commit 4c2691c Author: Tom Z <tzinckgraf@gmail.com> Date: Sat Jan 16 12:47:53 2021 -0500 feature/api - a working instance of a UTF Grid commit ad1fc56 Author: Tom Z <tzinckgraf@gmail.com> Date: Sat Jan 9 10:45:05 2021 -0500 feature/api - added a bunch of fixes to Webpack to upgrade everything. Webpack is now v4 This required some changes to the reverse library, as I could not get the export to work, so instead I updated the calls using reverse. commit 4282184 Author: Tom Z <tzinckgraf@gmail.com> Date: Fri Jan 1 14:24:51 2021 -0500 feature/api - upgrade to webpack commit fbd1299 Author: Tom Z <tzinckgraf@gmail.com> Date: Sun Dec 27 16:05:54 2020 -0500 feature/api - routes and users page commit f745822 Author: Tom Z <tzinckgraf@gmail.com> Date: Sun Nov 15 00:02:39 2020 -0500 python3 - more test cases working commit a6e5a8b Merge: c1fb9fb d3b4fb9 Author: Jenny Fung <fungjj92@users.noreply.github.com> Date: Thu Feb 6 14:16:07 2020 -0500 Merge pull request OpenTreeMap#3288 from OpenTreeMap/jf/fix-tests-2to3 First pass at fixing tests from Py2->3 upgrade commit d3b4fb9 Merge: d85cd29 b8a632a Author: Jenny Fung <fungjj92@users.noreply.github.com> Date: Thu Feb 6 14:14:23 2020 -0500 Merge pull request OpenTreeMap#3290 from OpenTreeMap/jf/fix-tests-manage-treemap Fix remaining broken tests in manage_treemap Django app commit b8a632a Author: Jenny Fung <fungjj92@gmail.com> Date: Tue Feb 4 13:22:14 2020 -0500 Remove obsolete unicode literal Strings are implicitly unicode in py3 commit db54d58 Author: Jenny Fung <fungjj92@gmail.com> Date: Tue Feb 4 13:21:11 2020 -0500 Repackage bytestream into string stream for csv A CSV by python definition is an iterator object that returns a string. A python3 string is defined as unicode and not binary, explicitly, so we have to be explicit about passing string data to csv generators. A downside to this solution is we may now have 2 copies of the entire file in memory while it is being sliced into individual database rows but this should probably be ok given the expected use cases and available computing resources. commit 0f2c3f0 Author: Jenny Fung <fungjj92@gmail.com> Date: Mon Feb 3 17:01:34 2020 -0500 Format request params as unicode strings commit c011701 Author: Jenny Fung <fungjj92@gmail.com> Date: Fri Jan 24 12:44:19 2020 -0500 Encode all strings to bytes before hashing commit ed3282c Author: Jenny Fung <fungjj92@gmail.com> Date: Fri Jan 24 12:30:27 2020 -0500 Handle image data as bytes not unicode commit e6a731e Author: Jenny Fung <fungjj92@gmail.com> Date: Fri Jan 24 09:25:02 2020 -0500 Upgrade modgrammar behavior for v.10 Some breaking changes in usage in modgrammar v.9 => v.10. Whitespace cleaning is invoked through a different class property (bool: grammar_whitespace => str: grammar_whitespace_mode) and stripping is no longer done by default. The parse_string method has strictly defined behavior, prefer to use parse_text with args set. Modgrammar is no longer maintained (or so it seems) and the latest / most helpful documentation is this google group post: https://groups.google.com/forum/#!msg/modgrammar/3CsPBb_UCck/kKr-0YmwtJ8J commit b79a409 Author: Jenny Fung <fungjj92@gmail.com> Date: Thu Jan 23 13:01:12 2020 -0500 Encode image data in bytes not string Refs https://github.com/OpenTreeMap/otm-cloud/issues/505 commit d85cd29 Author: Jenny Fung <fungjj92@gmail.com> Date: Wed Jan 22 09:54:03 2020 -0500 Fix incorrect coercion to string method D/encoding worked differently and more loosely in py2. Now decoding converts bytes to unicode, vice versa for encoding. Also, fix a duplicate conditional expression that captures strings to capture integers too. commit b386116 Author: Jenny Fung <fungjj92@gmail.com> Date: Wed Jan 22 09:21:04 2020 -0500 Handle CSV data de/encoding commit 6fa64bf Author: Jenny Fung <fungjj92@gmail.com> Date: Tue Jan 21 18:42:00 2020 -0500 Comply with PEP 352 The message attribute (and all attributes, other than args) were removed off the Exception base class between Py2 and Py3. commit bc961a8 Author: Jenny Fung <fungjj92@gmail.com> Date: Tue Jan 21 15:22:25 2020 -0500 Update deps to Py3.7-compatible versions Specifically, Celery and Django-tinsel required version bumps. See: celery/celery#5049 and azavea/django-tinsel#9 commit a1a3b6d Author: Jenny Fung <fungjj92@gmail.com> Date: Fri Jan 10 09:55:35 2020 -0500 Clarify usage of bytes vs. string One major change in Python3 is a clean divorce of unicode and binary data. Strings are unicode and bytes are binary. In python2 they could sometimes be handled interchangeably. Now one must explicitly convert between the two data formats, encoding to strings to bytes or decoding bytes to strings. - Django's HttpResponse.content is explicitly a bytestring - Use BytesIO instead of StringIO to prepare request data - Basic auth requires b64 encoding of byte credentials. The result of this is several new layers of de/encoding and unpacking are needed to verify the Basic auth credentials. commit c1fb9fb Merge: f63cfb9 ccef808 Author: Justin Walgran <jwalgran@azavea.com> Date: Fri Jan 10 14:40:03 2020 -0700 First stage of the application-level Python 2 to Python 3 conve… (OpenTreeMap#3285) First stage of the application-level Python 2 to Python 3 conversion commit f63cfb9 Author: Hector Castro <hectcastro@gmail.com> Date: Tue Jan 7 15:44:52 2020 -0500 Adjust hashbang for manage.py to use Python 3 Ensure that manage.py makes use of the Python 3.7 binary, which is distinct from the python (Python 2.7) and python3 (Python 3.6) binaries. commit c27a86b Author: Justin Walgran <jwalgran@azavea.com> Date: Fri Jan 3 11:53:55 2020 -0700 Update requirements for Python 3 compatibility Django 1.11.17 is the minimum version required to run under Python 3. https://docs.djangoproject.com/en/1.11/faq/install/#what-python-version-can-i-use-with-django `functools32` was a backport of a Python 3 included library. The 4.2.0 version of kombu fixes a syntax error under Python 3. celery/kombu#841 wsgiref is part of the Python 3 standard library. commit ccef808 Author: Justin Walgran <jwalgran@azavea.com> Date: Wed Jan 8 12:36:05 2020 -0700 Add migrations as a result of 2to3 converting choices to a list After running 2to3 the choices defined for the `ExportJob.status` and `Instance.itree_region_default` fields were wrapped with a call to `list()`. This resulted in the order of the choices changing. Any change to the choices defined for a field requires a migration. commit 545e383 Author: Justin Walgran <jwalgran@azavea.com> Date: Mon Jan 6 16:35:05 2020 -0700 Fix flake8 indentation errors after 2to3 commit b96f11d Author: Justin Walgran <jwalgran@azavea.com> Date: Mon Jan 6 16:26:11 2020 -0700 Replace reference to file type with a call to open Python 3 removed the built in `file` type, which was semantically equivalent to `open` and what we are required to use in Python 3. https://stackoverflow.com/a/32131309 commit e5a7b47 Author: Justin Walgran <jwalgran@azavea.com> Date: Mon Jan 6 16:04:28 2020 -0700 Fix flake8 line length errors after 2to3 We shorten and rearrange statements as needed to return to having all lines under 80 characters. commit 0afa0fb Author: Justin Walgran <jwalgran@azavea.com> Date: Mon Jan 6 15:38:18 2020 -0700 Fix multiple imports on one line flake 8 error Programmatically fixed with the following command autopep8 --in-place --recursive . --select E401 https://github.com/hhatto/autopep8/ We also removed a duplicate set of imports from ecobackend.py commit ef8a6f2 Author: Justin Walgran <jwalgran@azavea.com> Date: Mon Jan 6 15:02:30 2020 -0700 Fix undefined variable flake8 errors It appears that these lines may have been functioning properly by accident, relying on the fact that in Python 2 list comprehensions did not have their own function scope. commit 335f284 Author: Justin Walgran <jwalgran@azavea.com> Date: Mon Jan 6 14:21:58 2020 -0700 Avoid DotDict exceptions due to Python 3 change in hasattr handling Django 1.11.17 calls `hasattr(a_dotdict_field, 'resolve_expression')`. https://github.com/django/django/blob/121115d2c291b3969ac00ca62253f23513481739/django/db/models/sql/compiler.py#L990 The Python 3 documentation says that this ends up calling `getattr` and returning False if an `AttributeError` is raised https://docs.python.org/3/library/functions.html#hasattr For dictionaries `getattr` ends up calling `__getitem__`. Our implementation of `__getitem__` correctly raises KeyError, and we were relying on a bug in Python 2 where any exception raised during a `hasattr` check would result in False. Now that Python 3 explicitly checks for `AttributeError` we need this workaround The tradeoff is that we now return `AttributeError` instead of `KeyError` when attempting to access a non-existent key. If we rely on catching `KeyError` somewhere in our application we can fix it there. commit adf4233 Author: Justin Walgran <jwalgran@azavea.com> Date: Mon Jan 6 09:47:10 2020 -0700 Replace bytes literal with strings when using modgrammer in Python 3 "cannot use a string pattern on a bytes-like object" exceptions were being raised by code using modgrammer which expects string objects under Python 3. commit 506306f Author: Justin Walgran <jwalgran@azavea.com> Date: Mon Jan 6 09:43:05 2020 -0700 Fix variable references in list comprehension for Python 3 List comprehensions in Python 3 create a new functional scope. As a result in the case where we are using a list comprehension when defining a class-level member we do not have access to the other class-level members within the comprehension. We have implemented a workaround that uses an immediately executed lambda to bind the member variables in the new scope. commit bb20099 Author: Justin Walgran <jwalgran@azavea.com> Date: Mon Jan 6 14:51:51 2020 -0700 Remove extra blank lines created by 2to3 Programmatically removed with the following command autopep8 --in-place --recursive . --select E303 https://github.com/hhatto/autopep8/ commit fe25f7b Author: Justin Walgran <jwalgran@azavea.com> Date: Fri Jan 3 14:12:16 2020 -0700 Use 2to3 to upgrade to Python 3 compatible syntax These changes were made by running the following command from the project root: ``` 2to3 -w -n --no-diffs . ``` The resulting changes have lint errors and broken functionality but we are committing them separately to allow distinguishing between changes made by the automated upgrade tooling and manual fixes that were required after the fact. commit 2040c21 Author: Hector Castro <hectcastro@gmail.com> Date: Tue Jan 7 15:44:52 2020 -0500 Adjust hashbang for manage.py to use Python 3 commit fcd6fb6 Author: Justin Walgran <jwalgran@azavea.com> Date: Mon Jan 6 09:35:05 2020 -0700 FIXUP replace py2 backport of modgrammer with latest py3 version commit 6a29266 Author: Justin Walgran <jwalgran@azavea.com> Date: Fri Jan 3 11:53:55 2020 -0700 Update requirements for Python 3 compatibility Django 1.11.17 is the minimum version required to run under Python 3. https://docs.djangoproject.com/en/1.11/faq/install/#what-python-version-can-i-use-with-django `functools32` was a backport of a Python 3 included library. The 4.2.0 version of kombu fixes a syntax error under Python 3. celery/kombu#841 wsgiref is part of the Python 3 standard library.
develop - fixes on the empty tree pits and the logo
develop - fixed carousel features by mainly changing the item class to
carousel-item
develop
- fixed up the ecobenefits bar on mobile
- fixed some bugs on creation
- added the UHI layer
- added the ESRI layer for the tiling server
develop - remove UHI map
develop - ERSI hybrid and google hybrid
develop - added geolocating
develop - added Bing maps
Added a library for including Bing maps
move location button
to actually write to iNat because I broke everything
pit. UTF map refreshes after new point is created
tiler. The conditions will be red for Unhealthy, black for Dead. This matches our primary dashboard. To make this work, we only need one additional request field on a PlotTileLayer.
colors of the different tree condition points, and it only shows if the Tree Conditions layer is displayed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the first draft of my PR for upgraded OTM feature.
This includes some notable features:
Please note, there are some failing test cases. This is not due to the upgrade. All tests passed after the upgrade. This is related to recent validation features.