Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

push version 23.10.1 #190

Merged
merged 57 commits into from
Nov 7, 2023
Merged

push version 23.10.1 #190

merged 57 commits into from
Nov 7, 2023

Conversation

arunge
Copy link
Contributor

@arunge arunge commented Nov 7, 2023

  • the new version uses functions from the package IsoMemo instead of the deprecated functions from DataTools to reach the IsoMemo API

arunge and others added 30 commits April 21, 2023 08:50
* 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
Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
* 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>
Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
#	NEWS.md
* add "fixed" option

* fix test

* add issue
Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
#	NEWS.md
* use maps without borders or names, add new maps

* add issue

* add info icon
Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
* 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
Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	R/00-Namespace.R
#	tests/testthat/test-module-leafletPointSettings.R
* description and namespace

* function documentation

* renaming columns

* input changes and excel column changes

* KernelR renaming

* plot changes
* fix missing package

* description
Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
… newer version & enable running workflow manually
… newer version & enable running workflow manually
* 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
arunge and others added 27 commits June 6, 2023 10:34
Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
Merge branch 'main' into beta
# Bitte geben Sie eine Commit-Beschreibung ein, um zu erklären, warum dieser
# Merge erforderlich ist, insbesondere wenn es einen aktualisierten
# Upstream-Branch mit einem Thema-Branch zusammenführt.
#
# Zeilen, die mit '#' beginnen, werden ignoriert,
# und eine leere Beschreibung bricht den Commit ab.
* optimize app initialisation

* update news.md
* add new input mappingId

* update test

* rename schema labels

* update news.md

* add schema to save/load data selection

* fix text when empty
Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
* use always jpeg as base for gif file

* update news.md
* 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
* 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>
* exchange downUploadButton module with importData and downloadModel modules

* add config yaml

* fix news.md
* add tryCatch to wrappers

* version up

* fix version

* fix alignment
* 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>
* 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
@arunge arunge self-assigned this Nov 7, 2023
@arunge arunge merged commit f549072 into main Nov 7, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants