feat: support for bing maps and donut clusters #404
Merged
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
turban
changed the title
amcgee
reviewed
Jan 16, 2020
src/components/map/EventLayer.js
Outdated
| onEventClick({ feature, coordinates }) { | ||
| this.setState({ popup: { feature, coordinates } }); | ||
| onEventClick({ feature, coordinates, offset }) { | ||
| this.setState({ popup: { feature, coordinates, offset } }); |
There was a problem hiding this comment.
Question: where does this offset come from?
There was a problem hiding this comment.
It comes from Maps GL: https://github.com/dhis2/maps-gl/blob/feat/event-layer/src/layers/Spider.js#L82
It is the offset from the spiderified marker to the clicked feature which don't have a coordinate.
There was a problem hiding this comment.
OK, that's fine I just wasn't sure where it came from
There was a problem hiding this comment.
Smaller API footprint is better, so I've removed the need for the offset parameter in Maps GL. The solution was to add the offset to the [lng, lat] position directly and return it with the click event.
| ], | ||
| id: row[header.points], |
There was a problem hiding this comment.
Doesn't this need to be [EVENT_ID_FIELD]: row[header.points]? Or am I missing something?
There was a problem hiding this comment.
I don't think so as this is server cluster that don't make sense to download. I think you added [EVENT_ID_FIELD] for download purposes.
There was a problem hiding this comment.
Maybe true, but in that case I think the below feature.properties.id || feature.properties[EVENT_ID_FIELD]; might break data download, since we're now always setting .id? I don't remember how this logic worked off the top of my head, can look into it if you want.
There was a problem hiding this comment.
id is only set for server clusters, which we don't download - when the user download a server cluster layer we make new api requests that fetches all the events. I've tested that download still works like before, but feel free to do some additional testing :-)
amcgee
approved these changes
Jan 21, 2020
dhis2-bot
added a commit
that referenced
this pull request
Dec 2, 2020
# 1.0.0 (2020-12-02) ### Bug Fixes * **translations:** sync translations from transifex (master) ([351ec3c](351ec3c)) * **translations:** sync translations from transifex (master) ([805277c](805277c)) * **translations:** sync translations from transifex (master) ([28ec1c7](28ec1c7)) * **translations:** sync translations from transifex (master) ([d581dae](d581dae)) * **translations:** sync translations from transifex (master) ([8e6d182](8e6d182)) * **translations:** sync translations from transifex (master) ([5bf64d2](5bf64d2)) * **translations:** sync translations from transifex (master) ([1ef8af4](1ef8af4)) * **translations:** sync translations from transifex (master) ([8ff7983](8ff7983)) * **translations:** sync translations from transifex (master) ([6481261](6481261)) * **translations:** sync translations from transifex (master) ([4ad0501](4ad0501)) * **translations:** sync translations from transifex (master) ([7c2ce65](7c2ce65)) * **translations:** sync translations from transifex (master) ([da60d2b](da60d2b)) * **translations:** sync translations from transifex (master) ([7858354](7858354)) * **translations:** sync translations from transifex (master) ([0ca2d82](0ca2d82)) * **translations:** sync translations from transifex (master) ([d96fa9f](d96fa9f)) * **translations:** sync translations from transifex (master) ([5dd74d3](5dd74d3)) * **translations:** sync translations from transifex (master) ([2b4d5f2](2b4d5f2)) * **translations:** sync translations from transifex (master) ([f095534](f095534)) * **translations:** sync translations from transifex (master) ([efd94da](efd94da)) * add missing translations (DHIS2-8658) ([#697](#697)) ([1563ae0](1563ae0)) * authentication header ([#434](#434)) ([11b646d](11b646d)) * avoid app crash if missing period id ([#1054](#1054)) ([b6d0b26](b6d0b26)) * backport changes ([#477](#477)) ([9a74886](9a74886)), closes [#474](#474) [#476](#476) * backport changes from master ([#475](#475)) ([916f574](916f574)), closes [#474](#474) * Bing Maps download and more compact select lists ([#474](#474)) ([4d4ac0c](4d4ac0c)) * build ([48358f2](48358f2)) * build ([c06b383](c06b383)) * catch error for invalid org unit selection for facility layer (DHIS2-8474) ([#495](#495)) ([bcc95d6](bcc95d6)) * change fullscreen control container and period state handling (DHIS2-8524) ([#522](#522)) ([4a71c8f](4a71c8f)) * clean ou dimension before app switching ([#582](#582)) ([2782cc6](2782cc6)) * clear conflicting settings when changing TEI type ([#171](#171)) ([4ed657b](4ed657b)) * clear data and legend when data loading fails ([#564](#564)) ([9b437ac](9b437ac)) * clear dimension items array when filter is changed ([#263](#263)) ([5d6ac53](5d6ac53)) * context menu positioning ([#457](#457)) ([24c904e](24c904e)) * context menu styles ([c0693c4](c0693c4)) * correctly look up lowercase option code ([#137](#137)) ([8e542ca](8e542ca)) * dashboard maps ([#441](#441)) ([83b1dc6](83b1dc6)) * delete serverCluster option if previously set ([#528](#528)) ([62334c1](62334c1)) * event layer styling and no data alert ([#121](#121)) ([a15cd4f](a15cd4f)) * format coordinate values in event popups ([#178](#178)) ([8fb9b96](8fb9b96)) * Handle error if org unit selection is invalid for thematic layers (DHIS2-8479) ([#496](#496)) ([8ec724e](8ec724e)) * keep dynamic filters when switching from DV ([#565](#565)) ([9ff76ac](9ff76ac)) * latest maps-gl ([bad25cb](bad25cb)) * latest maps-gl ([#516](#516)) ([3068de1](3068de1)) * layer dialog column max width ([85d9363](85d9363)) * layer name translations and d2-ui upgrades ([#657](#657)) ([dab62d4](dab62d4)) * loading indicator for new layers ([#181](#181)) ([3d3b07e](3d3b07e)) * map context menu positioning and refactoring ([#447](#447)) ([5baa1bb](5baa1bb)) * map resize on panel change ([#438](#438)) ([96e8511](96e8511)) * map state ([#386](#386)) ([4feae28](4feae28)) * maps gl upgrade and increased node memory for travis ([#452](#452)) ([9c7058b](9c7058b)) * maps-gl latest ([d7d6b9c](d7d6b9c)) * maps-gl latest ([be035df](be035df)) * maps-gl latest ([d1c7185](d1c7185)) * maps-gl latest ([6110828](6110828)) * maps-gl latest ([ebb4c5a](ebb4c5a)) * maps-gl latest and map container class name ([#456](#456)) ([05cc2b2](05cc2b2)) * maps-gl upgrade ([28058bd](28058bd)) * new temperature layer from google earth engine ([#140](#140)) ([6ca1cd9](6ca1cd9)) * no data color and split view layer ordering ([76b8a4a](76b8a4a)) * node version ([0bc1334](0bc1334)) * only set default org unit level if no other org units are selected ([#585](#585)) ([aefe5d9](aefe5d9)) * only show org units with data ([#584](#584)) ([13c2d5f](13c2d5f)) * plugin rendering class names ([#755](#755)) ([0bf154a](0bf154a)) * prop types checks ([#136](#136)) ([41e2512](41e2512)) * re-export cypress fixtures ([#157](#157)) ([66d0825](66d0825)) * refactor popup handling ([#182](#182)) ([eb5bcd1](eb5bcd1)) * remove and onReady event ([#454](#454)) ([b227c7c](b227c7c)) * remove doble scrollbars for dimension select ([#499](#499)) ([5c4b2d8](5c4b2d8)) * remove unsupported filter operators for event layers (DHIS2-7089) ([#586](#586)) ([b29059c](b29059c)) * rename period names import ([#630](#630)) ([99126a7](99126a7)) * resize handling for map plugins ([#168](#168)) ([adf1a9f](adf1a9f)) * revert maps-gl upgrade ([6156596](6156596)) * rxjs import ([5442944](5442944)) * rxjs import bug ([9ff52ac](9ff52ac)) * set alerts to undefined ([#440](#440)) ([d7ab7e6](d7ab7e6)) * set default legend set from data item ([#494](#494)) ([ef2946b](ef2946b)) * set single map rendering strategy as default (DHIS2-9543) ([#1060](#1060)) ([e407411](e407411)) * set the default classification/legend for selected data item (DHIS2-8485) ([#498](#498)) ([d030be5](d030be5)) * set width and height for line legend items in ff ([#125](#125)) ([33a3860](33a3860)) * set width of fullscreen container ([#601](#601)) ([e887617](e887617)) * show an alert when a load error occurs ([#134](#134)) ([edb3f30](edb3f30)) * show feature count in brackets for thematic layers ([#265](#265)) ([d2f2b70](d2f2b70)) * start/end dates check ([#1132](#1132)) ([5fa5e81](5fa5e81)) * **translations:** sync translations from transifex (master) ([b0f4f8f](b0f4f8f)) * round legend numbers ([#1119](#1119)) ([c9ed1f0](c9ed1f0)) * **translations:** sync translations from transifex (master) ([a7fd5b7](a7fd5b7)) * d2-ui-interpretations upgrade ([#1105](#1105)) ([8fa73af](8fa73af)) * **translations:** sync translations from transifex (master) ([7741043](7741043)) * **translations:** sync translations from transifex (master) ([d67469f](d67469f)) * **translations:** sync translations from transifex (master) ([6c8fac5](6c8fac5)) * **translations:** sync translations from transifex (master) ([42a1f56](42a1f56)) * ee api upgrade ([#1067](#1067)) ([d467dd4](d467dd4)) * maps-gl upgrade with style fix ([#1075](#1075)) ([7cb2506](7cb2506)) * only remove date field if undefined ([#1080](#1080)) ([9b98e10](9b98e10)) * only remove date field if undefined ([#1082](#1082)) ([54d5bf3](54d5bf3)) * proptype change ([#1061](#1061)) ([d5c5359](d5c5359)) * start/end dates ([#1053](#1053)) ([18b6add](18b6add)) * style and default legend ([#476](#476)) ([6ccde2b](6ccde2b)) * switch from google maps to bing maps ([#450](#450)) ([bad559d](bad559d)) * tei checkbox label ([#1074](#1074)) ([39485b4](39485b4)) * translation strings (DHIS2-8658) ([#590](#590)) ([a28b9a1](a28b9a1)) * unique class name prefix for each map plugin item (DHIS2-9593) ([#1083](#1083)) ([761e7a5](761e7a5)) * **translations:** sync translations from transifex (master) ([06f2ff8](06f2ff8)) * **translations:** sync translations from transifex (master) ([f6085a7](f6085a7)) * **translations:** sync translations from transifex (master) ([67f5848](67f5848)) * trigger map redraw when data table is dragged (DHIS2-9522) ([#1056](#1056)) ([ab4fce5](ab4fce5)) * **translations:** sync translations from transifex (master) ([be9be9f](be9be9f)) * additional checks for data existence ([#1046](#1046)) ([6e9aa0a](6e9aa0a)) * **translations:** sync translations from transifex (master) ([8347703](8347703)) * d2-ui dependency upgrades ([#1034](#1034)) ([dd93ca3](dd93ca3)) * scroll zoom handling for split view maps on dashboard ([#1032](#1032)) ([ec7e21e](ec7e21e)) * **translations:** sync translations from transifex (master) ([4baeea5](4baeea5)) * map plugin style handling ([#995](#995)) ([162a788](162a788)) * TEI visibility toggle ([#998](#998)) ([32cab9b](32cab9b)) * **translations:** sync translations from transifex (master) ([8d2a48c](8d2a48c)) * **translations:** sync translations from transifex (master) ([49b3b35](49b3b35)) * allow uid to idenitfy org unit levels (TECH-427) ([#984](#984)) ([8a4ac43](8a4ac43)) * require legend set selection (DHIS2-9314) ([#985](#985)) ([03c01a8](03c01a8)) * **translations:** sync translations from transifex (master) ([80219fd](80219fd)) * **translations:** sync translations from transifex (master) ([7864318](7864318)) * **translations:** sync translations from transifex (master) ([3e8aa2c](3e8aa2c)) * **translations:** sync translations from transifex (master) ([2e00d48](2e00d48)) * **translations:** sync translations from transifex (master) ([63e3ffb](63e3ffb)) * **translations:** sync translations from transifex (master) ([0b7e092](0b7e092)) * **translations:** sync translations from transifex (master) ([72ed6ca](72ed6ca)) * add missing translation strings ([#786](#786)) ([8ac176b](8ac176b)) * keep created and lastUpdated map properties ([#868](#868)) ([277970e](277970e)) * missing translation ([fbf920c](fbf920c)) * **translations:** sync translations from transifex (master) ([81c0a1b](81c0a1b)) * **translations:** sync translations from transifex (master) ([ae6587a](ae6587a)) * **translations:** sync translations from transifex (master) ([f7dd46d](f7dd46d)) * **translations:** sync translations from transifex (master) ([0a373e5](0a373e5)) * **translations:** sync translations from transifex (master) ([d51f984](d51f984)) * **translations:** sync translations from transifex (master) ([4ac2f63](4ac2f63)) * **translations:** sync translations from transifex (master) ([4d9d524](4d9d524)) * **translations:** sync translations from transifex (master) ([d8dccd9](d8dccd9)) * **translations:** sync translations from transifex (master) ([84437fd](84437fd)) * **translations:** sync translations from transifex (master) ([e9c7aa8](e9c7aa8)) * **translations:** sync translations from transifex (master) ([82b75f4](82b75f4)) * **translations:** sync translations from transifex (master) ([d5b6308](d5b6308)) * **translations:** sync translations from transifex (master) ([d0227ad](d0227ad)) * **translations:** sync translations from transifex (master) ([cea51a3](cea51a3)) * **translations:** sync translations from transifex (master) ([3fe207d](3fe207d)) * **translations:** sync translations from transifex (master) ([c0e0d17](c0e0d17)) * localize ([6683049](6683049)) * **translations:** sync translations from transifex (master) ([e6b6ec9](e6b6ec9)) * persist publicAccess on map save ([#765](#765)) ([c4c8e71](c4c8e71)) * **translations:** sync translations from transifex (master) ([31c03f3](31c03f3)) * update headerbar to latest and greatest ([#405](#405)) ([7c8353f](7c8353f)) * upgrade gis-api to 32.0.21 ([#124](#124)) ([2bdeeb5](2bdeeb5)) * upgrade interpretations components DHIS2-7249 ([#163](#163)) ([e79b333](e79b333)) * upgrade to v34 of backend api ([#446](#446)) ([e022516](e022516)) * upgrade to version 32 of the web api ([#129](#129)) ([0b44b02](0b44b02)) * use first period as default ([#583](#583)) ([7447e33](7447e33)) * use JssProvider for maps plugin ([#451](#451)) ([b83d1e2](b83d1e2)) * version bump ([bf4b52c](bf4b52c)) * version bump ([6020fd4](6020fd4)) * version bump ([5278708](5278708)) * version bump ([a388d4c](a388d4c)) * version bump ([01ebc23](01ebc23)) * version bump ([99419d5](99419d5)) * version bump ([f500d9d](f500d9d)) * version bump ([e07a4e9](e07a4e9)) * version bump ([7f00b6a](7f00b6a)) * **externallayers:** handle network error correctly ([#102](#102)) ([74ceb68](74ceb68)) ### Features * allow all program statuses to be selected for TEI layers (DHIS2-8166) ([#894](#894)) ([c162d59](c162d59)) * bubble map support for thematic layers (DHIS2-8572) ([#805](#805)) ([e5354f2](e5354f2)) * data table for event layer (DHIS2-3210) ([#862](#862)) ([f353f52](f353f52)) * dynamic dimension filtering for thematic layers ([#86](#86)) ([057c7f0](057c7f0)) * event polygons ([#114](#114)) ([39b79d6](39b79d6)) * fullscreen map control ([#411](#411)) ([62bcb8e](62bcb8e)) * hideTitle option ([#571](#571)) ([01e5179](01e5179)) * improved period selection for google earth engine layers ([#139](#139)) ([bbcb30d](bbcb30d)) * map loading spinner ([#177](#177)) ([cbdca45](cbdca45)) * mapping interface locale ([#412](#412)) ([742fb7c](742fb7c)) * maps gl download ([#432](#432)) ([57cb9fb](57cb9fb)) * new event status select for event layers ([#893](#893)) ([cb51d70](cb51d70)) * new relative periods ([#978](#978)) ([57358f9](57358f9)) * no data color for thematic layers (DHIS2-8642) ([#935](#935)) ([61d185f](61d185f)) * split view maps ([#154](#154)) ([2a81b0d](2a81b0d)) * support for bing maps and donut clusters ([#404](#404)) ([9ab5ad6](9ab5ad6)) * support saving and loading of TEI relationship maps ([#130](#130)) ([38b9581](38b9581)) * switch to maps gl ([#439](#439)) ([fa9cf81](fa9cf81)) * tei relationships ([#117](#117)) ([c8d22d3](c8d22d3)) * timeline support for thematic layers ([#155](#155)) ([6d46dba](6d46dba)) * Use default relative period defined in system settings (DHIS2-8841) ([#706](#706)) ([222c397](222c397)) * use new favicon, cleanup static file handling ([#120](#120)) ([378dafa](378dafa))
|
🎉 This PR is included in version 1.0.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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 PR includes various changes to make DHIS2 Maps compliant with Maps GL:
The PR includes a Bing Maps key which will later be stored in the instance db. The key will be removed from this repo and deleted from Bing when backend support is in place.