Skip to content

Commit

Permalink
fix: backport fixes from master (#517)
Browse files Browse the repository at this point in the history
* fix: Bing Maps download and more compact select lists (#474)
* fix: maps-gl latest
* fix: style and default legend (#476)
* fix: layer toolbar more menu styles
* fix: split view 2x2
* fix: use legend set defined for data item if no classification method is selected
* fix: maps-gl latest
* fix: version bump
* fix: catch error for invalid org unit selection for facility layer (DHIS2-8474) (#495)
* fix: set default legend set from data item (#494)
* fix: Handle error if org unit selection is invalid for thematic layers (DHIS2-8479) (#496)
* fix: Handle error if org unit selection is invalid for thematic layers (DHIS2-8479)
* chore: remove redundant code
* fix: remove doble scrollbars for dimension select (#499)
* fix: set the default classification/legend for selected data item (DHIS2-8485) (#498)
* fix: set the default classification/legend for selected data item
* chore: code clean
* fix: latest maps-gl (#516)
  • Loading branch information
turban authored Mar 19, 2020
1 parent 1ad82bc commit 3b4197d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@dhis2/d2-ui-interpretations": "6.2.1",
"@dhis2/d2-ui-org-unit-dialog": "5.2.10",
"@dhis2/d2-ui-org-unit-tree": "5.2.10",
"@dhis2/maps-gl": "1.0.13",
"@dhis2/maps-gl": "1.0.14",
"@dhis2/ui-core": "^4.1.1",
"@dhis2/ui-widgets": "^2.0.5",
"@material-ui/core": "^4.9.3",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -417,10 +417,10 @@
recompose "^0.26.0"
rxjs "^5.5.7"

"@dhis2/maps-gl@1.0.13":
version "1.0.13"
resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-1.0.13.tgz#a253b0c2c5e559315c8f3879d865ca855f8588b6"
integrity sha512-wRknu4muBxqfmMyHQBK0a/m3aBNtts4PFlxxX/61JJvqZgUAO+6Ywu+kfVpNK7eo0B957uh9yJ3w0ZPI6TGUYQ==
"@dhis2/maps-gl@1.0.14":
version "1.0.14"
resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-1.0.14.tgz#7fec156968e61b32af7569959ad666462f5d17bb"
integrity sha512-pZgGABvm4lloj8XaIRQhvAdCKsTU9uke+q/k30Zct+sTBpr4HY85//HbU2smYq05WhYQhYfZoC5l1z+xtq+6VA==
dependencies:
"@mapbox/sphericalmercator" "^1.1.0"
"@turf/area" "^6.0.1"
Expand Down

0 comments on commit 3b4197d

Please sign in to comment.