Version 23.06.4: Feat/169 pixel size #170
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
1 task
Merge branch 'beta' into feat/169_pixelSize # Conflicts: # DESCRIPTION # R/02-plotExport.R
Merge branch 'beta' into feat/169_pixelSize # Conflicts: # DESCRIPTION
Merge branch 'beta' into feat/169_pixelSize # Conflicts: # NEWS.md # R/02-plotExport.R
|
@mgross I refactored several parts of the function
Could you please test this PR before you make any changes regarding I would like to merge these changes in advance in order to prevent merge conflicts. Additionally, it would be good if you could (randomly) test to create some plots. Thanks in advance! |
arunge
changed the title
|
@arunge : It seems to work properly (but not sure, why its marked as a bug actually.The change only makes it faster, I think) |
mgross
approved these changes
Jul 5, 2023
1 task
arunge
added a commit
that referenced
this pull request
Oct 17, 2023
* Feat/13 leaflet point symbol (#130) * add function to draw symbols on leaflet map, add test * try adding symbols to UI * named pchChoices * update test for pointSize * add logic to create symbols based on a character column, update and add tests * add symbol width * apply pchChoices in other tabs * fix docu, update tests, prepare symbol legend, add symbol width * add setSymbolLegend and test * make the symbol legend show an icon * fix size of symbols in legend, rename some values * fix test * fix namespace * fix tests after renaming * try standard path in tests in getSymbolLegend * update UI, shift update of legends * remove test * fix tests * add size legend input, fix if negative minSize * prepare pointSize legend * refactor mapping values to sizes in pxl * fix docu * fix name * create legend values for size * extract helper functions for legend * optimize update of data on map * update news.md * update news.md * unique icons in size legend * Feature/54 requested clustering changes (#136) * bugfix wrong number of cluster due to wrong df order * renaming and changing default cluster number * requested renaming changes * renaming and adding spatial cluster centers as option * link to discussion * clustering description * description * Update R/01-estimateMap.R Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> * Apply suggestions from code review Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> --------- Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> * Version 23.05.1: add "fixed" option (#150) * add "fixed" option * fix test * add issue * add user - possible fix for legend icon bug * delete user - possible fix for legend icon bug * try absolute path to www * Version 23.05.2: Feat/133 borders and names on maps (#151) * use maps without borders or names, add new maps * add issue * add info icon * update helpText for interactive mapType * Feat/return gif (#152) * prepare gif * prepare functions for gif loop * update UI, select ipnut to choose between with/without gif * add issue * extract functions exportGraphic * add options to export gif * clean up * update docu and tests * clean up * try hard path for icons * interactive map: try path to dist, autoformat, update UI for points, fix sizes for legend * fix test * most recent DataTools * Feature/54 clustering changes (#159) * description and namespace * function documentation * renaming columns * input changes and excel column changes * KernelR renaming * plot changes * add missing package * Fix/missing package (#160) * fix missing package * description * update checkout, login-action, metadata-action & build-push-action to newer version & enable running workflow manually * update checkout, login-action, metadata-action & build-push-action to newer version & enable running workflow manually * Version 23.06.0: Bug/161 leaflet map issues (#162) * new button reload points * add fixed size option * remove new button, it did not help * update news.md * add issue to news * use original names from map providers * most recent dataTools * try dataTools with optimized checks for internet connecton * #157 try new dataTools * try fix in sheet selection in import * Version: 23.06.1: optimize app initialisation (#165) * optimize app initialisation * update news.md * #157 reduce API calls in app * Version 23.06.2: Feat/102 new iso memo api endpoints (#166) * add new input mappingId * update test * rename schema labels * update news.md * add schema to save/load data selection * fix text when empty * fix missing export * version up * add catching error when exporting plots, functions to create gifs from svg and pdf (#171) * add missing package * add note * Version 23.06.3: use always jpeg as base for gif file (#176) * use always jpeg as base for gif file * update news.md * Version 23.06.4: Feat/169 pixel size (#170) * extract functions to calculate center estimates * apply new functions in plotMap functions * update parameter of centerEstimateServer * fix in plotExport * remove parameters that are not needed anymore * remove parameters that are not needed anymore * add grid length to centerEstimate output * add some comments * update news.md * update news * fix text * version up * change news.md * Missings assignR (#178) * New feature for AssignR: Imputatiopn of missings * Missings assign r refactored (#179) * add missing package to description * extract functions "addUncertainty", "imputeMissingValues" and "notEmpty" * format * fix sprintf --------- Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> * #164 update description for custom maps * Feat/apply model import from data tools (#184) * exchange downUploadButton module with importData and downloadModel modules * add config yaml * fix news.md * Feat/119 catch outer errors (#187) * add tryCatch to wrappers * version up * fix version * fix alignment * update skin name * Operator multi (#185) * New feature for AssignR: Imputatiopn of missings * add missing package to description * extract functions "addUncertainty", "imputeMissingValues" and "notEmpty" * format * fix sprintf * multi batch user defined maps * fix * merge changes from beta (#186) * new versioning * add news, fix duplicate uid name * fix bugs, global vars --------- Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> --------- Co-authored-by: Lukas Fuchs <86153843+f-lukas@users.noreply.github.com> Co-authored-by: Jan A <jan.abel@inwt-statistics.de> Co-authored-by: Marcus Groß <marcus.gross@inwt-statistics.de>
arunge
added a commit
that referenced
this pull request
Nov 7, 2023
* Feat/13 leaflet point symbol (#130) * add function to draw symbols on leaflet map, add test * try adding symbols to UI * named pchChoices * update test for pointSize * add logic to create symbols based on a character column, update and add tests * add symbol width * apply pchChoices in other tabs * fix docu, update tests, prepare symbol legend, add symbol width * add setSymbolLegend and test * make the symbol legend show an icon * fix size of symbols in legend, rename some values * fix test * fix namespace * fix tests after renaming * try standard path in tests in getSymbolLegend * update UI, shift update of legends * remove test * fix tests * add size legend input, fix if negative minSize * prepare pointSize legend * refactor mapping values to sizes in pxl * fix docu * fix name * create legend values for size * extract helper functions for legend * optimize update of data on map * update news.md * update news.md * unique icons in size legend * Feature/54 requested clustering changes (#136) * bugfix wrong number of cluster due to wrong df order * renaming and changing default cluster number * requested renaming changes * renaming and adding spatial cluster centers as option * link to discussion * clustering description * description * Update R/01-estimateMap.R Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> * Apply suggestions from code review Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> --------- Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> * Version 23.05.1: add "fixed" option (#150) * add "fixed" option * fix test * add issue * add user - possible fix for legend icon bug * delete user - possible fix for legend icon bug * try absolute path to www * Version 23.05.2: Feat/133 borders and names on maps (#151) * use maps without borders or names, add new maps * add issue * add info icon * update helpText for interactive mapType * Feat/return gif (#152) * prepare gif * prepare functions for gif loop * update UI, select ipnut to choose between with/without gif * add issue * extract functions exportGraphic * add options to export gif * clean up * update docu and tests * clean up * try hard path for icons * interactive map: try path to dist, autoformat, update UI for points, fix sizes for legend * fix test * most recent DataTools * Feature/54 clustering changes (#159) * description and namespace * function documentation * renaming columns * input changes and excel column changes * KernelR renaming * plot changes * add missing package * Fix/missing package (#160) * fix missing package * description * update checkout, login-action, metadata-action & build-push-action to newer version & enable running workflow manually * update checkout, login-action, metadata-action & build-push-action to newer version & enable running workflow manually * Version 23.06.0: Bug/161 leaflet map issues (#162) * new button reload points * add fixed size option * remove new button, it did not help * update news.md * add issue to news * use original names from map providers * most recent dataTools * try dataTools with optimized checks for internet connecton * #157 try new dataTools * try fix in sheet selection in import * Version: 23.06.1: optimize app initialisation (#165) * optimize app initialisation * update news.md * #157 reduce API calls in app * Version 23.06.2: Feat/102 new iso memo api endpoints (#166) * add new input mappingId * update test * rename schema labels * update news.md * add schema to save/load data selection * fix text when empty * fix missing export * version up * add catching error when exporting plots, functions to create gifs from svg and pdf (#171) * add missing package * add note * Version 23.06.3: use always jpeg as base for gif file (#176) * use always jpeg as base for gif file * update news.md * Version 23.06.4: Feat/169 pixel size (#170) * extract functions to calculate center estimates * apply new functions in plotMap functions * update parameter of centerEstimateServer * fix in plotExport * remove parameters that are not needed anymore * remove parameters that are not needed anymore * add grid length to centerEstimate output * add some comments * update news.md * update news * fix text * version up * change news.md * Missings assignR (#178) * New feature for AssignR: Imputatiopn of missings * Missings assign r refactored (#179) * add missing package to description * extract functions "addUncertainty", "imputeMissingValues" and "notEmpty" * format * fix sprintf --------- Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> * #164 update description for custom maps * Feat/apply model import from data tools (#184) * exchange downUploadButton module with importData and downloadModel modules * add config yaml * fix news.md * Feat/119 catch outer errors (#187) * add tryCatch to wrappers * version up * fix version * fix alignment * update skin name * Operator multi (#185) * New feature for AssignR: Imputatiopn of missings * add missing package to description * extract functions "addUncertainty", "imputeMissingValues" and "notEmpty" * format * fix sprintf * multi batch user defined maps * fix * merge changes from beta (#186) * new versioning * add news, fix duplicate uid name * fix bugs, global vars --------- Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> * Update cosign-installer version * apply functions from IsoMemo instead of DataTools (#189) * apply functions from IsoMemo instead of DataTools * apply getFields instead of getMappingTable * fix parameter name * use IsoMemo::getData instead of DataTools::getRemoteData * version up * version up * inc req DataTools version * fix version * apply has_internet before call to API * add has_internet * catch empty cases of mappingTable, reload mappingTable * apply reloadMappingTable * remove comment * catch error if internet disappears --------- Co-authored-by: Lukas Fuchs <86153843+f-lukas@users.noreply.github.com> Co-authored-by: Jan A <jan.abel@inwt-statistics.de> Co-authored-by: Marcus Groß <marcus.gross@inwt-statistics.de> Co-authored-by: Jan Abel <106665518+jan-abel-inwt@users.noreply.github.com>
arunge
added a commit
that referenced
this pull request
Dec 20, 2023
* Feat/13 leaflet point symbol (#130) * add function to draw symbols on leaflet map, add test * try adding symbols to UI * named pchChoices * update test for pointSize * add logic to create symbols based on a character column, update and add tests * add symbol width * apply pchChoices in other tabs * fix docu, update tests, prepare symbol legend, add symbol width * add setSymbolLegend and test * make the symbol legend show an icon * fix size of symbols in legend, rename some values * fix test * fix namespace * fix tests after renaming * try standard path in tests in getSymbolLegend * update UI, shift update of legends * remove test * fix tests * add size legend input, fix if negative minSize * prepare pointSize legend * refactor mapping values to sizes in pxl * fix docu * fix name * create legend values for size * extract helper functions for legend * optimize update of data on map * update news.md * update news.md * unique icons in size legend * Feature/54 requested clustering changes (#136) * bugfix wrong number of cluster due to wrong df order * renaming and changing default cluster number * requested renaming changes * renaming and adding spatial cluster centers as option * link to discussion * clustering description * description * Update R/01-estimateMap.R Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> * Apply suggestions from code review Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> --------- Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> * Version 23.05.1: add "fixed" option (#150) * add "fixed" option * fix test * add issue * add user - possible fix for legend icon bug * delete user - possible fix for legend icon bug * try absolute path to www * Version 23.05.2: Feat/133 borders and names on maps (#151) * use maps without borders or names, add new maps * add issue * add info icon * update helpText for interactive mapType * Feat/return gif (#152) * prepare gif * prepare functions for gif loop * update UI, select ipnut to choose between with/without gif * add issue * extract functions exportGraphic * add options to export gif * clean up * update docu and tests * clean up * try hard path for icons * interactive map: try path to dist, autoformat, update UI for points, fix sizes for legend * fix test * most recent DataTools * Feature/54 clustering changes (#159) * description and namespace * function documentation * renaming columns * input changes and excel column changes * KernelR renaming * plot changes * add missing package * Fix/missing package (#160) * fix missing package * description * update checkout, login-action, metadata-action & build-push-action to newer version & enable running workflow manually * update checkout, login-action, metadata-action & build-push-action to newer version & enable running workflow manually * Version 23.06.0: Bug/161 leaflet map issues (#162) * new button reload points * add fixed size option * remove new button, it did not help * update news.md * add issue to news * use original names from map providers * most recent dataTools * try dataTools with optimized checks for internet connecton * #157 try new dataTools * try fix in sheet selection in import * Version: 23.06.1: optimize app initialisation (#165) * optimize app initialisation * update news.md * #157 reduce API calls in app * Version 23.06.2: Feat/102 new iso memo api endpoints (#166) * add new input mappingId * update test * rename schema labels * update news.md * add schema to save/load data selection * fix text when empty * fix missing export * version up * add catching error when exporting plots, functions to create gifs from svg and pdf (#171) * add missing package * add note * Version 23.06.3: use always jpeg as base for gif file (#176) * use always jpeg as base for gif file * update news.md * Version 23.06.4: Feat/169 pixel size (#170) * extract functions to calculate center estimates * apply new functions in plotMap functions * update parameter of centerEstimateServer * fix in plotExport * remove parameters that are not needed anymore * remove parameters that are not needed anymore * add grid length to centerEstimate output * add some comments * update news.md * update news * fix text * version up * change news.md * Missings assignR (#178) * New feature for AssignR: Imputatiopn of missings * Missings assign r refactored (#179) * add missing package to description * extract functions "addUncertainty", "imputeMissingValues" and "notEmpty" * format * fix sprintf --------- Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> * #164 update description for custom maps * Feat/apply model import from data tools (#184) * exchange downUploadButton module with importData and downloadModel modules * add config yaml * fix news.md * Feat/119 catch outer errors (#187) * add tryCatch to wrappers * version up * fix version * fix alignment * update skin name * Operator multi (#185) * New feature for AssignR: Imputatiopn of missings * add missing package to description * extract functions "addUncertainty", "imputeMissingValues" and "notEmpty" * format * fix sprintf * multi batch user defined maps * fix * merge changes from beta (#186) * new versioning * add news, fix duplicate uid name * fix bugs, global vars --------- Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de> * Update cosign-installer version * apply functions from IsoMemo instead of DataTools (#189) * apply functions from IsoMemo instead of DataTools * apply getFields instead of getMappingTable * fix parameter name * use IsoMemo::getData instead of DataTools::getRemoteData * version up * version up * inc req DataTools version * fix version * apply has_internet before call to API * add has_internet * catch empty cases of mappingTable, reload mappingTable * apply reloadMappingTable * remove comment * catch error if internet disappears * new version of DataTools * fix missing data after model upload * inc upload size --------- Co-authored-by: Lukas Fuchs <86153843+f-lukas@users.noreply.github.com> Co-authored-by: Jan A <jan.abel@inwt-statistics.de> Co-authored-by: Marcus Groß <marcus.gross@inwt-statistics.de> Co-authored-by: Jan Abel <106665518+jan-abel-inwt@users.noreply.github.com>
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.
Version 23.06.4
New Features
Updates