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

Map adding points #5

Merged
merged 31 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
be33825
Initial Skeleton
RyanBirtch-aot May 23, 2024
814fa7c
component creation reference
abhilash-aot May 23, 2024
a1b7ccb
Merge branch 'component-reference' of https://github.com/abhilash-aot…
RyanBirtch-aot May 23, 2024
74eb54e
SMK Skeleton Integration
RyanBirtch-aot May 27, 2024
1a31453
Added map component changes
RyanBirtch-aot May 27, 2024
9c7733e
Init Leaflet Component
RyanBirtch-aot May 28, 2024
9c73981
Fixed marker bug, reduced options to point and circle, prelim work on…
RyanBirtch-aot May 29, 2024
6e91baf
refactor map component
RyanBirtch-aot May 31, 2024
a878ac4
refactoring intermediate step
RyanBirtch-aot Jun 3, 2024
00b4953
Typescript conversion
RyanBirtch-aot Jun 3, 2024
183e48d
fixed Unknown Component Render issue
abhilash-aot Jun 4, 2024
a236b63
Merge pull request #1 from abhilash-aot/leaflet-skeleton
RyanBirtch-aot Jun 4, 2024
c12741a
Fixes for js->ts conversion, fixes for webpack css import
RyanBirtch-aot Jun 4, 2024
36d590d
fix for multi map on one page
RyanBirtch-aot Jun 5, 2024
ec49043
map settings form work
RyanBirtch-aot Jun 11, 2024
96605cb
added limits on map pointer submission and popups showing lat lng
RyanBirtch-aot Jun 11, 2024
3a7cab0
settings fix
RyanBirtch-aot Jun 17, 2024
fd4ef17
Settings for radio button with draw options
RyanBirtch-aot Jun 20, 2024
397362b
Points fix
RyanBirtch-aot Jun 24, 2024
2110455
fixes for marker
RyanBirtch-aot Jun 24, 2024
11dfd07
Map zoom fix
RyanBirtch-aot Jun 24, 2024
4371b95
mapsubmission settings
abhilash-aot Jun 25, 2024
7f1ff5e
set map zoom fix
RyanBirtch-aot Jun 25, 2024
c9a46ac
set map zoom fix2
RyanBirtch-aot Jun 25, 2024
d8fb68a
added debug and other drawoptions
abhilash-aot Jun 25, 2024
c68a567
Merged to base branch
abhilash-aot Jun 25, 2024
b90fd13
Merge pull request #3 from RyanBirtch-aot/mapsubmission-settings
RyanBirtch-aot Jun 26, 2024
93fa6c2
Revert back to fieldComponent
RyanBirtch-aot Jun 26, 2024
97f9c28
Fixes for multi input limits
RyanBirtch-aot Jun 28, 2024
75fd4dc
fixes for pr
RyanBirtch-aot Jun 28, 2024
602bde6
Removed unused packages
abhilash-aot Jun 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ build
!app/frontend/.env
!local-infrastructure/.env
.history
realm-export.json
chefs_build
21 changes: 18 additions & 3 deletions app/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions app/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
"font-awesome": "^4.7.0",
"formiojs": "^4.14.13",
"keycloak-js": "^21.1.1",
"leaflet": "^1.9.4",
"leaflet-draw": "^1.0.4",
"lodash": "^4.17.21",
"mitt": "^3.0.0",
"moment": "^2.29.4",
Expand Down
1 change: 1 addition & 0 deletions app/frontend/src/components/designer/FormDesigner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ export default {
simplefile: this.form.userType !== this.ID_MODE.PUBLIC,
bcaddress: true,
simplebcaddress: true,
map: true,
},
},
},
Expand Down
203 changes: 187 additions & 16 deletions components/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,13 @@
"components"
],
"dependencies": {
"@types/leaflet": "^1.9.12",
"@types/leaflet-draw": "^1.0.11",
"autocompleter": "^7.0.1",
"css-loader": "^7.1.2",
"formiojs": "^4.14.6",
"leaflet": "^1.9.4",
"leaflet-draw": "^1.0.4",
"lodash": "^4.17.21",
"native-promise-only": "^0.8.1",
"path-browserify": "^1.0.1",
Expand Down
4 changes: 4 additions & 0 deletions components/src/components/Map/Common/Constants.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export declare abstract class Constants {
static readonly DEFAULT_HELP_LINK: string;
static readonly ADV: string;
}
4 changes: 4 additions & 0 deletions components/src/components/Map/Common/Constants.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export class Constants {
static DEFAULT_HELP_LINK = 'https://github.com/bcgov/common-hosted-form-service/wiki';
static ADV = '';
}
Loading
Loading