-
-
Notifications
You must be signed in to change notification settings - Fork 62
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
Model Creation & Edit, Banner and Start Mapping Layout #301
Merged
+10,950
−942
Merged
Changes from all commits
Commits
Show all changes
99 commits
Select commit
Hold shift + click to select a range
26bd4a5
feat: implemented layouts and progress bar
jeafreezy 3d30c54
fix: fixed typescript bug
jeafreezy 6d49ade
fix: transferred file download to the browser
jeafreezy 1169f5e
chore: reverting back to previous implementation
jeafreezy d53d320
chore: progress ...
jeafreezy 90a169f
chore: updated model details design
jeafreezy 5ecd04b
chore: heavy progress
jeafreezy 323d24e
chore: linting
jeafreezy e294a1e
fix: fixed typescript bug
jeafreezy b076646
chore: validations
jeafreezy 30a9479
chore: progres...
jeafreezy cd2cef9
chore: fixed typescript bug
jeafreezy 4d28c94
completed geojson upload, zoom to aoi, delete, layer swich and more
jeafreezy 37c3186
chore: fixed typescript bug
jeafreezy 45fc8f8
chore: removed buildinfo
jeafreezy 99f6220
chore: completed creation flow
jeafreezy efd61e4
chore: fixed typescript bug
jeafreezy f325aba
chore: fixed ts bug
jeafreezy 6844a58
chore: fixed redirection upon creation
jeafreezy 2f410cb
chore: sync with fixes branch
jeafreezy ab76c2a
Merge branch 'develop' into model-creation
jeafreezy a3f233e
chore: synced with develop
jeafreezy 4a097b7
chore: housekeeping: removed toast provider
jeafreezy e5cc5d2
chore: fixed tms bbox bug
jeafreezy b654289
chore: updated tms regex pattern
jeafreezy 3929229
chore: fixed redirection bug after creation, added tms tilename to su…
jeafreezy dc803d4
chore: training area map bug fixe
jeafreezy af9bec6
feat: housekeeping + model creation completed
jeafreezy c6a8bf5
chore: added docs
jeafreezy 7af23cc
feat: model details editing
jeafreezy 2b42f4d
chore: housekeeping + prepping for testing
jeafreezy 7ba5b10
fix: fixed bug in training aoi labels download
jeafreezy bebebd7
chore: added timeout to form state reset
jeafreezy 8f18411
fix: fixed propation bug in tooltip
jeafreezy 2943862
chore: added id to training dataset and descending ordering by id
jeafreezy 7cc6422
chore: enabled layer control for training labels, added background co…
jeafreezy 7ba01ab
chore: fixed JSOM bug
jeafreezy 7557754
chore: fixed zoom level order
jeafreezy 31c9b4e
chore: fixed training accuracy image link
jeafreezy ef64464
chore: updated training settings with new configurations
jeafreezy 06d6eb4
added advanced training settings for yolov8
jeafreezy 4b74486
chore: fixed bug in error toast
jeafreezy 0402ece
chore: added description to basemodels:
jeafreezy 85333f2
chore: styled the training area AOI
jeafreezy 6c1cfa2
chore: added aoi area size to file upload modal
jeafreezy a414fe4
chore: restyled toasts
jeafreezy 249baac
chore: switched to session storage
jeafreezy 5e866fb
chore: training area validations
jeafreezy aaea0db
chore: delayed model files retrieval
jeafreezy 23eef78
chore: fixed typescript bugs
jeafreezy b42a23c
chore: added dataset name to model card + progress with model setting…
jeafreezy 2129027
chore: made zoom 19 selected by default
jeafreezy 0428f40
chore: updated 0 sec text to just now after fetching labels and incre…
jeafreezy fc46437
chore: added validation to training settings input
jeafreezy 48f34a2
revert confirmation page after training settings validation
jeafreezy 10cdb02
feat: progress with banner
jeafreezy a192d79
chore: made terradraw rectangle style to match training area aoi
jeafreezy 8a4515e
chore: fixed training area leayout
jeafreezy 3570a9c
feat: finalized start-mapping layout
jeafreezy 249ceb7
chore: added base model to model grid and list viwq
jeafreezy 32eb75c
chore: added back button
jeafreezy 03e3177
chore: progress with model enhancement
jeafreezy cda0527
chore: merged with start mapping
jeafreezy 5517809
chore: merged with start mapping
jeafreezy 11d0ce4
feat: finalized banner
jeafreezy 71504b5
chore: finalized model enhancement
jeafreezy 447b86e
chore: refetch training history table after submitting new request
jeafreezy ab288e0
chore: disabled enhancement from anonymous users
jeafreezy 3c66368
chore: adjusted aoi color
jeafreezy 4df9a03
chore: added OSM last updated to training AOI tooltip
jeafreezy ba3dfe9
chore: added aoi labels upload
jeafreezy e3a6654
chore: disabled validation in training labels upload
jeafreezy 59c33bc
chore: fixed typescript bugs
jeafreezy 47535fb
chore: increased log height
jeafreezy fe8553b
chore: fixed banner bug
jeafreezy 143defc
chore:fixed crash
jeafreezy e336db4
chore: added typography tto banner
jeafreezy 87e3495
chore: made banner text white:
jeafreezy c3f9012
chore: made text wrap on mobile
jeafreezy 4d95251
chore: fixed bug in user profile
jeafreezy eb5e322
chore: fixed bug in enhance model button
jeafreezy d484d66
feat: finalized logics for editing mode
jeafreezy e956bff
chore: minor fixes
jeafreezy e325ebe
chore: fixe bug
jeafreezy 116a577
chore: progress with model edit
jeafreezy 9eeb3b1
chore: housekeeping
jeafreezy f8fb7b7
chore: model edit progress
jeafreezy 41796fb
chore: default training history table to be sorted by id
jeafreezy e8c8c1d
merging with model-creation branch
jeafreezy 14ee27e
chore: housekeeping
jeafreezy 9adb878
chore: fixed typescript bug
jeafreezy 4f504e8
fix: ordered training history by id
jeafreezy c759545
feat: moved configurations to environment variables
jeafreezy 5a79447
fix: fixed typescript bug
jeafreezy a986c37
chore: changed models route to ai-models
jeafreezy 8a5c822
chore: minor fixes
jeafreezy b2e440b
chore: fixed bug
jeafreezy a603e6d
chore: added max depth to model files recursion
jeafreezy dc4e544
chore: fixed model background refetch
jeafreezy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,46 @@ | ||
VITE_BASE_API_URL = 'http://localhost:8000/api/v1/' # backend api url | ||
VITE_MATOMO_ID= 0 | ||
VITE_MATOMO_APP_DOMAIN = "subdomain.hotosm.org" | ||
VITE_MATOMO_ID = 0 | ||
VITE_MATOMO_APP_DOMAIN = "subdomain.hotosm.org" | ||
|
||
# The maximum allowed area size (in square meters) for training areas. | ||
# Data type: Positive Integer e.g 500000 | ||
MAX_TRAINING_AREA_SIZE = | ||
|
||
# The minimum allowed area size (in square meters) for training areas. | ||
# Data type: Positive Integer e.g 500000 | ||
MIN_TRAINING_AREA_SIZE = | ||
|
||
# The maximum file size (in bytes) allowed for training area upload. | ||
# Data type: Positive Integer e.g 500000 | ||
MAX_TRAINING_AREA_UPLOAD_FILE_SIZE = | ||
|
||
# The current version of the application. | ||
# This is used in the OSM redirect callback when a training area is opened in OSM. | ||
# Data type: String e.g 'v1.1' | ||
FAIR_VERSION = | ||
|
||
# Comma separated hashtags to add to the OSM ID Editor redirection | ||
# Data type: String e.g '#HOT-fAIr, #AI-Assited-Mapping' | ||
OSM_HASHTAGS = | ||
|
||
|
||
# The maximum zoom level for the map. | ||
# Data type: Positive Integer e.g 22. Must be between 0 - 24 | ||
MAX_ZOOM_LEVEL = | ||
|
||
# The minimum zoom level to show the training area labels. | ||
# Data type: Positive Integer e.g 18. Must be between 0 - 24 | ||
TRAINING_LABELS_MIN_ZOOM_LEVEL = | ||
|
||
# Training area and labels styles. | ||
# Opacities are between 0 and 1 . E.g 0.5 | ||
# Widths must be Positive Integers e.g 1, 2 etc. | ||
# Colors must be hex codes or valid colors. E.g 'red', 'green', '#fff' | ||
TRAINING_AREAS_AOI_FILL_COLOR = | ||
TRAINING_AREAS_AOI_OUTLINE_COLOR = | ||
TRAINING_AREAS_AOI_OUTLINE_WIDTH = | ||
TRAINING_AREAS_AOI_FILL_OPACITY = | ||
TRAINING_AREAS_AOI_LABELS_FILL_OPACITY = | ||
TRAINING_AREAS_AOI_LABELS_OUTLINE_WIDTH = | ||
TRAINING_AREAS_AOI_LABELS_FILL_COLOR = | ||
TRAINING_AREAS_AOI_LABELS_OUTLINE_COLOR = |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,3 +22,6 @@ dist-ssr | |
*.njsproj | ||
*.sln | ||
*.sw? | ||
|
||
tsconfig.app.tsbuildinfo | ||
tsconfig.node.tsbuildinfo |
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jeafreezy the amount of dependencies is increasing rapidly, let's just make sure we are using community supported libs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Roger that.
Thanks for your concern @omranlm . The new additions are:
Some suggestions:
The top three can be delegated to the backend later in the future, therefore eliminating the dependencies.
Rest assured, I will ensure all dependencies are community-supported libs and lightweight.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The top three can be delegated to the backend later in the future, therefore eliminating the dependencies.
@jeafreezy Raise this as an issue ! I will resolve when I can
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in #304 and #303 .