Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge the editor and maps integration branch into main (#161)
* maps_first_draft -- needs refactoring * moved static mapping files into past/static * removed bad leaflet reference * cleaned up timing log on past and stopped the double-loading we saw when calling the maps tab * auto-fit to points, refactored selection function in app.js, link back to results. * using countries instead of language groups for origination points in order to consolidate visuals * Enslaver contribute UI now supports both Voyages and Relations children under aliases. * Implementing enslaver_update_actions backend API. * Enslaver contributions can now be saved to the database. Added editorial review URL/view with reject/accept actions. * Initial implementation of enslaver contribution editorial action. * Fixing a few bugs in the new code (backend for enslaver contrib). * Adding Contribute column to Enslavers data table. * Some changes in my local fork were not brought over during cherry picking. Most likely due to the history of "main" being rewritten with respect to the base for the local fork. * Adding Enslavers contribution list to editorial platform. * Enslaver cached properties are updated upon editorial acceptance. * Enslaver contribution voyage link now includes the role. Added the role to the list display as well as the required input for the linking functionality. * All types of enslaver contribution can now be initiated from the Datables UI. - the state is stored in the session storage, so multiple searches can be performed while the contribute UX state is kept; - dropdown button labeled "Contribute Data" was added; - new opens directly a new enslaver contrib; - edit/split/delete enable a direct action for each row; - merge show checkboxes and allows the selection of two entries, even from *different* searches, once the second row is selected, the contribution starts. * now with dynamically shown/hidden origin/final route legs * proper layer management and different zoom levels managed. errors with bad place->region coding like bissau... * Implementing *delete* contributions for Enslavers. * scaled/dynamic animation! and proper tooltip management btw routes & nodes * final draft * cleanup * oops, left console logging of main data object on * minzoom * Fix: raise should have been a return. * Redirect to enslaver contribution after login + legal page. * Using URL routing for editor_main in editorial platform. * Change wording from "unlink" to "delink". * Fix: Aliases tab cannot be activated in enslaver contrib. Problem was a linebreak accidentally introduced in the html. * Initial inclusion of (biographical) sources in enslaver contrib. Fix a URL path bug introduced by previous commit 08cef52. * Implementing more features related to Sources for Enslaver contribution. * Existing and new sources can be linked in enslaver contributions. * Changing the "Contribute Data" headers to "Edit Database". * Adding Enslavement relationship visualization. * Re-enabling LanguageGroup search on Origins. * Adding cache expiration to enslaver/enslaved name search. This allows editorial changes to propagate within a few minutes. * ++ animation contrast, imputed origins tooltip per nafees khan suggestion, and auto map height * fixed curve.js animations and simplified my own implementation * Modern country is now properly added to Origins contributions. * Adding unnamed_enslaved_count to EnslavementRelation. Enslaver cached properties also include this in the aggregate count. * Initial work on Origins contributions editorial review. * fixed routing bug arising from the pseudo-multi-graph * flattening all short 1-hop legs * Implementing more functionality of the Origins editorial page. * on-hover filtering of nodes. the js is a mess but it works * Adding back DataTable page length selection. Bonus point: i18n of button label and drop down choices. * default tight zoom to w africa * handling null hidden nodes * Building propagation table to Origins editorial review. * beginning of a full refactor -- origins clusters plus dynamic table tooltips now included * clicking on clusters to zoom ruins the popup feature on mobile -- we'll use double-clicks instead * ports and origin-to-port animations reintegrated -- [first draft] * modern countries on by default * Showing Origins contribution notes on review page. Propagation table now show current names/language groups with strikethrough to indicate that the current choice will overwrite these values. Editable notes in table. * final quick update before continuing the refactor * ports+regions. modularization. refactoring. * libxml2 bump * handlers for yoruba+igbo special cases * yoruba AND igbo * fix: double-counting dialect groups * Origins editorial review now displays action summary on Acceptance preview. * placeholder -- routing is broken as a result of this total overhaul * Editorial propagation of Origins (enslaved) contribution. * fixed routing basics * post-disembark nodes now included in region/place classes * prior commit did not include helpers.js updates * oceanic routes reincorporated * zoom level refreshes, layer controls, animation timings reincorporated * all routes gathering on all layers, with tooltips, and layer control for oceanic network. minor styling improvements like popup and edge interactions. * embarkation ports aggregation of language groups * fixed the sierra leone routes bug, finished the embarkations tables, updated language choices per de & pm request. * Updating libxml. * tweak to clustering params DO NOT TOUCH and minor language change per request * final destination nodes clustering with tables, and routing geometry artefacts resolved. * fixed embarkation tables bug * new loading image to replace helm * new svg loader img fully implemented * hide loader image on success * standardized loading image presentation * fixed glitchy map loading * consolidated origins routing for clusters * temporarily reinstating classic map tiles * data changes list update * temporary save. destination routes are back but distributed language groups are not integrated. sierra leone disembarkation->final_destination bug is corrected. * returning to mapping specialist tiles * better animation algo (UI still needs a toggle); export of distributed language groups from makemaproutes; finalized languagegroup importer * reintroduced curves on hidden edges, taking control point averages to dampen outliers * animation toggle w/ zoom shutoff, and dist language group positions corrected * final draft * updated language group import notes regarding process for reinstating the language groups submitted by users * borrowed domingos code for the geojson country shapes -- needs styling but already looks better than the proliferation of circles i was using. * properly styled polygon layer * simple, hard animation rule: disable past specific zoom level * guiana double-counts gone, but the fix is not logically correct * final dest marker clusters now working as required :regions & ports, lines drawn) * edge tooltips added back in, handling clusters * restricted mapbox tokens & tiles in preparation for production launch * oxford comma * corrected image not included in last commit * 1. moved map caching into static dirs to avoid git conflicts on scripted rebuild 2. added curvature back into final_dest routes to avoid visually overlapping lines where parallel edges in digraph a->b b->a 3. included a maps cache refresh endpoint * final (initial) routes for dec 21 prod and a correction to management command output file * final * fixed distributed language groups edge case bug Co-authored-by: John Connor (Mulligan) <[email protected]> Co-authored-by: Domingos <[email protected]>
- Loading branch information
3 people
authored
Dec 21, 2022
1 parent
f4453e4
commit 8094bfc